Merge branch 'feature/Feature-basic_data' into develop

src/views/basic_data/dealer/dealer_deposit.vue

@@ -255,7 +255,7 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="结束时间" prop="endTime">
+        <el-form-item label="结束时间" prop="">
           <el-date-picker
             class="inputStyle"
             v-model="dialogForm.endTime"
@@ -369,13 +369,13 @@ export default {
             required: true,
           },
         ],
-        endTime: [
-          {
-            message: "请选择结束时间",
-            trigger: "blur",
-            required: true,
-          },
-        ],
+        // endTime: [
+        //   {
+        //     message: "请选择结束时间",
+        //     trigger: "blur",
+        //     required: true,
+        //   },
+        // ],
       },
       showDialog: false,
       dataList: [],
@@ -413,13 +413,13 @@ export default {
     //取消
     async cancelFn() {
       this.dialogForm = {
-        amount: "",
+        amount: 0,
         customerId: "",
         customerName: "",
         customerNumber: "",
         endTime: "",
 
-        rate: "",
+        rate: 0,
         remark: "",
         startTime: "",
       };
@@ -503,6 +503,9 @@ export default {
         });
         this.$message.success("编辑成功");
       } else {
+        if (this.dialogForm.endTime === "") {
+          this.dialogForm.endTime = "2100-01-01 00:00:00";
+        }
         await getDealerDepositAdd({
           ...this.dialogForm,
           rate: Number(this.dialogForm.rate / 100),