Jelajahi Sumber

Merge branch 'sit'

xiaodai2022 2 tahun lalu
induk
melakukan
714aa32191

File diff ditekan karena terlalu besar
+ 10 - 0
dist/static/js/0.js


+ 12 - 20
src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="outOrderTable">
-    <!-- {{is_return}}--{{powers.some((item) => item == '051')}} -->
-      <!-- v-if="is_return && powers.some((item) => item == '051')" -->
+    <!-- {{wsend_num}}--{{powers.some((item) => item == '051')}} -->
+    <!-- v-if="wsend_num && powers.some((item) => item == '051')" -->
     <el-table
       ref="addrForm"
       :data="tableData"
@@ -149,7 +149,11 @@
             effect="dark"
             content="退货"
             class="fr"
-            v-if="is_return && powers.some((item) => item == '051')"
+            v-if="
+              wsend_num &&
+              wsend_num !== '0' &&
+              powers.some((item) => item == '051')
+            "
             placement="top"
           >
             <i
@@ -273,7 +277,7 @@ export default {
       returnId: "",
       returnItem: null,
       returnModel: false,
-      is_return: true,
+      wsend_num:"",
     };
   },
   mounted() {
@@ -301,22 +305,13 @@ export default {
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
-        this.is_return = true;
-        const { addrs, status, wsend_num, send_type, good_num } = this.sitem;
-        console.log(send_type);
-        let wsall = wsend_num * 1;
-
+        this.wsend_num = true;
+        const { addrs, status, wsend_num } = this.sitem;
         this.status = status;
+        this.wsend_num=wsend_num||""
         // console.log(this.status);
-        let t = 0;
         this.tableData = JSON.parse(JSON.stringify(addrs));
-        this.tableData.forEach((a) => {
-          if(a.send_status!=='2'&&a.send_status!=='3'&&a.send_status!=='4')
-          t += a.receipt_quantity * 1;
-        });
-        if (t === good_num * 1) {
-          this.is_return = false;
-        }
+      
       });
     },
     async addrRefresh(e) {
@@ -327,9 +322,6 @@ export default {
         console.log(list);
         let t_num = 0,
           add_num = 0;
-        // this.tableData.forEach((a) => {
-        //   t_num += a.receipt_quantity * 1;
-        // });
         let model = {
           arrtime: arrive_time,
           orderCode: orderCode,

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini