新增出入库优化并合并ccc

src/views/inout/DialogCreateOrder.vue

@@ -188,11 +188,20 @@
         <el-row v-if="documentShow">
           <el-col :span="11">
             <el-form-item prop="acceptance" label="预验收单据:">
-              <el-input
+              <el-select
                 style="width: 90%"
-                :disabled="true"
                 v-model="orderFormData.checkPreInOrders"
-              ></el-input>
+                multiple
+                placeholder="请选入单据"
+              >
+                <el-option
+                  v-for="(item, index) in orderFormData.checkPreInOrders"
+                  :key="item.index"
+                  :label="item"
+                  :value="item"
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -292,6 +301,7 @@
       <dialog-create-order-select
         @giveselectbox="giveselectbox"
         :closeDialogtwo="closeDialogtwo"
+        :checkPreInOrders="orderFormData.checkPreInOrders"
       >
       </dialog-create-order-select>
     </el-dialog>
@@ -401,7 +411,7 @@ export default {
         ],
         acceptance: [
           { required: true, message: "请选入预验收单据", trigger: "blur" },
-        ]
+        ],
       },
       isScan: true,
       scanText: "扫码录入：",
@@ -430,7 +440,6 @@ export default {
       viewBizVisible: false,
       viewCodeVisible: false,
       viewCodeDetailVisible: false,
-
       documentShow: false, //控制预选单显示隐藏
     };
   },
