[update] 联调企标立项、变更计划

src/api/enterpriseStandardLibraryApi.js

@@ -54,7 +54,7 @@ const initReview = (params) => getAction('', params)
 // 企标计划-根据id获取计划详情
 const getEnterpriseStandardPlanInfoById = (params) => getAction('/enterprise/plan/detail', params)
 // 企标计划-分页获取(选择企标计划组件中用)
-const getEnterpriseStandardPlanPage = (params) => getAction('/enterprise/plan/page', params)
+const getEnterpriseStandardPlanPage = (params) => getAction('/process/es/initChange/getESPList', params)
 
 export {
   getEnterpriseStandardTableHeader,

src/api/workCenter.js

@@ -24,6 +24,8 @@ const enterprisePlanApproval = (params) => postAction('/process/es/initChange/st
 const enterprisePlanApprovalSave = (params) => postAction('/process/es/initChange/save', params)
 // 根据三个编号和年代号获取企标编号
 const getEnStandardNo = (params) => postAction('/process/es/initChange/getStandardNo', params)
+// 根据流程id获取流程信息
+const getProcessDataById = (params) => getAction('/process/center/handle', params)
 
 // 流程中心
 // 待办-转办
@@ -43,6 +45,7 @@ export {
   enterprisePlanApproval,
   enterprisePlanApprovalSave,
   getEnStandardNo,
+  getProcessDataById,
 
   toDoTurnTo,
   compulsoryWithdrawal

src/common/lang/en-us.js

@@ -155,6 +155,7 @@ module.exports = {
   projectStatement: 'Project Statement',
   pleaseFillInAtLeastOneItem: 'Please Fill In At Least One Item',
   addAtLeastOneRowOfData: 'Please Add At Least One Row Of Data',
+  mergeStandardInformation: '合并标准信息',
   // 树右键
   treeRight: {
     addFolder: 'Create New Folder',

src/common/lang/workCenter/en.js

@@ -76,7 +76,13 @@ module.exports = {
     originalPlanSubmissionDate: '原计划报批日期',
     changeReason: '变更原因',
     superintendent: '所长',
-    relatedPersonnel: '相关人员'
+    relatedPersonnel: '相关人员',
+    originPrincipalDrafter: '原主起草人',
+    originMainDraftUnit: '原主起草单位',
+    originHeadOfMainDraftingUnit: '原起草单位负责人',
+    typeOfRevision: '制修订类型',
+    scopeOfApplication: '标准适用范围',
+    pleaseSelectTwoSameProjectTypePlan: '请选择两个制修订类型一样的企标计划'
   },
   // 年度制修订计划（各部门主动上报）
   revisionPlanActivelyReport: {

src/common/lang/workCenter/zh.js

@@ -81,7 +81,8 @@ module.exports = {
     originMainDraftUnit: '原主起草单位',
     originHeadOfMainDraftingUnit: '原起草单位负责人',
     typeOfRevision: '制修订类型',
-    scopeOfApplication: '标准适用范围'
+    scopeOfApplication: '标准适用范围',
+    pleaseSelectTwoSameProjectTypePlan: '请选择两个制修订类型一样的企标计划'
   },
   // 年度制修订计划（各部门主动上报）
   revisionPlanActivelyReport: {

src/common/lang/zh-cn.js

@@ -158,6 +158,7 @@ module.exports = {
   projectStatement: '立项说明',
   pleaseFillInAtLeastOneItem: '请至少填写一项',
   addAtLeastOneRowOfData: '请至少添加一行数据',
+  mergeStandardInformation: '合并标准信息',
   // 树右键
   treeRight: {
     addFolder: '新增文件夹',

src/components/PersonnelInfo.vue

@@ -29,9 +29,9 @@
               <div class="personnel-container-content-text">
                 <template v-if="step.canChoose && index >= currentNodeIndex">
                   <!--                  TODO 数据库设计确定后处理数据抛出格式-->
-                  <user-select-by-work-group v-show="step.chooseSource === 'workGroup'" v-model="step.user" :type="step.chooseType" input-type="textarea"/>
+                  <user-select-by-work-group v-if="step.chooseSource === 'workGroup'" v-model="step.user" :type="step.chooseType" input-type="textarea"/>
-                  <user-select-by-contact v-show="step.chooseSource === 'contactManage'" v-model="step.user" :type="step.chooseType" input-type="textarea"/>
+                  <user-select-by-contact v-else-if="step.chooseSource === 'contactManage'" v-model="step.user" :type="step.chooseType" input-type="textarea"/>
-                  <user-selection v-show="!['contactManage', 'workGroup'].includes(step.chooseSource)" :type="step.chooseType" v-model="step.user" input-type="textarea" />
+                  <user-selection v-else-if="!['contactManage', 'workGroup'].includes(step.chooseSource)" :type="step.chooseType" v-model="step.user" input-type="textarea" />
                 </template>
                 <div class="personnel-container-content-echo-text" v-else>{{ step.userList }}</div>
               </div>

src/components/selection/EnterprisePlanSelectionModal.vue

@@ -57,8 +57,8 @@
               <a-form-item :label="$t('enterpriseStandardLibrary.plan.revisionType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-dict-select-tag
                   :placeholder="$t('pleaseEnter')+$t('enterpriseStandardLibrary.plan.revisionType')"
-                  dict-code="esp_application_category"
+                  dict-code="esp_revision_type"
-                  v-model="queryParam.applicationCategory">
+                  v-model="queryParam.revisionType">
                 </j-dict-select-tag>
               </a-form-item>
             </a-col>
@@ -106,7 +106,7 @@ export default {
       required: false,
       default: 'checkbox'
     },
-    searchParam: {
+    searchParam: { // 根据不同模块传入固定的查询参数
       type: Object,
       required: false,
       default () {

src/components/selection/UserSelectByContact.vue

@@ -17,7 +17,7 @@
         {{ $t('userSelect.select') }}
       </a-button>
     </div>
-    <user-select-by-contact-modal v-bind="$attrs" :nameStr="nameStr" ref="selectModal" @change="selectChange" @nameChange="nameChange"></user-select-by-contact-modal>
+    <user-select-by-contact-modal v-bind="$attrs" :nameStr="nameStr" ref="selectModal" @change="selectChange" @listChange="listChange" @nameChange="nameChange"></user-select-by-contact-modal>
   </div>
 </template>
 
@@ -78,6 +78,9 @@ export default {
     selectChange (ids) {
       this.$emit('change', ids)
     },
+    listChange (value) {
+      this.$emit('listChange', value)
+    },
     nameChange (value) {
       this.checkedValue = value
       this.$emit('nameChange', value, this.filedName)

src/components/selection/UserSelectByContactModal.vue

@@ -12,7 +12,7 @@
         <a-row :gutter="24">
           <a-col :span="6">
             <a-form-item :label="$t('system.contact.departName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('system.contact.departName')" v-model="queryParam.departName"></a-input>
+              <j-input :placeholder="$t('pleaseEnter')+$t('system.contact.departName')" v-model="queryParam.departName"></j-input>
             </a-form-item>
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -25,7 +25,7 @@
     <div class="modal-content">
       <a-table
         :columns="columns"
-        rowKey="id"
+        rowKey="contactId"
         bordered
         :scroll="{x: '100%'}"
         :data-source="dataSource"
@@ -96,28 +96,28 @@ export default {
           title: this.$t('system.contact.departName'),
           align: 'center',
           width: 180,
-          dataIndex: 'departName',
+          dataIndex: 'departId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 标准化工程师
           title: this.$t('system.contact.standardizationEngineer'),
           align: 'center',
           width: 180,
-          dataIndex: 'standardizationEngineer',
+          dataIndex: 'engineerId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 联络人
           title: this.$t('system.contact.contactPerson'),
           align: 'center',
           width: 180,
-          dataIndex: 'contactPerson',
+          dataIndex: 'contactId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 部门联络人主管级领导
           title: this.$t('system.contact.contactPersonSupervisorLevelLeader'),
           align: 'center',
           width: 240,
-          dataIndex: 'contactPersonSupervisorLevelLeader',
+          dataIndex: 'leaderId_dictText',
           scopedSlots: { customRender: 'text' }
         }
       ],
@@ -137,7 +137,7 @@ export default {
       loadingLeft: false,
       dataSourceRight: [],
       url: {
-        userList: '',
+        userList: '/laws/system/lawsContactManage/page',
         userListByIds: '/sys/user/queryByIds'
       }
     }
@@ -244,6 +244,7 @@ export default {
     },
     handleOk () {
       this.$emit('change', this.selectedRowKeys.join(','))
+      this.$emit('listChange', this.dataSourceRight)
       this.$emit('nameChange', this.dataSourceRight.map(item => item.realname + '(' + item.username + ')').join(','))
       this.close()
     },

src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue

@@ -65,12 +65,18 @@
                 </span>
               </div>
               <a-form-model-item class="item-model" prop="applicationCategory">
-                <a-select v-model="formInline.applicationCategory"
+                <j-dict-select-tag v-model="formInline.applicationCategory"
                                    :disabled="disabled"
-                          :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.applicationType')">
+                                   :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.applicationType')"
-                  <a-select-option :value="ApplicationCategory.INITIATION.value">{{ $t('workCenter.enterpriseInitChangePlan.standardProjectEstablishment') }}</a-select-option>
+                                   :type="'select'"
-                  <a-select-option :value="ApplicationCategory.CHANGE.value">{{ $t('workCenter.enterpriseInitChangePlan.change') }}</a-select-option>
+                                   :triggerChange="false"
-                </a-select>
+                                   dictCode="esp_application_category" />
+                <!--<a-select v-model="formInline.applicationCategory"-->
+                <!--          :disabled="disabled"-->
+                <!--          :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.applicationType')">-->
+                <!--  <a-select-option :value="ApplicationCategory.INITIATION.value">{{ $t('workCenter.enterpriseInitChangePlan.standardProjectEstablishment') }}</a-select-option>-->
+                <!--  <a-select-option :value="ApplicationCategory.CHANGE.value">{{ $t('workCenter.enterpriseInitChangePlan.change') }}</a-select-option>-->
+                <!--</a-select>-->
               </a-form-model-item>
             </div>
             <!--  项目类别  -->
@@ -85,6 +91,7 @@
                 <a-select v-if="formInline.applicationCategory === ApplicationCategory.INITIATION.value"
                           v-model="formInline.projectType"
                           :disabled="disabled"
+                          @change="projectTypeChange"
                           :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.itemCategory')">
                   <a-select-option :value="ProjectType.ENACT.value">{{ $t('workCenter.enterpriseInitChangePlan.formulate') }}</a-select-option>
                   <a-select-option :value="ProjectType.MODIFY.value">{{ $t('workCenter.enterpriseInitChangePlan.revise') }}</a-select-option>
@@ -105,7 +112,7 @@
       </a-form-model>
       <!--  申请类型为立项时的业务基本信息部分组件  -->
       <approval-base-info
-        v-show="formInline.applicationCategory === ApplicationCategory.INITIATION.value"
+        v-if="formInline.applicationCategory === ApplicationCategory.INITIATION.value"
         ref="approvalBaseInfo"
         :disabled="disabled"
         :currentNode="currentNode"
@@ -113,10 +120,11 @@
       </approval-base-info>
       <!--  申请类型为变更,项目类型为完成时间变更时的业务基本信息部分组件  -->
       <finish-time-change-base-info
-        v-if="formInline.applicationCategory === ApplicationCategory.CHANGE.value && formInline.projectType === ProjectType.COMPLETE_TIME_CHANGE.value"
+        v-else-if="formInline.applicationCategory === ApplicationCategory.CHANGE.value && formInline.projectType === ProjectType.COMPLETE_TIME_CHANGE.value"
         ref="changeBaseInfo"
         :disabled="disabled"
         :currentNode="currentNode"
+        :projectType="formInline.projectType"
       >
       </finish-time-change-base-info>
       <!--  申请类型为变更，项目类型为工作终止时的业务基本信息部分组件  -->
@@ -125,6 +133,7 @@
         ref="changeBaseInfo"
         :disabled="disabled"
         :currentNode="currentNode"
+        :projectType="formInline.projectType"
       >
       </job-end-base-info>
       <!--  申请类型为变更，项目类型为责任部门变更的业务基本信息部分组件  -->
@@ -132,6 +141,7 @@
         v-else-if="formInline.applicationCategory === ApplicationCategory.CHANGE.value && formInline.projectType === ProjectType.RESPONSIBLE_DEPT_CHANGE.value"
         ref="changeBaseInfo"
         :disabled="disabled"
+        :projectType="formInline.projectType"
       >
       </duty-depart-change-base-info>
       <!--  申请类型为变更，项目类型为合并的业务基本信息部分组件  -->
@@ -139,6 +149,7 @@
         v-else-if="formInline.applicationCategory === ApplicationCategory.CHANGE.value && formInline.projectType === ProjectType.MERGE.value"
         ref="changeBaseInfo"
         :disabled="disabled"
+        :projectType="formInline.projectType"
       >
       </merge-base-info>
 
@@ -238,7 +249,8 @@ import {
   enterprisePlanApprovalReject,
   enterprisePlanApprovalDetermine,
   enterprisePlanApprovalSave,
-  enterprisePlanApproval
+  enterprisePlanApproval,
+  getProcessDataById
 } from '@/api/workCenter'
 import ApprovalBaseInfo from './modules/ApprovalBaseInfo'
 import FinishTimeChangeBaseInfo from './modules/FinishTimeChangeBaseInfo'
@@ -263,7 +275,7 @@ const approvalPersonalInfo = [ // 人员信息的数据
     canChoose: true,
     chooseType: 'radio',
     // todo: 还没有联络人管理模块，暂时用选用户
-    // chooseSource: 'contactManage',
+    chooseSource: 'contactManage',
     fieldName: 'contactUser'
   },
   {
@@ -314,60 +326,65 @@ const changePersonalInfo = [
     nodeRoleName: '部所联络人',
     canChoose: true,
     chooseType: 'radio',
-    chooseSource: 'contactManage'
+    // todo: 还没有联络人管理模块，暂时用选用户
+    chooseSource: 'contactManage',
+    fieldName: 'contactUser'
   },
   {
     id: 3,
     nodeName: '主起草人主管级领导审批',
     nodeRoleName: '主起草人主管级领导',
     canChoose: true,
-    chooseType: 'radio'
+    chooseType: 'radio',
+    fieldName: 'mainDraftUserLeader'
   },
   {
     id: 4,
     nodeName: '主起草人主管级上一级领导审批',
     nodeRoleName: '主起草人主管级上一级领导',
     canChoose: true,
-    chooseType: 'radio'
+    chooseType: 'radio',
+    fieldName: 'mainDraftUserLeaderLeader'
   },
   {
     id: 5,
     nodeName: '标准化审批',
     nodeRoleName: '标准化',
     canChoose: true,
-    chooseType: 'radio'
+    chooseType: 'radio',
+    fieldName: 'standardizationApprovalUser'
   },
   {
     id: 6,
     nodeName: '新起草部门主管级上一级领导下发',
     nodeRoleName: '新起草部门主管级上一级领导',
-    canChoose: true,
+    canChoose: false,
     chooseType: 'radio',
-    disabled: true
+    fieldName: 'newMainDraftUserLeaderLeader'
   },
   {
     id: 7,
     nodeName: '新起草部门主管级领导确认',
     nodeRoleName: '新起草部门主管级领导',
-    canChoose: true,
+    canChoose: false,
     chooseType: 'radio',
-    disabled: true
+    fieldName: 'newMainDraftUserLeader'
   },
   {
     id: 8,
     nodeName: '相关人员会签',
     nodeRoleName: '相关人员',
-    canChoose: true,
+    canChoose: false,
     chooseType: 'checkbox',
-    disabled: true
+    fieldName: 'relatedUser'
   },
   {
     id: 9,
     nodeName: '抄送主起草人',
     nodeRoleName: '主起草人',
-    canChoose: true,
+    canChoose: false,
     chooseType: 'checkbox',
-    disabled: true
+    fieldName: 'copyUser'
   }
 ]
 
@@ -417,6 +434,10 @@ export default {
     }
   },
   mounted () {
+    if (this.$route.query.processId) {
+      // 有流程id说明是从流程中心来的，需要初始化数据
+      this.getProcessData(this.$route.query.processId)
+    }
     if (this.currentNode === 1) {
       this.personnelInfoData = approvalPersonalInfo
     } else {
@@ -424,7 +445,7 @@ export default {
         return { ...item, canChoose: false }
       })
     }
-    // 如果是查看进入的，不可编辑
+    // 如果是查看进入的，不可编辑，不可操作
     if (this.$route.query.onlyLook) {
       this.onlyLook = this.$route.query.onlyLook
       this.disabled = this.$route.query.onlyLook
@@ -514,6 +535,16 @@ export default {
     }
   },
   methods: {
+    // 根据流程id获取数据
+    getProcessData (processId) {
+      getProcessDataById({ processInstanceId: processId }).then(res => {
+        if (res.success) {
+          console.log(res.result)
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
     // 头部tab改变
     switchChange (value) {
       this.switchValue = value
@@ -550,22 +581,70 @@ export default {
         const flag = Object.values(param).some(v => !!v || v === 0)
         if (!flag) {
           // 提示至少填写一项
-          this.$message.error(this.$t('pleaseFillInAtLeastOneItem'))
+          this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
           return
         }
         arr.push(param)
       } else if (this.formInline.projectType === ProjectType.COMPLETE_TIME_CHANGE.value) {
         // 业务基本信息-变更-完成时间变更
         const param = { ...processInfoForm, ...ruleForm, ...approvalInfoForm }
+        const flag = Object.values(param).some(v => !!v || v === 0)
+        if (!flag && this.$refs.changeBaseInfo.dataSource.length <= 0) {
+          // 提示至少填写一项
+          this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
+          return
+        }
         arr = this.$refs.changeBaseInfo.dataSource.map(item => { return { ...item, ...param } })
       } else if (this.formInline.projectType === ProjectType.WORK_TERMINATE.value) {
         // 业务基本信息-变更-工作终止
         const param = { ...processInfoForm, ...ruleForm, ...approvalInfoForm }
+        const flag = Object.values(param).some(v => !!v || v === 0)
+        if (!flag && this.$refs.changeBaseInfo.dataSource.length <= 0) {
+          // 提示至少填写一项
+          this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
+          return
+        }
         arr = this.$refs.changeBaseInfo.dataSource.map(item => { return { ...item, ...param } })
+      } else if (this.formInline.projectType === ProjectType.RESPONSIBLE_DEPT_CHANGE.value) {
+        // 业务基本信息-变更-责任部门变更
+        let dutyDepartChangeForm = {}
+        if (this.$refs.changeBaseInfo) {
+          dutyDepartChangeForm = this.$refs.changeBaseInfo.formInline
+        }
+        const param = { ...processInfoForm, ...ruleForm, ...dutyDepartChangeForm, ...approvalInfoForm }
+        const flag = Object.values(param).some(v => !!v || v === 0)
+        if (!flag) {
+          // 提示至少填写一项
+          this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
+          return
+        }
+        arr.push(param)
+      } else if (this.formInline.projectType === ProjectType.MERGE.value) {
+        // 业务基本信息-变更-合并
+        let mergeForm = {}
+        if (this.$refs.changeBaseInfo) {
+          mergeForm = this.$refs.changeBaseInfo.formInline
+        }
+        const param = { ...processInfoForm, ...ruleForm, ...mergeForm, ...approvalInfoForm }
+        const flag = Object.values(param).some(v => !!v || v === 0)
+        if (!flag) {
+          // 提示至少填写一项
+          this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
+          return
+        }
+        arr.push(param)
+      } else {
+        // 还没有选择申请类型和项目类别，需要外层信息至少填了一项
+        const param = { ...processInfoForm, ...ruleForm, ...approvalBaseInfo, ...approvalInfoForm }
+        const flag = Object.values(param).some(v => !!v || v === 0)
+        if (!flag) {
+          // 提示至少填写一项
+          this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
+          return
+        }
       }
       // 是节点一的保存，保存到草稿
       if (this.currentNode === 1) {
-        console.log(arr)
         enterprisePlanApprovalSave(arr).then(res => {
           if (res.success) {
             this.$message.success(res.message)
@@ -581,7 +660,8 @@ export default {
       this.processInfoForm.validateFields((err, values) => {
         this.$refs.ruleForm.validate(valid => {
           this.approvalInfoForm.validateFields((approvalErr, approvalValues) => {
-            let arr = []
+            let arr = [] // 需要传给后端的数据
+            let haveErr = false // 是否有错误，有错，则不能提交,false没有错
             // 立项和变更的数据不一样，分开判断
             if (this.formInline.applicationCategory === ApplicationCategory.INITIATION.value) {
               // 是立项
@@ -600,28 +680,87 @@ export default {
                   // 企标体系处理成逗号分隔
                   param.enStandardSystem = param.enStandardSystem.map(item => item.value).join(',')
                   arr.push(param)
+                } else {
+                  haveErr = true
                 }
               })
             } else if (this.formInline.projectType === ProjectType.COMPLETE_TIME_CHANGE.value ||
               this.formInline.projectType === ProjectType.WORK_TERMINATE.value) {
               // 是变更-完成时间 或者 变更-工作终止变更
-              if (valid && !err && !approvalErr && this.$refs.changeBaseInfo && this.$refs.changeBaseInfo.dataSource.length >= 0) {
+              if (valid && !err && !approvalErr && this.$refs.changeBaseInfo && this.$refs.changeBaseInfo.dataSource.length > 0) {
                 this.loading = true
-                const param = { ...values, ...this.formInline, ...approvalValues }
+                // 人员信息的数据, 处理成对象
+                const personnelInfo = this.$refs.personnelInfo.stepsData
+                const personnelObj = {}
+                for (const item of personnelInfo) {
+                  if (item.fieldName) {
+                    personnelObj[item.fieldName] = item.user
+                  }
+                }
+                const param = { ...values, ...this.formInline, ...approvalValues, ...personnelObj }
                 arr = this.$refs.changeBaseInfo.dataSource.map(item => { return { ...item, ...param } })
               } else {
+                haveErr = true
+                if (this.$refs.changeBaseInfo.dataSource.length <= 0) {
                   this.$message.warning(this.$t('addAtLeastOneRowOfData'))
-                return
                 }
-            } else {
+              }
-              // 校验特定节点需要填写人的必填
+            } else if (this.formInline.projectType === ProjectType.RESPONSIBLE_DEPT_CHANGE.value) {
-              this.userForm.validateFields((userErr, userValues) => {
+              // 是变更-责任部门变更
-                if (valid && !err && !approvalErr && !userErr) {
+              this.$refs.changeBaseInfo.$refs.ruleForm.validate(changeBaseValid => {
+                if (valid && changeBaseValid && !err && !approvalErr) {
                   this.loading = true
-                  const param = this.$refs.changeBaseInfo.dataSource
+                  // 人员信息的数据, 处理成对象
-                  console.log(param)
+                  const personnelInfo = this.$refs.personnelInfo.stepsData
+                  const personnelObj = {}
+                  for (const item of personnelInfo) {
+                    if (item.fieldName) {
+                      personnelObj[item.fieldName] = item.user
+                    }
+                  }
+                  const param = Object.assign({}, values, this.formInline, approvalValues, this.$refs.changeBaseInfo.formInline, personnelObj)
+                  arr.push(param)
+                } else {
+                  haveErr = true
                 }
               })
+            } else if (this.formInline.projectType === ProjectType.MERGE.value) {
+              // 是变更-合并
+              this.$refs.changeBaseInfo.$refs.ruleForm.validate(changeBaseValid => {
+                if (valid && changeBaseValid && !err && !approvalErr) {
+                  const changeBaseInfo = this.$refs.changeBaseInfo.formInline
+                  if (changeBaseInfo.projectTypeOne !== changeBaseInfo.projectTypeTwo) {
+                    // 合并时候的两个计划需要限定修订+修订，或者制定+制定
+                    this.$message.warning(this.$t('workCenter.enterpriseInitChangePlan.pleaseSelectTwoSameProjectTypePlan'))
+                    return
+                  }
+                  this.loading = true
+                  // 人员信息的数据, 处理成对象
+                  const personnelInfo = this.$refs.personnelInfo.stepsData
+                  const personnelObj = {}
+                  for (const item of personnelInfo) {
+                    if (item.fieldName) {
+                      personnelObj[item.fieldName] = item.user
+                    }
+                  }
+                  const param = Object.assign({}, values, this.formInline, approvalValues, this.$refs.changeBaseInfo.formInline, personnelObj)
+                  arr.push(param)
+                } else {
+                  haveErr = true
+                }
+              })
+            } else {
+              // 校验特定节点需要填写人的必填
+              // this.userForm.validateFields((userErr, userValues) => {
+              //   if (valid && !err && !approvalErr && !userErr) {
+              //     this.loading = true
+              //     const param = this.$refs.changeBaseInfo.dataSource
+              //     console.log(param)
+              //   }
+              // })
+            }
+            if (haveErr) {
+              return
             }
             enterprisePlanApproval(arr).then(res => {
               if (res.success) {

src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue

@@ -626,14 +626,9 @@ export default {
       default: false
     }
   },
-  // computed: {
-  //   yearNumberDefaultValue () {
-  //     return new Date().getFullYear() + ''
-  //   }
-  // },
   watch: {
     projectType () {
-      console.log('projectType改变了————————————————————————---')
+      this.$refs.ruleForm.resetFields()
       this.formInline.decadeCode = new Date().getFullYear() + ''
     },
     // 企业标准代号
@@ -874,10 +869,13 @@ export default {
           }
         })
       } else {
+        // 是修订，通过选中的企标编号和年代号拼接新企标编号
+        if (this.formInline.originEnStandardNo && this.formInline.decadeCode) {
           const standardNo = this.formInline.originEnStandardNo.split('-')[0] + '-' + this.formInline.decadeCode
           this.$set(this.formInline, 'newEnStandardNo', standardNo)
           this.$forceUpdate()
         }
+      }
     },
     // 获取零部件名称下拉框数据
     initPartNameOptions () {

src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue

@@ -11,12 +11,13 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}
                 </span>
           </div>
-          <a-form-model-item class="item-model" prop="enterpriseStandardPlanId">
+          <a-form-model-item class="item-model" prop="espId">
             <enterprise-plan-selection type="radio"
                                        :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')"
-                                       v-model="formInline.enterpriseStandardPlanId"
+                                       v-model="formInline.espId"
-                                       :standard-number="formInline.standardNo"
+                                       :standard-number="formInline.originEnStandardNo"
                                        @standardNumberChange="standardNumberChange"
+                                       :searchParam="{ projectType: projectType }"
                                        @listChange="listChange"/>
           </a-form-model-item>
         </div>
@@ -28,10 +29,10 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardName') }}
                 </span>
           </div>
-          <a-form-model-item class="item-model" prop="standardName">
+          <a-form-model-item class="item-model" prop="originEnStandardName">
             <a-input class="box-input"
                      disabled
-                     v-model="formInline.standardName"
+                     v-model="formInline.originEnStandardName"
                      :maxLength="50"
                      :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')" />
           </a-form-model-item>
@@ -39,31 +40,29 @@
         <!--  原主起草人  -->
         <div class="box-title-text form-flex-item">
           <div class="title-text">
-            <span class="required">*</span>
             <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.originPrincipalDrafter')">
                   {{ $t('workCenter.enterpriseInitChangePlan.originPrincipalDrafter') }}
                 </span>
           </div>
-          <a-form-model-item class="item-model" prop="principalDrafter">
+          <a-form-model-item class="item-model" prop="mainDraftingUser">
             <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.originPrincipalDrafter')"
-                            v-model="formInline.principalDrafter"
+                            v-model="formInline.mainDraftingUser"
                             disabled
-                            filedName="originPrincipalDrafter"
+                            filedName="mainDraftingUser"
                             @nameChange="userSelectNameChange"
-                            :nameStr="formInline.originPrincipalDrafter_dictText"
+                            :nameStr="formInline.mainDraftingUser_dictText"
                             type="radio" />
           </a-form-model-item>
         </div>
         <!--  原主起草单位  -->
         <div class="box-title-text form-flex-item">
           <div class="title-text">
-            <span class="required">*</span>
             <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.originMainDraftUnit')">
                   {{ $t('workCenter.enterpriseInitChangePlan.originMainDraftUnit') }}
                 </span>
           </div>
-          <a-form-model-item class="item-model" prop="originMainDraftUnit">
+          <a-form-model-item class="item-model" prop="mainDraftingUnit">
-            <j-select-depart v-model="formInline.originMainDraftUnit"
+            <j-select-depart v-model="formInline.mainDraftingUnit"
                              disabled
                              :backDepart="true" />
           </a-form-model-item>
@@ -71,49 +70,46 @@
         <!--  原起草单位负责人  -->
         <div class="box-title-text form-flex-item">
           <div class="title-text">
-            <span class="required">*</span>
             <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.originHeadOfMainDraftingUnit')">
                   {{ $t('workCenter.enterpriseInitChangePlan.originHeadOfMainDraftingUnit') }}
                 </span>
           </div>
-          <a-form-model-item class="item-model" prop="originHeadOfMainDraftingUnit">
+          <a-form-model-item class="item-model" prop="mainDraftingUnitResponsiblePerson">
             <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.originHeadOfMainDraftingUnit')"
-                            v-model="formInline.originHeadOfMainDraftingUnit"
+                            v-model="formInline.mainDraftingUnitResponsiblePerson"
                             disabled
-                            filedName="originHeadOfMainDraftingUnit"
+                            filedName="mainDraftingUnitResponsiblePerson"
                             @nameChange="userSelectNameChange"
-                            :nameStr="formInline.originHeadOfMainDraftingUnit_dictText"
+                            :nameStr="formInline.mainDraftingUnitResponsiblePerson_dictText"
                             type="radio" />
           </a-form-model-item>
         </div>
         <!--  主起草人  -->
         <div class="box-title-text form-flex-item">
           <div class="title-text">
-            <span class="required">*</span>
             <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.principalDrafter')">
                   {{ $t('workCenter.enterpriseInitChangePlan.principalDrafter') }}
                 </span>
           </div>
-          <a-form-model-item class="item-model" prop="principalDrafter">
+          <a-form-model-item class="item-model" prop="newMainDraftingUser">
             <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.principalDrafter')"
-                            v-model="formInline.principalDrafter"
+                            v-model="formInline.newMainDraftingUser"
                             :disabled="disabled"
-                            filedName="principalDrafter"
+                            filedName="newMainDraftingUser"
                             @nameChange="userSelectNameChange"
-                            :nameStr="formInline.principalDrafter_dictText"
+                            :nameStr="formInline.newMainDraftingUser_dictText"
                             type="radio" />
           </a-form-model-item>
         </div>
         <!--  主起草单位  -->
         <div class="box-title-text form-flex-item">
           <div class="title-text">
-            <span class="required">*</span>
             <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.mainDraftUnit')">
                   {{ $t('workCenter.enterpriseInitChangePlan.mainDraftUnit') }}
                 </span>
           </div>
-          <a-form-model-item class="item-model" prop="mainDraftUnit">
+          <a-form-model-item class="item-model" prop="newMainDraftingUnit">
-            <j-select-depart v-model="formInline.mainDraftUnit"
+            <j-select-depart v-model="formInline.newMainDraftingUnit"
                              :disabled="disabled"
                              :backDepart="true" />
           </a-form-model-item>
@@ -121,18 +117,17 @@
         <!--  起草单位负责人  -->
         <div class="box-title-text form-flex-item">
           <div class="title-text">
-            <span class="required">*</span>
             <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.headOfMainDraftingUnit')">
                   {{ $t('workCenter.enterpriseInitChangePlan.headOfMainDraftingUnit') }}
                 </span>
           </div>
-          <a-form-model-item class="item-model" prop="headOfMainDraftingUnit">
+          <a-form-model-item class="item-model" prop="newMainDraftingUnitResponsiblePerson">
             <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.headOfMainDraftingUnit')"
-                            v-model="formInline.headOfMainDraftingUnit"
+                            v-model="formInline.newMainDraftingUnitResponsiblePerson"
                             :disabled="disabled"
-                            filedName="headOfMainDraftingUnit"
+                            filedName="newMainDraftingUnitResponsiblePerson"
                             @nameChange="userSelectNameChange"
-                            :nameStr="formInline.headOfMainDraftingUnit_dictText"
+                            :nameStr="formInline.newMainDraftingUnitResponsiblePerson_dictText"
                             type="radio" />
           </a-form-model-item>
         </div>
@@ -167,44 +162,25 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    projectType: {
+      type: [Number, String],
+      required: false,
+      default: 1
     }
   },
   data () {
     return {
       formInline: {},
       rules: {
-        // 企标编号
+        // 企标计划id
-        enterpriseStandardPlanId: [
+        espId: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + this.$t('cannotEmpty'),
             trigger: 'change'
           }
         ],
-        // 草稿计划完成日期
-        draftPlanFinishDate: [
-          {
-            required: true,
-            message: this.$t('workCenter.enterpriseInitChangePlan.draftPlanFinishDate') + this.$t('cannotEmpty'),
-            trigger: ['change', 'blur']
-          }
-        ],
-        // 征求意见稿计划完成日期
-        exposureDraftPlanFinishDate: [
-          {
-            required: true,
-            message: this.$t('workCenter.enterpriseInitChangePlan.exposureDraftPlanFinishDate') + this.$t('cannotEmpty'),
-            trigger: ['change', 'blur']
-          }
-        ],
-        // 计划报批日期
-        planSubmissionDate: [
-          {
-            required: true,
-            message: this.$t('workCenter.enterpriseInitChangePlan.planSubmissionDate') + this.$t('cannotEmpty'),
-            trigger: ['change', 'blur']
-          }
-        ],
         // 变更原因
         changeReason: [
           {
@@ -219,17 +195,17 @@ export default {
   methods: {
     // 企标计划选择完成的企标编号回调
     standardNumberChange (value) {
-      this.formInline.standardNo = value
+      this.formInline.originEnStandardNo = value
     },
     // 企标选编号选择完成的回调
     listChange (value) {
       console.log(value)
       if (value && value.length > 0) {
-        this.formInline.standardName = value[0].originEnStandardName
+        this.formInline.originEnStandardName = value[0].originEnStandardName
-        this.formInline.principalDrafter_dictText = value[0].mainDraftingUser
+        this.formInline.mainDraftingUser_dictText = value[0].mainDraftingUser
-        this.formInline.mainDraftUnit = value[0].mainDraftingUnit
+        this.formInline.mainDraftingUnit = value[0].mainDraftingUnit
-        this.formInline.originPrincipalDrafter_dictText = value[0].mainDraftingUser
+        this.formInline.newMainDraftingUser_dictText = value[0].mainDraftingUser
-        this.formInline.originMainDraftUnit = value[0].mainDraftingUnit
+        this.formInline.newMainDraftingUnit = value[0].mainDraftingUnit
       }
     },
     // 选择用户得到用户名

src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfo.vue

@@ -42,7 +42,7 @@
 
       </j-table>
     </div>
-    <finish-time-change-base-info-drawer ref="changeBaseInfoDrawer" @ok="changeBaseInfoDrawerOk"></finish-time-change-base-info-drawer>
+    <finish-time-change-base-info-drawer v-bind="$attrs" ref="changeBaseInfoDrawer" @ok="changeBaseInfoDrawerOk"></finish-time-change-base-info-drawer>
   </div>
 </template>
 

src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfoDrawer.vue

@@ -23,11 +23,11 @@
               </div>
               <a-form-model-item class="item-model" prop="espId">
                 <!--  搜索项目状态为未开始和进行中的数据  -->
-                <!--  todo   暂时先注掉查询条件不然没数据  :searchParam="{projectStatus: '1,2'}"-->
                 <enterprise-plan-selection type="radio"
                                            :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')"
                                            v-model="formInline.espId"
                                            :standard-number="formInline.originEnStandardNo"
+                                           :searchParam="{ projectType: projectType }"
                                            @standardNumberChange="standardNumberChange"
                                            @listChange="listChange"/>
               </a-form-model-item>
@@ -204,6 +204,13 @@ import EnterprisePlanSelection from '@/components/selection/EnterprisePlanSelect
 export default {
   name: 'FinishTimeChangeBaseInfoDrawer',
   components: { EnterprisePlanSelection, UserSelection },
+  props: {
+    projectType: {
+      type: [Number, String],
+      required: false,
+      default: 1
+    }
+  },
   data () {
     return {
       visible: false,

src/views/workCenter/enterpriseStandardInitChange/modules/JobEndBaseInfo.vue

@@ -42,7 +42,7 @@
 
       </j-table>
     </div>
-    <job-end-base-info-drawer ref="jobEndBaseInfoDrawer" @ok="jobEndBaseInfoDrawerOk"></job-end-base-info-drawer>
+    <job-end-base-info-drawer v-bind="$attrs" ref="jobEndBaseInfoDrawer" @ok="jobEndBaseInfoDrawerOk"></job-end-base-info-drawer>
   </div>
 </template>
 

src/views/workCenter/enterpriseStandardInitChange/modules/JobEndBaseInfoDrawer.vue

@@ -27,6 +27,7 @@
                                            v-model="formInline.espId"
                                            :standard-number="formInline.originEnStandardNo"
                                            @standardNumberChange="standardNumberChange"
+                                           :searchParam="{ projectType: projectType }"
                                            @listChange="listChange"/>
               </a-form-model-item>
             </div>
@@ -108,6 +109,13 @@ import EnterprisePlanSelection from '@/components/selection/EnterprisePlanSelect
 export default {
   name: 'JobEndBaseInfoDrawer',
   components: { EnterprisePlanSelection, UserSelection },
+  props: {
+    projectType: {
+      type: [Number, String],
+      required: false,
+      default: 1
+    }
+  },
   data () {
     return {
       visible: false,

src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue

@@ -3,14 +3,13 @@
     <!--  合并标准信息  -->
     <div class="collapsible-panel-form">
       <div class="collapsible-panel-form-header">
-        <span>合并标准信息</span>
+        <span>{{ $t('mergeStandardInformation') }}</span>
         <div class="retractable-btn" @click="handleChangeRetractable('baseInfo')">
           <a-icon type="double-right" :class="retractableFlag.baseInfo ? 'pack-up-btn' : 'unfold-btn'" />
-          {{ retractableFlag.baseInfo ? '收起' : '展开' }}
+          {{ retractableFlag.baseInfo ? $t('putAway') : $t('open') }}
         </div>
       </div>
-      <div class="collapsible-panel-form">
+      <div class="form-flex-box collapsible-panel-form-content" v-show="retractableFlag.baseInfo">
-        <div class="form-flex-box collapsible-panel-form-content collapsible-content-no-head">
         <!--  企标编号1  -->
         <div class="box-title-text form-flex-item">
           <div class="title-text">
@@ -20,11 +19,13 @@
                     {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + '1' }}
                   </span>
           </div>
-            <a-form-model-item class="item-model" prop="enterpriseStandardPlanIdOne">
+          <a-form-model-item class="item-model" prop="standardIdOne">
             <enterprise-plan-selection type="radio"
                                        :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')"
-                                         v-model="formInline.enterpriseStandardPlanIdOne"
+                                       v-model="formInline.standardIdOne"
                                        :standard-number="formInline.standardNoOne"
+                                       :disabled="disabled"
+                                       :searchParam="{ projectType: projectType }"
                                        @standardNumberChange="standardNumberChangeOne"
                                        @listChange="listChange"/>
           </a-form-model-item>
@@ -32,8 +33,7 @@
         <!--  企标名称1  -->
         <div class="box-title-text form-flex-item">
           <div class="title-text">
-                  <span class="title-text-text"
+            <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName') + '1'">
-                        :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName') + '1'">
               {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardName') + '1' }}
             </span>
           </div>
@@ -48,33 +48,34 @@
         <!--  制修订类型1  -->
         <div class="box-title-text form-flex-item">
           <div class="title-text">
-                  <span class="title-text-text"
+            <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.typeOfRevision') + '1'">
-                        :title="$t('workCenter.enterpriseInitChangePlan.typeOfRevision') + '1'">
               {{ $t('workCenter.enterpriseInitChangePlan.typeOfRevision') + '1' }}
             </span>
           </div>
-            <a-form-model-item class="item-model" prop="typeOfRevisionOne">
+          <a-form-model-item class="item-model" prop="projectTypeOne">
-              <a-input class="box-input"
+            <a-select v-model="formInline.projectTypeOne"
                       disabled
-                       v-model="formInline.typeOfRevisionOne_dictText"
+                      :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.typeOfRevision')">
-                       :maxLength="50"
+              <a-select-option :value="ApplicationCategory.INITIATION.value">{{ $t('workCenter.enterpriseInitChangePlan.standardProjectEstablishment') }}</a-select-option>
-                       :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.typeOfRevision')" />
+              <a-select-option :value="ApplicationCategory.CHANGE.value">{{ $t('workCenter.enterpriseInitChangePlan.change') }}</a-select-option>
+            </a-select>
           </a-form-model-item>
         </div>
         <!--  企标编号2  -->
         <div class="box-title-text form-flex-item">
           <div class="title-text">
             <span class="required">*</span>
-              <span class="title-text-text"
+            <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + '2'">
-                    :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + '2'">
               {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + '2' }}
             </span>
           </div>
-            <a-form-model-item class="item-model" prop="enterpriseStandardPlanIdTwo">
+          <a-form-model-item class="item-model" prop="standardIdTwo">
             <enterprise-plan-selection type="radio"
                                        :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')"
-                                         v-model="formInline.enterpriseStandardPlanIdTwo"
+                                       v-model="formInline.standardIdTwo"
+                                       :disabled="disabled"
                                        :standard-number="formInline.standardNoTwo"
+                                       :searchParam="{ projectType: projectType }"
                                        @standardNumberChange="standardNumberChangeTwo"
                                        @listChange="listChange"/>
           </a-form-model-item>
@@ -98,30 +99,29 @@
         <!--  制修订类型2  -->
         <div class="box-title-text form-flex-item">
           <div class="title-text">
-                  <span class="title-text-text"
+            <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.typeOfRevision') + '2'">
-                        :title="$t('workCenter.enterpriseInitChangePlan.typeOfRevision') + '1'">
+              {{ $t('workCenter.enterpriseInitChangePlan.typeOfRevision') + '2' }}
-                    {{ $t('workCenter.enterpriseInitChangePlan.typeOfRevision') + '1' }}
             </span>
           </div>
-            <a-form-model-item class="item-model" prop="typeOfRevisionTwo">
+          <a-form-model-item class="item-model" prop="projectTypeTwo">
-              <a-input class="box-input"
+            <a-select v-model="formInline.projectTypeTwo"
                       disabled
-                       v-model="formInline.typeOfRevisionTwo_dictText"
+                      :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.typeOfRevision')">
-                       :maxLength="50"
+              <a-select-option :value="ApplicationCategory.INITIATION.value">{{ $t('workCenter.enterpriseInitChangePlan.standardProjectEstablishment') }}</a-select-option>
-                       :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.typeOfRevision')" />
+              <a-select-option :value="ApplicationCategory.CHANGE.value">{{ $t('workCenter.enterpriseInitChangePlan.change') }}</a-select-option>
+            </a-select>
           </a-form-model-item>
         </div>
         <!--  新企标编号  -->
         <div class="box-title-text form-flex-item">
           <div class="title-text">
-              <span class="required">*</span>
             <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardNum')">
                   {{ $t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardNum') }}
                 </span>
           </div>
-            <a-form-model-item class="item-model" prop="newEnterpriseStandardNum">
+          <a-form-model-item class="item-model" prop="newEnStandardNo">
             <a-input class="box-input"
-                       v-model="formInline.newEnterpriseStandardNum"
+                     v-model="formInline.newEnStandardNo"
                      :maxLength="50"
                      disabled
                      :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardNum')" />
@@ -135,10 +135,11 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardName') }}
                 </span>
           </div>
-            <a-form-model-item class="item-model" prop="newEnterpriseStandardName">
+          <a-form-model-item class="item-model" prop="newEnStandardName">
             <a-input class="box-input"
-                       v-model="formInline.newEnterpriseStandardName"
+                     v-model="formInline.newEnStandardName"
                      :maxLength="50"
+                     :disabled="disabled"
                      :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardName')" />
           </a-form-model-item>
         </div>
@@ -149,27 +150,32 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.standardEnglishName') }}
                 </span>
           </div>
-            <a-form-model-item class="item-model" prop="standardEnglishName">
+          <a-form-model-item class="item-model" prop="enStandardEnglishName">
             <a-input class="box-input"
-                       v-model="formInline.standardEnglishName"
+                     v-model="formInline.enStandardEnglishName"
                      :maxLength="50"
+                     :disabled="disabled"
                      :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.standardEnglishName')" />
           </a-form-model-item>
         </div>
         <!--  标准体系  -->
         <div class="box-title-text form-flex-item">
           <div class="title-text">
+            <span class="required">*</span>
             <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.standardSystem')">
               {{ $t('workCenter.enterpriseInitChangePlan.standardSystem') }}
             </span>
           </div>
-            <a-form-model-item class="item-model" prop="standardSystem">
+          <a-form-model-item class="item-model" prop="enStandardSystem">
-              <j-dict-select-tag class="box-input"
+            <a-tree-select
-                                 v-model="formInline.standardSystem"
+              v-model="formInline.enStandardSystem"
-                                 :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.standardSystem')"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                                 :type="'select'"
+              style="width: 100%"
-                                 :triggerChange="false"
+              :tree-data="standardSystemOptions"
-                                 dictCode="standard_system" />
+              tree-checkable
+              treeCheckStrictly
+              :disabled="disabled"
+              :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.standardSystem')" />
           </a-form-model-item>
         </div>
         <!--  企业标准代号  -->
@@ -180,12 +186,13 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardCode') }}
                 </span>
           </div>
-            <a-form-model-item class="item-model" prop="enterpriseStandardCode">
+          <a-form-model-item class="item-model" prop="enStandardCode">
             <j-dict-select-tag class="box-input"
-                                 v-model="formInline.enterpriseStandardCode"
+                               v-model="formInline.enStandardCode"
                                :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardCode')"
                                :type="'select'"
                                :triggerChange="false"
+                               :disabled="disabled"
                                dictCode="enterprise_standard_code" />
           </a-form-model-item>
         </div>
@@ -197,12 +204,13 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.enterpriseNameCode') }}
                 </span>
           </div>
-            <a-form-model-item class="item-model" prop="enterpriseNameCode">
+          <a-form-model-item class="item-model" prop="enNameCode">
             <j-dict-select-tag class="box-input"
-                                 v-model="formInline.enterpriseNameCode"
+                               v-model="formInline.enNameCode"
                                :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.enterpriseNameCode')"
                                :type="'select'"
                                :triggerChange="false"
+                               :disabled="disabled"
                                dictCode="enterprise_name_code" />
           </a-form-model-item>
         </div>
@@ -220,6 +228,7 @@
                                :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.standardCategoryCode')"
                                :type="'select'"
                                :triggerChange="false"
+                               :disabled="disabled"
                                dictCode="standard_category_code" />
           </a-form-model-item>
         </div>
@@ -231,11 +240,11 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.yearNumber') }}
                 </span>
           </div>
-            <a-form-model-item class="item-model" prop="yearNumber">
+          <a-form-model-item class="item-model" prop="decadeCode">
             <j-date show-type="year"
-                      v-model="formInline.yearNumber"
+                    v-model="formInline.decadeCode"
-                      :default-value="yearNumberDefaultValue"
                     date-format="YYYY"
+                    :disabled="disabled"
                     :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.yearNumber')" />
           </a-form-model-item>
         </div>
@@ -246,11 +255,11 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.compilationIllustration') }}
                 </span>
           </div>
-            <a-form-model-item class="item-model" prop="compilationIllustration">
+          <a-form-model-item class="item-model" prop="compilationDescription">
-              <a-button type="primary" class="button-text" @click="clickButtonToUpload('compilationIllustration')">
+            <a-button type="primary" class="button-text" @click="clickButtonToUpload('compilationDescription')">
               {{
-                  (formInline.compilationIllustration === 'null' || formInline.compilationIllustration === ''
+                (formInline.compilationDescription === 'null' || formInline.compilationDescription === ''
-                    || formInline.compilationIllustration === null || formInline.compilationIllustration === undefined)
+                  || formInline.compilationDescription === null || formInline.compilationDescription === undefined)
                   ? $t('uploadFile.clickUpload')
                   : $t('uploadFile.viewUploadedFiles')
               }}
@@ -260,14 +269,15 @@
         <!--  标准等级分类  -->
         <div class="box-title-text form-flex-item">
           <div class="title-text">
+            <span class="required">*</span>
             <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.standardGradeClassification')">
               {{ $t('workCenter.enterpriseInitChangePlan.standardGradeClassification') }}
             </span>
           </div>
-            <a-form-model-item class="item-model" prop="standardGradeClassification">
+          <a-form-model-item class="item-model" prop="enStandardClassification">
             <j-dict-select-tag class="box-input"
                                :disabled="disabled"
-                                 v-model="formInline.standardGradeClassification"
+                               v-model="formInline.enStandardClassification"
                                :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.standardGradeClassification')"
                                :type="'select'"
                                :triggerChange="false"
@@ -279,10 +289,10 @@
     <!--  完成日期部分  -->
     <div class="collapsible-panel-form">
       <div class="collapsible-panel-form-header">
-          <span>完成日期</span>
+        <span>{{ $t('finishDate') }}</span>
         <div class="retractable-btn" @click="handleChangeRetractable('finishDate')">
           <a-icon type="double-right" :class="retractableFlag.finishDate ? 'pack-up-btn' : 'unfold-btn'" />
-            {{ retractableFlag.finishDate ? '收起' : '展开' }}
+          {{ retractableFlag.finishDate ? $t('putAway') : $t('open') }}
         </div>
       </div>
       <div class="form-flex-box collapsible-panel-form-content" v-show="retractableFlag.finishDate">
@@ -294,9 +304,9 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.draftPlanFinishDate') }}
                 </span>
           </div>
-            <a-form-model-item class="item-model" prop="draftPlanFinishDate">
+          <a-form-model-item class="item-model" prop="draftPlannedCompleteDate">
             <a-date-picker
-                v-model="formInline.draftPlanFinishDate"
+              v-model="formInline.draftPlannedCompleteDate"
               :showTime="false"
               :disabled="disabled"
               value-format="YYYY-MM-DD">
@@ -311,9 +321,9 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.exposureDraftPlanFinishDate') }}
                 </span>
           </div>
-            <a-form-model-item class="item-model" prop="exposureDraftPlanFinishDate">
+          <a-form-model-item class="item-model" prop="solicitationDraftPlanCompleteDate">
             <a-date-picker
-                v-model="formInline.exposureDraftPlanFinishDate"
+              v-model="formInline.solicitationDraftPlanCompleteDate"
               :showTime="false"
               :disabled="disabled"
               value-format="YYYY-MM-DD">
@@ -328,9 +338,9 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.planSubmissionDate') }}
                 </span>
           </div>
-            <a-form-model-item class="item-model" prop="planSubmissionDate">
+          <a-form-model-item class="item-model" prop="planApprovalDate">
             <a-date-picker
-                v-model="formInline.planSubmissionDate"
+              v-model="formInline.planApprovalDate"
               :showTime="false"
               :disabled="disabled"
               value-format="YYYY-MM-DD">
@@ -342,10 +352,10 @@
     <!--  适用范围部分  -->
     <div class="collapsible-panel-form">
       <div class="collapsible-panel-form-header">
-          <span>适用范围</span>
+        <span>{{ $t('rangeOfApplication') }}</span>
         <div class="retractable-btn" @click="handleChangeRetractable('rangeOfApplication')">
           <a-icon type="double-right" :class="retractableFlag.rangeOfApplication ? 'pack-up-btn' : 'unfold-btn'" />
-            {{ retractableFlag.rangeOfApplication ? '收起' : '展开' }}
+          {{ retractableFlag.rangeOfApplication ? $t('putAway') : $t('open') }}
         </div>
       </div>
       <div class="form-flex-box collapsible-panel-form-content" v-show="retractableFlag.rangeOfApplication">
@@ -357,8 +367,8 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.partName') }}
                 </span>
           </div>
-            <a-form-model-item class="item-model" prop="partName">
+          <a-form-model-item class="item-model" prop="componentName">
-              <a-tree-select v-model="formInline.partName"
+            <a-tree-select v-model="formInline.componentName"
                            :disabled="disabled"
                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
                            style="width: 100%"
@@ -375,13 +385,13 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.principalDrafter') }}
                 </span>
           </div>
-            <a-form-model-item class="item-model" prop="principalDrafter">
+          <a-form-model-item class="item-model" prop="mainDraftingUser">
             <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.principalDrafter')"
-                              v-model="formInline.principalDrafter"
+                            v-model="formInline.mainDraftingUser"
                             :disabled="disabled"
-                              filedName="principalDrafter"
+                            filedName="mainDraftingUser"
                             @nameChange="userSelectNameChange"
-                              :nameStr="formInline.principalDrafter_dictText"
+                            :nameStr="formInline.mainDraftingUser_dictText"
                             type="radio" />
           </a-form-model-item>
         </div>
@@ -393,8 +403,8 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.mainDraftUnit') }}
                 </span>
           </div>
-            <a-form-model-item class="item-model" prop="mainDraftUnit">
+          <a-form-model-item class="item-model" prop="mainDraftingUnit">
-              <j-select-depart v-model="formInline.mainDraftUnit"
+            <j-select-depart v-model="formInline.mainDraftingUnit"
                              :disabled="disabled"
                              :backDepart="true" />
           </a-form-model-item>
@@ -407,30 +417,16 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.headOfMainDraftingUnit') }}
                 </span>
           </div>
-            <a-form-model-item class="item-model" prop="headOfMainDraftingUnit">
+          <a-form-model-item class="item-model" prop="mainDraftingUnitResponsiblePerson">
             <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.headOfMainDraftingUnit')"
-                              v-model="formInline.headOfMainDraftingUnit"
+                            v-model="formInline.mainDraftingUnitResponsiblePerson"
                             :disabled="disabled"
-                              filedName="headOfMainDraftingUnit"
+                            filedName="mainDraftingUnitResponsiblePerson"
                             @nameChange="userSelectNameChange"
-                              :nameStr="formInline.headOfMainDraftingUnit_dictText"
+                            :nameStr="formInline.mainDraftingUnitResponsiblePerson_dictText"
                             type="radio" />
           </a-form-model-item>
         </div>
-          <!--  标准适用范围  -->
-          <div class="box-title-text form-flex-item form-flex-item-long">
-            <div class="title-text title-text-long">
-              <span class="required">*</span>
-              <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.scopeOfApplication')">
-                  {{ $t('workCenter.enterpriseInitChangePlan.scopeOfApplication') }}
-                </span>
-            </div>
-            <a-form-model-item class="item-model" prop="scopeOfApplication">
-              <a-textarea :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.scopeOfApplication')"
-                          :maxLength="500"
-                          v-model="formInline.scopeOfApplication" :rows="4" />
-            </a-form-model-item>
-          </div>
         <!--  变更原因  -->
         <div class="box-title-text form-flex-item form-flex-item-long">
           <div class="title-text title-text-long">
@@ -442,12 +438,12 @@
           <a-form-model-item class="item-model" prop="changeReason">
             <a-textarea :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.changeReason')"
                         :maxLength="500"
+                        :disabled="disabled"
                         v-model="formInline.changeReason" :rows="4" />
           </a-form-model-item>
         </div>
       </div>
     </div>
-    </div>
     <upload-file ref="uploadFile" @change="uploadFileChange" :return-url="false" :disabled="disabled"></upload-file>
   </a-form-model>
 </template>
@@ -456,6 +452,10 @@
 import EnterprisePlanSelection from '@/components/selection/EnterprisePlanSelection'
 import UserSelection from '@/components/selection/UserSelection'
 import UploadFile from '@/components/UploadFile'
+import { getTreeList } from '@/api/enterpriseStandardLibraryApi'
+import { ApplicationCategory } from '@/enums/commonEnums'
+import { getFormDictTreeList } from '@/api/api'
+
 export default {
   name: 'MergeBaseInfo',
   components: { EnterprisePlanSelection, UserSelection, UploadFile },
@@ -464,10 +464,18 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    projectType: {
+      type: [Number, String],
+      required: false,
+      default: 1
     }
   },
   data () {
     return {
+      ApplicationCategory,
+      standardSystemOptions: [], // 标准体系下拉数据
+      partNameOptions: [], // 零部件名称下拉框数据
       formInline: {},
       // 各模块的收齐和展开状态
       retractableFlag: {
@@ -476,16 +484,16 @@ export default {
         rangeOfApplication: true // 适用范围部分
       },
       rules: {
-        // 企标编号1
+        // 企标计划id1
-        enterpriseStandardPlanIdOne: [
+        standardIdOne: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + '1' + this.$t('cannotEmpty'),
             trigger: 'change'
           }
         ],
-        // 企标编号2
+        // 企标计划id2
-        enterpriseStandardPlanIdTwo: [
+        standardIdTwo: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + '1' + this.$t('cannotEmpty'),
@@ -493,7 +501,7 @@ export default {
           }
         ],
         // 新企标名称
-        newEnterpriseStandardName: [
+        newEnStandardName: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardName') + this.$t('cannotEmpty'),
@@ -501,7 +509,7 @@ export default {
           }
         ],
         // 标准体系
-        standardSystem: [
+        enStandardSystem: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.standardSystem') + this.$t('cannotEmpty'),
@@ -509,7 +517,7 @@ export default {
           }
         ],
         // 企业标准代号
-        enterpriseStandardCode: [
+        enStandardCode: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardCode') + this.$t('cannotEmpty'),
@@ -517,7 +525,7 @@ export default {
           }
         ],
         // 企业名称代号
-        enterpriseNameCode: [
+        enNameCode: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseNameCode') + this.$t('cannotEmpty'),
@@ -533,7 +541,7 @@ export default {
           }
         ],
         // 年代号
-        yearNumber: [
+        decadeCode: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.yearNumber') + this.$t('cannotEmpty'),
@@ -541,7 +549,7 @@ export default {
           }
         ],
         // 标准等级分类
-        standardGradeClassification: [
+        enStandardClassification: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.standardGradeClassification') + this.$t('cannotEmpty'),
@@ -549,7 +557,7 @@ export default {
           }
         ],
         // 草稿计划完成日期
-        draftPlanFinishDate: [
+        draftPlannedCompleteDate: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.draftPlanFinishDate') + this.$t('cannotEmpty'),
@@ -557,7 +565,7 @@ export default {
           }
         ],
         // 征求意见稿计划完成日期
-        exposureDraftPlanFinishDate: [
+        solicitationDraftPlanCompleteDate: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.exposureDraftPlanFinishDate') + this.$t('cannotEmpty'),
@@ -565,7 +573,7 @@ export default {
           }
         ],
         // 计划报批日期
-        planSubmissionDate: [
+        planApprovalDate: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.planSubmissionDate') + this.$t('cannotEmpty'),
@@ -573,7 +581,7 @@ export default {
           }
         ],
         // 零部件名称
-        partName: [
+        componentName: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.partName') + this.$t('cannotEmpty'),
@@ -581,7 +589,7 @@ export default {
           }
         ],
         // 主起草人
-        principalDrafter: [
+        mainDraftingUser: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.principalDrafter') + this.$t('cannotEmpty'),
@@ -589,7 +597,7 @@ export default {
           }
         ],
         // 主起草单位
-        mainDraftUnit: [
+        mainDraftingUnit: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.mainDraftUnit') + this.$t('cannotEmpty'),
@@ -597,7 +605,7 @@ export default {
           }
         ],
         // 起草单位负责人
-        headOfMainDraftingUnit: [
+        mainDraftingUnitResponsiblePerson: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.headOfMainDraftingUnit') + this.$t('cannotEmpty'),
@@ -615,7 +623,29 @@ export default {
       }
     }
   },
+  mounted () {
+    // 获取标准体系下拉框数据
+    this.initStandardSystemOptions()
+    // 获取零部件名称下拉框数据
+    this.initPartNameOptions()
+  },
   methods: {
+    // 获取标准体系下拉框数据
+    initStandardSystemOptions () {
+      getTreeList({ option: 1 }).then(res => {
+        if (res.success) {
+          this.standardSystemOptions = res.result
+        }
+      })
+    },
+    // 获取零部件名称下拉框数据
+    initPartNameOptions () {
+      getFormDictTreeList({ dictId: '1696821512600637441' }).then(res => {
+        if (res.success) {
+          this.partNameOptions = res.result
+        }
+      })
+    },
     // 改变内容区域收起和展开
     handleChangeRetractable (module) {
       this.$set(this.retractableFlag, module, !this.retractableFlag[module])
@@ -636,48 +666,56 @@ export default {
         // 企标名称1
         this.formInline.standardNameOne = value[0].originEnStandardName
         // 制修订类型1
-        this.formInline.typeOfRevisionOne = value[0].typeOfRevision
+        this.formInline.projectTypeOne = value[0].revisionType
         // 新企标名称
-        this.formInline.newEnterpriseStandardName = value[0].originEnStandardName
+        this.formInline.newEnStandardName = value[0].originEnStandardName
         // 标准英文名称
-        this.formInline.standardEnglishName = value[0].originEnStandardName
+        this.formInline.enStandardEnglishName = value[0].originEnStandardName
         // 标准体系
-        this.formInline.standardSystem = value[0].originEnStandardName
+        this.formInline.enStandardSystem = value[0].originEnStandardName
         // 企业标准代号
-        this.formInline.enterpriseStandardCode = value[0].originEnStandardName
+        this.formInline.enStandardCode = value[0].originEnStandardName
         // 企业名称代号
-        this.formInline.enterpriseNameCode = value[0].originEnStandardName
+        this.formInline.enNameCode = value[0].originEnStandardName
         // 标准类别代号
         this.formInline.standardCategoryCode = value[0].originEnStandardName
         // 年代号
-        this.formInline.yearNumber = value[0].originEnStandardName
+        this.formInline.decadeCode = value[0].originEnStandardName
         // 编制说明
-        this.formInline.compilationIllustration = value[0].originEnStandardName
+        this.formInline.compilationDescription = value[0].originEnStandardName
         // 标准等级分类
-        this.formInline.standardGradeClassification = value[0].originEnStandardName
+        this.formInline.enStandardClassification = value[0].originEnStandardName
         // 草稿计划完成日期
-        this.formInline.draftPlanFinishDate = value[0].originEnStandardName
+        this.formInline.draftPlannedCompleteDate = value[0].originEnStandardName
         // 征求意见稿计划完成日期
-        this.formInline.exposureDraftPlanFinishDate = value[0].originEnStandardName
+        this.formInline.solicitationDraftPlanCompleteDate = value[0].originEnStandardName
         // 计划报批日期
-        this.formInline.planSubmissionDate = value[0].originEnStandardName
+        this.formInline.planApprovalDate = value[0].originEnStandardName
         // 零部件名称
-        this.formInline.partName = value[0].originEnStandardName
+        this.formInline.componentName = value[0].originEnStandardName
         // 主起草人
-        this.formInline.principalDrafter_dictText = value[0].mainDraftingUser
+        this.formInline.mainDraftingUser_dictText = value[0].mainDraftingUser
         // 主起草单位
-        this.formInline.mainDraftUnit = value[0].mainDraftingUnit
+        this.formInline.mainDraftingUnit = value[0].mainDraftingUnit
         // 起草单位负责人
-        this.formInline.headOfMainDraftingUnit = value[0].mainDraftingUnit
+        this.formInline.mainDraftingUnitResponsiblePerson_dictText = value[0].mainDraftingUnit
-        // 标准适用范围
-        this.formInline.scopeOfApplication = value[0].mainDraftingUnit
-        // 变更原因
-        this.formInline.changeReason = value[0].mainDraftingUnit
       }
     },
     // 选择用户得到用户名
     userSelectNameChange (value, fieldName) {
       this.formInline[fieldName + '_dictText'] = value
+    },
+    // 文件上传改变后的回调
+    uploadFileChange (data) {
+      const attIdList = []
+      if (data && data.length > 0) {
+        data.map(item => {
+          attIdList.push(item.id)
+        })
+      }
+      /** 赋值给当前对应的表单文件 */
+      this.formInline[this.uploadName] = attIdList.join(',')
+      this.formInline = { ...this.formInline }
     }
   }
 }

src/views/workCenter/processCenter/table/DoneList.vue

@@ -7,22 +7,22 @@
           <!--  流程名称  -->
           <a-col :span="6">
             <a-form-item :label="$t('processName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('processName')" v-model="queryParam.processName"></a-input>
+              <a-input :placeholder="$t('pleaseEnter')+$t('processName')" v-model="queryParam.prcName"></a-input>
             </a-form-item>
           </a-col>
           <!--  流程编号  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.processNumber"></a-input>
+              <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.prcNum"></a-input>
             </a-form-item>
           </a-col>
-          <!--  流程类型  -->
+          <!--  流程类型  todo：流程类型是字典还是什么后端还没确定  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag
                 :placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processType')"
                 dict-code="esp_project_status"
-                v-model="queryParam.projectStatus">
+                v-model="queryParam.prcType">
               </j-dict-select-tag>
             </a-form-item>
           </a-col>
@@ -142,7 +142,7 @@ export default {
         }
       ],
       url: {
-        list: ''
+        list: '/process/center/doneTaskList'
       }
     }
   },

src/views/workCenter/processCenter/table/DraftList.vue

@@ -4,13 +4,13 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <!--  流程类型  -->
+          <!--  流程类型  todo：流程类型是字典还是什么后端还没确定  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag
                 :placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processType')"
                 dict-code="esp_project_status"
-                v-model="queryParam.projectStatus">
+                v-model="queryParam.prcType">
               </j-dict-select-tag>
             </a-form-item>
           </a-col>
@@ -103,7 +103,7 @@ export default {
         }
       ],
       url: {
-        list: ''
+        list: '/process/center/draftList'
       }
     }
   },

src/views/workCenter/processCenter/table/MonitorList.vue

@@ -7,22 +7,22 @@
           <!--  流程名称  -->
           <a-col :span="6">
             <a-form-item :label="$t('processName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('processName')" v-model="queryParam.processName"></a-input>
+              <a-input :placeholder="$t('pleaseEnter')+$t('processName')" v-model="queryParam.prcName"></a-input>
             </a-form-item>
           </a-col>
           <!--  流程编号  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.processNumber"></a-input>
+              <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.prcNum"></a-input>
             </a-form-item>
           </a-col>
-          <!--  流程类型  -->
+          <!--  流程类型  todo：流程类型是字典还是什么后端还没确定  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag
                 :placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processType')"
                 dict-code="esp_project_status"
-                v-model="queryParam.processType">
+                v-model="queryParam.prcType">
               </j-dict-select-tag>
             </a-form-item>
           </a-col>
@@ -153,7 +153,7 @@ export default {
         }
       ],
       url: {
-        list: ''
+        list: '/process/center/monitorTaskList'
       }
     }
   },

src/views/workCenter/processCenter/table/SentList.vue

@@ -7,33 +7,33 @@
           <!--  流程名称  -->
           <a-col :span="6">
             <a-form-item :label="$t('processName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('processName')" v-model="queryParam.processName"></a-input>
+              <a-input :placeholder="$t('pleaseEnter')+$t('processName')" v-model="queryParam.prcName"></a-input>
             </a-form-item>
           </a-col>
           <!--  流程编号  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.processNumber"></a-input>
+              <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.prcNum"></a-input>
             </a-form-item>
           </a-col>
-          <!--  流程类型  -->
+          <!--  流程类型  todo：流程类型是字典还是什么后端还没确定  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag
                 :placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processType')"
                 dict-code="esp_project_status"
-                v-model="queryParam.processType">
+                v-model="queryParam.prcType">
               </j-dict-select-tag>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
-            <!--  流程状态  -->
+            <!--  流程状态  todo：流程状态是字典还是什么后端还没确定   -->
             <a-col :span="6">
               <a-form-item :label="$t('workCenter.processCenter.processState')" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-dict-select-tag
                   :placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processState')"
                   dict-code="esp_project_status"
-                  v-model="queryParam.processState">
+                  v-model="queryParam.prcState">
                 </j-dict-select-tag>
               </a-form-item>
             </a-col>
@@ -162,7 +162,7 @@ export default {
         }
       ],
       url: {
-        list: ''
+        list: '/process/center/sendTaskList'
       }
     }
   },

src/views/workCenter/processCenter/table/TodoList.vue

@@ -7,22 +7,22 @@
           <!--  流程名称  -->
           <a-col :span="6">
             <a-form-item :label="$t('processName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('processName')" v-model="queryParam.processName"></a-input>
+              <a-input :placeholder="$t('pleaseEnter')+$t('processName')" v-model="queryParam.prcName"></a-input>
             </a-form-item>
           </a-col>
           <!--  流程编号  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.processNumber"></a-input>
+              <a-input :placeholder="$t('pleaseEnter')+$t('workCenter.processCenter.processNumber')" v-model="queryParam.prcNum"></a-input>
             </a-form-item>
           </a-col>
-          <!--  流程类型  -->
+          <!--  流程类型  todo：流程类型是字典还是什么后端还没确定  -->
           <a-col :span="6">
             <a-form-item :label="$t('workCenter.processCenter.processType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag
                 :placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processType')"
                 dict-code="esp_project_status"
-                v-model="queryParam.projectStatus">
+                v-model="queryParam.prcType">
               </j-dict-select-tag>
             </a-form-item>
           </a-col>
@@ -138,15 +138,17 @@ export default {
     // 办理
     handleTransact (record) {
       // 跳转到对应流程页面
-      let path = ''
+      // todo 暂时没有流程类型字段
-      switch (record.processType) {
+      let path = '/workCenter/enterpriseStandardInitChange/planApprovalChangeFlow'
-        case '':
+      // switch (record.processType) {
-          path = ''
+      //   case '':
-      }
+      //     path = ''
+      // }
       this.$router.push({
         path: path,
         query: {
-          currentNode: record.currentNode
+          currentNode: record.currentNode,
+          processId: record.prcId // 流程id
         }
       })
     },