Browse Source

预问诊-编辑时单选多选可切换,且选项内容不清空

zhouna 5 years ago
parent
commit
416b985811

+ 0 - 7
src/components/preTreat/AddSimpleQuestion.vue

@@ -66,13 +66,6 @@
     methods: {
       changeVal(val) {   //子组件数据改变传递到父组件
         this.dataPub = val;
-        //console.log('公用组件传的值都在这', val);
-      },
-      changeSex() {       //性别改变,清空填写单明细
-        this.changeType();
-      },
-      changeType() {      //填写单类型改变,标签明细左侧更新,右侧清空
-        this.options = [];
       },
       pushValues(its){
         this.options = its;

+ 10 - 2
src/components/preTreat/PubIndeptQa.vue

@@ -35,7 +35,7 @@
                 <el-select
                         v-model="form.region2"
                         placeholder="请选择类型"
-                        :disabled="!!editData.id  || !form.region1"
+                        :disabled="(!!editData.id&&editData.controlType!='1'&&editData.controlType!='2')  || !form.region1"
                         @change="readyChangeSelect(2)"
                 >
                     <el-option
@@ -418,7 +418,15 @@
           if (res.data.code === '0') {
             this.Adscriptions = res.data.data[1];
             this.labelTypesList = this.qaType==1?res.data.data[2]:res.data.data[3];
-            this.labelTypes = this.labelTypesList;
+            const editData = this.$props.editData;
+            //编辑时,单选、多选可互相切换
+            if(editData.controlType=='1'||editData.controlType=='2'){
+              this.labelTypes = this.labelTypesList.filter((it)=>{
+                return it.val==='1'||it.val==='2';
+              })
+            }else{
+              this.labelTypes = this.labelTypesList;
+            }
           }
         })
       },

+ 2 - 5
src/components/preTreat/PubSelect.vue

@@ -205,15 +205,12 @@
       }
     },
     watch: {
-      /*ascription(newVal, preVal) {        //永远检测不到,因为归属修改时类型被清空,本组件被销毁
-        this.rows = [...utils.getInitRow(initRow,4)];
-      },*/
       focusOn(newVal){
         this.checkedExc = this.rows[newVal].exclusion===1;
       },
-      type() {
+      /*type() {
         this.initData();
-      },
+      },*/
       sexType() {
         this.initData();
       },