独立填写单编辑

src/api/preTreat.js

@@ -23,5 +23,9 @@ export default {
   },
   fileDel(param){
     return axios.post(urls.fileDel,param);
-  }
+  },
+  indexByLexicon(param) {
+    return axios.post(urls.indexByLexicon, param)
+  },
+
 }

src/api/utils.js

@@ -255,5 +255,34 @@ export default {
     }
     return arr;
   },
+  /**
+   * 预问诊-字段转换
+   *
+   * **/
+  transPretreatKeys(org){
+    const maps = {
+      name:'region4',
+      description:'region5',
+      itemType:'region12',
+      sexType:'region7',
+      ageBegin:'region8',
+      ageEnd:'region9',
+      tagName:'region3',
+      tagType:'region2',
+      type:'region1',
+      url:'region13',
+    };
+    let obj = {};
+    for(let i in org){
+      if(maps[i]){
+        obj[maps[i]] = org[i]+'';
+      }
+    }
+    return obj;
+  },
+  //获取图片名称
+  getImgName(url){
+    const arr = url.split("/");
+    return arr[arr.length-1];
+  }
 }
-

src/components/preTreat/AddCombinQuestion.vue

@@ -0,0 +1,214 @@
+<template>
+    <div class="NoiseTemplateWrapper TemplateWrapper">
+        <crumbs
+                :title="txt"
+                class="topBack"
+                linkTo="/admin/LT-YWZSJWH-ZHTXDWH"
+        ></crumbs>
+        <PubIndeptQa
+                @changeVal="changeVal"
+                @changeSex="changeSex"
+                @changeType="changeType"
+                @validatePass="validatePass"
+                qaType="2"
+                :editData="editData"
+                ref="submitForm"
+        ></PubIndeptQa>
+        <div class="main">
+            <p class="title" v-if="dataPub.region2==1||dataPub.region2==2|| dataPub.region2==11">
+                <i>*</i> 填写单明细：
+                <i v-if='dataPub.region2==2' style="margin-left:70px;color: #22ccc8; font-size: 12px;">所有选项必须都有或者都没有同“伴”/“无”标记</i>
+            </p>
+            <PubSelect v-if="dataPub.region2==1 || dataPub.region2==2 || dataPub.region2==11" :ascription="dataPub.region1" :sexType="dataPub.region7" :type="dataPub.region2" @pushValues="pushValues" :options="editData.questionDetailList"></PubSelect>
+            <div class="btn">
+                <el-button
+                        type="primary"
+                        @click="submitForm"
+                >确 定</el-button>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+  /**
+   * dataPub.region2  判断底部显示哪些
+   */
+  import PubIndeptQa from './PubIndeptQa';
+  import PubSelect from './PubSelect';
+  import api from '@api/preTreat.js';
+  import utils from '@api/utils.js';
+
+  export default {
+    name: 'addCombinQuestion',
+    data() {
+      return {
+        txt:'组合填写单维护-添加组合填写单',
+        imgList:[],
+        dataPub: {},      //公用组件传的值都在这
+        itemsTypes:[1,2],            //有明细的类型
+        editData:{},                    //编辑数据
+        options: [],           //标签明细右侧操作数据
+      }
+    },
+    beforeMount:function(){
+      const {isEdit,data} = this.$route.params;
+      if(isEdit){
+        this.txt = '独立填写单维护-修改独立填写单';
+        this.editData = data;
+      }
+    },
+    methods: {
+      back() { this.$router.go(-1) },
+      changeVal(val) {    //子组件数据改变传递到父组件
+        this.dataPub = val;
+        //console.log('公用组件传的值都在这', val);
+      },
+      changeSex(sex) {       //性别改变，清空填写单明细
+                             //console.log(sex)
+      },
+      changeType(type) {        //填写单类型改变，标签明细左侧更新，右侧清空
+        // console.log('type',type)
+        this.options = [];
+      },
+      pushValues(its){
+        this.options = its;
+      },
+      submitForm() {      // 调用子组件的方法验证公用部分
+        this.$refs.submitForm.submitForm('groups');
+      },
+      validatePass() {      //验证成功回调，调取接口
+        //仍需验证填写单明细是否选择
+        let isNull = true;
+        let options2 = [];
+        const opts = this.options;
+        for (let i = 0; i < this.options.length; i++) {
+          if(this.options[i].name.trim() != '') {
+            isNull = false
+            options2.push(this.options[i])
+          }
+        }
+        this.options = options2;
+        if(this.itemsTypes.includes(+this.dataPub.region2)&&isNull) {
+          this.warning('至少填一个选项')
+          return;
+        }
+        let flag=true;
+        if(opts[0] && opts[0].code){
+          flag=opts.findIndex((it)=>{
+            return !it.code;
+          })==-1;
+        }else{
+          flag=opts.findIndex((it)=>{
+            return it.code;
+          })==-1;
+        }
+        if(!flag){
+          this.warning('所有选项必须都有或者都没有同“伴”/“无”标记')
+          return;
+        }
+        if(parseFloat(this.dataPub.region8) >= parseFloat(this.dataPub.region9)) {
+          this.warning('最小年龄不能大于或等于最大年龄');
+          return;
+        }
+        if(parseFloat(this.dataPub.minNormalVal) >= parseFloat(this.dataPub.maxNormalVal)) {
+          this.warning('最小正常值不能大于或等于最大正常值');
+          return;
+        }
+        const {isEdit,data} = this.$route.params;
+        let param = {
+          "questionWrapper": {
+            "controlType": this.dataPub.region2,                            //控件类型(0：默认值 1：下拉单选 2：下拉多选 6：文本框 7：数字键盘文本框 99：联合推送)
+            "id": isEdit?data.id:'',                                    //新增id置空
+            "type": this.dataPub.region1,                //填写单归属
+            "tagType": 1,             //独立填写单类型
+            "tagName": this.dataPub.region3,             //系统名称
+            "name": this.dataPub.region4,                //医生界面名称
+            "description":this.dataPub.region5,
+            "sexType": this.dataPub.region7,             //1:男，2：女，3：通用
+            "ageBegin": this.dataPub.region8,       		 //最小年龄
+            "ageEnd": this.dataPub.region9,              //最大年龄
+            "itemType" :this.dataPub.region12,           //是否为主要内容
+            "url":this.dataPub.region13,                  //上传图片
+            "questionDetails": this.options,                //明细项
+            //"questionMappings": [],      //映射关系,
+          }
+        };
+        this.showSaveDialog(param);
+      },
+      showSaveDialog(param) {
+        this.showConfirmDialog('是否保存该填写单？', () => {
+          api.questionAdd(param).then((res) => {
+            if (res.data.code === '0') {
+              this.warning(res.data.msg || '保存成功', 'success');
+              this.$router.push("/admin/LT-YWZSJWH-DLTXDWH");
+            } else {
+              this.warning(res.data.msg)
+            }
+          }).catch((err) => {
+            this.warning(err);
+          })
+        });
+      },
+      showConfirmDialog(msg, resolve) {
+        this.$alert(msg, '提示', {
+          confirmButtonText: '确定',
+          type: 'warning'
+        }).then(() => {
+          resolve();
+        }).catch(() => {});
+      },
+      warning(msg, type) {
+        this.$message({
+          showClose: true,
+          message: msg,
+          type: type || 'warning'
+        })
+      },
+    },
+    components: {
+      PubIndeptQa,
+      PubSelect
+    }
+  }
+</script>
+<style lang="less">
+    @import "../../less/common.less";
+    .NoiseTemplateWrapper {
+    .groupTitle {
+        background-color: #fff;
+        height: 40px;
+        line-height: 40px;
+        padding-left: 20px;
+    }
+    .main {
+        background-color: #fff;
+        margin: 0 20px 20px;
+        padding: 20px;
+        border-top: 1px solid @icssBorder;
+        box-sizing: border-box;
+        font-size: 14px;
+        color: #606266;
+    .title {
+        margin-bottom: 20px;
+    i {
+        color: #f56c6c;
+    }
+    }
+    }
+    .btn {
+        text-align: right;
+    }
+    .order {
+        margin-bottom: 20px;
+    .el-input__inner {
+        line-height: 30px;
+        height: 30px;
+    }
+    }
+    }
+    .toast-cancel{
+        color: #22ccc8 !important;
+    // background: #22ccc8;
+    }
+</style>
+

