Merge remote-tracking branch 'origin/testedMerge'

package-lock.json

@@ -1931,7 +1931,6 @@
     "bindings": {
       "version": "1.5.0",
       "resolved": "https://registry.npm.taobao.org/bindings/download/bindings-1.5.0.tgz",
-      "integrity": "sha1-EDU8npRTNLwFEabZCzj7x8nFBN8=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -4546,7 +4545,6 @@
     "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/file-uri-to-path/download/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha1-VTp7hEb/b2hDWcRF8eN6BdrMM90=",
       "dev": true,
       "optional": true
     },
@@ -4836,7 +4834,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4857,12 +4856,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4877,17 +4878,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5004,7 +5008,8 @@
         "inherits": {
           "version": "2.0.4",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5016,6 +5021,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5030,6 +5036,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5037,12 +5044,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.9.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5061,6 +5070,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5150,7 +5160,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5162,6 +5173,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5247,7 +5259,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5283,6 +5296,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5302,6 +5316,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5345,12 +5360,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -6410,7 +6427,6 @@
     "jquery": {
       "version": "3.4.1",
       "resolved": "https://registry.npm.taobao.org/jquery/download/jquery-3.4.1.tgz",
-      "integrity": "sha1-cU8fjZ3eS9+lV2S6N+8hRjDYDvI=",
       "dev": true
     },
     "js-levenshtein": {
@@ -7192,7 +7208,6 @@
     "nan": {
       "version": "2.14.0",
       "resolved": "https://registry.npm.taobao.org/nan/download/nan-2.14.0.tgz",
-      "integrity": "sha1-eBj3IgJ7JFmobwKV1DTR/CM2xSw=",
       "dev": true,
       "optional": true
     },

src/api/config.js

@@ -1,3 +1,6 @@
+// const testUrl = 'http://223.93.170.82:23650'
+const testUrl = ''
+
 export default {
   host:'http://192.168.2.241:5050',
   imgHost:'http://192.168.2.121:82',      //富文本编辑器图片回传地址
@@ -15,8 +18,8 @@ export default {
     'registry': '/api/user/user/registry',
     'getSmsWithResetPassword': '/api/user/userver/getSmsWithResetPassword',
     'resetPassword': '/api/user/user/resetPassword',
-    'getAccessdMenu': '/api/user/user/getUserOrgMenu',  //获取左侧菜单项
-    'getVersionInner':'api/knowledgeman/versionInfo/getVersionInfoInner',  //获取内部版本信息
+    'getAccessdMenu': testUrl+'/api/user/user/getUserOrgMenu',  //获取左侧菜单项
+    'getVersionInner':testUrl+'api/knowledgeman/versionInfo/getVersionInfoInner',  //获取内部版本信息
     'getVersionOuter':'api/knowledgeman/versionInfo/getVersionInfoOuter',  //获取外部版本信息
     'getUserEnumsData': '/api/user/getUserEnumsData',   //获取用户枚举数据
     'getDiagbotManEnumsData':'/api/diagbotman/getDiagbotManEnumsData',      //获取产品枚举类型
@@ -150,7 +153,7 @@ export default {
     'getVersionDetlInfo': 'api/knowledgeman/versionDetail/getDetailById', //版本信息-版本说明列表获取
     'promptServer':'/api/knowledgeman/file/uploadImage',    //静态知识富文本图片上传
     /**************医学术语维护****************/
-    'getKnowledgeEnums':'/api/knowledgeman/getKlmEnumsData', //术语库枚举
+    'getKnowledgeEnums':testUrl+'/api/knowledgeman/getKlmEnumsData', //术语库枚举
 	  'saveConceptInfo':'/api/knowledgeman/conceptDetail/insertOrUpdate',   //保存术语静态知识
     'delConceptInfo':'/api/knowledgeman/conceptDetail/delete',   //删除术语静态知识
     'knowledgeName': 'api/knowledgeman/concept/getAllInformation', //医学术语-命名维护
@@ -203,7 +206,7 @@ export default {
     'searchKnowledgeLis': 'api/knowledgeman/scaleContent/index', //量表结构检索
     'getknowledgeList': 'api/knowledgeman/dictionaryInfo/getList', //量表结构字典信息
     'getModuleType': 'api/icssman/moduleInfo/getModuleType',  //模板维护 -- 类型筛选
-    'indexByLexicon': 'api/icssman/questionInfo/indexByLexicon',  //知识库标准化-根据名称和术语库词性类型搜索
+    'indexByLexicon': testUrl+'/'+'api/icssman/questionInfo/indexByLexicon',  //知识库标准化-根据名称和术语库词性类型搜索
     'indexByLexiconStandWord':'api/knowledgeman/commonconcept/indexByLexicon',  //知识库标准化-根据名称搜索
     'getAssaySon': 'api/knowledgeman/lisSonContact/lisSonContactList',  //化验子项维护
     'getAssaySonDetail': 'api/knowledgeman/lisSonContact/relationContactDetail',  //化验子项维护-详情
@@ -231,20 +234,21 @@ export default {
     
 
 	  /*********预问诊相关接口**********/
-	  'questionList':'/api/precman/questionInfo_prec/page',     //预问诊-填写单列表
-    'questionAdd':'/api/precman/questionInfo_prec/saveOrUpdate',      //预问诊-填写单添加
-    'questionSearch':'/api/precman/questionInfo_prec/index',    //预问诊-填写单检索
-    'preTypeList':'/api/precman/dictionaryInfo_prec/getList',   //类型枚举
+	  'questionList':testUrl+'/api/precman/questionInfo_prec/page',     //预问诊-填写单列表
+    'questionAdd':testUrl+'/api/precman/questionInfo_prec/saveOrUpdate',      //预问诊-填写单添加
+    'questionSearch':testUrl+'/api/precman/questionInfo_prec/index',    //预问诊-填写单检索
+    'preTypeList':testUrl+'/api/precman/dictionaryInfo_prec/getList',   //类型枚举
     'questionDel':'/api/precman/questionInfo_prec/delete',      //删除
     'uploadImg':'/api/precman/file_prec/uploadImage',       //图片上传
     'fileDel':'/api/precman/file_prec/deleteRemoteFile',          //图片删除
-    'questionDetail':'/api/precman/questionInfo_prec/getById',                //填写单详情
-    'moduleList':'/api/precman/moduleInfo_prec/getModuleInfoList',        //模板列表
+    'questionDetail':testUrl+'/api/precman/questionInfo_prec/getById',                //填写单详情
+    'moduleList':testUrl+'/api/precman/moduleInfo_prec/getModuleInfoList',        //模板列表
     'addModule':'/api/precman/moduleInfo_prec/saveOrUpdateModuleInfo',        //模板添加
     'delModule':'/api/precman/moduleInfo_prec/delete',        //模板删除
     'moduleDetail':'/api/precman/moduleInfo_prec/getModuleInfoOne',    //模板详情
-    'deptList':'/api/precman/moduleInfo_prec/getAllDeptAndDisInfo',    //模板-科室列表
-    'getPrecModuleType':'/api/precman/moduleInfo_prec/getModuleType',     //获取未创建的模板类型
+    'deptList':testUrl+'/api/precman/moduleInfo_prec/getAllDeptAndDisInfo',    //模板-科室列表
+    'getPrecModuleType':testUrl+'/api/precman/moduleInfo_prec/getModuleType',     //获取未创建的模板类型
+    'getByIds':'/api/prec/questionInfo/getByIds',// 获取多个问题
      /*********诊断依据*********/
      'exportDiagnosticAll': '/api/knowledgeman/diagnose/exportDiagnosticAll', //诊断依据--导出诊断依据
      'exportDiagnosticBasis': '/api/knowledgeman/diagnose/exportDiagnosticBasis', //诊断依据--导出诊断依据问题

src/api/index.js

@@ -3,7 +3,7 @@ import config from './config.js';
 
 axios.default.timeout = 5000;
 axios.defaults.headers.post['Content-Type'] = "application/json;charset=utf-8";
-//axios.defaults.baseURL = 'http://223.93.170.82:23650';
+//axios.defaults.baseURL = 'http://192.168.2.236:88';
 
 const urls = config.urls;
 export default {

src/api/preTreat.js

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

src/api/utils.js

@@ -180,10 +180,11 @@ export default {
   /**
    * 
    * @param {dataArr} 右侧选中的数据二维数组 
+   * @param {tmpArrAdd} 既往史自动生成的组合标签的id存储 
    * @param {type} 填写单类型 
    */
-  dataRecombination(dataArr,type){
-    // console.log(dataArr,type)
+  dataRecombination(dataArr,type,tmpArrAdd){
+    // console.log(11111,tmpArrAdd,dataArr)
     let tmpArr = [];
     for(let i = 0;i < dataArr.length;i++){
       let tmpData = dataArr[i];
@@ -215,7 +216,9 @@ export default {
           }else{
             mapping.formPosition = 0;
             mapping.exclusionType = 0;
+            mapping.sonQuestion = tmpArrAdd[i][0] || ''; //既往史新增标签的id
             sonMappingObj.sonQuestion = tmpData[j];    //{sonQuestion:18}
+            sonQuestionMap.id = tmpArrAdd[i][0] || '';    //{sonQuestion:18}
             sonQuestionMap.questionMappings = sonMappingArr;    //{id:"",[{sonQuestion:18},{sonQuestion:18}]}
             mapping.questionMappingSon = sonQuestionMap;
           }

src/components/icss/NoiseTemplate.vue

@@ -136,7 +136,8 @@ export default {
       },
       sendIds: [[], [], [], [], [], []],           //标签明细右侧操作数据
       saveDisable: false, //保存按钮是否可点击
-      isEditOrCopy: false //是否为修改或复制
+      isEditOrCopy: false, //是否为修改或复制
+      tmpArrAdd:[[], [], [], [], [], []],//既往史自动生成标签id
     }
   },
   beforeMount:function(){
@@ -182,8 +183,9 @@ export default {
     changeType(type) {        //填写单类型改变，标签明细左侧更新，右侧清空
       // console.log(type)
     },
-    changeActionData(arr) {          //标签明细右侧数据id
+    changeActionData(arr,tmpArr) {          //标签明细右侧数据id
       this.sendIds = arr
+      this.tmpArrAdd = tmpArr
     },
     submitForm() {       // 调用子组件的方法验证公用部分
       if(document.querySelectorAll('.redWordTip')[0]){
@@ -218,7 +220,7 @@ export default {
           return;
       }
      
-      let detailLis = utils.dataRecombination(this.sendIds, this.dataPub.region2)
+      let detailLis = utils.dataRecombination(this.sendIds, this.dataPub.region2,this.tmpArrAdd)
 
       let param = {
         "disTypeVO": {

src/components/icss/PubTagPartDetail.vue

@@ -144,6 +144,7 @@ export default {
       poolDetailList: [[{questionDetailList:[]}],[{questionDetailList:[]}],[],[],[],[]],     //默认6个部分
       poolDetailListTips: [[],[],[],[],[],[]],     //6个部分对应的提示
       poolDetailListIds: [[],[],[],[],[],[]],     //6个部分对应的id
+      poolDetailListIdsTmp: [[],[],[],[],[],[]],     //6个部分对应有自动生成的id
       poolDetailListAll:[],    //默认6个部分转化为一维数组
       activePart: '-1',        //选中part第几个
       activePartSon:'-1',      //选中第几个part中的元素了
@@ -167,6 +168,7 @@ export default {
       this.currentTipLis = this.tipLis
       if(tagList.length > 0){
         let tmpArr = [[],[],[],[],[],[]];
+        let tmpArrAdd = [[],[],[],[],[],[]];
         this.tmpNum = 1
         if(this.sign == 2){//杂音修改
           if(tagList[0].formPosition == 1){
@@ -189,6 +191,11 @@ export default {
                     tmpArr[1].push(sticArr)
                     tmpArr[idx+1] = val.questionMapping
                   }
+                  if(idx >1){
+                    tmpArrAdd[idx].push(val.id)//既往史自动生成的id
+                  }else{
+                    tmpArrAdd[idx]=[]
+                  }
                 })
               }else if(tagList[0].formPosition == 1 && tagList[1].tagType == 1){   //第一条为互斥项,第二条是伴无  12...
                 tagList.map((val,idx)=>{
@@ -197,6 +204,11 @@ export default {
                     }else{
                       tmpArr[idx] = val.questionMapping
                     }
+                    if(idx >1){
+                      tmpArrAdd[idx].push(val.id)//既往史自动生成的id
+                    }else{
+                      tmpArrAdd[idx]=[]
+                    }
                 })
               }else if(tagList[0].formPosition != 1 && tagList[0].tagType == 1){   //第一条是伴无  2...
                 tagList.map((val,idx)=>{
@@ -206,12 +218,22 @@ export default {
                     }else if(idx > 0){
                       tmpArr[idx+1] = val.questionMapping
                     }
+                    if(idx >1){
+                      tmpArrAdd[idx].push(val.id)//既往史自动生成的id
+                    }else{
+                      tmpArrAdd[idx]=[]
+                    }
                 })
               }else{  //第一条不是互斥项,第二条不是伴无  3...
                 tmpArr[0].push({questionDetailList:[]})
                 tmpArr[1].push({questionDetailList:[]})
                 tagList.map((val,idx)=>{
                   tmpArr[idx+2] = val.questionMapping
+                  if(idx >1){
+                    tmpArrAdd[idx].push(val.id)//既往史自动生成的id
+                  }else{
+                    tmpArrAdd[idx]=[]
+                  }
                 })
               }
             }else{       //有且只有一条
@@ -225,10 +247,12 @@ export default {
                 tmpArr[0].push(sticArr)
                 tmpArr[1].push(sticArr)
                 tmpArr[2] = tagList[0].questionMapping
+                tmpArrAdd[2].push(tagList[0].id)
               }
             }
           }
         this.poolDetailList = tmpArr
+        this.poolDetailListIdsTmp = tmpArrAdd
         this.poolDetailListAll = Array.prototype.concat.apply([],this.poolDetailList);     //二维转一维
         this.searchTagList()
         this.getPoolDetailListTips();
@@ -281,6 +305,7 @@ export default {
         this.poolDetailList = [[{questionDetailList:[]}],[{questionDetailList:[]}],[],[],[],[]]
         this.poolDetailListTips = [[],[],[],[],[],[]]
         this.poolDetailListIds = [[],[],[],[],[],[]]
+        this.poolDetailListIdsTmp =[[],[],[],[],[],[]]
         this.poolDetailListAll=[]
         this.activePart='-1'
         this.activePartSon='-1'
@@ -333,23 +358,30 @@ export default {
       }else if((this.choose == 'multiple') && (utils.filterArr(this.selectArr,true,2) && this.poolDetailList[this.activePart].length > 0) || (this.multipleItem.length > 0)){
         if(this.activePart != -1){
           let tmparr = this.poolDetailList;
+          let tmpAddIds = this.poolDetailListIdsTmp;
           if(this.activePart == 0 || this.activePart == 1){
             tmparr[this.activePart] = [{questionDetailList:[]}]
           }else{
             tmparr[this.activePart] = []
+            tmpAddIds[this.activePart] = []
           }
           this.poolDetailList = tmparr;
+          this.poolDetailListIdsTmp = tmpAddIds
           this.poolDetailListAll = Array.prototype.concat.apply([],this.poolDetailList);     //二维转一维
           this.searchTagList();
           this.currentLis = [];
           this.getPoolDetailListTips();
         }else{
           let tmparr = [],tmpArr = this.poolDetailList[this.activePartSon],tmpArrR = [];
+          let tmpAddIds = this.poolDetailListIdsTmp;
           this.multipleItem.map((id)=>{
             this.poolDetailListAll = utils.filterArr(this.poolDetailListAll,id,1,1)
             this.multipleItem = []
             tmpArr = utils.filterArr(tmpArr,id,1,1)
           })
+          if(tmpArr.length == 0){
+            tmpAddIds[this.activePartSon] = []
+          }
           this.poolDetailList[this.activePartSon] = tmpArr
           this.searchTagList();
           this.currentLis = [];
@@ -381,7 +413,7 @@ export default {
           }
         }
       }
-      this.$emit('changeActionData',poolDetailListIds, false);
+      this.$emit('changeActionData',poolDetailListIds,this.poolDetailListIdsTmp, false);
       if(this.choose == 'multiple'){
         this.poolDetailListTips = [[],[],[],[],[],[]]
       }else{

src/components/preTreat/AddCombinQuestion.vue

@@ -109,7 +109,7 @@
             "itemType" :this.dataPub.region12,           //是否为主要内容
             "url":this.dataPub.region13,                  //上传图片
             'explains':this.dataPub.explains,           //症状解释
-            //"questionDetails": this.options,                //明细项
+            "questionDetails": this.options,                //明细项
             "questionMappings": this.options,      //映射关系,
           }
         };

src/components/preTreat/AddSimpleQuestion.vue

@@ -19,11 +19,12 @@
                 填写单明细：<span v-if="dataPub.region2==2">(互斥项与其他明细内容互斥，互斥项同时只可选择一个)</span>
             </p>
             <PubSelect
-                    v-if="dataPub.region2==1 || dataPub.region2==2 || dataPub.region2==3 || dataPub.region2==11|| dataPub.region2==8"
+                    v-if="dataPub.region2==1 || dataPub.region2==2 || dataPub.region2==3 || dataPub.region2==11|| dataPub.region2==8|| dataPub.region2==10"
                     :ascription="dataPub.region1"
                     :sexType="dataPub.region7"
                     :type="dataPub.region2"
                     @pushValues="pushValues"
+                    :hasId="editData.id||''"
                     :options="editData.questionDetailList"></PubSelect>
             <div class="btn">
                 <el-button

src/components/preTreat/PubIndeptQa.vue

@@ -13,7 +13,7 @@
                     label="选择归属："
                     prop="region1"
             >
-                <span class="changeTips">改变归属后，填写单明细将会恢复到默认状态</span>
+                <!-- <span class="changeTips">改变归属后，填写单明细将会恢复到默认状态</span> -->
                 <el-select
                         v-model="form.region1"
                         placeholder="请选择归属"
@@ -31,7 +31,7 @@
             <el-form-item
                     label="选择类型："
                     prop="region2">
-                <span class="changeTips">改变类型后，填写单明细将会恢复到默认状态</span>
+                <!-- <span class="changeTips">改变类型后，填写单明细将会恢复到默认状态</span> -->
                 <el-select
                         v-model="form.region2"
                         placeholder="请选择类型"
@@ -39,7 +39,8 @@
                         @change="readyChangeSelect(2)"
                 >
                     <el-option
-                            v-for="item in labelTypes"
+                            v-for="item in labelTypes" 
+                            v-if="item.val!=6&&item.val!=7"
                             :label="item.name"
                             :value="item.val"
                             :key="item.val"
@@ -100,12 +101,13 @@
                         @change="sendData"
                 ></el-input>
             </el-form-item>
-          <el-form-item class="flag-box"  v-if="qaType =='1'&& form.region1 == '1' && form.region2 != '4'">
-              <el-checkbox v-model="form.required"  label="必填" true-label="1" false-label="0"  @change="sendData"></el-checkbox>
+          <!-- <el-form-item class="flag-box"  v-if="qaType =='1'&& form.region1 == '1' && form.region2 != '4'"> -->
+          <el-form-item class="flag-box"  v-if="qaType =='1'&&form.region1==1&&(form.region2=='1'||form.region2=='9'||form.region2=='2')">
+              <!-- <el-checkbox v-model="form.required"  label="必填" true-label="1" false-label="0"  @change="sendData"></el-checkbox> -->
               <!--<el-checkbox v-if="form.region2=='9'" v-model="form.specFlag" label="拼接到主诉" true-label="1" false-label="0"  @change="sendData"></el-checkbox>-->
-              <el-checkbox v-if="form.region2=='1'||form.region2=='9'" :disabled="form.flag==='2'" v-model="form.flag" label="时间类型" true-label="1" false-label=""  @change="sendData"></el-checkbox>
-              <el-checkbox v-if="form.region2=='1'||form.region2=='2'" :disabled="form.flag==='1'" v-model="form.flag" label="诱因类型" true-label="2" false-label=""  @change="sendData"></el-checkbox>
-              <el-checkbox v-if="form.region2=='8'" v-model="form.flag" label="伴随类型" true-label="3" false-label=""  @change="sendData"></el-checkbox>
+              <el-checkbox v-if="(form.region2=='9')&&form.region1!='51'" :disabled="form.flag==='2'" v-model="form.flag" label="时间类型" true-label="1" false-label=""  @change="sendData"></el-checkbox>
+              <el-checkbox v-if="(form.region2=='1'||form.region2=='2')&&form.region1!='51'" :disabled="form.flag==='1'" v-model="form.flag" label="诱因类型" true-label="2" false-label=""  @change="sendData"></el-checkbox>
+              <!-- <el-checkbox v-if="form.region2=='8'" v-model="form.flag" label="伴随类型" true-label="3" false-label=""  @change="sendData"></el-checkbox> -->
           </el-form-item>
             <el-form-item
                     v-if="qaType==2"
@@ -299,10 +301,10 @@
         showFileList:false,
         uploadUrl:config.urls.uploadImg,        //图片上传地址
         labelTypesMaps: {       // 归属和填写单类型限制
-          '1':['1','2','3','5','6','7','8','9'], //症状情况
-          '51':['1','2','3','4','5','6','7','9'],    //诊疗情况
-          '3':['1','2','3','5','6','7','9'],         //其他史
-          '52':['1','2','3','5','6','7','9']            //补充内容
+          '1':['1','2','3','5','8','9','10'], //症状情况
+          '51':['1','2','3','4','5','9','10'],    //诊疗情况
+          '3':['1','2','3','5','9','10'],         //其他史
+          '52':['1','2','3','5','9','10']            //补充内容
         },
         combinLabelMaps:{
           '1':['4'], //症状情况
@@ -411,8 +413,22 @@
       getDropList() {
         return api.getPreTypeList().then((res) => {
           if (res.data.code === '0') {
-            this.Adscriptions = res.data.data[1];
-            this.labelTypesList = this.qaType==1?res.data.data[2]:res.data.data[3];
+            const {isEdit,isCopy} = this.$route.params;
+            if(this.qaType == 1){
+              this.Adscriptions = res.data.data[1];
+              this.labelTypesList = res.data.data[2];
+            }else{
+              if(isEdit||isCopy){
+                this.Adscriptions = res.data.data[1];
+                this.labelTypesList = res.data.data[3];
+              }else{
+                this.Adscriptions = (res.data.data[1]).slice(0,1);
+                this.form.region1 = '1'
+                this.labelTypesList = (res.data.data[3]).slice(0,1);
+                this.form.region2 = '4'
+              }
+            }
+
             const editData = this.$props.editData;
             //编辑时，单选、多选可互相切换
             if(editData.controlType=='1'||editData.controlType=='2'){

src/components/preTreat/QuestionTagGroup.vue

@@ -276,7 +276,6 @@ export default {
               return ;
             }
             this.rightTagsList.push(...this.selectLeftTagsList);
-
             for (let i = 0; i < this.rightTagsList.length; i++) {
                 this.leftTagsList = this.leftTagsList.filter(item => item.id !== this.rightTagsList[i].id)
             }
@@ -300,7 +299,8 @@ export default {
                 "notIds": notIds,
                 "notControlType":this.qaType==2||this.ascription!='51'?['4']:[],             //组合填写单或非诊疗情况模版不能添加图片上传
                 "sexType": this.sexType,
-                "tagType":+this.qaType===2?maps[this.type]:['1','6']       //qaType=2:组合填写单，qaType=3模板
+                "tagType":+this.qaType===2?maps[this.type]:['1']       //qaType=2:组合填写单，qaType=3模板
+                // "tagType":+this.qaType===2?maps[this.type]:['1','6']       //qaType=2:组合填写单，qaType=3模板
             };
             api.questionSearch(param).then((res) => {
                 if (res.data.code === '0') {

src/components/preTreat/SimpleQuestion.vue

@@ -163,7 +163,7 @@
           if(res.data.code === '0') {
             this.Adscriptions = res.data.data[1];
             this.tagTypes =  res.data.data[2];
-            this.tagTypes =  this.tagTypes.filter(item => item.val != 0)  //去掉名称为默认值的填写单类型
+            this.tagTypes =  this.tagTypes.filter(item => item.val != 0&&item.val != 6&&item.val != 7)  //去掉名称为默认值的填写单类型
 
           }
 

vue.config.js

@@ -1,7 +1,8 @@
 const path = require('path');
 // const proxy_path = 'http://192.168.2.236:80';
-const proxy_path = 'http://192.168.2.241:88';
-// const proxy_path = 'http://192.168.2.236:88';
+// const proxy_path = 'http://192.168.2.241:88';
+const proxy_path = 'http://223.93.170.82:23650';
+//  const proxy_path = 'http://192.168.2.236:88';
 // const proxy_path = 'http://192.168.3.101:5050';
 // const proxy_path = 'http://192.168.3.117:5050';//周铁刚
 // const proxy_path = 'http://192.168.3.115:5050';