huang_an 2 роки тому
батько
коміт
b88f866d84

+ 4 - 1
src/views/warehouseManagement/outgoingManagement/add.vue

@@ -613,7 +613,10 @@
       this.initData();
     },
     methods: {
-      eomSuccess(row) {},
+      eomSuccess(row) {
+        this.formData.documentSource = row.orderNo;
+        this.$forceUpdate();
+      },
       pickOrderRow(row) {
         row.tableData = [];
         this.formData.documentSource = row.code;

+ 11 - 10
src/views/warehouseManagement/outgoingManagement/components/eom.vue

@@ -129,16 +129,17 @@
         this.$refs.eomEditRef.open(row);
       },
       handleMine() {
-        const current = this.current.orderInfoList;
-        for (const key in current) {
-          if (
-            current[key].bomDetailDTOS.length == 0 &&
-            current[key].instanceList.length == 0
-          ) {
-            this.$message.warning('当前领料单数据为空');
-            return;
-          }
-        }
+        // const current = this.current.orderInfoList;
+        // for (const key in current) {
+        //   if (
+        //     current[key].bomDetailDTOS.length == 0 &&
+        //     current[key].instanceList.length == 0
+        //   ) {
+        //     this.$message.warning('当前领料单数据为空');
+        //     return;
+        //   }
+        // }
+        console.log('sacnmmmmmm=', this.current);
         this.$emit('success', this.current);
         this.dialogVisible = false;
       },

+ 5 - 2
src/views/warehouseManagement/outgoingManagement/components/eomEdit.vue

@@ -40,7 +40,7 @@
         </el-row>
         <el-row>
           <el-col :offset="2" :span="8"
-            >发货附件:{{ orderRow.sendFiles.join(',') }}</el-col
+            >发货附件:{{ orderRow.sendFiles }}</el-col
           >
           <el-col :offset="6" :span="8"
             >是否回执:{{ orderRow.replied == 1 ? '是' : '否' }}</el-col
@@ -208,7 +208,10 @@
         // };
         const data = await getById(row.id);
         console.log('===', data);
-        this.orderRow = data.data;
+        this.orderRow = {
+          ...data.data,
+          sendFiles: data.data.sendFiles.join(',')
+        };
         this.dialogVisible = true;
       },
       handleClose(done) {}

+ 0 - 1
src/views/warehouseManagement/stockLedger/components/details/OutWarehouse.vue

@@ -239,7 +239,6 @@
           // ...this.searchForm,
           // batchNum: this.baseParams.batchNum || this.searchForm.batchNum
         });
-        console.log('wqwqwqres====', res);
         if (res) {
           const list = this.$store.state.userPage.userList;
           this.vuexUser = list;