src/components/preTreat/AddSimpleQuestion.vue

@@ -10,12 +10,13 @@
                 @changeSex="changeSex"
                 @changeType="changeType"
                 @validatePass="validatePass"
+                qaType="1"
                 :editData="editData"
                 ref="submitForm"
         ></PubIndeptQa>
         <div class="main">
             <p class="title" v-if="dataPub.region2==1||dataPub.region2==2|| dataPub.region2==11">
-                <i>*</i> 填写单明细：
+                填写单明细：
                 <i v-if='dataPub.region2==2' style="margin-left:70px;color: #22ccc8; font-size: 12px;">所有选项必须都有或者都没有同“伴”/“无”标记</i>
             </p>
             <PubSelect v-if="dataPub.region2==1 || dataPub.region2==2 || dataPub.region2==11" :ascription="dataPub.region1" :sexType="dataPub.region7" :type="dataPub.region2" @pushValues="pushValues" :options="editData.questionDetailList"></PubSelect>
@@ -82,7 +83,7 @@
         const opts = this.options;
         for (let i = 0; i < this.options.length; i++) {
           if(this.options[i].name.trim() != '') {
-            isNull = false
+            isNull = false;
             options2.push(this.options[i])
           }
         }

src/components/preTreat/CombinQuestion.vue

