build

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

@@ -5,6 +5,7 @@ export default {
   // 分页查询
   // list: (data, params) => http(api + 'after_child_list', data, 'post', params),
   detail: (data, params) => http(api + 'order_return_child_info', data, 'post', params),
+  saleinfo: (data, params) => http(api + 'saleinfo', data, 'post', params),
   express: (data, params) => http(api + 'child_send', data, 'post', params),
   list: (data, params) => http(api + 'order_return_child_list', data, 'post', params),
   setAfterChildRecord: (data, params) => http(api + 'set_order_return_child_record', data, 'post', params),

src/views/sellOut/beforeReturnGoodWorkOrder/columns.js

@@ -7,7 +7,7 @@ export default [
   },
   {
     prop: 'returnCode',
-    label: '售前退货单号',
+    label: '售前退货单编号',
     width: '160'
   },
   {
@@ -65,7 +65,7 @@ export default [
   },
   {
     prop: 'supplierName',
-    label: '业务公司名称',
+    label: '供应商名称',
     width: '150px'
   },
   {

src/views/sellOut/beforeReturnGoodWorkOrder/detail.vue

@@ -99,6 +99,10 @@
               </show-data-table>
             </el-collapse-item>
 
+            <el-collapse-item title="商品信息" name="2">
+              <show-goods-data-table :type="order_type" :spucode="spuCode" iscgd :newTime="newTime"  />
+            </el-collapse-item>
+
             <el-collapse-item title="待库管收货" name="1" v-if="sitem && ppowers.includes('1') && String(sitem.status) === '1' && !isSupertube">
               <wait-stockman :sitem="sitem" @reload="initData" />
             </el-collapse-item>
@@ -162,6 +166,8 @@ export default {
       ],
       xs_order_type_options,
       sitem: null, //传给组件
+      order_type: "",
+      spuCode: "",
       activeNames: ["0", "1", "2", "3", "4", "5", "6"],
       status: "", //存储详情接口状态
       statusList: [
@@ -184,8 +190,10 @@ export default {
         id: this.queryId,
       });
       if (code === 0) {
-        const { is_stock, status } = data;
+        const { is_stock, status,order_type, spuCode } = data;
         this.is_stock = is_stock;
+        this.order_type = order_type
+        this.spuCode = spuCode
         this.status = status;
         this.sitem = data;
         this.getNewTime();

src/views/sellOut/beforeReturnGoodWorkOrder/index.vue

@@ -453,8 +453,7 @@ export default {
         [this.select]: this.s_input,
         customer_code: Array.isArray(this.parmValue.customer_code) ? this.parmValue.customer_code[0] : this.parmValue.customer_code,
         supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
-        companyNo: this.currentCompany,
-        noRelation: true
+        needRela: true
       });
 
       if (res && res.code === 0 && res.data) {

src/views/sellOut/deliveryWorkOrder/index.vue

@@ -618,8 +618,7 @@ export default {
           ? this.parmValue.customer_code[0]
           : this.parmValue.customer_code,
         supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
-        companyNo: this.currentCompany,
-        noRelation: true,
+        needRela: true,
       });
 
       if (res && res.code === 0 && res.data) {

src/views/sellOut/returnGoodWorkOrder/columns.js

@@ -1,5 +1,10 @@
 export default [
   { type: 'selection', fixed: 'left', _noset_: true },
+  {
+    prop: 'id',
+    label: '售后退货工单ID',
+    width: '105px'
+  },
   {
     prop: 'returnCode',
     label: '售后退货单号',

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

@@ -2,7 +2,7 @@
 const showColumns = [
   {
     prop: 'returnCode',
-    label: '退货工单号',
+    label: '售后退货单号',
     span: 7
   },
   {

src/views/sellOut/returnGoodWorkOrder/detail.vue

@@ -141,6 +141,10 @@
                 </template>
               </show-data-table>
             </el-collapse-item>
+
+            <el-collapse-item title="商品信息" name="2">
+              <show-goods-data-table :type="order_type" :spucode="spuCode" iscgd :newTime="newTime"  />
+           </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
       </el-tabs>
@@ -183,6 +187,9 @@ export default {
         { value: "1", label: "待收货" },
         { value: "2", label: "已收货" }
       ],
+      newTime: "",
+      spuCode:"",
+      order_type:"",
       xs_order_type_options,
       sitem: null, //传给组件
       activeNames: ["0", "1", "2", "3", "4", "5", "6"],
@@ -191,7 +198,6 @@ export default {
         { value: "1", label: "待收货" },
         { value: "2", label: "已收货" }
       ],
-      newTime: "",
       loading: false,
       is_stock: "",
       queryId: "",
@@ -208,7 +214,9 @@ export default {
       });
 
       if (code === 0) {
-        const { is_stock, status } = data;
+        const { is_stock, status ,spuCode,order_type } = data;
+        this.spuCode = spuCode
+        this.order_type = order_type
         this.is_stock = is_stock;
         this.status = status;
         this.sitem = data;

src/views/sellOut/returnGoodWorkOrder/index.vue

@@ -345,7 +345,6 @@ export default {
             ...model,
             [this.select]: this.s_input,
             customer_code: Array.isArray(this.parmValue.customer_code) ? this.parmValue.customer_code[0] : this.parmValue.customer_code,
-            supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
             needRela: true
           },
           headers: {
@@ -484,9 +483,7 @@ export default {
         ...model,
         [this.select]: this.s_input,
         customer_code: Array.isArray(this.parmValue.customer_code) ? this.parmValue.customer_code[0] : this.parmValue.customer_code,
-        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
-        companyNo: this.currentCompany,
-        noRelation: true
+        needRela: true
       });
 
       if (res && res.code === 0 && res.data) {

src/views/sellOut/sellOutOrder/index.vue

@@ -364,15 +364,8 @@ export default {
           label:'发货时间'
         }
       },
-
-      // post_ownOptions: [
-      //   { id: "1", label: "客户承担" },
-      //   { id: "2", label: "公司承担" },
-      //   { id: "3", label: "供应商承担" },
-      // ],
       sitem: null,
       // 状态
-
       statusOptions: [
         { id: "0", label: "待采购备货" },
         { id: "1", label: "待库管发货" },
@@ -467,18 +460,12 @@ export default {
     },
     handleShare(outCode) {
       const url = shareWebUrl + outCode;
-
       const input = document.createElement("input");
-
       document.body.appendChild(input);
       input.value = url;
-
       input.select();
-
       document.execCommand("Copy");
-
       this.$message.success("复制成功");
-
       document.body.removeChild(input);
     },
     getRouter(toRouter, queryId) {

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/columns.js

@@ -7,7 +7,7 @@ export default [
   },
   {
     prop: 'returnCode',
-    label: '售前退货单号',
+    label: '售前退货单编号',
     width: '160'
   },
   {
@@ -65,7 +65,7 @@ export default [
   },
   {
     prop: 'supplierName',
-    label: '业务公司名称',
+    label: '供应商名称',
     width: '150px'
   },
   {

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/detail.vue

@@ -99,6 +99,10 @@
               </show-data-table>
             </el-collapse-item>
 
+            <el-collapse-item title="商品信息" name="2">
+              <show-goods-data-table :type="order_type" :spucode="spuCode" iscgd :newTime="newTime"  />
+            </el-collapse-item>
+
             <el-collapse-item title="待库管收货" name="1" v-if="sitem && ppowers.includes('1') && String(sitem.status) === '1' && !isSupertube">
               <wait-stockman :sitem="sitem" @reload="initData" />
             </el-collapse-item>
@@ -162,6 +166,8 @@ export default {
         { value: "1", label: "待收货" },
         { value: "2", label: "已收货" },
       ],
+      order_type: "",
+      spuCode: "",
       xs_order_type_options,
       sitem: null, //传给组件
       activeNames: ["0", "1", "2", "3", "4", "5", "6"],
@@ -187,8 +193,10 @@ export default {
         id: this.queryId,
       });
       if (code === 0) {
-        const { is_stock, status } = data;
+        const { is_stock, status,order_type, spuCode } = data;
         this.is_stock = is_stock;
+        this.order_type = order_type
+        this.spuCode = spuCode
         this.status = status;
         this.sitem = data;
         this.getNewTime();

src/views/supplierSellOut/supplierReturnWorkOrder/columns.js

@@ -1,5 +1,10 @@
 export default [
   { type: 'selection', fixed: 'left', _noset_: true },
+  {
+    prop: 'id',
+    label: '售后退货工单ID',
+    width: '105px'
+  },
   {
     prop: 'returnCode',
     label: '售后退货单号',

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

@@ -2,7 +2,7 @@
 const showColumns = [
   {
     prop: 'returnCode',
-    label: '退货工单号',
+    label: '售后退货单号',
     span: 7
   },
   {

src/views/supplierSellOut/supplierReturnWorkOrder/detail.vue

@@ -141,6 +141,10 @@
                 </template>
               </show-data-table>
             </el-collapse-item>
+
+            <el-collapse-item title="商品信息" name="2">
+              <show-goods-data-table :type="order_type" :spucode="spuCode" iscgd :newTime="newTime"  />
+           </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
       </el-tabs>
@@ -180,6 +184,8 @@ export default {
     return {
       activeTabs: "1",
       visible: false,
+      spuCode:"",
+      order_type:"",
       showColumns: showColumns,
       statusOptions: [
         { value: "1", label: "待收货" },
@@ -209,7 +215,9 @@ export default {
         id: this.queryId,
       });
       if (code === 0) {
-        const { is_stock, status } = data;
+        const { is_stock, status ,spuCode,order_type } = data;
+        this.spuCode = spuCode
+        this.order_type = order_type
         this.is_stock = is_stock;
         this.status = status;
         this.sitem = data;