build

src/apis/service/sellOut/sellAfterApply/index.js

@@ -25,6 +25,7 @@ export default {
   sendList: (data, params) => http(api + 'child_out_get_list ', data, 'post', params),
   reorderChildAdd: (data, params) => http(api + 'reorder_child_add ', data, 'post', params),
   deliveryOrderReturnChild: (data, params) => http(api + 'delivery_order_return_child ', data, 'post', params),
-  setOrderReturnChild: (data, params) => http(api + 'set_order_return_child ', data, 'post', params)
+  setOrderReturnChild: (data, params) => http(api + 'set_order_return_child ', data, 'post', params),
+  orderReturnChildList: (data, params) => http(api + 'order_return_child_list', data, 'post', params)
 }
 

src/views/interest/dataShare/addEdit.vue

@@ -327,7 +327,7 @@ export default {
       }
     },
     async initActionList() {
-      const res = await asyncRequest.actionList({})
+      const res = await asyncRequest.actionList({ level: '2' })
       if (res && res.code === 0) {
         const list = res.data
         const arr = list.filter((item) => item.child && item.child.length > 0)

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

@@ -158,7 +158,7 @@ export default {
           }
           this.loading = true;
           const model = JSON.parse(JSON.stringify(this.ruleForm));
-          let res = await asyncRequest.reorderChildReceive({id:this.sitem.id,...model});
+          let res = await asyncRequest.reorderChildReceive({id:this.sitem.id,...models});
           this.loading = false;
           
           if (res && res.code === 0) {

src/views/sellOut/returnGoodWorkOrder/columns.js

@@ -31,6 +31,11 @@ export default [
     width: '105px',
     _slot_: 'status'
   },
+  {
+    prop: 'return_num_total',
+    label: '最终收货数量',
+    width: '120px'
+  },
   {
     prop: 'return_num',
     label: '退货数量'

src/views/sellOut/returnGoodWorkOrder/index.vue

@@ -32,12 +32,12 @@
                 <el-input v-model="parmValue.returnCode"  placeholder="售后退货单号" size="mini" clearable @change="pageInfo.curr=1;parmValue.page=1;searchList()" />
               </el-col>
 
-              <!-- <el-col :span="4" style="margin-right:10px">
-                <el-select placeholder="退货工单状态" size="mini" clearable v-model="parmValue.status" @change="pageInfo.curr=1;parmValue.page=1;searchList()">
-                  <el-option label="待收货" value="1" />
-                  <el-option label="已收货" value="2" />
+              <el-col :span="4" style="margin-right:10px">
+                <el-select placeholder="仓库类型" size="mini" clearable v-model="parmValue.type" @change="pageInfo.curr=1;parmValue.page=1;searchList()">
+                  <el-option label="销售仓" value="1" />
+                  <el-option label="次品仓" value="2" />
                 </el-select>
-              </el-col> -->
+              </el-col>
 
 
               <el-col :span="4" style="width: 150px;margin-left:10px">
@@ -259,6 +259,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        type:'',
         order_type: "",
         returnCode:"",
         status: "",

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

@@ -2,31 +2,67 @@
   <div class="work-order__wrapper">
     <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 prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
-      <el-table-column label="发货仓库名称" prop="wsm_name" min-width="180px" show-overflow-tooltip>
+      <el-table-column prop="outCode" label="发货单" width="160px" show-overflow-tooltip />
+      <el-table-column prop="outChildCode" label="发货工单编号" width="160px" show-overflow-tooltip />
+      <el-table-column prop="send_supplierName" label="发货仓库名称" width="160px" show-overflow-tooltip>
         <template slot-scope="scope">
-          <el-popover placement="top" width="380" trigger="hover">
-            <h3>发货仓库</h3>
+          <el-popover placement="top" width="360" trigger="hover">
+            <i slot="reference" class="el-icon-warning-outline" />
             <ul>
-              <li>编码 : {{ scope.row.send_wsm_code }}</li>
-              <li>负责人 : {{ scope.row.send_contactor_name }}</li>
-              <li>所在供应商名称 : {{ scope.row.send_supplierName }}</li>
-              <li>所在供应商编码 : {{ scope.row.send_supplierNo }}</li>
+              <li><h3>发货仓库</h3></li>
+              <li>
+                <span>编号:</span><span>{{ scope.row.send_wsm_code }}</span>
+              </li>
+              <li>
+                <span>名称:</span><span>{{ scope.row.send_wsm_name }}</span>
+              </li>
+              <li>
+                <span>负责人:</span>
+                <span>{{ scope.row.return_contactor_name }}</span>
+              </li>
+              <li>
+                <span>供应商编码:</span><span>{{ scope.row.send_supplierName }}</span>
+              </li>
+              <li>
+                <span>供应商名称:</span><span>{{ scope.row.send_supplierNo }}</span>
+              </li>
             </ul>
-            <i slot="reference" class="el-icon-warning-outline" />
           </el-popover>
-          <span>{{ scope.row.send_wsm_name }}</span>
+          <span>{{ scope.row.send_supplierName }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="退货数量" prop="return_num" width="110px" show-overflow-tooltip />
-      <el-table-column label="退货仓库" align="center">
-        <el-table-column label="仓库名称" prop="return_wsm_name" show-overflow-tooltip min-width="160px" />
-        <!-- <el-table-column label="仓库编码" prop="return_wsm_code" show-overflow-tooltip min-width="160px" /> -->
-        <el-table-column label="所在供应商名称" prop="return_supplierName" width="160px" show-overflow-tooltip />
-        <el-table-column label="所在供应商编码" prop="return_supplierNo" width="160px" show-overflow-tooltip />
-        <el-table-column label="负责人" width="110px" prop="return_contactor_name" show-overflow-tooltip />
+      <el-table-column prop="send_supplierName" label="退货仓库名称" width="160px" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <el-popover placement="top" width="360" trigger="hover">
+            <i slot="reference" class="el-icon-warning-outline" />
+            <ul>
+              <li><h3>发货仓库</h3></li>
+              <li>
+                <span>编号:</span><span>{{ scope.row.return_wsm_code }}</span>
+              </li>
+              <li>
+                <span>名称:</span><span>{{ scope.row.return_wsm_name }}</span>
+              </li>
+              <li>
+                <span>负责人:</span>
+                <span>{{ scope.row.return_contactor_name }}</span>
+              </li>
+              <li>
+                <span>供应商编码:</span><span>{{ scope.row.returnsupplierName }}</span>
+              </li>
+              <li>
+                <span>供应商名称:</span><span>{{ scope.row.return_supplierNo }}</span>
+              </li>
+            </ul>
+          </el-popover>
+          <span>{{ scope.row.return_supplierName }}</span>
+        </template>
       </el-table-column>
+      <el-table-column prop="return_num" label="退货数量" width="120px" show-overflow-tooltip />
+      <el-table-column prop="can_sell_num" label="销售仓入库数量" width="160px" show-overflow-tooltip />
+      <el-table-column prop="defective_num" label="次品仓入库数量" width="160px" show-overflow-tooltip />
+      <el-table-column prop="loss_num" label="丢失数量" width="160px" show-overflow-tooltip />
+      <!-- <el-table-column prop="send_supplierName" label="发货仓库供应商编码" width="160px" show-overflow-tooltip /> -->
     </el-table>
   </div>
 </template>
@@ -64,11 +100,11 @@ export default {
           return
         }
 
-        const { data, code, message } = await asyncRequest.afterChild({ outCode: this.sitem.outCode })
+        const { data, code, message } = await asyncRequest.orderReturnChildList({ outCode: this.sitem.outCode, is_authority: '0', type: '1' })
         console.log(data)
         switch (code) {
           case 0:
-            this.list = data.list.map(item => ({ ...item, return_num: 0, return_wsm_code: '' }))
+            this.list = data.list.map(item => ({ ...item, return_wsm_code: '' }))
             break
           default:
             this.$message.warning(message)

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

@@ -23,7 +23,7 @@
         </el-table-column>
 
         <!-- <el-table-column prop="return_num" label="发货物流" width="110px" show-overflow-tooltip /> -->
-        <el-table-column prop="send_num" label="发货数量" width="110px" show-overflow-tooltip />
+        <!-- <el-table-column prop="send_num" label="发货数量" width="110px" show-overflow-tooltip /> -->
 
         <el-table-column label="退货销售仓库名称" prop="return_wsm_name" min-width="180px" show-overflow-tooltip>
           <template slot-scope="scope">

src/views/sellOut/sellAfterApply/detail.vue

@@ -163,9 +163,9 @@
               </show-data-table>
             </el-collapse-item>
 
-            <!-- <el-collapse-item title="发货工单" name="10" v-if="sitem && sitem.status === '12' || sitem.status === '4' || sitem.status === '5'">
+            <el-collapse-item title="售后退货工单" name="10" v-if="sitem.status === '5'">
                 <show-work-order :sitem="sitem"  />
-            </el-collapse-item> -->
+            </el-collapse-item>
 
             <el-collapse-item title="商品信息" name="2">
               <show-goods-data-table
@@ -208,7 +208,7 @@
               <set-work-order :sitem="sitem" @reload="() => initData()" />
             </el-collapse-item>
 
-            <el-collapse-item name="9" title="待库管收货" v-if="isHasPermission({status:'12', process:'12'})" >
+            <el-collapse-item name="9" title="待库管收货"  v-if="isHasPermission({status:'12', process:'12'})">
               <wait-stockman :sitem="sitem" @reload="() => initData()" />
             </el-collapse-item>
           </el-collapse>