build

src/apis/service/businessReportQuery/purchaseReport/index.js

@@ -0,0 +1,65 @@
+// 采购部门报表
+import http from '@/apis/axios'
+const api = 'admin/'
+export default {
+  // 添加
+  add: (data, params) => http(api + 'add', data, 'post', params),
+  // 分页查询
+  list: (data, params) => http(api + 'cgdlist', data, 'post', params),
+  // 删除
+  delete: (data, params) => http(api + 'delete', data, 'post', params),
+  // 详情
+  detail: (data, params) => http(api + 'cgdinfo', data, 'post', params),
+  // 更新
+  update: (data, params) => http(api + 'cgdedit', data, 'post', params),
+
+  // 竞价单总数
+  reportzixuntotal: (data, params) => http(api + 'r_reportzixuntotal', data, 'post', params),
+  // 采购订单总金额
+  reportpurcheaseordersum: (data, params) => http(api + 'r_reportpurcheaseordersum', data, 'post', params),
+  // 采购员回复竞价单数
+  reportconsultbidssum: (data, params) => http(api + 'r_reportconsultbidssum', data, 'post', params),
+  // 采购员订单金额
+  reportpurcheaseordersumbyuser: (data, params) => http(api + 'r_reportpurcheaseordersumbyuser', data, 'post', params),
+  // 已采反报价信息
+  reportconsultinfobidssum: (data, params) => http(api + 'r_reportconsultinfobidssum', data, 'post', params),
+  // 已采反报价信息导出
+  reportconsultinfobidssumexport: (data, params) => http(api + 'reportconsultinfobidssumexport', data, 'post', params),
+  // 未采反信息
+  reportconsultinfobidssumnot: (data, params) => http(api + 'reportconsultinfobidssumnot', data, 'post', params),
+  // 未采反信息导出
+  reportconsultinfobidssumnotexport: (data, params) => http(api + 'reportconsultinfobidssumnotexport', data, 'post', params),
+  // 订单明细
+  reportorderlistdetailed: (data, params) => http(api + 'reportorderlistdetailed', data, 'post', params),
+  // 订单明细导出
+  reportorderlistdetailedexport: (data, params) => http(api + 'reportorderlistdetailedexport', data, 'post', params),
+  // 售后报表
+  reportorderreturnlist: (data, params) => http(api + 'reportorderreturnlist', data, 'post', params),
+  // 售后报表导出
+  reportorderreturnlistexport: (data, params) => http(api + 'reportorderreturnlistexport', data, 'post', params),
+  // 供应商报表
+  reportsupplierlist: (data, params) => http(api + 'reportsupplierlist', data, 'post', params),
+  // 供应商报表导出
+  reportsupplierlistexport: (data, params) => http(api + 'reportsupplierlistexport', data, 'post', params),
+  // 退货流水报表
+  reportsalereturnlist: (data, params) => http(api + 'reportsalereturnlist', data, 'post', params),
+  // 退货流水报表导出
+  reportsalereturnexport: (data, params) => http(api + 'reportsalereturnexport', data, 'post', params),
+  // 产品上线报表
+  reportgoodonlinelist: (data, params) => http(api + 'reportgoodonlinelist', data, 'post', params),
+  // 产品上线报表导出
+  reportgoodonlineexport: (data, params) => http(api + 'reportgoodonlineexport', data, 'post', params),
+  // 产品下线报表
+  reportgoodofflinelist: (data, params) => http(api + 'reportgoodofflinelist', data, 'post', params),
+  // 产品下线报表导出
+  reportgoodofflineexport: (data, params) => http(api + 'reportgoodofflineexport', data, 'post', params),
+
+  // 产品修改报表
+  reportchangeloglist: (data, params) => http(api + 'reportchangeloglist', data, 'post', params),
+  // 产品修改报表导出
+  reportchangelogeexport: (data, params) => http(api + 'reportchangelogeexport', data, 'post', params),
+
+  // 退货台账-业务口径导出
+  reportreturnexport: (data, params) => http(api + 'reportreturnexport', data, 'post', params)
+}
+

src/apis/service/businessReportQuery/saleReport/index.js

