feat(退货、发货工单):流程权限限制

src/views/interest/group/index.vue

@@ -186,6 +186,7 @@ export default {
       const { btnList } = this.$store.getters;
       const tran = btnList.find(item => item.menu_route == "group") || {};
       const { action } = tran ?? {};
+      console.log(action);
       return action ?? [];
     }
   },

src/views/purchaseIn/purchaseOrder/index.vue

@@ -821,12 +821,10 @@ export default {
       // this.parmValue.supplier_name = this.select === "10" ? this.input : ""; // 采购供应商名称
       // this.wsm_supplierNo = [];
 
-      console.log(this.parmValue.has_account)
-
       const res = await asyncRequest.list({
         ...this.parmValue,
         supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
-        needRela: true,
+        needRela: true
       });
 
       if (res && res.code === 0 && res.data) {

src/views/sellOut/beforeReturnGoodWorkOrder/detail.vue

@@ -77,7 +77,7 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="待库管收货" name="1" v-if="sitem && String(sitem.status) === '12' && !isSupertube">
+            <el-collapse-item title="待库管收货" name="1" v-if="sitem && ppowers.includes('2') && String(sitem.status) === '12' && !isSupertube">
               <wait-stockman :sitem="sitem" @reload="initData" />
             </el-collapse-item>
 
@@ -115,6 +115,12 @@ export default {
       const { action } = tran ?? {};
       return action ?? [];
     },
+    ppowers() {
+      const tran =
+        this.$store.getters.roleProcess.find((i) => i.process_type === "THGD") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
   },
   data() {
     return {

src/views/sellOut/deliveryWorkOrder/columns.js

@@ -1,17 +1,61 @@
 export default [
+
   {
     prop: 'outChildCode',
     label: '发货工单号',
     width: '160'
   },
+  {
+    prop: 'outCode',
+    label: '发货单编号',
+    width: '160'
+  },
   {
     prop: 'orderCode',
     label: '确认单编号',
     width: '160'
   },
   {
-    prop: 'outCode',
-    label: '确认单编号',
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '85px'
+  },
+  {
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    width: '85'
+  },
+  {
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    width: '85'
+  },
+  {
+    prop: 'num',
+    label: '总数量',
+    width: '70'
+  },
+  {
+    prop: 'wsm_code',
+    label: '仓库编号',
+    width: '160'
+  },
+  {
+    prop: 'wsm_name',
+    label: '仓库名称',
+    width: '160'
+  },
+  {
+    prop: 'spuCode',
+    label: '商品成本编码',
+    width: '160'
+  },
+  {
+    prop: 'skuCode',
+    label: '商品上线编码',
     width: '160'
   },
   {
@@ -49,51 +93,13 @@ export default [
     label: '供应商编号 ',
     width: '160'
   },
-  {
-    prop: 'spuCode',
-    label: '商品成本编码',
-    width: '160'
-  },
-  {
-    prop: 'skuCode',
-    label: '商品上线编码',
-    width: '160'
-  },
 
-  {
-    prop: 'order_type',
-    label: '商品类型',
-    _slot_: 'order_type',
-    width: '85'
-  },
-  {
-    prop: 'order_source',
-    label: '订单来源',
-    _slot_: 'order_source',
-    width: '85'
-  },
-  {
-    prop: 'num',
-    label: '总数量',
-    width: '70'
-  },
-  {
-    prop: 'status',
-    label: '状态',
-    _slot_: 'status',
-    width: '120px'
-  },
   // {
   //   prop: 'send_status',
   //   label: '分单状态',
   //   _slot_: 'send_status',
   //   width: '120px'
   // },
-  {
-    prop: 'wsm_code',
-    label: '仓库编号',
-    width: '160'
-  },
   {
     prop: 'addtime',
     label: '下单时间',

src/views/sellOut/deliveryWorkOrder/detail.vue

@@ -85,7 +85,7 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="待库管发货" name="2" v-if="sitem.status === '1' && !isSupertube && powers.includes('080')">
+            <el-collapse-item title="待库管发货" name="2" v-if="sitem.status === '1' && !isSupertube && ppowers.includes('1')">
               <express-node @refresh="() => initData()" :sitem="sitem" />
             </el-collapse-item>
           </el-collapse>
@@ -117,17 +117,23 @@ export default {
       const { action } = tran ?? {};
       return action ?? [];
     },
+    ppowers() {
+      const tran =
+        this.$store.getters.roleProcess.find((i) => i.process_type === "FHGD") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    }
   },
   data() {
     return {
       showColumns,
       activeTabs: "1",
       statusOptions: [
-        { value: "1", label: "待库管发货" },
+        { value: "1", label: "待发货" },
         { value: "2", label: "发货完成" },
-        { value: "3", label: "已收货" },
-        { value: '3', label: '供应商驳回,待供应商负责人审核'},
-        { value: '4', label: '已全部退货'},
+        // { value: "3", label: "已收货" },
+        // { value: "4", label: "已全部收货" },
+        { value: "5", label: "已取消" },
       ],
       xs_order_type_options,
       sitem: null, //传给组件

src/views/sellOut/deliveryWorkOrder/index.vue

@@ -339,8 +339,8 @@ export default {
       statusOptions: [
         { value: "1", label: "待发货" },
         { value: "2", label: "发货完成" },
-        { value: "3", label: "已收货" },
-        { value: "4", label: "已全部收货" },
+        // { value: "3", label: "已收货" },
+        // { value: "4", label: "已全部收货" },
         { value: "5", label: "已取消" },
       ],
       loading: false,

src/views/sellOut/sellAfterApply/detail.vue

@@ -321,12 +321,13 @@ export default {
   },
   methods: {
     isHasPermission({ status, process }){
+      console.log(this.ppowers)
       return (
         status === String(this.sitem.status) 
-        // && this.ppowers.includes(process) && !this.isSupertube
+        && this.ppowers.includes(process) 
+        && !this.isSupertube
       )
-    
-    },
+s    },
     async handleExpress(data){
       let res = await asyncRequest.express({
         ...data,

src/views/sellOut/zixunOrder/components/feedbackList.vue

@@ -283,7 +283,6 @@ export default {
       table: {
         stripe: true,
         border: true,
-        // _defaultHeader_: ["setcol"],
       },
       // 表格 - 分页
       pageInfo: {
@@ -340,7 +339,6 @@ export default {
       this.isDetail = isDetail;
       this.sitem = sitem;
     },
-
     // 列表搜索
     async searchList() {
       this.loading = true;

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/detail.vue

@@ -77,7 +77,7 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="待库管收货" name="1" v-if="sitem && String(sitem.status) === '12'">
+            <el-collapse-item title="待库管收货" name="1" v-if="sitem && String(sitem.status) === '12' && !isSupertube && ppowers.includes('1')">
               <wait-stockman :sitem="sitem" @reload="initData" />
             </el-collapse-item>
 
@@ -115,6 +115,12 @@ export default {
       const { action } = tran ?? {};
       return action ?? [];
     },
+    ppowers() {
+      const tran =
+        this.$store.getters.roleProcess.find((i) => i.process_type === "THGD") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    }
   },
   data() {
     return {

src/views/supplierSellOut/supplierDeliveryWorkOrder/detail.vue

@@ -74,7 +74,7 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="待库管发货" name="2"  v-if="sitem.status === '1' && !isSupertube">
+            <el-collapse-item title="待库管发货" name="2"  v-if="sitem.status === '1' && !isSupertube && ppowers.includes('1')">
               <express-node @refresh="() => initData()" :sitem="sitem" />
             </el-collapse-item>
           </el-collapse>
@@ -108,17 +108,23 @@ export default {
       const { action } = tran ?? {};
       return action ?? [];
     },
+    ppowers() {
+      const tran =
+        this.$store.getters.roleProcess.find((i) => i.process_type === "FHGD") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    }
   },
   data() {
     return {
       activeTabs: "1",
       showColumns: showColumns,
       statusOptions: [
-        { value: "1", label: "待库管发货" },
-        { value: "2", label: "发货完成" },
-        { value: "3", label: "已收货" },
-        { value: '3', label: '供应商驳回,待供应商负责人审核'},
-        { value: '4', label: '已全部退货'},
+      { value: "1", label: "待发货" },
+      { value: "2", label: "发货完成" },
+        // { value: "3", label: "已收货" },
+        // { value: "4", label: "已全部收货" },
+      { value: "5", label: "已取消" },
       ],
       xs_order_type_options,
       sitem: null, //传给组件

src/views/supplierSellOut/supplierDeliveryWorkOrder/index.vue

@@ -296,12 +296,11 @@ export default {
       sitem: null,
       // 状态
       statusOptions: [
-        { value: "1", label: "待库管发货" },
+      { value: "1", label: "待发货" },
         { value: "2", label: "发货完成" },
-        { value: "3", label: "已收货" },
-        { value: '3', label: '供应商驳回,待供应商负责人审核'},
-        { value: '4', label: '已全部退货'},
-        { value: '5', label: '已取消'}
+        // { value: "3", label: "已收货" },
+        // { value: "4", label: "已全部收货" },
+        { value: "5", label: "已取消" },
       ],
       loading: false,
       showModel: false,