+
+
-
+
@@ -140,19 +240,31 @@
-
+
- {{ lmoment(scope.row.lastModificationTime, "yyyy-MM-DD HH:mm:ss") }}
+
+ {{
+ lmoment(scope.row.lastModificationTime, "yyyy-MM-DD HH:mm:ss")
+ }}
+
-
+
- 登记弃检
+ 登记弃检
- 取消弃检
+ 取消弃检
@@ -174,72 +286,87 @@ export default {
data() {
return {
dataList: [], //列表数据
- multipleSelection: [], //选中的数据列表
+ multipleSelection: [], //选中的数据列表
quick: {
- id:'',
- patientRegisterNo: '',
- patientNo: '',
- patientName: '',
+ id: "",
+ patientRegisterNo: "",
+ patientNo: "",
+ patientName: "",
},
-
};
},
- created() { },
+ created() {},
//挂载完成
- mounted() { },
+ mounted() {},
computed: {
- ...mapState(["window","dict", "patientRegister", "customerOrg", "doctorCheck"]),
+ ...mapState([
+ "window",
+ "dict",
+ "patientRegister",
+ "customerOrg",
+ "doctorCheck",
+ ]),
},
methods: {
...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
rowClick(row) {
- objCopy(row, this.quick)
- this.registerCheckList(row.id)
+ objCopy(row, this.quick);
+ this.registerCheckList(row.id);
},
//按条码号查个人数据
onQueryByPatientRegisterNo() {
- let val = this.quick.patientRegisterNo
- console.log(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
- getapi(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
- .then((res) => {
- if (res.code != -1) {
- if (res.data) {
- objCopy(res.data, this.quick)
- this.registerCheckList(res.data.id)
- } else {
- this.quick.patientNo = ''
- this.quick.patientName = ''
- }
+ let val = this.quick.patientRegisterNo;
+ console.log(
+ `/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`
+ );
+ getapi(
+ `/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`
+ ).then((res) => {
+ if (res.code != -1) {
+ if (res.data) {
+ objCopy(res.data, this.quick);
+ this.registerCheckList(res.data.id);
+ } else {
+ this.quick.patientNo = "";
+ this.quick.patientName = "";
}
- });
+ }
+ });
},
//按条码号查个人数据
onQueryByPatientNo() {
- let val = this.quick.patientNo
- console.log(`/api/app/patient-register/patient-register-or-patient?SType=2&PatientNo=${val}`)
- getapi(`/api/app/patient-register/patient-register-or-patient?SType=2&PatientNo=${val}`)
- .then((res) => {
- if (res.code != -1) {
- if (res.data) {
- objCopy(res.data, this.quick)
- this.registerCheckList(res.data.id)
- } else {
- this.quick.patientRegisterNo = ''
- this.quick.patientName = ''
- }
+ let val = this.quick.patientNo;
+ console.log(
+ `/api/app/patient-register/patient-register-or-patient?SType=2&PatientNo=${val}`
+ );
+ getapi(
+ `/api/app/patient-register/patient-register-or-patient?SType=2&PatientNo=${val}`
+ ).then((res) => {
+ if (res.code != -1) {
+ if (res.data) {
+ objCopy(res.data, this.quick);
+ this.registerCheckList(res.data.id);
+ } else {
+ this.quick.patientRegisterNo = "";
+ this.quick.patientName = "";
}
- });
+ }
+ });
},
//获取检查组合项目
registerCheckList(patientRegisterId) {
- console.log(`/api/app/register-check/register-check-or-asbitem/${patientRegisterId}`)
- getapi(`/api/app/register-check/register-check-or-asbitem/${patientRegisterId}`)
+ console.log(
+ `/api/app/register-check/register-check-or-asbitem/${patientRegisterId}`
+ );
+ getapi(
+ `/api/app/register-check/register-check-or-asbitem/${patientRegisterId}`
+ )
.then((res) => {
console.log("registerCheckList", res.data);
if (res.code != -1) {
@@ -266,85 +393,98 @@ export default {
.then((res) => {
if (res.code != -1) {
this.$message.success("操作成功");
- this.registerCheckList(this.quick.id)
+ this.registerCheckList(this.quick.id);
}
})
.catch(() => {
- this.$message({ type: "error", message: "已取消删除", });
+ this.$message({ type: "error", message: "已取消删除" });
});
},
//弃检与恢复判断
resuseCheck(completeFlag) {
- let resuseAsb = '',finishAsb = '',chargeAsb='',msg=''
+ let resuseAsb = "",
+ finishAsb = "",
+ chargeAsb = "",
+ msg = "";
let ret = {
allowable: true,
- msg:'',
- }
-
- if (!this.multipleSelection || this.multipleSelection.length < 1) return { allowable: false, msg: '请选择组合项目，再进行此操作' }
-
- for(let i=0;i
{
+ let body = [];
+ this.multipleSelection.forEach((e) => {
body.push({
- registerCheckId:e.id,
+ registerCheckId: e.id,
completeFlag,
- })
+ });
});
- this.resuseCore(body)
-
+ this.resuseCore(body);
},
-
ldddw(arrayData, key, value, display) {
return dddw(arrayData, key, value, display);
@@ -356,51 +496,65 @@ export default {
//查询
query() {
- let body = {}
+ let body = {};
- console.log(`this.patientRegister.query`, this.patientRegister.query)
+ console.log(`this.patientRegister.query`, this.patientRegister.query);
if (this.patientRegister.query.customerOrgFlag) {
if (this.patientRegister.query.CustomerOrgParentId) {
- body.customerOrgId = this.patientRegister.query.CustomerOrgParentId
+ body.customerOrgId = this.patientRegister.query.CustomerOrgParentId;
} else {
- if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId[0]
+ if (this.patientRegister.query.customerOrgId)
+ body.customerOrgId = this.patientRegister.query.customerOrgId[0];
}
}
- if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
+ if (this.patientRegister.query.sex)
+ body.sexId = this.patientRegister.query.sex;
- if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
+ if (this.patientRegister.query.patientName)
+ body.patientName = this.patientRegister.query.patientName;
- if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+ if (this.patientRegister.query.completeFlag)
+ body.completeFlag = this.patientRegister.query.completeFlag;
//StartDate EndDate
- if (this.patientRegister.query.startDate && this.patientRegister.query.endDate) {
- body.startDate = moment(this.patientRegister.query.startDate).format("yyyy-MM-DD")
- body.endDate = moment(this.patientRegister.query.endDate).format("yyyy-MM-DD")
- if(body.startDate > body.endDate){
- this.$message.warning("起始日期不能大于截止日期，数据校验不通过！")
- return
+ if (
+ this.patientRegister.query.startDate &&
+ this.patientRegister.query.endDate
+ ) {
+ body.startDate = moment(this.patientRegister.query.startDate).format(
+ "yyyy-MM-DD"
+ );
+ body.endDate = moment(this.patientRegister.query.endDate).format(
+ "yyyy-MM-DD"
+ );
+ if (body.startDate > body.endDate) {
+ this.$message.warning("起始日期不能大于截止日期，数据校验不通过！");
+ return;
}
}
+ if (this.patientRegister.query.idCardNo)
+ body = { idNo: this.patientRegister.query.idCardNo };
- if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
-
- if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
+ if (this.patientRegister.query.patientNo)
+ body = { patientNo: this.patientRegister.query.patientNo };
- if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
+ if (this.patientRegister.query.patientRegisterNo)
+ body = {
+ patientRegisterNo: this.patientRegister.query.patientRegisterNo,
+ };
-
- console.log('/api/app/patientregister/getlistinfilter', body)
+ console.log("/api/app/patientregister/getlistinfilter", body);
const loading = this.$loading({
lock: true,
- text: 'Loading',
- spinner: 'el-icon-loading',
- background: 'rgba(0, 0, 0, 0.7)'
+ text: "Loading",
+ spinner: "el-icon-loading",
+ background: "rgba(0, 0, 0, 0.7)",
});
- postapi('/api/app/patientregister/getlistinfilter', body)
+ postapi("/api/app/patientregister/getlistinfilter", body)
.then((res) => {
- if(res.code != - 1){
+ if (res.code != -1) {
this.dataList = res.data.items;
}
loading.close();
@@ -420,7 +574,6 @@ export default {
this.query();
}
},
-
},
};
@@ -438,7 +591,7 @@ export default {
margin-top: 10px;
text-align: center;
}
-.btnClass{
- width:110px;
+.btnClass {
+ width: 110px;
}
diff --git a/src/components/patientRegister/patientRegisterAsbItem.vue b/src/components/patientRegister/patientRegisterAsbItem.vue
index e92d368..04151ca 100644
--- a/src/components/patientRegister/patientRegisterAsbItem.vue
+++ b/src/components/patientRegister/patientRegisterAsbItem.vue
@@ -20,7 +20,7 @@