diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue
index 9bc24205..719589b7 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue
@@ -59,7 +59,7 @@ import { getFileInfo } from '@/api/api'
import { previewPdf } from '@/utils/previewPdf'
import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
-import { getFileByInspectId, getInspectProcessProjectId } from '@api/workCenter'
+import { getFileByInspectId } from '@api/workCenter'
import moment from 'moment/moment'
const Base64 = require('js-base64').Base64
@@ -178,14 +178,8 @@ export default {
if (!param.createTime) {
param.createTime = moment().format('YYYY-MM-DD HH:mm:ss')
}
- this.confirmLoading = true
- getInspectProcessProjectId().then(res => {
- param.id = res + ''
- this.$emit('ok', param, this.index)
- this.form.resetFields()
- }).finally(() => {
- this.confirmLoading = false
- })
+ this.$emit('ok', param, this.index)
+ this.form.resetFields()
}
})
},
@@ -196,13 +190,8 @@ export default {
if (!param.createTime) {
param.createTime = moment().format('YYYY-MM-DD HH:mm:ss')
}
- getInspectProcessProjectId().then(res => {
- param.id = res + ''
- this.$emit('ok', param, this.index)
- this.close()
- }).finally(() => {
- this.confirmLoading = false
- })
+ this.$emit('ok', param, this.index)
+ this.close()
}
})
}
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue
index 59199740..1f303509 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue
@@ -122,7 +122,8 @@
:label="$t('workCenter.esInspectionProcess.rectificationDirector')"
prop="responseUser">
+ @nameChange="nameChangeCallback($event, 'responseUserDictText')"
+ type="radio" v-model="form.responseUser" :nameStr="form.responseUserDictText" />
item.value === '4')).text
break
case '1':
params.rectifyStatus = '1'
+ params.rectifyStatus_dictText = (dictList.find(item => item.value === '1')).text
break
}
if (!params.createTime) {
params.createTime = moment().format('YYYY-MM-DD HH:mm:ss')
}
+ if (params.id) {
+ this.$emit('ok', params, this.index)
+ this.close()
+ return
+ }
this.confirmLoading = true
getInspectProcessProjectId().then(res => {
params.id = res + ''
@@ -291,6 +300,10 @@ export default {
this.$emit('close')
this.visible = false
},
+ // 选择用户名字修改回调
+ nameChangeCallback (name, field) {
+ this.form[field] = name
+ },
// 点击点击上传按钮
clickButtonToUpload () {
this.$refs.uploadFile.open(this.form.attachment)
@@ -346,7 +359,7 @@ export default {
const reportList = this.data.enterpriseStandardInspectReportList || []
const content = contentList.find(item => item.id === val) || {}
const report = reportList.find(item => item.inspectContentId === val) || {}
- this.form.inspectReportId = report.inspectReportId
+ this.form.inspectReportId = report.id
this.form.standardRequire = content.requirement
this.form.executionStatus = report.executionStatus
this.form.attachment = report.attachment
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue
index 20e3bd29..957fc3d4 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue
@@ -80,6 +80,7 @@