Merge branch 'test' into dev5.3.3

src/api/config.js

@@ -176,12 +176,12 @@ export default {
     'getAllConcept':'/api/knowledgeman/conceptDetail/index',   //医学术语--获取所有概念（标准术语）
     'getAllBodypart': '/api/knowledgeman/bodypart/getAllBodypart',  //医学术语--获取所有部位
     'getAllDepts': '/api/knowledgeman/medical/getAllDepts',  //医学术语--获取所有科室
-    'getLisMappingPage': '/api/icssman/lisMapping/getLisMappingPage', //医学数据-化验大小项与公表项维护-列表
-    'saveLisMapping': '/api/icssman/lisMapping/saveLisMapping',  //医学数据-化验大小项与公表项维护-新增
-    'delLisMappingById': '/api/icssman/lisMapping/delLisMappingById',  //医学数据-化验大小项与公表项维护-单个删除
+    'getLisMappingPage': '/api/knowledgeman/lisMapping/getLisMappingPage', //医学数据-化验大小项与公表项维护-列表
+    'saveLisMapping': '/api/knowledgeman/lisMapping/saveLisMapping',  //医学数据-化验大小项与公表项维护-新增
+    'delLisMappingById': '/api/knowledgeman/lisMapping/delLisMappingById',  //医学数据-化验大小项与公表项维护-单个删除
     'delLisMappingByIds': '/api/icssman/lisMapping/delLisMappingByIds', //医学数据-化验大小项与公表项维护-批量删除
     'modifyLisMapping': '/api/icssman/lisMapping/modifyLisMapping',  //医学数据-化验大小项与公表项维护-修改
-    'hasLisMapping': '/api/icssman/lisMapping/hasLisMapping',  //医学数据-化验大小项与公表项维护-化验公表项映射是否已存在
+    'hasLisMapping': '/api/knowledgeman/lisMapping/hasLisMapping',  //医学数据-化验大小项与公表项维护-化验公表项映射是否已存在
     'getTypeList': 'api/knowledgeman/lexicon/getLexiconList', //术语类型-列表
     'addType': 'api/knowledgeman/lexicon/addLexicon', //术语类型-添加
     'getAllLisConcept':'api/knowledgeman/concept/getAllLisConcept',  //医学数据-化验大小项与公表项维护-获取所有化验公表项

src/api/icss.js

@@ -319,12 +319,6 @@ export default {
     delLisMappingById(param) {  //医学数据-化验大小项与公表项维护-单个删除
         return axios.post(urls.delLisMappingById, param)
     },
-    delLisMappingByIds(param) {  //医学数据-化验大小项与公表项维护-批量删除
-        return axios.post(urls.delLisMappingByIds, param)
-    },
-    modifyLisMapping(param) {  //医学数据-化验大小项与公表项维护-修改
-        return axios.post(urls.modifyLisMapping, param)
-    },
     hasLisMapping(param) {  //医学数据-化验大小项与公表项维护-化验公表项映射是否已存在
         return axios.post(urls.hasLisMapping, param)
     },

src/components/icss/AddChemicalAndCommonMapping.vue

@@ -3,9 +3,9 @@
         <!-- <div class="groupTitle"><i
                 class="el-icon-back"
                 @click="back"
-        ></i> 化验大小项与公表项对应维护--添加关联</div> -->
+        ></i> 化验大小项与公表项对应维护-添加关联</div> -->
         <crumbs
-                title="化验大小项与公表项对应维护--添加关联"
+                title="化验大小项与公表项对应维护-添加关联"
                 class="topBack"
                 :param="$route.params"
                 linkTo="ChemicalAndCommonMapping"
@@ -13,26 +13,26 @@
         <div class="AddChemicalAndCommonMappingBox clearfix">
             <div class="titleBox clearfix">
                 <p class="title">关联公表项</p>
-                <p class="title">关联化验项</p> 
+                <p class="title">关联化验项</p>
             </div>
             <div class="rightBox">
                 <div class="itemLabel">
                     <label  class="itemLabelName">选择公表项：</label>
-                    <input class="searchInput"  @focus="focuInput" type="text" v-model = "uniqueText"> 
+                    <input class="searchInput"  @focus="focuInput" type="text" v-model = "uniqueText">
                     <span class="searchName" @click="searchMealItem(3)">搜索</span>
-                    <ul 
-                        v-if="showUniqueNameList&&uniqueNameList.length >0"
-                        class="itemList uniqueNameList" 
-                        ref="uniqueNameList"
+                    <ul
+                            v-if="showUniqueNameList&&uniqueNameList.length >0"
+                            class="itemList uniqueNameList"
+                            ref="uniqueNameList"
                     >
-                      <li 
-                        v-for="item in uniqueNameList" 
-                        class="mealNameItem ellipsis"
-                        :title="item.conceptName"
-                        @click="selectUniqueName(item)"
-                        :key="item.conceptName">
-                        {{item.conceptName}}
-                      </li>
+                        <li
+                                v-for="item in uniqueNameList"
+                                class="mealNameItem ellipsis"
+                                :title="item.conceptName"
+                                @click="selectUniqueName(item)"
+                                :key="item.conceptName">
+                            {{item.conceptName}}
+                        </li>
                     </ul>
                 </div>
                 <div class="itemLabel">
@@ -40,32 +40,32 @@
                     <span class="selectItemName">{{form.uniqueName}}</span>
                 </div>
             </div>
-            
+
             <div class="midBox">
                 <img class="midLogo" src="../../images/relation.png" alt="">
                 <p class="midTitle">相互关联</p>
             </div>
             <div class="leftBox clearfix" >
-                
+
                 <div class="itemLabel clearfix">
-                    <label class="itemLabelName">选择化验大项：</label> 
-                    <input class="searchInput" @focus="focuInput" type="text" v-model = "mealText"> 
+                    <label class="itemLabelName">选择化验大项：</label>
+                    <input class="searchInput" @focus="focuInput" type="text" v-model = "mealText">
                     <span class="searchName" @click="searchMealItem(1)">搜索</span>
-                    <ul 
-                        v-if="showMealNameList&&mealNameList.length >0"
-                        class="itemList mealNameList" 
-                        ref="mealNameList"
+                    <ul
+                            v-if="showMealNameList&&mealNameList.length >0"
+                            class="itemList mealNameList"
+                            ref="mealNameList"
                     >
-                      <li 
-                        v-for="item in mealNameList" 
-                        class="mealNameItem ellipsis"
-                        :title="item.name"
-                        @click="selectMealName(item)"
-                        :key="item.id">
-                        {{item.name}}
-                      </li>
+                        <li
+                                v-for="item in mealNameList"
+                                class="mealNameItem ellipsis"
+                                :title="item.conceptName"
+                                @click="selectMealName(item)"
+                                :key="item.conceptId">
+                            {{item.conceptName}}
+                        </li>
                     </ul>
-                    
+
                 </div>
                 <div class="itemLabel clearfix">
                     <label  class="itemLabelName isRequired">已选择化验大项：</label>
@@ -73,21 +73,21 @@
                 </div>
                 <div class="itemLabel clearfix">
                     <label  class="itemLabelName">选择化验小项：</label>
-                    <input class="searchInput"  @focus="focuInput" type="text" v-model = "itemText"> 
+                    <input class="searchInput"  @focus="focuInput" type="text" v-model = "itemText">
                     <span class="searchName" @click="searchMealItem(2)">搜索</span>
-                    <ul 
-                        v-if="showItemNameList&&itemNameList.length >0"
-                        class="itemList itemNameList" 
-                        ref="itemNameList"
+                    <ul
+                            v-if="showItemNameList&&itemNameList.length >0"
+                            class="itemList itemNameList"
+                            ref="itemNameList"
                     >
-                      <li 
-                        v-for="item in itemNameList" 
-                        class="mealNameItem ellipsis"
-                        :title="item.name+'-'+item.tagName"
-                        @click="selectItemName(item)"
-                        :key="item.id">
-                        {{item.name}}-{{item.tagName}}
-                      </li>
+                        <li
+                                v-for="item in itemNameList"
+                                class="mealNameItem ellipsis"
+                                :title="item.conceptName"
+                                @click="selectItemName(item)"
+                                :key="item.conceptId">
+                            {{item.conceptName}}
+                        </li>
                     </ul>
                 </div>
                 <div class="itemLabel">
@@ -96,169 +96,184 @@
                 </div>
             </div>
         </div>
-       <div class="btn">
-           <!-- <span class="sumbit" @click="submitForm">建立关联</span> -->
-           <el-button
-                type="primary"
-                :disabled = 'saveDisable'
-                @click="submitForm"
+        <div class="btn">
+            <!-- <span class="sumbit" @click="submitForm">建立关联</span> -->
+            <el-button
+                    type="primary"
+                    :disabled = 'saveDisable'
+                    @click="submitForm"
             >建立关联</el-button>
-        </div> 
+        </div>
     </div>
-    
+
 </template>
 <script>
-import api from '@api/icss.js';
+  import api from '@api/icss.js';
 
-export default {
+  export default {
     name: 'AddChemicalAndCommonMapping',
     data() {
-        return {
-            mealText: '', //化验大项搜索文字内容
-            itemText: '',   //化验小项搜索文字内容
-            uniqueText: '',     //公表项搜索文字内容
-            isEdit: false,
-            mealNameList:[],
-            itemNameList: [],
-            uniqueNameList:[],
-            showMealNameList: false,
-            showItemNameList: false,
-            showUniqueNameList: false,
-            form: {
-                mealName: '', //大项名称
-                itemName: '',   //小项名称
-                uniqueName: '',    //公表名称，必填
-            },
-            saveDisable: false  //保存按钮禁止点击
-            
-        }
+      return {
+        mealText: '', //化验大项搜索文字内容
+        itemText: '',   //化验小项搜索文字内容
+        uniqueText: '',     //公表项搜索文字内容
+        isEdit: false,
+        mealNameList:[],
+        itemNameList: [],
+        uniqueNameList:[],
+        showMealNameList: false,
+        showItemNameList: false,
+        showUniqueNameList: false,
+        form: {
+          mealName: '', //大项名称
+          mealId: '', //大项Id
+          itemName: '',   //小项名称
+          itemId: '',     //小项Id
+          uniqueName: '',    //公表名称，必填
+          uniqueId:'' //公表项Id
+        },
+        saveDisable: false  //保存按钮禁止点击
+
+      }
     },
     created() {
-        //修改（不需要）
-        // const { isEdit, data } = this.$route.params
-        // if(isEdit) {
-        //     this.isEdit = isEdit;
-        //     this.form.mealName = data.mealName
-        //     this.form.itemName = data.itemName
-        //     this.form.uniqueName = data.uniqueName
-        // }
+      //修改（不需要）
+      // const { isEdit, data } = this.$route.params
+      // if(isEdit) {
+      //     this.isEdit = isEdit;
+      //     this.form.mealName = data.mealName
+      //     this.form.itemName = data.itemName
+      //     this.form.uniqueName = data.uniqueName
+      // }
     },
     methods: {
-        close() {
-            this.mealNameList = [];
-            this.itemNameList =[];
-            this.uniqueNameList = [];
-            this.showSearchList()
-        },
-        searchMealItem(type) {
-            if( type == '1' || type == '2') {
-                this.getTagList(type)
-            } else if ( type == '3') {
-                this.getAllLisConcept()
-            }
-            
-        },
-        getTagList(type) {
-            let param = {}
+      close() {
+        this.mealNameList = [];
+        this.itemNameList =[];
+        this.uniqueNameList = [];
+        this.showSearchList()
+      },
+      searchMealItem(type) {
+        if( type == '1' || type == '2') {
+          this.getTagList(type)
+        } else if ( type == '3') {
+          this.getAllLisConcept()
+        }
+
+      },
+      getTagList(type) {
+        let param = {
+          relationPosition: 3
+        }
+        if (type == 1) {
+          param.name = this.mealText
+          param.typeId = 12
+        } else if (type == 2) {
+          param.name = this.itemText
+          param.typeId = 13
+        }
+        if(!param.name) {
+          return
+        }
+        api.getConceptInfoAssay(param).then((res) => {
+          if (res.data.code === '0') {
             if (type == 1) {
-                param.name = this.mealText
-                param.tagType = [7]
-                param.type = 5
+              this.mealNameList = res.data.data
+              this.showSearchList('showMealNameList')
             } else if (type == 2) {
-                param.name = this.itemText
-                param.tagType = [1]
-                param.type = 5
-            }
-            api.searchTagList(param).then((res) => {
-                if (res.data.code === '0') {
-                     if (type == 1) {
-                        this.mealNameList = res.data.data
-                        this.showSearchList('showMealNameList')
-                    } else if (type == 2) {
-                       
-                        this.itemNameList = res.data.data
-                        this.showSearchList('showItemNameList')
-                    }
-                }
-            })
-            
-        },
-        getAllLisConcept() {
-            const param = {
-                conceptName: this.uniqueText
-            }
-            api.getAllLisConcept(param).then((res) => {
-                if(res.data.code === '0') {
-                    this.uniqueNameList = res.data.data
-                    this.showSearchList('showUniqueNameList')
-                }
-            })
-        },
-        focuInput() {
-            this.showSearchList()
-        },
-        showSearchList(type) {
-            this.showMealNameList = false
-            this.showItemNameList = false
-            this.showUniqueNameList = false
-            if(type === 'showMealNameList') {
-                this.showMealNameList = true
-            } else if (type === 'showItemNameList') {
-                this.showItemNameList = true
-            } else if (type === 'showUniqueNameList'){
-                this.showUniqueNameList = true
+
+              this.itemNameList = res.data.data
+              this.showSearchList('showItemNameList')
             }
-        },
-        selectMealName(item) {
-            this.form.mealName = item.name
-            // this.$refs['mealNameList'].style.display='none'
-            this.mealText = ''
-            this.mealNameList = []
-        },
-        selectItemName(item) {
-             this.form.itemName = item.name
-            // this.$refs['itemNameList'].style.display='none'
-            this.itemText = ''
-            this.itemNameList = []
-        },
-        selectUniqueName(item) {
-            this.form.uniqueName = item.conceptName
-            let nameArr = item.conceptName.split('--');
-            this.form.mealName = nameArr[0]
-            this.form.itemName = nameArr[1]
-            // this.$refs['uniqueNameList'].style.display='none'
-            this.uniqueText = ''
-            this.uniqueNameList = []
-        },
-        initForm() {
-            this.form.mealName = ''
-            this.form.itemName = ''
-            this.form.uniqueName = ''
-        },
-        submitForm() {
-        const { mealName, itemName, uniqueName } = this.form
-        if (!mealName || !uniqueName) {
-            this.warning('请填写相关数据')
-            return
+          }
+        })
+
+      },
+      getAllLisConcept() {
+        const param = {
+          conceptName: this.uniqueText
+        }
+        if(!param.conceptName) {
+          return
+        }
+        api.getAllLisConcept(param).then((res) => {
+          if(res.data.code === '0') {
+            this.uniqueNameList = res.data.data
+            this.showSearchList('showUniqueNameList')
+          }
+        })
+      },
+      focuInput() {
+        this.showSearchList()
+      },
+      showSearchList(type) {
+        this.showMealNameList = false
+        this.showItemNameList = false
+        this.showUniqueNameList = false
+        if(type === 'showMealNameList') {
+          this.showMealNameList = true
+        } else if (type === 'showItemNameList') {
+          this.showItemNameList = true
+        } else if (type === 'showUniqueNameList'){
+          this.showUniqueNameList = true
+        }
+      },
+      selectMealName(item) {
+        this.form.mealName = item.conceptName
+        this.form.mealId = item.conceptId
+        // this.$refs['mealNameList'].style.display='none'
+        this.mealText = ''
+        this.mealNameList = []
+      },
+      selectItemName(item) {
+        this.form.itemName = item.conceptName
+        this.form.itemId = item.conceptId
+        this.itemText = ''
+        this.itemNameList = []
+      },
+      selectUniqueName(item) {
+        this.form.uniqueName = item.conceptName
+        this.form.uniqueId = item.conceptId
+        //搜索公表项自动填充大小项（目前暂时不需要）
+        // let nameArr = item.conceptName.split('--');
+        // this.form.mealName = nameArr[0]
+        // this.form.itemName = nameArr[1]
+        // this.$refs['uniqueNameList'].style.display='none'
+        this.uniqueText = ''
+        this.uniqueNameList = []
+      },
+      initForm() {
+        this.form.mealName = ''
+        this.form.mealId = ''
+        this.form.itemName = ''
+        this.form.itemId = ''
+        this.form.uniqueName = ''
+        this.form.uniqueId = ''
+      },
+      submitForm() {
+        const { itemId, mealId, uniqueId } = this.form
+        if (!mealId || !uniqueId) {
+          this.warning('请填写相关数据')
+          return
         }
         //通过必填验证，提交保存
         const param = {
-            "itemName": itemName,
-            "mealName": mealName,
-            "uniqueName": uniqueName
+          "itemId": itemId,
+          "mealId": mealId,
+          "uniqueId": uniqueId
         }
         this.showSaveDialog(param);
       },
       saveLisMapping(param, msg, type) {
         api.saveLisMapping(param).then((res) => {
-            if (res.data.code === '0') {
+          if (res.data.code === '0') {
             this.warning(res.data.msg || msg, type);
             // this.$router.push({name: 'ChemicalAndCommonMapping'});
             this.initForm();
-            } else {
-                this.warning(res.data.msg)
-            }
-            this.saveDisable = false
+          } else {
+            this.warning(res.data.msg)
+          }
+          this.saveDisable = false
         })
       },
       showSaveDialog(param) {
@@ -266,18 +281,18 @@ export default {
         //   if(this.isEdit) {
         //       this.saveLisMapping(param)
         //   } else {
-            this.saveDisable = true  //提交保存按钮不可点击，返回结果时才可点击，防止频繁发送请求
-            api.hasLisMapping(param).then((res) => {
-                if (!res.data.data) {
-                    this.saveLisMapping(param, '关联建立成功', 'success' )
-                } else {
-                    this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
-                        this.saveLisMapping(param, '关联建立成功', 'success' )
-                    });
-                }
-            }).catch((err) => {
-                this.warning(err);
-            })
+        this.saveDisable = true  //提交保存按钮不可点击，返回结果时才可点击，防止频繁发送请求
+        api.hasLisMapping(param).then((res) => {
+          if (!res.data.data) {
+            this.saveLisMapping(param, '关联建立成功', 'success' )
+          } else {
+            this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
+              this.saveLisMapping(param, '关联建立成功', 'success' )
+            });
+          }
+        }).catch((err) => {
+          this.warning(err);
+        })
 
         //   }
       },
@@ -291,8 +306,8 @@ export default {
         }).then(() => {
           resolve();
         }).catch(() => {
-            this.saveDisable = false
-            this.warning('建立失败','error')
+          this.saveDisable = false
+          this.warning('建立失败','error')
         });
       },
       warning(msg, type) {
@@ -304,10 +319,10 @@ export default {
       },
 
     }
-}
+  }
 </script>
 <style lang="less">
