From bc44c8e3c9d85691ce3fa73ef1300a6fae46e365 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 18 三月 2025 19:07:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/CNAS/personnel/personnelInfo/Department/components/Records/dispose/index.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/Department/components/Records/dispose/index.vue b/src/views/CNAS/personnel/personnelInfo/Department/components/Records/dispose/index.vue
index 7dad14c..c806da4 100644
--- a/src/views/CNAS/personnel/personnelInfo/Department/components/Records/dispose/index.vue
+++ b/src/views/CNAS/personnel/personnelInfo/Department/components/Records/dispose/index.vue
@@ -94,7 +94,7 @@
}
},
mounted() {
- this.isPermission = isPermission("isSubmit")
+ // this.isPermission = isPermission("isSubmit")
console.log('鏉冮檺', this.isPermission);
},
methods: {
@@ -118,14 +118,14 @@
*/
async getProcessData(id) {
const { code, data } = await personSupervisionProcessingPage({ id })
- if (code == 202) {
+ if (!data) {
this.controlType = '鏂板'
this.supervisionRecordId = id
this.active = 0
this.pageStatus = 0
this.processId = undefined
}
- if (code == 200) {
+ if (data && code == 200) {
this.currentResponsible = data.currentResponsible
this.controlType = '缂栬緫'
this.supervisionRecordId = id
@@ -162,7 +162,7 @@
console.log('绗�1姝�', this.active, currentState)
let { factForm } = this.mainForm
this.submitForm({
- proposingDepartmentDate: dateFormat(new Date(), 'YYYY-MM-DD HH:mm:ss'),
+ proposingDepartmentDate: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
currentState: currentState,
...factForm
})
@@ -171,7 +171,7 @@
console.log('绗�2姝�', this.active, currentState)
let { reasonForm } = this.mainForm
this.submitForm({
- causeAnalysisDate: dateFormat(new Date(), 'YYYY-MM-DD HH:mm:ss'),
+ causeAnalysisDate: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
currentState: currentState,
...reasonForm
})
@@ -181,7 +181,7 @@
let { measureForm } = this.mainForm
let { requestDepartmentConfirmation, ...measureFormRest } = measureForm
this.submitForm({
- correctiveActionDate: dateFormat(new Date(), 'YYYY-MM-DD HH:mm:ss'),
+ correctiveActionDate: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
currentState: currentState,
requestDepartmentConfirmation: requestDepartmentConfirmation ? 1 : 2,
...measureFormRest
@@ -191,7 +191,7 @@
console.log('绗�4姝�', this.active, currentState)
let { resultForm } = this.mainForm
this.submitForm({
- verificationDepartmentDate: dateFormat(new Date(), 'YYYY-MM-DD HH:mm:ss'),
+ verificationDepartmentDate: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
currentState: currentState,
...resultForm
})
--
Gitblit v1.9.3