+
@@ -145,13 +145,17 @@ import {
standardizationInitAgree,
standardizationInitReject
} from '@/api/workCenter'
+import Vue from 'vue'
+import { USER_INFO } from '@/store/mutation-types'
const personData = [
{
id: 1,
nodeName: '标准化工程师发起',
nodeRoleName: '发起人',
- canChoose: false
+ canChoose: false,
+ userList: Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')',
+ fieldName: 'standardEngineer'
},
{
id: 2,
@@ -251,7 +255,7 @@ export default {
onlyLook: false,
validatorRules: {
// 流程名称
- processName: {
+ prcName: {
rules: [
{
required: true,
@@ -261,7 +265,7 @@ export default {
validateTrigger: 'blur'
},
// 备注
- remarks: {
+ commitText: {
rules: [
{
required: false,
@@ -299,16 +303,25 @@ export default {
}
}
// 需要传给后端的
- let param = {}
+ const param = {}
+ param.common = { ...processInfoForm, ...approvalInfoForm }
+ param.flowUser = personnelObj
// 业务基本信息
if (this.$refs.basicInfoFormRef) {
- let ruleForm = this.$refs.baseInfoRef.getData()
+ const ruleForm = this.$refs.baseInfoRef.getData()
+ const form = { ...processInfoForm, ...approvalInfoForm, ...personnelObj }
+ const flag = Object.values(form).some(v => !!v || v === 0)
+ if (!flag || ruleForm.dataSource.length <= 0) {
+ // 提示至少填写一项
+ this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
+ return
+ }
// 该流程中业务基本信息只有表格
- // ruleForm.dataSource
+ param.dataList = ruleForm.dataSource
} else {
// 需要外层信息至少填了一项
- param = { ...processInfoForm, ...approvalInfoForm, ...personnelObj }
- const flag = Object.values(param).some(v => !!v || v === 0)
+ const form = { ...processInfoForm, ...approvalInfoForm, ...personnelObj }
+ const flag = Object.values(form).some(v => !!v || v === 0)
if (!flag) {
// 提示至少填写一项
this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
@@ -338,6 +351,8 @@ export default {
personnelObj[item.fieldName] = item.user
}
}
+ // 发起人,标准化工程师设置为当前登录人
+ personnelObj.standardEngineer = Vue.ls.get(USER_INFO).id
// 校验是否填了所有能填的人员信息
if (!Object.values(personnelObj).every(v => !!v)) {
this.$message.warning(this.$t('pleaseEnterPersonnelInfo'))
@@ -348,6 +363,9 @@ export default {
this.$refs.baseInfoRef.getDataValidate((data) => {
if (!err && !approvalErr && data) {
const param = {} // 传给后端的数据
+ param.common = { ...values, ...approvalValues }
+ param.dataList = data.dataSource
+ param.flowUser = personnelObj
standardizationInitApproval(param).then(res => {
if (res.success) {
this.$message.success(res.message)
@@ -396,7 +414,18 @@ export default {
this.$refs.baseInfoFormRef.getDataValidate(data => {
if (approvalErr && data) {
// 只有表格
- // param =
+ const param = {}
+ param.common = approvalValues
+ param.dataList = data.dataSource
+ standardizationInitAgree(param).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ } else {
+ this.$message.warning(res.message)
+ }
+ }).finally(() => {
+ this.loading = false
+ })
}
})
})
@@ -407,7 +436,8 @@ export default {
this.approvalInfoForm.validateFields((err, values) => {
if (!err) {
this.loading = true
- const param = Object.assign({}, values)
+ const param = {}
+ param.common = Object.assign({}, values)
param.taskId = this.$route.query.taskId
standardizationInitAgree(param).then(res => {
if (res.success) {
@@ -427,7 +457,8 @@ export default {
this.approvalInfoForm.validateFields((err, values) => {
if (!err) {
this.loading = true
- const param = Object.assign({}, values)
+ const param = {}
+ param.commom = Object.assign({}, values)
param.taskId = this.$route.query.taskId
standardizationInitReject(param).then(res => {
if (res.success) {
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue
index 0ad05944..77536cc2 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue
@@ -278,7 +278,11 @@ export default {
* 需要能判断是否是被驳回，产生的待办点击进入的，是的话需要显示带出被驳回的法规的联络人，
* 并且去掉批量设置联络人按钮，如需修改联络人，删除该标准重新走标准化发起流程 ??
*/
- // this.isRejectedTodo = false
+ if (this.$route.query.taskId) {
+ this.isRejectedTodo = true
+ } else {
+ this.isRejectedTodo = false
+ }
},
methods: {
// 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
@@ -291,7 +295,9 @@ export default {
getData () {
// 把数据抛出
const data = {}
- data.dataSource = this.dataSource
+ data.dataSource = this.dataSource.map(item => {
+ return { ...item, enStandardSystem: item.enStandardSystem ? item.enStandardSystem.join(',') : ''}
+ })
return data
},
// 外层获取数据要过校验,返回false表示没有通过校验
@@ -299,7 +305,9 @@ export default {
// 校验表格是否每行都有数据，每行的联络人是否都有
if (this.dataSource && this.dataSource.length > 0) {
const data = {}
- data.dataSource = this.dataSource
+ data.dataSource = this.dataSource.map(item => {
+ return { ...item, enStandardSystem: item.enStandardSystem ? item.enStandardSystem.join(',') : ''}
+ })
let hasErr = false
for (const item of this.dataSource) {
if (!item.contactUser) {