build

src/views/goodStore/goodsOnline/components/online-form.vue

@@ -273,6 +273,24 @@
 // import costFormAddEdit from "./costFormAddEdit";
 import asyncRequest from "@/apis/service/goodStore/goodsOnline";
 import showVoucherModel from "@/components/show-voucher-model";
+import { isAlphanumeric, isnumber, validAlphabets } from "@/utils/validate";
+
+const validate_plat_code = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("平台商品编号不能为空！"));
+      } else {
+        if (isnumber(value)) {
+          callback();
+        } else if (validAlphabets(value)) {
+          callback();
+        } else if (isAlphanumeric(value)) {
+          callback();
+        } else {
+          callback("平台商品编号仅支持数字和字母！");
+        }
+      }
+ };
+    
 export default {
   name: "exam-form",
   props: [
@@ -423,7 +441,8 @@ export default {
           {
             required: true,
             message: "请输入平台商品编号",
-            trigger: "blur",
+            validator:validate_plat_code
+            // trigger: "blur",
           },
         ],
         remark: [

src/views/sellOut/deliveryWorkOrder/detail.vue

@@ -78,6 +78,10 @@
                         <span>仓库编号:</span
                         ><span>{{ sitem.wsm_code }}</span>
                       </li>
+                      <li>
+                        <span>仓库负责人:</span
+                        ><span>{{ sitem.contactor_name }}</span>
+                      </li>
                     </ul>
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
                   </el-popover>
@@ -95,7 +99,6 @@
               />
             </el-collapse-item>
 
-            <!--   -->
             <el-collapse-item title="待库管发货" name="2"  v-if="sitem.status === '1' && !isSupertube && ppowers.includes('1') && canSend">
               <express-node @refresh="() => initData()" :sitem="sitem" />
             </el-collapse-item>
@@ -173,6 +176,7 @@ export default {
     canSend(){
       const { id:userId } = this.userInfo || {};
       const { contactor:manangerUserId } = this.sitem || {};
+      console.log(userId,manangerUserId)
       if(!userId || !manangerUserId) return false
       return userId === manangerUserId
     },

src/views/sellOut/returnGoodWorkOrder/columns.js

@@ -31,12 +31,12 @@ export default [
     _slot_: 'stock_type',
     width: '100px'
   },
-  {
-    prop: 'status',
-    label: '状态',
-    width: '105px',
-    _slot_: 'status'
-  },
+  // {
+  //   prop: 'status',
+  //   label: '状态',
+  //   width: '105px',
+  //   _slot_: 'status'
+  // },
   {
     prop: 'return_num_total',
     label: '最终收货数量',

src/views/sellOut/returnGoodWorkOrder/components/ShowDataTableColumns.js

@@ -11,15 +11,21 @@ const showColumns = [
     span: 7
   },
   {
-    prop: 'status',
-    label: '状态',
-    _slot_: 'status',
-    span: 6
+    prop: 'type',
+    label: '仓库类型',
+    span: 4,
+    _slot_: 'stock_type'
   },
+  // {
+  //   prop: 'status',
+  //   label: '状态',
+  //   _slot_: 'status',
+  //   span: 6
+  // },
   {
     prop: 'apply_name',
     label: '创建人',
-    span: 4
+    span: 6
   },
   {
     prop: 'companyName',
@@ -60,12 +66,6 @@ const showColumns = [
   //   label: '下单数量',
   //   span: 4
   // },
-  {
-    prop: 'type',
-    label: '仓库类型',
-    span: 4,
-    _slot_: 'stock_type'
-  },
   {
     prop: 'send_num',
     label: '发货数量',
@@ -84,7 +84,7 @@ const showColumns = [
   {
     prop: 'addtime',
     label: '创建时间',
-    span: 8
+    span: 12
   },
   {
     prop: 'remark',

src/views/supplierSellOut/supplierReturnWorkOrder/columns.js

@@ -31,12 +31,12 @@ export default [
     width: '75px',
     _slot_: 'stock_type'
   },
-  {
-    prop: 'status',
-    label: '状态',
-    width: '105px',
-    _slot_: 'status'
-  },
+  // {
+  //   prop: 'status',
+  //   label: '状态',
+  //   width: '105px',
+  //   _slot_: 'status'
+  // },
   {
     prop: 'return_num',
     label: '退货数量'

src/views/supplierSellOut/supplierReturnWorkOrder/components/ShowDataTableColumns.js

@@ -11,15 +11,15 @@ const showColumns = [
     span: 7
   },
   {
-    prop: 'status',
-    label: '状态',
-    _slot_: 'status',
-    span: 6
+    prop: 'type',
+    label: '仓库类型',
+    span: 4,
+    _slot_: 'stock_type'
   },
   {
     prop: 'apply_name',
     label: '创建人',
-    span: 4
+    span: 6
   },
   {
     prop: 'companyName',
@@ -60,12 +60,6 @@ const showColumns = [
   //   label: '下单数量',
   //   span: 4
   // },
-  {
-    prop: 'type',
-    label: '仓库类型',
-    span: 4,
-    _slot_: 'stock_type'
-  },
   {
     prop: 'send_num',
     label: '发货数量',
@@ -84,7 +78,7 @@ const showColumns = [
   {
     prop: 'addtime',
     label: '创建时间',
-    span: 8
+    span: 12
   },
   {
     prop: 'remark',