冲突解决

src/components/base/LtModal.vue

@@ -1,4 +1,3 @@
-<!----通用弹窗组件---->
 <template>
   <div class="modal-container">
     <div class="cover"></div>
@@ -34,6 +33,9 @@
                   <el-form-item :label="meal+'预览：'">
                     <span class="previewInfo" style="minWidth: 240px">{{form.hisName}}</span>
                   </el-form-item>
+                  <el-form-item label="科室编码：" prop="hisCode" v-if="type==7">
+                    <el-input v-model.trim="form.hisCode" clearable style="minWidth: 240px"></el-input>
+                  </el-form-item>
                 </el-col>
                 <el-col :span="16" v-if="type == 1">
                   <el-form-item :label="detail+'：'" prop="hisDetailName">
@@ -95,7 +97,7 @@
                       <el-table-column prop="name" :show-overflow-tooltip="true" label="词名"></el-table-column>
                       <el-table-column prop="address" :show-overflow-tooltip="true" label="来源">
                         <template slot-scope="scope">
-                          <span>{{scope.row.source == 1?'标准词匹配':scope.row.source == 2?'同义词匹配':scope.row.source == 5?'相似词匹配':''}}</span>
+                          <p>{{scope.row.source == 1?'标准词匹配':scope.row.source == 2?'同义词匹配':scope.row.source == 5?'相似词匹配':''}}</p>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -414,13 +416,50 @@ export default {
         } else {
           this.warning(res.data.msg);
         }
+        this.saveDisable = false;
+      });
+    },
+    // 关联已存在模态框
+    showConfirmDialog(msg, resolve) {
+      this.$alert(msg, '提示', {
+        // customClass: 'confirmRealation',
+        confirmButtonText: '是',
+        // cancelButtonText: '否',
+        // cancelButtonClass: 'cancelButton',
+        type: 'warning'
+      })
+        .then(() => {
+          resolve();
+        })
+        .catch(() => {
+          this.saveDisable = false;
+          this.warning('建立失败', 'error');
+        });
+    },
+    warning(msg, type) {
+      this.$message({
+        showClose: true,
+        message: msg,
+        type: type || 'warning'
+      });
+    },
+    closeModal() {
+      this.$emit('func', 'close');
     }
+  }
+};
 </script>
 <style lang="less" scoped>
-.modal-container{
-    position: fixed;
-    top:0;
-    left: 0;
+.modal-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 21;
+  .cover {
+    background: #000;
+    opacity: 0.2;
     width: 100%;
     height: 100%;
   }
@@ -655,5 +694,6 @@ export default {
     span {
       color: #606266;
     }
+  }
 }
 </style>