xiaodai2022 2 жил өмнө
parent
commit
acacf0a3d4

+ 4 - 4
src/config/env.development.js

@@ -7,10 +7,10 @@ module.exports = {
     // userApi: 'http://www.invoice.com/',
     // baseApi: 'http://www.stock.com/',
 
-    userApi: 'http://inv.test241.wanyuhengtong.com/',
-    baseApi: 'http://stock.test241.wanyuhengtong.com/',
-    // userApi: 'http://inv.sitw.wanyuhengtong.com/',
-    // baseApi: 'http://stock.api.wanyuhengtong.com/',
+    // userApi: 'http://inv.test241.wanyuhengtong.com/',
+    // baseApi: 'http://stock.test241.wanyuhengtong.com/',
+    userApi: 'http://inv.sitw.wanyuhengtong.com/',
+    baseApi: 'http://stock.api.wanyuhengtong.com/',
   },
   webUrl:'http://share.sitw.wanyuhengtong.com/#/test-good-share?id=',
   fileURL: `https://api2.edusit.zretchome.com`,

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

@@ -1,5 +1,7 @@
 <template>
   <div class="outOrderTable">
+    <!-- {{is_return}}--{{powers.some((item) => item == '051')}} -->
+      <!-- v-if="is_return && 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
@@ -305,10 +307,11 @@ export default {
         let wsall = wsend_num * 1;
 
         this.status = status;
-        console.log(this.status);
+        // 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) {