build

src/apis/service/supplierSellOut/supplierSellReturn/index.js

@@ -7,7 +7,7 @@ export default {
   // 删除
   delete: (data, params) => http(api + 'reorderdel', data, 'post', params),
   // 分页查询
-  list: (data, params) => http(api + 'supplieReorderList', data, 'post', params),
+  list: (data, params) => http(api + 'supplierReorderList', data, 'post', params),
   // 详情
   detail: (data, params) => http(api + 'reorderinfo', data, 'post', params),
   // 更新

src/views/businessReportQuery/businessSaleReport/components/table6.vue

@@ -171,7 +171,11 @@ export default {
       // return;
       this.loading = true
 
-      const res = await asyncRequest.saleexportorderreturn(this.parmValue)
+      const res = await asyncRequest.saleexportorderreturn({
+        ...this.parmValue,
+        companySearchProp: this.currentCompany
+      })
+
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list
         this.pageInfo.total = Number(res.data.count)
@@ -253,7 +257,10 @@ export default {
           method: 'post',
           url: this.fileUrl + 'admin/saleexportorderreturnexport',
           responseType: 'blob',
-          data: model,
+          data: {
+            ...model,
+            companyExportProp: this.currentCompany
+          },
           headers: {
             // 'Content-Type': 'multipart/form-data',
             // Accept: "application/vnd.ms-excel"

src/views/businessReportQuery/businessSaleReport/index.vue

@@ -166,7 +166,6 @@ export default {
     table23,
     table24
   },
-
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {

src/views/supplierPurchaseIn/supplierPurchaseOrder/components/order-out-table.vue

@@ -199,7 +199,12 @@ export default {
     async searchList() {
       this.parmValue.orderCode = this.orderCode;
       if (this.orderCode === "") return;
-      const { code, data, message } = await asyncRequest.supplierOrderOut(this.parmValue);
+      
+      const { code, data, message } = await asyncRequest.supplierOrderOut({
+        ...this.parmValue,
+        noRelation: true
+      });
+
       if (code === 0) {
         const { list, count } = data;
         this.tableData = list;

src/views/supplierSellOut/supplierReturnOrder/columns.js

@@ -1,8 +1,8 @@
 export default [
   {
-    prop: "thNo",
-    label: "售后退货单编号",
-    width: "160"
+    prop: 'thNo',
+    label: '售后退货单编号',
+    width: '160'
   },
   // {
   //   prop: "returnCode",
@@ -15,30 +15,37 @@ export default [
   //   label: "发货申请单编号",
   //   width: "160"
   // },
- 
+
   {
-    prop: "orderCode",
-    label: "销售订单编号",
-    width: "160"
+    prop: 'orderCode',
+    label: '销售订单编号',
+    width: '160'
   },
   {
-    prop: "good_code",
-    label: "商品属性编号",
-    width: "150"
+    prop: 'good_code',
+    label: '商品属性编号',
+    width: '150'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    width: "150"
+    prop: 'good_name',
+    label: '商品名称',
+    width: '150'
   },
 
- 
- 
   {
-    prop: "customer_code",
-    label: "客户编号",
-    width: "140"
-
+    prop: 'customer_code',
+    label: '客户编号',
+    width: '140'
+  },
+  {
+    prop: 'supplierNo',
+    label: '供应商编号',
+    width: '150'
+  },
+  {
+    prop: 'supplierName',
+    label: '供应商名称',
+    width: '150'
   },
   // {
   //   prop: "customer_name",
@@ -46,14 +53,14 @@ export default [
   //   width: "140"
 
   // },
-  
+
   {
-    prop: "return_num",
-    label: "退货数量",
+    prop: 'return_num',
+    label: '退货数量'
   },
   {
-    prop: "normal_num",
-    label: "正常数量",
+    prop: 'normal_num',
+    label: '正常数量'
   },
   // {
   //   prop: "received_num",
@@ -73,40 +80,39 @@ export default [
   // },
   // {地址code}
   {
-    prop: "post_fee",
-    label: "邮费",
+    prop: 'post_fee',
+    label: '邮费'
   },
 
   {
-    prop: "post_company",
-    label: "物流公司",
+    prop: 'post_company',
+    label: '物流公司'
   },
   {
-    prop: "post_code",
-    label: "快递单号",
-    width: "120"
+    prop: 'post_code',
+    label: '快递单号',
+    width: '120'
   },
- 
- 
+
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "120px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '120px'
   },
   {
-    prop: "addtime",
-    label: "申请时间",
+    prop: 'addtime',
+    label: '申请时间',
     sortable: true,
     width: 150
   },
   {
-    prop: "",
+    prop: '',
     width: 50,
-    label: "操作",
-    fixed: "right",
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    _slot_: "operation",
-  },
+    _slot_: 'operation'
+  }
 
 ]

src/views/supplierSellOut/supplierSellAfterApply/columns.js

@@ -83,13 +83,17 @@ const columns = [
   //   label:"费用承担方",
   //   width:"100",
   //   _slot_: "post_own",
-
-  // },
-  // {
-  //   prop:"customer_code",
-  //   label:"客户编码",
-  //   width:"150"
   // },
+  {
+    prop: 'supplierNo',
+    label: '供应商编号',
+    width: '160'
+  },
+  {
+    prop: 'supplierName',
+    label: '供应商名称',
+    width: '160'
+  },
   {
     prop: 'customer_name',
     label: '客户名称',

src/views/supplierSellOut/supplierSellOutOrder/index.vue

@@ -580,10 +580,11 @@ export default {
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
       model.supplierNo = this.currentCompany
-      model.noRelation = true
+      // model.noRelation = true
 
 
       const res = await asyncRequest.list(model);
+
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);

src/views/supplierSellOut/supplierSellReturn/columns.js

@@ -45,6 +45,16 @@ export default [
     label: '订单总数',
     width: '110'
   },
+  {
+    prop: 'supplierNo',
+    label: '供应商编号',
+    width: '150'
+  },
+  {
+    prop: 'supplierName',
+    label: '供应商名称',
+    width: '150'
+  },
   // {
   //   prop: "error_msg",
   //   label: "退货原因",