[update] 联调企标复审流程

src/api/dashboard.js

@@ -1,4 +1,10 @@
-import { getAction } from './manage'
+import { getAction, postAction } from './manage'
+// 获取检索历史数据
+const getSearchHistoryData = (params) => getAction('/home/lawsHomeNormalSearchHistory/page', params)
+// 一般检索(标题)——资源类型改变获取下面筛选项统计数据
+const getSearchParamNum = (params) => postAction('/home/lawsHomeNormalSearchData/getNormalSearchTitleCount', params)
+// 一般检索(全文)——资源类型改变获取下面筛选项统计数据
+const getSearchParamNumFullText = (params) => postAction('/home/lawsHomeSearch/getNormalSearchAllCount', params)
 
 // 国内标准的高级搜索，查询搜索条件
 const getDomesticStandardQuery = (params) => getAction('/laws/standard/domestic/getQueryCondition', params)
@@ -15,6 +21,9 @@ const getOverseasStandardList = (params) => getAction('/laws//standard/overseas/
 const getEnterStandardList = (params) => getAction('/laws/standard/enterprise/getCommonPage', params)
 
 export {
+  getSearchHistoryData,
+  getSearchParamNum,
+  getSearchParamNumFullText,
   getDomesticStandardQuery,
   getOverseasStandardQuery,
   getEnterStandardQuery,

src/common/lang/dashboard/en.js

@@ -4,6 +4,7 @@ module.exports = {
   generalSearch: {
     advancedSearch: 'Advanced Search',
     homePage: 'Home',
+    searchHistory: '检索历史',
     queryCondition: 'Query Condition',
     retrievalMode: 'Retrieval Mode',
     resourceType: 'Resource Type'

src/common/lang/dashboard/zh.js

@@ -4,6 +4,7 @@ module.exports = {
   generalSearch: {
     advancedSearch: '高级搜索',
     homePage: '首页',
+    searchHistory: '检索历史',
     queryCondition: '查询条件',
     retrievalMode: '检索方式',
     resourceType: '资源类型'

src/enums/commonEnums.js

@@ -109,8 +109,8 @@ export const TypeOfClauseItem = {
 export const Recheck = {
   STAND_GOOD: { text: '继续有效', value: '1' },
   REVISE: { text: '修订', value: '2' },
-  ANNUL: { text: '废止', value: '1' },
+  ANNUL: { text: '废止', value: '3' },
-  SEAL_SAVE: { text: '封存', value: '1' }
+  SEAL_SAVE: { text: '封存', value: '4' }
 }
 
 // 清单维护类型

src/mixins/WorkCenterMixin.js

@@ -9,8 +9,8 @@ export const WorkCenterMixin = {
     }
   },
   methods: {
-    // 查询人员信息结构数据
+    // 查询人员信息结构数据，callback用于获取完流程才可以初始化人员信息
-    getPersonInfoStructure (key) {
+    getPersonInfoStructure (key, callback) {
       const param = {}
       param.processDefinitionKey = key
       if (this.$route.query.processInstanceId) {
@@ -31,11 +31,15 @@ export const WorkCenterMixin = {
             this.personnelInfoData[0].linkUserIds = Vue.ls.get(USER_INFO).id
             this.personnelInfoData[0].userList = Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')'
           }
+          if (callback) {
+            callback()
+          }
         }
       })
     },
     // 待办中进入时需要初始化人员信息数据
     initPersonInfoData (isFirstNode) {
+      console.log('-----------isFirstNode------------', isFirstNode)
       if (isFirstNode) {
         // 是第一个节点，回显数据
         this.personnelInfoData = this.personnelInfoData.map(item => {

src/views/dashboard/search/GeneralSearch.vue

@@ -6,6 +6,7 @@
         <a-input-search class="input-search" :placeholder="$t('pleaseEnter')+$t('dashboard.generalSearch.queryCondition')" v-model="searchValue" enter-button @search="onSearch" />
         <a class="search-link" @click="clickAdvancedSearch">{{ $t('dashboard.generalSearch.advancedSearch') }}</a>
         <a class="search-link">{{ $t('dashboard.generalSearch.homePage') }}</a>
+        <a class="search-link" @click="clickSearchHistory">{{ $t('dashboard.generalSearch.searchHistory') }}</a>
       </div>
     </div>
     <!--  筛选区域 -->
@@ -46,35 +47,42 @@
         {{ toggleSearchStatus ? $t('putAway') : $t('open') }}
       </div>
     </div>
-    <!--  查询结果展示区域  -->
+    <template v-if="dataSource && dataSource.length > 0">
-    <div class="result-wrapper">
+      <!--  查询结果展示区域  -->
-      <div class="result-div" v-for="item in dataSource" :key="item.standardNumber">
+      <div class="result-wrapper">
-        <div class="result-title-wrapper">
+        <div class="result-div" v-for="item in dataSource" :key="item.standardNumber">
-          <p class="result-title">{{ item.standard_number + ' ' + item.standard_name }}</p>
+          <div class="result-title-wrapper">
-          <p class="result-source">{{ item.source }}</p>
+            <p class="result-title">{{ item.standard_number + ' ' + item.standard_name }}</p>
-          <p class="result-date">{{ item.publishDate }}</p>
+            <p class="result-source">{{ item.source }}</p>
-        </div>
+            <p class="result-date">{{ item.publishDate }}</p>
-        <div class="result-content-wrapper">
+          </div>
-          <span class="result-field-span" v-for="field in formInLine" :key="field.dbFieldName">{{field.dbFieldTxt}}: {{ item[field.dbFieldName] || '--' }}</span>
+          <div class="result-content-wrapper">
+            <span class="result-field-span" v-for="field in formInLine" :key="field.dbFieldName">{{field.dbFieldTxt}}: {{ item[field.dbFieldName] || '--' }}</span>
+          </div>
         </div>
       </div>
-    </div>
+      <a-pagination
-    <a-pagination
+        v-if="dataSource && dataSource.length > 0"
-      v-if="dataSource && dataSource.length > 0"
+        class="page-content"
-      class="page-content"
+        show-quick-jumper
-      show-quick-jumper
+        show-size-changer
-      show-size-changer
+        v-model="ipagination.current"
-      v-model="ipagination.current"
+        :pageSize="ipagination.pageSize"
-      :pageSize="ipagination.pageSize"
+        :pageSizeOptions="ipagination.pageSizeOptions"
-      :pageSizeOptions="ipagination.pageSizeOptions"
+        :total="ipagination.total"
-      :total="ipagination.total"
+        :showTotal="ipagination.showTotal"
-      :showTotal="ipagination.showTotal"
+      />
-    />
+    </template>
+    <a-empty v-else />
+
+    <search-history-modal ref="searchHistoryModal"></search-history-modal>
   </a-card>
 </template>
 
 <script>
 import { ajaxGetDictItems, getCarTypeProjectList } from '@/api/api'
+import SearchHistoryModal from './modules/SearchHistoryModal'
+import { getSearchParamNum, getSearchParamNumFullText } from '@/api/dashboard'
 
 // 国内的其他检索条件
 const domesticOtherOptions = {
@@ -173,30 +181,31 @@ const enterpriseOtherOptions = {
 
 export default {
   name: 'GeneralSearch',
+  components: { SearchHistoryModal },
   data () {
     return {
       searchValue: '', // 搜索框内容
       toggleSearchStatus: false, // 检索条件收缩还是展开， false收缩状态
       retrievalModeOptions: [
-        { key: 1, label: '全文检索' },
+        { key: '1', label: '全文检索' },
-        { key: 2, label: '标题检索' }
+        { key: '2', label: '标题检索' }
       ], // 检索方式可选择项
-      retrievalModeCurrent: 1, // 检索方式当前选中项
+      retrievalModeCurrent: '1', // 检索方式当前选中项
       resourceTypeOptions: [
-        { key: 1, label: '全部' },
+        { key: 'all', label: '全部' },
-        { key: 2, label: '国内标准法规' },
+        { key: '1', label: '国内标准法规' },
-        { key: 3, label: '海外标准法规' },
+        { key: '2', label: '海外标准法规' },
-        { key: 4, label: '企业标准' },
+        { key: '3', label: '企业标准' },
-        { key: 5, label: '动态消息' }
+        { key: '4', label: '动态消息' }
       ], // 资源类型可选择项
-      resourceTypeCurrent: 1, // 资源类型当前选中项
+      resourceTypeCurrent: 'all', // 资源类型当前选中项
       selectOptions: {}, // 其他筛选条件
       dataSource: [
-        { standard_number: 'GB 7258-12', standard_name: '机动车安全', source: '国内标准法规', publishDate: '2023-08-25' },
+        // { standard_number: 'GB 7258-12', standard_name: '机动车安全', source: '国内标准法规', publishDate: '2023-08-25' },
-        { standard_number: 'GB 7258-12', standard_name: '机动车安全', source: '国内标准法规', publishDate: '2023-08-25' },
+        // { standard_number: 'GB 7258-12', standard_name: '机动车安全', source: '国内标准法规', publishDate: '2023-08-25' },
-        { standard_number: 'GB 7258-12', standard_name: '机动车安全', source: '国内标准法规', publishDate: '2023-08-25' },
+        // { standard_number: 'GB 7258-12', standard_name: '机动车安全', source: '国内标准法规', publishDate: '2023-08-25' },
-        { standard_number: 'GB 7258-12', standard_name: '机动车安全', source: '国内标准法规', publishDate: '2023-08-25' },
+        // { standard_number: 'GB 7258-12', standard_name: '机动车安全', source: '国内标准法规', publishDate: '2023-08-25' },
-        { standard_number: 'GB 7258-12', standard_name: '机动车安全', source: '国内标准法规', publishDate: '2023-08-25' }
+        // { standard_number: 'GB 7258-12', standard_name: '机动车安全', source: '国内标准法规', publishDate: '2023-08-25' }
       ],
       formInLine: [
         {
@@ -231,31 +240,45 @@ export default {
   methods: {
     // 更新selectOptions中的options
     initSelectOptionsData () {
-      for (const item in this.selectOptions) {
+      // for (const item in this.selectOptions) {
-        if (this.selectOptions[item].code) {
+      //   if (this.selectOptions[item].code) {
-          ajaxGetDictItems(this.selectOptions[item].code).then(res => {
+      //     ajaxGetDictItems(this.selectOptions[item].code).then(res => {
-            if (res.success) {
+      //       if (res.success) {
-              this.selectOptions[item].options = res.result
+      //         this.selectOptions[item].options = res.result
-              this.selectOptions[item].options.unshift({ text: '全部', title: '全部', value: 'all' })
+      //         this.selectOptions[item].options.unshift({ text: '全部', title: '全部', value: 'all' })
-            } else {
+      //       } else {
-              this.selectOptions[item].options = []
+      //         this.selectOptions[item].options = []
-            }
+      //       }
-          })
+      //     })
-        } else if (this.selectOptions[item].href) {
+      //   } else if (this.selectOptions[item].href) {
-          this.selectOptions[item].href().then(res => {
+      //     this.selectOptions[item].href().then(res => {
-            if (res.success) {
+      //       if (res.success) {
-              this.selectOptions[item].options = res.result
+      //         this.selectOptions[item].options = res.result
-              this.selectOptions[item].options.unshift({ text: '全部', title: '全部', value: 'all' })
+      //         this.selectOptions[item].options.unshift({ text: '全部', title: '全部', value: 'all' })
-            } else {
+      //       } else {
-              this.selectOptions[item].options = []
+      //         this.selectOptions[item].options = []
-            }
+      //       }
-          })
+      //     })
-        }
+      //   }
-      }
+      // }
     },
     // 获取要显示数量的筛选条件的数据
     initFilterData () {
-
+      const param = {}
+      param.resourceType = this.resourceTypeCurrent === 'all' ? null : this.resourceTypeCurrent
+      param.searchContent = this.searchValue
+      param.searchMode = this.retrievalModeCurrent
+      let func
+      if (this.retrievalModeCurrent === '1') {
+        func = getSearchParamNumFullText
+      } else {
+        func = getSearchParamNum
+      }
+      func(param).then(res => {
+        if (res.success) {
+          this.selectOptions = res.result
+        }
+      })
     },
     // 查询
     onSearch () {},
@@ -279,7 +302,8 @@ export default {
         this.selectOptions = {}
       }
       // 更新其他筛选项的数据
-      this.initSelectOptionsData()
+      // this.initSelectOptionsData()
+      this.initFilterData()
     },
     // 其他检索条件改变
     selectOptionsChange (changeKey, value) {
@@ -294,6 +318,10 @@ export default {
       this.$router.push({
         path: '/advancedSearch'
       })
+    },
+    // 点击检索历史
+    clickSearchHistory () {
+      this.$refs.searchHistoryModal.open()
     }
   }
 }

src/views/dashboard/search/modules/SearchHistoryModal.vue

@@ -0,0 +1,75 @@
+<template>
+  <j-modal
+    :title="$t('dashboard.generalSearch.searchHistory')"
+    :maskClosable="false"
+    :width="width"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    switchFullscreen
+    @cancel="handleCancel">
+
+    <a-spin :spinning="confirmLoading">
+      <template v-if="model">
+        <!--<div class="record-item" v-for="record in recordList" :key="record.id">-->
+        <!--  {{ record.content }}-->
+        <!--</div>-->
+      </template>
+      <a-empty v-else />
+    </a-spin>
+
+    <template v-slot:footer>
+      <a-button @click="handleBatchDel">{{ $t('batchDelete') }}</a-button>
+      <a-button @click="handleCancel">{{ $t('close') }}</a-button>
+    </template>
+  </j-modal>
+</template>
+
+<script>
+import { getSearchHistoryData } from '../../../../api/dashboard'
+
+export default {
+  name: 'SearchHistoryModal',
+  data () {
+    return {
+      width: 800,
+      visible: false,
+      confirmLoading: false,
+      model: {},
+      page: {
+        pageNo: 1,
+        pageSize: 50
+      }
+    }
+  },
+  mounted () {
+    this.initData()
+  },
+  methods: {
+    open () {
+      this.visible = true
+    },
+    // 获取列表数据
+    initData () {
+      const param = {}
+      param.pageNo = this.page.pageNo
+      param.pageSize = this.page.pageSize
+      getSearchHistoryData(param).then(res => {
+        if (res.success) {
+          this.model = res.result
+          console.log(res.result)
+        }
+      })
+    },
+    // 批量删除
+    handleBatchDel () {},
+    // 取消
+    handleCancel () {
+      this.visible = false
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue

@@ -1,5 +1,5 @@
 <template>
-  <internal-detail-page :title="pageTitle" :content-padding="0">
+  <internal-detail-page :title="pageTitle" :content-padding="0" :loading="loading">
     <!--  标题右侧tab  -->
     <template v-slot:titleRightCustom>
       <div class="table-operator-tab">
@@ -81,7 +81,7 @@
     </div>
     <!--  人员信息  -->
     <div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
-      <process-detail-list >
+      <process-detail-list>
         <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNode + ''"></personnel-info>
       </process-detail-list>
     </div>
@@ -160,15 +160,6 @@ export default {
     }
   },
   mounted () {
-    // 获取人员信息结构
-    this.getPersonInfoStructure(ProcessKey.ES_RECHECK.value)
-    if (this.$route.query.taskId) {
-      this.currentNodeName = this.$route.query.taskName
-      // 有流程id说明是从流程中心来的，需要初始化数据
-      this.getProcessData(this.$route.query.taskId)
-    } else {
-      this.currentNodeName = '发起人发起'
-    }
     // 初始化节点
     const taskName = this.$route.query.taskName
     if (taskName) {
@@ -189,14 +180,26 @@ export default {
         this.currentNode = 999
       }
     }
-    if (this.currentNode === 1) {
+    // 获取人员信息结构
-      this.disabled = false
+    this.getPersonInfoStructure(ProcessKey.ES_RECHECK.value, () => {
-      // 是节点1的话还需要设置是联络人发起还是标准化发起 ？？
+      // 获取完人员信息结构，初始化人员信息是否可更改
-      this.initRole = 'contact'
+      if (this.currentNode === 1) {
+        this.disabled = false
+        // 是节点1的话还需要设置是联络人发起还是标准化发起 ？？
+        this.initRole = 'contact'
+        this.initPersonInfoData(true)
+      } else {
+        this.disabled = true
+        // 如果不是第一个节点，人员信息全部不可选
+        this.initPersonInfoData(false)
+      }
+    })
+    if (this.$route.query.taskId) {
+      this.currentNodeName = this.$route.query.taskName
+      // 有流程id说明是从流程中心来的，需要初始化数据
+      this.getProcessData(this.$route.query.taskId)
     } else {
-      this.disabled = true
+      this.currentNodeName = '发起人发起'
-      // 如果不是第一个节点，人员信息全部不可选
-      this.initPersonInfoData()
     }
     // 如果是查看进入的，不可编辑，不可操作
     if (this.$route.query.onlyLook) {
@@ -248,7 +251,6 @@ export default {
       },
       formInline: {},
       approvalInfoForm: this.$form.createForm(this), // 审批信息表单
-      personnelInfoData: [],
       url: {
         list: '' // 人员信息的右侧表格获取接口
       }
@@ -257,19 +259,25 @@ export default {
   methods: {
     // 根据流程id获取数据并回显
     getProcessData (taskId) {
+      this.loading = true
       enStandardRecheckGetDataById(taskId).then(res => {
         if (res.success) {
           this.model = res.result
           this.$nextTick(() => {
             // 初始化流程信息
-            this.processInfoForm.setFieldsValue(pick(this.model[0], 'processName', 'deadlineDate', 'processDescription'))
+            this.processInfoForm.setFieldsValue(pick(this.model.common, 'processName', 'deadlineDate', 'processDescription'))
             // 初始化流程审批信息，todo：需要判断是不是草稿进来的，草稿进来的才回显审批信息
             // this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'remarks', 'attachment'))
+            // 初始化业务基本信息中组件内容
+            if (this.$refs.baseInfoRef) {
+              this.$refs.baseInfoRef.initData(this.model.data)
+            }
           })
-          // 初始化业务基本信息中组件内容
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.loading = false
       })
     },
     // 头部tab改变
@@ -339,6 +347,7 @@ export default {
             enStandardRecheckApproval(paramObj).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
+                this.goBack()
               } else {
                 this.$message.warning(res.message)
               }
@@ -366,6 +375,32 @@ export default {
           enStandardRecheckTurnTo(param).then(res => {
             if (res.success) {
               this.$message.success(res.message)
+              this.goBack()
+            } else {
+              this.$message.warning(res.message)
+            }
+          }).finally(() => {
+            this.loading = false
+          })
+        }
+      })
+    },
+    // 提交
+    handleSubmit () {
+      if (this.loading) return
+      this.approvalInfoForm.validateFields(async (err, values) => {
+        const data = await this.$refs.baseInfoRef.getDataValidate()
+        if (!err && data) {
+          this.loading = true
+          const param = {}
+          param.common = Object.assign({}, values)
+          param.common.taskId = this.$route.query.taskId
+          param.data = Object.assign({}, data.formInline)
+          console.log(param)
+          enStandardRecheckAgree(param).then(res => {
+            if (res.success) {
+              this.$message.success(res.message)
+              this.goBack()
             } else {
               this.$message.warning(res.message)
             }
@@ -381,11 +416,13 @@ export default {
       this.approvalInfoForm.validateFields((err, values) => {
         if (!err) {
           this.loading = true
-          const param = Object.assign({}, values)
+          const param = {}
-          param.taskId = this.$route.query.taskId
+          param.common = Object.assign({}, values)
+          param.common.taskId = this.$route.query.taskId
           enStandardRecheckAgree(param).then(res => {
             if (res.success) {
               this.$message.success(res.message)
+              this.goBack()
             } else {
               this.$message.warning(res.message)
             }
@@ -406,11 +443,13 @@ export default {
         this.approvalInfoForm.validateFields((err, values) => {
           if (!err) {
             this.loading = true
-            const param = Object.assign({}, values)
+            const param = {}
-            param.taskId = this.$route.query.id
+            param.common = Object.assign({}, values)
+            param.common.taskId = this.$route.query.taskId
             enStandardRecheckReject(param).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
+                this.goBack()
               } else {
                 this.$message.warning(res.message)
               }

src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue

@@ -155,9 +155,8 @@ export default {
   methods: {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
-      this.data = data
       // 给表单赋值
-      // this.formInline =
+      this.formInline = data
     },
     // 外层要获取数据
     getData () {

src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue

@@ -9,12 +9,12 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}
                 </span>
           </div>
-          <a-form-model-item class="item-model" prop="enStandardNo">
+          <a-form-model-item class="item-model" prop="standardNumber">
             <standard-selection :source="StandardSource.ENTERPRISE.value"
                                 disabled
                                 :disabledSourceSearch="true"
                                 type="radio"
-                                v-model="formInline.enStandardNo" />
+                                v-model="formInline.standardNumber" />
           </a-form-model-item>
         </div>
         <!--  企标名称  -->
@@ -24,9 +24,9 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardName') }}
                 </span>
           </div>
-          <a-form-model-item class="item-model" prop="enStandardName">
+          <a-form-model-item class="item-model" prop="standardName">
             <a-input class="box-input"
-                     v-model="formInline.enStandardName"
+                     v-model="formInline.standardName"
                      :maxLength="50"
                      disabled
                      @change="event => event.target.value = event.target.value.trim()"
@@ -85,9 +85,9 @@
                   {{ $t('workCenter.enStandardChange.materialDate') }}
                 </span>
           </div>
-          <a-form-model-item class="item-model" prop="materialDate">
+          <a-form-model-item class="item-model" prop="implementationDate">
             <a-date-picker
-              v-model="formInline.materialDate"
+              v-model="formInline.implementationDate"
               :showTime="false"
               disabled
               value-format="YYYY-MM-DD">
@@ -118,8 +118,8 @@
                   {{ $t('workCenter.enStandardRecheck.recheck') }}
                 </span>
           </div>
-          <a-form-model-item class="item-model" prop="recheck">
+          <a-form-model-item class="item-model" prop="recheckAdvice">
-            <a-radio-group v-model="formInline.recheck">
+            <a-radio-group v-model="formInline.recheckAdvice">
               <!--  继续有效  -->
               <a-radio :value="Recheck.STAND_GOOD.value">
                 {{ $t('workCenter.enStandardRecheck.standGood') }}
@@ -166,7 +166,7 @@ export default {
       formInline: {},
       rules: {
         // 复审
-        recheck: [
+        recheckAdvice: [
           {
             required: true,
             message: this.$t('workCenter.enStandardRecheck.recheck') + this.$t('cannotEmpty'),
@@ -177,11 +177,12 @@ export default {
     }
   },
   methods: {
-    // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
+    // 拿到外面传进来的数据初始化
     initData (data) {
-      this.data = data
       // 给表单赋值
-      // this.formInline =
+      this.$nextTick(() => {
+        this.formInline = Object.assign({}, data)
+      })
     },
     // 外层要获取数据
     getData () {
@@ -191,14 +192,16 @@ export default {
       return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验
-    getDataValidate (callback) {
+    async getDataValidate () {
-      this.$refs.ruleForm.validate(valid => {
+      let data = {}
+      await this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          const data = {}
           data.formInline = this.formInline
-          callback(data)
+        } else {
+          data = false
         }
       })
+      return data
     },
   }
 }

src/views/workCenter/enterpriseStandardRecheck/modules/RecheckApproveBaseInfo.vue

@@ -139,16 +139,14 @@ export default {
       Recheck,
       StandardSource,
       formInline: {},
-      rules: {},
+      rules: {}
-      data: {}
     }
   },
   methods: {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
-      this.data = data
       // 给表单赋值
-      // this.formInline =
+      this.formInline = data
     }
   }
 }

src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue

@@ -10,12 +10,12 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}
                 </span>
           </div>
-          <a-form-model-item class="item-model" prop="enStandardNo">
+          <a-form-model-item class="item-model" prop="standardNumber">
             <standard-selection :source="StandardSource.ENTERPRISE.value"
                                 :disabled="disabled"
                                 :disabledSourceSearch="true"
                                 type="radio"
-                                v-model="formInline.enStandardNo"
+                                v-model="formInline.standardNumber"
                                 @listChange="listChange" />
           </a-form-model-item>
         </div>
@@ -26,9 +26,9 @@
                   {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardName') }}
                 </span>
           </div>
-          <a-form-model-item class="item-model" prop="enStandardName">
+          <a-form-model-item class="item-model" prop="standardName">
             <a-input class="box-input"
-                     v-model="formInline.enStandardName"
+                     v-model="formInline.standardName"
                      :maxLength="50"
                      disabled
                      @change="event => event.target.value = event.target.value.trim()"
@@ -78,7 +78,7 @@ export default {
       formInline: {},
       rules: {
         // 企标编号
-        enStandardNo: [
+        standardNumber: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + this.$t('cannotEmpty'),
@@ -93,16 +93,14 @@ export default {
             trigger: 'change'
           }
         ]
-      },
+      }
-      data: {}
     }
   },
   methods: {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
-      this.data = data
       // 给表单赋值
-      // this.formInline =
+      this.formInline = data
     },
     // 外层要获取数据
     getData () {
@@ -127,10 +125,10 @@ export default {
     listChange (value) {
       console.log(value)
       // 企标名称
-      this.formInline.enStandardName = value[0].standardName
+      this.formInline.standardName = value[0].standardName
       // 主起草人赋值给联络人
       // this.formInline.contactPerson = value[0].
-      this.$emit('processNameChange', (this.formInline.enStandardNo || '') + '-' + (this.formInline.enStandardName || '') + '-' + '复审')
+      this.$emit('processNameChange', (this.formInline.standardNumber || '') + '-' + (this.formInline.standardName || '') + '-' + '复审')
     },
     // 选择用户得到用户名
     userSelectNameChange (value, fieldName) {

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

@@ -131,8 +131,7 @@ export default {
       url: {
         list: '/workCenter/getTodoList'
       },
-      currentTurnTo: {}, // 当前转办
+      currentTurnTo: {} // 当前转办
-
     }
   },
   methods: {
@@ -157,6 +156,30 @@ export default {
         case '9':
           path = '/workCenter/annualRevisionPlanStandardizationInit/revisionPlanStandardizationInitFlow'
           break
+        // 企标制修订流程
+        case '10':
+          path = '/workCenter/enterpriseStandardRevision/enterpriseStandardRevisionFlow'
+          break
+        // 企标更改流程
+        case '11':
+          path = '/workCenter/enterpriseStandardChange/enterpriseStandardChangeFlow'
+          break
+        // 企标复审流程
+        case '12':
+          path = '/workCenter/enterpriseStandardRecheck/enterpriseStandardRecheckFlow'
+          break
+        // 企标废止流程
+        case '13':
+          path = '/workCenter/enterpriseStandardAnnul/enterpriseStandardAnnulFlow'
+          break
+        // 企标封存流程
+        case '14':
+          path = '/workCenter/enterpriseStandardSealSave/enterpriseStandardSealSaveFlow'
+          break
+        // 已封存企标启用流程
+        case '15':
+          path = '/workCenter/enterpriseStandardStartUse/enterpriseStandardStartUseFlow'
+          break
       }
       this.$router.push({
         path: path,