Merge branch 'sit' into dev

src/views/sellOut/bargainList/detail.vue

@@ -384,7 +384,7 @@ export default {
         if (exam_info && exam_info.length > 0) {
           exam_info.forEach((e) => {
             console.log(e.status);
-            switch (e.status + "") {
+            switch (e.info_status + "") {
               case "0":
                 this.orderItem = JSON.parse(JSON.stringify(e));
                 break;

src/views/sellOut/bargainList/exam-form.vue

@@ -135,8 +135,8 @@ export default {
           console.log(this.sitem);
           const { status, remark } = this.sitem;
           this.ruleForm = {
-            state: status+"" || "1", // 通过or驳回
-            remark: remark || "",
+            state: status + "" || "1", // 通过or驳回
+            remark: remark + "" || "",
           };
         }
       });

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

@@ -1,5 +1,7 @@
 <template>
   <div class="outOrderTable">
+    <!-- {{wsend_num}}--{{powers.some((item) => item == '051')}} -->
+    <!-- v-if="wsend_num && powers.some((item) => item == '051')" -->
     <el-table
       ref="addrForm"
       :data="tableData"
@@ -20,7 +22,7 @@
         show-overflow-tooltip
         prop="send_status"
         label="状态"
-        width="100"
+        width="105"
       >
         <template slot-scope="scope">
           <el-tag
@@ -147,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
@@ -271,7 +277,7 @@ export default {
       returnId: "",
       returnItem: null,
       returnModel: false,
-      is_return: true,
+      wsend_num:"",
     };
   },
   mounted() {
@@ -299,21 +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;
-        console.log(this.status);
-        let t = 0;
+        this.wsend_num=wsend_num||""
+        // console.log(this.status);
         this.tableData = JSON.parse(JSON.stringify(addrs));
-        this.tableData.forEach((a) => {
-          t += a.receipt_quantity * 1;
-        });
-        if (t === good_num * 1) {
-          this.is_return = false;
-        }
+      
       });
     },
     async addrRefresh(e) {
@@ -324,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,