Merge branch 'feature/Feature-sales' into develop

src/views/sales_policy/components/AddPolicy.vue

@@ -450,7 +450,7 @@ export default {
       isCondition: 0,
       searchForm: {
         code: "",
-        endTime: "",
+        endTime: "2100-01-01 00:00:00",
         imgSrc: "",
         remark: "",
         startTime: "",
@@ -671,6 +671,7 @@ export default {
     },
     // 提交审核
     handleAddPolicy(policyCustomers) {
+
       if (!this.searchForm.title) {
         this.$errorMsg("请输入说明");
         return;
@@ -683,10 +684,7 @@ export default {
         this.$errorMsg("请选择生效日期");
         return;
       }
-      if (!this.searchForm.endTime) {
-        this.$errorMsg("请选择失效日期");
-        return;
-      }
+
       if (policyCustomers.length) {
         var arr = [];
         policyCustomers.forEach((el) => {

src/views/sales_rebate/rebate_list.vue

@@ -450,9 +450,12 @@ export default {
     handleNumber(e) {
       console.log(e);
       if (Number(e) < 0) {
-        this.dialogForm.rebateRate = 0.1;
+        this.dialogForm.rebateRate = '';
+        this.$errorMsg('不能小于0，输入数值0至1之间')
+        return
       } else if (Number(e) > 1) {
-        this.dialogForm.rebateRate = 0.9;
+        this.dialogForm.rebateRate = '';
+           this.$errorMsg('不能大于1，输入数值0至1之间')
       } else {
         this.dialogForm.rebateRate = e;
       }