@@ -0,0 +1,242 @@
+<template>
+    <div>
+        <crumbs title="组合填写单维护">
+            <el-form :inline="true" class="demo-form-inline">
+                <el-form-item label="归属：">
+                    <el-select size="mini" v-model="filter.tagAdscription" @change="getValue"  placeholder="归属" clearable>
+                        <el-option v-if="item.val!=6&&item.val!=7&&item.val!=8&&item.val!=9&&item.val!=10&&item.val!=21&&item.val!=22" v-for="item in Adscriptions" :label="item.name" :value="item.val" :key="item.id" ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="类型：">
+                    <el-select size="mini" v-model="filter.tagType[0]" placeholder="类型" clearable>
+                        <el-option v-for="item in tagTypes" :label="item.name" :value="item.val" :key="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="填写单系统名称：">
+                    <el-input size="mini" v-model="filter.tagSysName" placeholder="填写单系统名称" clearable></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button size="mini" @click="filterDatas">确认</el-button>
+                    <el-button size="mini" type="warning" @click="addIndeptTag">添加组合填写单</el-button>
+                </el-form-item>
+            </el-form>
+        </crumbs>
+        <div class="contents">
+            <el-table
+                    :data="list"
+                    border
+                    style="width: 100%">
+                <el-table-column
+                        :resizable = "false"
+                        type="index"
+                        :index = 'indexMethod'
+                        label="编号"
+                        width="60">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="gmtModified"
+                        label="操作时间"
+                        width="180">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="tagName"
+                        label="填写单系统名称">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="typeCn"
+                        label="归属"
+                        width="80">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="tagTypeCn"
+                        label="类型">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="modifier"
+                        label="操作人"
+                        width="120">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="operate"
+                        label="操作"
+                        width="120">
+                    <template slot-scope="scope">
+                        <el-button  @click="modifyIndeptTag(scope.row)" type="text" size="small">修改</el-button>
+                        <span style="margin:0 3px;">|</span>
+                        <el-button @click="showDelDialog(scope.row)" class="delete" type="text" size="small">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination v-if="total>pageSize"
+                           :current-page.sync="currentPage"
+                           @current-change="currentChange"
+                           background
+                           :page-size="pageSize"
+                           layout="total,prev, pager, next, jumper"
+                           :total="total">
+            </el-pagination>
+        </div>
+    </div>
+</template>
+
+<script>
+  import api from '@api/preTreat.js';
+
+  export default {
+    name: 'combinQuestion',
+    data: function() {
+      return {
+        list: [],
+        tagTypes: [],
+        Adscriptions: [],
+        tagTypesList:[],
+        filter: {
+          tagType: [], //标签类型
+          tagAdscription: '', //标签归属
+          tagSysName: '', //标签系统名称
+        },
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+      }
+    },
+    created() {
+      this.getDropList();
+    },
+    methods: {
+      getValue(val) {
+        console.log('changeVal', val, this.filter.tagAdscription)
+      },
+      getDropList() {
+        api.getPreTypeList().then((res) =>{
+          this.getDataList();
+          if(res.data.code === '0') {
+            this.Adscriptions = res.data.data[1];
+            this.tagTypes =  res.data.data[3];
+            this.tagTypes =  this.tagTypes.filter(item => item.val != 0)  //去掉名称为默认值的填写单类型
+
+          }
+
+        })
+      },
+      getDataList() {
+        const param = this.getFilterItems();
+        api.getQuestionList(param).then((res) => {
+          const list = [...res.data.data.records];
+          for (var i = 0; i < list.length; i++) {
+            for (var j =  0; j < this.tagTypes.length; j++) {
+              if(list[i].controlType == this.tagTypes[j].val) {
+                list[i].tagTypeCn = this.tagTypes[j].name;
+              }
+            }
+            //后台数据typeCn转换为筛选中对应的字段名称
+            for (var z =  0; z < this.Adscriptions.length; z++) {
+              if(list[i].type == this.Adscriptions[z].val) {
+                list[i].typeCn = this.Adscriptions[z].name;
+              }
+            }
+          }
+          this.list = list;
+          this.total = res.data.data.total;
+        })
+      },
+      filterDatas() {
+        this.currentPage = 1;
+        this.getDataList();
+      },
+      addIndeptTag() {
+        this.$router.push({path:'LT-YWZSJWH-TJZHTXD'});
+      },
+      modifyIndeptTag(row) {
+        api.questionDetail({id:row.id}).then((res)=>{
+          const {code,data,msg} = res.data;
+          if(code=='0'){
+            const item = Object.assign({},row,data);
+            this.$router.push({name:'AddCombinQuestion',params:{isEdit:true,data:item}});
+          }else{
+            this.$message({
+              message: msg,
+              type: 'warning'
+            });
+          }
+        });
+      },
+      currentChange(next) {
+        this.currentPage = next;
+        this.getDataList();
+      },
+      getFilterItems() {
+        const param = {
+          tagTypeList: this.filter.tagType[0] ? this.filter.tagType: [4,6],
+          current: this.currentPage,
+          size: this.pageSize,
+          type: this.filter.tagAdscription,
+          tagName: this.filter.tagSysName,
+        };
+        return param;
+      },
+      indexMethod(index) {
+        return ((this.currentPage - 1) * this.pageSize) + index + 1;
+      },
+      getTagType(val) {
+        return val
+      },
+      warning(msg,type){
+        this.$message({
+          showClose: true,
+          message:msg,
+          type:type||'warning'
+        })
+      },
+      showConfirmDialog(msg,resolve){
+        this.$alert(msg, '提示', {
+          confirmButtonText: '确定',
+          type: 'warning'
+        }).then(() => {
+          resolve();
+        }).catch(() => {});
+      },
+      showDelDialog(row){
+        const param = {
+          "ids": row.id,
+          "type": row.type
+        };
+        this.showConfirmDialog('是否删除该填写单？',()=>{
+          api.questionDel(param).then((res)=>{
+            if(res.data.code=='0'){
+              this.getDataList();
+              this.warning(res.data.msg || '操作成功','success');
+            }else{
+              this.warning(res.data.msg);
+            }
+          }).catch((error)=>{
+            this.warning(error);
+          })
+        });
+      }
+    }
+  }
+</script>
+
+
+<style lang="less">
+    @import "../../less/admin.less";
+    .delete{
+        color: red
+    }
+    .delete:hover {
+        color: red;
+    }
+    .el-select .el-input .el-icon-arrow-up{
+        display: inline-block!important;
+    }
+    .el-select .el-input .el-icon-circle-close{
+        float:left;
+    }
+</style>

