@@ -56,7 +63,7 @@ export default {
components: {
ElProgressOCX,
},
- props: ["multipleSelection"],
+ props: ["multipleSelection","doctorType"],
data() {
return {
tableData: [],
@@ -96,15 +103,20 @@ export default {
btnOk() {
let checkDoctorDetail = []
this.tableData.forEach(e => {
- if (e.checkDoctorId) checkDoctorDetail.push(e)
+ if (!e.checkDoctorId) e.checkDoctorId = null
+ if (!e.auditorUserId) e.auditorUserId = null
});
+ checkDoctorDetail = this.tableData
if (checkDoctorDetail.length == 0) {
this.$message.warning({ showClose: true, message: '没有可更新的数据记录!' })
return
}
- postapi('/api/app/RegisterCheck/UpdateBatchCheckDoctor', { patientRegisterIds: this.patientRegisterIds, checkDoctorDetail })
+ let url = '/api/app/RegisterCheck/UpdateBatchCheckDoctor'
+ //if(this.doctorType == 'audit') url = '/api/app/RegisterCheck/UpdateBatchAuditDoctor'
+
+ postapi(url, { patientRegisterIds: this.patientRegisterIds, checkDoctorDetail })
.then(res => {
if (res.code > -1) {
this.dialogWin.PatientRegisterEditDoctorBatch = false;
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 3619a44..e11ff64 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -2,74 +2,40 @@
-
+
-
-
-
+
+
+
{{ scope.$index + 1 }}
-
+
{{
scope.row.isAudit == "Y"
? "已审核"
: dddw(
- dict.completeFlag,
- "id",
- scope.row.completeFlag,
- "displayName"
- )
+ dict.completeFlag,
+ "id",
+ scope.row.completeFlag,
+ "displayName"
+ )
}}
@@ -83,37 +49,26 @@
}}
-
+
-
+
-
+
{{ scope.row[dragCol[index].prop] == "Y" ? "是" : "否" }}
-
+
{{
scope.row.customerOrgParentName
? scope.row.customerOrgParentName
@@ -131,12 +86,10 @@
}}
-
+
{{
dddw(
dict.medicalPackage,
@@ -146,12 +99,10 @@
)
}}
-
+
{{
dddw(
dict.customerOrgGroupAll,
@@ -176,8 +127,8 @@
{{
scope.row[dragCol[index].prop]
? moment(scope.row[dragCol[index].prop]).format(
- "yyyy-MM-DD"
- )
+ "yyyy-MM-DD"
+ )
: ""
}}
@@ -217,7 +168,7 @@
{{
scope.row[dragCol[index].prop] ==
- scope.row["customerOrgParentName"]
+ scope.row["customerOrgParentName"]
? ""
: scope.row[dragCol[index].prop]
}}
@@ -259,12 +210,10 @@
- 共:{{ loadOpts.totalCount }} 条记录,当前显示:{{
- tableData.length
- }}
- 条。
+ 共:{{ loadOpts.totalCount }} 条记录,当前显示:{{
+ tableData.length
+ }}
+ 条。
@@ -277,53 +226,23 @@
-
-
导入青藏数据
+
+ 导入青藏数据
- 人员登记
+ 人员登记
-
-
批量正式登记
+
+ 批量正式登记
-
-
批量转预登记
+
+ 批量转预登记
- 编辑
+ 编辑
- 删除
+ 删除
-
-
批量调整分组
+
+ 批量调整分组
-
-
批量调整项目
+
+ 批量调整项目
-
-
指引单打印
+
+ 指引单打印
-
-
指引单预览
+
+ 指引单预览
-
-
人员检验检查条码
+
+ 人员检验检查条码
-
-
+
+
人员信息导出
- 设计列排序
+ 设计列排序
+ -->
+
-
+
-
+
-
+
{{
@@ -461,183 +320,91 @@
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
@@ -856,7 +623,8 @@ export default {
},
},
LocalConfigInit: {},
- tableName:""//导出人员列表表名
+ tableName: "", //导出人员列表表名
+ doctorType: "check" //check:检查 audit:审核
};
},
@@ -1536,7 +1304,7 @@ export default {
if (
this.loadOpts.skipCount != 0 &&
this.loadOpts.skipCount * this.loadOpts.maxResultCount >=
- this.loadOpts.totalCount
+ this.loadOpts.totalCount
)
return;
// console.log('getPrList', this.loadOpts)
@@ -1723,7 +1491,7 @@ export default {
if (scroll.judgeFlse) {
if (
(Number(this.loadOpts.skipCount) + 1) *
- Number(this.loadOpts.maxResultCount) >=
+ Number(this.loadOpts.maxResultCount) >=
Number(this.loadOpts.totalCount)
) {
return;
@@ -2036,10 +1804,13 @@ export default {
items.push({
label: "调整检查项目医生",
onClick: () => {
+ // this.doctorType = 'check'
this.dataTransOpts.plus.PatientRegisterEditDoctorBatch++; //如果放在弹窗显示后面,在首次加载子组件时,会触发两次数据处理
this.dialogWin.PatientRegisterEditDoctorBatch = true;
},
});
+
+
items.push({ label: "----------------" });
this.$contextmenu({
items,
@@ -2347,35 +2118,35 @@ export default {
this.dragCol.forEach((e) => {
this.jsonFields[e.label] = e.prop;
});
- let tableDatas=deepCopy(this.tableData)
- tableDatas.forEach((e,index)=>{
- if(index)e.sn=index+1
- if(e.completeFlag)e.completeFlag=e.isAudit == "Y"? "已审核": dddw(this.dict.completeFlag,"id",e.completeFlag,"displayName")
- if(e.guidePrintTimes)e.guidePrintTimes=e.guidePrintTimes > 0?'打印':''
- if(e.isLock)e.isLock=e.isLock=='Y'?'锁住':''
- if(e.sexId)e.sexId=dddw(this.dict.sex,"id",e.sexId,"displayName")
- if(e.medicalPackageId !== this.dict.personOrgId &&e.customerOrgId === this.dict.personOrgId){
- e.groupPack=dddw(this.dict.medicalPackage,"id",e.medicalPackageId,"displayName")
- }else if(e.medicalPackageId !== this.dict.personOrgId &&e.customerOrgId !== this.dict.personOrgId){
- e.groupPack=dddw(this.dict.customerOrgGroupAll,"id",e.customerOrgGroupId,"displayName")
+ let tableDatas = deepCopy(this.tableData)
+ tableDatas.forEach((e, index) => {
+ if (index) e.sn = index + 1
+ if (e.completeFlag) e.completeFlag = e.isAudit == "Y" ? "已审核" : dddw(this.dict.completeFlag, "id", e.completeFlag, "displayName")
+ if (e.guidePrintTimes) e.guidePrintTimes = e.guidePrintTimes > 0 ? '打印' : ''
+ if (e.isLock) e.isLock = e.isLock == 'Y' ? '锁住' : ''
+ if (e.sexId) e.sexId = dddw(this.dict.sex, "id", e.sexId, "displayName")
+ if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) {
+ e.groupPack = dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName")
+ } else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) {
+ e.groupPack = dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName")
}
- if(e.nationId)e.nationId=dddw(this.dict.nation,"id",e.nationId,"displayName")
- if(e.idNo)e.idNo=e.idNo+'&'
- if(e.birthDate)e.birthDate=moment(e.birthDate).format("yyyy-MM-DD")
- if(e.maritalStatusId)e.maritalStatusId=dddw(this.dict.maritalStatus,"id",e.maritalStatusId,"displayName")
- if(e.medicalTypeId)e.medicalTypeId=dddw(this.dict.medicalType,"id",e.medicalTypeId,"displayName")
- if(e.personnelTypeId)e.personnelTypeId=dddw(this.dict.personnelType,"id",e.personnelTypeId,"displayName")
- if(e.isVip)e.isVip=e.isVip == "Y" ? "是" : "否"
- if(e.isUpload)e.isUpload=e.isUpload == "Y" ? "是" : "否"
- if(e.qztlType)e.qztlType=dddw(this.dict.qztlType,"id",e.qztlType,"displayName")
- if(e.qztlIsMain)e.qztlIsMain=e.qztlIsMain == "Y" ? "是" : "否"
- if(e.qztlIsCy)e.qztlIsCy=e.qztlIsCy == "Y" ? "是" : "否"
- if(e.qztlIsCw)e.qztlIsCw=e.qztlIsCw == "Y" ? "是" : "否"
- if(e.qztlIsGt)e.qztlIsGt=e.qztlIsGt == "Y" ? "是" : "否"
- if(e.qztlIsWh)e.qztlIsWh=e.qztlIsWh == "Y" ? "是" : "否"
- if(e.qztlIsFj)e.qztlIsFj=e.qztlIsFj == "Y" ? "是" : "否"
+ if (e.nationId) e.nationId = dddw(this.dict.nation, "id", e.nationId, "displayName")
+ if (e.idNo) e.idNo = e.idNo + '&'
+ if (e.birthDate) e.birthDate = moment(e.birthDate).format("yyyy-MM-DD")
+ if (e.maritalStatusId) e.maritalStatusId = dddw(this.dict.maritalStatus, "id", e.maritalStatusId, "displayName")
+ if (e.medicalTypeId) e.medicalTypeId = dddw(this.dict.medicalType, "id", e.medicalTypeId, "displayName")
+ if (e.personnelTypeId) e.personnelTypeId = dddw(this.dict.personnelType, "id", e.personnelTypeId, "displayName")
+ if (e.isVip) e.isVip = e.isVip == "Y" ? "是" : "否"
+ if (e.isUpload) e.isUpload = e.isUpload == "Y" ? "是" : "否"
+ if (e.qztlType) e.qztlType = dddw(this.dict.qztlType, "id", e.qztlType, "displayName")
+ if (e.qztlIsMain) e.qztlIsMain = e.qztlIsMain == "Y" ? "是" : "否"
+ if (e.qztlIsCy) e.qztlIsCy = e.qztlIsCy == "Y" ? "是" : "否"
+ if (e.qztlIsCw) e.qztlIsCw = e.qztlIsCw == "Y" ? "是" : "否"
+ if (e.qztlIsGt) e.qztlIsGt = e.qztlIsGt == "Y" ? "是" : "否"
+ if (e.qztlIsWh) e.qztlIsWh = e.qztlIsWh == "Y" ? "是" : "否"
+ if (e.qztlIsFj) e.qztlIsFj = e.qztlIsFj == "Y" ? "是" : "否"
})
- this.tableName='人员登记列表'+moment(new Date()).format('yyyyMMDDHHmmss')+'.xls'
+ this.tableName = '人员登记列表' + moment(new Date()).format('yyyyMMDDHHmmss') + '.xls'
return tableDatas;
// const columns = this.$refs.info.getColumns(); // 获取列信息
// const data = this.$refs.info.getData(); // 获取数据