build

src/views/purchaseIn/purchaseOrder/columns.js

@@ -20,32 +20,12 @@ const columns = [
     label: '订单编号',
     width: '155px'
   },
-  // {
-  //   prop: "bkcode",
-  //   label: "备库单编号",
-  //   width: "155px",a
-  // },
-
-  // {
-  //   prop: "wsm_supplierNo",
-  //   label: "仓库公司编号",
-  //   width: "145px",
-  // },
-  // {
-  //   prop: "wsm_supplier",
-  //   label: "仓库公司名称",
-  //   width: "155px",
-  // },
-  // {
-  //   prop: "wsm_code",
-  //   label: "仓库编号",
-  //   width: "172px",
-  // },
-  // {
-  //   prop: "wsm_name",
-  //   label: "仓库名称",
-  //   width: "80px",
-  // },
+  {
+    prop: 'has_account',
+    label: '供应商端',
+    _slot_: 'has_account',
+    width: '80px'
+  },
   {
     prop: 'status',
     label: '状态',
@@ -149,12 +129,6 @@ const columns = [
   //   label: "未发货数量",
   //   width: "105px",
   // },
-  {
-    prop: 'has_account',
-    label: '供应商端',
-    _slot_: 'has_account',
-    width: '120px'
-  },
   {
     prop: 'lasttime',
     label: '预计最晚入库时间',

src/views/purchaseIn/purchaseReturn/ShowDataTableColumns.js

@@ -1,80 +1,50 @@
 export default [
   {
-    prop: "returnCode",
-    label: "采购退货单编号",
+    prop: 'returnCode',
+    label: '采购退货单编号',
     span: 6
   },
   {
-    prop: "cgdNo",
-    label: "采购单编号",
+    prop: 'cgdNo',
+    label: '采购单编号',
     span: 6
   },
   {
-    prop: "apply_name",
-    label: "申请人",
+    prop: 'apply_name',
+    label: '申请人',
     span: 6
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
     span: 6
   },
 
   {
-    prop: "good_num",
-    label: "总采购数量",
+    prop: 'good_num',
+    label: '总采购数量',
     span: 6
   },
   {
-    prop: "return_num",
-    label: "退货退货数量",
+    prop: 'return_num',
+    label: '退货数量',
     span: 6
   },
   {
-    prop: "good_price",
-    label: "采购单价",
+    prop: 'good_price',
+    label: '采购单价',
     span: 6
   },
   {
-    prop: "return_price",
-    label: "退货总金额",
+    prop: 'return_price',
+    label: '退货总金额',
     span: 6
   },
   {
-    prop: "addtime",
-    label: "创建时间",
-    span: 6
-  },
-  {
-    prop: "post_company",
-    label: "物流公司",
-    span: 6
-  },
-  {
-    prop: "post_code",
-    label: "物流编号",
-    span: 12,
-  },
-  {
-    prop: "return_contactor",
-    label: "退货联系人",
-    span: 6
-  },
-  {
-    prop: "return_mobile",
-    label: "退货联系电话",
-    span: 6
-  },
-  {
-    prop: "return_addr",
-    label: "退货地址",
-    span: 12,
-  },
-  {
-    prop: "error_remark",
-    label: "退货备注",
-    span: 24,
-  },
+    prop: 'addtime',
+    label: '创建时间',
+    span: 24
+  }
 ]
 

src/views/purchaseIn/purchaseReturn/components/columns.js

@@ -1,43 +1,42 @@
 export default [
   {
-    prop: "cgdNo",
-    label: "采购单编号",
-    width: "160"
+    prop: 'cgdNo',
+    label: '采购单编号',
+    width: '160'
   },
   {
-    prop: "returnCode",
-    label: "退货单编号",
-    width: "160"
+    prop: 'returnCode',
+    label: '退货单编号',
+    width: '160'
   },
   {
-    prop: "apply_name",
-    label: "申请人"
+    prop: 'apply_name',
+    label: '申请人'
   },
   {
-    prop: "good_code",
-    label: "商品编码",
-    width: "140"
+    prop: 'good_code',
+    label: '商品编码',
+    width: '140'
   },
   {
-    prop: "goods_class",
-    label: "商品分类",
-    width: "130",
+    prop: 'goods_class',
+    label: '商品分类',
+    width: '130'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    width: "150"
+    prop: 'good_name',
+    label: '商品名称',
+    width: '150'
   },
   {
-    prop: "goo_num",
-    label: "商品数量",
-    width: "150"
+    prop: 'goo_num',
+    label: '商品数量',
+    width: '150'
   },
 
-
   {
-    prop: "return_num",
-    label: "退货数量",
+    prop: 'return_num',
+    label: '退货数量'
   },
 
   // {
@@ -45,41 +44,41 @@ export default [
   //   label: "商品单价",
   // },
   {
-    prop: "good_total",
-    label: "退货总金额",
-    width: "100"
+    prop: 'good_total',
+    label: '退货总金额',
+    width: '100'
   },
   {
-    prop: "post_company",
-    label: "物流公司",
+    prop: 'post_company',
+    label: '物流公司'
   },
   {
-    prop: "post_code",
-    label: "物流编号",
+    prop: 'post_code',
+    label: '物流编号'
   },
   {
-    prop: "post_fee",
-    label: "物流费",
-    width: "120"
+    prop: 'post_fee',
+    label: '物流费',
+    width: '120'
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "120px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '120px'
   },
   {
-    prop: "remark",
-    label: "备注"
+    prop: 'remark',
+    label: '备注'
   },
   {
-    prop: "wsm_supplier",
-    label: "供应商"
+    prop: 'wsm_supplier',
+    label: '供应商'
   },
   {
-    prop: "wsm_supplierNo",
-    label: "供应商编码"
-  },
+    prop: 'wsm_supplierNo',
+    label: '供应商编码'
+  }
   // {
   //   prop: "order_type",
   //   label: "退货来源",
@@ -95,4 +94,4 @@ export default [
   //   _slot_: "operation",
   // },
 
-]
+]

src/views/purchaseIn/wsmInOrder/detail.vue

@@ -34,7 +34,8 @@
                         <span>仓库公司编号：</span><span>{{ sitem.wsm_supplierNo }}</span>
                       </li> -->
                       <li>
-                        <span>仓库名称编号：</span><span>{{ sitem.wsm_code }}</span>
+                        <p>仓库名称编号 : {{ sitem.wsm_code }}</p>
+                        <p>仓库负责人 : {{ sitem.contactor_name }}</p>
                       </li>
                     </ul>
                     <i class="el-icon-warning-outline fr" slot="reference"></i>

src/views/sellOut/deliveryWorkOrder/columns.js

@@ -15,6 +15,12 @@ export default [
     label: '确认单编号',
     width: '160'
   },
+  {
+    prop: 'has_account',
+    label: '供应商端',
+    width: '80',
+    _slot_: 'has_account'
+  },
   {
     prop: 'status',
     label: '状态',

src/views/sellOut/deliveryWorkOrder/detail.vue

@@ -95,7 +95,7 @@
               />
             </el-collapse-item>
 
-            <el-collapse-item title="待库管发货" name="2"  v-if="sitem.status === '1' && !isSupertube && ppowers.includes('1')">
+            <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>
           </el-collapse>
@@ -129,7 +129,7 @@ export default {
   mixins: [mixinPage, resToken],
   components: { ExpressNode },
   computed: {
-    ...mapGetters(['isSupertube']),
+    ...mapGetters(['isSupertube','userInfo']),
     powers() {
       const { btnList } = this.$store.getters;
       const tran = btnList.find((item) => item.menu_route == "deliveryWorkOrderDetail" ) || {};
@@ -182,6 +182,14 @@ export default {
     this.queryId = this.$route.query.id;
     this.initData();
   },
+  computed:{
+    canSend(){
+      const { id:userId } = this.userInfo || {};
+      const { contactor:manangerUserId } = this.sitem || {};
+      if(!userId || !manangerUserId) return false
+      return userId === manangerUserId
+    }
+  },
   methods: {
     async initData() {
       const { code, data, message } = await asyncRequest.detail({

src/views/sellOut/deliveryWorkOrder/index.vue

@@ -275,6 +275,10 @@
           ></el-tag>
         </template>
 
+        <!-- <template #has_account="{scope}">
+          <el-tag>{{scope.row.has_account}}</el-tag>
+        </template> -->
+
         <template #order_type="{ scope }">
           <el-tag
             :size="tablebtnSize"

src/views/sellOut/sellAfterApply/detail.vue

@@ -166,12 +166,11 @@
               />
             </el-collapse-item>
 
-            <!-- -->
             <el-collapse-item name="4" title="供应商驳回,待采购审核"  v-if="isHasPermission({status:'2', process:'2'})">
               <approval-results :sitem="sitem" @changeStatus="handlePurchaseConfirm" />
             </el-collapse-item>
 
-            <el-collapse-item name="5" title="供应商审核"  v-if="isHasPermission({status:'9', process:'9'})">
+            <el-collapse-item name="5" title="供应商审核"  v-if="isHasPermission({status:'9', process:'9'}) && sitem.has_account === '1'">
               <supplier-exam :sitem="sitem" @changeStatus="handleSupplierExam" />
             </el-collapse-item>
 
@@ -179,7 +178,7 @@
               <wait-return :sitem="sitem" @changeStatus="handleExpress" />
             </el-collapse-item>
 
-            <el-collapse-item name="7" title="业务公司修改，待供应商确认"  v-if="isHasPermission({status:'10', process:'10'})">
+            <el-collapse-item name="7" title="业务公司修改，待供应商确认"  v-if="isHasPermission({status:'10', process:'10'}) && sitem.has_account === '1'">
               <supplier-confrim :sitem="sitem"  @changeStatus="handleSupplierConfirm"/>
             </el-collapse-item>
 

src/views/sellOut/sellReturn/detail.vue

@@ -38,7 +38,7 @@
                 </template>
 
                 <template slot="supplierName">
-                  <span>{{ sitem.supplier_name }}</span>
+                  <span>{{ sitem.supplierName }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
                       <li>
@@ -155,7 +155,7 @@
                 @searchChange="examForm"
               />
             </el-collapse-item>
-            <el-collapse-item title="待供应商审核" name="4" v-if="isHasPermission({status:'9', process:'9'})">
+            <el-collapse-item title="待供应商审核" name="4" v-if="isHasPermission({status:'9', process:'9'}) && sitem.has_account === '1'">
               <exam-form
                 v-if="newTime"
                 :statusList="statusList"
@@ -169,7 +169,7 @@
               <approval-results :sitem="sitem" @changeStatus="handlePurchaseExam" />
             </el-collapse-item>
             
-            <el-collapse-item title="业务公司修改，待供应商确认" name="6" v-if="isHasPermission({status:'10', process:'10'})">
+            <el-collapse-item title="业务公司修改，待供应商确认" name="6" v-if="isHasPermission({status:'10', process:'10'}) && sitem.has_account === '1'">
               <exam-form
                 v-if="newTime"
                 :statusList="statusList"

src/views/sellOut/stockApply/detail.vue

@@ -43,7 +43,8 @@
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
                       <li>
-                        <span>仓库编码:</span><span>{{ sitem.wsm_code }}</span>
+                        <p>仓库编码 : {{ sitem.wsm_code }}</p>
+                        <p>仓库负责人 : {{ sitem.wsm_contactor_name }}</p>
                       </li>
                     </ul>
                     <i slot="reference" class="el-icon-warning-outline fr" />

src/views/supplierPurchaseIn/supplierWsmInOrder/detail.vue

@@ -41,6 +41,9 @@
                       <li>
                         <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>

src/views/supplierSellOut/supplierSellReturn/detail.vue

@@ -38,7 +38,7 @@
                 </template>
 
                 <template slot="supplierName">
-                  <span>{{ sitem.supplier_name }}</span>
+                  <span>{{ sitem.supplierName }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
                       <li>