src/components/preTreat/PubIndeptQa.vue

@@ -30,8 +30,7 @@
             </el-form-item>
             <el-form-item
                     label="选择类型："
-                    prop="region2"
-            >
+                    prop="region2">
                 <span class="changeTips">改变类型后，填写单明细将会恢复到默认状态</span>
                 <el-select
                         v-model="form.region2"
@@ -54,6 +53,7 @@
             >
                 <el-select
                         v-model="form.region12"
+                        :disabled="!form.region1"
                         @change="sendData"
                 >
                     <el-option
@@ -90,29 +90,28 @@
                     当为症状时，填写单系统名称需要与医学标准术语内容相对应，如果没有可以先在医学标准术语中建立相关信息！未建立相关信息可能会影响系统使用！
                 </span>
             </el-form-item>
-            <el-form-item
+            <!--<el-form-item
                     v-if="qaType==1"
                     label="填写单界面描述名称："
                     prop="region6"
             >
                 <el-input
                         :disabled="!form.region1"
-                        v-model="form.region6"
+                        v-model="form.region5"
                         maxLength="30"
                         placeholder="请输入填写单界面描述名称"
                         @change="sendData"
                 ></el-input>
-            </el-form-item>
+            </el-form-item>-->
             <el-form-item
-                    v-if="qaType==2"
-                    label="填写单医生界面展示标准内容："
+                    :label="qaType==2?'填写单医生界面展示标准内容：':'填写单界面描述名称：'"
                     prop="region4"
             >
                 <el-input
                         :disabled="!form.region1"
                         v-model="form.region4"
                         maxLength="30"
