From 343bed9eaba18740b7e701f04a0deca0257d4ad2 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 28 Feb 2023 11:17:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../companyManagement/components/bank.vue          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/customerManagement/companyManagement/components/bank.vue b/src/views/customerManagement/companyManagement/components/bank.vue
index f7401bb..8b31dfb 100644
--- a/src/views/customerManagement/companyManagement/components/bank.vue
+++ b/src/views/customerManagement/companyManagement/components/bank.vue
@@ -85,13 +85,15 @@
             <el-link type="primary" :underline="false" @click="complete(row)"
               >完成
             </el-link>
-            <el-link
-              type="primary"
-              :underline="false"
+            <el-popconfirm
               v-if="tableData.length > 1"
-              @click="deleteRow($index, row)"
-              >删除
-            </el-link>
+              title="确定删除吗？"
+              @confirm="deleteRow($index, row)"
+            >
+              <el-link slot="reference" type="primary" :underline="false"
+                >删除
+              </el-link>
+            </el-popconfirm>
           </template>
         </el-table-column>
       </el-table>

From 6fdc081c611c51075524a983cb476528aeb3b2e7 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 28 Feb 2023 14:55:12 +0800
Subject: [PATCH 2/3] =?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/views/product/index.vue | 76 +++++++++++++++++++++++++------------
 1 file changed, 52 insertions(+), 24 deletions(-)

diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 81420d5..ceaa831 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -99,17 +99,23 @@
         </el-table-column>
         <el-table-column prop="refineryLevel" label="成本价" width="70">
           <template slot-scope="{ row }">
-            {{ row.floorPrice|toNumberFixed }}/{{ row.measurement|toNumberFixed }}
+            {{ row.floorPrice | toNumberFixed }}/{{
+              row.measurement | toNumberFixed
+            }}
           </template>
         </el-table-column>
         <el-table-column prop="refineryLevel" label="企业销售价" width="100">
           <template slot-scope="{ row }">
-            {{ row.salePrice2company|toNumberFixed }}/{{ row.measurement|toNumberFixed }}
+            {{ row.salePrice2company | toNumberFixed }}/{{
+              row.measurement | toNumberFixed
+            }}
           </template>
         </el-table-column>
         <el-table-column prop="refineryLevel" label="个人销售价" width="100">
           <template slot-scope="{ row }">
-            {{ row.salePrice2personal|toNumberFixed }}/{{ row.measurement|toNumberFixed }}
+            {{ row.salePrice2personal | toNumberFixed }}/{{
+              row.measurement | toNumberFixed
+            }}
           </template>
         </el-table-column>
         <el-table-column label="时间" width="235">
@@ -142,7 +148,12 @@
                 <el-dropdown-item command="record">调价记录</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-            <span v-show="row.enableMark=='ENABLE'" class="el-dropdown-link" @click="updateCreate(row)">下单</span>