-.AddChemicalAndCommonMappingWrapper {
+    .AddChemicalAndCommonMappingWrapper {
     .AddChemicalAndCommonMappingBox {
         min-width: 940px;
     }
@@ -316,16 +331,16 @@ export default {
         top: 0;
     }
     // .groupTitle {
-    //     width: calc(100% - 50px);
-    //     height: 40px;
-    //     background: #fff;
-    //     padding: 0 20px 0 30px;
-    //     margin-bottom: 20px;
-    //     line-height: 40px;
-    //     position: relative;
-    //     z-index: 5;
-            
-    // }
+       //     width: calc(100% - 50px);
+       //     height: 40px;
+       //     background: #fff;
+       //     padding: 0 20px 0 30px;
+       //     margin-bottom: 20px;
+       //     line-height: 40px;
+       //     position: relative;
+       //     z-index: 5;
+
+       // }
     .titleBox {
         padding:  0 0 10px 0px;
     }
@@ -388,7 +403,7 @@ export default {
         border: 1px solid #a9a9a9;
         margin: 8px 0 0 0;
     }
-    
+
     .searchName {
         text-align: center;
         border-left: none;
@@ -424,37 +439,37 @@ export default {
         width: calc(100% - 160px);
     }
     .btn {
-         position: relative;
-            background-color: #fff;
-            margin: 0px 20px;
-            padding: 20px;
-            min-width: 960px;
-            height: 80px;
-            .el-button {
-                position: absolute;
-                right: 80px;
-                top: 20px;
-            }
+        position: relative;
+        background-color: #fff;
+        margin: 0px 20px;
+        padding: 20px;
+        min-width: 960px;
+        height: 80px;
+    .el-button {
+        position: absolute;
+        right: 80px;
+        top: 20px;
+    }
     }
     .sumbit {
         position: absolute;
         display: inline-block;
         width: 80px;
         height: 30px;
-        line-height: 30px;  
+        line-height: 30px;
         border: 1px solid #a9a9a9;
         text-align: center;
         right: 100px;
     }
-}
-.confirmRealation {
+    }
+    .confirmRealation {
     .cancelButton{
         border: 1px solid #a9a9a9;
-        span {
-            color: #606266;
-        }
-    }  
-    
+    span {
+        color: #606266;
+    }
+    }
+
 
-}
+    }
 </style>

