-
-
{{ item.standard_number + ' ' + item.standard_name }}
-
{{ item.source }}
-
{{ item.publishDate }}
-
-
-
{{field.dbFieldTxt}}: {{ item[field.dbFieldName] || '--' }}
+
+
+
+
+
+
{{ item.standard_number + ' ' + item.standard_name }}
+
{{ item.source }}
+
{{ item.publishDate }}
+
+
+ {{field.dbFieldTxt}}: {{ item[field.dbFieldName] || '--' }}
+
-
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
index d0823bc7..c6c12fe6 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
@@ -1,5 +1,5 @@
-
+
@@ -81,7 +81,7 @@
@@ -160,15 +160,6 @@ export default {
}
},
mounted () {
- // 获取人员信息结构
- this.getPersonInfoStructure(ProcessKey.ES_RECHECK.value)
- if (this.$route.query.taskId) {
- this.currentNodeName = this.$route.query.taskName
- // 有流程id说明是从流程中心来的，需要初始化数据
- this.getProcessData(this.$route.query.taskId)
- } else {
- this.currentNodeName = '发起人发起'
- }
// 初始化节点
const taskName = this.$route.query.taskName
if (taskName) {
@@ -189,14 +180,26 @@ export default {
this.currentNode = 999
}
}
- if (this.currentNode === 1) {
- this.disabled = false
- // 是节点1的话还需要设置是联络人发起还是标准化发起 ？？
- this.initRole = 'contact'
+ // 获取人员信息结构
+ this.getPersonInfoStructure(ProcessKey.ES_RECHECK.value, () => {
+ // 获取完人员信息结构，初始化人员信息是否可更改
+ if (this.currentNode === 1) {
+ this.disabled = false
+ // 是节点1的话还需要设置是联络人发起还是标准化发起 ？？
+ this.initRole = 'contact'
+ this.initPersonInfoData(true)
+ } else {
+ this.disabled = true
+ // 如果不是第一个节点，人员信息全部不可选
+ this.initPersonInfoData(false)
+ }
+ })
+ if (this.$route.query.taskId) {
+ this.currentNodeName = this.$route.query.taskName
+ // 有流程id说明是从流程中心来的，需要初始化数据
+ this.getProcessData(this.$route.query.taskId)
} else {
- this.disabled = true
- // 如果不是第一个节点，人员信息全部不可选
- this.initPersonInfoData()
+ this.currentNodeName = '发起人发起'
}
// 如果是查看进入的，不可编辑，不可操作
if (this.$route.query.onlyLook) {
@@ -248,7 +251,6 @@ export default {
},
formInline: {},
approvalInfoForm: this.$form.createForm(this), // 审批信息表单
- personnelInfoData: [],
url: {
list: '' // 人员信息的右侧表格获取接口
}
@@ -257,19 +259,25 @@ export default {
methods: {
// 根据流程id获取数据并回显
getProcessData (taskId) {
+ this.loading = true
enStandardRecheckGetDataById(taskId).then(res => {
if (res.success) {
this.model = res.result
this.$nextTick(() => {
// 初始化流程信息
- this.processInfoForm.setFieldsValue(pick(this.model[0], 'processName', 'deadlineDate', 'processDescription'))
+ this.processInfoForm.setFieldsValue(pick(this.model.common, 'processName', 'deadlineDate', 'processDescription'))
// 初始化流程审批信息，todo：需要判断是不是草稿进来的，草稿进来的才回显审批信息
// this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'remarks', 'attachment'))
+ // 初始化业务基本信息中组件内容
+ if (this.$refs.baseInfoRef) {
+ this.$refs.baseInfoRef.initData(this.model.data)
+ }
})
- // 初始化业务基本信息中组件内容
} else {
this.$message.warning(res.message)
}
+ }).finally(() => {
+ this.loading = false
})
},
// 头部tab改变
@@ -339,6 +347,7 @@ export default {
enStandardRecheckApproval(paramObj).then(res => {
if (res.success) {
this.$message.success(res.message)
+ this.goBack()
} else {
this.$message.warning(res.message)
}
@@ -366,6 +375,32 @@ export default {
enStandardRecheckTurnTo(param).then(res => {
if (res.success) {
this.$message.success(res.message)
+ this.goBack()
+ } else {
+ this.$message.warning(res.message)
+ }
+ }).finally(() => {
+ this.loading = false
+ })
+ }
+ })
+ },
+ // 提交
+ handleSubmit () {
+ if (this.loading) return
+ this.approvalInfoForm.validateFields(async (err, values) => {
+ const data = await this.$refs.baseInfoRef.getDataValidate()
+ if (!err && data) {
+ this.loading = true
+ const param = {}
+ param.common = Object.assign({}, values)
+ param.common.taskId = this.$route.query.taskId
+ param.data = Object.assign({}, data.formInline)
+ console.log(param)
+ enStandardRecheckAgree(param).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.goBack()
} else {
this.$message.warning(res.message)
}
@@ -381,11 +416,13 @@ export default {
this.approvalInfoForm.validateFields((err, values) => {
if (!err) {
this.loading = true
- const param = Object.assign({}, values)
- param.taskId = this.$route.query.taskId
+ const param = {}
+ param.common = Object.assign({}, values)
+ param.common.taskId = this.$route.query.taskId
enStandardRecheckAgree(param).then(res => {
if (res.success) {
this.$message.success(res.message)
+ this.goBack()
} else {
this.$message.warning(res.message)
}
@@ -406,11 +443,13 @@ export default {
this.approvalInfoForm.validateFields((err, values) => {
if (!err) {
this.loading = true
- const param = Object.assign({}, values)
- param.taskId = this.$route.query.id
+ const param = {}
+ param.common = Object.assign({}, values)
+ param.common.taskId = this.$route.query.taskId
enStandardRecheckReject(param).then(res => {
if (res.success) {
this.$message.success(res.message)
+ this.goBack()
} else {
this.$message.warning(res.message)
}
diff --git a/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue
index 5f5dfbcf..9949ad44 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue
@@ -155,9 +155,8 @@ export default {
methods: {
// 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
initData (data) {
- this.data = data
// 给表单赋值
- // this.formInline =
+ this.formInline = data
},
// 外层要获取数据
getData () {
diff --git a/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue b/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue
index a7ac4c0c..a3bb5071 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue
@@ -9,12 +9,12 @@
{{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}