物料采集实现

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "2.9"
+  "version": "3.0"
 }

src/views/pro-steps/components/wuliaocaiji.vue

@@ -15,9 +15,7 @@
     <div
       v-for="(item, index) in opCompentDataList"
       :key="index"
-      :class="
-        item.needNum - item.realNum == 0 ? 'infoMsg infoMsgImg' : 'infoMsg'
-      "
+      :class="item.completeStatus == 1 ? 'infoMsg infoMsgImg' : 'infoMsg'"
       @click="toXQPop(item)"
     >
       <div class="leftMsg">

src/views/pro-steps/popUpView/xiangqingPopUp.vue

@@ -52,7 +52,7 @@
             >还可绑定</el-button
           >
           <el-button style="width: 300px" type="success" @click="autoAll"
-            >按需自动绑定(从第一列开始绑定)</el-button
+            >按需全批次自动绑定</el-button
           >
         </div>
 
@@ -71,42 +71,44 @@
           />
           <el-table-column align="center" label="本次绑定管号">
             <template #default="scope">
-              <el-select
-                multiple
-                clearable
-                filterable
-                placeholder="管号"
-                v-model="batchNoTableData[scope.$index].selectSeqNo"
-                @change="
-                  (value) =>
-                    setSelectSeq(
-                      value,
-                      scope.$index,
-                      batchNoTableData[scope.$index].batchNo
-                    )
-                "
-                @clear="clear(scope.$index)"
-                @remove-tag="(tagValue) => removeTag(tagValue, scope.$index)"
-              >
-                <el-option
-                  v-for="item in seqNoDataList"
-                  :key="item"
-                  :label="item.seqNo"
-                  :value="item.seqNo"
-                  :disabled="
-                    item.selectBatchNoList.includes(
-                      batchNoTableData[scope.$index].batchNo
-                    )
-                      ? false
-                      : tabledata[scope.$index].num == 0
-                        ? true
-                        : item.remainingNum == 0
-                          ? true
-                          : false
+              <el-scrollbar max-height="300px">
+                <el-select
+                  multiple
+                  clearable
+                  filterable
+                  placeholder="管号"
+                  v-model="batchNoTableData[scope.$index].selectSeqNo"
+                  @change="
+                    (value) =>
+                      setSelectSeq(
+                        value,
+                        scope.$index,
+                        batchNoTableData[scope.$index].batchNo
+                      )
                   "
+                  @clear="clear(scope.$index)"
+                  @remove-tag="(tagValue) => removeTag(tagValue, scope.$index)"
                 >
-                </el-option>
-              </el-select>
+                  <el-option
+                    v-for="item in seqNoDataList"
+                    :key="item"
+                    :label="item.seqNo"
+                    :value="item.seqNo"
+                    :disabled="
+                      item.selectBatchNoList.includes(
+                        batchNoTableData[scope.$index].batchNo
+                      )
+                        ? false
+                        : tabledata[scope.$index].num == 0
+                          ? true
+                          : item.remainingNum == 0
+                            ? true
+                            : false
+                    "
+                  >
+                  </el-option>
+                </el-select>
+              </el-scrollbar>
             </template>
           </el-table-column>
           <el-table-column align="center" width="200" label="绑定管号详情">
@@ -354,13 +356,10 @@ const setBatchNoTableData = () => {
     //本次绑定具体字段和数量
     item.selectSeq = [];
     item.seqNo = listObj[item.batchNo];
-    item.ok = myMap.get(item.batchNo)
-      ? myMap.get(item.batchNo) < item.surplusNum
-        ? false
-        : true
-      : false;
-    item.soNum = myMap.get(item.batchNo)
-      ? item.surplusNum - myMap.get(item.batchNo)
+    item.ok = item.surplusNum > 0 ? false : true;
+    item.soNum = item.surplusNum;
+    item.surplusNum = myMap.get(item.batchNo)
+      ? item.surplusNum + myMap.get(item.batchNo)
       : item.surplusNum;
   });
 };