Merge branch 'yanglilong' of git.ssish.com:sunhailiang/bims into test

src/views/info/components/companyInfo.vue

 <template>
   <div class="info-div">
     <Goback title="保险公司详情" />
-    <a-form-model ref="form" layout="vertical">
+    <a-form-model ref="form" layout="vertical" :model="detailObj" :rules="formRules">
       <a-row :gutter="30">
         <a-col :lg="6" :sm="12">
-          <a-form-model-item label="保险公司名称">
+          <a-form-model-item label="保险公司名称" prop="longName">
             <a-input v-model="detailObj.longName" placeholder="保险公司名称" />
           </a-form-model-item>
         </a-col>
@@ -28,7 +28,7 @@
       </a-row>
       <a-row :gutter="30">
         <a-col :lg="3" :sm="12">
-          <a-form-model-item label="有效">
+          <a-form-model-item label="有效" prop="status">
             <a-select v-model="detailObj.status" placeholder="请选择">
               <a-select-option value="1">有效</a-select-option>
               <a-select-option value="2">无效</a-select-option>
@@ -50,7 +50,7 @@
           </a-row>
         </a-col>
         <a-col :lg="10" :sm="12">
-          <a-form-model-item label="保险公司地址">
+          <a-form-model-item label="保险公司地址" prop="address">
             <a-input v-model="detailObj.address" placeholder="保险公司地址" />
           </a-form-model-item>
         </a-col>
@@ -65,12 +65,12 @@
           </a-form-model-item>
         </a-col>
         <a-col :lg="4" :sm="12">
-          <a-form-model-item label="保险公司联系电话">
+          <a-form-model-item label="保险公司联系电话" prop="contactPhone">
             <a-input v-model="detailObj.contactPhone" placeholder="保险公司联系电话"/>
           </a-form-model-item>
         </a-col>
         <a-col :lg="6" :sm="12">
-          <a-form-model-item label="客服电话">
+          <a-form-model-item label="客服电话" prop="customerTel">
             <a-input v-model="detailObj.customerTel" placeholder="客服电话" />
           </a-form-model-item>
         </a-col>
@@ -80,7 +80,7 @@
           </a-form-model-item>
         </a-col>
         <a-col :lg="6" :sm="12">
-          <a-form-model-item label="保险公司邮件地址">
+          <a-form-model-item label="保险公司邮件地址" prop="email">
             <a-input v-model="detailObj.email" placeholder="保险公司邮件地址" />
           </a-form-model-item>
         </a-col>
@@ -160,6 +160,14 @@ export default {
   data() {
     return {
       countyList: [],
+      formRules: {
+        longName: [{ required: true, message: "请输入保险公司名称", trigger: "blur" }],
+        status: [{ required: true, message: "请选择是否有效", trigger: "change" }],
+        address: [{ required: true, message: "请输入保险公司地址", trigger: "blur" }],
+        contactPhone: [{ required: true, message: "请输入保险公司联系电话", trigger: "blur" }],
+        customerTel: [{ required: true, message: "请输入客服电话", trigger: "blur" }],
+        email: [{ required: true, message: "请输入保险公司邮件地址", trigger: "blur" }],
+      },
     }
   },
   components: {
@@ -194,6 +202,8 @@ export default {
     },
     //新建保存
     handlerSava(){
+      this.$refs.form.validate((valid) => {
+        if (valid) {
           let formData = {
             ...this.detailObj,
             claimApplicationTemplate: this.detailObj.claimApplicationTemplate.length>0? this.detailObj.claimApplicationTemplate[0].url: '',
@@ -216,6 +226,8 @@ export default {
               this.$message.error(res.returnMsg);
             }
           });
+        }
+      });
     },
     removeFile(file,type=1){
       return new Promise((resolve)=>{

src/views/info/index.vue

 <template>
   <div class="white_bg burt-container">
     <div class="title-div">申请日期</div>
-    <a-form-model ref="form" layout="vertical">
+    <a-form-model ref="form" layout="vertical" :model="detailObj" :rules="formRules">
       <a-row :gutter="30">
         <a-col :lg="8" :sm="12">
-          <a-form-model-item label="医疗机构名称">
+          <a-form-model-item label="医疗机构名称" prop="longName">
             <a-input v-model="detailObj.longName" placeholder="医疗机构名称" />
           </a-form-model-item>
         </a-col>
         <a-col :lg="8" :sm="12">
-          <a-form-model-item label="医疗机构英文名">
+          <a-form-model-item label="医疗机构英文名" prop="englishName">
             <a-input v-model="detailObj.englishName" placeholder="医疗机构英文名" />
           </a-form-model-item>
         </a-col>
         <a-col :lg="8" :sm="12">
-          <a-form-model-item label="联系电话">
+          <a-form-model-item label="联系电话" prop="telNo1">
             <a-input v-model="detailObj.telNo1" placeholder="请输入联系电话" />
           </a-form-model-item>
         </a-col>
         <a-col :lg="10" :sm="12">
-          <a-form-model-item label="诊所地址（中文）">
+          <a-form-model-item label="诊所地址（中文）" prop="address">
             <a-input v-model="detailObj.address" placeholder="诊所地址（中文）" />
           </a-form-model-item>
         </a-col>
@@ -185,6 +185,12 @@ export default {
       specialtyObj: {}, //科室对象
       countyList: [],
       languageList: [],
+      formRules: {   
+        longName: [{ required: true, message: "请输入医疗机构名称", trigger: "blur" }],
+        englishName: [{ required: true, message: "请输入医疗机构英文名", trigger: "blur" }],
+        telNo1: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
+        address: [{ required: true, message: "请输入诊所地址（中文）", trigger: "blur" }]
+      },
       editFormObj: {
         id: "",
         doctorCode: '',
@@ -294,6 +300,8 @@ export default {
     },
     //保存
     saveEvt(){
+      this.$refs.form.validate((valid) => {
+        if(valid){
           this.$apis.PROVIDERUPDATE({...this.detailObj})
           .then((res) => {
             if (res.returnCode == "0000") {
@@ -302,6 +310,8 @@ export default {
               this.$message.error(res.returnMsg);
             }
           });
+        }
+      });
     },
     editEvt(record) {
       this.editFormObj = {