-                        placeholder="请输入填写单医生界面展示标准内容"
+                        :placeholder="qaType==2?'请输入填写单医生界面展示标准内容':'请输入填写单界面描述名称'"
                         @change="sendData"
                 ></el-input>
             </el-form-item>
@@ -179,12 +178,14 @@
                 ></el-input>
             </el-form-item>
             <el-form-item label="填写单图片内容："
-                    prop="region13">
+                          v-if="qaType==1"
+                          prop="region13">
                 <el-upload
                         :class="form.region13?'upload-hide':''"
                         :limit="1"
                         :action="uploadUrl"
                         list-type="picture"
+                        :file-list="imgList"
                         :on-remove="handleRemove"
                         :on-success="handleSuccess"
                         accept="image/*"
@@ -237,7 +238,7 @@
         this.validateSystomName(value,callback,11)
       };
       var validatePass12 = (rule, value, callback) => {
-        this.validateSystomName(value,callback,12)
+        this.validateSystomName(value,callback,1)
       };
       return {
         form: {
@@ -254,13 +255,19 @@
           region13:'',          //上传图片
           isNeedSearch: false, //是否需要查询（系统名称）
         },
-        //imgName:'',
+        imgList:[],
         uploadUrl:config.urls.uploadImg,        //图片上传地址
         labelTypesMaps: {       // 归属和填写单类型限制
-          '1':['1','2','3','5', '6','7'], //症状情况
-          '51':['1','2','3','4','5', '6','7'],    //诊疗情况
-          '3':['1','2','3','5', '6','7'],         //其他史
-          '52':['1','2','3','5', '6','7']            //补充内容
+          '1':['1','2','3','5','6','7'], //症状情况
+          '51':['1','2','3','4','5','6','7'],    //诊疗情况
+          '3':['1','2','3','5','6','7'],         //其他史
+          '52':['1','2','3','5','6','7']            //补充内容
+        },
+        combinLabelMaps:{
+          '1':['4','6'], //症状情况
+          '51':['4','6'],    //诊疗情况
+          '3':['4','6'],         //其他史
+          '52':['4','6']            //补充内容
         },
         rules: {
           region1: [
@@ -285,7 +292,7 @@
             { required: true, message: '请输入填写单界面描述名称', trigger: 'change' },
             { validator: validatePass1, trigger: 'blur' },
           ],
-          /*region7: [
+          region7: [
             { required: true, message: '请选择性别', trigger: 'change' }
           ],
           region8: [
@@ -293,7 +300,7 @@
           ],
           region9: [
             { required: true, message: '请输入最大年龄', trigger: 'change' }
-          ],*/
+          ],
           region12: [
             { required: true, message: '请选择是否为主要内容', trigger: 'change' }
           ],
@@ -306,15 +313,6 @@
       }
     },
     computed: {
-      newSex() {
-        return this.form.region7;
-      },
-      newType() {
-        return this.form.region1;
-      },
-      newSign() {
-        return this.form.region2;
-      },
       newName() {
         return this.form.region3;
       },
@@ -324,9 +322,13 @@
       //编辑时赋值
       const editData = this.$props.editData;
       if(editData.id){
-        const trans = utils.transformKeys(editData);
+        const trans = utils.transPretreatKeys(editData);
         this.form = Object.assign({},this.form,trans);
-      }
+        const imgUrl = trans.region13;
+        if(imgUrl){
+          this.imgList = [{name:'',url:imgUrl.replace('{imageUrlPrefix}',config.imgHost)}];
+        }
+      };
 
       this.$emit('submitForm', 'groups', false);
 
