Merge remote-tracking branch 'origin/xiaozy_产品列表'

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

src/views/customerManagement/companyManagement/components/bank.vue

@@ -85,13 +85,15 @@
             <el-link type="primary" :underline="false" @click="complete(row)"
               >完成
             </el-link>
-            <el-link
+            <el-popconfirm
-              type="primary"
-              :underline="false"
               v-if="tableData.length > 1"
-              @click="deleteRow($index, row)"
+              title="确定删除吗？"
+              @confirm="deleteRow($index, row)"
+            >
+              <el-link slot="reference" type="primary" :underline="false"
                 >删除
               </el-link>
+            </el-popconfirm>
           </template>
         </el-table-column>
       </el-table>

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: "未提交",

src/views/financialCenter/enterpriseRecharge/index.vue

@@ -355,13 +355,7 @@ export default {
         examine: false,
       },
       accountStatusEnum: accountStatusEnum,
-      rechargeTypeEnum: [
+      rechargeTypeEnum: rechargeTypeEnum,
-        {
-          label: "圈回",
-          value: "TURN",
-        },
-        ...rechargeTypeEnum,
-      ],
       rechargeStatusEnum: rechargeStatusEnum,
       auditMarkEnum: [
         {

src/views/product/index.vue

@@ -99,17 +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">
@@ -142,7 +142,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) => {
@@ -235,10 +240,12 @@ export default {
   filters: {
     toNumberFixed(val) {
       if (val) {
-        return Number(val).toFixed(2)
+        return Number(val).toFixed(2);
-      }else{return '暂无'}
+      } else {
+        return "暂无";
       }
     },
+  },
   data() {
     return {
       controlWindows: {
@@ -347,10 +354,10 @@ 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) {
@@ -359,7 +366,7 @@ export default {
         ...row,
       };
       this.controlWindows.create = true;
-        console.log('修改')
+      console.log("修改");
     },
     //详情
     detail(row) {
@@ -390,17 +397,32 @@ export default {
     },
     //启用禁用
     switchTrigger(val, row) {
-      row.enableMark = row.enableMark;
+      row.enableMark = val === "ENABLE" ? "DISENABLE" : "ENABLE";
+      // return;
       serve
-        .update({
+        .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() {