src/components/icss/AddMedicalMultRelation.vue

@@ -31,6 +31,9 @@
             :props="defaultProps"
             node-key="conceptId"
             default-expand-all
+            draggable
+            :allow-drag="allowDrag"
+            :allow-drop="allowDrop"
             :expand-on-click-node="false">
             <span class="custom-tree-node" slot-scope="{ node, data }">
                 <span class="custom-tree-node-name ellipsis" :class="{colorGray: data.isDeletedConcept == 'Y'}" :title="node.label">{{ node.label }}</span>
@@ -153,6 +156,16 @@ import api from '@api/icss.js';
       }
     },
     methods:{
+       allowDrop(draggingNode, dropNode, type) {
+        if(draggingNode.data.parentConceptName !== dropNode.data.parentConceptName){
+          return false
+        }else{
+          return type !== 'inner'
+        }
+      },
+      allowDrag(draggingNode) {
+        return draggingNode.data.level != 0;//一级不可拖动
+      },
       addConcept(e) {
         this.addLevel = 0;
         this.openSearch(e);

src/components/icss/AddMedicalName.vue

@@ -187,7 +187,7 @@
                     <el-option v-for="(it,i) in deptList" :label="it.name" :value="it.name"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="类型：" v-if="dioType" class="marT">
+            <el-form-item label="归属类型：" v-if="dioType" class="marT">
                 <el-select v-model="dioType">
                     <el-option v-for="(it,i) in dioTypeList" :label="it.name" :value="it.val"></el-option>
                 </el-select>
@@ -687,6 +687,10 @@ import pinyin from '../../js/Convert_Pinyin.js';
      text-align: right;
      margin-left: 0;
    }
+   /deep/ .moreInfo .el-form-item .el-form-item__label {
+     width: 85px;
+     text-align: left;
+   }
    // 饿了么分组下拉
     .el-scrollbar{
      .el-select-dropdown__list{

src/components/icss/AddVersion.vue

@@ -19,7 +19,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="版本号：" prop="name" class="version-num">
-              <el-input v-model="form.name" placeholder="请输入版本号" maxlength="21"></el-input>
+              <el-input v-model="form.name" placeholder="请输入版本号" maxlength="31"></el-input>
           </el-form-item>
           <el-form-item label="版本时间：" prop="refreshTime">
             <el-date-picker
@@ -54,12 +54,12 @@
         if (!value) {
           return callback(new Error('请输入版本号'));
         }
-        if (value.length > 20) {
-           this.form.name = value.substr(0, 20);
+        if (value.length > 30) {
+           this.form.name = value.substr(0, 30);
            this.$message({
              showClose: true,
              type: 'warning',
-             message: '版本号已超过最大限制20字'
+             message: '版本号已超过最大限制30字'
            })
         }
         callback();

src/components/icss/VersionDesc.vue

@@ -30,7 +30,7 @@
             <template slot-scope="scope">
                 <el-button type="text" size="small" @click="toEditDesc(scope.row,scope.$index)">修改</el-button>
                 <span style="margin:0 3px;">|</span>
-                <el-button type="text" size="small" class="delete" @click="showDelDialog(scope.row,scope.row.id)">删除</el-button>
+                <el-button type="text" size="small" class="delete" @click="showDelDialog(scope.row,scope.row.id,scope.$index)">删除</el-button>
             </template>
         </el-table-column>
         <el-table-column
@@ -56,7 +56,7 @@
             <p v-if="showDesc" v-html="form.description" class="cont">{{form.description}}</p>
             <el-input v-else type="textarea" :rows="3" placeholder="请输入内容" v-model="form.description" maxlength="501" @keydown.native="contentInp"></el-input>
           </el-form-item>
-          <el-button class="disclButn1" size="small" type="primary" @click="comfirn('form')">确定</el-button>
+          <el-button class="disclButn1" size="small" type="primary" :disabled="confirmDisable" @click="comfirn('form')">确定</el-button>
           <!-- <el-button class="disclButn can" size="small" type="primary" @click="cancel">取消</el-button> -->
       </el-form>
     </div>
@@ -116,7 +116,8 @@
         modiId:null,
         showDesc:false,
         tip:true,
-        modiIndex:null
+        modiIndex:null,
+        confirmDisable: false
       }
     },
     created(){
@@ -175,6 +176,7 @@
         this.$refs[form].validate((valid) => {
           if (valid) {
               // 修改--直接调修改接口；复制--新增
+            this.confirmDisable = true
             if(this.modiId){//修改
               if(!this.isCopy){
                 const param = {
@@ -183,6 +185,7 @@
                   detailId:this.modiId
                 }
                 api.modiVersionInfo(param).then((res)=>{
+                   this.confirmDisable = false
                   if(res.data.code==0){
                     this.$message({
                       message:"修改成功",
@@ -195,6 +198,7 @@
                         this.list[i].description=this.form.description;
                       }
                     }*/
+                   
                     this.reset();
                   }else{
                     this.$message({
@@ -229,6 +233,7 @@
                   versionInfoId: this.versionId
                 }
                 api.addVersionInfo(params).then((res)=>{
+                   this.confirmDisable = false
                   if(res.data.code==0){
                     this.$message({
                       message:"添加成功",
@@ -245,6 +250,7 @@
                   }
                 })
               }else{//仅添加到本地list
+                this.confirmDisable = false
                 if(this.modiIndex !==null){
                   this.list[this.modiIndex].description = this.form.description;
                   this.list[this.modiIndex].title = this.form.title;
@@ -298,9 +304,10 @@
           resolve();
         }).catch(() => {});
       },
-      showDelDialog(item,id){
+      showDelDialog(item,id,index){
+        console.log('cancel',item,id,index)
         this.showConfirmDialog('是否删除该版本说明？',()=>{
-          if(!this.isCopy){
+          if(!this.isCopy&&id){
             api.delVersionInfo({id}).then((res)=>{
               if(res.data.code=='0'){
                 this.warning(res.data.msg||'操作成功','success');
@@ -322,8 +329,8 @@
             for(let i in newList){
               if(id && newList[i].id==id){
                 this.list.splice(i,1);
-              }else if(newList[i].title == item.title && newList[i].description == item.description){//新增的没有id
-                this.list.splice(i,1);
+              }else {//新增的没有id
+                this.list.splice(index,1);
               }
             }
             this.$emit('func',this.list);

src/components/preTreat/PubIndeptQa.vue

@@ -108,7 +108,7 @@
                 </span>
                 <span
                  class = "flagBox"
-                  v-if="qaType =='1' &&form.region1=='1'&&form.region2=='1'"
+                  v-if="qaType =='1' &&form.region1=='1'&&form.region2=='9'"
                 >
                    <el-checkbox v-model="form.specFlag" label="拼接到主诉" true-label="1" false-label="0"  @change="sendData"></el-checkbox>
                 </span>