build

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

@@ -1,38 +1,37 @@
 // 企业客户/供应商账号相关
-import http from "@/apis/axios";
-import testHttp from "@/apis/testAxios";
-const api = "admin/";
+import http from '@/apis/axios'
+import testHttp from '@/apis/testAxios'
+const api = 'admin/'
 export default {
   // 分页查询
-  list: (data, params) => http(api + "receiptlist", data, "post", params),
+  list: (data, params) => http(api + 'receiptlist', data, 'post', params),
   // 分页查询企业客户
-  clist: (data, params) => http(api + "customerlist", data, "post", params),
+  clist: (data, params) => http(api + 'customerlist', data, 'post', params),
   // 发票开票数据导出
-  receiptexport: (data, params) => http(api + "receiptexport", data, "post", params),
+  receiptexport: (data, params) => http(api + 'receiptexport', data, 'post', params),
   // 发票数据导入
-  receiptimport: (data, params) => http(api + "receiptimport", data, "post", params),
+  receiptimport: (data, params) => http(api + 'receiptimport', data, 'post', params),
   // 新建业务需求表
-  add: (data, params) => http(api + "execsave", data, "post", params),
-  //获取预约导出业务需求表
-  exportList: (data, params) => http(api + "execlist", data, "post", params),
+  add: (data, params) => http(api + 'execsave', data, 'post', params),
+  // 获取预约导出业务需求表
+  exportList: (data, params) => http(api + 'execlist', data, 'post', params),
 
   // 历史数据导出列表
-  hlist: (data, params) => testHttp(api + "execnowlist", data, "post", params),
+  hlist: (data, params) => testHttp(api + 'execnowlist', data, 'post', params),
   // 准备执行
-  download: (data, params) => testHttp(api + "execnowdown", data, "post", params),
+  download: (data, params) => testHttp(api + 'execnowdown', data, 'post', params),
   //  即时下载列表接口 -新
-  realNewList: (data, params) => http(api + "nowlist", data, "post", params),
+  realNewList: (data, params) => http(api + 'nowlist', data, 'post', params)
 
-
-  // // 分页查询确认单列表
+  // // 分页查询销售订单列表
   // qrdlist: (data, params) => http(api + "qrdlist", data, "post", params),
   // // 发票新建（金额）
   // madd: (data, params) => http(api + "receiptadd", data, "post", params),
   // // 发票编辑（金额）
   // mupdate: (data, params) => http(api + "receiptedit", data, "post", params),
-  // // 发票新建（确认单）
+  // // 发票新建（销售订单）
   // oadd: (data, params) => http(api + "receiptcreate", data, "post", params),
-  // // 发票编辑（确认单）
+  // // 发票编辑（销售订单）
   // oupdate: (data, params) => http(api + "receiptsave", data, "post", params),
   // // 发票详情
   // detail: (data, params) => http(api + "receiptinfo", data, "post", params),
@@ -51,4 +50,4 @@ export default {
   // // 认领资金开票编辑
   // editbytrade: (data, params) => http(api + 'editbytrade', data, 'post', params),
 
-};
+}

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

@@ -1,38 +1,37 @@
 // 企业客户/供应商账号相关
-import http from "@/apis/axios";
-import testHttp from "@/apis/testAxios";
-const api = "admin/";
+import http from '@/apis/axios'
+import testHttp from '@/apis/testAxios'
+const api = 'admin/'
 export default {
   // 分页查询
-  list: (data, params) => http(api + "receiptlist", data, "post", params),
+  list: (data, params) => http(api + 'receiptlist', data, 'post', params),
   // 分页查询企业客户
-  clist: (data, params) => http(api + "customerlist", data, "post", params),
+  clist: (data, params) => http(api + 'customerlist', data, 'post', params),
   // 发票开票数据导出
-  receiptexport: (data, params) => http(api + "receiptexport", data, "post", params),
+  receiptexport: (data, params) => http(api + 'receiptexport', data, 'post', params),
   // 发票数据导入
-  receiptimport: (data, params) => http(api + "receiptimport", data, "post", params),
+  receiptimport: (data, params) => http(api + 'receiptimport', data, 'post', params),
   // 新建业务需求表
-  add: (data, params) => http(api + "execsave", data, "post", params),
-  //获取预约导出业务需求表
-  exportList: (data, params) => http(api + "execlist", data, "post", params),
+  add: (data, params) => http(api + 'execsave', data, 'post', params),
+  // 获取预约导出业务需求表
+  exportList: (data, params) => http(api + 'execlist', data, 'post', params),
 
   // 历史数据导出列表
-  hlist: (data, params) => testHttp(api + "execnowlist", data, "post", params),
+  hlist: (data, params) => testHttp(api + 'execnowlist', data, 'post', params),
   // 准备执行
-  download: (data, params) => testHttp(api + "execnowdown", data, "post", params),
+  download: (data, params) => testHttp(api + 'execnowdown', data, 'post', params),
   //  即时下载列表接口 -新
-  realNewList: (data, params) => http(api + "nowlist", data, "post", params),
+  realNewList: (data, params) => http(api + 'nowlist', data, 'post', params)
 
-
-  // // 分页查询确认单列表
+  // // 分页查询销售订单列表
   // qrdlist: (data, params) => http(api + "qrdlist", data, "post", params),
   // // 发票新建（金额）
   // madd: (data, params) => http(api + "receiptadd", data, "post", params),
   // // 发票编辑（金额）
   // mupdate: (data, params) => http(api + "receiptedit", data, "post", params),
-  // // 发票新建（确认单）
+  // // 发票新建（销售订单）
   // oadd: (data, params) => http(api + "receiptcreate", data, "post", params),
-  // // 发票编辑（确认单）
+  // // 发票编辑（销售订单）
   // oupdate: (data, params) => http(api + "receiptsave", data, "post", params),
   // // 发票详情
   // detail: (data, params) => http(api + "receiptinfo", data, "post", params),
@@ -51,4 +50,4 @@ export default {
   // // 认领资金开票编辑
   // editbytrade: (data, params) => http(api + 'editbytrade', data, 'post', params),
 
-};
+}

