feat

src/components/globalComponents/search-stock/main.vue

@@ -142,7 +142,9 @@ export default {
             mobile: this.options[index].mobile,
             addr: this.options[index].wsm_addr,
             addr_code: this.options[index].addr_code,
-            addr_cn: this.options[index].addr_cn
+            addr_cn: this.options[index].addr_cn,
+            supplierNo: this.options[index].supplierNo,
+            supplierName: this.options[index].supplierName
           }
           this.$emit('searchChange', model)
         } else {

src/views/interest/account/index.vue

@@ -69,7 +69,7 @@
                     type="primary"
                     class="fr"
                     icon="el-icon-search"
-                    @click="searchList"
+                    @click="parmValue.page = 1;pageInfo.curr = 1;searchList()"
                 /></el-col>
                 <el-col :span="4" style="width: 66px">
                   <el-button

src/views/interest/accountQuery/index.vue

@@ -69,9 +69,7 @@
                     type="primary"
                     class="fr"
                     icon="el-icon-search"
-                    @click="pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList()"
+                    @click="searchList"
                 /></el-col>
                 <el-col :span="4" style="width: 66px">
                   <el-button
@@ -88,7 +86,7 @@
                     :size="searchSize"
                     type="primary"
                     style="float: right; margin-left: 5px"
-                    @click="searchList"
+                    @click="parmValue.page = 1;pageInfo.curr = 1;searchList()"
                   >
                     刷新
                   </el-button>

src/views/sellOut/hawbWorkbench/index.vue

@@ -116,9 +116,8 @@
         </el-collapse-item>
 
         <el-collapse-item
-          v-if="activeItem.send_status === '1'"
           v-loading="loadings.wsmList"
-          title="待分仓"
+          title=""
           name="3"
         >
           <div style="width:100%">
@@ -147,9 +146,9 @@
               </el-table-column>
             </el-table>
 
-            <div style="width:100;display: flex;justify-content: flex-end;padding-right: 30px;margin: 20px 0px;">
+            <!-- <div style="width:100;display: flex;justify-content: flex-end;padding-right: 30px;margin: 20px 0px;">
               <el-button type="primary" size="mini" :loading="loadings.wsmSplit" @click="onSplitWsm">保存</el-button>
-            </div>
+            </div> -->
           </div>
         </el-collapse-item>
       </el-collapse>

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

@@ -4,14 +4,14 @@
       <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-toolti />
-        <el-table-column label="提退时发货申请单状态" width="150px" show-overflow-tooltip />
-        <el-table-column prop="outChildCode" label="发货工单" width="160px" show-overflow-toolti />
-        <el-table-column label="发货仓库所在供应商名称" prop="supplierName" width="170px"show-overflow-tooltip />
+        <!-- <el-table-column label="提退时发货申请单状态" prop="order_out_status" width="150px" show-overflow-tooltip /> -->
+        <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 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 />
-        <el-table-column prop="num" label="发货数量" />
+        <el-table-column prop="num" label="发货数量" how-overflow-tooltip />
         <el-table-column width="110px" show-overflow-tooltip>
           <template slot="header">
             <span style="color:red;margin-right:2px">*</span>退货数量
@@ -33,8 +33,6 @@
             </el-form-item>
           </template>
         </el-table-column>
-        <el-table-column label="退货仓库所在供应商名称" width="160px" />
-        <el-table-column label="退货仓库所在供应商编码" width="160px" />
         <el-table-column width="160px">
           <template slot="header">
             <span style="color:red;margin-right:2px">*</span>退货仓库编码
@@ -54,7 +52,9 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="退货仓库负责人" width="110px" />
+        <el-table-column label="退货仓库所在供应商名称" prop="returnSupplierName" width="160px" how-overflow-tooltip />
+        <el-table-column label="退货仓库所在供应商编码" prop="returnSupplierNo" width="160px" how-overflow-tooltip />
+        <el-table-column label="退货仓库负责人" width="110px" prop="returnSupplierNameContactor" how-overflow-tooltip />
       </el-table>
     </el-form>
 
@@ -90,10 +90,13 @@ export default {
     })
   },
   methods: {
-    onStockChange({ code } = {}, index) {
+    onStockChange({ code, supplierName, supplierNo, contactor } = {}, index) {
       this.$set(this.list, index, {
         ...this.list[index],
-        return_wsm_code: code ? [code] : ''
+        return_wsm_code: code ? [code] : '',
+        returnSupplierName: supplierName,
+        returnSupplierNo: supplierNo,
+        returnSupplierNameContactor: contactor
       })
     },
     onNumberChange(return_num, index) {

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

@@ -1,24 +1,24 @@
 <template>
   <div class="work-order__wrapper">
     <el-table size="mini" border :data="list">
-      <el-table-column prop="orderCode" label="销售订单" width="160px" />
-      <el-table-column prop="outCode" label="发货申请单" width="160px" />
-      <el-table-column label="发货单状态" width="150px" />
-      <el-table-column prop="outChildCode" label="发货工单" width="160px" />
-      <el-table-column label="发货仓库所在供应商名称" prop="send_supplierName" width="170px" />
-      <el-table-column label="发货仓库所在供应商编码" prop="send_supplierNo" width="170px" />
-      <el-table-column prop="send_wsm_name" label="发货仓库名称" width="170px" />
-      <el-table-column prop="send_wsm_code" label="发货仓库编码" width="170px" />
-      <el-table-column prop="send_contactor_name" label="发货仓库负责人" width="110px" />
-      <el-table-column prop="return_num" label="发货物流" width="110px" />
-      <el-table-column label="发货物流单号" width="110px" />
-      <el-table-column prop="send_num" label="发货数量" />
-      <el-table-column label="退货仓库所在供应商名称" prop="return_supplierName" width="180px" />
-      <el-table-column label="退货仓库所在供应商编码" prop="return_supplierNo" width="190px" />
-      <el-table-column label="退货数量" prop="return_num" width="110px" />
-      <el-table-column label="退货销售仓库名称" prop="return_wsm_name" width="180px" />
-      <el-table-column label="退货销售仓库编码" prop="return_wsm_code" width="180px" />
-      <el-table-column label="退货销售仓库负责人" width="130px" prop="return_contactor_name" />
+      <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 label="发货单状态" prop="order_out_status" width="150px" 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="return_num" label="发货物流" width="110px" show-overflow-tooltip />
+      <el-table-column 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_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="退货销售仓库负责人" width="130px" prop="return_contactor_name" show-overflow-tooltip />
       <el-table-column width="130px">
         <template slot="header">
           <span style="color:red;margin-right:2px">*</span>销售仓入库数量

src/views/sellOut/sellAfterApply/detail.vue

@@ -324,7 +324,7 @@ export default {
     isHasPermission({ status, process }){
       return (
         status === String(this.sitem.status) 
-        && this.ppowers.includes(process) && !this.isSupertube
+        // && this.ppowers.includes(process) && !this.isSupertube
       )
     
     },

src/views/supplierSellOut/supplierSellAfterApply/components/set-work-order.vue

@@ -2,17 +2,17 @@
   <div class="work-order__wrapper">
     <el-form>
       <el-table size="mini" border :data="list">
-        <el-table-column prop="orderCode" label="销售订单" width="160px" />
-        <el-table-column prop="outCode" label="发货申请单" width="160px" />
-        <el-table-column label="提退时发货申请单状态" width="150px" />
-        <el-table-column prop="outChildCode" label="发货工单" width="160px" />
-        <el-table-column label="发货仓库所在供应商名称" prop="supplierName" width="170px" />
-        <el-table-column label="发货仓库所在供应商编码" prop="supplierNo" width="170px" />
-        <el-table-column prop="wsm_name" label="发货仓库名称" width="160px" />
-        <el-table-column prop="wsm_code" label="发货仓库编码" width="170px" />
-        <el-table-column prop="contactor_name" label="发货仓库负责人" width="110px" />
-        <el-table-column prop="num" label="发货数量" />
-        <el-table-column width="110px">
+        <el-table-column prop="orderCode" label="销售订单" width="160px" show-overflow-tooltip />
+        <el-table-column prop="outCode" label="发货申请单" width="160px" show-overflow-toolti />
+        <!-- <el-table-column label="提退时发货申请单状态" prop="order_out_status" width="150px" show-overflow-tooltip /> -->
+        <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 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 />
+        <el-table-column prop="num" label="发货数量" how-overflow-tooltip />
+        <el-table-column width="110px" show-overflow-tooltip>
           <template slot="header">
             <span style="color:red;margin-right:2px">*</span>退货数量
           </template>
@@ -33,8 +33,6 @@
             </el-form-item>
           </template>
         </el-table-column>
-        <el-table-column label="退货仓库所在供应商名称" width="160px" />
-        <el-table-column label="退货仓库所在供应商编码" width="160px" />
         <el-table-column width="160px">
           <template slot="header">
             <span style="color:red;margin-right:2px">*</span>退货仓库编码
@@ -54,7 +52,9 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="退货仓库负责人" width="110px" />
+        <el-table-column label="退货仓库所在供应商名称" prop="returnSupplierName" width="160px" how-overflow-tooltip />
+        <el-table-column label="退货仓库所在供应商编码" prop="returnSupplierNo" width="160px" how-overflow-tooltip />
+        <el-table-column label="退货仓库负责人" width="110px" prop="returnSupplierNameContactor" how-overflow-tooltip />
       </el-table>
     </el-form>
 
@@ -90,10 +90,13 @@ export default {
     })
   },
   methods: {
-    onStockChange({ code } = {}, index) {
+    onStockChange({ code, supplierName, supplierNo, contactor } = {}, index) {
       this.$set(this.list, index, {
         ...this.list[index],
-        return_wsm_code: code ? [code] : ''
+        return_wsm_code: code ? [code] : '',
+        returnSupplierName: supplierName,
+        returnSupplierNo: supplierNo,
+        returnSupplierNameContactor: contactor
       })
     },
     onNumberChange(return_num, index) {

src/views/supplierSellOut/supplierSellAfterApply/components/wait-stockman.vue

@@ -1,24 +1,24 @@
 <template>
   <div class="work-order__wrapper">
     <el-table size="mini" border :data="list">
-      <el-table-column prop="orderCode" label="销售订单" width="160px" />
-      <el-table-column prop="outCode" label="发货申请单" width="160px" />
-      <el-table-column label="发货单状态" width="150px" />
-      <el-table-column prop="outChildCode" label="发货工单" width="160px" />
-      <el-table-column label="发货仓库所在供应商名称" prop="send_supplierName" width="170px" />
-      <el-table-column label="发货仓库所在供应商编码" prop="send_supplierNo" width="170px" />
-      <el-table-column prop="send_wsm_name" label="发货仓库名称" width="170px" />
-      <el-table-column prop="send_wsm_code" label="发货仓库编码" width="170px" />
-      <el-table-column prop="send_contactor_name" label="发货仓库负责人" width="110px" />
-      <el-table-column prop="return_num" label="发货物流" width="110px" />
-      <el-table-column label="发货物流单号" width="110px" />
-      <el-table-column prop="send_num" label="发货数量" />
-      <el-table-column label="退货仓库所在供应商名称" prop="return_supplierName" width="180px" />
-      <el-table-column label="退货仓库所在供应商编码" prop="return_supplierNo" width="190px" />
-      <el-table-column label="退货数量" prop="return_num" width="110px" />
-      <el-table-column label="退货销售仓库名称" prop="return_wsm_name" width="180px" />
-      <el-table-column label="退货销售仓库编码" prop="return_wsm_code" width="180px" />
-      <el-table-column label="退货销售仓库负责人" width="130px" prop="return_contactor_name" />
+      <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 label="发货单状态" prop="order_out_status" width="150px" 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="return_num" label="发货物流" width="110px" show-overflow-tooltip />
+      <el-table-column 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_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="退货销售仓库负责人" width="130px" prop="return_contactor_name" show-overflow-tooltip />
       <el-table-column width="130px">
         <template slot="header">
           <span style="color:red;margin-right:2px">*</span>销售仓入库数量

src/views/supplierSellOut/supplierSellAfterApply/detail.vue

@@ -246,9 +246,9 @@ export default {
       ],
       // 未收到货状态
       status2Options: [
-      { id: "1", label: "待业务审核" },
+        { id: "1", label: "待业务审核" },
         { id: "2", label: "供应商驳回,待采购审核" },//  id: "2", label: "供应商驳回,待供应商负责人审核" },
-      //{ id: "2", label: "待设置仓库" },//节点废除
+        //{ id: "2", label: "待设置仓库" },//节点废除
         { id: "4", label: "待客户退货" },//已收到货才有
         { id: "5", label: "售后已完成" },
         { id: "6", label: "业务已驳回" },