优化传染病基础信息上传

src/views/crb-manage/CrbBaseInfo.vue

@@ -24,23 +24,31 @@
               <el-table :data="baseUserData.slice(pageSize * (currentPage - 1), pageSize * currentPage)" border
                         stripe highlight-current-row height="100%">
                 <el-table-column type="index" label="序号" width="50" fixed/>
-                <el-table-column prop="id" label="账号" width="100" />
-                <el-table-column prop="loginName" label="工号" width="100"/>
+                <el-table-column prop="uploadFlag" label="上传状态" width="100" fixed>
+                  <template #default="scope">
+                    <el-button v-if="scope.row.uploadFlag === 0 " type="danger" size="small" class="cancel-btn">上传失败</el-button>
+                    <el-button v-else-if="scope.row.uploadFlag === 1 " type="primary" size="small" class="cancel-btn">上传成功</el-button>
+                    <el-button v-else type="warning" size="small" class="cancel-btn">未上传</el-button>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="uploadMsg" label="上传结果信息" width="180" show-overflow-tooltip fixed/>
+                <el-table-column prop="id" label="用户ID" width="80" />
+                <el-table-column prop="loginName" label="登录名(工号)" width="80"/>
                 <el-table-column prop="orgCode" label="所属机构" width="100" />
                 <el-table-column prop="deptCode" label="所属科室" width="100" />
                 <el-table-column prop="userName" label="姓名" width="100" />
                 <el-table-column prop="idCardTypeCode" label="身份证件类别" width="120"/>
-                <el-table-column prop="idCard" label="身份证件号码" width="180" >
+                <el-table-column prop="idCard" label="身份证件号码" width="160" >
                   <template #default="scope">
                     {{!scope.row.idCard ? '' : scope.row.idCard.replace(reg, '\$1******\$2')}}
                   </template>
                 </el-table-column>
-                <el-table-column prop="tel" label="联系电话" width="180">
+                <el-table-column prop="tel" label="联系电话" width="160">
                   <template #default="scope">
-                    {{!scope.row.tel ? '' : scope.row.tel.replace(reg, '\$1******\$2')}}
+                    {{!scope.row.tel ? '' : scope.row.tel.replace(reg1, '\$1******\$2')}}
                   </template>
                 </el-table-column>
-                <el-table-column prop="physicianNo" label="医师执业资格证号" width="180"/>
+                <el-table-column prop="physicianNo" label="医师执业资格证号" width="160"/>
                 <el-table-column prop="userTypeCode" label="用户类型" width="100"/>
                 <el-table-column fixed="right" label="操作" min-width="80" width="80" center>
                   <template #default="scope">
@@ -63,7 +71,15 @@
             <div class="layout_flex_1-y">
               <el-table :data="baseDeptData.slice(pageSizeDept * (currentPageDept - 1), pageSizeDept * currentPageDept)" border
                         stripe highlight-current-row height="100%">
-                <el-table-column type="index" label="序号" width="50" />
+                <el-table-column type="index" label="序号" width="50" fixed/>
+                <el-table-column prop="uploadFlag" label="上传状态" width="100" fixed>
+                  <template #default="scope">
+                    <el-button v-if="scope.row.uploadFlag === 0 " type="danger" size="small" class="cancel-btn">上传失败</el-button>
+                    <el-button v-else-if="scope.row.uploadFlag === 1 " type="primary" size="small" class="cancel-btn">上传成功</el-button>
+                    <el-button v-else type="warning" size="small" class="cancel-btn">未上传</el-button>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="uploadMsg" label="上传结果信息" width="180" show-overflow-tooltip fixed/>
                 <el-table-column prop="deptCode" label="院内科室代码" width="180" />
                 <el-table-column prop="deptName" label="院内科室名称" width="280" />
                 <el-table-column prop="targetDeptCode" label="前置软件科室代码" width="180" />
@@ -175,12 +191,22 @@ const uploadBaseUser = (row) => {
     dangerouslyUseHTMLString: true
   }).then(() => {
     uploadBaseUserData(row).then((res) => {
-      ElMessage({
-        type: "success",
-        message: "用户信息上传成功！",
-        duration: 2500,
-        showClose: true,
-      });
+      if(res.result){
+        ElMessage({
+          type: "success",
+          message: res.desc,
+          duration: 2500,
+          showClose: true,
+        });
+      } else {
+        ElMessage({
+          type: "error",
+          message: res.desc,
+          duration: 2500,
+          showClose: true,
+        });
+      }
+      queryBaseUser()
     })
   }).catch((action) => {
     if (action === 'cancel') {
@@ -209,12 +235,22 @@ const uploadBaseDept = (row) => {
     dangerouslyUseHTMLString: true
   }).then(() => {
     uploadBaseDeptData(row).then((res) => {
-      ElMessage({
-        type: "success",
-        message: "科室信息上传成功！",
-        duration: 2500,
-        showClose: true,
-      });
+      if(res.result){
+        ElMessage({
+          type: "success",
+          message: res.desc,
+          duration: 2500,
+          showClose: true,
+        });
+      } else {
+        ElMessage({
+          type: "error",
+          message: res.desc,
+          duration: 2500,
+          showClose: true,
+        });
+      }
+      queryBaseDept()
     })
   }).catch((action) => {
     if (action === 'cancel') {