snow 2 years ago
parent
commit
93e39bba7a

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


+ 4 - 4
src/views/sellOut/returnGoodWorkOrder/detail.vue

@@ -81,8 +81,8 @@
                         ><span>{{ sitem.return_wsm_name}}</span>
                       </li>
                       <li>
-                        <span>负责人:</span
-                        ><span>xx</span>
+                        <span>负责人:</span>
+                        <span>{{ sitem.return_contactor_name }}</span>
                       </li>
                       <li>
                         <span>供应商编码:</span
@@ -111,8 +111,8 @@
                         ><span>{{ sitem.send_wsm_name }}</span>
                       </li>
                       <li>
-                        <span>负责人:</span
-                        ><span>xx</span>
+                        <span>负责人:</span>
+                        <span>{{ sitem.return_contactor_name }}</span>
                       </li>
                       <li>
                         <span>供应商编码:</span

+ 4 - 2
src/views/sellOut/salesOrder/components/child-list.vue

@@ -51,18 +51,20 @@
         width="80"
       />
 
+      <el-table-column show-overflow-tooltip prop="post_code" label="物流单号" min-width="160" />
+      <el-table-column show-overflow-tooltip prop="post_name" label="物流公司" min-width="160" />
       <el-table-column show-overflow-tooltip prop="wsm_name" label="仓库名称" min-width="160" />
       <el-table-column show-overflow-tooltip prop="wsm_code" label="仓库编号" min-width="160" />
       <el-table-column show-overflow-tooltip prop="addtime" label="下单时间" width="140" />
       <el-table-column show-overflow-tooltip prop="apply_name" label="申请人" width="110" />
 
-      <el-table-column label="操作" v-if="dpowers.includes('007')">
+      <el-table-column label="操作">
         <template slot-scope="scope">
           <el-tooltip
             effect="dark"
             content="查看"
             placement="top"
-            v-if="powers.some((i) => i == '007')"
+            v-if="dpowers.some((i) => i == '007')"
           >
             <i
               class="el-icon-view tb-icon"

+ 1 - 1
src/views/sellOut/sellOutOrder/components/child-list.vue

@@ -114,7 +114,7 @@ export default {
    powers() {
       const tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "salesOrderDetail"
+          (item) => item.menu_route == "deliveryWorkOrderDetail"
         ) || {};
       const { action } = tran ?? {};
       return action ?? [];

+ 2 - 2
src/views/supplierSellOut/supplierSellOutOrder/components/child-list.vue

@@ -69,7 +69,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="routeGoto('deliveryWorkOrderDetail', { id: scope.row.outChildCode })"
+              @click="routeGoto('supplierDeliveryWorkOrderDetail', { id: scope.row.outChildCode })"
             ></i>
           </el-tooltip>
         </template>
@@ -114,7 +114,7 @@ export default {
    powers() {
       const tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "salesOrderDetail"
+          (item) => item.menu_route == "supplierDeliveryWorkOrder"
         ) || {};
       const { action } = tran ?? {};
       return action ?? [];

Some files were not shown because too many files changed in this diff