build

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -319,7 +319,7 @@
                 placeholder="售后说明"
                 v-model="ruleForm.after_sales"
                 show-word-limit
-                maxlength="250"
+                maxlength="1000"
               >
               </el-input>
             </el-form-item>

src/views/purchaseIn/wsmInOrder/detail.vue

@@ -87,7 +87,7 @@
             <el-collapse-item
               title="入库验收"
               name="3"
-              v-if="status == '0' && ppowers.some((i) => i == '0') && !isSupertube"
+              v-if="status == '1' && ppowers.some((i) => i == '1') && !isSupertube"
             >
               <wsm-in
                 v-if="newTime !== ''"

src/views/sellOut/deliveryWorkOrder/components/express.vue

@@ -7,8 +7,8 @@
     label-width="90px"
   >
     <el-row>
-      <el-col :span="12"
-        ><el-form-item label="物流公司" prop="post_name">
+      <el-col :span="8">
+        <el-form-item label="物流公司" prop="post_name">
           <search-express
             :value="ruleForm.post_name"
             :placeholder="'请输入物流公司'"
@@ -33,10 +33,11 @@
             @reschange="number_change($event, 'post_fee')"
           />
         </el-form-item>
-      </el-col>
-
-      <el-col :span="12">
         <el-form-item label="物流单号" prop="post_code">
+          <div>
+            <el-alert title="多物流单号请用逗号'，'隔开" type="warning" :closable="false">
+            </el-alert>
+          </div>
           <el-input
             placeholder="请输入物流单号"
             maxlength="100"
