From dcffab1d2ac282ab9ec05e72e1b666d4b1ca4175 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Wed, 22 Feb 2023 17:37:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/autocomplete/index.vue         | 12 ++--
 src/utils/dataType.js                         | 16 ++---
 .../enterpriseRecharge/index.vue              | 68 ++-----------------
 .../enterpriseRechargeDetails/index.vue       | 14 ++--
 src/views/product/components/adjust.vue       |  4 +-
 5 files changed, 28 insertions(+), 86 deletions(-)

diff --git a/src/components/autocomplete/index.vue b/src/components/autocomplete/index.vue
index 476e150..126bba9 100644
--- a/src/components/autocomplete/index.vue
+++ b/src/components/autocomplete/index.vue
@@ -59,14 +59,14 @@ export default {
       if (query !== "") {
         this.loading = true;
         let params = {};
-        if (
-          this.$utils
-            .typeJudgment(this.config.autocompleteKey)
-            .includes("Object")
-        ) {
+        let type = this.$utils.typeJudgment(this.config.autocompleteKey);
+        if (!type.includes("Object") && !type.includes("String")) return;
+
+        if (type.includes("Object")) {
           params[this.config.autocompleteKey.key] = query;
           params["enableMark"] = this.config.autocompleteKey.enableMark;
-        } else {
+        }
+        if (type.includes("String")) {
           this.config.autocompleteKey
             ? (params[this.config.autocompleteKey] = query)
             : (params["queryTypeGet"] = query);
diff --git a/src/utils/dataType.js b/src/utils/dataType.js
index ccaeece..f4230ef 100644
--- a/src/utils/dataType.js
+++ b/src/utils/dataType.js
@@ -18,14 +18,14 @@ export const rechargeTypeEnum = [
     label: "充值",
     value: "RECHARGE",
   },
-  {
-    label: "销账",
-    value: "REVOKE",
-  },
-  {
-    label: "赊销",
-    value: "CHARGE_SALES",
-  },
+  // {
+  //   label: "销账",
+  //   value: "REVOKE",
+  // },
+  // {
+  //   label: "赊销",
+  //   value: "CHARGE_SALES",
+  // },
   {
     label: "消费返利",
     value: "CONSUME_REBATE",
diff --git a/src/views/financialCenter/enterpriseRecharge/index.vue b/src/views/financialCenter/enterpriseRecharge/index.vue
index 3e88f74..e304fb9 100644
--- a/src/views/financialCenter/enterpriseRecharge/index.vue
+++ b/src/views/financialCenter/enterpriseRecharge/index.vue
@@ -34,7 +34,7 @@
           v-for="(item, index) in rechargeStatusEnum"
           :key="index"
           :label="item.label"
-          :value="item.value"
+          :value="item.value + ''"
         >
         </el-option>
       </el-select>
@@ -47,11 +47,11 @@
           v-for="(item, index) in auditMarkEnum"
           :key="index"
           :label="item.label"
-          :value="item.value"
+          :value="item.value + ''"
         >
         </el-option>
       </el-select>
-      <el-select
+      <!-- <el-select
         v-model="parameter.params.chargeSalesAuditMark"
         placeholder="赊账还款审核"
         clearable
@@ -63,7 +63,7 @@
           :value="item.value"
         >
         </el-option>
-      </el-select>
+      </el-select> -->
       <el-date-picker
         v-model="datetime"
         type="datetimerange"
@@ -141,7 +141,7 @@
 
         <el-table-column label="交易状态">
           <template slot-scope="{ row }">
-            <p v-if="row.transactionState">
+            <p>
               {{
                 rechargeStatusEnum.find(
                   (item) => item.value === row.transactionState
@@ -345,7 +345,6 @@ import generalDetails from "components/generalDetails/index.vue";
 import {
   rechargeTypeEnum,
   rechargeStatusEnum,
-  repaymentExamineEnum,
   accountStatusEnum,
 } from "utils/dataType.js";
 
@@ -377,13 +376,6 @@ export default {
         ...rechargeTypeEnum,
       ],
       rechargeStatusEnum: rechargeStatusEnum,
-      repaymentExamineEnum: [
-        {
-          label: "已拆分",
-          value: -3,
-        },
-        ...repaymentExamineEnum,
-      ],
       auditMarkEnum: [
         {
           label: "待审核",
@@ -427,24 +419,6 @@ export default {
         total: 0,
         params: {},
       },
-      rechargeTypeEnum: [
-        {
-          label: "充值",
-          value: "RECHARGE",
-        },
-        {
-          label: "销账",
-          value: "REVOKE",
-        },
-        {
-          label: "赊销",
-          value: "CHARGE_SALES",
-        },
-        {
-          label: "消费返利",
-          value: "CONSUME_REBATE",
-        },
-      ],
       LoopBackTypeEnum: [
         {
           label: "充值圈回",
@@ -463,38 +437,6 @@ export default {
           value: 4,
         },
       ],
-      rechargeStatusEnum: [
-        {
-          label: "已申请",
-          value: 0,
-        },
-        {
-          label: "已成功",
-          value: 1,
-        },
-        {
-          label: "已撤销",
-          value: -1,
-        },
-      ],
-      repaymentExamineEnum: [
-        {
-          label: "还款待审核",
-          value: 0,
-        },
-        {
-          label: "还款成功",
-          value: 1,
-        },
-        {
-          label: "还款失败",
-          value: -1,
-        },
-        {
-          label: "待还款",
-          value: -2,
-        },
-      ],
       oilCompanyMatch: [],
       mappingData: [
         {
diff --git a/src/views/financialCenter/enterpriseRechargeDetails/index.vue b/src/views/financialCenter/enterpriseRechargeDetails/index.vue
index 3e176b3..2138eb2 100644
--- a/src/views/financialCenter/enterpriseRechargeDetails/index.vue
+++ b/src/views/financialCenter/enterpriseRechargeDetails/index.vue
@@ -13,7 +13,7 @@
         :config="configAutocompleteSec"
       />
       <el-select
-        v-model="parameter.params.enableMark"
+        v-model="parameter.params.transactionType"
         placeholder="交易类型"
         clearable
       >
@@ -26,7 +26,7 @@
         </el-option>
       </el-select>
       <el-select
-        v-model="parameter.params.enableMark"
+        v-model="parameter.params.transactionState"
         placeholder="交易状态"
         clearable
       >
@@ -38,7 +38,7 @@
         >
         </el-option>
       </el-select>
-      <el-select
+      <!-- <el-select
         v-model="parameter.params.enableMark"
         placeholder="赊账还款审核"
         clearable
@@ -50,7 +50,7 @@
           :value="item.value"
         >
         </el-option>
-      </el-select>
+      </el-select> -->
       <el-date-picker
         v-model="datetime"
         type="datetimerange"
@@ -106,7 +106,7 @@
 
         <el-table-column label="交易状态">
           <template slot-scope="{ row }">
-            <p v-if="row.transactionState">
+            <p>
               {{
                 rechargeStatusEnum.find(
                   (item) => item.value === row.transactionState
@@ -135,7 +135,7 @@
         >
         </el-table-column>
 
-        <el-table-column label="赊账还款审核">
+        <!-- <el-table-column label="赊账还款审核">
           <template slot-scope="{ row }">
             <p v-if="row.transactionType && row.chargeSalesAuditMark">
               {{
@@ -149,7 +149,7 @@
               }}
             </p>
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column
           prop="businessLeader"
diff --git a/src/views/product/components/adjust.vue b/src/views/product/components/adjust.vue
index ffc97f4..31d384e 100644
--- a/src/views/product/components/adjust.vue
+++ b/src/views/product/components/adjust.vue
@@ -27,7 +27,7 @@
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="controlWindows.adjust = false">取 消</el-button>
+      <el-button @click="closeWindow">取 消</el-button>
       <el-button type="primary" @click="submit">确 定</el-button>
     </span>
   </el-dialog>
@@ -67,8 +67,8 @@ export default {
       });
     },
     closeWindow() {
-      this.form = {};
       this.$emit("closeWindow");
+      this.form = {};
       this.$nextTick(() => {
         this.$refs.form.clearValidate();
         this.controlWindows.adjust = false;