Merge remote-tracking branch 'origin/dev' into dev

src/views/manage/blacklist/index.vue

@@ -101,10 +101,10 @@
           <el-input v-model="form.patientName" placeholder="请输入姓名" :disabled="title == '修改黑名单'" />
         </el-form-item>
         <el-form-item label="身份证" prop="cardNo">
-          <el-input v-model="form.cardNo" placeholder="请输入身份证" :disabled="title == '修改黑名单'" />
+          <el-input v-model="form.cardNo" placeholder="请输入身份证" :disabled="title == '修改黑名单'" maxlength="18"/>
         </el-form-item>
         <el-form-item label="电话" prop="patientPhone">
-          <el-input v-model="form.patientPhone" placeholder="请输入电话" :disabled="title == '修改黑名单'" />
+          <el-input v-model="form.patientPhone" placeholder="请输入电话" :disabled="title == '修改黑名单'" maxlength="11"/>
         </el-form-item>
         <el-form-item label="医院" prop="hospitalAgencyId">
           <el-select v-model="form.hospitalAgencyId" filterable placeholder="请选择医院" style="width:380px" clearable
@@ -167,6 +167,22 @@ export default {
   name: "Blacklist",
   dicts: ['blacklist_source'],
   data() {
+        //验证身份证
+        var isCardId = (rule, value, callback) => {
+          console.log(value)
+      if (value==null) {
+        callback(new Error("请输入患者身份证号"));
+      } else {
+        const reg =
+          /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/;
+        const card = reg.test(value);
+        if (!card) {
+          callback(new Error("身份证号格式有误！"));
+        } else {
+          callback();
+        }
+      }
+    };
     return {
       //医院list
       hospitalAgencylist: [],
@@ -226,7 +242,7 @@ export default {
           { required: true, message: '请输入患者姓名', trigger: 'change' }
         ],
         cardNo: [
-          { required: true, message: '请输入患者身份证号', trigger: 'change' }
+          { required: true, message: '', validator: isCardId, trigger: 'change' }
         ],
         hospitalAgencyId: [
           { required: true, message: '请选择医院', trigger: 'change' }
@@ -244,7 +260,12 @@ export default {
           { required: true, message: '请输入补充说明', trigger: 'change' }
         ],
         patientPhone: [
-          { required: true, message: '请输入患者手机号', trigger: 'change' }
+          { required: true, message: '请输入患者手机号', trigger: 'change' },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机码",
+            trigger: "blur"
+          }
         ],
       }
     };
@@ -272,6 +293,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        cardNo:null,
         campusAgencyId: null,
         departmentId: null,
         wardId: null,

src/views/manage/labelfieldcontent/index.vue

@@ -647,7 +647,7 @@ export default {
   }
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .el-input-number .el-input__inner {
   text-align: left;
 }

src/views/manage/materials/index.vue

@@ -124,13 +124,18 @@
           </div>
           <div class="dataliat">素材来源：</div>
           <!-- <div class="dataliat">标签：暂无</div> -->
-          <div class="dataliat">标签：
+          <div class="dataliat">
+            标签：
 
             <span v-if="item.indications">{{ item.indications }}，</span>
             <span v-if="item.drugName">{{ item.drugName }}，</span>
-            <span v-if="item.applicableDiseases">{{ item.applicableDiseases }}，</span>
+            <span v-if="item.applicableDiseases"
+              >{{ item.applicableDiseases }}，</span
+            >
             <span v-if="item.surgicalName">{{ item.surgicalName }}，</span>
-            <span v-if="item.inspectionItems">{{ item.inspectionItems }}，</span>
+            <span v-if="item.inspectionItems"
+              >{{ item.inspectionItems }}，</span
+            >
             <span v-if="item.checkItems">{{ item.checkItems }}，</span>
           </div>
         </div>
@@ -139,7 +144,6 @@
       </div>
     </div>
 
-
     <pagination
       v-show="total > 0"
       :total="total"
@@ -195,7 +199,6 @@
             :tovideo="form.materialsFilePath"
             :type="'materialsVideoUrl'"
           />
-
         </el-form-item>
 
         <el-form-item
@@ -218,7 +221,6 @@
           />
         </el-form-item>
 
-
         <el-form-item label="适用症状" prop="indications">
           <el-input v-model="form.indications" placeholder="请输入适用症状" />
         </el-form-item>
@@ -258,9 +260,7 @@
             >
             </el-option>
           </el-select>
-
         </el-form-item>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -295,7 +295,9 @@
           <div class="nametitle">素材标签：</div>
           <div class="nameitem">适用症状：{{ viewform.indications }}</div>
           <div class="nameitem">药物名称：{{ viewform.drugName }}</div>
-          <div class="nameitem">适用疾病：{{viewform.applicableDiseases}}</div>
+          <div class="nameitem">
+            适用疾病：{{ viewform.applicableDiseases }}
+          </div>
           <div class="nameitem">手术名称：{{ viewform.surgicalName }}</div>
           <div class="nameitem">检验项目：{{ viewform.inspectionItems }}</div>
           <div class="nameitem">检查项目：{{ viewform.checkItems }}</div>
@@ -430,9 +432,11 @@ export default {
     },
     // 素材类型
     radioChange(e) {
+      this.$refs.form.clearValidate();
       if (e == 'VIDEO') {
         this.form.materialsFilePath = null
         this.form.videoCoverFilePath = null
+        
       } else if (e == 'IMAGE_TEXT') {
         this.form.materialsFilePath = null
         this.form.videoCoverFilePath = null
@@ -655,7 +659,6 @@ video {
   img {
     height: 100%;
     width: 100%;
-
   }
   .right {
     width: 20%;

src/views/system/taskPushRecord/index.vue

@@ -140,7 +140,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-document-copy"
             @click="handledetails(scope.row)"
             v-hasPermi="['system:taskPushRecord:edit']"
             >详情</el-button