@@ -114,24 +115,24 @@ export default {
       rules: {
         post_name: [
           {
-            type: "array",
-            required: true,
+            // type: "array",
+            // required: true,
             message: "请选择发货公司",
             trigger: "change",
           },
         ],
         post_fee: [
           {
-            required: true,
-            validator: validate_post_fee,
+            // required: true,
+            // validator: validate_post_fee,
             trigger: "blur",
           },
         ],
         post_code: [
           {
-            required: true,
+            // required: true,
             trigger: "blur",
-            validator: validateExpressSn,
+            // validator: validateExpressSn,s
           },
         ],
       },
@@ -142,6 +143,17 @@ export default {
       this.ruleForm[key] = e + "" || "0";
       this.$refs.ruleForm.validateField(key);
     },
+    getComma(str){
+      const isHasComma =  str.indexOf('，') !== -1
+      const isHasEComma = str.indexOf(',') !== -1
+      const commas = []
+      if(isHasComma) commas.push('，')
+      if(isHasEComma) commas.push(',')
+      return {
+        isHasComma: isHasComma || isHasEComma,
+        commas
+      }
+    },
     // 商品保存提交
     async submitForm() {
       await this.$refs.ruleForm.validate(async (valid) => {
@@ -150,7 +162,16 @@ export default {
             return;
           }
           this.loading = true;
-          const model = JSON.parse(JSON.stringify(this.ruleForm));
+          let model = JSON.parse(JSON.stringify(this.ruleForm));
+          const { post_code } = model;
+          const { isHasComma, commas } = this.getComma(post_code)
+
+          if(isHasComma){
+            let postCodeChunks;
+            postCodeChunks = post_code.split(commas[0])
+            if(commas[1]) postCodeChunks.forEach()
+          }
+
           model.outChildCode = this.sitem.outChildCode;
           model.post_name = model.post_name.toString();
           
@@ -174,7 +195,6 @@ export default {
       });
     },
     handleCompany(e) {
-      console.log(e);
       this.ruleForm.post_name = e && e.code ? [e.label] : [];
       this.$refs.ruleForm.validateField("post_name");
     },

src/views/sellOut/deliveryWorkOrder/detail.vue

@@ -85,7 +85,18 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="待库管发货" name="2" v-if="sitem.status === '1' && !isSupertube && ppowers.includes('1')">
+            <el-collapse-item title="商品信息" name="2">
+              <show-goods-data-table
+                :newTime="newTime"
+                v-if="newTime !== ''"
+                :type="sitem.order_type"
+                :skucode="sitem.skuCode"
+                :spucode="sitem.good_code"
+              />
+            </el-collapse-item>
+
+            <!-- v-if="sitem.status === '1' && !isSupertube && ppowers.includes('1')" -->
+            <el-collapse-item title="待库管发货" name="2">
               <express-node @refresh="() => initData()" :sitem="sitem" />
             </el-collapse-item>
           </el-collapse>

src/views/sellOut/sellAfterApply/columns.js

@@ -256,7 +256,7 @@ const sellshowColumns = [
   },
   {
     prop: 'addr',
-    label: '客户退回信息',
+    label: '客户退回地址',
     _slot_: 'addr',
     span: 12
   },

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

@@ -6,7 +6,7 @@
         <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 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 />

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

@@ -2,21 +2,71 @@
   <div class="work-order__wrapper">
     <el-form>
       <el-table size="mini" border :data="list">
-        <el-table-column prop="orderCode" label="销售订单" width="160px" show-overflow-tooltip />
-        <el-table-column prop="outCode" label="发货单" width="160px" show-overflow-tooltip />
-        <el-table-column prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
-        <el-table-column label="发货仓库所在供应商名称" prop="send_supplierName" width="170px" show-overflow-tooltip />
-        <el-table-column label="发货仓库所在供应商编码" prop="send_supplierNo" width="170px" show-overflow-tooltip />
-        <el-table-column prop="send_wsm_name" label="发货仓库名称" width="170px" show-overflow-tooltip />
-        <el-table-column prop="send_wsm_code" label="发货仓库编码" width="170px" show-overflow-tooltip />
-        <el-table-column prop="send_contactor_name" label="发货仓库负责人" width="110px" show-overflow-tooltip />
+        <el-table-column prop="orderCode" label="销售订单" width="150px" show-overflow-tooltip />
+        <el-table-column prop="outCode" label="发货单" width="145px" show-overflow-tooltip />
+        <el-table-column prop="outChildCode" label="发货工单" width="155px" show-overflow-tooltip />
+        <el-table-column label="发货仓库所在供应商" prop="send_supplierName" width="170px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-popover placement="top" width="350" trigger="hover">
+              <span>发货仓库所在供应商编码:</span><span>{{ scope.row.send_supplierNo }}</span>
+              <i slot="reference" class="el-icon-warning-outline" />
+            </el-popover>
+
+            <span>{{ scope.row.send_supplierName }}</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="发货仓库所在供应商编码" prop="send_supplierNo" width="170px" show-overflow-tooltip /> -->
+        <el-table-column prop="send_wsm_name" label="发货仓库" width="170px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-popover placement="top" width="280" trigger="hover">
+              <ul>
+                <li>
+                  <span>发货仓库编码:</span><span>{{ scope.row.send_wsm_code }}</span>
+                </li>
+              </ul>
+              <i slot="reference" class="el-icon-warning-outline" />
+            </el-popover>
+
+            <span>{{ scope.row.send_wsm_name }}</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="send_wsm_code" label="发货仓库编码" width="170px" show-overflow-tooltip /> -->
+        <el-table-column label="发货仓库负责人" prop="send_contactor_name" width="110px" show-overflow-tooltip />
         <el-table-column prop="return_num" label="发货物流" width="110px" show-overflow-tooltip />
         <el-table-column prop="send_num" label="发货数量" show-overflow-tooltip />
-        <el-table-column label="退货仓库所在供应商名称" prop="return_supplierName" width="180px" show-overflow-tooltip />
-        <el-table-column label="退货仓库所在供应商编码" prop="return_supplierNo" width="190px" show-overflow-tooltip />
+        <el-table-column label="退货仓库所在供应商" prop="return_supplierName" width="180px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-popover placement="top" width="280" trigger="hover">
+              <ul>
+                <li>
+                  <span>退货仓库所在供应商编码:</span><span>{{ scope.row.return_supplierNo }}</span>
+                </li>
+              </ul>
+              <i slot="reference" class="el-icon-warning-outline" />
+            </el-popover>
+
+            <span>{{ scope.row.return_supplierName }}</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="退货仓库所在供应商编码" prop="return_supplierNo" width="190px" show-overflow-tooltip /> -->
         <el-table-column label="退货数量" prop="return_num" width="110px" show-overflow-tooltip />
-        <el-table-column label="退货销售仓库名称" prop="return_wsm_name" width="180px" show-overflow-tooltip />
-        <el-table-column label="退货销售仓库编码" prop="return_wsm_code" width="180px" show-overflow-tooltip />
+
+        <el-table-column label="退货销售仓库" prop="return_wsm_name" width="180px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-popover placement="top" width="280" trigger="hover">
+              <ul>
+                <li>
+                  <span>退货销售仓库编码:</span><span>{{ scope.row.return_wsm_code }}</span>
+                </li>
+              </ul>
+              <i slot="reference" class="el-icon-warning-outline" />
+            </el-popover>
+
+            <span>{{ scope.row.return_wsm_name }}</span>
+          </template>
+        </el-table-column>
+
+        <!-- <el-table-column label="退货销售仓库编码" prop="return_wsm_code" width="180px" show-overflow-tooltip /> -->
         <el-table-column label="退货销售仓库负责人" width="130px" prop="return_contactor_name" show-overflow-tooltip />
         <el-table-column width="130px">
           <template slot="header">

src/views/supplierPurchaseIn/supplierWsmInOrder/detail.vue

@@ -92,7 +92,7 @@
             <el-collapse-item
               title="入库验收"
               name="3"
-              v-if="status == '0' && ppowers.some((i) => i == '0') && !isSupertube"
+              v-if="status == '1' && ppowers.some((i) => i == '1') && !isSupertube"
             >
               <wsm-in
                 v-if="newTime !== ''"