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

src/views/system/ManageNodeInformation/index.vue

@@ -488,7 +488,10 @@
                   ></scripts>
                 </span>
               </div>
-              <div class="pushMethod" v-if="form.phoneDialMethod == 'COMMON' || !form.phoneDialMethod">
+              <div
+                class="pushMethod"
+                v-if="form.phoneDialMethod == 'COMMON' || !form.phoneDialMethod"
+              >
                 问卷模板：
                 <span class="spanname" v-if="form.phoneTemplateId">
                   <question
@@ -660,7 +663,8 @@
               </el-option>
             </el-select>
             <!-- 包含 -->
-            <el-select
+            <!-- <div @change.native="changehos" style="background:red;width: 200px;height: 200px;display: inline-block;"> -->
+              <el-select
               v-model="item.triggerConditionOperator"
               style="width: 100px"
               @change="changetriggerLogic($event, index)"
@@ -673,6 +677,8 @@
               >
               </el-option>
             </el-select>
+            <!-- </div> -->
+           
 
             <el-input
               v-if="item.dictDataType == 'STRING'"
@@ -794,7 +800,11 @@ export default indexjs;
   background-color: #fff !important;
   color: #606266 !important;
 }
-
+::v-deep.el-form-item--medium .el-form-item__content {
+  line-height: 36px;
+  height: 40px;
+  overflow: hidden;
+}
 .el-icon-arrow-down {
   margin-left: 50px;
   font-size: 14px;

src/views/system/ManageNodeInformation/indexjs.js

@@ -109,6 +109,7 @@ export default {
       },
     };
   },
