Merge remote-tracking branch 'origin/perTreat' into bugFix20190722

src/components/admin/AddAdmin.vue

@@ -121,7 +121,7 @@
         orgList: [],
         isEdit:false,
         userId:'',
-        link:'/admin/LT-KHZX-CGXX',
+        link:'superAdmin',
         curPage:'1',
         orgName:'',
         form: {

src/components/admin/AddOrganization.vue

@@ -1,7 +1,7 @@
 <!-- 添加机构信息 By_liucf -->
 <template>
     <div>
-        <crumbs title="机构信息-添加机构" linkTo="/admin/LT-KHZX-JGXX">
+        <crumbs title="机构信息-添加机构" linkTo="organizationInfo">
         </crumbs>
         <div class="contents">
           <!--<img src="../../images/return.png" height="18" width="18" class="back" @click="back">-->

src/components/admin/AddProductLine.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <!-------------面包屑-------------->
-        <crumbs :title="`产品线管理-${isEdit?'修改':'添加'}产品线`" linkTo="/admin/LT-CPXGL">
+        <crumbs :title="`产品线管理-${isEdit?'修改':'添加'}产品线`" linkTo="productDetail">
         </crumbs>
         <!--------------表单--------------->
         <div class="contents">

src/components/admin/ModifinedOrga.vue

@@ -1,7 +1,7 @@
 <!-- 添加机构信息 By_liucf -->
 <template>
     <div>
-        <crumbs title="机构信息-修改机构" linkTo="/admin/LT-KHZX-JGXX">
+        <crumbs title="机构信息-修改机构" linkTo="organizationInfo">
         </crumbs>
         <div class="contents">
             <el-form ref="form" :model="form" :rules="rules" label-width="110px" class="add-admin-form">

src/components/admin/ProductDetail.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <crumbs title="产品线管理-产品线详情" linkTo="/admin/LT-CPXGL">
+        <crumbs title="产品线管理-产品线详情" linkTo="productDetail">
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="机构名称：">
                     <el-input size="mini" v-model="filter.orgName" placeholder="机构名称"></el-input>

src/components/common/Crumbs.vue

@@ -11,15 +11,15 @@
 <script>
   export default {
     name: 'crumbs',
-    props: ['title','linkTo','minWidth'],//minWidth-有些头部选项比较多，最小宽度需要调整
+    props: ['title','linkTo','minWidth','param'],//minWidth-有些头部选项比较多，最小宽度需要调整
     data: function () {
       return {}
     },
     methods:{
       goBack(){
         this.$router.push({
-          path:this.linkTo,
-          query:this.curPage
+          name:this.linkTo,
+          params:this.param
         });
       }
     }

src/components/icss/AddAssaySon.vue

@@ -3,7 +3,7 @@
         <crumbs
           :title="'化验子项维护-'+titleText"
           class="topBack"
-          linkTo="/admin/LT-YXSYKWH-HYZXWH"
+          linkTo="AssaySon"
         ></crumbs>
         <el-form :model="form" ref="ruleForm"  class="addDepartForm">
             <p class="assayTitle">添加化验标准术语</p>

src/components/icss/AddChemicalAndCommonMapping.vue

@@ -7,7 +7,7 @@
         <crumbs
           title="化验大小项与公表项对应维护--添加关联"
           class="topBack"
-          linkTo="/admin/LT-YXSJWH-HYDXXYGBXDY"
+          linkTo="ChemicalAndCommonMapping"
         ></crumbs>
         <div class="AddChemicalAndCommonMappingBox clearfix">
             <div class="titleBox clearfix">

src/components/icss/AddChronicAndIndexRelation.vue

@@ -8,7 +8,7 @@
         <crumbs
           :title="'慢病指标值关联维护-'+titleText"
           class="topBack"
-          linkTo="/admin/LT-YXSYKWH-MBZBZGLWH"
+          linkTo="ChronicAndIndexRelation"
         ></crumbs>
         <el-form :model="form" ref="ruleForm"  class="addDepartForm">
             <el-form-item  class="addDepartFormItem"  v-if="!isEdit" label="选择慢病标准术语（概念ID）：" prop="department">

src/components/icss/AddCommonSymptom.vue

@@ -4,7 +4,7 @@
          <crumbs
           :title="'常见选项维护系统-' + titleText"
           class="topBack"
-          linkTo="/admin/LT-YXSJWH-CJXXWH"
+          linkTo="CommonSymptom"
         ></crumbs>
         <el-form :model="form" ref="ruleForm" :rules="rules" class="addDepartForm">
            

src/components/icss/AddConceptRelation.vue

@@ -3,7 +3,7 @@
     <crumbs
     :title="'医学术语关联维护-'+titleText"
     class="topBack"
-    linkTo="/admin/LT-YXSYKWH-YXSYGLWH"
+    linkTo="ConceptRelation"
     ></crumbs>
     <el-form :model="form" ref="ruleForm"  class="addDepartForm">
       <p class="assayTitle">选择医学标准术语</p>

src/components/icss/AddDeptInfo.vue

@@ -1,7 +1,7 @@
 <!-- 添加机构信息 By_liucf -->
 <template>
     <div>
-        <crumbs :title="topInfo" linkTo="/admin/LT-YXSJWH-KSWH">
+        <crumbs :title="topInfo" linkTo="deptInfo">
         </crumbs>
         <div class="contents">
             <el-form ref="form" :label-position="labelPosition" :model="form" :rules="rules" label-width="100px" class="add-depart-form">

src/components/icss/AddDisAndScaleRelation.vue

@@ -8,7 +8,7 @@
         <crumbs
           :title="'量表关联维护-'+titleText"
           class="topBack"
-          linkTo="/admin/LT-YXSJWH-LBGLWH"
+          linkTo="DisAndScaleRelation"
         ></crumbs>
         <el-form :model="form" ref="ruleForm"  class="addDepartForm">
             <el-form-item  v-if="!isEdit" label="选择诊断标签：" prop="department">

src/components/icss/AddDisclInfo.vue

@@ -1,7 +1,7 @@
 <!-- 免责声明修改 By_liucf -->
 <template>
     <div>
-        <crumbs :title="topInfo" linkTo="/admin/LT-YXSJKWH-MZSMWH">
+        <crumbs :title="topInfo" linkTo="DisclaimerInformation">
         </crumbs>
         <div class="contents">
             <el-form ref="form" :label-position="labelPosition" :model="form" :rules="rules" label-width="65px" class="add-discl-form">

src/components/icss/AddIndeptLabel.vue

@@ -3,7 +3,7 @@
         <crumbs
           :title="txt"
           class="topBack"
-          linkTo="/admin/LT-YXSJWH-DLLXBQWH"
+          linkTo="IndeptLabel"
         ></crumbs>
         <PubIndeptTag
                 @changeVal="changeVal"

src/components/icss/AddMedicalInfo.vue

@@ -7,7 +7,7 @@
         <crumbs
           :title=" isEdit? '术语医学属性-修改':'术语医学属性-添加'"
           class="topBack"
-          linkTo="/admin/LT-YXSYKWH-SYYXSXWH"
+          linkTo="MedicalInfo"
         ></crumbs>
         <div class="info-container">
             <el-form :rules="rules"

src/components/icss/AddMedicalMultRelation.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="addMedicalMultRelationWrapper">
-    <crumbs :title="minTitle" linkTo="/admin/LT-YXSYKWH-YXSYDCGLWH"></crumbs>
+    <crumbs :title="minTitle" linkTo="MedicalMultRelation"></crumbs>
     <div class="contents">
       <div class="content">
         <div class="addBtn" v-if="list.length == 0">

src/components/icss/AddMedicalName.vue

@@ -1,6 +1,8 @@
 <template>
   <div>
-    <crumbs :title="minTitle" linkTo="/admin/LT-YXSYKWH-YXSYMMWH"></crumbs>
+    <crumbs :title="minTitle"
+            :param="$route.params"
+            linkTo="MedicalName"></crumbs>
     <div class="contents">
       <div class="content">
         <h3>添加术语：</h3>
@@ -502,7 +504,8 @@ import pinyin from '../../js/Convert_Pinyin.js';
           const result = res.data;
           if(result.code==0){
             this.warning(res.data.msg||'操作成功','success');
-            this.$router.push({name:'MedicalName'});
+            //返回带搜索条件的首页
+            this.$router.push({name:'MedicalName',params:Object.assign({},this.$route.params,{currentPage:1})});
             /*if(flg == 14){
               this.getDetail(this.id)
               this.radioVal = ''

src/components/icss/AddMedicalRelation.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <crumbs title="医学术语关系-添加" linkTo="/admin/LT-YXSYKWH-YXSYGXWH"></crumbs>
+    <crumbs title="医学术语关系-添加" linkTo="MedicalRelation"></crumbs>
     <div class="contents">
       <div class="content" @click="closeSearch">
         <p>明细</p>

src/components/icss/AddMedicinePrompt.vue

@@ -3,7 +3,7 @@
         <crumbs
           :title=" isEdit? '医学术语静态知识维护-修改':'医学术语静态知识维护-添加'"
           class="topBack"
-          linkTo="/admin/LT-YXSYKWH-YXSYJTZSWH"
+          linkTo="MedicinePrompt"
         ></crumbs>
         <div class="info-container">
             <el-form :rules="rules"

src/components/icss/AddPhysicalExamTemp.vue

@@ -4,7 +4,7 @@
         <crumbs
           :title="'查体模板维护系统-'+titleText"
           class="topBack"
-          linkTo="/admin/LT-YXSJWH-CTMBWH"
+          linkTo="PhysicalExamTemplate"
         ></crumbs>
         <el-form :model="form" ref="ruleForm" :rules="rules" class="addDepartForm">
             <el-form-item label="模板归属："  >

src/components/icss/AddPromptInfo.vue

@@ -2,7 +2,7 @@
     <div class="NoiseTemplateWrapper TemplateWrapper">
         <crumbs :title="isEdit?'提示信息维护-修改':'提示信息维护-添加'"
                 class="topBack"
-                linkTo="/admin/LT-YXSJWH-TSXXWH"></crumbs>
+                linkTo="PromptInfo"></crumbs>
         <div class="pinfo-container">
             <el-form :rules="rules"
                      :model="form"

src/components/icss/AddSimilarName.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <crumbs :title="minTitle" linkTo="/admin/LT-YXSJWH-BMWH"></crumbs>
+    <crumbs :title="minTitle" linkTo="SimilarName"></crumbs>
     <div class="contents">
       <div class="content" @click="close">
         <h3>选择标签</h3>

src/components/icss/AddVersion.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <crumbs :title="title" linkTo="/admin/LT-YXSJWH-BBXXWH"></crumbs>
+    <crumbs :title="title" linkTo="VersionInfo"></crumbs>
     <div class="contents">
       <div class="content">
         <!-- <el-form ref="form" :label-position="labelPosition" label-width="95px" class="add-admin-form" :model="form" :rules="rules"> -->

src/components/icss/ChronicDiseaseAdd.vue

@@ -3,7 +3,7 @@
     <crumbs
       :title="minTitle"
       class="topBack"
-      linkTo="/admin/LT-YXSYKWH-LBJGWH"
+      linkTo="ChronicDiseaseStructureList"
     ></crumbs>
     <div class="ChronicDiseaseAddWrap" @click="close">
       <div class="ChronicDisease">

src/components/icss/ChronicDiseaseManageAdd.vue

@@ -3,7 +3,7 @@
     <crumbs
       :title="minTitle"
       class="topBack"
-      linkTo="/admin/LT-YXSJWH-MBGLYPG"
+      linkTo="ChronicDiseaseManage"
     ></crumbs>
     <div class="ChronicDiseaseAddWrap">
       <div class="ChronicDisease">

src/components/icss/DeptInfoDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <crumbs title="icss科室维护系统-详情" linkTo="/admin/LT-YXSJWH-KSWH"></crumbs>
+    <crumbs title="icss科室维护系统-详情" linkTo="deptInfo"></crumbs>
     <div class="contents">
       <table class="deptbox">
         <tr>

src/components/icss/DiagnosisTemplate.vue

@@ -3,7 +3,7 @@
     <crumbs
       :title="txt"
       class="topBack"
-      linkTo="/admin/LT-YXSJWH-ZDBQWH"
+      linkTo="DiagnosisList"
     ></crumbs>
     <DiagnosisPubTag
       :editData="editData"

src/components/icss/DiscInfoDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <crumbs title="免责声明维护-详情" linkTo="/admin/LT-YXSJKWH-MZSMWH"></crumbs>
+    <crumbs title="免责声明维护-详情" linkTo="DisclaimerInformation"></crumbs>
     <div class="contents">
       <div class="deptbox">
         <p class="titl">标题</p>

src/components/icss/MedicalName.vue

@@ -36,9 +36,7 @@
                     <el-button size="mini" @click="filterDatas">确认</el-button>
                     <el-button size="mini" @click="uploadClick">导入</el-button>
                     <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" accept=".csv, application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
-                    <router-link to="/admin/LT-YXSYKWH-TJYXSY" style="margin:0 10px">
-                        <el-button size="mini" type="warning">添加医学标准术语</el-button>
-                    </router-link>
+                    <el-button size="mini" type="warning"  @click="addMedicalName" style="margin:0 10px">添加医学标准术语</el-button>
                 </el-form-item>
             </el-form>
         </crumbs>
@@ -134,12 +132,24 @@
       this.getDataList();
       this.getTypeList();
     },
+    beforeRouteEnter(to, from, next){
+      next(vm => {
+        //const pm = to.param;
+        Object.assign(vm,to.params);
+      })
+    },
     methods: {
+      addMedicalName(){
+        this.$router.push({name:'AddMedicalName',
+          params:{currentPage:this.currentPage,
+            filter:this.filter}});
+      },
       toEditProduct(row){
         this.$router.push({
           name:'AddMedicalName',
           // params: {info:row}
-          params: {id:row.conceptId}
+          params: {id:row.conceptId,currentPage:this.currentPage,
+            filter:this.filter}
         })
       },
       filterDatas(){

src/components/icss/NoiseTemplate.vue

@@ -3,7 +3,7 @@
       <crumbs
       :title="txt"
       class="topBack"
-      linkTo="/admin/LT-YXSJWH-BQZWH"
+      linkTo="labelGroup"
     ></crumbs>
     <PubTagGroup
       :editData="editData"

src/components/icss/PromptDetail.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="NoiseTemplateWrapper TemplateWrapper">
-        <crumbs title="提示信息维护--详情" class="topBack" linkTo="/admin/LT-YXSJWH-TSXXWH">
+        <crumbs title="提示信息维护--详情" class="topBack" linkTo="PromptInfo">
         </crumbs>
         <div class="info-container">
             <el-form label-width="130px"

src/components/icss/TemplateMaintenanceWrap.vue

@@ -3,7 +3,7 @@
     <crumbs
       :title="txt"
       class="topBack"
-      linkTo="/admin/LT-YXSJWH-MBWH"
+      linkTo="TemplateMaintenance"
     ></crumbs>
     <PubTemplateGroup
       :editData="editData"

src/components/icss/VersionDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <crumbs title="版本信息维护-明细" linkTo="/admin/LT-YXSJWH-BBXXWH"></crumbs>
+    <crumbs title="版本信息维护-明细" linkTo="VersionInfo"></crumbs>
     <div class="contents">
       <div class="content">
         <el-form ref="form" :label-position="labelPosition" label-width="85px" class="add-admin-form">

src/components/preTreat/AddCombinQuestion.vue

@@ -3,7 +3,8 @@
         <crumbs
                 :title="txt"
                 class="topBack"
-                linkTo="/admin/LT-YWZSJWH-ZHTXDWH"
+                :param="$route.params"
+                linkTo="CombinQuestion"
         ></crumbs>
         <PubIndeptQa
                 @changeVal="changeVal"
@@ -56,7 +57,6 @@
       }
     },
     methods: {
-      back() { this.$router.go(-1) },
       changeVal(val) {    //子组件数据改变传递到父组件
         this.dataPub = val;
         console.log('公用组件传的值都在这', val);
@@ -117,7 +117,8 @@
           api.questionAdd(param).then((res) => {
             if (res.data.code === '0') {
               this.warning(res.data.msg || '保存成功', 'success');
-              this.$router.push("/admin/LT-YWZSJWH-ZHTXDWH");
+              //返回带搜索条件的首页
+              this.$router.push({name:'CombinQuestion',params:Object.assign({},this.$route.params,{currentPage:1})});
             } else {
               this.warning(res.data.msg)
             }

src/components/preTreat/AddQuestionModules.vue

@@ -3,7 +3,8 @@
         <crumbs
                 :title="txt"
                 class="topBack"
-                linkTo="/admin/LT-YWZSJWH-MBWH"
+                :param="$route.params"
+                linkTo="QuestionModules"
         ></crumbs>
         <div class="PubTagGroupWrapper">
         <el-form class="groups"
@@ -180,7 +181,6 @@
       },
     },
     methods: {
-      back() { this.$router.go(-1) },
       getAvailibleType(){
         api.getModuleType({moduleType:this.form.moduleType,relationId:this.form.relationId}).then((res) =>{
           if(res.data.code === '0') {
@@ -266,7 +266,8 @@
           api.addModule(param).then((res) => {
             if (res.data.code === '0') {
               this.warning(res.data.msg || '保存成功', 'success');
-              this.$router.push("/admin/LT-YWZSJWH-MBWH");
+              //返回带搜索条件的首页
+              this.$router.push({name:'QuestionModules',params:Object.assign({},this.$route.params,{currentPage:1})});
             } else {
               this.warning(res.data.msg)
             }

src/components/preTreat/AddSimpleQuestion.vue

@@ -3,7 +3,8 @@
         <crumbs
                 :title="txt"
                 class="topBack"
-                linkTo="/admin/LT-YWZSJWH-DLTXDWH"
+                :param="param"
+                linkTo="SimpleQuestion"
         ></crumbs>
         <PubIndeptQa
                 @changeVal="changeVal"
@@ -46,6 +47,7 @@
     data() {
       return {
         txt:'独立填写单维护-添加独立填写单',
+        param:this.$route.params,
         imgList:[],
         dataPub: {},      //公用组件传的值都在这
         itemsTypes:[1,2],            //有明细的类型
@@ -61,7 +63,6 @@
       }
     },
     methods: {
-      back() { this.$router.go(-1) },
       changeVal(val) {   //子组件数据改变传递到父组件
         this.dataPub = val;
         //console.log('公用组件传的值都在这', val);
@@ -141,7 +142,8 @@
           api.questionAdd(param).then((res) => {
             if (res.data.code === '0') {
               this.warning(res.data.msg || '保存成功', 'success');
-              this.$router.push("/admin/LT-YWZSJWH-DLTXDWH");
+              //返回带搜索条件的首页
+              this.$router.push({name:"SimpleQuestion",params:Object.assign({},this.param,{currentPage:1})});
             } else {
               this.warning(res.data.msg)
             }

src/components/preTreat/CombinQuestion.vue

@@ -3,7 +3,7 @@
         <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-select size="mini" v-model="filter.tagAdscription"  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>
@@ -109,10 +109,13 @@
     created() {
       this.getDropList();
     },
+    beforeRouteEnter(to, from, next){
+      next(vm => {
+        //const pm = to.param;
+        Object.assign(vm,to.params);
+      })
+    },
     methods: {
-      getValue(val) {
-        console.log('changeVal', val, this.filter.tagAdscription)
-      },
       getDropList() {
         api.getPreTypeList().then((res) =>{
           this.getDataList();
@@ -151,14 +154,17 @@
         this.getDataList();
       },
       addIndeptTag() {
-        this.$router.push({path:'LT-YWZSJWH-TJZHTXD'});
+        this.$router.push({name:'AddCombinQuestion',
+          params:{currentPage:this.currentPage,
+            filter:this.filter}});
       },
       modifyIndeptTag(row) {
         api.questionDetail({id:row.id}).then((res)=>{
           const {code,data,msg} = res.data;
           if(code=='0'){
             const infos = Object.assign({},row,data);
-            this.$router.push({name:'AddCombinQuestion',params:{isEdit:true,data:infos}});
+            this.$router.push({name:'AddCombinQuestion',params:{isEdit:true,data:infos,currentPage:this.currentPage,
+                filter:this.filter}});
           }else{
             this.$message({
               message: msg,

src/components/preTreat/QuestionModules.vue

@@ -6,7 +6,7 @@
                     <el-input size="mini" v-model="filter.name" placeholder="模板名称" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="归属：">
-                    <el-select size="mini" v-model="filter.type" @change="getValue"  placeholder="归属" clearable>
+                    <el-select size="mini" v-model="filter.type"  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>
@@ -16,7 +16,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="归属科室：" v-if="filter.moduleType==1">
-                    <el-select size="mini" v-model="filter.relationId" @change="getValue"  placeholder="归属" clearable>
+                    <el-select size="mini" v-model="filter.relationId"  placeholder="归属" clearable>
                         <el-option v-for="item in deptList" :label="item.name" :value="item.conceptId" :key="item.conceptId" ></el-option>
                     </el-select>
                 </el-form-item>
@@ -120,10 +120,13 @@
     created() {
       this.getDropList();
     },
+    beforeRouteEnter(to, from, next){
+      next(vm => {
+        //const pm = to.param;
+        Object.assign(vm,to.params);
+      })
+    },
     methods: {
-      getValue(val) {
-        console.log('changeVal', val, this.filter.tagAdscription)
-      },
       getDropList() {
         api.getPreTypeList().then((res) =>{
           this.getDataList();
@@ -182,14 +185,17 @@
         this.getDataList();
       },
       addModule() {
-        this.$router.push({path:'LT-YWZSJWH-TJMBWH'});
+        this.$router.push({name:'AddQuestionModules',
+          params:{currentPage:this.currentPage,
+            filter:this.filter}});
       },
       modifyModule(row) {
         api.getModuleDetail({moduleId:row.id,type:row.type}).then((res)=>{
           const {code,data,msg} = res.data;
           if(code=='0'){
             const item = Object.assign({},row,data);
-            this.$router.push({name:'AddQuestionModules',params:{isEdit:true,data:item}});
+            this.$router.push({name:'AddQuestionModules',params:{isEdit:true,data:item,currentPage:this.currentPage,
+                filter:this.filter}});
           }else{
             this.$message({
               message: msg,

src/components/preTreat/QuestionTagGroup.vue

@@ -235,7 +235,24 @@ export default {
             this.searchTagList();
             this.$emit('changeActionData',this.rightTagsList, false);
         },
+        toMuchImgs(list){
+          const arr = list.filter((it)=>{
+            return it.tagType==1&&it.controlType ==4;
+          });
+          if(arr.length>1){
+            return true;
+          }
+          return false;
+        },
         toRightList() {
+            if(this.toMuchImgs([...this.rightTagsList,...this.selectLeftTagsList])){
+              this.$message({
+                showClose: true,
+                message: '一个模板最多只能添加一个上传图片类型填写单',
+                type: 'warning'
+              });
+              return ;
+            }
             this.rightTagsList.push(...this.selectLeftTagsList);
 
             for (let i = 0; i < this.rightTagsList.length; i++) {
@@ -259,6 +276,7 @@ export default {
                 "tagName": this.searchVal,
                 "type": this.ascription,
                 "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模板
             };
@@ -266,7 +284,7 @@ export default {
                 if (res.data.code === '0') {
                     this.leftTagsList = res.data.data;
                     this.selectLeftTagsList = [];
-                    this.selectRightTagsList = [];console.log(this.rightTagsList)
+                    this.selectRightTagsList = [];
                 }
             })
            

src/components/preTreat/SimpleQuestion.vue

@@ -3,7 +3,7 @@
         <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-select size="mini" v-model="filter.tagAdscription"  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>
@@ -110,10 +110,13 @@
     created() {
       this.getDropList();
     },
+    beforeRouteEnter(to, from, next){
+      next(vm => {
+        //const pm = to.param;
+        Object.assign(vm,to.params);
+      })
+    },
     methods: {
-      getValue(val) {
-        console.log('changeVal', val, this.filter.tagAdscription)
-      },
       getDropList() {
         api.getPreTypeList().then((res) =>{
           this.getDataList();
@@ -152,14 +155,17 @@
         this.getDataList();
       },
       addIndeptTag() {
-        this.$router.push({path:'LT-YWZSJWH-TJDLTXD'})
+        this.$router.push({name:'AddSimpleQuestion',
+                            params:{currentPage:this.currentPage,
+                                    filter:this.filter}})
       },
       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:'AddSimpleQuestion',params:{isEdit:true,data:item}});
+            this.$router.push({name:'AddSimpleQuestion',params:{currentPage:this.currentPage,
+                filter:this.filter,isEdit:true,data:item}});
           }else{
             this.$message({
               message: msg,

src/routes.js

@@ -150,6 +150,7 @@ export default [
         component: AuthedAdmin
       },
     	{
+    	  name:'organizationInfo',
     	  path: 'LT-KHZX-JGXX',//机构信息
         component: OrganizationInfo,
         meta:{
@@ -165,6 +166,7 @@ export default [
         component: ModifinedOrga
       },
       {
+        name:'superAdmin',
         path: 'LT-KHZX-CGXX',
         component: SuperAdmin
       },
@@ -190,9 +192,9 @@ export default [
       {path: 'LT-CPXGL', component: ProductLinesManage},
       {path: 'LT-CPXGL-TJCPX', component: AddProductLine,name:'editProductLine'},
       {path: 'LT-GRZX/CHANGE',component: ChangePwd}, //个人中心--修改密码
-      {path: 'LT-YXSJWH-BQZWH',component: LabelGroup}, //医学数据维护--标签组维护
+      {path: 'LT-YXSJWH-BQZWH',component: LabelGroup,name:'labelGroup'}, //医学数据维护--标签组维护
       {path:'LT-YXSJWH-TJBQZ',component:NoiseTemplate,name:'AddLabelGroup'},     //医学数据维护--标签组维护--添加标签组
-      {path:'LT-YXSJWH-KSWH',component:DeptInfo},     //医学数据维护--科室维护
+      {path:'LT-YXSJWH-KSWH',component:DeptInfo,name:'deptInfo'},     //医学数据维护--科室维护
       {path:'LT-YXSJWH-KSXQ',component:DeptInfoDetail,name:'DeptInfoDetail'},     //科室维护--详情
       {path:'LT-YXSJWH-TJKS',component:AddDeptInfo,name:'AddDeptInfo'},     //科室维护--添加
       {path:'LT-YXSJWH-DLLXBQWH',component:IndeptLabel,name:'IndeptLabel'},     //独立标签维护--详情

vue.config.js

@@ -1,6 +1,6 @@
 const path = require('path');
 // const proxy_path = 'http://192.168.2.236:80';
-const proxy_path = 'http://192.168.2.236:88';
+const proxy_path = 'http://192.168.2.241:88';
 // 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';//周铁刚