Merge branch '经销商_lin' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

src/views/valueAddedService/orderSettleManag/index.vue

@@ -21,8 +21,8 @@ export default {
   components: { collect, offline },
   data() {
     return {
-      tabType: 'collect',
-      tabTypeCk: 'collect',
+      tabType: this?.$route?.params?.pageType ? ({ SELF: "offline", ONLINE: "collect" })[this?.$route?.params?.pageType] || 'collect' : 'collect',
+      tabTypeCk: this?.$route?.params?.pageType ? ({ SELF: "offline", ONLINE: "collect" })[this?.$route?.params?.pageType] || 'collect' : 'collect',
     }
   },
   methods: {

src/views/valueAddedService/orderSettleManag/pages/collect.vue

@@ -1,7 +1,7 @@
 <template>
   <template-page ref="pageRef" :get-list="getList" :exportList="exportList" :table-attributes="tableAttributes"
     :table-events="tableEvents" :moreParameters="moreParameters" :column-parsing="columnParsing" :operation="operation()"
-    :operationColumnWidth="200" :optionsEvensGroup="optionsEvensGroup">
+    :operationColumnWidth="200" :optionsEvensGroup="optionsEvensGroup" :defaultSearchData="defaultSearchData">
     <div class="cartographer">
       <el-dialog :title="formTypeName[formType]" width="100%" :modal="false" :visible.sync="formDialog"
         :before-close="formCancel">
@@ -60,6 +60,7 @@ export default {
         pgIncreItems: []
       },
       formDialog: false,
+      defaultSearchData: [],
     }
   },
   computed: {
@@ -115,6 +116,11 @@ export default {
       ]
     }
   },
+  created() {
+    if (this.pageCode) {
+      this.defaultSearchData = [{ "param": "a.id", "compare": "=", "value": this.pageCode, label: "订单单号" }]
+    }
+  },
   methods: {
     selectable(row, index) {
       return ["PAID"].includes(Object.entries(row.selectMapData.payStatus).find(([key, val]) => val == row.payStatus)?.[0]) &&

src/views/valueAddedService/orderSettleManag/pages/offline.vue

@@ -1,7 +1,7 @@
 <template>
   <template-page ref="pageRef" :get-list="getList" :exportList="exportList" :table-attributes="tableAttributes"
     :table-events="tableEvents" :moreParameters="moreParameters" :column-parsing="columnParsing" :operation="operation()"
-    :operationColumnWidth="200" :optionsEvensGroup="optionsEvensGroup">
+    :operationColumnWidth="200" :optionsEvensGroup="optionsEvensGroup" :defaultSearchData="defaultSearchData">
     <div class="cartographer">
       <el-dialog :title="formTypeName[formType]" width="100%" :modal="false" :visible.sync="formDialog"
         :before-close="formCancel">
@@ -31,11 +31,14 @@
     <div class="cartographer">
       <el-dialog title="新增" width="100%" :modal="false" :visible.sync="addFormDialog" :before-close="addFormCancel">
         <zj-form-container v-if="addFormDialog" ref="addFormRef" :form-data="addFormData">
-          <zj-form-module  v-if="addFormDialog" title="客户信息" label-width="80px" :form-data="addFormData" :form-items="basicInfo">
+          <zj-form-module v-if="addFormDialog" title="客户信息" label-width="80px" :form-data="addFormData"
+            :form-items="basicInfo">
           </zj-form-module>
-          <zj-form-module  v-if="addFormDialog" title="服务信息" label-width="80px" :form-data="addFormData" :form-items="serviceInfo">
+          <zj-form-module v-if="addFormDialog" title="服务信息" label-width="80px" :form-data="addFormData"
+            :form-items="serviceInfo">
           </zj-form-module>
-          <zj-form-module  v-if="addFormDialog" title="产品信息" label-width="80px" :form-data="addFormData" :form-items="productInfo">
+          <zj-form-module v-if="addFormDialog" title="产品信息" label-width="80px" :form-data="addFormData"
+            :form-items="productInfo">
           </zj-form-module>
         </zj-form-container>
         <div slot="footer" class="dialog-footer">
@@ -98,6 +101,7 @@ export default {
       formDialog: false,
       addFormDialog: false,
       formDshType: false,
+      defaultSearchData: [],
       addFormData: {
         shiyongleixing: "按使用年限",
         "amount": "",
@@ -213,11 +217,16 @@ export default {
       }
     }
   },
+  created() {
+    if (this.pageCode) {
+      this.defaultSearchData = [{ "param": "a.id", "compare": "=", "value": this.pageCode, label: "订单单号" }]
+    }
+  },
   methods: {
     wxPay(id) {
       increOrderSettleGeneratePayCode({ id }).then(res => {
         this.codeUrl = res.data.codeUrl
-        if(this.$refs?.payQRCode?.innerHTML){
+        if (this.$refs?.payQRCode?.innerHTML) {
           this.$refs.payQRCode.innerHTML = '';
         }
         this.$nextTick(() => {
@@ -301,14 +310,14 @@ export default {
             return ["PAID", "REFUND"].includes(row.payStatus)
           },
           click: ({ row, index, column }) => {
-				this.$router.push({
-					name: 'workOrderPool',
-					params: {
-            pageName: row.id,
-						pageType: 'pgIncreItemId',
-						pageCode: row.id,
-					},
-				})
+            this.$router.push({
+              name: 'workOrderPool',
+              params: {
+                pageName: row.id,
+                pageType: 'pgIncreItemId',
+                pageCode: row.id,
+              },
+            })
           }
         },
         examine: {