|
|
@@ -59,10 +59,10 @@
|
|
|
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
|
|
|
v-hasPermi="['his:prescribe:edit']">修改</el-button>
|
|
|
</el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
- <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
|
|
|
- v-hasPermi="['his:prescribe:remove']">删除</el-button>
|
|
|
- </el-col>
|
|
|
+<!-- <el-col :span="1.5">-->
|
|
|
+<!-- <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"-->
|
|
|
+<!-- v-hasPermi="['his:prescribe:remove']">删除</el-button>-->
|
|
|
+<!-- </el-col>-->
|
|
|
<el-col :span="1.5">
|
|
|
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
|
|
v-hasPermi="['his:prescribe:export']">导出</el-button>
|
|
|
@@ -319,13 +319,12 @@ export default {
|
|
|
orderCode: undefined,
|
|
|
patientName: undefined,
|
|
|
patientTel: undefined,
|
|
|
- status: undefined,
|
|
|
+ status: 2,//默认查询药师审核不通过的数据
|
|
|
doctorName: undefined,
|
|
|
sTime: undefined,
|
|
|
eTime: undefined,
|
|
|
auditETime: undefined,
|
|
|
- auditSTime: undefined,
|
|
|
- status: 2,//拒绝
|
|
|
+ auditSTime: undefined
|
|
|
},
|
|
|
currentConfirm: null,
|
|
|
form: {},
|
|
|
@@ -459,6 +458,7 @@ export default {
|
|
|
this.currentConfirm = row.doctorConfirm;
|
|
|
|
|
|
getPrescribe(prescribeId).then(response => {
|
|
|
+ console.log('从后端拿到的处方数据:', response.data);
|
|
|
this.form = response.data;
|
|
|
this.open = true;
|
|
|
this.title = "开方";
|
|
|
@@ -472,15 +472,26 @@ export default {
|
|
|
confirmPrescribe() {
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
if (valid) {
|
|
|
+ //保存原始 status
|
|
|
+ const originalStatus = this.form.status;
|
|
|
+
|
|
|
+ //这里应该临时设置为 0 因为确认处方后 status 应该为0了 这里没有从数据库取最新的status
|
|
|
+ this.form.status = 0;
|
|
|
confirmPrescribe(this.form).then(response => {
|
|
|
if (response.code === 200) {
|
|
|
+ //打印提交的 数据
|
|
|
+ console.log('提交的处方数据:', this.form);
|
|
|
this.submitForm();
|
|
|
this.$message.success("确认成功！");
|
|
|
this.open = false;
|
|
|
} else {
|
|
|
this.$message.error(response.message);
|
|
|
+ this.form.status = originalStatus;
|
|
|
}
|
|
|
}).finally(() => {
|
|
|
+ if (this.open) {
|
|
|
+ this.form.status = originalStatus;
|
|
|
+ }
|
|
|
this.getList();
|
|
|
})
|
|
|
}
|
