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

src/views/system/components/wangEditor.vue

@@ -316,7 +316,7 @@ function withAttachment(editor) {                        // JS 语法
 Boot.registerPlugin(withAttachment)
 function renderAttachment(elem, children, editor) {                                                // JS 语法
     // 获取“附件”的数据，参考上文 myResume 数据结构
-    const { fileName = '', link = '', fileSpan = '', fieldMark } = elem
+    const { fileName = '', link = '', fileSpan = '', fieldMark = '' } = elem
     // 附件 icon 图标 vnode
     const iconVnode = h(
         // HTML tag

src/views/system/specialDiseaseNode/index.vue

@@ -8,7 +8,6 @@
       </div>
       <div class="select">
         <span> 适用范围 </span>
-
         <el-select v-model="updata.suitRange" placeholder="请选择" @change="changeoptions">
           <el-option v-for="item in options" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
           </el-option>
@@ -356,18 +355,15 @@ export default {
   },
   created() {
     this.infolist();
-    this.taskinfo();
   },
   beforeDestroy() { },
   watch: {},
   mounted() { },
   methods: {
     changeoptions(e) {
-      console.log(e);
       this.parentDictCode = this.options.find(
         (el) => el.dictValue == e
-      ).dictCode;
+      )?.dictCode;
-      console.log(this.parentDictCode, "this.parentDictCode");
       this.changelisy();
     },
     changelisy() {
@@ -379,6 +375,7 @@ export default {
       var dictType = "suit_range";
       getAgencytype(dictType).then((res) => {
         this.options = res.data;
+        this.taskinfo();
       });
     },
     info() {
@@ -393,7 +390,7 @@ export default {
         this.updata.suitRange = this.$route.query.suitRange;
         this.parentDictCode = this.options.find(
           (el) => el.dictValue == this.updata.suitRange
-        ).dictCode;
+        )?.dictCode;
         this.changelisy();
         this.updata.routeName = this.$route.query.routeName;
         this.updata.specialDiseaseRouteId = this.$route.query.id;
@@ -585,7 +582,6 @@ export default {
     taskinfo() {
       selectTaskTypeList().then((res) => {
         this.selectTaskTypeList = res.data;
-
         this.info();
       });
     },