diff --git a/src/components/confirmModal.vue b/src/components/confirmModal.vue
index 66f50e9..2c68974 100644
--- a/src/components/confirmModal.vue
+++ b/src/components/confirmModal.vue
@@ -59,18 +59,26 @@ const rules = reactive({
});
// Akiraka 20230210 确认按钮 => 开始数据检查
const handleConfirm = () => {
- proxy.$refs.modalFormRef.validate((valid) => {
+ proxy.$refs.modalFormRef.validate(async(valid) => {
if (!valid) {
- api.value(id.value,form).then(response => {
- // Akiraka 20230210 关闭弹窗
- if(response.code==200){
- Message.success("取消成功");
+ const {code}= await api.value(id.value,form);
+ if(code==200){
+ Message.success("取消成功");
proxy.$refs.modalFormRef.resetFields();
- }else{
- proxy.$notification.error(response.message);
- }
- emits('closeChange',true);
- })
+ }else{
+ proxy.$notification.error(response.message);
+ }
+ emits('closeChange',true);
+ // api.value(id.value,form).then(response => {
+ // // Akiraka 20230210 关闭弹窗
+ // if(response.code==200){
+ // Message.success("取消成功");
+ // proxy.$refs.modalFormRef.resetFields();
+ // }else{
+ // proxy.$notification.error(response.message);
+ // }
+ // emits('closeChange',true);
+ // })
}
})
}
diff --git a/src/components/isOkModal.vue b/src/components/isOkModal.vue
index c648c9e..4b70c02 100644
--- a/src/components/isOkModal.vue
+++ b/src/components/isOkModal.vue
@@ -13,7 +13,7 @@
\ No newline at end of file
diff --git a/src/utils/format.js b/src/utils/format.js
index 2f2f5bf..fc87bca 100644
--- a/src/utils/format.js
+++ b/src/utils/format.js
@@ -52,4 +52,12 @@ export const formatDoctorTitle=(val)=>{
return ''
}
}
-
+ export const fromatReportStatus=(val)=>{
+ //上报处方平台状态(0:未上报 1:已上报 2:上报失败))
+ let data={0:'未上报', 1:'已上报', 2:'上报失败'}
+ if(val || val==0){
+ return data[val]
+ }else{
+ return ''
+ }
+}
diff --git a/src/views/order/medince-list/index.vue b/src/views/order/medince-list/index.vue
index 06fff35..a15ea08 100644
--- a/src/views/order/medince-list/index.vue
+++ b/src/views/order/medince-list/index.vue
@@ -422,6 +422,26 @@