[update] 修改企标制修订流程

src/api/workCenter.js

@@ -56,6 +56,20 @@ const standardizationInitReject = (params) => postAction('/process/es/annualInit
 // 根据流程id获取流程信息
 const standardizationInitGetDataById = (taskId, params) => getAction(`/process/es/annualInit/handle/${taskId}`, params)
 
+// 企标制修订流程
+// 保存
+const enStandardEditSave = (params) => postAction('', params)
+// 发起
+const enStandardEditApproval = (params) => postAction('', params)
+// 转办
+const enStandardEditTurnTo = (params) => postAction('', params)
+// 同意
+const enStandardEditAgree = (params) => postAction('', params)
+// 拒绝
+const enStandardEditReject = (params) => postAction('', params)
+// 根据id查流程数据
+const enStandardEditGetDataById = (taskId, params) => getAction(`/${taskId}`, params)
+
 // 企标更改流程
 // 保存
 const enStandardChangeSave = (params) => postAction('/process/es/change/save', params)
@@ -176,6 +190,13 @@ export {
   standardizationInitReject,
   standardizationInitGetDataById,
 
+  enStandardEditSave,
+  enStandardEditApproval,
+  enStandardEditTurnTo,
+  enStandardEditAgree,
+  enStandardEditReject,
+  enStandardEditGetDataById,
+
   enStandardChangeSave,
   enStandardChangeApproval,
   enStandardChangeTurnTo,

src/enums/commonEnums.js

@@ -167,6 +167,7 @@ export const ProcessKey = {
   // 年度制修订-标准化部门主动发起
   ES_ANNUAL_INIT: { text: 'es-annual-init', value: 'es-annual-init' },
   // 企标制修订流程
+  ES_EDIT: { text: '', value: '' },
   // 企标更改流程
   ES_CHANGE: { text: 'es-change', value: 'es-change' },
   // 企标复审流程

src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue

@@ -163,6 +163,7 @@ export default {
     }
     // 获取人员信息结构
     this.getPersonInfoStructure(ProcessKey.ES_ABOLISH.value, () => {
+      if (this.$route.query.processInstanceId) {
         if (this.currentNode === 1) {
           this.disabled = false
           this.initPersonInfoData(true)
@@ -171,6 +172,7 @@ export default {
           // 如果不是第一个节点，人员信息全部不可选
           this.initPersonInfoData(false)
         }
+      }
     })
     if (this.$route.query.taskId) {
       this.currentNodeName = this.$route.query.taskName

src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue

@@ -173,9 +173,10 @@ export default {
     }
     if (this.currentNode === 1) {
       this.disabled = false
+      this.initPersonInfoData(true)
     } else {
       this.disabled = true
-      this.initPersonInfoData()
+      this.initPersonInfoData(false)
     }
     // 如果是查看进入的，不可编辑，不可操作
     if (this.$route.query.onlyLook) {

src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue

@@ -183,6 +183,7 @@ export default {
     // 获取人员信息结构
     this.getPersonInfoStructure(ProcessKey.ES_RECHECK.value, () => {
       // 获取完人员信息结构，初始化人员信息是否可更改
+      if (this.$route.query.processInstanceId) {
         if (this.currentNode === 1) {
           this.disabled = false
           // 是节点1的话还需要设置是联络人发起还是标准化发起 ？？
@@ -193,6 +194,7 @@ export default {
           // 如果不是第一个节点，人员信息全部不可选
           this.initPersonInfoData(false)
         }
+      }
     })
     if (this.$route.query.taskId) {
       this.currentNodeName = this.$route.query.taskName

src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue

@@ -57,36 +57,36 @@
       <!--  节点1、主起草人起草分发  -->
       <main-drafter-sent-base-info v-if="currentNode === 1" :flowInitType="flowInitType" :disabled="disabled" ref="baseInfoRef"></main-drafter-sent-base-info>
       <!--  节点2、其他起草人上传企标  -->
-      <other-drafter-upload-standard-base-info v-if="currentNode === 2" :flowInitType="flowInitType" :disabled="disabled" ref="baseInfoRef"></other-drafter-upload-standard-base-info>
+      <other-drafter-upload-standard-base-info v-if="currentNode === 2" :disabled="disabled" ref="baseInfoRef"></other-drafter-upload-standard-base-info>
       <!--  节点3、主起草人汇总上传会议纪要  -->
-      <main-drafter-collect-upload-minute-base-info v-if="currentNode === 3" :flowInitType="flowInitType" :disabled="disabled" ref="baseInfoRef"></main-drafter-collect-upload-minute-base-info>
+      <main-drafter-collect-upload-minute-base-info v-if="currentNode === 3" :disabled="disabled" ref="baseInfoRef"></main-drafter-collect-upload-minute-base-info>
       <!--  节点4、标准化审核 -->
-      <standardization-audit-base-info v-if="currentNode === 4" :flowInitType="flowInitType" :disabled="disabled" ref="baseInfoRef" @standardizationAuditIsMeeting="standardizationAuditIsMeeting"></standardization-audit-base-info>
+      <standardization-audit-base-info v-if="currentNode === 4" :disabled="disabled" ref="baseInfoRef" @standardizationAuditIsMeeting="standardizationAuditIsMeeting"></standardization-audit-base-info>
       <!--  节点5、评分人打分  -->
-      <scorer-mark-base-info v-if="currentNode === 5" :flowInitType="flowInitType" :disabled="disabled" ref="baseInfoRef"></scorer-mark-base-info>
+      <scorer-mark-base-info v-if="currentNode === 5" :disabled="disabled" ref="baseInfoRef"></scorer-mark-base-info>
       <!--  节点6、标准化确认是否开启征求意见  -->
-      <confirm-whether-comment-base-info v-if="currentNode === 6" :flowInitType="flowInitType" :disabled="disabled" ref="baseInfoRef"></confirm-whether-comment-base-info>
+      <confirm-whether-comment-base-info v-if="currentNode === 6" :disabled="disabled" ref="baseInfoRef"></confirm-whether-comment-base-info>
       <!--  节点7、部所联络人下发  -->
-      <depart-liaison-issue-base-info v-if="currentNode === 7" :flowInitType="flowInitType" :disabled="disabled" ref="baseInfoRef"></depart-liaison-issue-base-info>
+      <depart-liaison-issue-base-info v-if="currentNode === 7" :disabled="disabled" ref="baseInfoRef"></depart-liaison-issue-base-info>
       <!--  节点8、征求意见对象填写意见  -->
-      <comment-object-enter-base-info v-if="currentNode === 8" :flowInitType="flowInitType" :disabled="disabled" ref="baseInfoRef"></comment-object-enter-base-info>
+      <comment-object-enter-base-info v-if="currentNode === 8" :disabled="disabled" ref="baseInfoRef"></comment-object-enter-base-info>
       <!--  节点9、部所联络人汇总数据  -->
-      <depart-liaison-collect-base-info v-if="currentNode === 9" :flowInitType="flowInitType" :disabled="disabled" ref="baseInfoRef"></depart-liaison-collect-base-info>
+      <depart-liaison-collect-base-info v-if="currentNode === 9" :disabled="disabled" ref="baseInfoRef"></depart-liaison-collect-base-info>
       <!--  节点10、部所联络人主管级领导审批  -->
-      <depart-liaison-leader-approve-base-info v-if="currentNode === 10" :flowInitType="flowInitType" :disabled="disabled" ref="baseInfoRef"></depart-liaison-leader-approve-base-info>
+      <depart-liaison-leader-approve-base-info v-if="currentNode === 10" :disabled="disabled" ref="baseInfoRef"></depart-liaison-leader-approve-base-info>
       <!--  节点11、主起草人汇总  -->
-      <main-drafter-collect-base-info v-if="currentNode === 11" :flowInitType="flowInitType" :disabled="disabled" ref="baseInfoRef"></main-drafter-collect-base-info>
+      <main-drafter-collect-base-info v-if="currentNode === 11" :disabled="disabled" ref="baseInfoRef"></main-drafter-collect-base-info>
       <!--  节点12、主起草人上传会议纪要  -->
-      <main-drafter-upload-minute-base-info v-if="currentNode === 12" :flowInitType="flowInitType" :disabled="disabled" ref="baseInfoRef"></main-drafter-upload-minute-base-info>
+      <main-drafter-upload-minute-base-info v-if="currentNode === 12" :disabled="disabled" ref="baseInfoRef"></main-drafter-upload-minute-base-info>
       <!--  节点13、其他起草人校对  -->
       <!--  节点14、主管级领导审批  -->
       <!--  节点15、标准化审批  -->
       <!--  节点16、相关部门领导会签  -->
       <!--  节点17、总工程师审批  -->
       <!--  只有标准文本  -->
-      <other-drafter-proofread-base-info v-if="[13, 14, 15, 16, 17].includes(currentNode)" :flowInitType="flowInitType" :disabled="disabled" ref="baseInfoRef"></other-drafter-proofread-base-info>
+      <other-drafter-proofread-base-info v-if="[13, 14, 15, 16, 17].includes(currentNode)" :disabled="disabled" ref="baseInfoRef"></other-drafter-proofread-base-info>
       <!--  节点18、主起草人发布  -->
-      <main-drafter-publish-base-info v-if="currentNode === 18" :flowInitType="flowInitType" :disabled="disabled" ref="baseInfoRef"></main-drafter-publish-base-info>
+      <main-drafter-publish-base-info v-if="currentNode === 18" :disabled="disabled" ref="baseInfoRef"></main-drafter-publish-base-info>
 
       <!--  流程审批信息  -->
       <div class="process-part-title">{{ $t('processApprovalInformation') }}</div>
@@ -171,121 +171,15 @@ import MainDrafterCollectUploadMinuteBaseInfo from './modules/MainDrafterCollect
 import MainDrafterUploadMinuteBaseInfo from './modules/MainDrafterUploadMinuteBaseInfo'
 import OtherDrafterProofreadBaseInfo from './modules/OtherDrafterProofreadBaseInfo'
 import MainDrafterPublishBaseInfo from './modules/MainDrafterPublishBaseInfo'
-
+import { ProcessKey } from '../../../enums/commonEnums'
-const personData = [
+import {
-  {
+  enStandardEditAgree,
-    id: 1,
+  enStandardEditApproval,
-    nodeName: '主起草人起草分发',
+  enStandardEditGetDataById,
-    nodeRoleName: '主起草人',
+  enStandardEditReject,
-    canChoose: false
+  enStandardEditSave,
-  },
+  enStandardEditTurnTo
-  {
+} from '@/api/workCenter'
-    id: 2,
-    nodeName: '其他起草人上传企标',
-    nodeRoleName: '其他起草人',
-    canChoose: false
-  },
-  {
-    id: 3,
-    nodeName: '主起草人汇总上传会议纪要',
-    nodeRoleName: '主起草人',
-    canChoose: false
-  },
-  {
-    id: 4,
-    nodeName: '标准化审批',
-    nodeRoleName: '标准化',
-    canChoose: true,
-    chooseType: 'radio',
-    fieldName: ''
-  },
-  {
-    id: 5,
-    nodeName: '评分人打分',
-    nodeRoleName: '评分人',
-    canChoose: false
-  },
-  {
-    id: 6,
-    nodeName: '标准化确认是否开启征求意见',
-    nodeRoleName: '标准化',
-    canChoose: false
-  },
-  {
-    id: 7,
-    nodeName: '部所联络人下发',
-    nodeRoleName: '部所联络人',
-    canChoose: false
-  },
-  {
-    id: 8,
-    nodeName: '征求意见对象填写意见',
-    nodeRoleName: '征求意见对象',
-    canChoose: true,
-    chooseType: 'checkbox',
-    fieldName: ''
-  },
-  {
-    id: 9,
-    nodeName: '部所联络人汇总数据',
-    nodeRoleName: '部所联络人',
-    canChoose: false
-  },
-  {
-    id: 10,
-    nodeName: '部所联络人主管级领导审批',
-    nodeRoleName: '部所联络人主管级领导',
-    canChoose: false
-  },
-  {
-    id: 11,
-    nodeName: '主起草人汇总',
-    nodeRoleName: '主起草人',
-    canChoose: false
-  },
-  {
-    id: 12,
-    nodeName: '主起草人上传会议纪要',
-    nodeRoleName: '主起草人',
-    canChoose: false
-  },
-  {
-    id: 13,
-    nodeName: '其他起草人校对',
-    nodeRoleName: '其他起草人',
-    canChoose: false
-  },
-  {
-    id: 14,
-    nodeName: '主管级领导审批',
-    nodeRoleName: '主管级领导',
-    canChoose: false
-  },
-  {
-    id: 15,
-    nodeName: '标准化审批',
-    nodeRoleName: '标准化审批人',
-    canChoose: false
-  },
-  {
-    id: 16,
-    nodeName: '相关部门领导会签',
-    nodeRoleName: '相关部门领导',
-    canChoose: false
-  },
-  {
-    id: 17,
-    nodeName: '总工程师审批',
-    nodeRoleName: '总工程师',
-    canChoose: false
-  },
-  {
-    id: 18,
-    nodeName: '主起草人发布',
-    nodeRoleName: '主起草人',
-    canChoose: false
-  }
-]
 
 export default {
   name: 'EnterpriseStandardRevisionFlow',
@@ -311,16 +205,70 @@ export default {
   },
   computed: {
     pageTitle () {
-      return this.$t('flowCenter') + this.$route.meta.title
+      return this.$t('flowCenter') + this.$route.meta.title + '（' + this.currentNodeName + '）'
     }
   },
   mounted () {
-    if (this.currentNode === 1) {
+    // 初始化节点
-      this.personnelInfoData = personData
+    const taskName = this.$route.query.taskName
+    if (taskName) {
+      if (taskName === '主起草人起草分发') {
+        this.currentNode = 1
+      } else if (taskName === '其他起草人上传企标') {
+        this.currentNode = 2
+      } else if (taskName === '主起草人汇总上传会议纪要') {
+        this.currentNode = 3
+      } else if (taskName === '标准化审核') {
+        this.currentNode = 4
+      } else if (taskName === '评分人评分') {
+        this.currentNode = 5
+      } else if (taskName === '标准化确认是否开启征求意见') {
+        this.currentNode = 6
+      } else if (taskName === '部所联络人下发') {
+        this.currentNode = 7
+      } else if (taskName === '征求意见对象填写意见') {
+        this.currentNode = 8
+      } else if (taskName === '部所联络人汇总数据') {
+        this.currentNode = 9
+      } else if (taskName === '部门联络人主管级领导审批') {
+        this.currentNode = 10
+      } else if (taskName === '主起草人汇总') {
+        this.currentNode = 11
+      } else if (taskName === '主起草人上传会议纪要') {
+        this.currentNode = 12
+      } else if (taskName === '其他起草人校对') {
+        this.currentNode = 13
+      } else if (taskName === '主管级领导审批') {
+        this.currentNode = 14
+      } else if (taskName === '标准化审批') {
+        this.currentNode = 15
+      } else if (taskName === '相关部门领导会签') {
+        this.currentNode = 16
+      } else if (taskName === '总工程师审批') {
+        this.currentNode = 17
+      } else if (taskName === '主起草人发布') {
+        this.currentNode = 18
       } else {
-      this.personnelInfoData = personData.map(item => {
+        // 预留加签节点
-        return { ...item, canChoose: false, fieldName: undefined }
+        this.currentNode = 999
+      }
+    }
+    // 获取人员信息结构
+    this.getPersonInfoStructure(ProcessKey.ES_EDIT.value, () => {
+      if (this.$route.query.processInstanceId) {
+        if (this.currentNode === 1) {
+          this.initPersonInfoData(true)
+        } else {
+          this.initPersonInfoData(false)
+        }
+      }
     })
+    if (this.$route.query.taskId) {
+      this.currentNodeName = this.$route.query.taskName
+      // 有流程id说明是从流程中心来的，需要初始化数据
+      this.getProcessData(this.$route.query.taskId)
+    } else {
+      this.currentNodeName = '主起草人起草分发'
     }
     // 如果是查看进入的，不可编辑，不可操作
     if (this.$route.query.onlyLook) {
@@ -373,7 +321,9 @@ export default {
           validateTrigger: 'blur'
         }
       },
-      currentNode: 18,
+      model: {},
+      currentNode: 1,
+      currentNodeName: '', // 当前节点名称
       approvalInfoForm: this.$form.createForm(this), // 审批信息表单
       personnelInfoData: [], // 人员信息数据
       url: {
@@ -385,10 +335,27 @@ export default {
     }
   },
   methods: {
+    // 根据流程id获取数据并回显
+    getProcessData (taskId) {
+      enStandardEditGetDataById(taskId).then(res => {
+        if (res.success) {
+          this.model = res.result
+          this.$nextTick(() => {
+            // 初始化流程信息
+            this.processInfoForm.setFieldsValue(pick(this.model[0], 'prcName', 'dueTime', 'prcMes'))
+            // 初始化流程审批信息，todo：需要判断是不是草稿进来的，草稿进来的才回显审批信息
+            // this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'commitText', 'commitFile'))
+          })
+          // 初始化业务基本信息中组件内容
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
     switchChange (value) {
       this.switchValue = value
     },
-    // 标准化审核节点是否可进行评审会修改
+    // 标准化审核节点是否可进行评审会修改，需要修改备注的是否必填和同意、驳回按钮是否可用
     standardizationAuditIsMeeting (value) {
       // 选是的话,驳回按钮置灰，不可点击；选否，备注变成必填，内容自动带入“驳回”，下方同意按钮置灰，不可点击
       if (value === 1) {
@@ -416,17 +383,29 @@ export default {
       // 流程审批信息
       const approvalInfoForm = this.approvalInfoForm.getFieldsValue()
       // 人员信息的数据, 处理成对象
-      const personnelInfo = this.$refs.personnelInfo.stepsData
+      const personnelObj = this.$refs.personnelInfo.getDataObj()
-      const personnelObj = {}
-      for (const item of personnelInfo) {
-        if (item.fieldName) {
-          personnelObj[item.fieldName] = item.user
-        }
-      }
       // 需要传给后端的
+      const paramObj = {}
+      paramObj.common = { ...processInfoForm, ...approvalInfoForm }
+      paramObj.flowUser = personnelObj
       // 业务基本信息
-      if (this.$refs.basicInfoFormRef) {
+      if (this.$refs.baseInfoRef) {
-
+        // 业务基本信息
+        const baseInfo = this.$refs.baseInfoRef.getData()
+        const param = { ...processInfoForm, ...approvalInfoForm, ...personnelObj, ...baseInfo.formInline }
+        const flag = Object.values(param).some(v => !!v || v === 0)
+        if (!flag || (baseInfo.dataSource && baseInfo.dataSource.length <= 0)) {
+          // 提示至少填写一项
+          this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
+          return
+        }
+        if (baseInfo.dataSource) {
+          paramObj.dataList = baseInfo.dataSource.map(item => {
+            return { ...item, ...baseInfo.formInline }
+          })
+        } else {
+          paramObj.dataList = [baseInfo.formInline]
+        }
       } else {
         // 需要外层信息至少填了一项
         const param = { ...processInfoForm, ...approvalInfoForm, ...personnelObj }
@@ -437,34 +416,52 @@ export default {
           return
         }
       }
+      this.loading = true
       // 保存到草稿
-      // enterprisePlanApprovalSave(arr).then(res => {
+      enStandardEditSave(paramObj).then(res => {
-      //   if (res.success) {
+        if (res.success) {
-      //     this.$message.success(res.message)
+          this.$message.success(res.message)
-      //   } else {
+          this.goBack()
-      //     this.$message.warning(res.message)
+        } else {
-      //   }
+          this.$message.warning(res.message)
-      // })
+        }
+      }).finally(() => {
+        this.loading = false
+      })
     },
     // 节点一时候的提交，发起变更
     handleStart () {
       if (this.loading) return
       // 人员信息的数据, 处理成对象
-      const personnelInfo = this.$refs.personnelInfo.stepsData
+      const personnelObj = this.$refs.personnelInfo.getDataObjVerify()
-      const personnelObj = {}
+      if (!personnelObj) {
-      for (const item of personnelInfo) {
-        if (item.fieldName) {
-          personnelObj[item.fieldName] = item.user
-        }
-      }
-      // 校验是否填了所有能填的人员信息
-      if (!Object.values(personnelObj).every(v => !!v)) {
-        this.$message.warning(this.$t('pleaseEnterPersonnelInfo'))
         return
       }
       this.processInfoForm.validateFields((err, values) => {
-        this.approvalInfoForm.validateFields((approvalErr, approvalValues) => {
+        this.approvalInfoForm.validateFields(async (approvalErr, approvalValues) => {
-
+          const data = await this.$refs.baseInfoRef.getDataValidate()
+          if (!err && !approvalErr && data) {
+            const param = {} // 需要传给后端的数据
+            param.common = { ...values, ...approvalValues }
+            param.flowUser = personnelObj
+            if (data.dataSource && data.dataSource.length > 0) {
+              param.dataList = data.dataSource.map(item => {
+                return { ...item, ...data.formInline }
+              })
+            } else {
+              param.dataList = [data.formInline]
+            }
+            enStandardEditApproval(param).then(res => {
+              if (res.success) {
+                this.$message.success(res.message)
+                this.goBack()
+              } else {
+                this.$message.warning(res.message)
+              }
+            }).finally(() => {
+              this.loading = false
+            })
+          }
         })
       })
     },
@@ -482,29 +479,97 @@ export default {
           const param = Object.assign({}, values)
           param.userId = userIds
           param.taskId = this.$route.query.taskId
-          // enterprisePlanApprovalTurnTo(param).then(res => {
+          enStandardEditTurnTo(param).then(res => {
-          //   if (res.success) {
+            if (res.success) {
-          //     this.$message.success(res.message)
+              this.$message.success(res.message)
-          //   } else {
+              this.goBack()
-          //     this.$message.warning(res.message)
+            } else {
-          //   }
+              this.$message.warning(res.message)
-          // }).finally(() => {
+            }
-          //   this.loading = false
+          }).finally(() => {
-          // })
+            this.loading = false
+          })
         }
       })
     },
     // 提交
     handleSubmit () {
-
+      if (this.loading) return
+      this.approvalInfoForm.validateFields(async (approvalErr, approvalValues) => {
+        const data = await this.$refs.baseInfoRef.getDataValidate()
+        if (!approvalErr && data) {
+          const param = {} // 需要传给后端的数据
+          param.common = approvalValues
+          if (data.dataSource && data.dataSource.length > 0) {
+            param.dataList = data.dataSource.map(item => {
+              return { ...item, ...data.formInline }
+            })
+          } else {
+            param.dataList = [data.formInline]
+          }
+          enStandardEditAgree(param).then(res => {
+            if (res.success) {
+              this.$message.success(res.message)
+              this.goBack()
+            } else {
+              this.$message.warning(res.message)
+            }
+          }).finally(() => {
+            this.loading = false
+          })
+        }
+      })
     },
     // 同意
     handleAgree () {
-
+      if (this.loading) return
+      this.approvalInfoForm.validateFields((err, values) => {
+        if (!err) {
+          this.loading = true
+          const param = {}
+          param.common = Object.assign({}, values)
+          param.common.taskId = this.$route.query.taskId
+          enStandardEditAgree(param).then(res => {
+            if (res.success) {
+              this.$message.success(res.message)
+              this.goBack()
+            } else {
+              this.$message.warning(res.message)
+            }
+          }).finally(() => {
+            this.loading = false
+          })
+        }
+      })
     },
     // 驳回
     handleReject () {
-
+      if (this.loading) return
+      this.validatorRules.commitText.rules[0].required = true
+      if (!this.approvalInfoForm.getFieldValue('commitText')) {
+        this.$message.warning(this.$t('pleaseEnterRemarks'))
+      }
+      this.$nextTick(() => {
+        this.approvalInfoForm.validateFields((err, values) => {
+          if (!err) {
+            this.loading = true
+            const param = {}
+            param.common = Object.assign({}, values)
+            param.common.taskId = this.$route.query.taskId
+            enStandardEditReject(param).then(res => {
+              if (res.success) {
+                this.$message.success(res.message)
+                this.goBack()
+              } else {
+                this.$message.warning(res.message)
+              }
+            }).finally(() => {
+              this.loading = false
+              this.validatorRules.commitText.rules[0].required = false
+            })
+          }
+        })
+      })
     }
   }
 }

src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue

@@ -1,4 +1,5 @@
 <template>
+  <a-spin :spinning="loading">
     <a-form-model v-if="isFormInline" :model="formInline" class="form-add" :rules="rules" ref="ruleForm">
       <div class="collapsible-panel-form">
         <div class="form-flex-box collapsible-panel-form-content collapsible-content-no-head">
@@ -11,12 +12,12 @@
                   </span>
             </div>
             <a-form-model-item class="item-model" prop="typeOfRevision">
-            <a-select v-model="formInline.typeOfRevision"
+              <j-dict-select-tag
-                      :disabled="disabled"
+                :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.typeOfRevision')"
-                      :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.typeOfRevision')">
+                dict-code="esp_revision_type"
-              <a-select-option :value="ApplicationCategory.INITIATION.value">{{ $t('workCenter.enterpriseInitChangePlan.standardProjectEstablishment') }}</a-select-option>
+                disabled
-              <a-select-option :value="ApplicationCategory.CHANGE.value">{{ $t('workCenter.enterpriseInitChangePlan.change') }}</a-select-option>
+                v-model="formInline.typeOfRevision">
-            </a-select>
+              </j-dict-select-tag>
             </a-form-model-item>
           </div>
           <!--  是新建流程,新增企标编号字段，从企标计划选择 -->
@@ -33,9 +34,8 @@
                                          :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')"
                                          v-model="formInline.standardPlanId"
                                          :standard-number="formInline.standard_number"
-                                       :disabled="disabled"
+                                         @listChange="listChange"
-                                       @standardNumberChange="standardNumberChange"
+                                         :disabled="disabled"/>
-                                       @listChange="listChange"/>
             </a-form-model-item>
           </div>
           <!--
@@ -166,6 +166,16 @@
                                :tree-data="optionsData[item.dbFieldName]"
                                :label-in-value="false"
                                :placeholder="$t('pleaseSelect')+item.dbFieldTxt" />
+                <!--16、树形弹框选择-->
+                <tree-selection v-else-if="item.fieldShowType === FieldType.TREE_MODAL_SELECT.value"
+                                :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                                v-model="formInline[item.dbFieldName]"
+                                @nameChange="treeSelectNameChange"
+                                :filedName="item.dbFieldName"
+                                type="checkbox"
+                                :nameStr="formInline[item.dbFieldName + '_dictText']"
+                                :dict-id="item.dictId"
+                                :disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />
               </a-form-model-item>
             </div>
           </template>
@@ -173,11 +183,14 @@
       </div>
       <upload-file ref="uploadFile" @change="uploadFileChange" :return-url="false"></upload-file>
     </a-form-model>
+  </a-spin>
 </template>
 
 <script>
-import { getEnterpriseStandardAddForm } from '@/api/enterpriseStandardLibraryApi'
+import {
-import { StandardSource, FieldType, ApplicationCategory } from '@/enums/commonEnums'
+  getEnterpriseStandardAddForm
+} from '@/api/enterpriseStandardLibraryApi'
+import { StandardSource, FieldType, ApplicationCategory, IsTrial } from '@/enums/commonEnums'
 import { getAction } from '@/api/manage'
 import { getFormDictTreeList } from '@/api/api'
 import UserSelection from '@/components/selection/UserSelection'
@@ -185,10 +198,18 @@ import JMultipleDatePicker from '@/components/JMultipleDatePicker'
 import StandardSelection from '@/components/selection/StandardSelection'
 import UploadFile from '@/components/UploadFile'
 import EnterprisePlanSelection from '@/components/selection/EnterprisePlanSelection'
+import TreeSelection from '@/components/selection/TreeSelection'
 
 export default {
   name: 'BaseInfoForm',
-  components: { UserSelection, JMultipleDatePicker, StandardSelection, UploadFile, EnterprisePlanSelection },
+  components: {
+    UserSelection,
+    JMultipleDatePicker,
+    StandardSelection,
+    UploadFile,
+    EnterprisePlanSelection,
+    TreeSelection
+  },
   props: {
     // 流程发起类型，是自动发起（auto）的还是从新建流程发起的(newProcess)
     flowInitType: {
@@ -197,11 +218,32 @@ export default {
       default: ''
     }
   },
+  watch: {
+    // 企标是否试行改变，试行周期必填校验也跟着变
+    'formInline.try_flag' (val) {
+      if (val && this.flag === StandardSource.ENTERPRISE.value) {
+        if (val === IsTrial.YES.value) {
+          // 试行周期给默认值24
+          this.formInline.trial_period = '24'
+          this.formInline = JSON.parse(JSON.stringify(this.formInline))
+          // 试行，试行周期必填
+          this.rules.trial_period[0].required = true
+        } else {
+          // 试行周期置空
+          this.formInline.trial_period = undefined
+          // 不试行，试行周期非必填
+          this.rules.trial_period[0].required = false
+        }
+      }
+    }
+  },
   data () {
     return {
       StandardSource,
       FieldType,
       ApplicationCategory,
+      loading: false,
+      dataList: [],
       isFormInline: false, // 是否展示表单
       disabledFieldList: ['standard_number'], // 不可修改字段
       formInline: {},
@@ -214,6 +256,18 @@ export default {
     this.getForm()
   },
   methods: {
+    // 外层获取数据要过校验,返回false表示没有通过校验
+    async getDataValidate () {
+      let data = {}
+      await this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          data.formInline = this.formInline
+        } else {
+          data = false
+        }
+      })
+      return data
+    },
     // 获取表单列表
     getForm (callBack) {
       this.confirmLoading = true
@@ -227,23 +281,10 @@ export default {
           // 1、去掉三个代号一个年代号
           dataList = dataList.filter(item => !['standard_code', 'name_code', 'category_code', 'year_number', 'standard_state'].includes(item.dbFieldName))
           // 2、加零部件名称和代替标准号
-          dataList.push({
+          const partName = res.result.适用范围.find(item => item.dbFieldName === 'part_name')
-            dbFieldEnName: 'Part name',
+          const substituteStandardNumber = res.result.关联信息.find(item => item.dbFieldName === 'substitute_standard_number')
-            dbFieldName: 'part_name',
+          dataList.push(partName)
-            dbFieldNameOld: 'part_name',
+          dataList.push(substituteStandardNumber)
-            dbFieldTxt: '零部件名称',
-            dictId: '1696821512600637441',
-            fieldMustInput: '1',
-            fieldShowType: '15'
-          })
-          dataList.push({
-            dbFieldEnName: 'Substitute Standard Number',
-            dbFieldName: 'substitute_standard_number',
-            dbFieldNameOld: 'substitute_standard_number',
-            dbFieldTxt: '代替标准号',
-            fieldMustInput: '0',
-            fieldShowType: '6'
-          })
           // 3、企标编号如果是自动发起的就带入(文本框)，从新建流程点入的话就从企标计划选择（选择企标计划组件）
           if (this.flowInitType === 'newProcess') {
             // 是新建流程,删除企标编号字段,在html中设置显示企标计划选择
@@ -273,13 +314,6 @@ export default {
               message: res.dbFieldTxt + this.$t('cannotEmpty'),
               trigger: 'blur'
             })
-          } else if (res.fieldShowType === FieldType.DATE_SINGLE.value) {
-            // 解决第一次校验不消失的问题
-            rule.push({
-              required: true,
-              message: res.dbFieldTxt + this.$t('cannotEmpty'),
-              trigger: ['change', 'blur']
-            })
           } else {
             rule.push({
               required: true,
@@ -287,6 +321,20 @@ export default {
               trigger: 'change'
             })
           }
+        } else {
+          if ([FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value].includes(res.fieldShowType)) {
+            rule.push({
+              required: false,
+              message: res.dbFieldTxt + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            })
+          } else {
+            rule.push({
+              required: false,
+              message: res.dbFieldTxt + this.$t('cannotEmpty'),
+              trigger: 'change'
+            })
+          }
         }
         if (rule.length > 0) {
           rules[res.dbFieldName] = rule
@@ -321,29 +369,22 @@ export default {
       })
     },
     // 4、从企标计划选择企标编号的话，把其他字段也回显
-    standardNumberChange (value) {
-      this.formInline.standard_number = value
-    },
-    // 企标计划选择列表的回调
     listChange (value) {
-      // 企标名称
+      console.log(value)
-      // 标准英文名称
+      // 回显企标编号
-      // 标准等级分类
+      this.formInline.standard_number = value[0].newEnStandardNo
-      // 企标体系
+      // 回显制修订类型
-      // 零部件名称
+      this.formInline.typeOfRevision = value[0].applicationCategory
-      // 授权部门
-      // 代替标准号
-      // 发布日期
-      // 实施日期
-      // 是否试行
-      // 试行周期
-      // 编制说明
     },
     // 点击点击上传按钮
     clickButtonToUpload (item) {
       this.$refs.uploadFile.open(this.formInline[item.dbFieldName])
       this.uploadName = item.dbFieldName
     },
+    // 树弹框选择改变
+    treeSelectNameChange (value, fieldName) {
+      this.formInline[fieldName + '_dictText'] = value
+    },
     // 文件上传改变后的回调
     uploadFileChange (data) {
       const attIdList = []
@@ -355,7 +396,7 @@ export default {
       /** 赋值给当前对应的表单文件 */
       this.formInline[this.uploadName] = attIdList.join(',')
       this.formInline = { ...this.formInline }
-    },
+    }
   }
 }
 </script>

src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue

@@ -111,7 +111,6 @@ export default {
   methods: {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
-      this.data = data
       // 给表格赋值,在线编辑不知道要怎么赋值？
       // this.dataSource =
       // 给表单赋值

src/views/workCenter/enterpriseStandardRevision/modules/ConfirmWhetherCommentBaseInfo.vue

@@ -105,7 +105,6 @@ export default {
   methods: {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
-      this.data = data
       // 给表单赋值,在线编辑不知道要怎么赋值？
       // this.formInline =
       // 给表单赋值
@@ -117,18 +116,20 @@ export default {
     getData () {
       // 把数据抛出，在线编辑不知道要不要抛
       const data = {}
-      data.isCommentsFormInline = this.formInline
+      data.formInline = this.formInline
       return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验
-    getDataValidate () {
+    async getDataValidate () {
-      this.$refs.ruleForm.validate(valid => {
+      let data = {}
+      await this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          const data = {}
+          data.formInline = this.formInline
-          data.isCommentsFormInline = this.formInline
+        } else {
-          return data
+          data = false
         }
       })
+      return data
     },
     // 选择用户得到用户名
     userSelectNameChange (value, fieldName) {

src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue

@@ -149,7 +149,6 @@ export default {
   methods: {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
-      this.data = data
       // 给表格赋值,在线编辑不知道要怎么赋值？
       // this.dataSource =
       // 给表单赋值
@@ -165,15 +164,22 @@ export default {
       return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验
-    getDataValidate () {
+    async getDataValidate () {
+      let data = {} // 需要返回的数据
+      await this.$refs.ruleForm.validate(valid => {
+        if (valid) {
           if (this.dataSource && this.dataSource.length > 0) {
-        const data = {}
             data.dataSource = this.dataSource
-        return data
+            data.formInline = this.formInline
           } else {
             this.$message.warning(this.$t('addAtLeastOneRowOfData'))
-        return false
+            data = false
           }
+        } else {
+          data = false
+        }
+      })
+      return data
     },
     // 征求意见的编辑
     handleEdit (record, index) {

src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue

@@ -19,7 +19,7 @@
               </div>
             </a-form-model-item>
           </div>
-          <!--  征求意见截止日期 -->
+          <!--  征求意见截止日期,限制要比计划的时间早？？ -->
           <div class="box-title-text form-flex-item">
             <div class="title-text title-text-long">
               <span class="required">*</span>
@@ -100,7 +100,6 @@ export default {
   methods: {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
-      this.data = data
       // 给表单赋值,在线编辑不知道要怎么赋值？
       // this.formInline =
       // 给表单赋值
@@ -112,18 +111,20 @@ export default {
     getData () {
       // 把数据抛出，在线编辑不知道要不要抛
       const data = {}
-      data.issueFormInline = this.formInline
+      data.formInline = this.formInline
       return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验
-    getDataValidate () {
+    async getDataValidate () {
-      this.$refs.ruleForm.validate(valid => {
+      let data = {}
+      await this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          const data = {}
+          data.formInline = this.formInline
-          data.issueFormInline = this.formInline
+        } else {
-          return data
+          data = false
         }
       })
+      return data
     },
     // 选择用户得到用户名
     userSelectNameChange (value, fieldName) {

src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonLeaderApproveBaseInfo.vue

@@ -118,7 +118,6 @@ export default {
   methods: {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
-      this.data = data
       // 给表格赋值,在线编辑不知道要怎么赋值？
       // this.dataSource =
       // 给表单赋值

src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue

@@ -170,12 +170,14 @@ export default {
           break
         }
       }
+      let data = {} // 需要返回的数据
       if (hasErr) {
         this.$message.warning(this.$t('workCenter.enStandardRevision.pleaseEnterAllMarkItem'))
-        return false
+        data = false
       } else {
-        return this.dataSource
+        data.dataSource = this.dataSource
       }
+      return data
     },
     // 新增征求意见
     handleAdd () {

src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue

@@ -301,7 +301,6 @@ export default {
   methods: {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
-      this.data = data
       // 给表格赋值,在线编辑不知道要怎么赋值？
       // this.drafterDataSource =
       // this.dataSource =
@@ -316,25 +315,27 @@ export default {
       // 把数据抛出，在线编辑不知道要不要抛
       const data = {}
       data.dataSource = this.dataSource
-      data.uploadMinuteFormInline = this.formInline
+      data.formInline = this.formInline
       return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验
-    getDataValidate () {
+    async getDataValidate () {
-      this.$refs.ruleForm.validate(valid => {
+      let data = {}
+      await this.$refs.ruleForm.validate(valid => {
         if (valid) {
           if (this.dataSource && this.dataSource.length > 0) {
             // 有数据可以抛出
-            const data = {}
             data.dataSource = this.dataSource
-            data.uploadMinuteFormInline = this.formInline
+            data.formInline = this.formInline
-            return data
           } else {
             this.$message.warning(this.$t('addAtLeastOneRowOfData'))
-            return false
+            data = false
           }
+        } else {
+          data = false
         }
       })
+      return data
     },
     // 查看企标文本
     handleLookUploadStandard (record) {

src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterPublishBaseInfo.vue

@@ -99,7 +99,6 @@ export default {
   methods: {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
-      this.data = data
       // 给表单赋值,在线编辑不知道要怎么赋值？
       // this.formInline =
       // 给表单赋值
@@ -111,18 +110,20 @@ export default {
     getData () {
       // 把数据抛出，在线编辑不知道要不要抛
       const data = {}
-      data.publishFormInline = this.formInline
+      data.formInline = this.formInline
       return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验
-    getDataValidate () {
+    async getDataValidate () {
-      this.$refs.ruleForm.validate(valid => {
+      let data = {}
+      await this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          const data = {}
+          data.formInline = this.formInline
-          data.publishFormInline = this.formInline
+        } else {
-          return data
+          data = false
         }
       })
+      return data
     }
   }
 }

src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue

@@ -107,14 +107,12 @@ export default {
       ],
       dataSource: [],
       loading: false,
-      data: {}, // 初始化获取的数据
       modalType: undefined // 当前是新增还是编辑编辑的话是edit+编辑行的下标
     }
   },
   methods: {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
-      this.data = data
       // 给表格赋值,在线编辑不知道要怎么赋值？
       // this.dataSource =
       // 给表单赋值
@@ -132,11 +130,12 @@ export default {
     },
     // 外层获取数据要过校验,返回false表示没有通过校验
     getDataValidate () {
-      if (this.dataSource && this.dataSource.length > 0) {
+      const formData = this.$refs.baseInfoForm.getDataValidate()
+      if (formData && this.dataSource && this.dataSource.length > 0) {
         // 有数据可以抛出
         const data = {}
         data.dataSource = this.dataSource
-        data.formInline = this.$refs.baseInfoForm.formInline
+        data.formInline = formData.formInline
         return data
       } else {
         this.$message.warning(this.$t('addAtLeastOneRowOfData'))

src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterUploadMinuteBaseInfo.vue

@@ -274,14 +274,16 @@ export default {
       return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验
-    getDataValidate () {
+    async getDataValidate () {
-      this.$refs.ruleForm.validate(valid => {
+      let data = {}
+      await this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          const data = {}
+          data.formInline = this.formInline
-          data.uploadMinuteFormInline = this.formInline
+        } else {
-          return data
+          data = false
         }
       })
+      return data
     },
     // 点击文件上传
     clickButtonToUpload (fieldName) {

src/views/workCenter/enterpriseStandardRevision/modules/OtherDrafterProofreadBaseInfo.vue

@@ -27,7 +27,6 @@ export default {
   methods: {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
-      this.data = data
       // 在线编辑不知道要怎么赋值？
       // 给表单赋值
       // this.$nextTick(() => {

src/views/workCenter/enterpriseStandardRevision/modules/OtherDrafterUploadStandardBaseInfo.vue

@@ -96,7 +96,6 @@ export default {
         }
       ],
       loading: false,
-      data: {}, // 初始化获取的数据
       userInfo: {}, // 当前登录人信息
       currentDate: '',
       uploadIndex: undefined // 正在上传企标的下标
@@ -109,7 +108,6 @@ export default {
   methods: {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
-      this.data = data
       // 给表格赋值,在线编辑不知道要怎么赋值？
       // this.dataSource =
       // 给表单赋值
@@ -124,6 +122,7 @@ export default {
     },
     // 外层获取数据要过校验,返回false表示没有通过校验
     getDataValidate () {
+      let data = {}// 需要返回的值
       if (this.dataSource && this.dataSource.length > 0) {
         // 看能上传企标的行是否都上传了
         let hasErr = false
@@ -136,11 +135,14 @@ export default {
         // 根据hasErr看有没有通过校验
         if (hasErr) {
           this.$message.warning(this.$t('workCenter.enStandardRevision.pleaseUploadStandard'))
-          return false
+          data = false
         } else {
-          return this.dataSource
+          data.dataSource = this.dataSource
         }
+      } else {
+        data = false
       }
+      return data
     },
     // 上传企标
     handleUploadStandard (record, index) {

src/views/workCenter/enterpriseStandardRevision/modules/ScorerMarkBaseInfo.vue

@@ -280,7 +280,6 @@ export default {
   methods: {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
-      this.data = data
       // 给表格赋值,在线编辑不知道要怎么赋值？
       // this.dataSource =
       // 给表单赋值
@@ -304,12 +303,14 @@ export default {
           break
         }
       }
+      let data = {} // 需要返回的数据
       if (hasErr) {
         this.$message.warning(this.$t('workCenter.enStandardRevision.pleaseEnterAllMarkItem'))
-        return false
+        data = false
       } else {
-        return this.dataSource
+        data.dataSource = this.dataSource
       }
+      return data
     },
   }
 }

src/views/workCenter/enterpriseStandardRevision/modules/StandardizationAuditBaseInfo.vue

@@ -177,7 +177,6 @@ export default {
   methods: {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
-      this.data = data
       // 给表格赋值,在线编辑不知道要怎么赋值？
       // this.formInline =
       // 给表单赋值
@@ -189,18 +188,20 @@ export default {
     getData () {
       // 把数据抛出，在线编辑不知道要不要抛
       const data = {}
-      data.standardAuditFormInline = this.formInline
+      data.formInline = this.formInline
       return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验
     getDataValidate () {
+      let data = {} // 要返回的数据
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          const data = {}
+          data.formInline = this.formInline
-          data.standardAuditFormInline = this.formInline
+        } else {
-          return data
+          data = false
         }
       })
+      return data
     },
     // 是否可进行评审会
     isCanAuditMeetingChange () {

src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue

@@ -163,6 +163,7 @@ export default {
     }
     // 获取人员信息结构
     this.getPersonInfoStructure(ProcessKey.ES_ARCHIVE.value, () => {
+      if (this.$route.query.processInstanceId) {
         if (this.currentNode === 1) {
           this.disabled = false
           this.initPersonInfoData(true)
@@ -171,6 +172,7 @@ export default {
           // 如果不是第一个节点，人员信息全部不可选
           this.initPersonInfoData(false)
         }
+      }
     })
     if (this.$route.query.taskId) {
       this.currentNodeName = this.$route.query.taskName

src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue

@@ -163,6 +163,7 @@ export default {
     }
     // 获取人员信息结构
     this.getPersonInfoStructure(ProcessKey.ES_ENABLE.value, () => {
+      if (this.$route.query.processInstanceId) {
         if (this.currentNode === 1) {
           this.disabled = false
           this.initPersonInfoData(true)
@@ -171,6 +172,7 @@ export default {
           // 如果不是第一个节点，人员信息全部不可选
           this.initPersonInfoData(false)
         }
+      }
     })
     if (this.$route.query.taskId) {
       this.currentNodeName = this.$route.query.taskName