台账筛选修改等

src/views/basic_data/taker/taker_car.vue

@@ -46,6 +46,7 @@
           type="primary"
           icon="el-icon-plus"
           size="small"
+          class="add-right"
           @click="addDataList"
           >新增</el-button
         >
@@ -57,6 +58,7 @@
           title="这是一段内容确定删除吗？"
         >
           <el-button
+            :disabled="ids.length < 1"
             slot="reference"
             type="danger"
             icon="el-icon-minus"
@@ -310,9 +312,9 @@ export default {
       // this.ids = selection.map((k) => {
       //   return k.id;
       // });
-      console.log(selection);
+      // console.log(selection);
       this.ids = selection.map((v) => v.id);
-      console.log(this.ids);
+      // console.log(this.ids);
     },
     // //导出
     // exportFn() {
@@ -358,11 +360,18 @@ export default {
     },
     //删除
     async delFn(ids) {
-      this.ids.push(ids);
-      let res = this.ids.toString();
-      await delCarFn({ ids: res });
-      this.$message.success("删除成功");
+      if (ids) {
+        let arr = [];
+        arr.push(ids);
+        let res = arr.toString();
+        await delCarFn({ ids: res });
+      } else {
+        let res = this.ids.toString();
+        await delCarFn({ ids: res });
+      }
 
+      this.$message.success("删除成功");
+      this.ids = [];
       this.getDataList({ pageNum: this.currentPage, pageSize: this.pageSize });
     },
     //获取经销商数据
