Browse Source

修复问题

liuxiangqi 1 year ago
parent
commit
4b52b0237e

+ 8 - 3
src/utils/validate.js

@@ -221,11 +221,16 @@ export function validMobile(rule, value, cb) {
 }
 
 export function validPhone(rule, value, cb) {
-  if (!isPhone(value)) {
-    cb(new Error('请输入正确的固定电话格式,例如xxxxxxxxxxx,xxxx-xxxxxxx'))
-  } else {
+  if(!value) {
     cb()
+  }else {
+    if (!isPhone(value)) {
+      cb(new Error('请输入正确的固定电话格式,例如xxxxxxxxxxx,xxxx-xxxxxxx'))
+    } else {
+      cb()
+    }
   }
+  
 }
 export function validZhcn(rule, value, cb) {
   if (!isZhcn(value, 1, 25)) {

+ 27 - 19
src/views/enterprise/ent/components/audit.vue

@@ -2,7 +2,8 @@
   <el-dialog title="审核通过" :visible.sync="open" width="800px" append-to-body>
     <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="服务时间段" prop="serviceTime">
-          <el-date-picker v-model="form.serviceTime" placeholder="选择日期" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          <el-input  @focus="getLayDate" id="inputUI" v-model="form.serviceTime"></el-input>
+          <!-- <el-date-picker v-model="form.serviceTime" placeholder="选择日期" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker> -->
         </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -21,7 +22,7 @@
         disabled: false,
         type: '',
         form: {
-          serviceTime: [],
+          serviceTime: "",
           authState: '2',
           endDate: '',
           startDate: ''
@@ -50,10 +51,21 @@
         getEntInfoByIdApi(this.form.id).then(res => {
           this.loading = false
           this.form = res.data || {}
-          this.form.serviceDate = []
-          if(this.form.startDate) {
-            this.form.serviceDate[0] = this.form.startDate
-            this.form.serviceDate[1] = this.form.endDate
+          if(this.form.startDate && this.form.endDate) {
+            this.form.serviceTime = this.form.startDate + ' 至 ' + this.form.endDate
+          }else {
+            this.form.serviceTime = ""
+          }
+        })
+      },
+      getLayDate(){
+        let _self = this
+        laydate.render({
+          elem: '#inputUI', // 输入框的id属性,用来绑定到dom
+          type: 'date',
+          range: true,
+          done: (value) => {
+            _self.form.serviceTime = value; // 将选中的值赋给组件中的变量
           }
         })
       },
@@ -61,13 +73,20 @@
         this.$refs.form.validate(valid => {
           if (valid) {
             this.disabled = true
+            if(this.form.serviceTime) {
+              this.form.startDate = this.form.serviceTime.split('至')[0].trim()
+              this.form.endDate = this.form.serviceTime.split('至')[1].trim()
+            }else {
+              this.form.startDate = ''
+              this.form.endDate = ''
+            }
             auditEntApi(this.form).then(res => {
               this.disabled = false;
-              if(res.code == 200) {          
+              if(res.code == 200) {
                 this.$message({
                   message: '审核通过成功',
                   type: 'success'
-                });    
+                });
               }
               this.open = false;
               this.$emit('refreshData');
@@ -77,17 +96,6 @@
       },
       cancel() {
         this.open = false
-      },
-    },
-    watch: {
-      "form.serviceTime"(val) {
-        if(this.form.serviceTime) {
-          this.form.startDate = this.form.serviceTime[0]
-          this.form.endDate = this.form.serviceTime[1]
-        }else {
-          this.form.startDate = ''
-          this.form.endDate = ''
-        }
       }
     }
   }

+ 8 - 20
src/views/enterprise/ent/components/service.vue

@@ -80,26 +80,14 @@
       },
       getLayDate(){
         let _self = this
-          laydate.render({
-            elem: '#inputUI', // 输入框的id属性,用来绑定到dom
-            type: 'date',
-            range: true,
-            done: (value) => {
-              _self.form.serviceTime = value; // 将选中的值赋给组件中的变量
-            }
-          })
-        }
-    },
-    watch: {
-      "form.serviceTime"(val) {
-        if(val) {
-          let arr = val.split('至')
-          this.form.startDate = arr[0].trim()
-          this.form.endDate = arr[1].trim()
-        }else {
-          this.form.startDate = ''
-          this.form.endDate = ''
-        }
+        laydate.render({
+          elem: '#inputUI', // 输入框的id属性,用来绑定到dom
+          type: 'date',
+          range: true,
+          done: (value) => {
+            _self.form.serviceTime = value; // 将选中的值赋给组件中的变量
+          }
+        })
       }
     }
   }

+ 16 - 21
src/views/enterprise/ent/edit.vue

@@ -735,10 +735,10 @@ export default {
       }
     };
     const validateLicense = (rule, value, callback) => {
-            if (value === '') {
-              callback(new Error('请上传附件'));
-            }
-          };
+      if (value === '') {
+        callback(new Error('请上传附件'));
+      }
+    };
     return {
       date: "",
       action: process.env.VUE_APP_BASE_API + "/common/attach/upload", // 上传的图片服务器地址
@@ -952,7 +952,6 @@ export default {
     };
   },
   created() {
-
     this.form.id = this.$route.params.id || undefined;
     this.type = this.$route.query.type || undefined
     if(this.form.id) {
@@ -1006,10 +1005,10 @@ export default {
       getEntInfoByIdApi(this.form.id).then(res => {
         this.loading = false
         this.form = res.data || {}
-        this.form.serviceDate = []
-        if(this.form.startDate) {
-          this.form.serviceDate[0] = this.form.startDate + ' '
-          this.form.serviceDate[1] = ' ' + this.form.endDate
+        if(this.form.startDate && this.form.endDate) {
+          this.form.serviceDate = this.form.startDate + ' 至 ' + this.form.endDate
+        }else {
+          this.form.serviceDate = ""
         }
         getProvinceDataApi().then(res => {
           if(res.code == 200) {
@@ -1206,7 +1205,6 @@ export default {
       this.$router.go(-1);
     },
     handleRegister() {
-      // this.form.mainProducts = this.form.mainProductArray.join(',')
       if(this.type == 'update') {
         this.$refs.form.validate((valid, obj) => {
           if (valid) {
@@ -1243,6 +1241,13 @@ export default {
         this.$refs.form.validate((valid, obj) => {
           if (valid) {
             this.loading = true;
+            if(this.form.serviceDate) {
+              this.form.startDate = this.form.serviceDate.split('至')[0].trim()
+              this.form.endDate = this.form.serviceDate.split('至')[1].trim()
+            }else {
+              this.form.startDate = ''
+              this.form.endDate = ''
+            }
             if(this.form.license) {
               validLicenseApi(this.form.license).then(res => {
                 // true存在
@@ -1314,18 +1319,8 @@ export default {
         }
         });
       }
-
     }
-  },
-  watch: {
-    'form.serviceDate'(val) {
-      if(val) {
-        let arr = val.split('至')
-        this.form.startDate = arr[0].trim()
-        this.form.endDate = arr[1].trim()
-      }
-    }
-   }
+  }
 };
 </script>