合并depart分支

src/components/icss/AddDisclInfo.vue

@@ -1,4 +1,4 @@
-<!-- 添加机构信息 By_liucf -->
+<!-- 免责声明修改 By_liucf -->
 <template>
     <div>
         <crumbs :title="topInfo" linkTo="/admin/LT-YXSJWH-MZSMWH">
@@ -9,7 +9,7 @@
                     <el-input v-model="form.title" placeholder="请输入标题" maxlength="30"></el-input>
                 </el-form-item>
                 <el-form-item label="内容：" prop="description" class="discDesc">
-                    <el-input type="textarea" :rows="3" placeholder="请输入内容述" v-model="form.description" maxlength="1024"></el-input>
+                    <el-input type="textarea" :rows="3" placeholder="请输入内容述" v-model="form.description" maxlength="120"></el-input>
                 </el-form-item>
                 <el-form-item label="归属：" prop="disclaimerCode">
                     <el-select v-model="form.disclaimerCode" clearable placeholder="请选择">
@@ -46,20 +46,20 @@
         }
         callback();
       };
-      /*const descVaild = (rule, value, callback) => {
+      const descVaild = (rule, value, callback) => {
         if (!value) {
           return callback(new Error('请输入内容'));
         }
-        if (value.length > 1024) {
+        if (value.length >= 120) {
            this.form.name = value.substr(0, 120);
            this.$message({
              showClose: true,
              type: 'warning',
-             message: '科室名称最多可输入1024个字'
+             message: '已超过最大字数限制'
            })
         }
         callback();
-      };*/
+      };
       const disclVaild = (rule, value, callback) => {
         if (!value) {
           return callback(new Error('请选择归属'));
@@ -77,11 +77,11 @@
         },
         rules: {
           title:[
-            { required: true, validator: titleVaild, trigger: ['blur', 'change'] },
+            { required: true, validator: titleVaild, trigger: [ 'change'] },
             { required: true, message: '请输入标题', trigger: ['blur', 'change'] }
           ],
           description:[
-            // { required: true, validator: descVaild, trigger: ['blur', 'change'] },
+            { required: true, validator: descVaild, trigger: [ 'change'] },
             { required: true, message: '请输入内容', trigger: ['blur', 'change'] }
           ],
           disclaimerCode:[

src/components/icss/AddSimilarName.vue

@@ -9,7 +9,8 @@
           <input type="text" name="" v-model="searchStr" class="name">
           <span class="search" @click.stop="search">搜索</span>
           <ul v-if="showFlag">
-            <li v-for="it in searchDatas" :key="it.id" @click="choose(it)" :title="it.tagName.length>10?it.tagName+'（'+it.typeName+'）':''">{{it.tagName+'（'+it.typeName+'）'}}</li>
+            <!-- <li v-for="it in searchDatas" :key="it.id" @click="choose(it)" :title="it.tagName.length>10?it.tagName+'（'+it.typeName+'）':''">{{it.tagName+'（'+it.typeName+'）'}}</li> -->
+            <li v-for="it in searchDatas" :key="it.id" @click="choose(it)" :title="(it.tagName+'（'+typeList[it.type]+'）').length>10?it.tagName+'（'+typeList[it.type]+'）':''">{{it.tagName+'（'+typeList[it.type]+'）'}}</li>
           </ul>
         </div>   
         <span></span>
@@ -128,11 +129,13 @@
         ],
         searchDatas:[],
         searchStr:'',
-        showFlag:false
+        showFlag:false,
+        typeList:[]
       }
     },
     created(){
       const id = this.$route.params.id;
+      const optionList = this.$route.params.optionList;//归属类型
       if(id){
         this.id = id;
         this.name = this.$route.params.name;
@@ -142,7 +145,11 @@
         this.minTitle = "别名维护-修改别名";
         this.getDetail();
       }
-      
+      if(optionList.length>0){
+        for(let i=0; i<optionList.length; i++){
+          this.typeList[+optionList[i].val] = optionList[i].name;
+        }
+      }
     },
     methods:{
       getDetail(){

src/components/icss/SimilarName.vue

@@ -9,9 +9,10 @@
                     <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-YXSJWH-TJBM" style="margin:0 10px">
+                    <!-- <router-link to="/admin/LT-YXSJWH-TJBM" style="margin:0 10px">
                         <el-button size="mini" type="warning">添加别名</el-button>
-                    </router-link>
+                    </router-link> -->
+                    <el-button size="mini" type="warning" style="margin:0 10px" @click="addName">添加别名</el-button>
                 </el-form-item>
             </el-form>
         </crumbs>
@@ -40,7 +41,7 @@
                 </el-table-column>
                 <el-table-column
                         :resizable = "false"
-                        prop="questionType"
+                        prop="typeName"
                         label="归属"
                         show-overflow-tooltip>
                 </el-table-column>
@@ -112,17 +113,39 @@
         pays:[],
         filter: {
           proName: ''
-        }
+        },
+        optionList:[]
       }
     },
     created() {
+      this.getOptions();
       this.getDataList();
     },
     methods: {
+      getOptions(){//归属枚举
+        api.getDropList().then((res)=>{
+          const list = res.data;
+          if(list.code==0){
+            this.optionList = list.data[1];
+          }else{
+            /*this.$message({
+              message:list.msg || '获取归属类型失败',
+              type:'warning'
+            });*/
+            console.log(list.msg);
+          }
+        })
+      },
+      addName(){
+        this.$router.push({
+          name:'AddSimilarName',
+          params:{optionList:this.optionList}
+        })
+      },
       toEditProduct(row){
         this.$router.push({
           name:'AddSimilarName',
-          params: {id:row.questionId,name:row.questionName}
+          params: {id:row.questionId,name:row.questionName,optionList:this.optionList}
         })
       },
       filterDatas(){
@@ -134,8 +157,22 @@
         api.similarName(param).then((res) => {
           if (res.data.code == '0') {
             const data = res.data.data;
-            this.list = data.records;
-            this.cacheData[param.current] = data.records;
+            // 将questionType转文字
+            let datas = data.records;
+            const lists = this.optionList;
+            if(lists.length>0){
+              for(let i=0; i<datas.length; i++){
+                for(let j=0; j<lists.length;j++){
+                  if(datas[i].questionType== +lists[j].val){
+                    datas[i].typeName=lists[j].name;
+                  }
+                }
+              }
+            }
+            // this.list = data.records;
+            // this.cacheData[param.current] = data.records;
+            this.list = datas;
+            this.cacheData[param.current] = datas;
             this.total = data.total;
           }
         }).catch((error) => {