@@ -434,9 +443,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-popover__reference {
-  margin-left: 10px;
+.add-right {
+  margin-right: 10px;
 }
+// ::v-deep .el-popover__reference {
+//   margin-left: 10px;
+// }
 ::v-deep .el-date-editor {
   width: 100%;
 }

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

@@ -172,7 +172,7 @@ export default {
   data() {
     return {
       remark: "",
-      examineStatus: "",
+      examineStatus: "OK",
       dataList: [], // 列表数据
       // searchForm: {}, //搜索表单
       listLoading: false, // 列表加载loading

src/views/finance/components/rebate_list-confirm.vue

@@ -22,7 +22,7 @@
               <el-input
                 disabled
                 v-model="searchForm.rebateOrderId"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -31,7 +31,7 @@
               <el-input
                 disabled
                 v-model="searchForm.theTime"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -40,7 +40,7 @@
               <el-input
                 disabled
                 v-model="searchForm.remark"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -49,7 +49,7 @@
               <el-input
                 disabled
                 v-model="searchForm.createBy"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -58,7 +58,7 @@
               <el-input
                 disabled
                 v-model="searchForm.createTime"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>

src/views/finance/components/rebate_list-detail.vue

@@ -19,7 +19,7 @@
               <el-input
                 disabled
                 v-model="searchForm.rebateOrderId"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -28,7 +28,7 @@
               <el-input
                 disabled
                 v-model="searchForm.theTime"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -37,7 +37,7 @@
               <el-input
                 disabled
                 v-model="searchForm.remark"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -46,7 +46,7 @@
               <el-input
                 disabled
                 v-model="searchForm.createBy"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -55,18 +55,18 @@
               <el-input
                 disabled
                 v-model="searchForm.createTime"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
           <!-- <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="审批人" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input placeholder=""></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="审批日期" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input placeholder=""></el-input>
             </el-form-item>
           </el-col> -->
         </el-row>

src/views/finance/components/rebate_list-edit.vue

@@ -29,10 +29,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="备注" prop="remark">
-              <el-input
-                v-model="searchForm.remark"
-                placeholder="请输入"
-              ></el-input>
+              <el-input v-model="searchForm.remark" placeholder=""></el-input>
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -19,7 +19,7 @@
               <el-input
                 disabled
                 v-model="searchForm.rebateOrderId"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -28,7 +28,7 @@
               <el-input
                 disabled
                 v-model="searchForm.theTime"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -37,7 +37,7 @@
               <el-input
                 disabled
                 v-model="searchForm.remark"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -46,7 +46,7 @@
               <el-input
                 disabled
                 v-model="searchForm.createBy"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -55,18 +55,18 @@
               <el-input
                 disabled
                 v-model="searchForm.createTime"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
           <!-- <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="审批人" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input placeholder=""></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="审批日期" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input placeholder=""></el-input>
             </el-form-item>
           </el-col> -->
         </el-row>

src/views/finance/components/rebate_list-review.vue

@@ -19,7 +19,7 @@
               <el-input
                 disabled
                 v-model="searchForm.rebateOrderId"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -28,7 +28,7 @@
               <el-input
                 disabled
                 v-model="searchForm.theTime"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -37,7 +37,7 @@
               <el-input
                 disabled
                 v-model="searchForm.remark"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -46,7 +46,7 @@
               <el-input
                 disabled
                 v-model="searchForm.createBy"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -55,7 +55,7 @@
               <el-input
                 disabled
                 v-model="searchForm.createTime"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>

src/views/finance/receivable_list.vue

@@ -105,6 +105,7 @@
             title="这是一段内容确定删除吗？"
           >
             <el-button
+              :disabled="deleList.length < 1"
               slot="reference"
               type="danger"
               icon="el-icon-minus"
@@ -298,7 +299,7 @@ export default {
       examine: "",
       showPage: 1,
       approvalId: null,
-      deleList: null,
+      deleList: [],
     };
   },
   computed: {
@@ -349,6 +350,7 @@ export default {
       await getFinanceOtherReceDelete({ ids: res });
       this.getDataList({ pageSize: this.pageSize, pageNum: this.currentPage });
       this.$message.success("删除成功");
+      this.deleList = [];
     },
     selectionChangeFn(value) {
       console.log(value);

src/views/finance/standbook_list.vue

@@ -463,8 +463,8 @@ export default {
       dataList: [],
       walletList: [],
       // dictList: [],
-      customerName: null,
-      customerNumber: null,
+      customerName: "",
+      customerNumber: "",
       searchForm: {
         customerId: "",
         customerWalletId: "",
@@ -504,7 +504,7 @@ export default {
     //改变经销商
     async changeFn(v) {
       this.searchForm.customerWalletId = "";
-      let res = await getWalletCustomerList({ customerId: v });
+      let res = await getWalletCustomerList({ customerId: v, type: this.bill });
       this.walletList = res.data;
     },
     //获取经销商列表
@@ -578,10 +578,12 @@ export default {
     //   this.dictList = res.data;
     // },
     //重置
-    resetFn() {
+    async resetFn() {
       // this.searchForm.customerId = "";
       this.walletList = [];
-      this.$refs.searchForm.resetFields();
+      this.customerName = "";
+      this.customerNumber = "";
+      await this.$refs.searchForm.resetFields();
     },
     //查询
     searchFn() {
@@ -635,6 +637,7 @@ export default {
       //   pageNum: 1,
       //   type: v,
       // });
+      this.resetFn();
       this.pageSize = 10;
       this.currentPage = 1;
       if (this.$route.query.customerName && this.$route.query.customerNumber) {
@@ -649,10 +652,10 @@ export default {
         });
       } else {
         this.getDataList({
-          ...this.searchForm,
+          // ...this.searchForm,
 
-          customerName: this.customerName,
-          customerNumber: this.customerNumber,
+          // customerName: this.customerName,
+          // customerNumber: this.customerNumber,
           pageSize: this.pageSize,
           pageNum: this.currentPage,
           type: v,

src/views/sales_rebate/rebate_list.vue

@@ -74,6 +74,7 @@
                 title="这是一段内容确定删除吗？"
               >
                 <el-button
+                  :disabled="ids.length < 1"
                   slot="reference"
                   type="danger"
                   icon="el-icon-minus"
@@ -393,14 +394,15 @@ export default {
     },
     //删除
     async delfn() {
-      if (this.ids.length == 0) {
-        this.$message.error("请选择列表数据");
-        return;
-      }
+      // if (this.ids.length == 0) {
+      //   this.$message.error("请选择列表数据");
+      //   return;
+      // }
       let res = this.ids.toString();
       await getWalletRebateSaletypeDelete({ walletRebateSaleTypeIds: res });
       this.getList();
       this.$message.success("删除成功");
+      this.ids = [];
     },
     //获取钱包列表
     async getWalletList() {