Browse Source

优化匹配时的提醒效果。

lighter 4 years ago
parent
commit
c7978abca4
1 changed files with 35 additions and 12 deletions
  1. 35 12
      src/views/dictionary/NationalSiMatch.vue

+ 35 - 12
src/views/dictionary/NationalSiMatch.vue

@@ -22,7 +22,7 @@
         <el-switch v-model="fuzzy" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
         &nbsp;
       </span>
-      <el-button icon="el-icon-search" size="mini" type="primary" @click="search">检索</el-button>
+      <el-button icon="el-icon-search" size="mini" type="primary" @click="search">检索</el-button>&nbsp;
       <span v-if="queryParam.status === 0 && queryParam.type >= 3">
         <el-button icon="el-icon-refresh" size="mini" type="warning" @click="syncNewServiceOrItem"> 同步新增{{ queryParam.type === 3 ? '项目' : '耗材' }} </el-button>
       </span>
@@ -387,28 +387,51 @@ export default {
 
     const doMatch = (row) => {
       const header =
-        '<div style="font-weight: bold">选中的数据为:</div><div style="color: #409EFF">本院名称:' +
+        '<div style="font-weight: bold">选中的数据为:</div><div style="color: #409EFF">' +
+        '本院名称:' +
         data.row.name +
-        '</div><div style="color:red">' +
-        '<div>国家名称:' +
+        '</div>' +
+        '<div style="color:red">' +
+        '<div>' +
+        '国家名称:' +
         row.nationalName +
-        '</div><div>国家代码:' +
+        '</div>' +
+        '<div>' +
+        '国家代码:' +
         row.nationalCode +
-        '</div></div>'
+        '</div>' +
+        '</div>'
 
       const medOnly =
-        '<div style="color: #409EFF; margin-top: 8px">本院规格:' +
+        '<div style="color: #409EFF; margin-top: 8px">' +
+        '本院规格:' +
         data.row.specification +
-        '</div><div style="color:red">' +
-        '<div>注册规格:' +
+        '</div>' +
+        '<div style="color:red">' +
+        '<div>' +
+        '注册规格:' +
         row.makeRegisteredSpecification +
-        '</div><div>实际规格:' +
+        '</div>' +
+        '<div>' +
+        '实际规格:' +
         row.makeActualSpecification +
-        '</div></div>'
+        '</div>' +
+        '</div>'
+
+      const srvcOnly = '<div style="color: #409EAA">' + '地方名称:' + row.localMedicalServiceName + '</div>'
+
+      const supplyOnly = '<div style="color: #409EAA">' + '注册证号:' + row.registrationCertificateNo + '</div>'
 
       const end = '<div style="font-weight: bold"d>是否确认匹配?</div>'
 
-      const msg = queryParam.type === 1 ? header + medOnly + end : header + end
+      let msg = ''
+      if (queryParam.type == 3) {
+        msg = header + srvcOnly + end
+      } else if (queryParam.type === 4) {
+        msg = header + supplyOnly + end
+      } else {
+        msg = header + medOnly + end
+      }
 
       ElMessageBox.confirm(msg, '提示', {
         dangerouslyUseHTMLString: true,