@@ -334,9 +336,6 @@
 
     },
     watch: {
-      newSex(nextVal, prevVal) {
-        //this.tmpSex = prevVal;
-      },
       newName(nextVal, prevVal) {
         if (this.isNeedSearch && nextVal != prevVal && (this.form.region12 == 0)) {
           this.focusSystemName()
@@ -345,12 +344,11 @@
     },
     methods: {
       handleRemove(){
-        //this.imgName = '';
-        this.region13 = '';
+        this.form.region13 = '';
+        this.imgList=[];
       },
       handleSuccess(response){
         if(response.state==='SUCCESS'){
-          //this.imgName = response.title;
           this.form.region13 = '{imageUrlPrefix}'+response.url;
         }else{
           this.warning(response.msg);
@@ -360,18 +358,18 @@
         return api.getPreTypeList().then((res) => {
           if (res.data.code === '0') {
             this.Adscriptions = res.data.data[1];
-            this.labelTypesList = res.data.data[2];
-            this.labelTypes = this.labelTypesList.filter(item => Object.keys(this.labelTypesMaps).indexOf(item.val) > -1)
+            this.labelTypesList = this.qaType==1?res.data.data[2]:res.data.data[3];
+            this.labelTypes = this.labelTypesList;
           }
         })
       },
       validateSystomName(name,callback,flg) {
         if(flg == 1){
-          let tmpVal = this.form.region6;
+          let tmpVal = this.form.region5;
           if(tmpVal.trim() == ''){
             callback(new Error('填写单界面描述名称不能为空'));
           }else{
-            this.form.region6 = tmpVal.trim();
+            this.form.region5 = tmpVal.trim();
             callback();
           }
         }else if(flg == 2){
@@ -390,7 +388,7 @@
             this.form.region4 = tmpVal.trim();
             callback();
           }
-        }else if(flg == 12){
+        }/*else if(flg == 12){
           let tmpVal = this.form.region5;
           if(tmpVal.trim() == ''){
             callback(new Error('填写单患者界面名称不能为空'));
@@ -398,7 +396,7 @@
             this.form.region5 = tmpVal.trim();
             callback();
           }
-        }
+        }*/
       },
       sendData() {
         this.$emit('changeVal', this.form, false)
@@ -414,11 +412,12 @@
       readyChangeSelect(tmpData,type) {
         if(type === 1) {
           this.form.region2 = '';
-          this.labelTypes = this.labelTypesList.filter(item => this.labelTypesMaps[tmpData].indexOf(item.val) > -1)
-          this.initForm()
+          const maps = this.qaType==1?this.labelTypesMaps:this.combinLabelMaps;
+          this.labelTypes = this.labelTypesList.filter(item => maps[this.form.region1].includes(item.val));
+          this.initForm();
         }
         if(type === 2) {
-          this.initForm()
+          this.initForm();
           this.$emit('changeType', type, false)
         }
         //console.log(tmpData)
@@ -434,51 +433,41 @@
           }
         });
       },
-      focusSystemName() {
-        this.isNeedSearch = true
+      focusSystemName() {       //系统名称搜索标准词
+        this.isNeedSearch = true;
         if (this.form.region3.trim() == '') {
-          this.systemNameShow = false
-          this.systemNameLis = []
-          return
+          this.systemNameShow = false;
+          this.systemNameLis = [];
+          return;
         }
-        if (this.form.region12 == 0) {
-          let tmpArr = [];
-          if (this.form.region1 == 1 && this.form.region2 == 4) {//症状
-            tmpArr = [1]
-          } else if (this.form.region1 == 4) {//查体
-            tmpArr = [33]
-          } else if (this.form.region1 == 5) {//化验
-            tmpArr = [12]
-          }
-          let params = {
-            "libType": tmpArr,
-            "name": this.form.region3
-          }
-          api.indexByLexicon(params).then((res) => {
-            if (res.data.code === '0') {
-              this.systemNameLis = res.data.data
-              if (res.data.data.length > 0) {
-                this.systemNameShow = true
-              } else {
-                this.systemNameShow = false
-              }
+        let params = {
+          "libType": [1],
+          "name": this.form.region3
+        };
+        api.indexByLexicon(params).then((res) => {
+          if (res.data.code === '0') {
+            this.systemNameLis = res.data.data;
+            if (res.data.data.length > 0) {
+              this.systemNameShow = true;
+            } else {
+              this.systemNameShow = false;
             }
-          })
-        }
+          }
+        })
       },
       pushSystemName(val) {
-        this.form.region3 = val
-        this.systemNameShow = false
-        this.isNeedSearch = false
+        this.form.region3 = val;
+        this.systemNameShow = false;
+        this.isNeedSearch = false;
       },
       closeNameLis(flg) {
         if (flg == 1) {
-          this.systemNameShow = false
+          this.systemNameShow = false;
         } else if (flg == 2) {
           if (this.systemNameLis.length > 0) {
-            this.systemNameShow = true
+            this.systemNameShow = true;
           } else {
-            this.systemNameShow = false
+            this.systemNameShow = false;
           }
         }
       },
@@ -490,8 +479,8 @@
         })
       },
       initForm() {
-        this.form.region5 = ''
-        this.form.region12 = '1'
+        //this.form.region5 = '';
+        //this.form.region12 = '1';
       },
     }
   }
