Merge branch 'dev2/zhangxc' into dev

src/components/icss/AddCommonSymptom.vue

@@ -87,7 +87,7 @@
         return{
             rules: {
                 department:[{required: true, message: '请选择科室', trigger: ['blur']}],
-                type:[{required: true, message: '请选择科室', trigger: ['blur']}]
+                type:[{required: true, message: '请选择类型', trigger: ['blur']}]
             },
             form: {
                 department: '',
@@ -250,7 +250,7 @@
                 })
                 return;
             }
-            this.$refs[formName].validate((valid) => {
+            const valided = this.$refs[formName].validate((valid, callback) => {
                 if (valid) {
                     return
                 } else {
@@ -258,9 +258,13 @@
                     return false;
                 }
             });
-             if(!this.form.department) {
+             if(!this.form.department || !this.form.type) {
                 return 
             }
+            if(this.rightTagsList.length === 0) {
+                this.warning('请选择症状标签')
+                return
+            }
             this.showDelDialog()
         },
         showDelDialog() {
@@ -274,7 +278,7 @@
                 "type": this.form.type,
    
             }
-            this.showConfirmDialog('是否保存常见科室症状？', () => {
+            this.showConfirmDialog('是否保存常见选项内容？', () => {
                 api.addCommonSymptom(param).then((res) => {
                 if (res.data.code  === '0') {
                     this.warning(res.data.msg || '保存成功', 'success','1000')

src/components/icss/AddIndeptLabel.vue

@@ -103,10 +103,7 @@
         }
         this.options = options2;
         if(this.itemsTypes.includes(+this.dataPub.region2)&&isNull) {
-            this.$message({
-              message: '至少填一个选项',
-              type: 'warning'
-            });
+            this.warning('至少填一个选项')
             return;
         }
         let flag=true;
@@ -120,17 +117,15 @@
           })==-1;
         }
         if(!flag){
-          this.$message({
-            message: '所有选项必须都有或者都没有同“伴”/“无”标记',
-            type: 'warning'
-          });
+          this.warning('所有选项必须都有或者都没有同“伴”/“无”标记')
           return;
         }
-        if(this.dataPub.region8 >= this.dataPub.region9) {
-          this.$message({
-            message: '最小年龄不能大于或等于最大年龄',
-            type: 'warning'
-          });
+        if(parseInt(this.dataPub.region8) >= parseInt(this.dataPub.region9)) {
+          this.warning('最小年龄不能大于或等于最大年龄')
+          return;
+        }
+        if(parseInt(this.dataPub.minNormalVal) >= parseInt(this.dataPub.maxNormalVal)) {
+          this.warning('最小正常值不能大于或等于最大正常值')
           return;
         }
         const {isEdit,data} = this.$route.params;

src/components/icss/AddPhysicalExamTemp.vue

@@ -251,8 +251,9 @@
         },
         showDelDialog() {
             let dvDetailVOList = []
+            const deptName = this.departList.filter(item => item.id == this.form.department)[0].name
             for (let i =0; i < this.rightTagsList.length; i++) {
-                dvDetailVOList.push({orderNo: i+1,vitalId:this.rightTagsList[i].id })
+                dvDetailVOList.push({orderNo: i+1,vitalId:this.rightTagsList[i].id , remark: `${deptName}-${this.rightTagsList[i].tagName}`})
             }
             const param ={
                 "deptId": this.form.department,

src/components/icss/NoiseTemplate.vue

@@ -175,7 +175,7 @@ export default {
         });
         return;
       }
-      if(this.dataPub.region8 >= this.dataPub.region9) {
+      if(parseInt(this.dataPub.region8) >= parseInt(this.dataPub.region9)) {
           this.$message({
             message: '最小年龄不能大于或等于最大年龄',
             type: 'warning'

src/components/icss/PhysicalExamTemplate.vue

@@ -139,7 +139,7 @@
       },
       getFilterItems() {
         const param = {
-          name: this.filter.proName,
+          deptName: this.filter.proName,
           current: this.currentPage,
           size: this.pageSize
         };

src/components/icss/PubIndeptTag.vue

@@ -174,28 +174,43 @@
                 @input="sendData"
               ></el-input>
             </el-form-item>
+
+          <div>
             <el-form-item
                     label="正常值范围："
-                    class="fix-inp"
-                    prop="region13"
+                    prop="minNormalVal"
+                    class="ages"
                     v-if="form.region1==5 && form.region2==6 || form.region2==7"
             >
-                <el-col :span="7">
-                <el-input v-model="form.minNormalVal"
-                        :disabled="!form.region1"
-                        maxLength="30"
-                        @change="sendData"
-                ></el-input></el-col>
-                <el-col :span="8"> ~</el-col>
-                <el-col :span="7">
                 <el-input
-                    v-model="form.maxNormalVal"
-                    :disabled="!form.region1"
-                    maxLength="30"
-                    @change="sendData"
-                ></el-input></el-col>
+                        v-model.number="form.minNormalVal"
+                        :disabled="!form.region1"
+                         type="number"
+                         maxLength="4"
+                        ref="valage1"
+                        @input="sendData"
+                ></el-input>
             </el-form-item>
-            
+            <span
+              v-if="form.region1==5 && form.region2==6 || form.region2==7"
+            > ~ 
+            </span>
+            <el-form-item
+              prop="maxNormalVal"
+              class="ages maxAges"
+              v-if="form.region1==5 && form.region2==6 || form.region2==7"
+            > 
+              <el-input
+                v-model.number="form.maxNormalVal"
+               :disabled="!form.region1"
+                type="number"
+                ref="valage2"
+                maxLength="4"
+                @input="sendData"
+              ></el-input>
+            </el-form-item>
+          </div>
+          
         </el-form>
     </div>
 </template>
@@ -279,9 +294,13 @@
           region9: [
             { required: true, message: '请输入最大年龄', trigger: 'change' }
           ],
-           region13: [
+           minNormalVal: [
+            { required: true, message: '请输入正常值范围', trigger: 'change' }
+          ],
+          maxNormalVal: [
             { required: true, message: '请输入正常值范围', trigger: 'change' }
           ]
+          
         },
         tmpSex: '通用',
         tmpOwn: '',
@@ -442,6 +461,7 @@
         margin-bottom: 20px;
     }
     .el-form-item__error {
+        width: 200px;
         top: 28px;
     }
     .el-form-item__label {