优化页面内容及操作

src/views/basic_data/dealer/dealer_apply.vue

@@ -150,6 +150,7 @@
               label="操作"
               min-width="160"
               show-overflow-tooltip
+              fixed="right"
             >
               <el-button type="text" class="textColor" @click="editFn"
                 >跟进</el-button
@@ -237,5 +238,4 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

src/views/basic_data/dealer/dealer_deposit.vue

@@ -149,6 +149,7 @@
             label="操作"
             min-width="160"
             show-overflow-tooltip
+            fixed="right"
           >
             <template slot-scope="scope">
               <el-button

src/views/basic_data/dealer/dealer_list.vue

@@ -109,6 +109,7 @@
               prop="caozuo"
               min-width="160"
               show-overflow-tooltip
+              fixed="right"
             >
               <template slot-scope="scope">
                 <el-button
@@ -217,5 +218,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

src/views/basic_data/dealer/dealer_stock.vue

@@ -38,18 +38,21 @@
           type="primary"
           size="small"
           @click="addFn"
+          class="add-right"
+          icon="el-icon-plus"
           >新增</el-button
         >
-
         <el-popconfirm
           v-if="$checkBtnRole('del', $route.meta.roles)"
           @onConfirm="deleFn"
           title="这是一段内容确定删除吗？"
         >
           <el-button
-            type="primary"
+            :disabled="ids.length < 1"
+            type="danger"
             size="small"
             class="textColor"
+            icon="el-icon-minus"
             slot="reference"
             >批量删除</el-button
           >
@@ -138,6 +141,7 @@
             prop="caozuo"
             min-width="160"
             show-overflow-tooltip
+            fixed="right"
           >
             <template slot-scope="scope">
               <el-button
@@ -323,6 +327,7 @@ import { getDealerList } from "@/api/basic_data/dealer";
 export default {
   data() {
     return {
+      isDisabled: true,
       title: "",
       dialogForm: false,
       addForm: {
@@ -489,7 +494,8 @@ export default {
       // this.ids = selection.map((k) => {
       //   return k.id;
       // });
-      console.log(selection);
+
+      // console.log(selection);
       this.ids = selection.map((v) => v.id);
     },
     // //存货分类
@@ -500,11 +506,20 @@ export default {
     // },
     //删除
     async deleFn(id) {
-      this.ids.push(id);
-      let res = this.ids.toString();
-      await deleDealerStockList({ ids: res });
+      if (id) {
+        let arr = [];
+        arr.push(id);
+        let res2 = arr.toString();
+        await deleDealerStockList({ ids: res2 });
+      } else {
+        let res = this.ids.toString();
+        await deleDealerStockList({ ids: res });
+      }
+
       this.getList({ pageNum: 1, pageSize: 10 });
+
       this.$message.success("删除成功");
+      this.ids = [];
     },
     addFn() {
       this.title = "经销商业务关系管理";
@@ -612,8 +627,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-popover__reference {
-  margin-left: 10px;
+.add-right {
+  margin-right: 10px;
 }
 // ::v-deep .selectStyle .el-input--suffix {
 //   width: 200%;

src/views/basic_data/supplier/supplier_list.vue

@@ -82,6 +82,7 @@
               prop="caozuo"
               min-width="160"
               show-overflow-tooltip
+              fixed="right"
             >
               <template slot-scope="scope"
                 ><el-button

src/views/basic_data/taker/taker_car.vue

@@ -135,6 +135,7 @@
             label="操作"
             min-width="160"
             show-overflow-tooltip
+            fixed="right"
           >
             <template slot-scope="scope">
               <el-button

src/views/basic_data/taker/taker_list.vue

@@ -149,6 +149,7 @@
             prop="caozuo"
             min-width="160"
             show-overflow-tooltip
+            fixed="right"
           >
             <template slot-scope="scope"
               ><el-button

src/views/finance/balance_sum.vue

@@ -89,6 +89,7 @@
             label="操作"
             min-width="160"
             show-overflow-tooltip
+            fixed="right"
           >
             <template v-slot="{ row }">
               <el-button

src/views/finance/change_apply.vue

@@ -14,7 +14,7 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="返利互转单号" prop="">
-              <el-input disabled></el-input>
+              <el-input disabled placeholder="系统自动生成"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">

src/views/finance/components/change_list-examine.vue

@@ -137,7 +137,7 @@
           <div class="label">审批结果</div>
           <div class="value">
             <el-radio v-model="examineStatus" label="OK">通过</el-radio>
-            <el-radio v-model="examineStatus" label="FALL">驳回</el-radio>
+            <el-radio v-model="examineStatus" label="FAIL">驳回</el-radio>
           </div>
         </el-col>
         <el-col :span="24" class="item">

src/views/finance/rebate_form.vue

@@ -14,7 +14,7 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="返利单号" prop="">
-              <el-input disabled placeholder=""></el-input>
+              <el-input disabled placeholder="系统自动生成"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -130,6 +130,7 @@
                 @change="changeCustomerFn($event, scope.$index, scope.row)"
                 v-model="scope.row.customerId"
                 placeholder="请选择"
+                filterable
               >
                 <el-option
                   v-for="item in customerData"
@@ -152,6 +153,7 @@
               <el-select
                 v-model="scope.row.customerWalletId"
                 placeholder="请选择"
+                filterable
               >
                 <el-option
                   v-for="item in scope.row.walletList"

src/views/finance/rebate_list.vue

@@ -396,7 +396,7 @@
             <el-table-column
               align="center"
               label="操作"
-              min-width="160"
+              min-width="240"
               show-overflow-tooltip
               fixed="right"
             >
@@ -445,7 +445,9 @@
                     $checkBtnRole('examine', $route.meta.roles)
                   "
                   @click="reviewFn(scope.row.rebateOrderId)"
-                  >复核</el-button
+                  >{{
+                    scope.row.examineStatus == "OK" ? "取消复核" : "复核"
+                  }}</el-button
                 >
                 <el-button
                   type="text"

src/views/finance/standbook_list.vue

@@ -51,6 +51,7 @@
                 class="selectStyle"
                 v-model="searchForm.customerWalletId"
                 placeholder="请选择"
+                filterable
               >
                 <el-option
                   v-for="(v, i) in walletList"

src/views/sales_rebate/rebate_list_type.vue

@@ -141,6 +141,8 @@
     </div>
     <div>
       <el-dialog
+        v-loading="addLoading"
+        element-loading-text="Loading"
         :visible.sync="dialogVisible"
         width="30%"
         @close="hanelclose"
@@ -214,6 +216,8 @@ export default {
   mixins: [Mixin],
   data() {
     return {
+      addLoading: false,
+      listLoading: false,
       type: 0, // 0 1
       screenForm: {
         name: "",
@@ -401,19 +405,23 @@ export default {
       this.type = "";
     },
     handelInfo() {
-      console.log(this.$refs.dialogForm);
+      // console.log(this.$refs.dialogForm);
+      // this.listLoading = true;\
+
       this.$refs.dialogForm.validate((valid) => {
         if (valid) {
           if (this.type) {
+            this.addLoading = true;
             // this.hanleScreen(this.dialogForm.mainId);
             const params = {
               ...this.dialogForm,
             };
 
             addWallet(params).then((res) => {
-              console.log(res);
+              // console.log(res);
               this.$successMsg("添加成功");
               this.hanleReset();
+              this.addLoading = false;
             });
           } else {
             const upParams = {