+
   created() {
     if (this.$route.query) {
       this.$set(this.form, "specialDiseaseNodeId", this.$route.query.id);
@@ -135,6 +136,19 @@ export default {
       },
       deep: true,
     },
+    // "openlist.triggerConditionList": {
+    //   handler(newValue, oldValue) {
+    //     // console.log(newValue,'newValue')
+    //     newValue.forEach(e=>{
+    //       console.log(e,'e')
+    //     })
+    //     // if (newValue == "NOT_SEND_MESSAGE") {
+    //     //   this.form.phoneMessageTemplateId = "";
+    //     //   this.form.phoneMessageTemplateName = "";
+    //     // }
+    //   },
+    //   deep: true,
+    // },
   },
   mounted() {
     // this.form = this.lists[0].list[0];
@@ -437,21 +451,11 @@ export default {
     optiononditionOperator() {
       var dictType = "trigger_condition_operator";
       getAgencytype(dictType).then((res) => {
+        console.log(res, 'redsssssssss')
         this.optionstriggerConditionOperator = res.data;
       });
     },
-    // 包含或等号接口
-    handlelist() {
-      var dictType = "trigger_condition_operator";
 
-      getList(dictType, this.dictDataType).then((res) => {
-        this.optionstriggerConditionOperator = res.data;
-        console.log(
-          this.optionstriggerConditionOperator,
-          "  this.optionstriggerConditionOperator "
-        );
-      });
-    },
 
     // 包含
     changetriggerLogic(e, index) {
@@ -475,11 +479,24 @@ export default {
       this.dictDataType = this.optionsname.find(
         (el) => el.dictValue == e
       ).dictDataType;
+      this.handlelist();
+
       this.openlist.triggerConditionList[index].dictDataType =
         this.optionsname.find((el) => el.dictValue == e).dictDataType;
-      this.handlelist();
     },
+    // 包含或等号接口
+    handlelist() {
+      var dictType = "trigger_condition_operator";
 
+      getList(dictType, this.dictDataType).then((res) => {
+        console.log(res.data, 'res')
+        this.optionstriggerConditionOperator = res.data;
+        // console.log(
+        //   this.optionstriggerConditionOperator,
+        //   "  this.optionstriggerConditionOperator "
+        // );
+      });
+    },
     // 且或
     changetriggerLogicsname(e, index) {
       this.openlist.triggerConditionList[index].triggerLogic = e;
@@ -494,6 +511,19 @@ export default {
       });
       this.infolist();
     },
+    changehos() {
+      // this.$message.error('1111111111')
+      // this.$message.error('应该选择${conf.accept}类型的文件')
+      this.$alert('这是一段内容', '标题名称', {
+        confirmButtonText: '确定',
+        callback: action => {
+          this.$message({
+            type: 'info',
+            message: `action: ${action}`
+          });
+        }
+      });
+    },
     // 展示触发条件
     infolist() {
       this.routeId = this.$route.query.id;
@@ -504,10 +534,13 @@ export default {
           p.dictDataType = this.optionsname.find(
             (el) => el.dictValue == p.triggerConditionCode
           )?.dictDataType;
-          var dictType = p.triggerConditionCode;
+          // var dictType = p.triggerConditionCode;
-          getAgencytype(dictType).then((res) => {
+          // getAgencytype(dictType).then((res) => {
-            this.ConditionValue = res.data;
+          //   this.ConditionValue = res.data;
-          });
+          this.optiononditionOperator();
+
+          // });
+
           // console.log(this.ConditionValue,'ConditionValueConditionValueConditionValueConditionValue')
 
           // this.handlelist();
@@ -517,7 +550,6 @@ export default {
           //   this.optionstriggerConditionOperator = res.data;
           // });
         });
-        this.optiononditionOperator();
         if (res.data.length == 1) {
           // 回显一条时
           this.updata = res.data[0];
@@ -557,6 +589,8 @@ export default {
     // 编辑接口
     infolistname() {
       this.routeId = this.$route.query.id;
+      this.optionstriggerConditionOperator = []
+
       triggerConditionList(this.routeId).then((res) => {
         this.openlist.triggerConditionList = res.data;
         this.openlist.triggerConditionList.forEach((o) => {
@@ -564,16 +598,22 @@ export default {
           o.dictDataType = this.optionsname.find(
             (el) => el.dictValue == o.triggerConditionCode
           )?.dictDataType;
+          // console.log(o.dictDataType, 'dictDataTypedictDataTypedictDataTypedictDataType')
+          var dictType = "trigger_condition_operator";
+
+          getList(dictType, o.dictDataType).then((res) => {
+            this.optionstriggerConditionOperator = res.data;
+            setTimeout(() => {
+              this.optionstriggerConditionOperator = []
+
+            }, 30);
+          });
+
           var dictType = o.triggerConditionCode;
           getAgencytype(dictType).then((res) => {
+            // console.log(res, 'ressssssss')
             this.ConditionValue = res.data;
           });
-          // if (o.triggerConditionCode.includes("SEX")) {
-          //   var dictType = "SEX";
-          //   getAgencytype(dictType).then((res) => {
-          //     this.ConditionValue = res.data;
-          //   });
-          // }
         });
         this.$set(this.updata, "suitRange", this.openlist.suitRange);
       });

src/views/system/editorialSpecialization/index.vue

@@ -432,7 +432,7 @@ export default {
     this.info();
     this.infolist();
     this.infolistoptionslistS();
-    this.optiononditionOperator();
+    // this.optiononditionOperator();
     this.optiononditionOperators();
   },
   watch: {},
@@ -453,11 +453,15 @@ export default {
     },
     // 包含
     changetriggerLogic(e, index) {
+      // if (this.updata.triggerConditionList[index].triggerConditionOperator=='') {
+      //   this.$message('请先选择第一个')
+      // } else {
       this.updata.triggerConditionList[index].triggerConditionOperatorName =
         this.optionstriggerConditionOperator.find(
           (el) => el.dictValue == e
         ).dictLabel;
       this.updata.triggerConditionList[index].triggerConditionValue = null;
+      // }
     },
     // 诊断
     changetriggerConditionName(e, index) {

src/views/system/specialDiseaseNode/index.vue

@@ -322,7 +322,10 @@
                   ></scripts>
                 </span>
               </div>
-              <div class="pushMethod" v-if="form.phoneDialMethod == 'COMMON' || !form.phoneDialMethod">
+              <div
+                class="pushMethod"
+                v-if="form.phoneDialMethod == 'COMMON' || !form.phoneDialMethod"
+              >
                 问卷模板：
                 <span class="spanname" v-if="form.phoneTemplateId">
                   <question
@@ -1063,7 +1066,11 @@ export default {
   background-color: #fff !important;
   color: #606266 !important;
 }
-
+::v-deep.el-form-item--medium .el-form-item__content {
+  line-height: 36px;
+  height: 40px;
+  overflow: hidden;
+}
 ::v-deep .el-card__body {
   position: relative;
 }