+            <span
+              v-show="row.enableMark == 'ENABLE'"
+              class="el-dropdown-link"
+              @click="updateCreate(row)"
+              >下单</span
+            >
             <el-dropdown
               @command="
                 (val) => {
@@ -232,12 +243,14 @@ export default {
     autocomplete,
     generalDetails,
   },
-  filters:{
-    toNumberFixed(val){
-      if(val){
-        return Number(val).toFixed(2)
-      }else{return '暂无'}
-    }
+  filters: {
+    toNumberFixed(val) {
+      if (val) {
+        return Number(val).toFixed(2);
+      } else {
+        return "暂无";
+      }
+    },
   },
   data() {
     return {
@@ -347,19 +360,19 @@ export default {
 
     //下单
     createOrder(row) {
-      this.controlWindows.addInfo = {}
+      this.controlWindows.addInfo = {};
       this.controlWindows.addInfo.title = "创建订单";
       this.controlWindows.create = true;
-      console.log(this.controlWindows,'新增')
+      console.log(this.controlWindows, "新增");
     },
     //修改订单
-    updateCreate(row){
+    updateCreate(row) {
       this.controlWindows.addInfo = {
-          title: "创建订单",
-          ...row,
-        };
-        this.controlWindows.create = true;
-        console.log('修改')
+        title: "创建订单",
+        ...row,
+      };
+      this.controlWindows.create = true;
+      console.log("修改");
     },
     //详情
     detail(row) {
@@ -390,17 +403,32 @@ export default {
     },
     //启用禁用
     switchTrigger(val, row) {
-      row.enableMark = row.enableMark;
+      row.enableMark = val === "ENABLE" ? "DISENABLE" : "ENABLE";
+      // return;
       serve
-        .update({
-          id: row.id,
-          enableMark: val,
-        })
+        .updateBatchEnable([
+          {
+            id: row.id,
+            enableMark: val,
+          },
+        ])
         .then((res) => {
           if (res.code === 20000) {
             this.getByPage();
-          } else this.$message.error(res.msg);
+          }
+          // this.$message.success(res.msg);
+          // this.closeWindow();
         });
+      // serve
+      //   .update({
+      //     id: row.id,
+      //     enableMark: val,
+      //   })
+      //   .then((res) => {
+      //     if (res.code === 20000) {
+      //       this.getByPage();
+      //     } else this.$message.error(res.msg);
+      //   });
     },
     //批量启用禁用
     batchHandler() {

From a9d14aedb464b192b54cb51ad873e3350ab52653 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Wed, 1 Mar 2023 13:53:06 +0800
Subject: [PATCH 3/3] =?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         |  2 +-
 .../companyManagement/index.vue               | 24 ++++++++++++++++++-
 .../enterpriseRecharge/index.vue              |  8 +------
 src/views/product/index.vue                   | 12 +++-------
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/components/autocomplete/index.vue b/src/components/autocomplete/index.vue
index 9c9614f..b6cb1c7 100644
--- a/src/components/autocomplete/index.vue
+++ b/src/components/autocomplete/index.vue
@@ -30,7 +30,7 @@
     <template>
       <el-option
         v-for="(item, index) in list"
-        :key="item.id + index"
+        :key="index"
         :label="item[config.labelKey]"
         :value="item[config.valueKey]"
       >
diff --git a/src/views/customerManagement/companyManagement/index.vue b/src/views/customerManagement/companyManagement/index.vue
index 4ca305e..daff844 100644
--- a/src/views/customerManagement/companyManagement/index.vue
+++ b/src/views/customerManagement/companyManagement/index.vue
@@ -62,7 +62,7 @@
           clearable
         >
           <el-option
-            v-for="(item, index) in companyNatureTypeEnum"
+            v-for="(item, index) in companyTypeEnum"
             :key="index"
             :label="item.label"
             :value="item.value"
@@ -521,6 +521,28 @@ export default {
         total: 0,
         params: {},
       },
+      companyTypeEnum: [
+        {
+          label: "柴油账户",
+          value: "0",
+        },
+        {
+          label: "汽油账户",
+          value: "1",
+        },
+        {
+          label: "LNG账户",
+          value: "2",
+        },
+        {
+          label: "尿素账户",
+          value: "3",
+        },
+        {
+          label: "油批账户",
+          value: "4",
+        },
+      ],
       auditMarkEnum: [
         {
           label: "未提交",
diff --git a/src/views/financialCenter/enterpriseRecharge/index.vue b/src/views/financialCenter/enterpriseRecharge/index.vue
index 53e4aca..a4c68dc 100644
--- a/src/views/financialCenter/enterpriseRecharge/index.vue
+++ b/src/views/financialCenter/enterpriseRecharge/index.vue
@@ -355,13 +355,7 @@ export default {
         examine: false,
       },
       accountStatusEnum: accountStatusEnum,
-      rechargeTypeEnum: [
-        {
-          label: "圈回",
-          value: "TURN",
-        },
-        ...rechargeTypeEnum,
-      ],
+      rechargeTypeEnum: rechargeTypeEnum,
       rechargeStatusEnum: rechargeStatusEnum,
       auditMarkEnum: [
         {
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index ceaa831..3812962 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -99,23 +99,17 @@
         </el-table-column>
         <el-table-column prop="refineryLevel" label="成本价" width="70">
           <template slot-scope="{ row }">
-            {{ row.floorPrice | toNumberFixed }}/{{
-              row.measurement | toNumberFixed
-            }}
+            {{ row.floorPrice | toNumberFixed }}/{{ row.measurement }}
           </template>
         </el-table-column>
         <el-table-column prop="refineryLevel" label="企业销售价" width="100">
           <template slot-scope="{ row }">
-            {{ row.salePrice2company | toNumberFixed }}/{{
-              row.measurement | toNumberFixed
-            }}
+            {{ row.salePrice2company | toNumberFixed }}/{{ row.measurement }}
           </template>
         </el-table-column>
         <el-table-column prop="refineryLevel" label="个人销售价" width="100">
           <template slot-scope="{ row }">
-            {{ row.salePrice2personal | toNumberFixed }}/{{
-              row.measurement | toNumberFixed
-            }}
+            {{ row.salePrice2personal | toNumberFixed }}/{{ row.measurement }}
           </template>
         </el-table-column>
         <el-table-column label="时间" width="235">