diff --git a/ruoyi-admin/src/main/java/com/ruoyi/script/service/impl/PatientScriptServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/script/service/impl/PatientScriptServiceImpl.java index 12262bd..1698b3e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/script/service/impl/PatientScriptServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/script/service/impl/PatientScriptServiceImpl.java @@ -271,6 +271,7 @@ public class PatientScriptServiceImpl implements PatientScriptService { } }catch (Exception e){ + log.error(e.getMessage()); patientScript.setStatus("生成异常"); scriptMapper.updateStatus(patientScript); } diff --git a/ruoyi-ui/src/views/system/shMenu/index.vue b/ruoyi-ui/src/views/system/shMenu/index.vue index a12ea74..b4b088f 100644 --- a/ruoyi-ui/src/views/system/shMenu/index.vue +++ b/ruoyi-ui/src/views/system/shMenu/index.vue @@ -243,13 +243,13 @@ export default { ], // 表单校验 rules: { - filePath: [ - { - required: true, - message: "扫描文件不能为空", - trigger: "blur", - }, - ], + // filePath: [ + // { + // required: true, + // message: "扫描文件不能为空", + // trigger: "blur", + // }, + // ], scanPosition: [ { @@ -329,10 +329,10 @@ export default { submitForm() { let flag = false; this.form.forEach(it=>{ - if (!it.filePath){ - flag = true - this.$modal.msgError("请上传文件"); - } + // if (!it.filePath){ + // flag = true + // this.$modal.msgError("请上传文件"); + // } if (!it.scanPosition){ flag = true this.$modal.msgError("请输入扫描地点"); @@ -342,7 +342,7 @@ export default { if (flag) return; const formData = this.form.map(item => ({ ...item, - scanTime: dayjs(item.scanTime).format('YYYY-MM-DD HH:mm:ss'), + scanTime:item.scanTime? dayjs(item.scanTime).format('YYYY-MM-DD HH:mm:ss'):null, type: 'noDti' })); addRecord(formData).then(response => {