@@ -505,6 +494,9 @@
         padding: 0 5px;
     }
     }
+    .el-upload-list--picture .el-upload-list__item-name{
+        display: none;
+    }
     .PubTagGroupWrapper .fix-inp .el-col .el-input__inner{
         width: 100%;
         display: inline-block;

src/components/preTreat/PubSelect.vue

@@ -136,13 +136,13 @@
     mounted(){
       const {options} = this.$props;
       if(options){
-        const arr = options.map((it)=>{
-          return {name:it.name,description:'',isExclu:false};
+        const arr = options.filter((it)=>{
+          return it.name;
         });
         const arrLen = arr.length;
         if(arrLen < 4) {
           for (let i = 0; i < 4 - arrLen; i++) {
-            arr.push(utils.getInitRow(initRow,1))
+            arr.push(...utils.getInitRow(initRow,1))
           }
         }
         this.rows = arr;

src/components/preTreat/SimpleQuestion.vue

@@ -159,7 +159,7 @@
           const {code,data,msg} = res.data;
           if(code=='0'){
             const item = Object.assign({},row,data);
-            this.$router.push({name:'addSimpleQuestion',params:{isEdit:true,data:item}});
+            this.$router.push({name:'AddSimpleQuestion',params:{isEdit:true,data:item}});
           }else{
             this.$message({
               message: msg,

src/routes.js

@@ -90,6 +90,7 @@ import SimpleQuestion from '@components/preTreat/SimpleQuestion.vue';
 import CombinQuestion from '@components/preTreat/CombinQuestion.vue';
 import QuestionGroup from '@components/preTreat/QuestionGroup.vue';
 import AddSimpleQuestion from '@components/preTreat/AddSimpleQuestion.vue';
+import AddCombinQuestion from '@components/preTreat/AddCombinQuestion.vue';
 
 export default [
   {
@@ -247,6 +248,7 @@ export default [
       {path:'LT-YWZSJWH-ZHTXDWH',component:CombinQuestion,name:'CombinQuestion'},  //预问诊-组合填写单
       {path:'LT-YWZSJWH-MBWH',component:QuestionGroup,name:'QuestionGroup'},  //预问诊-模板
       {path:'LT-YWZSJWH-TJDLTXD',component:AddSimpleQuestion,name:'AddSimpleQuestion'},  //预问诊-添加独立填写单
+      {path:'LT-YWZSJWH-TJZHTXD',component:AddCombinQuestion,name:'AddCombinQuestion'},  //预问诊-添加组合填写单
 
     ]
   }