Merge branch 'xiaozy_产品列表' of http://121.196.213.68:3000/xiaozhiyong/refinery-admin into lixuan

src/components/autocomplete/index.vue

@@ -59,9 +59,18 @@ export default {
       if (query !== "") {
         this.loading = true;
         let params = {};
-        this.config.autocompleteKey
-          ? (params[this.config.autocompleteKey] = query)
-          : (params["queryTypeGet"] = query);
+        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;
+        }
+        if (type.includes("String")) {
+          this.config.autocompleteKey
+            ? (params[this.config.autocompleteKey] = query)
+            : (params["queryTypeGet"] = query);
+        }
         this.config.serveTarget(params).then((res) => {
           let timeInstance = setTimeout(() => {
             this.loading = false;

src/components/generalDetails/index.vue

@@ -117,7 +117,7 @@ export default {
     init() {
       this.dataPage = this.mappingData.map(
         (mappingDataItem, mappingDataIndex) => {
-          let shineData = this.sourceData[mappingDataIndex];
+          let shineData = this.sourceData[mappingDataIndex] || {};
           return {
             title: mappingDataItem.carTitle,
             iconClass: mappingDataItem.iconClass || "iconjichuziliao",

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",

src/utils/index.js

@@ -55,3 +55,8 @@ export function isLicensePlate(no) {
 export function cellStyle() {
   return "text-align:center";
 }
+
+export function typeJudgment(object) {
+  let res = {}.__proto__.toString.call(object);
+  return res ? res : "";
+}

src/views/customerManagement/companyManagement/index.vue

@@ -282,7 +282,7 @@
             ></el-switch>
           </template>
         </el-table-column>
-        <el-table-column lable="审核标识">
+        <el-table-column label="审核标识">
           <template slot-scope="{ row }">
             <el-tag v-if="row.auditMark === 0" type="info" effect="dark"
               >未提交</el-tag

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: [
         {

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"

src/views/product/components/add.vue

@@ -110,7 +110,10 @@ export default {
       refineryList: [],
       configAutocomplete: {
         serveTarget: refineryInfoServe.findByEntity,
-        autocompleteKey: "refineryName",
+        autocompleteKey: {
+          key: "refineryName",
+          enableMark: "ENABLE",
+        },
         labelKey: "refineryName",
         valueKey: "id",
         placeholder: "炼厂名称",

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;

src/views/product/index.vue

@@ -7,6 +7,19 @@
         placeholder="产品名称"
         clearable
       ></el-input>
+      <el-select
+        v-model="parameter.params.productType"
+        placeholder="产品类型"
+        clearable
+      >
+        <el-option
+          v-for="(item, index) in productTypeList"
+          :key="index"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
       <!-- 炼厂名称 -->
       <autocomplete :params="parameter.params" :config="configAutocomplete" />
       <el-input
@@ -227,6 +240,24 @@ export default {
         batch: false,
         adjust: false,
       },
+      productTypeList: [
+        {
+          label: "0#柴",
+          value: "0#",
+        },
+        {
+          label: "-10#柴",
+          value: "-10#",
+        },
+        {
+          label: "92#汽",
+          value: "92#",
+        },
+        {
+          label: "95#汽",
+          value: "95#",
+        },
+      ],
       configAutocomplete: {
         serveTarget: refineryInfoServe.findByEntity,
         autocompleteKey: "refineryName",

src/views/refineryAccount/index.vue

@@ -35,7 +35,7 @@
     </div>
     <div class="table">
       <div class="operation">
-        <el-button @click="addition">新增炼厂账户</el-button>
+        <!-- <el-button @click="addition">新增炼厂账户</el-button> -->
         <el-button @click="addition">充值</el-button>
       </div>
       <el-table