feat

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

@@ -3,9 +3,9 @@ import http from '@/apis/axios'
 const api = 'admin/'
 export default {
   // 分页查询
-  // list: (data, params) => http(api + 'after_child_list', data, 'post', params),
   detail: (data, params) => http(api + 'reorder_child_info', data, 'post', params),
   express: (data, params) => http(api + 'child_send', data, 'post', params),
   list: (data, params) => http(api + 'reorder_child_list', data, 'post', params),
-  reorderChildReceive: (data, params) => http(api + 'reorder_child_receive', data, 'post', params)
+  reorderChildReceive: (data, params) => http(api + 'reorder_child_receive', data, 'post', params),
+  setAfterChildRecord: (data, params) => http(api + 'reorder_child_set_record', data, 'post', params)
 }

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

@@ -20,7 +20,7 @@ export default {
   aftersetwsm: (data, params) => http(api + 'aftersetwsm', data, 'post', params),
   // 售后快递录入
   afterPost: (data, params) => http(api + 'afterpost ', data, 'post', params),
-  afterChild: (data, params) => http(api + 'after_child_list ', data, 'post', params),
+  afterChild: (data, params) => http(api + 'order_return_child_list ', data, 'post', params),
   express: (data, params) => http(api + 'setdelivery ', data, 'post', params),
   sendList: (data, params) => http(api + 'child_list ', data, 'post', params),
   reorderChildAdd: (data, params) => http(api + 'reorder_child_add ', data, 'post', params),

src/views/purchaseIn/wsmInOrder/columns.js

@@ -1,13 +1,13 @@
 const columns = [
   {
-    prop: "wsm_in_code",
-    label: "入库单编号",
-    width: "155",
+    prop: 'wsm_in_code',
+    label: '入库单编号',
+    width: '155'
   },
   {
-    prop: "cgdNo",
-    label: "采购单编号",
-    width: "155px",
+    prop: 'cgdNo',
+    label: '采购单编号',
+    width: '155px'
   },
   {
     prop: 'has_account',
@@ -16,22 +16,22 @@ const columns = [
     width: '120px'
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "110px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '110px'
   },
   {
-    prop: "order_source",
-    label: "订单来源",
-    _slot_: "order_source",
-    width: "118px",
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    width: '118px'
   },
   {
-    prop: "order_type",
-    label: "商品类型",
-    _slot_: "order_type",
-    width: "118px",
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    width: '118px'
   },
 
   // {
@@ -51,26 +51,26 @@ const columns = [
   // },
 
   {
-    prop: "spuCode",
-    label: "商品成本编号",
-    width: "145px",
+    prop: 'spuCode',
+    label: '商品成本编号',
+    width: '145px'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    _slot_: "good_name",
-    "min-width": "145px",
+    prop: 'good_name',
+    label: '商品名称',
+    _slot_: 'good_name',
+    'min-width': '145px'
   },
   {
-    prop: "brand_name",
-    label: "品牌",
-    width: "95px",
+    prop: 'brand_name',
+    label: '品牌',
+    width: '95px'
   },
 
   {
-    prop: "send_num",
-    label: "发货数量",
-    width: "80px",
+    prop: 'send_num',
+    label: '发货数量',
+    width: '80px'
   },
   // {
   //   prop: "post_company",
@@ -83,9 +83,9 @@ const columns = [
   //   width: "140px",
   // },
   {
-    prop: "post_fee",
-    label: "物流费用",
-    width: "100px",
+    prop: 'post_fee',
+    label: '物流费用',
+    width: '100px'
   },
 
   // {
@@ -141,24 +141,24 @@ const columns = [
   //   width: "145px",
   // },
   {
-    prop: "companyNo",
-    label: "业务公司编码",
-    width: "155px",
+    prop: 'companyNo',
+    label: '业务公司编码',
+    width: '155px'
   },
   {
-    prop: "companyName",
-    label: "业务公司名称",
-    width: "155px",
+    prop: 'companyName',
+    label: '业务公司名称',
+    width: '155px'
   },
   {
-    prop: "supplierNo",
-    label: "供应商编码",
-    width: "155px",
+    prop: 'supplierNo',
+    label: '供应商编码',
+    width: '155px'
   },
   {
-    prop: "supplier_name",
-    label: "供应商名称",
-    width: "155px",
+    prop: 'supplier_name',
+    label: '供应商名称',
+    width: '155px'
   },
   // {
   //   prop: 'wsm_supplier',
@@ -171,9 +171,9 @@ const columns = [
   //   width: '172px'
   // },
   {
-    prop: "wsm_name",
-    label: "仓库名称",
-    width: "80px",
+    prop: 'wsm_name',
+    label: '仓库名称',
+    width: '80px'
   },
   // {
   //   prop: "company_name",
@@ -181,19 +181,19 @@ const columns = [
   //   minWidth: "150px",
   // },
   {
-    prop: "cgder",
-    label: "供应商负责人",
-    width: "95",
+    prop: 'cgder',
+    label: '供应商负责人',
+    width: '95'
   },
   {
-    prop: "good_creater",
-    label: "商品创建人",
-    width: "85px",
+    prop: 'good_creater',
+    label: '商品创建人',
+    width: '85px'
   },
   {
-    prop: "sendtime",
-    label: "发货时间",
-    width: "145px",
+    prop: 'sendtime',
+    label: '发货时间',
+    width: '145px'
   },
   // {
   //   prop: "addtime",
@@ -201,13 +201,13 @@ const columns = [
   //   width: "145px",
   // },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    width: "50px",
-    _slot_: "operation",
-  },
-];
+    width: '50px',
+    _slot_: 'operation'
+  }
+]
 
-export { columns };
+export { columns }

src/views/purchaseIn/wsmInOrder/index.vue

@@ -294,13 +294,11 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import companyHelper from "@/mixins/companyHelper";
-
 import asyncRequest from "@/apis/service/purchaseIn/wsmInOrder";
 import { cg_order_type_options, cg_order_source_options, has_account_list } from "@/assets/js/statusList";
-import columns from "./columns"; //表格列参数
+import {columns} from "./columns"; //表格列参数
 import { mapGetters } from "vuex";
 
-
 export default {
   name: "purchaseOrder",
   mixins: [mixinPage, resToken, companyHelper],

src/views/sellOut/beforeReturnGoodWorkOrder/components/ShowDataTableColumns.js

@@ -13,17 +13,68 @@ const showColumns = [
     prop: 'status',
     label: '状态',
     _slot_: 'status',
-    span: 5
+    span: 6
   },
   {
     prop: 'apply_name',
     label: '创建人',
-    span: 5
+    span: 4
+  },
+  {
+    prop: 'send_wsm_code',
+    label: '发货仓库编码',
+    span: 6
+  },
+  {
+    prop: 'return_wsm_code',
+    label: '退货仓库编码',
+    span: 6
+  },
+  // {
+  //   prop: 'sale_price',
+  //   label: '销售价格',
+  //   span: 4
+  // },
+  // {
+  //   prop: 'total_price',
+  //   label: '总价',
+  //   span: 4
+  // },
+  // {
+  //   prop: 'num',
+  //   label: '下单数量',
+  //   span: 4
+  // },
+  {
+    prop: 'send_num',
+    label: '发货数量',
+    span: 4
+  },
+  {
+    prop: 'return_num',
+    label: '退货数量',
+    span: 4
+  },
+  {
+    prop: 'loss_num',
+    label: '丢失数量',
+    span: 4
   },
   {
     prop: 'addtime',
     label: '创建时间',
     span: 24
+  },
+  {
+    prop: 'remark',
+    label: '备注',
+    span: 24
+  },
+  {
+    prop: 'record',
+    label: '标记',
+    span: 24,
+    _slot_: 'record'
   }
 ]
 

src/views/sellOut/beforeReturnGoodWorkOrder/components/work-order-mark.vue

@@ -7,7 +7,7 @@
 
 <script>
 import { VueEditor } from 'vue2-editor'
-import asyncRequest from '@/apis/service/sellOut/returnGoodWorkOrder'
+import asyncRequest from '@/apis/service/sellOut/beforeReturnGoodWorkOrder'
 
 export default {
   components: { VueEditor },
@@ -24,6 +24,7 @@ export default {
 
       switch (code) {
         case 0:
+          this.content = ''
           this.$emit('reload')
           break
         default:

src/views/sellOut/beforeReturnGoodWorkOrder/detail.vue

@@ -34,6 +34,10 @@
                   ></el-tag>
                 </template>
 
+                <template slot="record">
+                  <div v-html="sitem.record" />
+                </template>
+
                 <template slot="supplierName">
                   <span>{{ sitem.supplierName }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
@@ -73,8 +77,7 @@
               </show-data-table>
             </el-collapse-item>
 
-            <!-- v-if="sitem && String(sitem.status) === '12'" -->
-            <el-collapse-item title="待库管收货" name="1">
+            <el-collapse-item title="待库管收货" name="1" v-if="sitem && String(sitem.status) === '12' && !isSupertube">
               <wait-stockman :sitem="sitem" @reload="initData" />
             </el-collapse-item>
 

src/views/sellOut/deliveryWorkOrder/index.vue

@@ -332,6 +332,7 @@ export default {
         { value: "2", label: "发货完成" },
         { value: "3", label: "已收货" },
         { value: '4', label: '已全部收货' },
+        { value: '5', label: '已取消' }
       ],
       loading: false,
       showModel: false,

src/views/sellOut/returnGoodWorkOrder/components/ShowDataTableColumns.js

@@ -14,17 +14,68 @@ const showColumns = [
     prop: 'status',
     label: '状态',
     _slot_: 'status',
-    span: 5
+    span: 6
   },
   {
     prop: 'apply_name',
     label: '创建人',
-    span: 5
+    span: 4
+  },
+  {
+    prop: 'send_wsm_code',
+    label: '发货仓库编码',
+    span: 6
+  },
+  {
+    prop: 'return_wsm_code',
+    label: '退货仓库编码',
+    span: 6
+  },
+  // {
+  //   prop: 'sale_price',
+  //   label: '销售价格',
+  //   span: 4
+  // },
+  // {
+  //   prop: 'total_price',
+  //   label: '总价',
+  //   span: 4
+  // },
+  // {
+  //   prop: 'num',
+  //   label: '下单数量',
+  //   span: 4
+  // },
+  {
+    prop: 'send_num',
+    label: '发货数量',
+    span: 4
+  },
+  {
+    prop: 'return_num',
+    label: '退货数量',
+    span: 4
+  },
+  {
+    prop: 'loss_num',
+    label: '丢失数量',
+    span: 4
   },
   {
     prop: 'addtime',
     label: '创建时间',
     span: 24
+  },
+  {
+    prop: 'remark',
+    label: '备注',
+    span: 24
+  },
+  {
+    prop: 'record',
+    label: '标记',
+    span: 24,
+    _slot_: 'record'
   }
 ]
 

src/views/sellOut/returnGoodWorkOrder/components/work-order-mark.vue

@@ -8,7 +8,6 @@
 <script>
 import { VueEditor } from 'vue2-editor'
 import asyncRequest from '@/apis/service/sellOut/returnGoodWorkOrder'
-
 export default {
   components: { VueEditor },
   props: ['sitem'],
@@ -24,6 +23,7 @@ export default {
 
       switch (code) {
         case 0:
+          this.content = ''
           this.$emit('reload')
           break
         default:

src/views/sellOut/returnGoodWorkOrder/detail.vue

@@ -34,6 +34,10 @@
                   ></el-tag>
                 </template>
 
+                <template slot="record">
+                  <div v-html="sitem.record"></div>
+                </template>
+
                 <template slot="supplierName">
                   <span>{{ sitem.supplierName }}</span>
                   <el-popover placement="top" width="300" trigger="hover">

src/views/sellOut/sellAfterApply/index.vue

@@ -128,7 +128,7 @@
                 </el-input>
               </el-col>
               <!-- <el-col :span="4" >
-                  <el-select style="width:100%;margin-left:10px" placeholder="供应商端" clearable size="mini"  v-model="parmValue.has_account"  
+                  <el-select style="width:100%;margin-left:10px" placeholder="供应商端开启状态" clearable size="mini"  v-model="parmValue.has_account"  
                     @change="
                         pageInfo.curr = 1;
                         parmValue.page = 1;

src/views/sellOut/sellOutOrder/index.vue

@@ -372,6 +372,7 @@ export default {
         { id: "2", label: "已发货待收货" },
         { id: "3", label: "已收货" },
         { id: "4", label: "已全部退货" },
+        { id: "5", label: "已取消" }
       ],
       loading: true,
       showModel: false,

src/views/sellOut/sellReturn/components/ShowDataTableColumns.js

@@ -16,12 +16,12 @@ const showColumns = [
     label: '订单来源',
     _slot_: 'order_type',
     span: 6
-  }, {
+  },
+  {
     prop: 'apply_name',
     label: '创建人',
     span: 6
   },
-
   {
     prop: 'supplierName',
     label: '销售方公司',

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

@@ -117,7 +117,6 @@ export default {
     },
     isSalesWarehouselist() {
       const { isHasAddr, isHasWorkOrder, isStock } = this.state
-      if (!isHasWorkOrder) return false
       // 有发货工单 && 库存品
       if (isHasAddr && isHasWorkOrder & isStock) return true
       // 有地址 && 不是库存品

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/components/ShowDataTableColumns.js

@@ -13,17 +13,68 @@ const showColumns = [
     prop: 'status',
     label: '状态',
     _slot_: 'status',
-    span: 5
+    span: 6
   },
   {
     prop: 'apply_name',
     label: '创建人',
-    span: 5
+    span: 4
+  },
+  {
+    prop: 'send_wsm_code',
+    label: '发货仓库编码',
+    span: 6
+  },
+  {
+    prop: 'return_wsm_code',
+    label: '退货仓库编码',
+    span: 6
+  },
+  // {
+  //   prop: 'sale_price',
+  //   label: '销售价格',
+  //   span: 4
+  // },
+  // {
+  //   prop: 'total_price',
+  //   label: '总价',
+  //   span: 4
+  // },
+  // {
+  //   prop: 'num',
+  //   label: '下单数量',
+  //   span: 4
+  // },
+  {
+    prop: 'send_num',
+    label: '发货数量',
+    span: 4
+  },
+  {
+    prop: 'return_num',
+    label: '退货数量',
+    span: 4
+  },
+  {
+    prop: 'loss_num',
+    label: '丢失数量',
+    span: 4
   },
   {
     prop: 'addtime',
     label: '创建时间',
     span: 24
+  },
+  {
+    prop: 'remark',
+    label: '备注',
+    span: 24
+  },
+  {
+    prop: 'record',
+    label: '标记',
+    span: 24,
+    _slot_: 'record'
   }
 ]
 

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/components/work-order-mark.vue

@@ -7,7 +7,7 @@
 
 <script>
 import { VueEditor } from 'vue2-editor'
-import asyncRequest from '@/apis/service/sellOut/returnGoodWorkOrder'
+import asyncRequest from '@/apis/service/sellOut/beforeReturnGoodWorkOrder'
 
 export default {
   components: { VueEditor },

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/detail.vue

@@ -34,6 +34,10 @@
                   ></el-tag>
                 </template>
 
+                <template slot="record">
+                  <div v-html="sitem.record" />
+                </template>
+
                 <template slot="supplierName">
                   <span>{{ sitem.supplierName }}</span>
                   <el-popover placement="top" width="300" trigger="hover">

src/views/supplierSellOut/supplierDeliveryWorkOrder/index.vue

@@ -301,6 +301,7 @@ export default {
         { value: "3", label: "已收货" },
         { value: '3', label: '供应商驳回,待供应商负责人审核'},
         { value: '4', label: '已全部退货'},
+        { value: '5', label: '已取消'}
       ],
       loading: false,
       showModel: false,

src/views/supplierSellOut/supplierReturnWorkOrder/components/ShowDataTableColumns.js

@@ -14,17 +14,68 @@ const showColumns = [
     prop: 'status',
     label: '状态',
     _slot_: 'status',
-    span: 5
+    span: 6
   },
   {
     prop: 'apply_name',
     label: '创建人',
-    span: 5
+    span: 4
+  },
+  {
+    prop: 'send_wsm_code',
+    label: '发货仓库编码',
+    span: 6
+  },
+  {
+    prop: 'return_wsm_code',
+    label: '退货仓库编码',
+    span: 6
+  },
+  // {
+  //   prop: 'sale_price',
+  //   label: '销售价格',
+  //   span: 4
+  // },
+  // {
+  //   prop: 'total_price',
+  //   label: '总价',
+  //   span: 4
+  // },
+  // {
+  //   prop: 'num',
+  //   label: '下单数量',
+  //   span: 4
+  // },
+  {
+    prop: 'send_num',
+    label: '发货数量',
+    span: 4
+  },
+  {
+    prop: 'return_num',
+    label: '退货数量',
+    span: 4
+  },
+  {
+    prop: 'loss_num',
+    label: '丢失数量',
+    span: 4
   },
   {
     prop: 'addtime',
     label: '创建时间',
     span: 24
+  },
+  {
+    prop: 'remark',
+    label: '备注',
+    span: 24
+  },
+  {
+    prop: 'record',
+    label: '标记',
+    span: 24,
+    _slot_: 'record'
   }
 ]
 

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

@@ -117,7 +117,6 @@ export default {
     },
     isSalesWarehouselist() {
       const { isHasAddr, isHasWorkOrder, isStock } = this.state
-      if (!isHasWorkOrder) return false
       // 有发货工单 && 库存品
       if (isHasAddr && isHasWorkOrder & isStock) return true
       // 有地址 && 不是库存品
@@ -191,12 +190,12 @@ export default {
 
         const salesWarehouseParams = { list, type: '1', returnCode: this.sitem.returnCode }
         const parms = {
-          list: {
+          list: [{
             return_wsm_code: Array.isArray(this.formData.return_wsm_code)
               ? this.formData.return_wsm_code[0]
               : this.formData.return_wsm_code,
             return_num: this.sitem.num
-          },
+          }],
           returnCode: this.sitem.returnCode,
           type: '1'
         }

src/views/supplierSellOut/supplierSellReturn/detail.vue

@@ -33,6 +33,10 @@
                   ></el-tag>
                 </template>
 
+                <template slot="record">
+                  <div v-html="sitem.record" />
+                </template>
+
                 <template slot="supplierName">
                   <span>{{ sitem.supplier_name }}</span>
                   <el-popover placement="top" width="300" trigger="hover">