@@ -114,9 +114,9 @@ export default {
   // 本地销售订单情况统计
   sm: (data, params) => http(api + 'r_sm', data, 'post', params),
   // 本月采购订单和库存品发货情况
-  oom: (data, params) => http(api + 'oom', data, 'post', params),
-  pom: (data, params) => http(api + 'pom', data, 'post', params),
-  popm: (data, params) => http(api + 'popm', data, 'post', params),
+  oom: (data, params) => http(api + 'r_oom', data, 'post', params),
+  pom: (data, params) => http(api + 'r_pom', data, 'post', params),
+  popm: (data, params) => http(api + 'r_popm', data, 'post', params),
 
   // 开票明细表
   reportchangeloglist: (data, params) =>

src/apis/service/reportQuery/saleReport/index.js

@@ -71,10 +71,10 @@ export default {
     http(api + 'saleexportsaledetailedexport', data, 'post', params),
   // 竞价单导出明细
   saleexportconsultdetailed: (data, params) =>
-    http(api + 'r_saleexportconsultdetailed', data, 'post', params),
+    http(api + 'saleexportconsultdetailed', data, 'post', params),
   // 竞价单导出明细导出
   saleexportconsultdetailedexport: (data, params) =>
-    http(api + 'r_saleexportconsultdetailedexport', data, 'post', params),
+    http(api + 'saleexportconsultdetailedexport', data, 'post', params),
   // 工差明细表
   saleexportsalediff: (data, params) =>
     http(api + 'saleexportsalediff', data, 'post', params),

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

@@ -26,6 +26,7 @@ export default {
   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),
-  orderReturnChildList: (data, params) => http(api + 'order_return_child_list', data, 'post', params)
+  orderReturnChildList: (data, params) => http(api + 'order_return_child_list', data, 'post', params),
+  aftercancel: (data, params) => http(api + 'aftercancel', data, 'post', params)
 }
 

src/views/businessReportQuery/businessPurchaseReport/components/columns.js

@@ -16,6 +16,16 @@ const table1 = [
     label: '竞价时间',
     minWidth: '155px'
   },
+  {
+    prop: 'relaComNo',
+    label: '业务公司编码',
+    minWidth: '155px'
+  },
+  {
+    prop: 'relaComName',
+    label: '业务公司名称',
+    minWidth: '165px'
+  },
   {
     prop: 'name',
     label: '业务部门',
@@ -45,6 +55,16 @@ const table2 = [
     label: '创建时间',
     minWidth: '155px'
   },
+  {
+    prop: 'relaComNo',
+    label: '业务公司编码',
+    minWidth: '155px'
+  },
+  {
+    prop: 'relaComName',
+    label: '业务公司名称',
+    minWidth: '165px'
+  },
   {
     prop: 'name',
     label: '业务部门',
@@ -79,6 +99,16 @@ const table3 = [
     label: '采反日期',
     minWidth: '155px'
   },
+  {
+    prop: 'relaComNo',
+    label: '业务公司编码',
+    minWidth: '155px'
+  },
+  {
+    prop: 'relaComName',
+    label: '业务公司名称',
+    minWidth: '165px'
+  },
   {
     prop: 'name',
     label: '创建人部门',
@@ -118,6 +148,16 @@ const table4 = [
     label: '采购日期',
     minWidth: '155px'
   },
+  {
+    prop: 'relaComNo',
+    label: '业务公司编码',
+    minWidth: '155px'
+  },
+  {
+    prop: 'relaComName',
+    label: '业务公司名称',
+    minWidth: '165px'
+  },
   {
     prop: 'name',
     label: '采购员所属部门',

src/views/businessReportQuery/businessPurchaseReport/components/table1.vue

@@ -71,7 +71,7 @@
 import mixinPage from '@/mixins/elPaginationHandle'
 import resToken from '@/mixins/resToken'
 import urlConfig from '@/apis/url-config'
-import asyncRequest from '@/apis/service/reportQuery/purchaseReport'
+import asyncRequest from '@/apis/service/businessReportQuery/purchaseReport'
 import periodDatePickerActive from '../period-date-picker/main.vue'
 import companyHelper from '@/mixins/companyHelper'
 import { table1 } from './columns'
@@ -197,7 +197,7 @@ export default {
 
       const res = await asyncRequest.reportzixuntotal({
         ...this.parmValue,
-        relaComNo: this.currentCompany
+        needRela: true
       })
 
       if (res && res.code === 0 && res.data) {

src/views/businessReportQuery/businessPurchaseReport/components/table2.vue

@@ -71,7 +71,7 @@
 import mixinPage from '@/mixins/elPaginationHandle'
 import resToken from '@/mixins/resToken'
 import urlConfig from '@/apis/url-config'
-import asyncRequest from '@/apis/service/reportQuery/purchaseReport'
+import asyncRequest from '@/apis/service/businessReportQuery/purchaseReport'
 import periodDatePickerActive from '../period-date-picker/main.vue'
 import * as dayjs from 'dayjs'
 import { table2 } from './columns'
@@ -217,7 +217,7 @@ export default {
 
       const res = await asyncRequest.reportpurcheaseordersum({
         ...this.parmValue,
-        relaComNo: this.currentCompany
+        needRela: true
       })
 
       if (res && res.code === 0 && res.data) {

src/views/businessReportQuery/businessPurchaseReport/components/table3.vue

@@ -62,7 +62,7 @@
 import mixinPage from '@/mixins/elPaginationHandle'
 import resToken from '@/mixins/resToken'
 import urlConfig from '@/apis/url-config'
-import asyncRequest from '@/apis/service/reportQuery/purchaseReport'
+import asyncRequest from '@/apis/service/businessReportQuery/purchaseReport'
 import periodDatePickerActive from '../period-date-picker/main.vue'
 import { table3 } from './columns'
 import { mapGetters } from 'vuex'

src/views/businessReportQuery/businessPurchaseReport/components/table4.vue

@@ -62,7 +62,7 @@ import mixinPage from '@/mixins/elPaginationHandle'
 import searchDate from '@/mixins/searchDate'
 import resToken from '@/mixins/resToken'
 import urlConfig from '@/apis/url-config'
-import asyncRequest from '@/apis/service/reportQuery/purchaseReport'
+import asyncRequest from '@/apis/service/businessReportQuery/purchaseReport'
 import periodDatePickerActive from '../period-date-picker/main.vue'
 import { table4 } from './columns'
 import { mapGetters } from 'vuex'
@@ -129,7 +129,6 @@ export default {
     // 获取要合并的行数
     getSpanNumber(data, prop) {
       // data要处理的数组，prop要合并的属性，比如name
-
       // 数组的长度，有时候后台可能返回个null而不是[]
       const length = Array.isArray(data) ? data.length : 0
       if (length > 0) {
@@ -180,7 +179,7 @@ export default {
 
       const res = await asyncRequest.reportpurcheaseordersumbyuser({
         ...this.parmValue,
-        relaComNo: this.currentCompany
+        needRela: true
       })
 
       if (res && res.code === 0 && res.data) {

src/views/businessReportQuery/businessPurchaseReport/components/table5.vue

@@ -129,7 +129,7 @@
 import mixinPage from '@/mixins/elPaginationHandle'
 import resToken from '@/mixins/resToken'
 import urlConfig from '@/apis/url-config'
-import asyncRequest from '@/apis/service/reportQuery/purchaseReport'
+import asyncRequest from '@/apis/service/businessReportQuery/purchaseReport'
 import periodDatePickerActive from '../period-date-picker/main.vue'
 import { table5 } from './columns'
 import { mapGetters } from 'vuex'
@@ -202,7 +202,7 @@ export default {
 
       const res = await asyncRequest.reportconsultinfobidssum({
         ...this.parmValue,
-        relaComNo: this.currentCompany
+        needRela: true
       })
 
       if (res && res.code === 0 && res.data) {

src/views/businessReportQuery/businessSaleReport/components/columns.js

@@ -2152,14 +2152,14 @@ const table21 = [
     _slot_: 'name'
   },
   {
+    prop: 'relaComNo',
     label: '业务公司编码',
-    minWidth: '155px',
-    _slot_: 'companyNo'
+    minWidth: '155px'
   },
   {
+    prop: 'relaComName',
     label: '业务公司名称',
-    minWidth: '165px',
-    _slot_: 'companyName'
+    minWidth: '165px'
   },
   {
     prop: 'tag_1',
@@ -2178,6 +2178,16 @@ const table21 = [
 ]
 
 const table22 = [
+  {
+    label: '业务公司编码',
+    minWidth: '155px',
+    _slot_: 'companyNo'
+  },
+  {
+    label: '业务公司名称',
+    minWidth: '165px',
+    _slot_: 'companyName'
+  },
   {
     prop: 'cat_1',
     label: '一级分类'
@@ -2222,6 +2232,16 @@ const table23 = [
     label: '采购方',
     _slot_: 'name'
   },
+  {
+    label: '业务公司编码',
+    minWidth: '155px',
+    _slot_: 'companyNo'
+  },
+  {
+    label: '业务公司名称',
+    minWidth: '165px',
+    _slot_: 'companyName'
+  },
   {
     prop: 'total_cgd',
     label: '采购订单总量'
@@ -2254,6 +2274,16 @@ const table24 = [
     label: '采购方',
     _slot_: 'name'
   },
+  {
+    label: '业务公司编码',
+    minWidth: '155px',
+    _slot_: 'companyNo'
+  },
+  {
+    label: '业务公司名称',
+    minWidth: '165px',
+    _slot_: 'companyName'
+  },
   {
     prop: 'total_cgd',
     label: '采购订单总量'

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

@@ -317,7 +317,7 @@ export default {
           responseType: 'blob',
           data: {
             ...model,
-            relaComNo: this.currentCompany
+            needRela: true
           },
           headers: {
             // 'Content-Type': 'multipart/form-data',

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

@@ -216,7 +216,7 @@ export default {
           responseType: 'blob',
           data: {
             ...model,
-            relaComNo: this.currentCompany
+            needRela: true
           },
           headers: {
             Accept: httpType

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

@@ -53,6 +53,14 @@
           </el-row>
         </div>
       </template>
+
+      <template #companyNo="{ scope }">
+        <span>{{ scope.row['0'] }}</span>
+      </template>
+
+      <template #companyName="{ scope }">
+        <span>{{ scope.row['1'] }}</span>
+      </template>
     </ex-table>
   </div>
 </template>
@@ -60,7 +68,7 @@
 import mixinPage from '@/mixins/elPaginationHandle'
 import resToken from '@/mixins/resToken'
 import urlConfig from '@/apis/url-config'
-import asyncRequest from '@/apis/service/reportQuery/saleReport'
+import asyncRequest from '@/apis/service/businessReportQuery/saleReport'
 import periodDatePickerActive from '../period-date-picker/main.vue'
 import companyHelper from '@/mixins/companyHelper'
 import { table22 } from './columns'
@@ -119,7 +127,7 @@ export default {
       this.loading = true
       const { code, data, message } = await asyncRequest.oom({
         ...this.parmValue,
-        relaComNo: this.currentCompany
+        needRela: true
       })
       if (code === 0) {
         this.tableData = data
@@ -224,11 +232,11 @@ export default {
         const httpType = `aplication/zip`
         axios({
           method: 'post',
-          url: this.fileUrl + 'admin/oome',
+          url: this.fileUrl + 'admin/r_oome',
           responseType: 'blob',
           data: {
             ...model,
-            relaComNo: this.currentCompany
+            needRela: true
           },
           headers: {
             Accept: httpType
@@ -244,7 +252,7 @@ export default {
               const link = document.createElement('a')
               link.style.display = 'none'
               link.href = url
-              const excelName = '本月采购订单和库存品发货情况.zip'
+              const excelName = this.getCompanyWithCode(this.currentCompany).name + '-本月采购订单和库存品发货情况.zip'
               link.setAttribute('download', excelName)
               document.body.appendChild(link)
               link.click()

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

@@ -70,6 +70,15 @@
           </el-row>
         </div>
       </template>
+
+      <template #companyNo="{ scope }">
+        <span>{{ scope.row['0'] }}</span>
+      </template>
+
+      <template #companyName="{ scope }">
+        <span>{{ scope.row['1'] }}</span>
+      </template>
+
       <template #name="{ scope }">
         <span>{{ Array.isArray(scope.row.supplier_name) ? scope.row.supplier_name.join(",") : scope.row.supplier_name }}</span>
       </template>
@@ -80,7 +89,7 @@
 import mixinPage from '@/mixins/elPaginationHandle'
 import resToken from '@/mixins/resToken'
 import urlConfig from '@/apis/url-config'
-import asyncRequest from '@/apis/service/reportQuery/saleReport'
+import asyncRequest from '@/apis/service/businessReportQuery/saleReport'
 import periodDatePickerActive from '../period-date-picker/main.vue'
 import { table23 } from './columns'
 import { mapGetters } from 'vuex'
@@ -141,7 +150,7 @@ export default {
       this.loading = true
       const { code, data } = await asyncRequest.pom({
         ...this.parmValue,
-        relaComNo: this.currentCompany
+        needRela: true
       })
       if (code === 0) {
         // const { list, count } = data;
@@ -256,11 +265,11 @@ export default {
         const httpType = `aplication/zip`
         axios({
           method: 'post',
-          url: this.fileUrl + 'admin/pome',
+          url: this.fileUrl + 'admin/r_pome',
           responseType: 'blob',
           data: {
             ...model,
-            relaComNo: this.currentCompany
+            needRela: true
           },
           headers: {
             Accept: httpType
@@ -276,7 +285,7 @@ export default {
               const link = document.createElement('a')
               link.style.display = 'none'
               link.href = url
-              const excelName = '本月供应商采购订单情况.zip'
+              const excelName = this.getCompanyWithCode(this.currentCompany).name + '-本月供应商采购订单情况.zip'
               link.setAttribute('download', excelName)
               document.body.appendChild(link)
               link.click()

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

@@ -88,6 +88,15 @@
           </el-row>
         </div>
       </template>
+
+      <template #companyNo="{ scope }">
+        <span>{{ scope.row['0'] }}</span>
+      </template>
+
+      <template #companyName="{ scope }">
+        <span>{{ scope.row['1'] }}</span>
+      </template>
+
       <template #name="{ scope }">
         <span>{{ Array.isArray(scope.row.person) ? scope.row.person.join(",") : scope.row.person }}</span>
       </template>
@@ -98,7 +107,7 @@
 import mixinPage from '@/mixins/elPaginationHandle'
 import resToken from '@/mixins/resToken'
 import urlConfig from '@/apis/url-config'
-import asyncRequest from '@/apis/service/reportQuery/saleReport'
+import asyncRequest from '@/apis/service/businessReportQuery/saleReport'
 import periodDatePickerActive from '../period-date-picker/main.vue'
 import { table23 } from './columns'
 import { mapGetters } from 'vuex'
@@ -160,7 +169,7 @@ export default {
       this.loading = true
       const { code, data, message } = await asyncRequest.popm({
         ...this.parmValue,
-        relaComNo: this.currentCompany
+        needRela: true
       })
       if (code === 0) {
         // const { list, count } = data;
@@ -269,11 +278,11 @@ export default {
         const httpType = `aplication/zip`
         axios({
           method: 'post',
-          url: this.fileUrl + 'admin/popme',
+          url: this.fileUrl + 'admin/r_popme',
           responseType: 'blob',
           data: {
             ...model,
-            relaComNo: this.currentCompany
+            needRela: true
           },
           headers: {
             Accept: httpType
@@ -289,7 +298,7 @@ export default {
               const link = document.createElement('a')
               link.style.display = 'none'
               link.href = url
-              const excelName = '本月供应商负责人采购订单情况.zip'
+              const excelName = this.getCompanyWithCode(this.currentCompany).name + '-本月供应商负责人采购订单情况.zip'
               link.setAttribute('download', excelName)
               document.body.appendChild(link)
               link.click()

src/views/purchaseIn/wsmInOrder/detail.vue

@@ -85,7 +85,7 @@
             <el-collapse-item
               title="入库验收"
               name="3"
-              v-if="isMananger && status == '1' && ppowers.some((i) => i == '1') && !isSupertube"
+              v-if="canInStock && status == '1' && ppowers.some((i) => i == '1') && !isSupertube"
             >
               <wsm-in
                 v-if="newTime !== ''"
@@ -133,10 +133,11 @@ export default {
   },
   computed: {
     ...mapGetters(["isSupertube","userInfo"]),
-    isMananger(){
-      const { contactor } = this.sitem
+    canInStock(){
+      const { contactor } = this.sitem || {}
       const { id } = this.userInfo || {}
-      return String(id) === String(contactor)
+      if(!contactor || !id) return false
+      return String(contactor) === String(id)
     },
     powers() {
       const { btnList } = this.$store.getters;

src/views/sellOut/deliveryWorkOrder/columns.js

@@ -25,7 +25,7 @@ export default [
     prop: 'use_type',
     label: '平台类型',
     _slot_: 'use_type',
-    width: '70',
+    width: '70'
   },
   {
     prop: 'status',
@@ -116,7 +116,7 @@ export default [
     label: '下单时间',
     width: 150
   },
-  
+
   {
     prop: '',
     width: 50,
@@ -144,61 +144,63 @@ export const sendOutOrderColumns = [
   {
     prop: 'value0',
     label: '发货工单号',
-    width: '156px'
+    'min-width': '156px'
   },
 
   {
-    prop: 'value1',
+    prop: 'value2',
     label: '订单编号',
-    width: '156px'
-  },
-  {
-    prop: 'value11',
-    label: '商品名称',
-    'min-width': '180px'
+    'min-width': '156px'
   },
+  // {
+  //   prop: 'value11',
+  //   label: '',
+  //   'min-width': '180px'
+  // },
   {
     prop: 'value14',
     label: '发货数量',
-    width: '100px'
+    'min-width': '100px'
   },
   {
-    prop: 'value18',
+    prop: 'value21',
     label: '物流公司',
-    width: '150px'
+    'min-width': '150px'
   },
   {
-    prop: 'value19',
+    prop: 'value22',
     label: '物流单号',
-    width: '150px'
+    'min-width': '150px'
   },
   {
-    prop: 'value20',
+    prop: 'value23',
     label: '物流费用',
-    width: '140px'
+    'min-width': '140px'
   }
 ]
-
 export const head = [
   '发货工单号',
-  '销售订单编号',
-  '发货申请单号',
-  '业务公司编号',
-  '业务公司名称',
-  '客户编号',
-  '客户名称',
-  '供应商编号',
-  '供应商名称',
-  '商品成本编号',
-  '商品上线编号',
-  '商品名称',
-  '订单来源',
-  '商品类型',
-  '数量',
-  '分单状态',
-  '下单时间',
-  '申请人名称',
-  '物流公司',
-  '物流单号',
+  '发货单编号	',
+  '销售订单编号	',
+  '供应商端	',
+  '状态	',
+  '商品类型	',
+  '订单来源	',
+  '总数量	',
+  '仓库编号	',
+  '仓库名称	',
+  '商品成本编码	',
+  '商品上线编码	',
+  '业务公司编号	',
+  '业务公司名称	',
+  '客户编号	',
+  '客户名称	',
+  '供应商编号	',
+  '供应商名称	',
+  '下单时间	',
+  '申请人	',
+  '对接类型	',
+  '物流公司	',
+  '物流单号	',
   '物流费用'
 ]

src/views/sellOut/deliveryWorkOrder/sendOutOrder.vue

@@ -95,8 +95,7 @@ export default {
         }
         let hederOk = true;
         this.head.forEach((v1, i1) => {
-          if (v1 !== header[i1].replace(/\s*/g, "")) {
-            console.log(v1 + "----" + header[i1]);
+          if (v1.replace(/\s*/g, "") !== header[i1].replace(/\s*/g, "")) {
             hederOk = false;
           }
         });
@@ -186,20 +185,20 @@ export default {
         this.tableData.forEach((key, index) => {
           if (
             key["value0"] === "" ||
-            key["value18"] === "" ||
-            key["value19"] === "" ||
-            key["value20"] === ""
+            key["value21"] === "" ||
+            key["value22"] === "" ||
+            key["value23"] === ""
           ) {
             isok = false;
           }
           let ketitem = {
             outChildCode: key["value0"],
-            post_name: key["value18"],
-            post_code: key["value19"],
-            post_fee: key["value20"]
+            post_name: key["value21"],
+            post_code: key["value22"],
+            post_fee: key["value23"]
           };
 
-          if (!this.validateCode(key["value19"])) {
+          if (!this.validateCode(key["value22"])) {
             is_codeok = false;
           }
 

src/views/sellOut/returnGoodWorkOrder/columns.js

@@ -55,16 +55,21 @@ export default [
   //   width: '105px',
   //   _slot_: 'status'
   // },
+  // {
+  //   prop: 'return_num_total',
+  //   label: '最终收货数量',
+  //   width: '120px'
+  // },
   {
-    prop: 'return_num_total',
-    label: '最终收货数量',
-    width: '120px'
+    prop: 'return_num',
+    label: '售后申请总数量',
+    width: '110px'
   },
   {
-    prop: 'return_num',
-    label: '退货数量'
+    label: '最终入库数量',
+    _slot_: 'stcok_in',
+    width: '100px'
   },
- 
   {
     prop: 'good_code',
     label: '商品编码',

src/views/sellOut/returnGoodWorkOrder/index.vue

@@ -195,6 +195,10 @@
           ></el-tag>
         </template>
 
+        <template #stcok_in="{scope}">{{
+            scope.row.type === "1" ? scope.row.can_sell_num : scope.row.defective_num
+        }}</template>
+
         <template #returnWsm="{ scope }">
           <el-popover placement="top" width="360" trigger="hover">
             <i class="el-icon-warning-outline" slot="reference"></i>

src/views/sellOut/sellAfterApply/columns.js

@@ -15,7 +15,7 @@ const columns = [
     label: '订单编号',
     width: '160'
   },
- 
+
   {
     prop: 'status',
     label: '状态',
@@ -136,7 +136,7 @@ const columns = [
     fixed: 'right',
     _noset_: true,
     _slot_: 'operation',
-    width: 50
+    width: 80
   }
 ]
 const sellshowColumns = [

src/views/sellOut/sellAfterApply/index.vue

@@ -311,6 +311,19 @@
               @click="getRouter('sellAfterApplyDetail', scope.row.returnCode)"
             ></i>
           </el-tooltip>
+
+          <el-tooltip
+            class="fr"
+            effect="dark"
+            content="取消申请"
+            v-if=" 
+              !statusList.includes(Number(scope.row.status))  &&
+              powers.some((i) => i == '027') && !isSupertube
+            "
+            placement="top"
+            >
+               <i class="el-icon-circle-close tb-icon" @click="() => close_return(scope.row.returnCode)"></i>
+            </el-tooltip>
         </template>
       </ex-table>
     </div>
@@ -343,13 +356,16 @@ export default {
       const tran =
         this.$store.getters.btnList.find((item) => item.menu_route == "sellAfterApply") ||
         {};
+
       const { action } = tran ?? {};
+      console.log(action)
       return action ?? [];
     },
   },
   data() {
     return {
       supplierNo: "",
+      statusList:[5,6,8,11,12],
       xs_order_source_options,
       xs_order_type_options,
       has_account_list,
@@ -372,7 +388,7 @@ export default {
       sitem: null,
       // 收到货状态
       statusOptions: [
-        { id: "1", label: "待业务审核" },
+        { id: "1", label: "待业务审核" }, //
         { id: "9", label: "供应商审核" },
         { id: "2", label: "供应商驳回,待采购审核" }, //  id: "2", label: "供应商驳回,待供应商负责人审核" },
         { id: "10", label: "业务公司修改，待供应商确认" },
@@ -563,6 +579,33 @@ export default {
         this.$message.warning("暂未找到相关流程！");
       }
     },
+    async close_return(returnCode) {
+      await this.$confirm("确定要取消申请？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          const model = {
+            returnCode
+          };
+          const res = await asyncRequest.aftercancel(model);
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "取消成功",
+              message: "",
+            });
+            await this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
     restSearch() {
       this.customerCode = [];
       this.select = "serviceNum";

src/views/sellOut/sellOutOrder/columns.js

@@ -20,7 +20,6 @@ const columns = [
     label: '采购单编号',
     width: '156'
   },
- 
 
   // {
   //   prop: "orderCode",
@@ -431,38 +430,30 @@ const sendOutOrderColumns = [
 ]
 const head = [
   '序号',
-
-  '创建时间',
-  '采购单编号',
-  '采购单状态',
-  '采购员',
-  '销售订单号',
-  '销售订单时间',
-  '产品编号',
-  '产品名称',
-  '规格',
-  '单位',
-  '供应商名称',
-  '供应商编号',
-  '裸价',
-  '物流费',
-  '发货方式',
-  '采购单价',
-  '销售订单备注',
-  '采购数量',
-  '采购货款',
-  '发货数量',
-  '收货人',
-  '联系方式',
-  '收货地址',
-  '到货时间',
-  '发货单号',
-  '平台订单号',
-  '发货单物流公司',
-  '发货单物流单号',
-  '发货单物流费用',
-  '发货单备注',
-  '申请人',
-  '商品分类'
+  '发货工单号',
+  '发货单编号	',
+  '销售订单编号	',
+  '供应商端	',
+  '状态	',
+  '商品类型	',
+  '订单来源	',
+  '总数量	',
+  '仓库编号	',
+  '仓库名称	',
+  '商品成本编码	',
+  '商品上线编码	',
+  '业务公司编号	',
+  '业务公司名称	',
+  '客户编号	',
+  '客户名称	',
+  '供应商编号	',
+  '供应商名称	',
+  '下单时间	',
+  '申请人	',
+  '对接类型	',
+  '物流公司	',
+  '物流单号	',
+  '物流费用'
 ]
+
 export { columns, showColumns, rshowColumns, sendOutOrderColumns, head }

src/views/sellOut/sellOutOrder/detail.vue

@@ -240,6 +240,20 @@
                       ).label || '--'
                     "
                   ></el-tag>
+
+                  <el-tooltip
+                    class="fr"
+                    effect="dark"
+                    content="取消申请"
+                    style="padding: 3px 0 0 0"
+                    v-if="
+                      !afterStatusList.includes(Number(resitem.status)) &&
+                      powers.some((i) => i == '027') && !isSupertube
+                    "
+                    placement="top"
+                  >
+                    <i class="el-icon-circle-close tb-icon" @click="() => close_return(scope.row.returnCode)"></i>
+                  </el-tooltip>
                 </template>
 
                 <template slot="is_stock">
@@ -494,6 +508,7 @@ export default {
       newTime: "",
       showModel: false,
       loading: false,
+      afterStatusList:[5,6,8,11,12],
       orderOptions: [
         { id: "1", label: "线上商品销售" },
         { id: "2", label: "项目线上商品销售" },

src/views/sellOut/sellOutOrder/sendOutOrder.vue

@@ -77,8 +77,6 @@ export default {
       return false;
     },
     handleSuccess({ results, header }) {
-      // alert(this.head.length, header.length)
-      // console.log(results)
       if (!this.loading) {
         this.loading = true;
         if (results.length === 0) {
@@ -87,12 +85,13 @@ export default {
           return;
         }
 
+
         if (this.head.length !== header.length) {
-          console.log(this.head.length,header.length);
           this.$message.error("表头与导入模板不匹配！");
           this.loading = false;
           return;
         }
+
         let hederOk = true;
         this.head.forEach((v1, i1) => {
           if (v1 !== header[i1].replace(/\s*/g, "")) {

src/views/sellOut/sellReturn/columns.js

@@ -1,6 +1,6 @@
 export default [
   { type: 'selection', fixed: 'left', _noset_: true },
- 
+
   {
     prop: 'returnCode',
     label: '退货单编号',
@@ -98,7 +98,6 @@ export default [
     width: '160'
   },
 
- 
   // {
   //   prop: "error_msg",
   //   label: "退货原因",
@@ -110,7 +109,7 @@ export default [
   //   label: "退货总金额",
   //   width: "120"
   // },
- 
+
   {
     prop: 'apply_name',
     label: '申请人',
@@ -128,7 +127,7 @@ export default [
   },
   {
     prop: '',
-    width: 50,
+    width: 100,
     label: '操作',
     fixed: 'right',
     _noset_: true,

src/views/supplierPurchaseIn/supplierWsmInOrder/detail.vue

@@ -1,15 +1,6 @@
 <template>
   <div class="stockInDetail pagePadding">
     <div style="width: 100%" v-if="powers.some((i) => i == '007')">
-      <!-- <div class="detail-page-title">
-        <span class="title">入库单编号：{{ queryId }}</span>
-      </div> -->
-      <!-- <status-bar
-        v-if="newTime !== ''"
-        :newTime="newTime"
-        :options="statusOptions"
-        :status="status"
-      /> -->
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
@@ -95,7 +86,7 @@
             <el-collapse-item
               title="入库验收"
               name="3"
-              v-if="status == '1' && ppowers.some((i) => i == '1') && !isSupertube"
+              v-if="canInStock && status == '1' && ppowers.some((i) => i == '1') && !isSupertube"
             >
               <wsm-in
                 v-if="newTime !== ''"
@@ -155,7 +146,13 @@ export default {
     wsmIn
   },
   computed: {
-    ...mapGetters(["isSupertube"]),
+    ...mapGetters(["isSupertube","userInfo"]),
+    canInStock(){
+      const { contactor } = this.sitem || {}
+      const { id } = this.userInfo || {}
+      if(!contactor || !id) return false
+      return String(contactor) === String(id)
+    },
     powers() {
       const { btnList } = this.$store.getters;
       const tran =

src/views/supplierSellOut/supplierReturnWorkOrder/columns.js

@@ -36,15 +36,15 @@ export default [
     width: '75px',
     _slot_: 'stock_type'
   },
-  // {
-  //   prop: 'status',
-  //   label: '状态',
-  //   width: '105px',
-  //   _slot_: 'status'
-  // },
   {
     prop: 'return_num',
-    label: '退货数量'
+    label: '售后申请总数量',
+    width: '110px'
+  },
+  {
+    label: '最终入库数量',
+    _slot_: 'stcok_in',
+    width: '100px'
   },
   {
     prop: 'order_type',

src/views/supplierSellOut/supplierReturnWorkOrder/index.vue

@@ -191,6 +191,10 @@
           ></el-tag>
         </template>
 
+        <template #stcok_in="{scope}">{{
+            scope.row.type === "1" ? scope.row.can_sell_num : scope.row.defective_num
+        }}</template>
+
         <template #returnWsm="{ scope }">
           <el-popover placement="top" width="360" trigger="hover">
             <i class="el-icon-warning-outline" slot="reference"></i>