src/assets/js/linkType.js

@@ -9,9 +9,9 @@ const capitalType = [
   { code: "3", name: "资金全部核销" },
 ];
 const orderType = [
-  { code: "1", name: "确认单未核销" },
-  { code: "2", name: "确认单部分核销" },
-  { code: "3", name: "确认单全部核销" },
+  { code: "1", name: "销售订单未核销" },
+  { code: "2", name: "销售订单部分核销" },
+  { code: "3", name: "销售订单全部核销" },
 ];
 const capitalFlowType = [
   { code: "1", name: "未认领" },
@@ -26,26 +26,26 @@ const relationType = [
   { code: "3", name: "关联完成" },
 ]
 const relationBasisType = [
-  { code: "2", name: "确认单=>资金" },
-  { code: "3", name: "资金=>确认单" },
+  { code: "2", name: "销售订单=>资金" },
+  { code: "3", name: "资金=>销售订单" },
   // { code: "4", name: "发票=>资金" },
   // { code: "5", name: "资金=>发票" },
 ]
 const RQList = [
-  { code: "1", name: "确认单=>发票",  },
-  { code: "2", name: "确认单=>资金",  },
-  { code: "3", name: "资金=>确认单",  },
+  { code: "1", name: "销售订单=>发票",  },
+  { code: "2", name: "销售订单=>资金",  },
+  { code: "3", name: "资金=>销售订单",  },
   { code: "4", name: "发票=>资金",},
   { code: "5", name: "资金=>发票", },
 ]
 const relationList = [
-  { code: "2", name: "确认单=>资金", active: ['order', 'capital'], orderType: ["", "4", ""], capitalType: ["4", "", ""], invoiceType: ["", "", ""], onces: [true, false, false] },
-  { code: "3", name: "资金=>确认单", active: ['capital', 'order'], orderType: ["", "4", ""], capitalType: ["4", "", ""], invoiceType: ["", "", ""], onces: [false, true, false] },
+  { code: "2", name: "销售订单=>资金", active: ['order', 'capital'], orderType: ["", "4", ""], capitalType: ["4", "", ""], invoiceType: ["", "", ""], onces: [true, false, false] },
+  { code: "3", name: "资金=>销售订单", active: ['capital', 'order'], orderType: ["", "4", ""], capitalType: ["4", "", ""], invoiceType: ["", "", ""], onces: [false, true, false] },
   { code: "4", name: "发票=>资金", active: ['invoice', 'capital'], orderType: ["", "", ""], capitalType: ["", "", "4"], invoiceType: ["", "4", ""], onces: [false, false, true] },
   { code: "5", name: "资金=>发票", active: ['capital', 'invoice'], orderType: ["", "", ""], capitalType: ["", "", "4"], invoiceType: ["", "4", ""], onces: [false, true, false] },
 ]
 const queryBasisList = [
-  { code: "1", name: "确认单", active: ['capital', 'order', 'invoice'] },
+  { code: "1", name: "销售订单", active: ['capital', 'order', 'invoice'] },
   { code: "2", name: "发票", active: ['capital', 'invoice', 'order',] },
   { code: "3", name: "资金", active: ['order', 'capital', 'invoice'] },
 

src/layout/components/Navbar.vue

@@ -48,7 +48,7 @@
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar">
+          <!-- <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar"> -->
 
           <template v-if="userInfo.nickname && userInfo.nickname.length <= 3">
             <div class="username">

src/mixins/companyHelper.js

@@ -61,7 +61,7 @@ const companyHelper = {
         // 超管公司改变后执行该方法(刷新列表页或自定义实现)
         if (isSupertube) onCompanyChange ? onCompanyChange() : onCompanyChangeInner()
       },
-      immediate: true,
+      immediate: false,
       deep: true
     }
   }

src/store/getters.js

