Pārlūkot izejas kodu

bug1774,1847,1858,1860修改

zhouna 6 gadi atpakaļ
vecāks
revīzija
f3d4664146

+ 1 - 0
src/components/icss/AddMedicinePrompt.vue

@@ -15,6 +15,7 @@
                                filterable
                                remote
                                clearable
+                               no-data-text=" "
                                value-key="conceptId"
                                ref="termName"
                                placeholder="搜索"

+ 1 - 1
src/components/preTreat/AddQuestionModules.vue

@@ -86,7 +86,7 @@
             <p class="title" v-if="form.type&&form.moduleType">
                 <i v-if="form.type!=1">*</i>填写单明细:
             </p>
-            <QuestionTagGroup v-if="form.type&&form.moduleType&&form.type!=1" qaType="3" :ascription="form.type" @changeActionData="pushValues" :options="editData.moduleDetail"></QuestionTagGroup>
+            <QuestionTagGroup v-if="form.type&&form.moduleType&&form.type!=1" qaType="3" :ascription="form.type" :relationId="form.relationId" @changeActionData="pushValues" :options="editData.moduleDetail"></QuestionTagGroup>
             <div class="static" v-if="form.type==1">
                 <p>请问您有哪些不适?</p>
                 <div class="inner">科室常见症状</div>

+ 1 - 1
src/components/preTreat/PubIndeptQa.vue

@@ -220,7 +220,7 @@
             name='系统名称';
             break;
           case 2:
-            name='医生界面标准内容';
+            name=this.qaType==1?'界面描述名称':'医生界面标准内容';
             break;
           case 3:
             name='患者界面通俗内容';

+ 3 - 1
src/components/preTreat/PubSelect.vue

@@ -248,7 +248,9 @@
         this.$emit('pushValues',items);
       },
       HandleInputName(i, name, isName) {
-        if(name.length > 30) {
+        const pureName=name.replace(/(\$\{number_\S*?\})|(\$\{input_\S*?\})/g,'');
+        //console.log(pureName);
+        if(pureName.length > 30) {
           if(isName){
             Vue.set(this.rows[i], 'name', this.rows[i].name.slice(0, 30));
             this.$refs.inputName[i].currentValue = this.rows[i].name;

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

@@ -61,7 +61,7 @@ import api from '@api/preTreat.js';
 
 export default {
     name: "QuestionTagGroup",
-    props: ['ascription','sexType','options','type','qaType'],
+    props: ['ascription','sexType','options','type','qaType','relationId'],
     data() {
         return {
             leftTagsList: [],
@@ -101,7 +101,10 @@ export default {
         },
         type(newVal, preVal){
           this.ifReflashTagList(newVal, preVal);
-        }
+        },
+        relationId(newVal, preVal){
+          this.ifReflashTagList(newVal, preVal);
+        },
     },
     methods: {
         handleExclu(){