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

src/components/icss/AddIndeptLabel.vue

@@ -91,9 +91,26 @@
       },
       validatePass() {      //验证成功回调，调取接口
         //仍需验证标签明细是否选择
-        if (this.itemsTypes.includes(+this.dataPub.region2)&&this.options.length==0) {
+        console.log('this.options',this.options)
+        let isNull = true
+        let options2 = []
+        for (let i = 0; i < this.options.length; i++) {
+          if(this.options[i].name.trim() != '') {
+            isNull = false
+            options2.push(this.options[i])
+          }
+        }
+        this.options = options2;
+        if(this.itemsTypes.includes(+this.dataPub.region2)&&isNull) {
+            this.$message({
+              message: '至少填一个选项',
+              type: 'warning'
+            });
+            return;
+        }
+        if(this.dataPub.region8 > this.dataPub.region9) {
           this.$message({
-            message: '至少填一个选项',
+            message: '最小年龄不能大于最大年龄',
             type: 'warning'
           });
           return;
@@ -121,7 +138,8 @@
             "minValue": this.dataPub.minNormalVal,        //化验最小正常值
             "maxValue": this.dataPub.maxNormalVal,         //化验最大正常值
             "questionDetails": this.options,
-            "questionMappings": []       //映射关系,
+            "questionMappings": [],      //映射关系,
+            "formulaCode": isEdit?data.formulaCode : ''
           }
         };
         this.showSaveDialog(param);

src/components/icss/AddPhysicalExamTemp.vue

@@ -165,7 +165,6 @@
             return RightTagListIds
         },
         changeDepart(){
-            console.log(this.form.department)
             this.getTagList()
         },
         selectLeftTag(tag, index, e) {
@@ -256,7 +255,6 @@
             }
             this.showConfirmDialog('是否保存该模板？', () => {
                 api.savePhysicalExamTemp(param).then((res) => {
-                console.log('resssss', res)
                 if (res.data.code  === '0') {
                     this.warning(res.data.msg || '保存成功', 'success','1000')
                     setTimeout(() => {

src/components/icss/IndeptLabel.vue

@@ -161,7 +161,7 @@
         this.$router.push({path:'LT-YXSJWH-TJDLBQ'})
       },
       modifyIndeptTag(row) {
-        api.detailsTag({id:row.id,sexType:row.sexType,age:row.age}).then((res)=>{
+        api.detailsTag({id:row.id}).then((res)=>{
           const {code,data,msg} = res.data;
           if(code=='0'){
             const item = Object.assign({},row,data);

src/components/icss/LabelGroup.vue

@@ -168,7 +168,7 @@ export default {
             this.$router.push({path:'LT-YXSJWH-TJBQZ'})
         },
         modifyTagGroup(row) {
-            api.detailsTag({id:row.id,sexType:row.sexType,age:row.age}).then((res)=>{
+            api.detailsTag({id:row.id}).then((res)=>{
                 const {code,data,msg} = res.data;
                 if(code=='0'){
                     const item = Object.assign({},row,data);

src/components/icss/NoiseTemplate.vue

@@ -176,6 +176,13 @@ export default {
         });
         return;
       }
+      if(this.dataPub.region8 > this.dataPub.region9) {
+          this.$message({
+            message: '最小年龄不能大于最大年龄',
+            type: 'warning'
+          });
+          return;
+      }
       let detailLis = utils.dataRecombination(this.sendIds, this.dataPub.region2)
       let param = {
         "questionWrapper": {

src/components/icss/PubIndeptTag.vue

@@ -97,7 +97,7 @@
                     label="标签前后缀："
                     class="fix-inp"
                     prop="region12"
-                    v-if="form.region2==6 || form.region2==7"
+                    v-if="form.region2==5 ||form.region2==6 || form.region2==7 "
             >
                 <el-col :span="10">
                 <el-input v-model="form.prefix"