@@ -16,7 +16,7 @@ const getters = {
   navList: state => state.user.navList,
   mainList: state => state.user.mainList,
   business_company: state => state.user.business_company,
-  business_companyNo: state => state.user.business_companyNo,
+  business_companyNo: state => state.currentCompany,
   isSupertube: state => state.user.isSupertube,
   userInfo: state => state.user.userInfo,
   roleProcess: state => state.user.roleProcess,

src/views/businessReportQuery/businessFinanceReport/index.vue

@@ -72,9 +72,10 @@ export default {
   },
   mounted() {
     this.activeName = "1";
+    this.onCompanyChange() //MARK
   },
   methods: {
-    onCompanyChange(){this.isHasCurrentCompany()}
+    onCompanyChange(){this.isHasCurrentCompany()} //MARK
   },
 };
 </script>

src/views/businessReportQuery/businessFinanceReport/real-time-export.vue

@@ -118,14 +118,14 @@ export default {
         // },
         // {
         //   value: "1",
-        //   label: "确认单台账",
+        //   label: "销售订单台账",
         //   start: "",
         //   end: "",
         //   url: "Admin/downreportqrdtz",
         // },
         // {
         //   value: "2",
-        //   label: "确认单明细",
+        //   label: "销售订单明细",
         //   start: "",
         //   end: "",
         //   url: "Admin/downreportqrd",
@@ -161,7 +161,7 @@ export default {
         // },
         // {
         //   value: "7",
-        //   label: "核算确认单",
+        //   label: "核算销售订单",
         //   start: "",
         //   end: "",
         //   url: "downqrd",

src/views/businessReportQuery/businessProductReport/index.vue

@@ -56,11 +56,14 @@ export default {
       activeName: "table3",
     };
   },
+  mounted(){
+    this.onCompanyChange() //MARK
+  },
   methods: {
     //   handleClick(tab, event) {
     //     console.log(tab, event);
     //   }
-    onCompanyChange(){
+    onCompanyChange(){ //MARK
       this.isHasCurrentCompany()
     }
   },

src/views/businessReportQuery/businessPurchaseReport/index.vue

@@ -114,8 +114,11 @@ export default {
       activeName: "table1",
     };
   },
+  mounted(){
+    this.onCompanyChange() //MARK
+  },
   methods: {
-    onCompanyChange(){
+    onCompanyChange(){ //MARK
       this.isHasCurrentCompany()
     }
     //   handleClick(tab, event) {

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

@@ -667,7 +667,7 @@ const table9 = [
   // },
   {
     prop: 'addtime',
-    label: '确认单下单时间',
+    label: '销售订单下单时间',
     minWidth: '155px'
   },
   {
@@ -983,7 +983,7 @@ const table11 = [
   },
   {
     prop: 'orderCode',
-    label: '关联确认单',
+    label: '关联销售订单',
     minWidth: '155px'
   },
   {
@@ -998,7 +998,7 @@ const table11 = [
   },
   {
     prop: 'poaddtime',
-    label: '确认单下单日期',
+    label: '销售订单下单日期',
     minWidth: '155px'
   },
   {
@@ -1109,7 +1109,7 @@ const table12 = [
   },
   {
     prop: 'orderCode',
-    label: '确认单编号',
+    label: '销售订单编号',
     minWidth: '155px'
   },
   {

src/views/businessReportQuery/businessSaleReport/index.vue

@@ -182,9 +182,12 @@ export default {
       activeName: "table1"
     };
   },
+  mounted(){
+    this.onCompanyChange() //MARK
+  },
   methods: {
-    onCompanyChange(){
-      this.isHasCurrentCompany()      
+    onCompanyChange(){ //MARK 
+      this.isHasCurrentCompany()  
     }
     //   handleClick(tab, event) {
     //     console.log(tab, event);

src/views/businessReportQuery/businessSaleReportOrder/index.vue

@@ -72,9 +72,10 @@ export default {
   },
   mounted() {
     this.activeName = "1";
+    this.onCompanyChange() //MARK
   },
   methods: {
-    onCompanyChange(){
+    onCompanyChange(){ //MARK
       this.isHasCurrentCompany()
     }
   },

src/views/businessReportQuery/businessSaleReportOrder/real-time-export.vue

@@ -118,14 +118,14 @@ export default {
         // },
         // {
         //   value: "1",
-        //   label: "确认单台账",
+        //   label: "销售订单台账",
         //   start: "",
         //   end: "",
         //   url: "Admin/downreportqrdtz",
         // },
         // {
         //   value: "2",
-        //   label: "确认单明细",
+        //   label: "销售订单明细",
         //   start: "",
         //   end: "",
         //   url: "Admin/downreportqrd",
@@ -161,7 +161,7 @@ export default {
         // },
         // {
         //   value: "7",
-        //   label: "核算确认单",
+        //   label: "核算销售订单",
         //   start: "",
         //   end: "",
         //   url: "downqrd",

src/views/businessReportQuery/businessStockReport/index.vue

@@ -72,9 +72,10 @@ export default {
   },
   mounted() {
     this.activeName = "1";
+    this.onCompanyChange() //MARK
   },
   methods: {
-    onCompanyChange(){
+    onCompanyChange(){ //MARK
       this.isHasCurrentCompany()
     }
   },

src/views/businessReportQuery/businessStockReport/real-time-export.vue

@@ -118,14 +118,14 @@ export default {
         // },
         // {
         //   value: "1",
-        //   label: "确认单台账",
+        //   label: "销售订单台账",
         //   start: "",
         //   end: "",
         //   url: "Admin/downreportqrdtz",
         // },
         // {
         //   value: "2",
-        //   label: "确认单明细",
+        //   label: "销售订单明细",
         //   start: "",
         //   end: "",
         //   url: "Admin/downreportqrd",
@@ -161,7 +161,7 @@ export default {
         // },
         // {
         //   value: "7",
-        //   label: "核算确认单",
+        //   label: "核算销售订单",
         //   start: "",
         //   end: "",
         //   url: "downqrd",

src/views/goodStore/active/components/baseForm.vue

@@ -471,7 +471,7 @@ export default {
     this.initForm();
   },
   methods: {
-    onCompanyChange(){
+    onCompanyChange(){ //MARK
       this.ruleForm.company_id = this.currentCompany
     },
     async initForm() {

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -1144,7 +1144,7 @@ export default {
     this.initForm();
   },
   methods: {
-    onCompanyChange(){
+    onCompanyChange(){ //MARK
      if(this.type === 'add'){
       this.ruleForm.company_id = this.currentCompany
      }

src/views/goodStore/goodsCost/index.vue

@@ -369,8 +369,8 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            (powers.some((i) => i == '010') &&
-            !(scope.row.status + '' === '7' || scope.row.status + '' === '8')) && !isSupertube
+           ( (powers.some((i) => i == '010') &&
+            !(scope.row.status + '' === '7' || scope.row.status + '' === '8')) && !isSupertube) && String(scope.row.createrid) !== '0'
           "
           effect="dark"
           content="复制商品"

src/views/goodStore/supplierGoodsCost/components/baseForm.vue

@@ -1142,9 +1142,11 @@ export default {
   },
   mounted() {
     this.initForm();
+    // this.onCompanyChange() //MARK
+    this.$nextTick(() => this.onCompanyChange())  //MARK
   },
   methods: {
-    onCompanyChange(){
+    onCompanyChange(){ //MARK
       // this.ruleForm.supplierNo = this.currentCompany
       this.supplierNosearchChange({code: this.currentCompany})
     },
@@ -1157,7 +1159,7 @@ export default {
       this.good_type_change();
       await this.get_golpricelast();
       this.stock_change();
-      this.onCompanyChange()
+      this.onCompanyChange() //MARK
       this.loading = false;
     },
     async number_change(e, key) {

src/views/interest/action/index.vue

@@ -257,7 +257,7 @@ export default {
   },
 
   methods: {
-    onCompanyChange(){
+    onCompanyChange(){ //MARK
        this.initactionList();
     },
     recursionFilterActionList(list) {

src/views/interest/dataShare/index.vue

@@ -329,11 +329,11 @@ export default {
       this.modelId = id;
       this.isDetail = isDetail;
     },
-    onCompanyChange(){
-      this.pageInfo.curr = 1;
-      this.parmValue.page = 1;
-      this.searchList();
-    },
+    // onCompanyChange(){ MARK
+    //   this.pageInfo.curr = 1;
+    //   this.parmValue.page = 1;
+    //   this.searchList();
+    // },
     /**
      * 启用/禁用
      * @param {String} id id

src/views/interest/organize/index.vue

@@ -239,7 +239,7 @@ export default {
       };
       this.searchList();
     },
-    onCompanyChange() {
+    onCompanyChange() { //TODO
       this.parmValue.pid = "";
       this.titleList = [];
       this.depart = [];

src/views/interest/processPermission/index.vue

@@ -140,11 +140,11 @@ export default {
     },
   },
   mounted() {
-    this.initperActionList();
+    this.initperActionList(); //MARK
   },
 
   methods: {
-    onCompanyChange(){
+    onCompanyChange(){ //MARK
        this.initperActionList();
     },
     // 全选/全不选

src/views/netOrderEntry/netOrderEnter/addEdit.vue

@@ -26,7 +26,7 @@
             size="mini"
           >
             <el-divider>
-              <el-tag size="mini">确认单信息</el-tag>
+              <el-tag size="mini">销售订单信息</el-tag>
             </el-divider>
 
             <el-row>
@@ -390,7 +390,7 @@ export default {
     return {
       loading: false,
       detailLoading: false,
-      title: '添加确认单信息',
+      title: '添加销售订单信息',
       khName: '',
       accounts: [],
       cat_id_name: '',
@@ -606,13 +606,13 @@ export default {
       await this.getAccounts()
 
       if (this.id === '003') {
-        this.title = '添加确认单信息'
+        this.title = '添加销售订单信息'
         this.rulesThis = this.rules
       } else if (this.id === '005') {
-        this.title = '修改确认单信息'
+        this.title = '修改销售订单信息'
         this.rulesThis = this.rules
       } else {
-        this.title = '确认单信息详情'
+        this.title = '销售订单信息详情'
         this.rulesThis = {}
       }
       await this.resetForm()

src/views/netOrderEntry/netOrderEnter/index.vue

@@ -223,7 +223,7 @@ export default {
   },
   data() {
     const mapSelectValue2Query = {
-      orderCode: "确认单编号",
+      orderCode: "销售订单编号",
       cgdNo: "采购单编号",
       // sale_name: "销售员",
       // cgd_sale: "采购员"

src/views/purchaseIn/purchaseReturn/columns.js

@@ -9,7 +9,7 @@ export default [
     label: '退货单编号',
     width: '160'
   },
-  // {确认单编号}
+  // {销售订单编号}
   // {order_type类型}
   // {
   //   prop: "apply_name",

src/views/reportQuery/financeReport/real-time-export.vue

@@ -118,14 +118,14 @@ export default {
         // },
         // {
         //   value: "1",
-        //   label: "确认单台账",
+        //   label: "销售订单台账",
         //   start: "",
         //   end: "",
         //   url: "Admin/downreportqrdtz",
         // },
         // {
         //   value: "2",
-        //   label: "确认单明细",
+        //   label: "销售订单明细",
         //   start: "",
         //   end: "",
         //   url: "Admin/downreportqrd",
@@ -161,7 +161,7 @@ export default {
         // },
         // {
         //   value: "7",
-        //   label: "核算确认单",
+        //   label: "核算销售订单",
         //   start: "",
         //   end: "",
         //   url: "downqrd",

src/views/reportQuery/saleReport/components/columns.js

@@ -667,7 +667,7 @@ const table9 = [
   // },
   {
     prop: 'addtime',
-    label: '确认单下单时间',
+    label: '销售订单下单时间',
     minWidth: '155px'
   },
   {
@@ -983,7 +983,7 @@ const table11 = [
   },
   {
     prop: 'orderCode',
-    label: '关联确认单',
+    label: '关联销售订单',
     minWidth: '155px'
   },
   {
@@ -998,7 +998,7 @@ const table11 = [
   },
   {
     prop: 'poaddtime',
-    label: '确认单下单日期',
+    label: '销售订单下单日期',
     minWidth: '155px'
   },
   {
@@ -1109,7 +1109,7 @@ const table12 = [
   },
   {
     prop: 'orderCode',
-    label: '确认单编号',
+    label: '销售订单编号',
     minWidth: '155px'
   },
   {

src/views/reportQuery/saleReportOrder/real-time-export.vue

@@ -118,14 +118,14 @@ export default {
         // },
         // {
         //   value: "1",
-        //   label: "确认单台账",
+        //   label: "销售订单台账",
         //   start: "",
         //   end: "",
         //   url: "Admin/downreportqrdtz",
         // },
         // {
         //   value: "2",
-        //   label: "确认单明细",
+        //   label: "销售订单明细",
         //   start: "",
         //   end: "",
         //   url: "Admin/downreportqrd",
@@ -161,7 +161,7 @@ export default {
         // },
         // {
         //   value: "7",
-        //   label: "核算确认单",
+        //   label: "核算销售订单",
         //   start: "",
         //   end: "",
         //   url: "downqrd",

src/views/reportQuery/stockReport/real-time-export.vue

@@ -118,14 +118,14 @@ export default {
         // },
         // {
         //   value: "1",
-        //   label: "确认单台账",
+        //   label: "销售订单台账",
         //   start: "",
         //   end: "",
         //   url: "Admin/downreportqrdtz",
         // },
         // {
         //   value: "2",
-        //   label: "确认单明细",
+        //   label: "销售订单明细",
         //   start: "",
         //   end: "",
         //   url: "Admin/downreportqrd",
@@ -161,7 +161,7 @@ export default {
         // },
         // {
         //   value: "7",
-        //   label: "核算确认单",
+        //   label: "核算销售订单",
         //   start: "",
         //   end: "",
         //   url: "downqrd",

src/views/sellOut/beforeReturnGoodWorkOrder/index.vue

@@ -119,9 +119,9 @@
         <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
+            :type="String(scope.row.status) === '1' ? 'warning' : ''"
             v-text="
-              (statusOptions.find((item) => item.value == scope.row.status) || {})
+              (statusOptions.find((item) => item.value == String(scope.row.status)) || {})
                 .label || '--'
             "
           ></el-tag>
@@ -288,25 +288,20 @@ export default {
     if (back) {
       this.parmValue = JSON.parse(back);
       const { page, size } = this.parmValue;
-      // this.parmValue.start = start || last_start;
-      // this.parmValue.end = end || last_end;
-      // if(this.parmValue.companyNo.length>0){
-      //     this.customerCode = [this.parmValue.companyNo] ;
-      // }
-
+      
       this.pageInfo = {
         size: size,
         curr: page,
         total: 0,
       };
+
       //多选条件
-      this.select = this.parmValue.select;
-      // this.sselect = this.parmValue.sselect;
-      this.s_input = this.parmValue.s_input;
+      this.queryKey = this.parmValue.queryKey;
+      this.queryValue = this.parmValue.queryValue;
     } else {
       this.select = "outChildCode";
-      //  this.sselect = "创建时间"
     }
+    
     this.searchList();
   },
 
@@ -314,7 +309,7 @@ export default {
     async supplierChange(e) {
       const { code, label } = e;
       this.supplierNo = code ? [code] : [];
-      this.searchList()
+      this.searchList();
     },
     customer_code_change(e) {
       if (e && e.code) {
@@ -322,7 +317,6 @@ export default {
       } else {
         this.parmValue.customer_code = [];
       }
-      this.searchList();
     },
     handleExport(){
       if (!this.loading) {
@@ -389,9 +383,8 @@ export default {
         };
 
         //有多选框的条件
-        this.parmValue.select = this.select;
-        // this.parmValue.sselect = this.sselect ;
-        this.parmValue.s_input = this.s_input;
+        this.parmValue.queryKey = this.queryKey;
+        this.parmValue.queryValue = this.queryValue;
         let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
           router: this.$route.path,
@@ -424,6 +417,8 @@ export default {
         curr: 1,
         total: 0,
       };
+
+      this.queryValue = ''
       this.searchList();
     },
 
@@ -496,22 +491,6 @@ export default {
       this.loading = false;
     },
 
-    //物流公司查询
-    async handleCompany(e) {
-      console.log(e, "要求传快递简称，不传id"); //
-      if (e && e.code) {
-        this.parmValue.postCompany = [e.shortName];
-        this.parmValue.page = 1;
-      }
-      await this.searchList();
-    },
-
-    company_idsearchChange(e) {
-      const { code } = e;
-      this.parmValue.companyNo = code || "";
-      this.searchList()
-    },
-
     // 时间
     async handleTime(e) {
       if (e.startTime !== "") {

src/views/sellOut/deliveryWorkOrder/columns.js

@@ -12,7 +12,7 @@ export default [
   },
   {
     prop: 'orderCode',
-    label: '确认单编号',
+    label: '销售订单编号',
     width: '160'
   },
   {
@@ -175,7 +175,7 @@ export const sendOutOrderColumns = [
 
 export const head = [
   '发货工单号',
-  '确认单编号',
+  '销售订单编号',
   '发货申请单号',
   '业务公司编号',
   '业务公司名称',

src/views/sellOut/deliveryWorkOrder/index.vue

@@ -210,7 +210,7 @@
                     slot="prepend"
                     placeholder="关键字类型"
                   >
-                    <el-option label="确认单编号" value="orderCode" />
+                    <el-option label="销售订单编号" value="orderCode" />
                     <el-option label="发货工单编号" value="outChildCode" />
                     <el-option label="商品成本编号" value="spuCode" />
                     <el-option label="发货单编号" value="outCode" />

src/views/sellOut/hawbWorkbench/index.vue

@@ -264,7 +264,7 @@ export default {
       this.computeTime()
     },
 
-    onCompanyChange() {
+    onCompanyChange() { // TODO
       this.resetState()
       this.initData()
     },

src/views/sellOut/project/components/addForm.vue

@@ -377,7 +377,7 @@ export default {
     this.initForm()
   },
   methods: {
-    onCompanyChange() {
+    onCompanyChange() { // MARK
       this.ruleForm.companyNo = this.currentCompany
     },
     // 商品要求阶梯修改

src/views/sellOut/returnGoodWorkOrder/columns.js

@@ -1,5 +1,5 @@
 export default [
-  { type: 'selection', fixed: 'left', _noset_: true },
+  // { type: 'selection', fixed: 'left', _noset_: true },
   {
     prop: 'id',
     label: 'ID',

src/views/sellOut/returnGoodWorkOrder/index.vue

@@ -159,7 +159,7 @@
         </template>
 
         <template #stock_type="{scope}">
-          <el-tag size="mini">{{scope.row.type === '1' ? '销售仓' : '次品仓'}}</el-tag>
+          <el-tag :type="scope.row.type !== '1' ? 'warning' : ''" size="mini">{{scope.row.type === '1' ? '销售仓' : '次品仓'}}</el-tag>
         </template>
 
         <template #sendWsm="{scope}">
@@ -323,6 +323,8 @@ export default {
     if (back) {
       this.parmValue = JSON.parse(back);
       const { page, size } = this.parmValue;
+      this.queryKey = this.parmValue.queryKey
+      this.queryValue = this.parmValue.queryValue
       // this.parmValue.start = start || last_start;
       // this.parmValue.end = end || last_end;
       // if(this.parmValue.companyNo.length>0){
@@ -423,9 +425,9 @@ export default {
         };
 
         //有多选框的条件
-        this.parmValue.select = this.select;
+        this.parmValue.queryKey = this.queryKey;
         // this.parmValue.sselect = this.sselect ;
-        this.parmValue.s_input = this.s_input;
+        this.parmValue.queryValue = this.queryValue;
         let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
           router: this.$route.path,
@@ -452,6 +454,8 @@ export default {
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
+
+      this.queryValue = ""
       
       // 表格 - 分页
       this.pageInfo = {

src/views/sellOut/salesOrder/components/child-list.vue

@@ -27,7 +27,7 @@
       <el-table-column
         show-overflow-tooltip
         prop="orderCode"
-        label="确认单编号"
+        label="销售订单编号"
         width="160"
       />
 

src/views/sellOut/salesOrder/components/order-out-table.vue

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

src/views/sellOut/sellAfterApply/index.vue

@@ -279,7 +279,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="routeGoto('sellAfterApplyDetail', { id: scope.row.returnCode })"
+              @click="getRouter('sellAfterApplyDetail', scope.row.returnCode)"
             ></i>
           </el-tooltip>
         </template>
@@ -424,6 +424,28 @@ export default {
     };
   },
   mounted() {
+    const { back } = this.$route.query;
+    if (back) {
+      this.parmValue = JSON.parse(back);
+      const { page, size } = this.parmValue;
+      
+      if (this.parmValue.customer_code.length > 0) {
+        this.customerCode = [this.parmValue.customer_code];
+      }
+
+      this.pageInfo = {
+        size: size,
+        curr: page,
+        total: 0,
+      };
+      //多选条件
+      this.select = this.parmValue.select;
+      // this.sselect = this.parmValue.sselect;
+      this.input = this.parmValue.input;
+    } else {
+      this.select = "orderCode";
+      //  this.sselect = "创建时间"
+    }
     this.searchList();
   },
 
@@ -483,6 +505,27 @@ export default {
           });
       }
     },
+    getRouter(toRouter, queryId) {
+      if (toRouter && queryId) {
+        let model = {
+          id: queryId,
+          type: "view",
+        };
+
+        //有多选框的条件
+        this.parmValue.select = this.select;
+        this.parmValue.input = this.input;
+        let routerModel = {
+          options: JSON.parse(JSON.stringify(this.parmValue)),
+          router: this.$route.path,
+        };
+        model.preModel = JSON.stringify(routerModel);
+
+        this.routeGoto(toRouter, model);
+      } else {
+        this.$message.warning("暂未找到相关流程！");
+      }
+    },
     restSearch() {
       this.customerCode = [];
       this.select = "serviceNum";

src/views/sellOut/sellOutOrder/columns.js

@@ -431,8 +431,8 @@ const head = [
   '采购单编号',
   '采购单状态',
   '采购员',
-  '确认单号',
-  '确认单时间',
+  '销售订单号',
+  '销售订单时间',
   '产品编号',
   '产品名称',
   '规格',
@@ -443,7 +443,7 @@ const head = [
   '物流费',
   '发货方式',
   '采购单价',
-  '确认单备注',
+  '销售订单备注',
   '采购数量',
   '采购货款',
   '发货数量',

src/views/sellOut/sellOutOrder/components/child-list.vue

@@ -28,7 +28,7 @@
       <el-table-column
         show-overflow-tooltip
         prop="orderCode"
-        label="确认单编号"
+        label="销售订单编号"
         width="160"
       />
 

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

@@ -22,7 +22,6 @@
       <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 />

src/views/sellOut/zixunOrder/components/addEditForm.vue

@@ -427,9 +427,9 @@ export default {
       },
     };
   },
-  async mounted() {
+  async mounted() { 
     await this.initForm();
-    await this.onCompanyChange()
+    await this.onCompanyChange() // MARK
     
   },
   watch: {
@@ -445,7 +445,7 @@ export default {
     },
   },
   methods: {
-    onCompanyChange(){
+    onCompanyChange(){ //MARK
       this.ruleForm.companyNo = this.currentCompany
     },
     async initForm() {

src/views/standingBook/components/detail19/columns.js

@@ -12,7 +12,7 @@ const columns = [
   },
   {
     prop: 'orderCode',
-    label: '确认单编号',
+    label: '销售订单编号',
     width: '160'
   },
   {
@@ -126,7 +126,7 @@ const listColumens = [
   },
   {
     prop: 'orderCode',
-    label: '确认单编号',
+    label: '销售订单编号',
     width: '160'
   },
   {

src/views/standingBook/components/detail4/columns.js

@@ -90,7 +90,7 @@ const listColumns = [
     label: '退货单编号',
     width: '160'
   },
-  // {确认单编号}
+  // {销售订单编号}
   // {order_type类型}
   // {
   //   prop: "apply_name",

src/views/stock/allot/index.vue

@@ -377,7 +377,7 @@ export default {
       this.modelId = id;
       this.isDetail = isDetail;
     },
-    onCompanyChangeInner() {
+    onCompanyChangeInner() { //MARK
       this.stockNo;
       this.pageInfo.curr = 1;
       this.parmValue.page = 1;

src/views/stock/stockCount/components/spaceCount/index.vue

@@ -161,7 +161,7 @@ export default {
     };
   },
   mounted() {
-    // this.onCompanyChange()
+    // this.onCompanyChange() MARK
     this.searchList();
   },
   watch:{

src/views/stock/stockWarning/index.vue

@@ -344,7 +344,7 @@ export default {
       this.sitem = sitem;
     },
 
-    onCompanyChangeInner() {
+    onCompanyChangeInner() { //MARK
       this.parmValue.stock_code = [];
       this.stock_code = "";
       this.parmValue.companyNo = this.currentCompany

src/views/stock/survey/index.vue

@@ -364,8 +364,7 @@ export default {
   },
   mounted() {
     this.selectKey = this.selectOptions[0].value;
-    console.log(this.selectKey)
-    this.onCompanyChangeInner()
+    this.onCompanyChangeInner() //MARK
   },
 
   methods: {
@@ -449,7 +448,7 @@ export default {
       } else {
       }
     },
-    onCompanyChangeInner() {
+    onCompanyChangeInner() { //MARK
       this.parmValue.stock_code = [];
       this.stock_code = "";
       this.pageInfo.curr = 1

src/views/supplierInterest/supplierProcessPermission/index.vue

@@ -138,7 +138,7 @@ export default {
   },
 
   methods: {
-    onCompanyChange(){
+    onCompanyChange(){ //MARK
        this.initperActionList();
     },
     // 全选/全不选

src/views/supplierPurchaseIn/supplierPurchaseReturn/columns.js

@@ -9,7 +9,7 @@ export default [
     label: '退货单编号',
     width: '160'
   },
-  // {确认单编号}
+  // {销售订单编号}
   // {order_type类型}
   // {
   //   prop: "apply_name",

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/columns.js

@@ -26,12 +26,12 @@ export default [
     _slot_: 'status',
     width: '80px'
   },
-  {
-    prop: 'type',
-    label: '仓库类型',
-    _slot_: 'stock_type',
-    width: '100px'
-  },
+  // {
+  //   prop: 'type',
+  //   label: '仓库类型',
+  //   _slot_: 'stock_type',
+  //   width: '100px'
+  // },
   {
     prop: 'order_type',
     label: '商品类型',

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/index.vue

@@ -114,7 +114,7 @@
         <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
+            :type="scope.row.status == '1' ? 'warning' : ''"
             v-text="
               (statusOptions.find((item) => item.value == scope.row.status) || {})
                 .label || '--'
@@ -157,7 +157,7 @@
         </template>
 
         <template #stock_type="{scope}">
-          <el-tag size="mini">{{scope.row.type === '1' ? '销售仓' : '次品仓'}}</el-tag>
+          <el-tag :type="String(scope.row.type) !== '1' ? 'warning' : ''" size="mini">{{scope.row.type === '1' ? '销售仓' : '次品仓'}}</el-tag>
         </template>
 
         <template #order_type="{ scope }">

src/views/supplierSellOut/supplierDeliveryWorkOrder/columns.js

@@ -12,7 +12,7 @@ export default [
   },
   {
     prop: 'orderCode',
-    label: '确认单编号',
+    label: '销售订单编号',
     width: '160'
   },
   {
@@ -169,7 +169,7 @@ export const sendOutOrderColumns = [
 
 export const head = [
   '发货工单号',
-  '确认单编号',
+  '销售订单编号',
   '发货申请单号',
   '业务公司编号',
   '业务公司名称',

src/views/supplierSellOut/supplierDeliveryWorkOrder/index.vue

@@ -186,7 +186,7 @@
                       slot="prepend"
                       placeholder="关键字类型"
                     >
-                      <el-option label="确认单编号" value="orderCode" />
+                      <el-option label="销售订单编号" value="orderCode" />
                       <el-option label="发货工单编号" value="outChildCode" />
                       <el-option label="商品成本编号" value="spuCode" />
                       <el-option label="发货单编号" value="outCode" />

src/views/supplierSellOut/supplierReturnWorkOrder/index.vue

@@ -154,7 +154,7 @@
         </template>
 
         <template #stock_type="{scope}">
-          <el-tag size="mini">{{scope.row.type === '1' ? '销售仓' : '次品仓'}}</el-tag>
+          <el-tag :type="String(scope.row.type) !== '1' ? 'warning' : ''" size="mini">{{scope.row.type === '1' ? '销售仓' : '次品仓'}}</el-tag>
         </template>
 
         <template #sendWsm="{scope}">

src/views/supplierSellOut/supplierSellOutOrder/columns.js

@@ -428,8 +428,8 @@ const head = [
   '采购单编号',
   '采购单状态',
   '采购员',
-  '确认单号',
-  '确认单时间',
+  '销售订单号',
+  '销售订单时间',
   '产品编号',
   '产品名称',
   '规格',
@@ -440,7 +440,7 @@ const head = [
   '物流费',
   '发货方式',
   '采购单价',
-  '确认单备注',
+  '销售订单备注',
   '采购数量',
   '采购货款',
   '发货数量',

src/views/supplierSellOut/supplierSellOutOrder/components/child-list.vue

@@ -28,7 +28,7 @@
       <el-table-column
         show-overflow-tooltip
         prop="orderCode"
-        label="确认单编号"
+        label="销售订单编号"
         width="160"
       />