build

src/views/businessReportQuery/businessSaleReport/components/columns.js

@@ -1204,7 +1204,7 @@ const table13 = [
   },
   {
     prop: 'outCode',
-    label: '发货编号',
+    label: '发货单编号',
     minWidth: '155px'
   },
   {

src/views/reportQuery/saleReport/components/columns.js

@@ -1204,7 +1204,7 @@ const table13 = [
   },
   {
     prop: 'outCode',
-    label: '发货编号',
+    label: '发货单编号',
     minWidth: '155px'
   },
   {

src/views/sellOut/deliveryWorkOrder/index.vue

@@ -190,7 +190,7 @@
                     <el-option label="确认单编号" value="orderCode" />
                     <el-option label="发货工单编号" value="outChildCode" />
                     <el-option label="商品成本编号" value="spuCode" />
-                    <el-option label="发货编号" value="outCode" />
+                    <el-option label="发货单编号" value="outCode" />
                     <el-option label="商品上线编号" value="skuCode" />
                     <el-option label="申请人" value="apply_name" />
                   </el-select>

src/views/sellOut/deliveryWorkOrder/sendOutOrder.vue

@@ -174,6 +174,11 @@ export default {
           return;
         }
 
+        if(this.tableData.length > 100){
+          this.$message.warning("导入数据最多不能超过100条");        
+          this.loading = false
+        }
+
         let isok = true,
           list = [],
           is_codeok = true;

src/views/sellOut/filing/cpns/shipment-request.vue

@@ -1,7 +1,7 @@
 <template>
   <el-table v-loading="loading" size="mini" border :data="list" max-height="300px">
     <el-table-column
-      label="发货编号"
+      label="发货单编号"
       width="160px"
       prop="orderCode"
       show-overflow-tooltip

src/views/sellOut/returnGoodWorkOrder/columns.js

@@ -17,7 +17,7 @@ export default [
   },
   {
     prop: 'outCode',
-    label: '发货编号',
+    label: '发货单编号',
     width: '160'
   },
   {

src/views/sellOut/salesOrder/columns.js

@@ -40,12 +40,12 @@ export default [
     _slot_: 'status',
     width: '120px'
   },
-  {
-    prop: 'cgd_status',
-    label: '采购单状态',
-    _slot_: 'cgd_status',
-    width: '120px'
-  },
+  // {
+  //   prop: 'cgd_status',
+  //   label: '采购单状态',
+  //   _slot_: 'cgd_status',
+  //   width: '120px'
+  // },
   {
     prop: 'order_source',
     label: '订单来源',

src/views/sellOut/salesOrder/index.vue

@@ -237,7 +237,7 @@
         <template #cgd_status="{ scope }">
           <el-tag size="mini">
             <template  v-if="String(scope.row.order_type) === '1'">--</template>
-            <template v-else>{{(purchaseStatusOptions.find(({value}) => value === scope.row.cgd_status) || {}).label || '--'}}</template>            
+            <template v-else>{{(purchaseStatusOptions.find(({value}) => value === scope.row.cgd_status) || {}).label || '---'}}</template>            
           </el-tag>
         </template>
 
@@ -420,7 +420,6 @@ export default {
     const { back } = this.$route.query;
     if (back) {
       this.parmValue = JSON.parse(back);
-      console.log(this.parmValue);
       const { page, size } = this.parmValue;
       // this.parmValue.start = start || last_start;
       // this.parmValue.end = end || last_end;
@@ -448,9 +447,11 @@ export default {
     isCancel(row){
       const { status, order_type, cgd_status } = row;
       // 库存品&&未发货直接撤销 || 除了库存品以外的商品类型&&采购单未入库的可以撤销
-      const isStock = status === '0' && order_type === '1';
-      const isInStock = cgd_status && (cgd_status === '0' || cgd_status === '1')
-      return isStock || (!isStock && isInStock)
+      // const isStock = status === '0' && order_type === '1';
+      // const isInStock = cgd_status && (cgd_status === '0' || cgd_status === '1')
+      // return isStock || (!isStock && isInStock)
+      /* CHANGE: 未发货可直接撤销 **/
+      return status === "0"
     },
     handleOrderCancel(row){
       MessageBox.confirm("是否确认撤销该销售订单?").then(async () => {

src/views/sellOut/sellAfterApply/components/set-work-order.vue

@@ -5,11 +5,22 @@
         <el-table-column prop="orderCode" label="销售订单" width="160px" show-overflow-tooltip />
         <el-table-column prop="outCode" label="发货单" width="160px" show-overflow-toolti />
         <el-table-column prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
-        <el-table-column label="发货仓库所在供应商名称" prop="supplierName" width="170px" show-overflow-tooltip />
-        <el-table-column label="发货仓库所在供应商编码" prop="supplierNo" width="170px" show-overflow-tooltip />
-        <el-table-column prop="wsm_name" label="发货仓库名称" width="160px" show-overflow-tooltip />
-        <el-table-column prop="wsm_code" label="发货仓库编码" width="170px" show-overflow-tooltip />
-        <el-table-column prop="contactor_name" label="发货仓库负责人" width="110px" show-overflow-tooltip />
+        <el-table-column label="发货仓库名称" prop="wsm_name" width="180px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-popover placement="top" width="380" trigger="hover">
+              <h2>发货仓库</h2>
+              <ul>
+                <li>编码 : {{ scope.row.wsm_code }}</li>
+                <li>负责人 : {{ scope.row.contactor_name }}</li>
+                <li>所在供应商名称 : {{ scope.row.supplierName }}</li>
+                <li>所在供应商编码 : {{ scope.row.supplierNo }}</li>
+              </ul>
+              <i slot="reference" class="el-icon-warning-outline" />
+            </el-popover>
+            <span>{{ scope.row.wsm_name }}</span>
+          </template>
+        </el-table-column>
+
         <el-table-column prop="num" label="发货数量" show-overflow-tooltip />
         <el-form>
           <el-table-column width="110px" show-overflow-tooltip>
@@ -90,23 +101,28 @@ export default {
       })
     }
   },
-  async mounted() {
-    this.$nextTick(async() => {
-      const { data, code, message } = await asyncRequest.sendList({ outCode: this.sitem.outCode })
+  watch: {
+    sitem: {
+      async handler() {
+        if (!this.sitem || !this.sitem.outCode) {
+          return
+        }
 
-      switch (code) {
-        case 0:
-          this.list = data.list.map(item => ({ ...item, return_num: 0, return_wsm_code: '' }))
-          break
-        default:
-          this.$message.warning(message)
-          break
-      }
-    })
+        const { data, code, message } = await asyncRequest.sendList({ outCode: this.sitem.outCode })
+        switch (code) {
+          case 0:
+            this.list = data.list.map(item => ({ ...item, return_num: 0, return_wsm_code: '' }))
+            break
+          default:
+            this.$message.warning(message)
+            break
+        }
+      },
+      immediate: true
+    }
   },
   methods: {
     onStockChange({ code, supplierName, supplierNo, contactor_name } = {}, index) {
-      console.log(111, contactor_name)
       this.$set(this.list, index, {
         ...this.list[index],
         return_wsm_code: code ? [code] : '',

src/views/sellOut/sellAfterApply/components/wait-stockman.vue

@@ -153,18 +153,25 @@ export default {
     loading: false,
     list: []
   }),
-  mounted() {
-    this.$nextTick(async() => {
-      const { data, code, message } = await asyncRequest.afterChild({ returnCode: this.sitem.returnCode })
-      switch (code) {
-        case 0:
-          this.list = data.list.map(item => ({ ...item, can_sell_num: 0, defective_num: 0, loss_num: 0 }))
-          break
-        default:
-          this.$message.warning(message)
-          break
-      }
-    })
+  watch: {
+    sitem: {
+      async handler() {
+        if (!this.sitem || !this.sitem.outCode) {
+          return
+        }
+
+        const { data, code, message } = await asyncRequest.afterChild({ returnCode: this.sitem.returnCode })
+        switch (code) {
+          case 0:
+            this.list = data.list.map(item => ({ ...item, can_sell_num: 0, defective_num: 0, loss_num: 0 }))
+            break
+          default:
+            this.$message.warning(message)
+            break
+        }
+      },
+      immediate: true
+    }
   },
   methods: {
     onNumberChange(num, index, prop) {

src/views/sellOut/sellAfterApply/detail.vue

@@ -180,7 +180,7 @@
               <set-work-order :sitem="sitem" @reload="() => initData()" />
             </el-collapse-item>
 
-            <el-collapse-item name="9" title="待库管收货" v-if="isHasPermission({status:'12', process:'12'})">
+            <el-collapse-item name="9" title="待库管收货"  v-if="isHasPermission({status:'12', process:'12'})">
               <wait-stockman :sitem="sitem" @reload="() => initData()" />
             </el-collapse-item>
           </el-collapse>

src/views/supplierSellOut/supplierDeliveryWorkOrder/index.vue

@@ -175,7 +175,7 @@
                       <el-option label="确认单编号" value="orderCode" />
                       <el-option label="发货工单编号" value="outChildCode" />
                       <el-option label="商品成本编号" value="spuCode" />
-                      <el-option label="发货编号" value="outCode" />
+                      <el-option label="发货单编号" value="outCode" />
                       <el-option label="商品上线编号" value="skuCode" />
                       <el-option label="申请人" value="apply_name" />
                     </el-select>

src/views/supplierSellOut/supplierFiling/cpns/shipment-request.vue

@@ -1,7 +1,7 @@
 <template>
   <el-table v-loading="loading" size="mini" border :data="list" max-height="300px">
     <el-table-column
-      label="发货编号"
+      label="发货单编号"
       width="160px"
       prop="orderCode"
       show-overflow-tooltip

src/views/supplierSellOut/supplierReturnWorkOrder/columns.js

@@ -17,7 +17,7 @@ export default [
   },
   {
     prop: 'outCode',
-    label: '发货编号',
+    label: '发货单编号',
     width: '160'
   },
   // {