@@ -457,18 +466,18 @@ export default {
             this.getBusTypeByInv();
           }
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
-    //接收预选单传值
+    //接收预验单传值
     giveselectbox(val) {
-      this.orderFormData.checkPreInOrders = val;
+      this.orderFormData.checkPreInOrders = JSON.parse(JSON.stringify(val));
     },
     //仓库改变
     changeInv() {
       this.orderFormData.action = null;
-      if (this.documentShow = true) {
-        this.documentShow = false
+      this.orderFormData.checkPreInOrders = null;
+      if ((this.documentShow = true)) {
+        this.documentShow = false;
       }
       this.getBusTypeByInv();
     },
@@ -482,8 +491,7 @@ export default {
         .then((response) => {
           this.busTypeOptions = response.data || [];
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
     //关闭预选单弹框
     closeDialogtwo() {
@@ -515,8 +523,7 @@ export default {
             this.bizShow = true;
           } else this.bizShow = false;
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
     //获取往来单位候选列表
@@ -550,6 +557,8 @@ export default {
 
     //单据类型改变
     actionChange(item) {
+      this.orderFormData.checkPreInOption = null;
+      this.orderFormData.checkPreInOrders = null;
       this.curAction = this.getActionItem(item);
       if (
         (this.curAction.checkEnable && this.curAction.checkWebNew) ||
@@ -571,13 +580,13 @@ export default {
         this.orderFormData.fromInvCode = null;
         this.findFromInvList();
       }
-      if (this.curAction.scanPreIn && this.curAction.backPreinType == 1) {
-        this.documentShow = true
+      if (
+        (this.curAction.scanPreIn = true && this.curAction.backPreinType == 1)
+      ) {
+        this.documentShow = true;
       } else {
-        this.documentShow = false
+        this.documentShow = false;
       }
-      this.giveselectbox();
-
     },
 
     //获取往来仓库列表
@@ -592,8 +601,7 @@ export default {
             this.orderFormData.fromInvCode = this.fromInvOptions[0].code;
           }
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
     //获取当前单据类型
@@ -666,8 +674,7 @@ export default {
               confirmButtonText: "确定",
               type: "warning",
               closeOnClickModal: true,
-              callback: (action) => {
-              },
+              callback: (action) => {},
             });
           }
           this.corpOrderIdDisabled = true;
@@ -697,8 +704,7 @@ export default {
                 tQuery.ignoreExpire = true;
                 this.addCodeSubmit(tQuery);
               })
-              .catch(() => {
-              });
+              .catch(() => {});
           } else if (response.code == 505) {
             this.$confirm(response.message, "提示", {
               confirmButtonText: "确定",
@@ -709,29 +715,24 @@ export default {
                 tQuery.ignoreRecentExpire = true;
                 this.addCodeSubmit(tQuery);
               })
-              .catch(() => {
-              });
+              .catch(() => {});
           } else if (response.code == 605) {
             this.$confirm(response.message, "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
               type: "warning",
-            }).then(() => {
-
-            }).catch(() => {
-
-            });
+            })
+              .then(() => {})
+              .catch(() => {});
             return;
           } else if (response.code == 604) {
             this.$confirm(response.message, "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
               type: "warning",
-            }).then(() => {
-
-            }).catch(() => {
-
-            });
+            })
+              .then(() => {})
+              .catch(() => {});
             return;
           } else if (response.code == 507) {
             this.editOriginCodeVisible = true;
@@ -925,8 +926,7 @@ export default {
             this.$message.error(response.message);
           }
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
     closeCodeDialog() {
       this.editOriginCodeVisible = false;

src/views/inout/DialogCreateOrderSelect.vue

@@ -64,15 +64,20 @@
       <el-divider style="margin: 15px"></el-divider>
       <el-table
         ref="multipleTable"
-        @select="select"
+        @select-all="handleAll"
+        :header-cell-class-name="leftheaderStyle"
+        @selection-change="handleSelectionChange"
         v-loading="loading"
         :data="list"
         style="width: 100%"
         highlight-current-row
         border
-        @row-click="handleSelectionChange"
       >
-        <!-- <el-table-column type="selection" width="55"></el-table-column> -->
+        <el-table-column
+          type="selection"
+          :selectable="checkSelection"
+          width="55"
+        ></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column
           label="扫码单据类型"
@@ -192,6 +197,10 @@ export default {
       type: Function,
       required: true,
     },
+    checkPreInOrders: {
+      type: Array,
+      required: true,
+    },
   },
   data() {
     return {
@@ -306,8 +315,9 @@ export default {
       resultTotal: 0,
       resultDetailLoading: false,
       resultDetailList: [],
-      selectboxs: [],
-      selectbox: "",
+      multipleSelection: [],
+      selectbox: [],
+      selectRow: null,
     };
   },
   components: {},
@@ -345,20 +355,23 @@ export default {
     //选入
     combine() {
       this.closeDialogtwo();
-      this.$emit("giveselectbox", this.currentRow.billNo);
+      this.$emit("giveselectbox", this.selectbox);
     },
-    //   //选择
-    //   select(selection,row){
 
-    //     //   console.log(row);
-    //     this.selectboxs.push(row)
-    //     let nerArr = JSON.parse(JSON.stringify(this.selectboxs))
-    //      let qwe = nerArr.map(item=>{
-    //   // 每一项的单号
-    //   return item.billNo
-    // })
-    //     this.selectbox=qwe
-    //   },
+    //选择框根据已选入判断禁用方法
+    checkSelection(row, index) {
+      let flag = true;
+      if (this.checkPreInOrders.length === 0) {
+        flag = true;
+      } else {
+        if (this.checkPreInOrders.includes(row.billNo)) {
+          flag = false;
+        } else {
+          flag = true;
+        }
+      }
+      return flag;
+    },
     //关闭对话框
     closeLocalDialog() {
     },
@@ -377,10 +390,21 @@ export default {
         .catch(() => {
         });
     },
+    //多行勾选
     handleSelectionChange(val) {
-      this.currentRow = val;
-      console.log(this.currentRow.billNo);
-      this.getOrderDetails();
+      let checkboxs = JSON.parse(JSON.stringify(val));
+      this.multipleSelection = checkboxs.map((item) => {
+        return item.billNo;
+      });
+      let hebin = [...this.checkPreInOrders, ...this.multipleSelection];
+      let boxarry = Array.from(new Set(hebin));
+      this.selectbox = boxarry;
+    },
+    //全选
+    handleAll(selection) {
+      if(selection.length==0){
+           this.$refs.multipleTable.clearSelection()
+      }   
     },
     // 获取单据 业务详情、扫码详情、扫码明细
     getOrderDetails() {
@@ -644,4 +668,5 @@ export default {
 </script>
 
 <style type="text/scss" lang="scss">
+
 </style>