Merge remote-tracking branch 'origin/bugfix' into test

src/api/config.js

@@ -249,6 +249,7 @@ export default {
     'deptList':testUrl+'/api/precman/moduleInfo_prec/getAllDeptAndDisInfo',    //模板-科室列表
     'getPrecModuleType':testUrl+'/api/precman/moduleInfo_prec/getModuleType',     //获取未创建的模板类型
     'getByIds':'/api/prec/questionInfo/getByIds',// 获取多个问题
+    'getBySubQuestionId':testUrl+'/api/precman/questionInfo_prec/getBySubQuestionId',// 获取是否被关联
      /*********诊断依据*********/
      'exportDiagnosticAll': '/api/knowledgeman/diagnose/exportDiagnosticAll', //诊断依据--导出诊断依据
      'exportDiagnosticBasis': '/api/knowledgeman/diagnose/exportDiagnosticBasis', //诊断依据--导出诊断依据问题

src/api/preTreat.js

@@ -3,6 +3,9 @@ import config from '@api/config.js';
 
 const urls = config.urls;
 export default {
+  getBySubQuestionId(param){
+    return axios.post(urls.getBySubQuestionId,param)
+  },
   getByIds(param){
     return axios.post(urls.getByIds,param)
   },

src/components/common/CopyRightInfo.vue

@@ -2,7 +2,7 @@
     <footer class="copyRightContainer">
         <div>
             <span class="copyRightInfo">版权所有：杭州朗通信息技术有限公司</span>
-            <span class="copyRightNum">浙ICP备：10039268号</span>
+            <a class="copyRightNum" href="http://www.beian.miit.gov.cn" target="_blank">浙ICP备：16000400号-2</a>
         </div>
     </footer>
 </template>
@@ -32,5 +32,8 @@ export default {
 .copyRightInfo {
     margin: 0 22px 0 238px;
 }
+    .copyRightNum{
+        color:#545455
+    }
 </style>
 

src/components/preTreat/AddSimpleQuestion.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="NoiseTemplateWrapper TemplateWrapper">
+    <div class="NoiseTemplateWrapper TemplateWrapper" @click="hideQas">
         <crumbs
                 :title="txt"
                 class="topBack"
@@ -20,11 +20,13 @@
             </p>
             <PubSelect
                     v-if="dataPub.region2==1 || dataPub.region2==2 || dataPub.region2==3 || dataPub.region2==11|| dataPub.region2==8|| dataPub.region2==10"
+                    ref="PubSelect"
                     :ascription="dataPub.region1"
                     :sexType="dataPub.region7"
                     :type="dataPub.region2"
                     @pushValues="pushValues"
                     :hasId="editData.id||''"
+                    :hasPool="hasPool"
                     :options="editData.questionDetailList"></PubSelect>
             <div class="btn">
                 <el-button
@@ -55,6 +57,7 @@
         itemsTypes:[1,2,8],            //有明细的类型
         editData:{},                    //编辑数据
         options: [],           //标签明细右侧操作数据
+        hasPool:true
       }
     },
     beforeMount:function(){
@@ -62,12 +65,23 @@
       if(isEdit||isCopy){
         this.txt = isCopy?'独立填写单维护-复制独立填写单':'独立填写单维护-修改独立填写单';
         this.editData = data;
+        api.getBySubQuestionId({id:data.id}).then((res) => {
+            if (res.data.code === '0') {
+              // console.log(res.data.data)
+              if(res.data.data&&res.data.data.length>0){
+                this.hasPool = false
+              }
+            }
+        })
       }
     },
     methods: {
       changeVal(val) {   //子组件数据改变传递到父组件
         this.dataPub = val;
       },
+      hideQas(){
+        this.$refs.PubSelect&&this.$refs.PubSelect.hideQas()
+      },
       pushValues(its){
         this.options = its;
       },

src/components/preTreat/PubSelect.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="single-container">
+  <div class="single-container" @click="hideQas">
     <el-form>
       <div class="operation-row">
         <el-checkbox-group size="small">
@@ -51,7 +51,7 @@
             ></el-input>
           </div>
           <el-tag v-if="it.exclusion" type="info" size="mini">互斥项</el-tag>
-          <span :class="tagActive===i?'tag-active el-tag--mini el-tag el-tag--info':'el-tag--mini el-tag el-tag--info'" v-if="it.exclusionCon" @click="getConnectedQas(it.subQuestion,i)">已关联</span>
+          <span :class="tagActive===i?'tag-active el-tag--mini el-tag el-tag--info':'el-tag--mini el-tag el-tag--info'" v-if="it.exclusionCon" @click="getConnectedQas($event,it.subQuestion,i)">已关联</span>
         </el-col>
         <el-button @click="addRow">+</el-button>
         <div class="bottomPartMid bottomPartMidss">
@@ -62,7 +62,7 @@
             <span class="el-icon-arrow-down" @click="orderUpDown(1)"></span>
           </p>
         </div>
-        <div class="connected-qas" v-if="showQas.length>0">
+        <div class="connected-qas" @click.stop v-if="showQas.length>0">
           <p style="margin-bottom: 10px;">关联的问题：</p>
           <p v-for="(qa,i) in showQas">{{i+1}}. {{qa.name}}</p>
         </div>
@@ -91,7 +91,7 @@
           </p>
         </div>
       </div>
-      <div v-if="type==1||type==2" class="bottomPartLeft">
+      <div v-if="(type==1||type==2)&&hasPool" class="bottomPartLeft">
         <p class="poolTitle">标签池</p>
         <div class="pool">
           <el-input placeholder="请输入搜索内容" v-model="searchVal">
@@ -202,7 +202,7 @@
     margin: 20px 150px 20px 30%;
     .bottomPartMid {
       top: 0;
-      right: 40%;
+      right: 5%;
     }
   }
   .inps {
@@ -255,10 +255,11 @@ import Vue from "vue";
 const initRow = { orderNo: 0, name: "", description: "", exclusion: 0 };
 const initRows = utils.getInitRow(initRow, 4);
 export default {
-  props: ["type", "options", "ascription", "sexType","hasId"],
+  props: ["type", "options", "ascription", "sexType","hasId","hasPool"],
   data() {
     return {
       rows: [...initRows],
+      selectIndex: -1,
       checkedExc: false,
       checkedCon: false,
       focusOn: -1, //聚焦的行index
@@ -305,8 +306,10 @@ export default {
       this.searchTagList();
     },
     focusOn(newVal) {
+      this.selectIndex = newVal
       this.checkedExc = this.rows[newVal].exclusion === 1;
       this.checkedCon = this.rows[newVal].exclusionCon === 1;
+      this.searchTagList()
     },
     /*type() {
         this.initData();
@@ -316,10 +319,10 @@ export default {
     }
   },
   methods: {
-    getConnectedQas(ids,n){
+    getConnectedQas(e,ids,n){
+      e.stopPropagation();
       if(this.tagActive===n){
-        this.tagActive=-1;
-        this.showQas=[];
+       this.hideQas()
         return;
       }
       this.tagActive=n;
@@ -351,6 +354,10 @@ export default {
         }
       });
     },
+    hideQas(){
+      this.tagActive=-1;
+      this.showQas =[]
+    },
     selectLeftTag(tag) {
       const hasTag = this.isHasTag(tag, this.selectLeftTagsList);
       if (hasTag) {
@@ -376,7 +383,7 @@ export default {
     searchTagList() {
       let ids = []
       this.rows.map((it, x) => {
-        if (it.subQuestion) {
+        if (it.subQuestion&&this.selectIndex===x) {
           ids=ids.concat(it.subQuestion.split(','))
         }
       });