Luolei 6 years ago
parent
commit
ba5fb7e364

+ 1 - 0
src/components/icss/ChronicAndIndexRelation.vue

@@ -46,6 +46,7 @@
                     label="操作">
                     label="操作">
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <el-button  @click="modifyRelation(scope.row)" type="text" size="small">修改</el-button>
                         <el-button  @click="modifyRelation(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>
                         <el-button @click="showDelDialog(scope.row)" class="delete" type="text" size="small">删除</el-button>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>

+ 1 - 0
src/components/icss/ChronicDiseaseStructureList.vue

@@ -45,6 +45,7 @@
                         label="操作">
                         label="操作">
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <el-button  @click="modifyIndeptTag(scope.row)" type="text" size="small">修改</el-button>
                         <el-button  @click="modifyIndeptTag(scope.row)" type="text" size="small">修改</el-button>
+                        <span style="margin:0 3px;">|</span>
                         <el-button @click="showDelDialog(scope.row.id)" class="delete" type="text" size="small">删除</el-button>
                         <el-button @click="showDelDialog(scope.row.id)" class="delete" type="text" size="small">删除</el-button>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>

+ 3 - 2
src/components/icss/CommonTemplate.vue

@@ -229,7 +229,7 @@ export default {
   watch: {
   watch: {
     type:{
     type:{
       handler(newVal, preVal) {
       handler(newVal, preVal) {
-        if(newVal != preVal){
+        if(newVal != preVal && !this.copyed){
           this.form = {region: ''}  
           this.form = {region: ''}  
           this.subTmpList = []     //子模板的id用于去重
           this.subTmpList = []     //子模板的id用于去重
           this.leftTagsList = []
           this.leftTagsList = []
@@ -249,7 +249,7 @@ export default {
     },
     },
     signe:{
     signe:{
       handler(newVal, preVal) {
       handler(newVal, preVal) {
-        if(newVal != preVal){
+        if(newVal != preVal && !this.copyed){
           this.form = {region: ''}  
           this.form = {region: ''}  
           this.subTmpList = []     //子模板的id用于去重
           this.subTmpList = []     //子模板的id用于去重
           this.leftTagsList = []
           this.leftTagsList = []
@@ -285,6 +285,7 @@ export default {
             }
             }
           }
           }
           this.rightTagsList = [...lis]
           this.rightTagsList = [...lis]
+          this.$emit('changeActionData', this.rightTagsList, false);
           this.getSubTemplate()
           this.getSubTemplate()
         }
         }
         if(newVal != preVal  && !this.copyed){
         if(newVal != preVal  && !this.copyed){

+ 1 - 0
src/components/icss/DiagnosisList.vue

@@ -65,6 +65,7 @@
                     label="操作">
                     label="操作">
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <el-button  @click="modifyTagGroup(scope.row)" type="text" size="small">修改</el-button>
                         <el-button  @click="modifyTagGroup(scope.row)" type="text" size="small">修改</el-button>
+                        <span style="margin:0 3px;"> | </span>
                         <el-button @click="showDelDialog(scope.row.id,scope.row.type)" class="delete" type="text" size="small">删除</el-button>
                         <el-button @click="showDelDialog(scope.row.id,scope.row.type)" class="delete" type="text" size="small">删除</el-button>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>

+ 1 - 0
src/components/icss/DisAndScaleRelation.vue

@@ -55,6 +55,7 @@
                     label="操作">
                     label="操作">
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <el-button  @click="modifyRelation(scope.row)" type="text" size="small">修改</el-button>
                         <el-button  @click="modifyRelation(scope.row)" type="text" size="small">修改</el-button>
+                        <span style="margin:0 3px;">|</span>
                         <el-button @click="showDelDialog(scope.row.id)" class="delete" type="text" size="small">删除</el-button>
                         <el-button @click="showDelDialog(scope.row.id)" class="delete" type="text" size="small">删除</el-button>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>

+ 1 - 0
src/components/icss/TemplateMaintenance.vue

@@ -72,6 +72,7 @@
                         label="操作">
                         label="操作">
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <el-button  @click="modifyIndeptTag(scope.row)" type="text" size="small">修改</el-button>
                         <el-button  @click="modifyIndeptTag(scope.row)" type="text" size="small">修改</el-button>
+                        <span style="margin:0 3px;">|</span>
                         <el-button @click="showDelDialog(scope.row.id,scope.row.type)" class="delete" type="text" size="small">删除</el-button>
                         <el-button @click="showDelDialog(scope.row.id,scope.row.type)" class="delete" type="text" size="small">删除</el-button>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>