Merge branch 'dev_2nd_period_test' into 'dev_third_stage'

# Conflicts:
#   jero-web/src/common/lang/en-us.js
#   jero-web/src/common/lang/zh-cn.js
#   jero-web/src/views/projectManagement/components/TaskList.vue
#   jero-web/src/views/projectManagement/components/cuibanModel.vue

jero-web/src/common/lang/en-us.js

@@ -793,6 +793,7 @@ module.exports = {
   parameter: 'Parameter',
   changeExtension: 'Change Extension',
   addDetailList: 'Add',
+  editDetailList:'Edit DetailList',
   detailedList: 'DetailedList',
   copyParamDetailList: 'Copy Parameter List',
   collectionCompletionTime: 'Collection Completed',
@@ -1329,5 +1330,35 @@ module.exports = {
   thereForTheCurrentlySelectedData:'There is no standard breakdown for the currently selected data',
   secondaryDirectory:'Secondary Directory',
   OnlyPersonsCanBeSelected:'The maximum upper limit is exceeded; Only 100 persons can be selected',
+  projectVersion:'Project Version',
+  softwareVersion:'Authentication Software version',
+  versionStatistics:'Version statistics',
+  addSubproject:'Add Subproject',
+  Topping:'Topping',
+  cancelTopping:'Cancel Topping',
+  relatedProjectVersion:'Related project version',
+  taskType:'Task Type',
+  taskStatus:'Task Status',
+  taskConfirmationHandling:'Task confirmation handling',
+  relatedVersion:'Related version',
+  filledBy:'Filled by',
+  parameterToBeInitiated:'Parameter to be initiated',
+  listTaskConfirmation:'List task confirmation',
+  completednum: 'Quantity to be filled',
+  filledBynum:'Filled by',
+  parameterToBeInitiatednum:'Parameter to be initiated',
+  listToConfirm:'List to confirm',
+  toSubmit:'To submit',
+  toAudit:'To audit',
+  secondaryDirectory:'Secondary Directory',
+  OnlyPersonsCanBeSelected:'The maximum upper limit is exceeded; Only 100 persons can be selected',
+  projectVersion:'Project Version',
+  softwareVersion:'Authentication Software version',
+  versionStatistics:'Version statistics',
+  addSubproject:'Add Subproject',
+  Topping:'Topping',
+  cancelTopping:'Cancel Topping',
+  relatedProjectVersion:'Related project version',
+  Importfailure:'Import failure',
   CuiBan:'CuiBan',
 }

jero-web/src/common/lang/zh-cn.js

@@ -516,8 +516,8 @@ module.exports = {
   AddProcess: '添加流程',
   RelatedItems: '相关项目',
   Sponsor: '发起人',
-  CurrentProcessor: '当前处理人',
-  LastProcessor: '上一处理人',
+  CurrentProcessor: '当前操作人',
+  LastProcessor: '上一操作人',
   ProcessingTime: '办理时间',
   cutoffTime: '截止时间',
   ProcessStatus: '流程状态',
@@ -809,6 +809,7 @@ module.exports = {
   parameter: '参数',
   changeExtension: '变更扩展',
   addDetailList: '添加清单',
+  editDetailList:'编辑清单',
   detailedList: '清单',
   copyParamDetailList: '复制参数清单',
   collectionCompletionTime: '收集完成时间',
@@ -1430,5 +1431,35 @@ module.exports = {
   thereForTheCurrentlySelectedData:'当前所选数据暂无标准分解单',
   secondaryDirectory:'二级目录',
   OnlyPersonsCanBeSelected:'超出最大上限；最多只能选择100个人员',
+  projectVersion:'项目版本',
+  softwareVersion:'认证软件版本',
+  versionStatistics:'版本统计',
+  addSubproject:'添加子项目',
+  Topping:'置顶',
+  cancelTopping:'取消置顶',
+  relatedProjectVersion:'相关项目版本',
+  taskType:'任务类型',
+  taskStatus:'任务状态',
+  taskConfirmationHandling:'任务确认办理',
+  relatedVersion:'相关版本',
+  filledBy:'待分配填写人',
+  parameterToBeInitiated:'参数待发起',
+  listTaskConfirmation:'清单任务确认',
+  completednum: '待填写',
+  filledBynum:'待分配填写人',
+  parameterToBeInitiatednum:'参数待发起',
+  listToConfirm:'待确认',
+  toSubmit:'待提交',
+  toAudit:'待审核',
+  secondaryDirectory:'二级目录',
+  OnlyPersonsCanBeSelected:'超出最大上限；最多只能选择100个人员',
+  projectVersion:'项目版本',
+  softwareVersion:'认证软件版本',
+  versionStatistics:'版本统计',
+  addSubproject:'添加子项目',
+  Topping:'置顶',
+  cancelTopping:'取消置顶',
+  relatedProjectVersion:'相关项目版本',
+  Importfailure:'导入失败',
   CuiBan:'催办',
 }

jero-web/src/components/CollectionType/index.vue

@@ -29,6 +29,7 @@
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
                        @input="onInput"
+                       :maxLength="1000"
                        onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
                        v-model="item.dataValue"/>
             </div>

jero-web/src/components/CollectionTypeDisabled/index.vue

@@ -27,6 +27,7 @@
               <a-input class="box-input inputWid"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
                        @input="onInput"
+                       :maxLength="1000"
                        onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
                        v-model="item.dataValue"/>
             </div>

jero-web/src/components/ImportFileOnlyList/index.vue

@@ -54,6 +54,10 @@ export default {
       type: String,
       default: ''
     },
+    paramsManifestId: {
+      type: String,
+      default: ''
+    },
     projectLibraryId: {
       type: String,
       default: ''
@@ -76,6 +80,8 @@ export default {
         return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&paramsTemplateId=' + this.paramsTemplateId
       } else if (this.projectLibraryId) {
         return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectLibraryId=' + this.projectLibraryId
+      } else if (this.paramsManifestId) {
+        return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&paramsManifestId=' + this.paramsManifestId
       }
       return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut
     }

jero-web/src/components/ImportFileOnlyListtag/index.vue

@@ -0,0 +1,284 @@
+<template>
+  <div>
+    <a-upload name="file" :showUploadList="false"
+              class="upload-text"
+              :multiple="false" :headers="tokenHeader"
+              :action="importUrl"
+              @change="handleImport"
+              :accept="accept">
+      <a-icon type="import" :rotate="270"/>
+      {{$t('import')}}
+    </a-upload>
+    <div class="loading-box" v-if="spinning">
+      <div class="loading-content">
+        <a-icon class="loading" type="loading"/>
+        <div class="loading-tips">
+          {{this.$t('Importing')}}...
+        </div>
+      </div>
+    </div>
+    <!--    错误数据提示-->
+    <a-modal
+      :title="$t('Importfailure')"
+      :width="860"
+      v-model="visibleoperationFailed"
+      :maskClosable="false"
+      :footer="null"
+    >
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <div>
+            <span style='font-size: 16px;margin-bottom: 20px;' v-for='(item,key) in operationFailedValue'>
+              <span v-html="item"></span>
+            </span>
+          </div>
+        </a-col>
+      </a-row>
+      <div class="imports-footer">
+        <div class="imports-footer-wrap">
+          <a-button class="imports-btn" type="primary" @click="cancleoperationFailed">{{$t('cancel')}}</a-button>
+        </div>
+      </div>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+import {ACCESS_TOKEN} from '@/store/mutation-types'
+import eventBUs from '../../common/event'
+import {Modal} from 'ant-design-vue'
+import store from '@/store'
+export default {
+  name: 'index',
+  props: {
+    url: {
+      type: Object,
+      default: {}
+    },
+    //判断当前文档库还是其余的页面
+    isTrue: {
+      type: Boolean,
+      default: false
+    },
+    accept: {
+      type: String,
+      default: ''
+    },
+    projectId: {
+      type: String,
+      default: ''
+    },
+    dummyInventoryBaseId: {
+      type: String,
+      default: ''
+    },
+    paramsTemplateId: {
+      type: String,
+      default: ''
+    },
+    paramsManifestId: {
+      type: String,
+      default: ''
+    },
+    projectLibraryId: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      tokenHeader: {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)},
+      spinning: false,
+      operationFailedValue:[],
+      visibleoperationFailed: false, // 数据失败的弹框
+      cut: ''
+    }
+  },
+  computed: {
+    importUrl() {
+      if (this.projectId) {
+        return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectId=' + this.projectId
+      } else if (this.dummyInventoryBaseId) {
+        return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&dummyInventoryBaseId=' + this.dummyInventoryBaseId
+      } else if (this.paramsTemplateId) {
+        return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&paramsTemplateId=' + this.paramsTemplateId
+      } else if (this.projectLibraryId) {
+        return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectLibraryId=' + this.projectLibraryId
+      } else if (this.paramsManifestId) {
+        return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&paramsManifestId=' + this.paramsManifestId
+      }
+      return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut
+    }
+  },
+  mounted() {
+    let long = localStorage.getItem('language')
+    this.cut = ''
+    if (long && long == 'zh-cn') {
+      this.cut = 'cn'
+    } else if (long && long == 'en-us') {
+      this.cut = 'en'
+    }
+  },
+  methods: {
+    handleImport(info) {
+      this.spinning = true
+      if (info.file.status !== 'uploading') {
+        this.$emit('getList')
+      }
+
+      if (info.file.status === 'done') {
+        if (info.file.response.success) {
+          if (info.file.response.code === 201) {
+            let {message} = info.file.response
+            let {name} = info.file
+            let content = []
+            if (message) {
+              message = message.split('</br>')
+              message.forEach(res => {
+                if (res) {
+                  content.push( < div > {res} < /div>)
+                }
+              })
+            }
+            this.$warning({
+              title: name,
+              content: (
+                < div >
+                  {content}
+                < /div>
+              )
+            })
+          } else {
+            if (this.isTrue) {
+              this.$emit('getList')
+            } else {
+              eventBUs.$emit('searchReset')
+            }
+            console.log(info.file.response.message)
+            if(info.file.response.message == null){
+              console.log(111)
+              this.operationFailedValue = info.file.response.result
+              this.visibleoperationFailed = true
+            }else{
+              this.$message.success(info.file.response.message || `${info.file.name} 文件导入成功`)
+            }
+          }
+          this.spinning = false
+        } else {
+          let data = info.file.response
+          const token = Vue.ls.get(ACCESS_TOKEN)
+          if ((token && data.message.includes('Token失效')) || (token && data.message.includes('token')) || (token && data.message.includes('用户不存在'))) {
+            this.spinning = false
+            Modal.error({
+              title: '登录已过期',
+              content: '很抱歉，登录已过期，请重新登录',
+              okText: '重新登录',
+              mask: false,
+              onOk: () => {
+                store.dispatch('Logout').then(() => {
+                  Vue.ls.remove(ACCESS_TOKEN)
+                  window.location.reload()
+                })
+              }
+            })
+            return
+          }
+          let {message} = info.file.response
+          let {name} = info.file
+          let content = []
+          if (message) {
+            message = message.split('</br>')
+            message.forEach(res => {
+              if (res) {
+                content.push( < div > {res} < /div>)
+              }
+            })
+          }
+          this.$warning({
+            title: name,
+            content: (
+              < div >
+                {content}
+              < /div>
+            )
+          })
+          this.spinning = false
+        }
+      } else if (info.file.status === 'error') {
+        if (info.file.response.status === 500) {
+          let data = info.file.response
+          const token = Vue.ls.get(ACCESS_TOKEN)
+          if ((token && data.message.includes('Token失效')) || (token && data.message.includes('token')) || (token && data.message.includes('用户不存在'))) {
+            Modal.error({
+              title: '登录已过期',
+              content: '很抱歉，登录已过期，请重新登录',
+              okText: '重新登录',
+              mask: false,
+              onOk: () => {
+                store.dispatch('Logout').then(() => {
+                  Vue.ls.remove(ACCESS_TOKEN)
+                  window.location.reload()
+                })
+              }
+            })
+          }
+          this.spinning = false
+        } else {
+          this.$message.error(`文件导入失败: ${info.file.msg} `)
+          this.spinning = false
+        }
+      }
+    },
+    // 错误数据的弹框
+    cancleoperationFailed() {
+      this.operationFailedValue = []
+      this.visibleoperationFailed = false
+    },
+  }
+}
+</script>
+
+<style>
+.upload-text .ant-upload {
+  font-size: 14px !important;
+  font-weight: 400 !important;
+  color: #040B29 !important;
+}
+</style>
+<style scoped lang="less">
+.loading-box {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 9999900;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(255, 255, 255, 0.9);
+  border-radius: 8px;
+  user-select: none;
+
+  .loading-content {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    color: #21c9cc;
+    transform: translate(-50%, -50%);
+    text-align: center;
+
+    .loading {
+      font-size: 28px;
+    }
+
+    .spin-loading {
+      animation: rotating 2s linear infinite;
+    }
+
+    .loading-tips {
+      margin-top: 5px;
+      font-size: 16px;
+      color: #21c9cc;
+    }
+  }
+}
+</style>

jero-web/src/components/menu/index.js

@@ -109,8 +109,10 @@ export default {
         props = { to: { path: menu.path } }
       }
 
-      const attrs = { href: menu.path, target: menu.meta.target , title:menu.meta.title }
-
+      const attrs = { href: menu.path, target: menu.meta.target, title: menu.meta.title }
+      if (menu.meta && menu.meta.existTask) {
+        attrs.style = 'color:red'
+      }
       if (menu.children && menu.alwaysShow) {
         // 把有子菜单的 并且 父菜单是要隐藏子菜单的
         // 都给子菜单增加一个 hidden 属性
@@ -162,7 +164,8 @@ export default {
       span
       slot = 'title' >
         { this.renderIcon(menu.meta.icon) }
-        < span title={menu.meta.title}> { menu.meta.title } < /span>
+        < span
+      title = { menu.meta.title } > { menu.meta.title } < /span>
         < /span>
       {
         itemArr

jero-web/src/components/tools/HeaderNotice.vue

@@ -15,7 +15,10 @@
               <a-list-item :key="index" v-for="(record, index) in announcement1" v-if="index <= 4">
                 <div style="margin-left: 5%;width: 80%;">
                   <p style="overflow: hidden; text-overflow: ellipsis;white-space: nowrap;color:#00B3BE">
-                    <a :title="record.titile" @click="showAnnouncement(record)">{{ record.titile }}</a>
+                    <a :title="language == 'zh-cn'?record.msgContentCn:record.msgContent"
+                       @click="showAnnouncement(record)">
+                      {{ language == 'zh-cn'?record.msgContentCn:record.msgContent }}
+                    </a>
                   </p>
                 </div>
               </a-list-item>
@@ -50,6 +53,7 @@
     data() {
       return {
         loadding: false,
+        language: '',
         url: {
           listCementByUser: '/sys/sysAnnouncementSend/getMessageUnreadList',
           editCementSend: '/sys/sysAnnouncementSend/editByAnntIdAndUserId',
@@ -91,6 +95,7 @@
     },
     created() {
       this.loadData()
+      this.language = localStorage.getItem('language') || ''
       // this.initWebSocket()
       if (store.getters.userInfo) {
         this.$socketPublic.dispatch('webSocketInit')//初始化ws
@@ -110,6 +115,11 @@
     //   clearInterval(this.timer)
     // },
     methods: {
+      getText(str) {
+        let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
+        //.replace(/\s/g, '') //这里是去除空格
+        return words
+      },
       loadData() {
         getAction(this.url.listCementByUser).then((res) => {
           if (res.success) {
@@ -134,9 +144,16 @@
       showAnnouncement(record) {
         getAction(this.url.readAllMsg, { ids: record.id }).then((res) => {
         })
+        if (this.language == 'zh-cn') {
+          localStorage.setItem('msgContent', record.msgContentCn)
+        } else {
+          localStorage.setItem('msgContent', record.msgContent)
+        }
         this.$router.push({
-          path: '/system/MessageDetails',
-          query: record
+          path: '/isps/userAnnouncement',
+          query: {
+            Date: Date.now()
+          }
         })
       },
       toMyAnnouncement() {

jero-web/src/views/dashboard/components/myList.vue

@@ -10,11 +10,17 @@
     <div class="myList-box-content" v-if="dataSource.length > 0">
       <div class="myList-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="prcClick(item)">
         <div class="top">
-          <span class="top-text" :title="item.prcName">{{item.prcName}}</span>
-<!--          <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>-->
+          <span class="top-text" v-if="item.flowType == 10"
+                :title="item.flowTypeShow+'-'+item.projectName">
+            {{item.flowTypeShow+'-'+item.projectName}}
+          </span>
+          <span class="top-text" :title="item.flowTypeShow+'-'+item.serialNumber">
+            {{item.flowTypeShow+'-'+item.serialNumber}}
+          </span>
+          <!--          <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>-->
         </div>
         <div class="button">
-          {{item.creatTime}}
+          {{item.endTime}}
         </div>
         <div class="with">
           {{$t('Pending')}}
@@ -43,9 +49,13 @@
         dataSource: [],
         loading: false,
         prcTypeName: {
-          1: this.$t('taskConfirmationProcess'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
-          6:this.$t('regulatoryTechnologyAssessmentProcess')
+          1: this.$t('listTaskConfirmation'),
+          2: this.$t('designComplianceReview'),
+          3: this.$t('preHomeConfirmation'),
+          4: this.$t('verificationComplianceReview'),
+          10: this.$t('confirmationOfRegulationsList'),
+          5: this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6: this.$t('regulatoryTechnologyAssessmentProcess')
         }
       }
     },
@@ -74,11 +84,11 @@
       queryProcess() {
         this.loading = true
         let parmes = {}
-        parmes.current = this.pageNo
-        parmes.size = this.pageSize
-        parmes.userId = this.userInfo().userId
-        postAction('task/todoTaskList', parmes).then((res) => {
-          this.dataSource = res.list || []
+        parmes.pageNo = this.pageNo
+        parmes.pageSize = this.pageSize
+        // parmes.userId = this.userInfo().userId
+        getAction('/todoCenter/projectProcess/todoTaskList', parmes).then((res) => {
+          this.dataSource = res.result.records || []
           this.loading = false
         })
       },
@@ -88,29 +98,138 @@
         })
       },
       prcClick(row) {
-        // let index = row.taskIds.lastIndexOf(',')
-        // row.taskIds = row.taskIds.slice(0, index)
+        let query = {}
         row.router = this.$route.path
-        if (row.prcType == '1') {
+        if (row.flowType == '1') {
+          query = {
+            taskDefinitionKey: row.taskDefinitionKey,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            prcNum: row.prcNum,
+            isTrue: true
+          }
           let newUrl = this.$router.resolve({
             path: '/handshakeProcess',
-            query: row
+            query: query
           })
           window.open(newUrl.href, '_blank')
-        } else if (row.prcType == '5') {
+        } else if (row.flowType == '10') {
           let newUrl = this.$router.resolve({
-            path: '/regulatoryProcessReview',
-            query: row
+            path: '/ProjectDetails',
+            query: {
+              id: row.projectLibraryId,
+              projectName: row.projectName,
+              projectNameId: row.projectNameId,
+              targetMarket: row.targetMarket,
+              studioEngineer: row.studioEngineer,
+              type: '102'
+            }
           })
           window.open(newUrl.href, '_blank')
-        } else if (row.prcType == '6') {
+        } else if (row.flowType == '2') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            projectLibraryId: row.projectLibraryId,
+            id: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            isDisplay: true,
+            flowType: 2,
+            Sponsor: 'designInitiatorName',
+            personLiable: 'designDutyName',
+            typeOfDeliverables: 'designDeliverableTypeName',
+            deliverableTemplate: 'designDeliverableTemplate',
+            DueDate: 'designDueDate',
+            remarks: 'designRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
           let newUrl = this.$router.resolve({
-            path: '/evaluationProcess',
-            query: row
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '3') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            studioEngineer: row.studioEngineer,
+            projectLibraryId: row.projectLibraryId,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 3,
+            isDisplay: true,
+            id: row.projectLibraryId,
+            Sponsor: 'prehomoInitiatorName',
+            personLiable: 'prehomoDutyName',
+            typeOfDeliverables: 'prehomoDeliverableTypeName',
+            deliverableTemplate: 'prehomoDeliverableTemplate',
+            DueDate: 'prehomoDueDate',
+            remarks: 'prehomoRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '4') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            id: row.projectLibraryId,
+            projectLibraryId: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 4,
+            isDisplay: true,
+            Sponsor: 'verifyInitiatorName',
+            personLiable: 'verifyDutyName',
+            typeOfDeliverables: 'verifyDeliverableTypeName',
+            deliverableTemplate: 'verifyDeliverableTemplate',
+            DueDate: 'verifyDueDate',
+            remarks: 'verifyRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
           })
           window.open(newUrl.href, '_blank')
         }
-      }
+      },
     }
   }
 </script>
@@ -167,6 +286,7 @@
             text-overflow: ellipsis;
             white-space: nowrap;
           }
+
           /*.top-admin {*/
           /*  font-size: 16px;*/
           /*  font-family: Blue Sky Noto;*/

jero-web/src/views/dashboard/components/myNews.vue

@@ -11,8 +11,8 @@
       <div class="myNews-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="magClick(item)">
         <img src="../../../assets/wdxx.png" alt="">
         <div class="content-box">
-          <div class="top" :title="item.titile">
-            {{item.titile}}
+          <div class="top" :title="language == 'zh-cn'?item.msgContentCn:item.msgContent">
+            {{language == 'zh-cn'?item.msgContentCn:item.msgContent}}
           </div>
           <div class="botton">
             {{item.sendTime}}
@@ -44,11 +44,13 @@
         loading: false,
         pageNo: 1,
         pageSize: 4,
-        dataSource: []
+        dataSource: [],
+        language: ''
       }
     },
     mounted() {
       this.getList()
+      this.language = localStorage.getItem('language') || ''
     },
     methods: {
       getList() {
@@ -69,9 +71,16 @@
       magClick(row) {
         getAction(this.url.readAllMsg, { ids: row.id }).then((res) => {
         })
+        if (this.language == 'zh-cn'){
+          localStorage.setItem('msgContent', row.msgContentCn)
+        }else{
+          localStorage.setItem('msgContent', row.msgContent)
+        }
         this.$router.push({
-          path: '/system/MessageDetails',
-          query: row
+          path: '/isps/userAnnouncement',
+          query: {
+            Date: Date.now()
+          }
         })
       },
       moreClick() {

jero-web/src/views/parameter/parameterlist/components/addModel.vue

@@ -225,6 +225,7 @@
                   <a-input class="box-input add-input"
                            :disabled="disabled"
                            type="textarea"
+                           @input="onInput"
                            v-model.trim="formInline.controlValues"
                            :placeholder="$t('PleaseEnter')+$t('NcontrolAlternatives')"/>
                 </a-form-model-item>
@@ -609,9 +610,12 @@ export default {
         };
 
       })
-
-
-
+    },
+    onInput(r) {
+      let value = r.target.value
+      r.target.value = value.replace(/[！!#]/g, '')
+      this.formInline.controlValues = r.target.value
+      this.formInline = {...this.formInline}
     },
     getSysCategoryTree() {
       getAction('/sys/category/getSysCategoryTree', {}).then((res) => {

jero-web/src/views/processCenter/ProcessMapping.vue

@@ -16,7 +16,7 @@
         data() {
             return {
                 name: '',
-                actUrl: 'http://10.0.1.13:17210/bat-wkflow/modeler.html?modelId='//本地
+                actUrl: 'http://localhost:17210/bat-wkflow/modeler.html?modelId='//本地
                 // actUrl: 'http://10.255.35.25:8082/modeler.html?modelId='  //正式
                 // actUrl: 'http://10.255.128.148:8888/modeler.html?modelId='  //测试
             }

jero-web/src/views/processCenter/components/evaluatorFeedback.vue

@@ -15,7 +15,15 @@
                 <span class="title-text-text" :title="$t('complianceResults')">{{$t('complianceResults')}}</span>
               </div>
               <div class="title-text-right" v-if="disabled">
-                {{formInline.complianceResult == 'Compliance'?$t('accord'):$t('nonConformity')}}
+                <span v-if="formInline.complianceResult == 'Compliance'">
+                   {{$t('accord')}}
+                </span>
+                <span v-else-if="formInline.complianceResult == 'Non-Compliance'">
+                    {{$t('nonConformity')}}
+                </span>
+                <span v-else>
+                   --
+                </span>
               </div>
               <a-form-model-item class="itemModel" v-if="!disabled" :prop="!disabled?'complianceResult':''">
                 <a-radio-group style="margin-top: 2px" class="box-input"
@@ -51,7 +59,7 @@
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
                 <div class="title-text-right" :title="item.relatedSection" v-if="disabled">
-                  {{item.relatedSection}}
+                  {{item.relatedSection ?item.relatedSection : '--'}}
                 </div>
                 <a-form-model-item class="itemModel" v-if="!disabled"
                                    :prop="'dataList.'+index+'.relatedSection'"
@@ -73,7 +81,7 @@
                         :title="$t('problemDescription')">{{$t('problemDescription')}}</span>
                 </div>
                 <div class="title-text-right" :title="item.issueOrSuggest" v-if="disabled">
-                  {{item.issueOrSuggest}}
+                  {{item.issueOrSuggest ? item.issueOrSuggest :'--'}}
                 </div>
                 <a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'" v-if="!disabled"
                                    :rules="[{ required: true, message: $t('problemDescription') + $t('cannotEmpty'), trigger: 'blur'},
@@ -121,7 +129,7 @@
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
                 <div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="item.relatedSection">
-                  {{item.relatedSection}}
+                  {{item.relatedSection?item.relatedSection : '--'}}
                 </div>
               </div>
             </a-col>
@@ -132,7 +140,7 @@
                         :title="$t('problemDescription')">{{$t('problemDescription')}}</span>
                 </div>
                 <div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="item.issueOrSuggest">
-                  {{item.issueOrSuggest}}
+                  {{item.issueOrSuggest ? item.issueOrSuggest:'--'}}
                 </div>
               </div>
             </a-col>
@@ -156,12 +164,13 @@
             </a-col>
           </a-row>
         </div>
-        <div class="box-text" style="margin-top: 10px" v-if="disabled">
+        <div class="box-text" style="margin-top: 10px"
+             v-if="disabled && $route.query.taskDefinitionKey == 'fqrsc' && !isTrue">
           <div class="header-text">
             {{$t('sponsorReview')}}
           </div>
         </div>
-        <a-row :gutter="24" v-if="disabled">
+        <a-row :gutter="24" v-if="disabled && $route.query.taskDefinitionKey == 'fqrsc' && !isTrue">
           <a-col :span="24">
             <div class="box-title-text">
               <div class="title-text">
@@ -175,6 +184,18 @@
             </div>
           </a-col>
         </a-row>
+        <!--        <a-row :gutter="24" v-if="disabled && $route.query.taskDefinitionKey == 'fqrsc' && isTrue">-->
+        <!--          <a-col :span="24">-->
+        <!--            <div class="box-title-text">-->
+        <!--              <div class="title-text">-->
+        <!--                <span class="title-text-text" :title="$t('reviewComments')">{{$t('reviewComments')}}</span>-->
+        <!--              </div>-->
+        <!--              <div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="formInline.approvalOpinion">-->
+        <!--                {{formInline.approvalOpinion}}-->
+        <!--              </div>-->
+        <!--            </div>-->
+        <!--          </a-col>-->
+        <!--        </a-row>-->
       </a-form-model>
     </div>
     <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
@@ -259,7 +280,8 @@
         },
         disabled: false,
         uploadIndex: '',
-        dataList: []
+        dataList: [],
+        isTrue: false
       }
     },
     mounted() {
@@ -283,8 +305,14 @@
       })
       if (this.$route.query.taskDefinitionKey == 'pgrqr') {
         this.disabled = false
+        if (this.$route.query.isDisabled) {
+          this.disabled = JSON.parse(this.$route.query.isDisabled)
+        }
       } else {
         this.disabled = true
+        if (this.$route.query.isDisabled) {
+          this.isTrue = JSON.parse(this.$route.query.isDisabled)
+        }
       }
     },
     methods: {
@@ -443,4 +471,5 @@
     white-space: normal;
     word-break: break-all;
   }
+
 </style>

jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue

@@ -74,7 +74,9 @@
                <span v-else>--</span>
         </span>
         <span slot="Results" slot-scope="text,result">
-           {{text == 'Compliance' ? $t('accord'):$t('nonConformity')}}
+            <span v-if="text == 'Compliance'">{{$t('accord')}}</span>
+            <span v-else-if="text == 'Non-Compliance'">{{$t('nonConformity')}}</span>
+            <span v-else>--</span>
         </span>
         <span slot="sponsorFeedback" slot-scope="text,result">
              <a-textarea :placeholder="$t('pleaseEnter')+$t('sponsorFeedback')"
@@ -282,6 +284,81 @@
             ellipsis: true,
             scopedSlots: { customRender: 'sponsorFeedback' }
           }
+        ],
+        columnsOne: [
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'itemNum',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'itemName',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'itemContent',
+            align: 'center',
+            width: 280,
+            scopedSlots: { customRender: 'clauseContent' }
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            dataIndex: 'evaluationMethodsName',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('complianceResults'),
+            dataIndex: 'complianceResult',
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'Results' }
+          },
+          {
+            title: this.$t('nameTechnicalDocument'),
+            dataIndex: 'technicalFileName',
+            align: 'center',
+            width: 280,
+            ellipsis: true
+          },
+          {
+            title: this.$t('chapter'),
+            dataIndex: 'section',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('opinion'),
+            dataIndex: 'opinion',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('enclosure'),
+            dataIndex: 'accessoryFile',
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'accessoryFile' }
+          },
+          {
+            title: this.$t('sponsorFeedback'),
+            dataIndex: 'sponsorFeedback',
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'sponsorFeedbackIndex' }
+          }
         ]
       }
     },
@@ -296,7 +373,11 @@
             antTableHeader[0].style = 'margin-bottom: -8px;padding-bottom: 0px;min-width: 8px;overflow: hidden'
           })
         }
-        if (this.$route.query.taskDefinitionKey != 'pgrqr') {
+        let disabled = false
+        if (this.$route.query.isDisabled) {
+          disabled = JSON.parse(this.$route.query.isDisabled)
+        }
+        if (this.$route.query.taskDefinitionKey != 'pgrqr' && !disabled) {
           this.dataSource.forEach(res => {
             res.sponsorFeedback = ''
           })
@@ -306,10 +387,18 @@
     },
     computed: {
       columns() {
-        if (this.$route.query.taskDefinitionKey == 'pgrqr') {
-          return this.columnsTwo
+        let disabled = false
+        if (this.$route.query.isDisabled) {
+          disabled = JSON.parse(this.$route.query.isDisabled)
+        }
+        if (disabled) {
+          return this.columnsOne
         } else {
-          return this.columnsThree
+          if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+            return this.columnsTwo
+          } else {
+            return this.columnsThree
+          }
         }
       }
     },
@@ -345,14 +434,14 @@
             this.$message.warning(this.$t('PleaseCompleteList'))
             return
           }
-          Object.keys(this.dataSource[i]).forEach(res=>{
+          Object.keys(this.dataSource[i]).forEach(res => {
             if (this.dataSource[i][res] && typeof this.dataSource[i][res] == 'string') {
               this.dataSource[i][res] = this.dataSource[i][res].replace(/\"/g, '“')
               this.dataSource[i][res] = this.dataSource[i][res].replace(/\'/g, '‘')
             }
           })
         }
-        if (this.$route.query.taskDefinitionKey == 'pgrqr'){
+        if (this.$route.query.taskDefinitionKey == 'pgrqr') {
           let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
           for (let i = 0; i < this.dataSource.length; i++) {
             this.dataSource[i].feedbackTime = feedbackTime
@@ -361,7 +450,7 @@
         callBack && callBack(this.dataSource)
       },
       preservationData(callBack) {
-        if (this.$route.query.taskDefinitionKey == 'pgrqr'){
+        if (this.$route.query.taskDefinitionKey == 'pgrqr') {
           let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
           for (let i = 0; i < this.dataSource.length; i++) {
             this.dataSource[i].feedbackTime = feedbackTime

jero-web/src/views/processCenter/components/feedbackInformation.vue

@@ -12,18 +12,18 @@
             {{$t('feedbackPoint')+(index+1)}}
             <a-icon class="icon-size"
                     @click="addData"
-                    v-if="(formInline.dataList.length-1) == index"
+                    v-if="(formInline.dataList.length-1) == index && !disabled"
                     type="plus-circle"/>
             <a-icon class="icon-size"
                     @click="deleteData"
-                    v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index"
+                    v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index && !disabled"
                     type="minus-circle"/>
           </div>
           <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
                 <a-form-model-item class="itemModel"
@@ -33,6 +33,7 @@
                                     }]">
                   <a-textarea :placeholder="$t('PleaseEnter')+$t('relevantSections')"
                               :disabled="disabled"
+                              :title="item.relatedSection"
                               v-model="item.relatedSection" :rows="4"/>
 <!--                  <a-input class="box-input"-->
 <!--                           :disabled="disabled"-->
@@ -53,6 +54,7 @@
                                     }]">
                   <a-textarea :placeholder="$t('PleaseEnter')+$t('clauseContent')"
                               :disabled="disabled"
+                              :title="item.clauseContent"
                               v-model="item.clauseContent" :rows="4"/>
                 </a-form-model-item>
               </div>
@@ -62,7 +64,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text"
                         :title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
                 </div>
@@ -72,6 +74,7 @@
                                     }]">
                   <a-textarea :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"
                               :disabled="disabled"
+                              :title="item.issueOrSuggest"
                               v-model="item.issueOrSuggest" :rows="4"/>
                 </a-form-model-item>
               </div>
@@ -79,7 +82,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('reason')">{{$t('reason')}}</span>
                 </div>
                 <a-form-model-item class="itemModel"
@@ -89,6 +92,7 @@
                                      {max: 300,message: $t('reason') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
                                     }]">
                   <a-textarea :placeholder="$t('PleaseEnter')+$t('reason')"
+                              :title="item.reason"
                               :disabled="disabled"
                               v-model="item.reason" :rows="4"/>
                 </a-form-model-item>
@@ -112,6 +116,7 @@
               </div>
             </a-col>
           </a-row>
+
         </div>
       </a-form-model>
     </div>
@@ -166,7 +171,9 @@
         }
         this.formInline = { ...this.formInline }
       })
-
+      if (this.$route.query.isDisabled) {
+        this.disabled = JSON.parse(this.$route.query.isDisabled)
+      }
     },
     methods: {
       clickButtonToUpload(item, index) {
@@ -301,4 +308,7 @@
     margin-left: 8px;
     cursor: pointer;
   }
+  ::v-deep .ant-input-disabled{
+    color: #000F16;
+  }
 </style>

jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue

@@ -72,7 +72,7 @@
         </a-col>
       </a-row>
       <a-row :gutter="24" v-if="$route.query.TaskKey == 'dreDispose'">
-        <a-col :span="12">
+        <a-col :span="12" v-if="$route.query.isDisplay">
           <div class="box-title-text">
             <div class="title-text-fq">
               <span class="Required" v-if="$route.query.isDisplay">*</span>
@@ -88,16 +88,29 @@
             </a-form-model-item>
           </div>
         </a-col>
+        <a-col :span="24" v-else>
+          <div class="box-title-text">
+            <div class="title-text-fq">
+              <span class="title-text-text"
+                    :title="$t('feedbackFromTheEngineer')">{{$t('feedbackFromTheEngineer')}}</span>
+            </div>
+            <a-form-model-item class="itemModel">
+              <span class="text-header">
+                {{formInline.engineerFeedbackContent}}
+              </span>
+            </a-form-model-item>
+          </div>
+        </a-col>
       </a-row>
       <a-row :gutter="24" v-if="$route.query.TaskKey == 'dreDispose'">
         <a-col :span="12">
           <div class="box-title-text">
             <div class="title-text-fq">
-<!--              <span class="Required" v-if="this.$route.query.isDisplay">*</span>-->
+              <!--              <span class="Required" v-if="this.$route.query.isDisplay">*</span>-->
               <span class="title-text-text"
                     :title="$t('Deliverables')">{{$t('Deliverables')}}</span>
             </div>
-<!--            :prop="!this.$route.query.isDisplay?'':'fileId'"-->
+            <!--            :prop="!this.$route.query.isDisplay?'':'fileId'"-->
             <a-form-model-item class="itemModel">
               <a-button type="primary" class="button-text"
                         @click="clickButtonToUpload('fileId')">

jero-web/src/views/processCenter/components/taskCirculationHistory.vue

@@ -80,7 +80,7 @@
     methods: {
       getList() {
         let query = {
-          actiProcInstId: this.$route.query.actiProcInstId
+          actiProcInstId: this.$route.query.actiProcInstId || this.$route.query.prcId
         }
         this.loading = true
         getAction('/wkflow/processHistoryEO/list', query).then((res) => {

jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue

@@ -26,7 +26,7 @@
           :title="$t('evaluatorFeedback')"
         />
         <footerProcess
-          v-if="isDisplay"
+          v-if="isDisplay && !disabled"
           :isPreservation="isPreservation"
           :isSubmit="true"
           :isSendBack="isSendBack"
@@ -78,6 +78,7 @@
         isPreservation: false,
         isSendBack: false,
         isTrue: false,
+        disabled:false,
         standardContentList: [],
         standardContent: [
           {
@@ -155,6 +156,9 @@
         this.isSendBack = true
       }
       this.queryTaskDetailByTask()
+      if (this.$route.query.isDisabled) {
+        this.disabled = JSON.parse(this.$route.query.isDisabled)
+      }
     },
     methods: {
       ...mapGetters(['userInfo']),

jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue

@@ -28,7 +28,7 @@
           "/>
         <examineInformation
           :isFlag="isFlag"
-          v-if="isDisplay"
+          v-if="isDisplay && isTrue"
           isApprovalOpinion
           :title="titleName"
           :isSendBack="isSendBackOne"
@@ -37,6 +37,7 @@
         <!--        @terminationProcess="terminationProcess"-->
         <footerProcess
           is-submit
+          v-if="isTrue"
           :isSendBack="isSendBack"
           @submit="submit"
           @sendBack="sendBack"
@@ -116,7 +117,8 @@
         queryProject: {},
         loading: false,
         titleName: '',
-        textLoading: this.$t('dataLoading')
+        textLoading: this.$t('dataLoading'),
+        isTrue: false
       }
     },
     created() {
@@ -130,6 +132,9 @@
       } else {
         this.titleName = this.$t('taskConfirmationResponsiblePerson')
       }
+      if (this.$route.query.isTrue) {
+        this.isTrue = JSON.parse(this.$route.query.isTrue)
+      }
       this.queryTaskDetailByTask(function() {
         _this.queryProjectLawsInventoryInfo()
       })
@@ -181,10 +186,10 @@
         this.loading = true
         getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
           if (res instanceof String) {
-            this.queryBy = JSON.parse(res)
+            this.queryBy = JSON.parse(res) || {}
             callback()
           } else {
-            this.queryBy = res
+            this.queryBy = res || {}
             callback()
           }
         })

jero-web/src/views/processCenter/processForm/processDetails/index.vue

@@ -15,6 +15,7 @@
     </div>
     <regulatoryCirculationHistory :isTrue="isTrue"
                                   v-if="$route.query.prcType == '5' || $route.query.prcType == '6'"/>
+    <taskCirculationHistory v-else-if="$route.query.prcType == '2' || $route.query.prcType == '3' || $route.query.prcType == '4'"/>
     <circulationHistory v-else/>
   </div>
 </template>
@@ -22,6 +23,7 @@
 <script>
   import circulationHistory from '../../components/circulationHistory'
   import regulatoryCirculationHistory from '../../components/regulatoryCirculationHistory'
+  import taskCirculationHistory from '../../components/taskCirculationHistory'
   import axios from 'axios'
   import Vue from 'vue'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -30,7 +32,8 @@
     name: 'processDetails',
     components: {
       circulationHistory,
-      regulatoryCirculationHistory
+      regulatoryCirculationHistory,
+      taskCirculationHistory
     },
     data() {
       return {

jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue

@@ -19,7 +19,7 @@
           :title="$t('feedbackInformation')"
         />
         <footerProcess
-          v-if="isDisplay"
+          v-if="isDisplay && !disabled"
           isPreservation
           :isSubmit="true"
           @preservation="preservation"
@@ -61,6 +61,7 @@
         },
         loading: false,
         isDisplay: true,
+        disabled: false,
         feedbackDataList: [],
         queryProject: {},
         standardContentList: [
@@ -101,6 +102,9 @@
     },
     mounted() {
       this.isDisplay = false
+      if (this.$route.query.isDisabled) {
+        this.disabled = JSON.parse(this.$route.query.isDisabled)
+      }
       this.queryTaskDetailByTask(() => {
         this.lawsOpinionAssessmentResult()
       })
@@ -120,10 +124,16 @@
         })
       },
       lawsOpinionAssessmentResult() {
+        let createBy = ''
+        if (this.$route.query.taskDefinitionKey == 'gcsfq' && this.disabled){
+          createBy = ''
+        }else{
+          createBy = this.userInfo().username
+        }
         getAction(this.url.list, {
           lawsOpinionGatherId: this.queryProject.id,
           actiProcInstId: this.$route.query.prcId,
-          createBy: this.userInfo().username
+          createBy: createBy
         }).then((res) => {
           if (res.success) {
             this.feedbackDataList = res.result || []

jero-web/src/views/processCenter/processForm/taskListProcess/index.vue

@@ -324,14 +324,19 @@
         putAction(this.url.dreSubmit, query).then((res) => {
           if (res.success) {
             this.$message.success(this.$t('OperationSuccessful'))
-
-            this.$router.push({
-              path: '/ProjectDetails',
-              query: {
-                type: '103',
-                ...this.$route.query
-              }
-            })
+            if (this.$route.query.router) {
+              this.$router.push({
+                path: '/projectRegulationTasks'
+              })
+            } else {
+              this.$router.push({
+                path: '/ProjectDetails',
+                query: {
+                  type: '103',
+                  ...this.$route.query
+                }
+              })
+            }
             // setTimeout(() => {
             //   this.loading = false
             //   window.close()
@@ -375,13 +380,19 @@
           if (res.success) {
             setTimeout(() => {
               this.loading = false
-              this.$router.push({
-                path: '/ProjectDetails',
-                query: {
-                  type: '103',
-                  ...this.$route.query
-                }
-              })
+              if (this.$route.query.router) {
+                this.$router.push({
+                  path: '/projectRegulationTasks'
+                })
+              } else {
+                this.$router.push({
+                  path: '/ProjectDetails',
+                  query: {
+                    type: '103',
+                    ...this.$route.query
+                  }
+                })
+              }
             }, 1000)
           }
         })
@@ -390,10 +401,10 @@
         this.loading = true
         getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
           if (res instanceof String) {
-            this.queryBy = JSON.parse(res)
+            this.queryBy = JSON.parse(res) || {}
             callback()
           } else {
-            this.queryBy = res
+            this.queryBy = res || {}
             callback()
           }
         })

jero-web/src/views/projectManagement/ProjectDetails/index.vue

@@ -57,6 +57,12 @@
             <a-icon type="profile"/>
             {{$t('TaskParameterCollection')}}
           </div>
+          <div class="Virtual-detail-left-text"
+               :title="$t('projectStatus')"
+               @click="textClick(5,$t('projectStatus'))">
+            <a-icon type="cluster" />
+            {{$t('projectStatus')}}
+          </div>
           <a-icon @click="textIconClick" type="menu-fold" class="text-icon"/>
         </div>
         <div v-if="!isDisplay" class="Virtual-detail-left-One">
@@ -85,17 +91,24 @@
                @click="textClick(4,$t('TaskParameterCollection'))">
             <a-icon type="profile"/>
           </div>
+          <div class="Virtual-detail-left-text"
+               :title="$t('projectStatus')"
+               @click="textClick(5,$t('projectStatus'))">
+            <a-icon type="cluster" />
+          </div>
           <a-icon @click="textIconClick" type="menu-unfold" class="text-icon-one"/>
         </div>
         <div class="Virtual-detail-right"
              :style="{'width':isDisplay?'calc(100% - 240px)':'calc(100% - 66px)'}">
-          <ProjectDetailsName @TaskListChange="TaskListChange" v-if="textTitle === $t('projectDetails')"/>
+          <ProjectDetailsName v-if="textTitle === $t('projectDetails')"/>
           <listOfRegulations v-else-if="textTitle === $t('listOfRegulations')"
-          :areaOfResponsibilityList="areaOfResponsibilityList"/>
+                             :areaOfResponsibilityList="areaOfResponsibilityList"/>
           <TaskList :isDisplayNum="isDisplayNum" :areaOfResponsibility="areaOfResponsibility"
                     v-else-if="textTitle === $t('taskList')"/>
           <TaskParameterCollection v-else-if="textTitle === $t('TaskParameterCollection')"/>
           <nonConformance v-else-if="textTitle === $t('nonConformance')"/>
+          <projectStatus @TaskListChange="TaskListChange"
+                         v-else-if="textTitle === $t('projectStatus')"/>
         </div>
       </div>
     </div>
@@ -112,6 +125,7 @@
   import ProjectDetailsName from '../components/ProjectDetails'
   import TaskParameterCollection from '../components/TaskParameterCollection'
   import nonConformance from '../components/nonConformance'
+  import projectStatus from '../components/projectStatus'
   import updateLog from '@/components/UpdateLog/index'
   import historicalVersionList from '../components/historicalVersionList'
   import commentList from '../components/commentList'
@@ -128,7 +142,8 @@
       nonConformance,
       updateLog,
       historicalVersionList,
-      commentList
+      commentList,
+      projectStatus
     },
     data() {
       return {
@@ -138,7 +153,7 @@
         isTrue: true,
         loading: false,
         isDisplay: true,
-        areaOfResponsibilityList:{},
+        areaOfResponsibilityList: {},
         url: {
           logList: '/project/projectLawsInventoryLogEO/page',
           historicalVersionUrl: '',
@@ -150,7 +165,7 @@
     },
     created() {
       document.title = this.$route.query.projectName ? this.$t('projectDetails') + '-' + this.$route.query.projectName : this.$t('projectDetails')
-      this.title = this.$route.query.projectName && this.$route.query.targetMarket ? this.$route.query.projectName + '-' + this.$route.query.targetMarket : this.$t('projectDetails')
+      this.title = this.$route.query.projectName
     },
     mounted() {
       this.getTaskId()
@@ -194,7 +209,6 @@
           textColor[0].classList.remove('Virtual-detail-left-text-color')
         }
         let text = document.getElementsByClassName('Virtual-detail-left-text')
-        console.log(text)
         if (name == 0) {
           text[name].classList.add('Virtual-detail-left-text-color')
           this.textTitle = text[name].title
@@ -289,10 +303,10 @@
         })
       },
       TaskListChange(item) {
-        if (item.isListing && item.isListing == '1'){
+        if (item.isListing && item.isListing == '1') {
           this.areaOfResponsibilityList = item
           this.textTitle = this.$t('listOfRegulations')
-        }else{
+        } else {
           this.areaOfResponsibility = item
           this.textTitle = this.$t('taskList')
         }

jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue

@@ -5,8 +5,12 @@
         <a-row :gutter="24">
           <a-col :md="6" :sm="10">
             <a-form-item :label="$t('Collectlist')">
-              <a-select  v-model="queryParam.ctype" @change="getonChange" :getPopupContainer="triggerNode => triggerNode.parentNode" :popper-append-to-body="false">
-                <a-select-option v-for="d in options" :key="d.value" :value="d.value" >{{ d.label }}</a-select-option>
+              <a-select  v-model="queryParam.ctype"  @change="getonChange" style='width: 183px' :getPopupContainer="triggerNode => triggerNode.parentNode" :popper-append-to-body="false">
+                <a-select-option v-for="d in options" :key="d.value" :value="d.value" >
+                  <span style="display: inline-block;width: 80%" :title=" d.label">
+                           {{ d.label }}
+                     </span>
+                </a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -47,6 +51,12 @@
     components: {
       responsibilityList
     },
+    props: {
+      idList: {
+        type: Array,
+        default: []
+      }
+    },
     data() {
       return {
         queryParam:{
@@ -99,7 +109,13 @@
         })
       },
       getoptions(){
-        getAction('project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestLabel', {id:this.$route.query.id}).then((res) => {
+        let id = ''
+        if (this.idList && this.idList.length > 0) {
+          id = this.idList.join(',')
+        } else {
+          id = this.$route.query.id
+        }
+        getAction('project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestLabel', {id:id}).then((res) => {
           if (res.success) {
             this.options = res.result
             this.queryParam.ctype = this.options[0].value
@@ -354,6 +370,12 @@
         box-sizing: border-box;
       }
     }
+    .box-input {
+      display: inline-block;
+      width: calc(70% - 100px);
+      height: 38px;
+      margin-top: 2px;
+    }
 
     .box-content-right {
       width: calc(50% - 12px);

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -210,6 +210,16 @@
               <a-icon type="delete"/>
               {{$t('sendBack')}}
             </div>
+            <!--      导入-->
+            <div class="operator-text" v-if='currentPersonRole == "dre"'>
+              <ImportFileOnlyList :url="url" :isTrue="false" :accept="'.zip'" :paramsManifestId='this.$route.query.id' @getList='getList'/>
+            </div>
+            <!--      填写人导出-->
+            <div @click="handleExportDre" class="operator-text"
+                 v-if='currentPersonRole == "dre"'>
+              <a-icon type="export"/>
+              {{$t('export')}}
+            </div>
             <!--      强制撤回-->
             <div @click="compulsoryWithdrawaljurisdiction" class="operator-text"
                  v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
@@ -443,7 +453,7 @@
 
 <script>
   import TableCollection from '@/components/tableCollection/index'
-  import { getAction, postAction } from '../../../api/manage'
+  import { getAction, postAction, downloadFile } from '../../../api/manage'
   import eventBUs from '../../../common/event'
   import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index'
   import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
@@ -453,6 +463,7 @@
   import AdjustareaSofrespon from '@/components/AdjustareaSofrespon/index'
   import ReferenceParameter from '@/components/ReferenceParameter/index'
   import AssignedBy from '@/components/AssignedBy/index'
+  import ImportFileOnlyList from '@/components/ImportFileOnlyListtag/index'
   import axios from 'axios'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import Vue from 'vue'
@@ -465,6 +476,7 @@
       ParameterLibraryAdd,
       AssignedBy,
       AdjustareaSofrespon,
+      ImportFileOnlyList,
       TaskCutOffTime,
       ReferenceParameter,
       SynchronousSubmissionLibrary,
@@ -603,6 +615,7 @@
           getLoginUserType: 'params/collectManifest/getLoginUserType', // 获取当前登陆人
           getquerySdtList: 'params/collectManifest/querySdtList', // 获取工程接口人的列表
           updateSdt: 'params/collectManifest/updateSdt', // 提交工程接口人
+          importZipUrl: 'params/collectManifest/importDre', // 导入
           deleteBatch: 'params/collectManifest/deleteBatch'
         },
         loading: false,
@@ -619,6 +632,7 @@
         rowId: '',
         version: 0,
         confirmLoading: false,
+        importsVisible: false,
         itemId: '',
         selectedRowKeysValue: [], // table列表所选得数据
         token: Vue.ls.get(ACCESS_TOKEN),
@@ -670,6 +684,10 @@
       // }
     },
     mounted() {
+      console.log(this.$route.query)
+      if(this.$route.query.type == '1'){
+        this.handleOkRoleSwitching()
+      }
       this.GetgetLoginUserType()
       console.log(this.currentPersonRole)
       setTimeout(() => {
@@ -704,36 +722,62 @@
         })
       },
       handleOkRoleSwitching() {
-        this.$refs.ruleFormRoleSwitching.validate(valid => {
-          if (valid) {
-            let query = {
-              userType: this.formInlineRoleSwitching.roleSwitchingCode,
-              paramsManifestId: this.$route.query.id,
-              projectId: this.$route.query.projectId,
-              userId: this.userInfo().id
-            }
-            this.confirmLoadingRoleSwitching = true
-            postAction('/params/userTypeLog/edit', query).then((res) => {
-              if (res.success) {
-                this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode
-                this.$message.success(this.$t('OperationSuccessful'))
-                this.$refs.CollectionTabel.getHeader(this.currentPersonRole)
-                this.visibleRoleSwitching = false
-                this.confirmLoadingRoleSwitching = false
-                localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
-                this.RoleType.forEach((item,index) => {
-                  if(item.value == this.currentPersonRole){
-                    this.rolename = item.label
-                  }
-                })
-                this.selectedRowKeysValue = []
-              } else {
-                this.confirmLoadingRoleSwitching = false
-                this.$message.warning(this.$t('operationFailed'))
-              }
-            })
+        if(this.$route.query.type == '1'){
+          let query = {
+            userType:this.$route.query.userType,
+            paramsManifestId: this.$route.query.id,
+            projectId: this.$route.query.projectId,
+            userId: this.userInfo().id
           }
-        })
+          this.confirmLoadingRoleSwitching = true
+          postAction('/params/userTypeLog/edit', query).then((res) => {
+            if (res.success) {
+              this.currentPersonRole = this.$route.query.userType
+              this.visibleRoleSwitching = false
+              this.confirmLoadingRoleSwitching = false
+              localStorage.setItem('currentPersonRole', JSON.stringify(this.$route.query.userType))
+              this.RoleType.forEach((item,index) => {
+                if(item.value == this.currentPersonRole){
+                  this.rolename = item.label
+                }
+              })
+              this.selectedRowKeysValue = []
+            } else {
+              this.confirmLoadingRoleSwitching = false
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          })
+        }else {
+          this.$refs.ruleFormRoleSwitching.validate(valid => {
+            if (valid) {
+              let query = {
+                userType: this.formInlineRoleSwitching.roleSwitchingCode,
+                paramsManifestId: this.$route.query.id,
+                projectId: this.$route.query.projectId,
+                userId: this.userInfo().id
+              }
+              this.confirmLoadingRoleSwitching = true
+              postAction('/params/userTypeLog/edit', query).then((res) => {
+                if (res.success) {
+                  this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode
+                  this.$message.success(this.$t('OperationSuccessful'))
+                  this.visibleRoleSwitching = false
+                  this.confirmLoadingRoleSwitching = false
+                  localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
+                  this.RoleType.forEach((item,index) => {
+                    if(item.value == this.currentPersonRole){
+                      this.rolename = item.label
+                    }
+                  })
+                  this.selectedRowKeysValue = []
+                } else {
+                  this.confirmLoadingRoleSwitching = false
+                  this.$message.warning(this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        }
       },
       roleSwitchingClick() {
         this.visibleRoleSwitching = true
@@ -873,6 +917,36 @@
           this.textLoading = false
         })
       },
+      //填写人导出
+      handleExportDre(){
+        let long = localStorage.getItem('language')
+        this.cut = ''
+        if (long && long === 'zh-cn') {
+          this.cut = 'cn'
+        } else if (long && long === 'en-us') {
+          this.cut = 'en'
+        }
+        console.log(this.formInline)
+        let query = {
+          paramsManifestId: this.paramsManifest.id,
+          cut: this.cut,
+          ...this.formInline,
+          ...this.queryParamQuery,
+          ids: this.selectedRowKeys.join(','),
+          exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')'
+        }
+        let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
+        downloadFile('/params/collectManifest/exportDre', name , query , this.selectClear)
+      },
+      getList(){
+        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+      },
+      iVisible(val,num) {
+        this.importsVisible = val
+        if (num == 1){
+          eventBUs.$emit('searchGetData')
+        }
+      },
       // 高级搜索
       handleSuperQuery(params, matchType) {
         let sqp = {}

jero-web/src/views/projectManagement/components/ProjectDetails.vue

@@ -23,13 +23,18 @@
         <span class="text-field-right" :title="queryForm.targetMarket_dictText"
         >{{queryForm.targetMarket_dictText}}</span>
       </div>
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('projectVersion')">{{$t('projectVersion')}}</span>
+        <span class="text-field-right" :title="queryForm.projectVersion"
+        >{{queryForm.projectVersion}}</span>
+      </div>
+    </div>
+    <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('projectStatus')">{{$t('projectStatus')}}</span>
         <span class="text-field-right" :title="queryForm.projectStatus_dictText"
         >{{queryForm.projectStatus_dictText}}</span>
       </div>
-    </div>
-    <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('DigitalPlatform')">{{$t('DigitalPlatform')}}</span>
         <span class="text-field-right" :title="queryForm.digitalPlatform"
@@ -43,17 +48,10 @@
     </div>
     <div class="content-text">
       <div class="text-field">
-        <span class="text-field-left" :title="$t('StudioEngineer')">{{$t('StudioEngineer')}}</span>
-        <span class="text-field-right" :title="queryForm.studioEngineerName"
-        >{{queryForm.studioEngineerName}}</span>
+        <span class="text-field-left" :title="$t('softwareVersion')">{{$t('softwareVersion')}}</span>
+        <span class="text-field-right" :title="queryForm.softwareVersion"
+        >{{queryForm.softwareVersion}}</span>
       </div>
-      <div class="text-field">
-        <span class="text-field-left" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
-        <span class="text-field-right" :title="queryForm.certificationEngineerName"
-        >{{queryForm.certificationEngineerName}}</span>
-      </div>
-    </div>
-    <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('IPDInformation')">{{$t('IPDInformation')}}</span>
         <span class="text-field-right text-field-right-color"
@@ -61,6 +59,8 @@
               @click="urlClick(queryForm.ipdInfo)"
         >{{queryForm.ipdInfo}}</span>
       </div>
+    </div>
+    <div class="content-text">
       <div class="text-field">
         <span class="text-field-left" :title="$t('certificationProgram')">{{$t('certificationProgram')}}</span>
         <span class="text-field-right text-field-right-color"
@@ -77,16 +77,38 @@
       </div>
     </div>
     <div class="content-text">
-      <div class="text-field" style="width: 50%">
-        <span class="text-field-left" :title="$t('ListOfRelevantPersonnel')">{{$t('ListOfRelevantPersonnel')}}</span>
+      <div class="text-field-content">
+        <span class="text-field-left" :title="$t('explain')">{{$t('explain')}}</span>
+        <span class="text-field-right" :title="queryForm.explanation"
+        >{{queryForm.explanation}}</span>
+      </div>
+    </div>
+    <div class="content-text">
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('StudioEngineer')">{{$t('StudioEngineer')}}</span>
+        <span class="text-field-right" :title="queryForm.studioEngineerName"
+        >{{queryForm.studioEngineerName}}</span>
+      </div>
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
+        <span class="text-field-right" :title="queryForm.certificationEngineerName"
+        >{{queryForm.certificationEngineerName}}</span>
+      </div>
+      <div class="text-field">
+        <span class="text-field-left" style="float: left;margin-top: 3px" :title="$t('ListOfRelevantPersonnel')">{{$t('ListOfRelevantPersonnel')}}</span>
         <span class="text-field-right"
         >
-          <a-button type="primary" v-has="'projectRelatedPersonnel:page'" class="button-text"
+          <a-button type="primary" v-has="'projectRelatedPersonnel:page'"
+                    :title="$t('ListOfRelevantPersonnel')"
+                    class="button-text"
                     @click="ListOfRelevantPersonnelClick">
                   {{$t('ListOfRelevantPersonnel')}}
           </a-button>
         </span>
       </div>
+    </div>
+    <div class="content-text">
+
     </div>
     <div class="box-text">
       <div class="header-text">
@@ -115,21 +137,21 @@
       </div>
       <div class="process-content-right-xian"></div>
     </div>
-    <a-tabs style="margin-top: 20px" v-model="activeKey" class="ant-tabs">
-      <a-tab-pane :key="$t('CurrentStatusOfTheProject')" :tab="$t('CurrentStatusOfTheProject')">
-        <currentStatusOfTheProjectEcharts @currentStatus="currentStatus"
-                                          v-if="activeKey == $t('CurrentStatusOfTheProject')"/>
-      </a-tab-pane>
-      <a-tab-pane :key="$t('DeliverableStatus')" :tab="$t('DeliverableStatus')">
-        <deliverableStatusEchart @currentStatus="currentStatus" v-if="activeKey == $t('DeliverableStatus')"/>
-      </a-tab-pane>
-      <a-tab-pane :key="$t('CertificationProgress')" :tab="$t('CertificationProgress')">
-        <certificationProgressEchart @currentStatus="currentStatus" v-if="activeKey == $t('CertificationProgress')"/>
-      </a-tab-pane>
-      <a-tab-pane :key="$t('Parametercollection')" :tab="$t('Parametercollection')">
-        <ParameterCollectionEchart @currentStatus="currentStatus" v-if="activeKey == $t('Parametercollection')"/>
-      </a-tab-pane>
-    </a-tabs>
+<!--    <a-tabs style="margin-top: 20px" v-model="activeKey" class="ant-tabs">-->
+<!--      <a-tab-pane :key="$t('CurrentStatusOfTheProject')" :tab="$t('CurrentStatusOfTheProject')">-->
+<!--        <currentStatusOfTheProjectEcharts @currentStatus="currentStatus"-->
+<!--                                          v-if="activeKey == $t('CurrentStatusOfTheProject')"/>-->
+<!--      </a-tab-pane>-->
+<!--      <a-tab-pane :key="$t('DeliverableStatus')" :tab="$t('DeliverableStatus')">-->
+<!--        <deliverableStatusEchart @currentStatus="currentStatus" v-if="activeKey == $t('DeliverableStatus')"/>-->
+<!--      </a-tab-pane>-->
+<!--      <a-tab-pane :key="$t('CertificationProgress')" :tab="$t('CertificationProgress')">-->
+<!--        <certificationProgressEchart @currentStatus="currentStatus" v-if="activeKey == $t('CertificationProgress')"/>-->
+<!--      </a-tab-pane>-->
+<!--      <a-tab-pane :key="$t('Parametercollection')" :tab="$t('Parametercollection')">-->
+<!--        <ParameterCollectionEchart @currentStatus="currentStatus" v-if="activeKey == $t('Parametercollection')"/>-->
+<!--      </a-tab-pane>-->
+<!--    </a-tabs>-->
     <listOfRelevantPersonnel ref="listOfRelevantPersonnelRef"/>
     <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
     <settingList :url="url" ref="settingListRef" @settingListForm="settingListForm"/>
@@ -199,9 +221,9 @@
           }
         })
       },
-      currentStatus(item) {
-        this.$emit('TaskListChange', item)
-      },
+      // currentStatus(item) {
+      //   this.$emit('TaskListChange', item)
+      // },
       getSetting() {
         getAction(this.url.queryByProjectId, { projectId: this.$route.query.id }).then((res) => {
           if (res.success) {
@@ -283,6 +305,35 @@
         font-weight: 400;
       }
     }
+
+    .text-field-content {
+      width: 100%;
+      margin-bottom: 8px;
+
+      .text-field-left {
+        width: 124px;
+        display: inline-block;
+        font-size: 14px;
+        font-weight: 400;
+        color: #6F7385;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        float: left;
+        margin-right: 24px;
+        margin-top: 3px;
+      }
+
+      .text-field-right {
+        width: calc(100% - 200px);
+        display: inline-block;
+        font-size: 16px;
+        float: left;
+        word-break: break-word;
+        color: #040B29;
+        font-weight: 400;
+      }
+    }
   }
 
   .process-content {
@@ -364,4 +415,8 @@
     height: 80px;
     line-height: 80px;
   }
+
+  .button-text {
+    padding: 0 13px;
+  }
 </style>

jero-web/src/views/projectManagement/components/TaskList.vue

@@ -191,6 +191,7 @@
     <batchChangeModel @batchChangeModel="batchChangeModel" ref="batchChangeModelRef"/>
     <cuibanModel @cibanModel="cibanModel" ref="cModelRef"/>
     <batchModel @batchModel="batchModel" ref="batchModelRef"/>
+    <cuibanModel @cibanModel="cibanModel" ref="cModelRef"/>
     <!--    错误数据提示-->
     <a-modal
       :title="$t('operationFailed')"
@@ -224,6 +225,7 @@
   import TaskListModel from './TaskListModel'
   import cuibanModel from './cuibanModel'
   import taskBatSetting from './taskBatSetting'
+  import cuibanModel from './cuibanModel'
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import { mapGetters } from 'vuex'
   import store from '@/store/'
@@ -235,8 +237,8 @@
       TaskListModel,
       batchChangeModel,
       batchModel,
-      taskBatSetting,
       cuibanModel,
+      taskBatSetting
     },
     props: ['isDisplayNum', 'areaOfResponsibility'],
     data() {
@@ -539,6 +541,17 @@
         let item = JSON.parse(JSON.stringify(val))
         this.$refs.TaskListModelRef.getData(item, this.$t('CurrentStatus'))
       },
+      // 催办
+      cuibanClick(){
+        if(this.selectionRowsArray.length <1){
+          this.$message.warning(this.$t('selectLeastOne'))
+        }else{
+          this.$refs.cModelRef.getData(this.selectionRowsArray)
+        }
+      },
+      cibanModel(){
+        this.getList()
+      },
       //批量维护进度
 
       BatchMaintenanceProgress() {

jero-web/src/views/projectManagement/components/TaskParameterCollection.vue

@@ -84,11 +84,21 @@
       />
     </div>
     <!--    参数模板-->
-    <a-modal v-model="areaVisible" :maskClosable="false" :title="$t('parameterTemplate')" width='750px' :footer="null">
+    <a-drawer
+      :visible="areaVisible"
+      :maskClosable="false"
+      @close="handleCancel"
+      :title="areaTitle"
+      width='850px'
+      style="height: 100%;overflow: auto;padding-bottom: 53px;"
+      placement="right"
+      :footer="null">
       <parameter-template-add :url='url' ref='templateRef' v-if='areaVisible' @areaVisible='handleCancel'
                               :version='version'
-                              :projectId='this.$route.query.id'></parameter-template-add>
-    </a-modal>
+                              :projectId='this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id'>
+
+      </parameter-template-add>
+    </a-drawer>
     <!--    配置-->
     <configure ref="configureRef" :url='url' :itemId='itemId' :itemRow='itemRow'/>
     <!--    历史版本-->
@@ -96,12 +106,23 @@
       <historical-version v-if='historicalVisible' :historicalRow='historicalRow'></historical-version>
     </a-modal>
     <!--     复制参数模板-->
-    <a-modal class="show-drawer" :title="$t('Copyparameterlist')" width="700px" v-model="drawerVisible" :footer="null">
+    <a-drawer
+      class="show-drawer"
+      :maskClosable="false"
+      :visible="drawerVisible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;"
+      placement="right"
+      @close="drawerhandleCancel"
+      :title="$t('Copyparameterlist')"
+      width="850px"
+      :footer="null">
       <project-collection-parameters v-if='drawerVisible' @areaVisible='drawerhandleCancel'
                                      :templateTitle='templatetitle' @copysubmit='copysubmit'
                                      :selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :url='url'
-                                     :projectId='this.$route.query.id'></project-collection-parameters>
-    </a-modal>
+                                     :projectId='this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id'>
+
+      </project-collection-parameters>
+    </a-drawer>
   </a-card>
 </template>
 
@@ -151,6 +172,13 @@
             ellipsis: true,
             dataIndex: 'paramsTemplateName'
           },
+          {
+            title: this.$t('relatedProjectVersion'),
+            align: 'center',
+            width: 120,
+            ellipsis: true,
+            dataIndex: 'projectVersion'
+          },
           {
             title: this.$t('collectionCompletionTime'),
             align: 'center',
@@ -214,6 +242,7 @@
         selectedRowKeysArray: '',
         templatetitle: '',
         templatetitleId: '',
+        areaTitle:'',
         rowId: '',
         version: 0,
         itemId: '', // 配置id
@@ -237,8 +266,8 @@
         //处理接收到的消息
         handler: function(res) {
           let that = this
-          if (res.data == '1'){
-          this.getlist()
+          if (res.data == '1') {
+            this.getlist()
           }
         }
       }
@@ -255,8 +284,8 @@
             // localStorage.setItem('paramsManifest', JSON.stringify(item))
             let newUrl = _this.$router.resolve({
               path: '/ParameterItemCollection',
-              query:  item
-                // projectName:this.$route.query.projectName
+              query: item
+              // projectName:this.$route.query.projectName
             })
             window.open(newUrl.href, '_blank')
           } else {
@@ -299,12 +328,12 @@
         this.$refs.configureRef.addModel(item.id, item)
       },
       handleCancel(val) {
-        this.areaVisible = val
+        this.areaVisible = false
         this.getlist()
       },
       // 项目收集参数
       drawerhandleCancel(val) {
-        this.drawerVisible = val
+        this.drawerVisible = false
       },
       copysubmit() {
         this.drawerVisible = false
@@ -326,11 +355,13 @@
       },
       edit(edit) {
         this.areaVisible = true
+        this.areaTitle = this.$t('editDetailList')
         setTimeout(() => {
           this.$refs.templateRef.editData(edit)
         }, 50)
       },
       handleAdd() {
+        this.areaTitle = this.$t('addDetailList')
         this.areaVisible = true
       },
       // 变更扩展
@@ -402,7 +433,7 @@
       },
       getlist() {
         let query = {
-          projectId: this.$route.query.id,
+          projectId: this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id,
           pageSize: this.pageSize,
           pageNo: this.pageNo,
           ...this.queryParam
@@ -561,13 +592,14 @@
     text-justify: inter-ideograph;
     word-break: break-all
   }
+
   ::v-deep .ant-table-row:first-child {
-    background: #fff!important;
+    background: #fff !important;
     opacity: 0.95;
   }
 
   ::v-deep .ant-table-body {
-    background: transparent!important;
+    background: transparent !important;
   }
 </style>
 <style>

jero-web/src/views/projectManagement/components/addModel.vue

@@ -69,6 +69,22 @@
               </a-form-model-item>
             </div>
           </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('projectVersion')">{{$t('projectVersion')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="projectVersion">
+                <a-input class="box-input"
+                         :disabled="true"
+                         v-model="formInline.projectVersion"
+                         :placeholder="$t('PleaseEnter')+$t('projectVersion')"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -85,8 +101,6 @@
               </a-form-model-item>
             </div>
           </a-col>
-        </a-row>
-        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -104,6 +118,8 @@
               </a-form-model-item>
             </div>
           </a-col>
+        </a-row>
+        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -120,8 +136,6 @@
               </a-form-model-item>
             </div>
           </a-col>
-        </a-row>
-        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -135,6 +149,8 @@
               </a-form-model-item>
             </div>
           </a-col>
+        </a-row>
+        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -148,8 +164,6 @@
               </a-form-model-item>
             </div>
           </a-col>
-        </a-row>
-        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -165,6 +179,8 @@
             <!--            ^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%\$#_]*)?$
             -->
           </a-col>
+        </a-row>
+        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -179,8 +195,6 @@
               </a-form-model-item>
             </div>
           </a-col>
-        </a-row>
-        <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -195,6 +209,36 @@
             </div>
           </a-col>
         </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('softwareVersion')">{{$t('softwareVersion')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop="'softwareVersion'">
+                <a-input class="box-input"
+                         :disabled="disabled"
+                         v-model="formInline.softwareVersion"
+                         :placeholder="$t('PleaseEnter')+$t('softwareVersion')"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('explain')">{{$t('explain')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="explanation">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('explain')"
+                            v-model="formInline.explanation"
+                            :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
       </a-form-model>
     </a-spin>
     <div class="drawer-bootom-button">
@@ -244,6 +288,13 @@
               trigger: 'blur'
             }
           ],
+          explanation: [
+            {
+              max: 500,
+              message: this.$t('explain') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
           attestationPlan: [
             {
               pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%$#_]*)?/,
@@ -269,6 +320,13 @@
               trigger: 'blur'
             }
           ],
+          softwareVersion:[
+            {
+              max: 300,
+              message: this.$t('softwareVersion') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
           projectNameId: [
             {
               required: true,
@@ -351,6 +409,7 @@
         this.getNameList()
         this.formInline.studioEngineerName = this.userInfo().username
         this.formInline.studioEngineer = this.userInfo().id
+        this.formInline.projectVersion = '00'
         this.formInline = { ...this.formInline }
         this.$nextTick(() => {
           this.$refs.ruleForm.clearValidate()

jero-web/src/views/projectManagement/components/certificationProgressEchart.vue

@@ -33,6 +33,12 @@
     components: {
       responsibilityList
     },
+    props: {
+      idList: {
+        type: Array,
+        default: []
+      }
+    },
     data() {
       return {
         loading: false,
@@ -79,7 +85,13 @@
         this.$emit('currentStatus', item)
       },
       getData() {
-        getAction(this.url.getProjectDetailsStatistics, { id: this.$route.query.id }).then((res) => {
+        let id = ''
+        if (this.idList && this.idList.length > 0) {
+          id = this.idList.join(',')
+        } else {
+          id = this.$route.query.id
+        }
+        getAction(this.url.getProjectDetailsStatistics, { id: id }).then((res) => {
           if (res.success) {
             if (res.result) {
               let certificationProgressMap = res.result.certificationProgressMap ? res.result.certificationProgressMap.certificationProgressMapList : []

jero-web/src/views/projectManagement/components/cuibanModel.vue

@@ -15,12 +15,13 @@
           <div class="box-title-text">
             <div class="title-text">
                       <span class="title-text-text"
-                            :title="$t('CertificationProgress')">{{$t('CertificationProgress')}}</span>
+                            :title="$t('taskType')">{{$t('taskType')}}</span>
             </div>
 <!--            mode="multiple"-->
             <a-form-model-item class="itemModel" prop="type">
                 <a-select v-model="formInline.type"
                           class='box-input'
+                          :placeholder="$t('PleaseSelect') + $t('taskType')"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear>
                   <a-select-option v-for="(item, key) in cuibanList" :key="key" :value="item.value">
@@ -51,7 +52,7 @@ export default {
         type: [
           {
             required: true,
-            message: this.$t('PleaseSelect') + this.$t('CertificationProgress'),
+            message: this.$t('PleaseSelect') + this.$t('taskType'),
             trigger: 'change'
           }
           ]
@@ -118,7 +119,7 @@ export default {
           })
           ProjectTaskUrgVo = {
               projectLawsInventoryIds: projectLawsInventoryId.join(','),
-              type: this.formInline.type
+              type: this.formInline.type,
             }
           this.confirmLoading = true
           postAction('/project/projectLawsInventoryEO/taskUrg', ProjectTaskUrgVo).then((res) => {
@@ -128,7 +129,7 @@ export default {
               this.$message.success(this.$t('OperationSuccessful'))
               this.$emit('cibanModel')
             } else {
-              this.$message.warning(this.$t('operationFailed'))
+              this.$message.warning(res.message)
               this.confirmLoading = false
             }
           })

jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue

@@ -40,6 +40,12 @@
     components: {
       responsibilityList
     },
+    props: {
+      idList: {
+        type: Array,
+        default: []
+      }
+    },
     data() {
       return {
         loading: false,
@@ -77,7 +83,13 @@
     },
     methods: {
       getData() {
-        getAction(this.url.getProjectDetailsStatistics, { id: this.$route.query.id }).then((res) => {
+        let id = ''
+        if (this.idList && this.idList.length > 0) {
+          id = this.idList.join(',')
+        } else {
+          id = this.$route.query.id
+        }
+        getAction(this.url.getProjectDetailsStatistics, { id: id }).then((res) => {
           if (res.success) {
             if (res.result) {
               let dataSource = res.result.currentProjectStatusMap ? res.result.currentProjectStatusMap.currentProjectStatusMapList : []

jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue

@@ -36,6 +36,12 @@
     components: {
       responsibilityList
     },
+    props: {
+      idList: {
+        type: Array,
+        default: []
+      }
+    },
     data() {
       return {
         url: {
@@ -52,10 +58,15 @@
     },
     methods: {
       getData() {
-        getAction(this.url.getProjectDetailsStatistics, { id: this.$route.query.id }).then((res) => {
+        let id = ''
+        if (this.idList && this.idList.length > 0) {
+          id = this.idList.join(',')
+        } else {
+          id = this.$route.query.id
+        }
+        getAction(this.url.getProjectDetailsStatistics, { id: id }).then((res) => {
           if (res.success) {
             if (res.result) {
-
               let listingToConfirmMap = res.result.listingToConfirmMap ? res.result.listingToConfirmMap.listingToConfirmMapList : []
               let taskToConfirmMap = res.result.taskToConfirmMap ? res.result.taskToConfirmMap.taskToConfirmMapList : []
               let designComplianceMap = res.result.designComplianceMap ? res.result.designComplianceMap.designComplianceMapList : []
@@ -67,7 +78,6 @@
               this.dataEchartsOne(prehomoMap, 2)
               this.dataEchartsOne(verifyComplianceMap, 3)
             }
-
           }
         })
       },

jero-web/src/views/projectManagement/components/projectStatus.vue

@@ -0,0 +1,88 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-operator" style="margin-bottom: 10px">
+      <div @click="versionStatisticsClick"
+           v-if="!this.$route.query.parentId && $t('Parametercollection')!= activeKey"
+           class="operator-text">
+        <a-icon type="plus"/>
+        {{$t('versionStatistics')}}
+      </div>
+      <div v-else
+           class="operator-text">
+      </div>
+    </div>
+    <a-tabs v-model="activeKey" class="ant-tabs">
+      <a-tab-pane :key="$t('CurrentStatusOfTheProject')" :tab="$t('CurrentStatusOfTheProject')">
+        <currentStatusOfTheProjectEcharts @currentStatus="currentStatus"
+                                          :idList="idList"
+                                          v-if="activeKey == $t('CurrentStatusOfTheProject')"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('DeliverableStatus')" :tab="$t('DeliverableStatus')">
+        <deliverableStatusEchart @currentStatus="currentStatus" :idList="idList"
+                                 v-if="activeKey == $t('DeliverableStatus')"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('CertificationProgress')" :tab="$t('CertificationProgress')">
+        <certificationProgressEchart @currentStatus="currentStatus" :idList="idList"
+                                     v-if="activeKey == $t('CertificationProgress')"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('Parametercollection')" :tab="$t('Parametercollection')">
+        <ParameterCollectionEchart @currentStatus="currentStatus" :idList="[]"
+                                   v-if="activeKey == $t('Parametercollection')"/>
+      </a-tab-pane>
+    </a-tabs>
+    <versionStatistics ref="versionStatisticsRef" @versionStatisticsForm="versionStatisticsForm"/>
+  </a-card>
+</template>
+
+<script>
+  import currentStatusOfTheProjectEcharts from './currentStatusOfTheProjectEcharts'
+  import deliverableStatusEchart from './deliverableStatusEchart'
+  import ParameterCollectionEchart from './ParameterCollectionEchart'
+  import certificationProgressEchart from './certificationProgressEchart'
+  import versionStatistics from './versionStatistics'
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'projectStatus',
+    components: {
+      ParameterCollectionEchart,
+      currentStatusOfTheProjectEcharts,
+      deliverableStatusEchart,
+      certificationProgressEchart,
+      versionStatistics
+    },
+    data() {
+      return {
+        activeKey: this.$t('CurrentStatusOfTheProject'),
+        selectedRowKeys: [],
+        idList: []
+      }
+    },
+    methods: {
+      currentStatus(item) {
+        this.$emit('TaskListChange', item)
+      },
+      versionStatisticsClick() {
+        this.$refs.versionStatisticsRef.addModel(JSON.parse(JSON.stringify(this.selectedRowKeys)))
+      },
+      versionStatisticsForm(value) {
+        this.idList = []
+        let activeKey = JSON.parse(JSON.stringify(this.activeKey))
+        this.activeKey = ''
+        if (value && value.length > 0) {
+          value.forEach(res => {
+            this.idList.push(JSON.parse(res).id)
+          })
+        }
+        this.selectedRowKeys = JSON.parse(JSON.stringify(value))
+        this.$nextTick(() => {
+          this.activeKey = activeKey
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jero-web/src/views/projectManagement/components/versionStatistics.vue

@@ -0,0 +1,212 @@
+<template>
+  <a-drawer
+    :title="$t('versionStatistics')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <!--      <div class="table-page-search-wrapper">-->
+      <!--        <a-form layout="inline" @keyup.enter.native="searchQuery">-->
+      <!--          <a-row :gutter="24">-->
+      <!--            <a-col :md="12" :sm="8">-->
+      <!--              <div class="box-title-text">-->
+      <!--                <div class="title-text" :title="$t('standard')">-->
+      <!--                  <span>{{$t('standard')}}</span>-->
+      <!--                </div>-->
+      <!--                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"-->
+      <!--                         v-model="queryParam.serial_number"></a-input>-->
+      <!--              </div>-->
+      <!--            </a-col>-->
+      <!--            <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">-->
+      <!--               <a-col :md="12" :sm="24">-->
+      <!--                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>-->
+      <!--                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>-->
+      <!--               </a-col>-->
+      <!--            </span>-->
+      <!--          </a-row>-->
+      <!--        </a-form>-->
+      <!--      </div>-->
+      <a-table
+        :columns="columns"
+        :rowKey="(record)=>JSON.stringify(record)"
+        :scroll="{x: '100%',y:500}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :loading="loading">
+
+      </a-table>
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'versionStatistics',
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        columns: [
+          {
+            title: this.$t('VersionNumber'),
+            dataIndex: 'projectVersion',
+            align: 'center',
+            ellipsis: true,
+            width: 200
+          },
+          {
+            title: this.$t('describe'),
+            dataIndex: 'explanation',
+            align: 'center',
+            ellipsis: true,
+            width: 500
+          }
+        ],
+        dataList: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        url: {
+          list: '/project/projectLibraryBase/versionStatistics'
+        }
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      addModel(value) {
+        this.visible = true
+        this.queryParam = {}
+        this.selectedRowKeys = JSON.parse(JSON.stringify(value))
+        this.replacePage()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          id:this.$route.query.id,
+          ...this.queryParam
+        }
+        this.loading = true
+        postAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.dataList = []
+            this.total = 0
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit() {
+        this.$emit('versionStatisticsForm', this.selectedRowKeys)
+        this.visible = false
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 33px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 100%;
+    height: 38px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+</style>

jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue

@@ -10,19 +10,75 @@
         :wrapper-col='wrapperCol'
       >
         <a-row :gutter='24'>
-          <a-col :span='9'>
-            <a-form-model-item class="itemAddAdmin" :label="$t('title')" prop='title'>
-              <a-input style='width: 420px'
-                       class='box-input'
-                       :placeholder="$t('PleaseEnter')+$t('title')"
-                       v-model='formData.title'/>
-            </a-form-model-item>
+          <a-col :span='11'>
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('title')">{{$t('title')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop='title'>
+                <!--                <a-input class="box-input"-->
+                <!--                         :disabled="disabled"-->
+                <!--                         v-model="formInline[item.db_field_name]"-->
+                <!--                         :placeholder="$t('PleaseEnter')+item.db_field_txt"/>-->
+                <!--                <a-input-->
+                <!--                  :placeholder="$t('PleaseEnter')+$t('parameterTemplate')"-->
+                <!--                  v-model='form.paramsTemplateName'/>-->
+                <a-input class="box-input"
+                         :placeholder="$t('PleaseEnter')+$t('title')"
+                         v-model='formData.title'/>
+              </a-form-model-item>
+            </div>
+            <!--            <a-form-model-item class="itemAddAdmin" :label="$t('title')" prop='title'>-->
+            <!--              <a-input style='width: 420px'-->
+            <!--                       :placeholder="$t('PleaseEnter')+$t('title')"-->
+            <!--                       v-model='formData.title'/>-->
+            <!--            </a-form-model-item>-->
+          </a-col>
+          <a-col :span='11'>
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('relatedProjectVersion')">{{$t('relatedProjectVersion')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" style="height: 40px">
+                <a-select mode="multiple"
+                          class="box-input"
+                          style="width: 100%"
+                          v-model='formData.projectVersion'
+                          :placeholder="$t('PleaseSelect')+$t('relatedProjectVersion')">
+                  <!--    <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>-->
+                  <a-select-option v-for="(item, key) in projectVersionList"
+                                   :key="key"
+                                   :label="item"
+                                   :value="item">
+                        <span class="itemOption" :title=" item ">
+                             {{ item }}
+                        </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
           </a-col>
           <!--          <a-col :span='9'>-->
           <!--          </a-col>-->
           <!--          <a-col :span='6'>-->
           <!--          </a-col>-->
         </a-row>
+        <a-row :gutter="24" style="border-bottom: 1px #f5f5f5 solid;margin-bottom: 10px">
+          <a-col :span="22">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('explain')">{{$t('explain')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="explanation">
+                <a-textarea
+                  :placeholder="$t('PleaseEnter')+$t('explain')"
+                  v-model.trim="formData.explanation" :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
         <a-row :gutter='24'>
           <a-col :span='9'>
             <div class="box-title-text">
@@ -94,11 +150,11 @@
       :dataSource='areaTable'
       :pagination='false'
       :loading='loading'
-      :scroll='{x: 600,y:300}'
+      :scroll='{x: 600,y:400}'
       :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
       @change='handleTableChange'>
     </a-table>
-    <div class="page" style='display: flex;justify-content: flex-end; margin-bottom: 15px'>
+    <div class="page" style='display: flex;justify-content: flex-end; margin-bottom: 42px'>
       <a-pagination
         :show-total="total => $t('total')+` ${total} `+$t('strip')"
         show-quick-jumper
@@ -145,6 +201,7 @@
             ellipsis: true
           }
         ],
+        projectVersionList: [],
         newVisible: false,
         labelCol: {
           xs: { span: 24 },
@@ -164,6 +221,13 @@
               message: this.$t('title') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
               trigger: 'blur'
             }
+          ],
+          explanation: [
+            {
+              max: 500,
+              message: this.$t('explain') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              trigger: 'blur'
+            }
           ]
         },
         areaTable: [],
@@ -195,8 +259,21 @@
     },
     mounted() {
       this.loadData()
+      this.getProjectVersion()
     },
     methods: {
+      getProjectVersion() {
+        let query = {
+          id: this.projectId
+        }
+        getAction('/project/projectLibraryBase/getVersionsInfo', query).then((res) => {
+          if (res.success) {
+            this.projectVersionList = res.result || []
+          } else {
+            this.projectVersionList = []
+          }
+        })
+      },
       pageOnChange(page, pageSize) {
         this.pageNo = page
         this.loadData()
@@ -246,9 +323,15 @@
       },
       editData(edit) {
         // 编辑一行的数据
-        this.row = edit
-        this.formData = { ...edit }
-        this.selectedRowKeys = edit.paramsTemplateId.split(',')
+        let query = JSON.parse(JSON.stringify(edit))
+        if (query.projectVersion) {
+          query.projectVersion = query.projectVersion.split(',')
+        }else{
+          query.projectVersion = []
+        }
+        this.row = query
+        this.formData = { ...query }
+        this.selectedRowKeys = query.paramsTemplateId.split(',')
       },
       //新增
       handleSubmit() {
@@ -267,10 +350,17 @@
               this.confirmLoading = true
               let postDate = {
                 title: this.formData.title,
+                projectVersion: this.formData.projectVersion,
+                explanation: this.formData.explanation,
                 paramsTemplateId: this.paramsTemplateId || this.selectedRowKeys[0],
                 paramsTemplatePublishVersion: this.row.version || this.selectedRowKeysDate[0].version,
                 projectId: this.projectId
               }
+              Object.keys(postDate).forEach(res => {
+                if (postDate[res] && postDate[res] instanceof Array) {
+                  postDate[res] = postDate[res].join(',')
+                }
+              })
               if (this.formData.id) {
                 //编辑
                 postDate = {
@@ -377,8 +467,16 @@
   }
 
   .drawer-bootom-button {
-    display: flex;
-    justify-content: flex-end;
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    z-index: 100;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
   }
 
   .Required {
@@ -393,7 +491,7 @@
   }
 
   .title-text {
-    width: 85px;
+    width: 84px;
     text-align: right;
     display: inline-block;
     font-weight: 500;
@@ -413,10 +511,10 @@
   }
 
   .itemModel {
-    width: calc(100% - 101px);
+    width: calc(100% - 100px);
     display: inline-block;
     margin-top: 2px;
-    height: 40px;
+    /*height: 40px;*/
     margin-bottom: 24px;
   }
 
@@ -473,6 +571,15 @@
   .box-button {
     height: 38px;
   }
+
+  .itemOption {
+    display: inline-block;
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+  }
 </style>
 <style lang='less'>
   .area-module {

jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue

@@ -10,29 +10,80 @@
         :wrapper-col='wrapperCol'
       >
         <a-row :gutter='24'>
-          <a-col :span='8'>
-            <a-form-model-item :label="$t('title')" prop='title'>
-              <a-input style='width: 420px'
-                       :placeholder="$t('PleaseEnter')+$t('title')"
-                       v-model='formData.title' />
-            </a-form-model-item>
+          <a-col :span='11'>
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('title')">{{$t('title')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop='title'>
+                <a-input class="box-input"
+                         :placeholder="$t('PleaseEnter')+$t('title')"
+                         v-model='formData.title'/>
+              </a-form-model-item>
+            </div>
           </a-col>
-          <a-col :span='9'>
+          <a-col :span='11'>
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('relatedProjectVersion')">{{$t('relatedProjectVersion')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" style="height: 40px">
+                <a-select mode="multiple"
+                          class="box-input"
+                          style="width: 100%"
+                          v-model='formData.projectVersion'
+                          :placeholder="$t('PleaseSelect')+$t('relatedProjectVersion')">
+                  <!--    <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>-->
+                  <a-select-option v-for="(item, key) in projectVersionList"
+                                   :key="key"
+                                   :label="item"
+                                   :value="item">
+                        <span class="itemOption" :title=" item ">
+                             {{ item }}
+                        </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
           </a-col>
-          <a-col :span='7'>
+        </a-row>
+        <a-row :gutter="24" style="border-bottom: 1px #f5f5f5 solid;margin-bottom: 10px">
+          <a-col :span="22">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('explain')">{{$t('explain')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="explanation">
+                <a-textarea
+                  :placeholder="$t('PleaseEnter')+$t('explain')"
+                  v-model.trim="formData.explanation" :rows="4"/>
+              </a-form-model-item>
+            </div>
           </a-col>
         </a-row>
         <a-row :gutter='24'>
-          <a-col :span='8'>
-            <a-form-model-item :label="$t('entryName')" prop='projectName'>
-              <a-input style='width: 420px'
-                       :placeholder="$t('PleaseEnter')+$t('entryName')"
-                       v-model='formData.projectName' />
-            </a-form-model-item>
+          <a-col :span='11'>
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('entryName')">{{$t('entryName')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <a-input class="box-input"
+                         :placeholder="$t('PleaseEnter')+$t('entryName')"
+                         v-model='formData.projectName'/>
+              </a-form-model-item>
+            </div>
           </a-col>
-          <a-col :span='9'>
-          </a-col>
-          <a-col :span='7' style='margin-top: 4px;padding-left: 20px'>
+          <!--          <a-col :span='8'>-->
+          <!--            <a-form-model-item :label="$t('entryName')" prop='projectName'>-->
+          <!--              <a-input style='width: 420px'-->
+          <!--                       :placeholder="$t('PleaseEnter')+$t('entryName')"-->
+          <!--                       v-model='formData.projectName'/>-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <a-col :span='11' style="margin-top: 5px">
             <a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
             <a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
           </a-col>
@@ -48,7 +99,7 @@
       :dataSource='areaTable'
       :pagination='false'
       :loading='loading'
-      :scroll='{x: 600}'
+      :scroll='{x: 600,y:400}'
       :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
       @change='handleTableChange'>
       <span slot='click' slot-scope='text, record'>
@@ -60,7 +111,7 @@
       </span>
 
     </a-table>
-    <div class="page" style='display: flex;justify-content: flex-end;'>
+    <div class="page" style='display: flex;justify-content: flex-end;margin-bottom: 43px'>
       <a-pagination
         :show-total="total => $t('total')+` ${total} `+$t('strip')"
         show-quick-jumper
@@ -78,311 +129,405 @@
     </div>
     <!--  清单弹框  -->
     <a-modal v-model="listVisible" :title="$t('parameterTemplate')" width='700px' :footer="null">
-      <parameter-template v-if='listVisible' @areaVisible='drawerhandleCancel' @listVisibleRow='listVisibleRow'></parameter-template>
+      <parameter-template v-if='listVisible' @areaVisible='drawerhandleCancel'
+                          @listVisibleRow='listVisibleRow'></parameter-template>
     </a-modal>
   </div>
 </template>
 
 <script>
-import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
-import axios from 'axios'
-import Vue from 'vue'
-import ParameterTemplate from '../dialog/ParameterTemplate'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
+  import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
+  import axios from 'axios'
+  import Vue from 'vue'
+  import ParameterTemplate from '../dialog/ParameterTemplate'
+  import { ACCESS_TOKEN } from '@/store/mutation-types'
 
-export default {
-  name: 'ProjectCollectionParameters',
-  components: {
-    ParameterTemplate
-  },
-  data() {
-    return {
-      token:Vue.ls.get(ACCESS_TOKEN),
-      title: this.$t('add'),
-      total: 0,
-      selectedRowKeysDate: {},
-      loading: false,
-      editId: '',
-      columns: [
-        {
-          title: this.$t('entryName'),
-          dataIndex: 'projectName',
-          key: 'showArea',
-          align: 'center',
-          ellipsis: true
-        },
-        {
-          title: this.$t('ListTitle'),
-          align: 'center',
-          dataIndex: 'title',
-          ellipsis: true
-        },
-        {
-          title: this.$t('parameterTemplate'),
-          align: 'center',
-          dataIndex: 'paramsTemplateName',
-          ellipsis: true,
-          scopedSlots: { customRender: 'parameterTemplateSlot' }
-        }
-      ],
-      newVisible: false,
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 7 }
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 14 }
-      },
-      form: {},
-      formData: {},
-      rules: {
-        title: [
-          { required: true, message: this.$t('PleaseEnter')+this.$t('title'), trigger: 'blur' }
-        ]
-      },
-      areaTable: [],
-      flag: false,  //表单提交标识
-      spinLoading: false,
-      confirmLoading: false,
-      selectedRowKeys: [],
-      pageNo: 1,
-      pageSize: 10,
-      listVisible: false,
-      listVisibleRowDate: {}
-    }
-  },
-  props: {
-    version: {
-      type: Number,
-      default: '',
-      required: false
+  export default {
+    name: 'ProjectCollectionParameters',
+    components: {
+      ParameterTemplate
     },
-    projectId: {
-      type: String,
-      default: '',
-      require: true
-    },
-    url: {
-      type: Object,
-      default: '',
-      require: true
-    }
-  },
-  mounted() {
-    this.loadData()
-  },
-  methods: {
-    // 清单列表传出数据
-    listVisibleRow(val) {
-      // this.selectedRowKeys = []
-      let newAreaTable=JSON.parse(JSON.stringify(this.areaTable))
-      newAreaTable.forEach((item, index) => {
-         if( item.id == this.listVisibleRowDate.id ) {
-           let _obj = {...item}
-           _obj.paramsTemplateId = val[0].id
-           _obj.paramsTemplateName = val[0].paramsTemplateName
-           this.areaTable.splice(index, 1,_obj)
+    data() {
+      return {
+        token: Vue.ls.get(ACCESS_TOKEN),
+        title: this.$t('add'),
+        total: 0,
+        selectedRowKeysDate: {},
+        projectVersionList: [],
+        loading: false,
+        editId: '',
+        columns: [
+          {
+            title: this.$t('entryName'),
+            dataIndex: 'projectName',
+            key: 'showArea',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('ListTitle'),
+            align: 'center',
+            dataIndex: 'title',
+            ellipsis: true
+          },
+          {
+            title: this.$t('parameterTemplate'),
+            align: 'center',
+            dataIndex: 'paramsTemplateName',
+            ellipsis: true,
+            scopedSlots: { customRender: 'parameterTemplateSlot' }
           }
-      })
-      console.log(this.areaTable,'this.areaTable')
-      this.listVisible = false
-    },
-    parameterTemplateSlotHandler(val) {
-      this.listVisibleRowDate = val
-      console.log(val)
-      this.listVisible = true
-    },
-    pageOnChange(page, pageSize) {
-      this.pageNo = page
-      this.loadData()
-    },
-    SizeChange(page, pageSize) {
-      this.pageNo = 1
-      this.pageSize = pageSize
-      this.loadData()
-    },
-    loadData() {
-      let _this = this
-      let params = {
-        pageNo: this.pageNo,
-        pageSize: this.pageSize,
-        ...this.formData
+        ],
+        newVisible: false,
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 7 }
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 14 }
+        },
+        form: {},
+        formData: {},
+        rules: {
+          title: [
+            { required: true, message: this.$t('PleaseEnter') + this.$t('title'), trigger: 'blur' }
+          ]
+        },
+        areaTable: [],
+        flag: false,  //表单提交标识
+        spinLoading: false,
+        confirmLoading: false,
+        selectedRowKeys: [],
+        pageNo: 1,
+        pageSize: 10,
+        listVisible: false,
+        listVisibleRowDate: {}
       }
-      this.loading = true
-      axios({
-        url: `/jero-boot/params/manifest/getAllManifest`,
-        method: 'post',
-        data: params,
-        transformRequest: [function (data) {
-          let ret = ''
-          for (let it in data) {
-            ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
-          }
-          return ret
-        }],
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          'X-Access-Token':_this.token
+    },
+    props: {
+      version: {
+        type: Number,
+        default: '',
+        required: false
+      },
+      projectId: {
+        type: String,
+        default: '',
+        require: true
+      },
+      url: {
+        type: Object,
+        default: '',
+        require: true
+      }
+    },
+    mounted() {
+      this.loadData()
+      this.getProjectVersion()
+    },
+    methods: {
+      getProjectVersion() {
+        let query = {
+          id: this.projectId
         }
-      })
-        .then( (res) =>{
-          if (res.data.success) {
-            console.log(res.data)
-            this.loading = false
-            this.areaTable = res.data.result.records || []
-            this.total = res.data.result.total
-          }else{
-            this.loading = false
-          }
-        })
-        .catch( (error) =>{
-          console.log(error);
-        });
-    },
-    searchQuery() {
-      this.loadData()
-    },
-    searchReset() {
-      this.formData = {}
-      this.loadData()
-    },
-    handleCancel() {
-      this.$emit('areaVisible', false)
-    },
-    drawerhandleCancel(val) {
-      this.listVisible = val
-    },
-    onSelectChange(selectedRowKeys, selectedRowKeysDate) {
-      this.selectedRowKeysDate = selectedRowKeysDate
-      this.selectedRowKeys = selectedRowKeys
-    },
-    handleTableChange(val) {
-      console.log(',,,')
-    },
-    showModal() {
-      this.title = this.$t('add')
-      this.newVisible = true
-      this.form = {}
-    },
-    //新增
-    handleSubmit() {
-      let _this = this
-      if (this.selectedRowKeys.length == 0) {
-        this.$message.warning(this.$t('pleaseSelectData'))
-      } else if (this.selectedRowKeys.length > 1) {
-        this.$message.warning(this.$t('OnlyOneSelected'))
-      } else {
-        this.$refs.ruleForm.validate(valid => {
-          if (valid) {
-            this.flag = true
-            this.spinLoading = true
-            this.confirmLoading = true
-            let _tt = {
-              paramsTemplateId: this.selectedRowKeysDate[0].paramsTemplateId,
-              projectId: this.projectId,
-              title: this.formData.title,
-              paramsTemplatePublishVersion: this.selectedRowKeysDate[0].paramsTemplatePublishVersion,
-              sourceManifestId: this.selectedRowKeysDate[0].id,
-            }
-            postAction('params/manifest/copy', _tt).then((res) => {
-              if (res.success) {
-                this.$emit('copysubmit')
-                this.$message.success(this.$t('Copysuccessful'))
-                this.flag = false
-                this.spinLoading = false
-                this.confirmLoading = false
-              } else {
-                this.$message.warning(this.$t('Copyfailed'))
-                this.flag = false
-                this.spinLoading = false
-                this.confirmLoading = false
-              }
-            })
-            // axios({
-            //   url: `/jero-boot/params/manifest/copy`,
-            //   method: 'post',
-            //   data: _tt,
-            //   transformRequest: [function (data) {
-            //     let ret = ''
-            //     for (let it in data) {
-            //       ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
-            //     }
-            //     return ret
-            //   }],
-            //   headers: {
-            //     'Content-Type': 'application/x-www-form-urlencoded',
-            //     'X-Access-Token':_this.token
-            //   }
-            // })
-            //   .then( (res) =>{
-            //     if (res.data.success) {
-            //       _this.$emit('copysubmit')
-            //       _this.$message.success(res.data.message)
-            //       _this.flag = false
-            //       _this.spinLoading = false
-            //       _this.confirmLoading = false
-            //     }else{
-            //       _this.$message.warning(res.data.message)
-            //       _this.flag = false
-            //       _this.spinLoading = false
-            //       _this.confirmLoading = false
-            //     }
-            //   })
-            //   .catch( (error) =>{
-            //     console.log(error);
-            //   });
+        getAction('/project/projectLibraryBase/getVersionsInfo', query).then((res) => {
+          if (res.success) {
+            this.projectVersionList = res.result || []
           } else {
-            return false
+            this.projectVersionList = []
           }
         })
+      },
+      // 清单列表传出数据
+      listVisibleRow(val) {
+        // this.selectedRowKeys = []
+        let newAreaTable = JSON.parse(JSON.stringify(this.areaTable))
+        newAreaTable.forEach((item, index) => {
+          if (item.id == this.listVisibleRowDate.id) {
+            let _obj = { ...item }
+            _obj.paramsTemplateId = val[0].id
+            _obj.paramsTemplateName = val[0].paramsTemplateName
+            this.areaTable.splice(index, 1, _obj)
+          }
+        })
+        console.log(this.areaTable, 'this.areaTable')
+        this.listVisible = false
+      },
+      parameterTemplateSlotHandler(val) {
+        this.listVisibleRowDate = val
+        console.log(val)
+        this.listVisible = true
+      },
+      pageOnChange(page, pageSize) {
+        this.pageNo = page
+        this.loadData()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.loadData()
+      },
+      loadData() {
+        let _this = this
+        if (!this.formData.projectName){
+          this.formData.projectName = ''
+        }
+        let params = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          projectName:this.formData.projectName
+        }
+        this.loading = true
+        axios({
+          url: `/jero-boot/params/manifest/getAllManifest`,
+          method: 'post',
+          data: params,
+          transformRequest: [function(data) {
+            let ret = ''
+            for (let it in data) {
+              ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+            }
+            return ret
+          }],
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'X-Access-Token': _this.token
+          }
+        })
+          .then((res) => {
+            if (res.data.success) {
+              console.log(res.data)
+              this.loading = false
+              this.areaTable = res.data.result.records || []
+              this.total = res.data.result.total
+            } else {
+              this.loading = false
+            }
+          })
+          .catch((error) => {
+            console.log(error)
+          })
+      },
+      searchQuery() {
+        this.loadData()
+      },
+      searchReset() {
+        this.formData.projectName = ''
+        this.formData = {...this.formData}
+        this.loadData()
+      },
+      handleCancel() {
+        this.$emit('areaVisible', false)
+      },
+      drawerhandleCancel(val) {
+        this.listVisible = val
+      },
+      onSelectChange(selectedRowKeys, selectedRowKeysDate) {
+        this.selectedRowKeysDate = selectedRowKeysDate
+        this.selectedRowKeys = selectedRowKeys
+      },
+      handleTableChange(val) {
+        console.log(',,,')
+      },
+      showModal() {
+        this.title = this.$t('add')
+        this.newVisible = true
+        this.form = {}
+      },
+      //新增
+      handleSubmit() {
+        let _this = this
+        if (this.selectedRowKeys.length == 0) {
+          this.$message.warning(this.$t('pleaseSelectData'))
+        } else if (this.selectedRowKeys.length > 1) {
+          this.$message.warning(this.$t('OnlyOneSelected'))
+        } else {
+          this.$refs.ruleForm.validate(valid => {
+            if (valid) {
+              this.flag = true
+              this.spinLoading = true
+              this.confirmLoading = true
+              let formData = JSON.parse(JSON.stringify(this.formData))
+              Object.keys(formData).forEach(res => {
+                if (formData[res] && formData[res] instanceof Array) {
+                  formData[res] = formData[res].join(',')
+                }
+              })
+              let _tt = {
+                paramsTemplateId: this.selectedRowKeysDate[0].paramsTemplateId,
+                projectId: this.projectId,
+                title: formData.title,
+                projectVersion: formData.projectVersion,
+                explanation: formData.explanation,
+                paramsTemplatePublishVersion: this.selectedRowKeysDate[0].paramsTemplatePublishVersion,
+                sourceManifestId: this.selectedRowKeysDate[0].id
+              }
+              postAction('params/manifest/copy', _tt).then((res) => {
+                if (res.success) {
+                  this.$emit('copysubmit')
+                  this.$message.success(this.$t('Copysuccessful'))
+                  this.flag = false
+                  this.spinLoading = false
+                  this.confirmLoading = false
+                } else {
+                  this.$message.warning(this.$t('Copyfailed'))
+                  this.flag = false
+                  this.spinLoading = false
+                  this.confirmLoading = false
+                }
+              })
+              // axios({
+              //   url: `/jero-boot/params/manifest/copy`,
+              //   method: 'post',
+              //   data: _tt,
+              //   transformRequest: [function (data) {
+              //     let ret = ''
+              //     for (let it in data) {
+              //       ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+              //     }
+              //     return ret
+              //   }],
+              //   headers: {
+              //     'Content-Type': 'application/x-www-form-urlencoded',
+              //     'X-Access-Token':_this.token
+              //   }
+              // })
+              //   .then( (res) =>{
+              //     if (res.data.success) {
+              //       _this.$emit('copysubmit')
+              //       _this.$message.success(res.data.message)
+              //       _this.flag = false
+              //       _this.spinLoading = false
+              //       _this.confirmLoading = false
+              //     }else{
+              //       _this.$message.warning(res.data.message)
+              //       _this.flag = false
+              //       _this.spinLoading = false
+              //       _this.confirmLoading = false
+              //     }
+              //   })
+              //   .catch( (error) =>{
+              //     console.log(error);
+              //   });
+            } else {
+              return false
+            }
+          })
+        }
       }
     },
-  },
-  watch: {
-    selectedRowKeyS(val) {
-      this.selectedRowKeys = val
+    watch: {
+      selectedRowKeyS(val) {
+        this.selectedRowKeys = val
+      }
     }
-  }
 
-}
+  }
 </script>
 
 <style lang='less' scoped>
-@import '~@assets/less/common.less';
+  @import '~@assets/less/common.less';
 
-.diolag-area {
-  .table-area {
-    margin: 20px 0;
+  .diolag-area {
+    .table-area {
+      margin: 20px 0;
 
-    .action-edit {
-      margin-right: 10px;
+      .action-edit {
+        margin-right: 10px;
+      }
+    }
+
+    .table-del {
+      color: red;
     }
   }
 
-  .table-del {
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    z-index: 100;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .Required {
     color: red;
+    margin-right: 4px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 84px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 100px);
+    display: inline-block;
+    margin-top: 2px;
+    /*height: 40px;*/
+    margin-bottom: 24px;
+  }
+
+  .itemModel-text {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+  .box-button{
+    height: 38px;
   }
-}
-.drawer-bootom-button{
-  display: flex;
-  justify-content: center;
-}
-.Required {
-  color: red;
-  margin-right: 4px;
-}
 </style>
 <style lang='less'>
-.area-module {
-  .ant-modal-wrap {
-    .ant-modal {
-      .ant-modal-content {
-        .ant-modal-footer {
-          text-align: center;
+  .area-module {
+    .ant-modal-wrap {
+      .ant-modal {
+        .ant-modal-content {
+          .ant-modal-footer {
+            text-align: center;
+          }
         }
       }
     }
   }
-}
 </style>

jero-web/src/views/projectManagement/projectLibrary/components/changeExtensionModel.vue

@@ -0,0 +1,278 @@
+<template>
+  <a-drawer
+    :title="$t('addSubproject')"
+    :maskClosable="false"
+    :width="600"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <a-spin :spinning="confirmLoading">
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('projectVersion')">{{$t('projectVersion')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="projectVersion">
+                <a-input class="box-input"
+                         :disabled="true"
+                         v-model="formInline.projectVersion"
+                         :placeholder="$t('PleaseEnter')+$t('projectVersion')"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('explain')">{{$t('explain')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="explanation">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('explain')"
+                            v-model="formInline.explanation
+"
+                            :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <div class="drawer-bootom-button">
+      <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: 'changeExtensionModel',
+    props: ['url'],
+    data() {
+      return {
+        formInline: {},
+        confirmLoading: false,
+        visible: false,
+        yearNameDataList: [],
+        rules: {
+          explanation: [
+            {
+              max: 500,
+              message: this.$t('explain') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          projectVersion: [
+            {
+              required: true,
+              message: this.$t('projectVersion') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            }
+          ]
+        },
+        disabled: false,
+        projectNameList: [],
+        title: ''
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      addModel(val) {
+        this.visible = true
+        this.formInline = {}
+        this.formInline = { ...this.formInline }
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      editModel(value) {
+        this.visible = true
+        this.formInline = {}
+        this.formInline.id = value.parentId || value.id
+        if (!value.versionLast) {
+          this.formInline.projectVersion = '01'
+        } else if (value.versionLast) {
+          if (value.versionLast.slice(0, 1) == '0') {
+            let num = value.versionLast.slice(1, 2)
+            let numIndex = parseInt(num) + 1
+            numIndex = numIndex + ''
+            if (numIndex.length == 1) {
+              this.formInline.projectVersion = '0' + numIndex
+            } else {
+              this.formInline.projectVersion = numIndex
+            }
+          } else {
+            let index = parseInt(value.versionLast) + 1
+            index = index + ''
+            if (index.length == 1) {
+              this.formInline.projectVersion = '0' + index
+            } else {
+              this.formInline.projectVersion = index
+            }
+          }
+        }
+        this.formInline = { ...this.formInline }
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let query = JSON.parse(JSON.stringify(this.formInline))
+            Object.keys(query).forEach(res => {
+              if (query[res] && query[res] instanceof Array) {
+                query[res] = query[res].join(',')
+              }
+            })
+            this.confirmLoading = true
+            postAction('/project/projectLibraryBase/addChild', query).then((res) => {
+              if (res.success) {
+                this.confirmLoading = false
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visible = false
+                this.$emit('changeExtensionForm')
+              } else {
+                this.$message.warning(res.message)
+                this.confirmLoading = false
+              }
+            })
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style>
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }
+
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: 100%;
+  }
+
+  /*.formAdd .ant-form-item {*/
+  /*  margin-bottom: 20px;*/
+  /*}*/
+
+  .itemModel .ant-form-item-control-wrapper {
+    width: 100%;
+  }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+    margin-top: 6px;
+  }
+
+  .box-input .ant-calendar-picker {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    height: 38px;
+  }
+
+  .box-input .ant-input-number-input-wrap {
+    line-height: 38px;
+    height: 38px;
+  }
+</style>
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 84px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 110px);
+    display: inline-block;
+    margin-top: 2px;
+    height: 40px;
+    margin-bottom: 24px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    z-index: 100;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
+<style>
+  .ant-input-disabled {
+    color: rgba(0, 0, 0, 0.65) !important;
+  }
+</style>

jero-web/src/views/projectManagement/projectLibrary/index.vue

@@ -125,10 +125,18 @@
         :columns="columns"
       >
         <span slot="projectName" slot-scope="text,record">
-          <a @click="entryNameClick(record)">{{text}}</a>
+          <a @click="entryNameClick(record)" :title="text">{{text}}</a>
         </span>
         <span slot="operation" slot-scope="text,record">
 <!--            <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>-->
+            <a class="text-operation"
+               v-if="!record.parentId"
+               @click="toppingClick(record)">
+              {{record.flag == '1'?$t('cancelTopping'):$t('Topping')}}
+            </a>
+            <a class="text-operation" @click="changeExtensionClick(record)">
+              {{$t('addSubproject')}}
+            </a>
             <a class="text-operation"
                v-has="'projectLibraryBase:delete'"
                v-if="record.createBy == userInfoQuery.username || administrators"
@@ -150,12 +158,14 @@
       />
     </div>
     <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
+    <changeExtensionModel ref="changeExtensionModelRef" @changeExtensionForm="changeExtensionForm"/>
   </a-card>
 </template>
 
 <script>
   import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
   import addModel from '../components/addModel'
+  import changeExtensionModel from './components/changeExtensionModel'
   import PersonnelSelection from '@/components/PersonnelSelection/index'
   import { mapGetters } from 'vuex'
 
@@ -163,7 +173,8 @@
     name: 'index',
     components: {
       addModel,
-      PersonnelSelection
+      PersonnelSelection,
+      changeExtensionModel
     },
     data() {
       return {
@@ -189,26 +200,26 @@
         columns: [
           {
             title: this.$t('entryName'),
-            align: 'center',
+            align: 'left',
             dataIndex: 'projectName',
             width: 180,
             ellipsis: true,
             scopedSlots: { customRender: 'projectName' }
           },
-          {
-            title: this.$t('targetMarket'),
-            width: 180,
-            ellipsis: true,
-            align: 'center',
-            dataIndex: 'targetMarket_dictText'
-          },
-          {
-            title: this.$t('projectStatus'),
-            align: 'center',
-            width: 180,
-            ellipsis: true,
-            dataIndex: 'projectStatus_dictText'
-          },
+          // {
+          //   title: this.$t('targetMarket'),
+          //   width: 180,
+          //   ellipsis: true,
+          //   align: 'center',
+          //   dataIndex: 'targetMarket_dictText'
+          // },
+          // {
+          //   title: this.$t('projectStatus'),
+          //   align: 'center',
+          //   width: 180,
+          //   ellipsis: true,
+          //   dataIndex: 'projectStatus_dictText'
+          // },
           {
             title: this.$t('StudioEngineer'),
             align: 'center',
@@ -217,12 +228,19 @@
             dataIndex: 'studioEngineerName'
           },
           {
-            title: this.$t('certifiedEngineer'),
+            title: this.$t('explain'),
             align: 'center',
-            width: 180,
+            width: 280,
             ellipsis: true,
-            dataIndex: 'certificationEngineerName'
+            dataIndex: 'explanation'
           },
+          // {
+          //   title: this.$t('certifiedEngineer'),
+          //   align: 'center',
+          //   width: 180,
+          //   ellipsis: true,
+          //   dataIndex: 'certificationEngineerName'
+          // },
           {
             title: this.$t('ModelPlatform'),
             align: 'center',
@@ -241,7 +259,7 @@
             title: this.$t('operation'),
             align: 'center',
             fixed: 'right',
-            width: 100,
+            width: 302,
             scopedSlots: { customRender: 'operation' }
           }
         ],
@@ -267,6 +285,32 @@
       handleToggleSearch() {
         this.toggleSearchStatus = !this.toggleSearchStatus
       },
+      toppingClick(row) {
+        let flag = ''
+        if (row.flag == '1') {
+          flag = '0'
+        } else {
+          flag = '1'
+        }
+        let query = {
+          flag: flag,
+          id: row.id
+        }
+        getAction('/project/projectLibraryBase/top', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.getList()
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+      },
+      changeExtensionClick(val) {
+        this.$refs.changeExtensionModelRef.editModel(JSON.parse(JSON.stringify(val)))
+      },
+      changeExtensionForm() {
+        this.getList()
+      },
       onSelectChange(value) {
         this.selectedRowKeys = value
       },

jero-web/src/views/system/PermissionList.vue

@@ -56,7 +56,7 @@
                 <a href="javascript:;" @click="handleDataRule(record)">{{$t('DataRules')}}</a>
               </a-menu-item>
 
-              <a-menu-item>
+              <a-menu-item v-if="isTrue(record)">
                 <a-popconfirm :title="$t('areYouSure')" @confirm="() => handleDelete(record.id)">
                   <a>{{$t('delete')}}</a>
                 </a-popconfirm>
@@ -187,6 +187,16 @@
       }
     },
     methods: {
+      isTrue(record) {
+        if (record.id == '1580735287309119489' ||
+          record.id == '1580735611793059842' ||
+          record.id == '1580735965892980738' ||
+          record.id == '1580734309507805185' ||
+          record.id == '1580762600394469378') {
+          return false
+        }
+        return true
+      },
       loadData() {
         this.dataSource = []
         getPermissionList().then((res) => {

jero-web/src/views/system/QuartzJobList.vue

@@ -126,6 +126,13 @@
         description: '定时任务在线管理',
         // 查询条件
         queryParam: {},
+        ipagination: {
+          total: 0,
+          pageSize: 20,//每页中显示10条数据
+          showSizeChanger: true,
+          pageSizeOptions: ["10", "20", "50", "100"],//每页中显示的数据
+          showTotal: total => `共有 ${total} 条数据`,  //分页中显示总的数据
+        },
         // 表头
         columns: [
           {

jero-web/src/views/system/UserAnnouncementList.vue

@@ -6,12 +6,12 @@
         <a-row :gutter="24">
           <a-col :md="6" :sm="8" style="line-height: 48px">
             <div class="box-title-text">
-              <div class="title-text" :title="$t('MessageTitle')">
-                <span>{{this.$t('MessageTitle')}}</span>
+              <div class="title-text" :title="$t('MessageContent')">
+                <span>{{this.$t('MessageContent')}}</span>
               </div>
               <a-input class="box-input"
-                       :placeholder="$t('pleaseEnter')+$t('MessageTitle')"
-                       v-model="queryParam.titile">
+                       :placeholder="$t('pleaseEnter')+$t('MessageContent')"
+                       v-model="queryParam.msgContent">
               </a-input>
             </div>
           </a-col>
@@ -63,18 +63,29 @@
       :dataSource="dataSource"
       :scroll="{x: '100%'}"
       :pagination="ipagination"
+      :expandIconAsCell='false'
+      :expandIconColumnIndex="5"
+      :expandIcon="expandIcon"
       :loading="loading"
+      @expand="expandChange"
       @change="handleTableChange">
       <span slot="msgTitile" slot-scope="text,scope">
-           <a :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}" :title="text" @click="msgContentClick(scope)">
-             {{text}}
+<!--         @click="msgContentClick(scope)"-->
+           <a :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}"
+              :title="language == 'zh-cn' ? scope.msgContentCn : scope.msgContent">
+             {{language == 'zh-cn' ? scope.msgContentCn : scope.msgContent}}
            </a>
       </span>
       <span slot="msgCategory" slot-scope="text,scope">
-           <a :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}" @click="msgContentClick(scope)">
+<!--        :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}" @click="msgContentClick(scope)"-->
+           <span :title="msgCategoryQuery[text]">
              {{msgCategoryQuery[text]}}
-           </a>
+           </span>
       </span>
+      <p slot="expandedRowRender" slot-scope="record" style="margin: 0;padding-left: 58px;">
+        <span v-html="language == 'zh-cn' ? record.msgContentInfoCn : record.msgContentInfo">
+        </span>
+      </p>
     </a-table>
     <show-announcement ref="ShowAnnouncement"></show-announcement>
     <dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData"/>
@@ -104,8 +115,8 @@
         msgCategoryQuery: {
           '1': this.$t('SubscriptionNotification'),
           '2': this.$t('warningInformation'),
-          '3': this.$t('ForwardPush'),
-          '4': this.$t('CollectinguthenticationParameters'),
+          '3': this.$t('ForwardPush')
+          // '4': this.$t('CollectinguthenticationParameters'),
           // '6':this.$t('RegulationListConfirmationTask'),
           // '7':this.$t('RegulationListConfirmationNotification'),
           // '8':this.$t('RegulationTaskConfirmation'),
@@ -115,39 +126,48 @@
           // '12':this.$t('DesignComplianceNotification'),
           // '13':this.$t('PreHomoNotification'),
           // '14':this.$t('ValidationComplianceNotification'),
-          '15':this.$t('RegulationTaskConfirmationNotification'),
-          '17':this.$t('listConfirmation'),
-          '18':this.$t('taskAffirm'),
-          '19':this.$t('complianceConfirmation'),
-          '20':this.$t('collectionLegislativeComments'),
-          '21':this.$t('regulatoryAndTechnicalAssessment'),
+          // '15':this.$t('RegulationTaskConfirmationNotification'),
+          // '17':this.$t('listConfirmation'),
+          // '18':this.$t('taskAffirm'),
+          // '19':this.$t('complianceConfirmation'),
+          // '20':this.$t('collectionLegislativeComments'),
+          // '21':this.$t('regulatoryAndTechnicalAssessment'),
         },
         columns: [
           {
-            title: this.$t('MessageTitle'),
-            align: 'center',
-            dataIndex: 'titile',
+            title: this.$t('MessageContent'),
+            align: 'left',
+            dataIndex: 'msgContent',
             ellipsis: true,
             scopedSlots: { customRender: 'msgTitile' }
           },
           {
             title: this.$t('Sponsor'),
-            align: 'center',
+            align: 'left',
+            ellipsis: true,
             dataIndex: 'initiator',
-            width: 200,
+            width: 200
           },
           {
             title: this.$t('MessageType'),
-            align: 'center',
+            align: 'left',
+            ellipsis: true,
             dataIndex: 'msgCategory',
             width: 200,
             scopedSlots: { customRender: 'msgCategory' }
           },
           {
             title: this.$t('NotificationTime'),
-            align: 'center',
+            align: 'left',
+            ellipsis: true,
             width: 200,
             dataIndex: 'sendTime'
+          },
+          {
+            title: '',
+            align: 'left',
+            ellipsis: true,
+            width: 50
           }
         ],
         url: {
@@ -158,10 +178,55 @@
         },
         loading: false,
         openPath: '',
-        formData: ''
+        formData: '',
+        language: ''
       }
     },
+    watch: {
+      $route: function(res) {
+        console.log(res)
+        this.loadData()
+      }
+    },
+    mounted() {
+      this.language = localStorage.getItem('language') || ''
+    },
     methods: {
+      expandIcon(props) {
+        if (props.expanded) {
+          return <a-icon type = 'down'onClick = { e=>
+          {
+            props.onExpand(props.record, e)
+          }
+        }
+          />;
+        } else {
+          return <a-icon type = 'right' onClick = { e =>
+          {
+            props.onExpand(props.record, e)
+          }
+        }
+          />;
+        }
+      },
+      getQueryParams() {
+        //获取查询条件
+        let sqp = {}
+        if (this.superQueryParams) {
+          sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+          sqp['superQueryMatchType'] = this.superQueryMatchType
+        }
+        if (localStorage.getItem('msgContent')) {
+          this.queryParam.msgContent = localStorage.getItem('msgContent')
+          this.queryParam = { ...this.queryParam }
+          localStorage.removeItem('msgContent')
+        }
+        var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters)
+        param.field = this.getQueryField()
+        param.pageNo = this.ipagination.current
+        param.pageSize = this.ipagination.pageSize
+        return filterObj(param)
+      },
       showAnnouncement(record) {
         putAction(this.url.editCementSend, { anntId: record.anntId }).then((res) => {
           if (res.success) {
@@ -177,6 +242,13 @@
           this.$refs.ShowAnnouncement.detail(record)
         }
       },
+      expandChange(isTrue, val) {
+        if (isTrue) {
+          if (val.readFlag == '0') {
+            this.msgContentClick(val)
+          }
+        }
+      },
       readAll() {
         var that = this
         if (this.selectedRowKeys.length > 0) {
@@ -204,11 +276,12 @@
       },
       msgContentClick(row) {
         getAction(this.url.readAllMsg, { ids: row.id }).then((res) => {
+          // this.loadData()
         })
-        this.$router.push({
-          path: '/system/MessageDetails',
-          query: row
-        })
+        // this.$router.push({
+        //   path: '/system/MessageDetails',
+        //   query: row
+        // })
       },
       handleDel() {
         var that = this
@@ -297,6 +370,10 @@
     height: 38px;
     /*margin-top: 2px;*/
   }
+
+  ::v-deep .ant-table .ant-table-row-indent + .ant-table-row-expand-icon {
+    margin-right: 0;
+  }
 </style>
 <style>
   .box-input .ant-select-selection {

jero-web/src/views/toDoCenter/projectParameterTasks/index.vue

@@ -0,0 +1,308 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('RelatedItems')">
+                <span>{{$t('RelatedItems')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RelatedItems')"
+                       v-model.trim="queryParam.projectName"></a-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('ListTitle')">
+                <span>{{$t('ListTitle')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ListTitle')"
+                       v-model.trim="queryParam.title"></a-input>
+            </div>
+          </a-col>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+        rowKey="id"
+        :data-source="dataSource"
+        :columns="columns"
+      >
+        <!--         -->
+
+        <span slot="projectVersion" slot-scope="text,record">
+          <span class="text-operation">{{text ? text:'--'}}</span>
+        </span>
+        <span slot="waitFillNumoperation" slot-scope="text,record">
+          <a class="text-operation" v-if='text'
+             @click="waitFillClick(record)">{{text}}</a>
+          <span class="text-operation" v-else >{{'--'}}</span>
+        </span>
+        <span slot="waitSdtNumoperation" slot-scope="text,record">
+          <a class="text-operation" v-if='text'
+             @click="waitSdtClick(record)">{{text}}</a>
+          <span class="text-operation" v-else >{{'--'}}</span>
+        </span>
+        <span slot="waitCollectNumoperation" slot-scope="text,record">
+          <a class="text-operation" v-if='text'
+             @click="waitCollectClick(record)">{{text}}</a>
+          <span class="text-operation" v-else >{{'--'}}</span>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} ` +$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'index',
+    components: {},
+    data() {
+      return {
+        queryParam: {},
+        taskTypeList: [],
+        taskStatusList: [],
+        dataSource: [],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        loading: false,
+        url:{
+          list:'',
+        },
+        columns: [
+          {
+            title: this.$t('RelatedItems'),
+            align: 'center',
+            dataIndex: 'projectName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('ListTitle'),
+            align: 'center',
+            dataIndex: 'title',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('relatedVersion'),
+            align: 'center',
+            dataIndex: 'projectVersion',
+            ellipsis: true,
+            width: 170,
+            scopedSlots: { customRender: 'projectVersion' }
+          },
+          {
+            title: this.$t('completednum'),
+            align: 'center',
+            dataIndex: 'waitFillNum',
+            ellipsis: true,
+            width: 170,
+            scopedSlots: { customRender: 'waitFillNumoperation' }
+          },
+          {
+            title: this.$t('filledBynum'),
+            align: 'center',
+            dataIndex: 'waitSdtNum',
+            ellipsis: true,
+            width: 170,
+            scopedSlots: { customRender: 'waitSdtNumoperation' }
+          },
+          {
+            title: this.$t('parameterToBeInitiatednum'),
+            align: 'center',
+            dataIndex: 'waitCollectNum',
+            ellipsis: true,
+            width: 170,
+            scopedSlots: { customRender: 'waitCollectNumoperation' }
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      //待填写数量
+      waitFillClick(item) {
+        let _this = this
+        item.type = '1'
+        item.userType = 'dre'
+        console.log(item)
+        let newUrl = _this.$router.resolve({
+          path: '/ParameterItemCollection',
+          query:  item
+          // projectName:this.$route.query.projectName
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      //待分配填写人数量
+      waitSdtClick(item) {
+        let _this = this
+        item.type = '1'
+        item.userType = 'sdt'
+        console.log(item)
+        let newUrl = _this.$router.resolve({
+          path: '/ParameterItemCollection',
+          query:  item
+          // projectName:this.$route.query.projectName
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      //参数待发起数量
+      waitCollectClick(item) {
+        let _this = this
+        item.type = '1'
+        item.userType = 'homo'
+        console.log(item)
+        let newUrl = _this.$router.resolve({
+          path: '/ParameterItemCollection',
+          query:  item
+          // projectName:this.$route.query.projectName
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction('todoCenter/params/manifest/page', query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  @import '~@assets/less/common.less';
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  ::v-deep .ant-table-row:first-child {
+    background: #fff !important;
+    opacity: 0.9;
+  }
+
+  ::v-deep .ant-table-body {
+    background: transparent !important;
+  }
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+</style>

jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue

@@ -0,0 +1,354 @@
+<template>
+  <div class="box">
+    <a-table
+      ref="table"
+      size="middle"
+      :loading="loading"
+      :pagination="false"
+      :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+      rowKey="id"
+      :data-source="dataSource"
+      :columns="columns"
+    >
+      <!--         -->
+      <span slot="operation" slot-scope="text,record">
+           <a class="text-operation" v-if="record.flowType != '10'"
+              @click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
+          <a class="text-operation"
+             @click="viewClick(record)">{{$t('view')}}</a>
+      </span>
+      <span slot="RelatedItems" slot-scope="text,record">
+          <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
+      </span>
+      <span slot="standardInformation" slot-scope="text,record">
+       <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
+          {{text}}
+        </a>
+        <span v-else>--</span>
+      </span>
+    </a-table>
+    <div class="page" v-if="dataSource && dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'SentList',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        columns: [
+          {
+            title: this.$t('RelatedItems'),
+            align: 'center',
+            dataIndex: 'projectName',
+            scopedSlots: { customRender: 'RelatedItems' },
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('standardInformation'),
+            align: 'center',
+            dataIndex: 'standardInfo',
+            scopedSlots: { customRender: 'standardInformation' },
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'center',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('LastProcessor'),
+            align: 'center',
+            dataIndex: 'lastAssigneeName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('CurrentProcessor'),
+            align: 'center',
+            dataIndex: 'assigneeName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskStatus'),
+            align: 'center',
+            dataIndex: 'statusShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 120,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        url: {
+          list: '/todoCenter/projectProcess/issuedProcess'
+        },
+        queryParam: {}
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      monitoringProcessClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/processDetails',
+          query: {
+            prcNum: row.prcNum,
+            prcType: row.flowType,
+            prcId: row.actiProcInstId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      RelatedItemsClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/ProjectDetails',
+          query: {
+            id: item.projectLibraryId,
+            projectName: item.projectName,
+            projectNameId: item.projectNameId,
+            targetMarket: item.targetMarket,
+            studioEngineer: item.studioEngineer
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      standardInformationClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.bussDocumentLibraryId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      viewClick(row) {
+        let query = {}
+        row.router = this.$route.path
+        if (row.flowType == '1') {
+          query = {
+            taskDefinitionKey: row.taskDefinitionKey,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            prcNum: row.prcNum,
+            isTrue: false
+          }
+          let newUrl = this.$router.resolve({
+            path: '/handshakeProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '10') {
+          let newUrl = this.$router.resolve({
+            path: '/ProjectDetails',
+            query: {
+              id: row.projectLibraryId,
+              projectName: row.projectName,
+              projectNameId: row.projectNameId,
+              targetMarket: row.targetMarket,
+              studioEngineer: row.studioEngineer,
+              type: '102'
+            }
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '2') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            projectLibraryId: row.projectLibraryId,
+            id: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            isDisplay: false,
+            flowType: 2,
+            Sponsor: 'designInitiatorName',
+            personLiable: 'designDutyName',
+            typeOfDeliverables: 'designDeliverableTypeName',
+            deliverableTemplate: 'designDeliverableTemplate',
+            DueDate: 'designDueDate',
+            remarks: 'designRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '3') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            studioEngineer: row.studioEngineer,
+            projectLibraryId: row.projectLibraryId,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 3,
+            isDisplay: false,
+            id: row.projectLibraryId,
+            Sponsor: 'prehomoInitiatorName',
+            personLiable: 'prehomoDutyName',
+            typeOfDeliverables: 'prehomoDeliverableTypeName',
+            deliverableTemplate: 'prehomoDeliverableTemplate',
+            DueDate: 'prehomoDueDate',
+            remarks: 'prehomoRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '4') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            id: row.projectLibraryId,
+            projectLibraryId: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 4,
+            isDisplay: false,
+            Sponsor: 'verifyInitiatorName',
+            personLiable: 'verifyDutyName',
+            typeOfDeliverables: 'verifyDeliverableTypeName',
+            deliverableTemplate: 'verifyDeliverableTemplate',
+            DueDate: 'verifyDueDate',
+            remarks: 'verifyRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }
+      },
+      searchQuery(value) {
+        this.queryParam = value
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+</style>

jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue

@@ -0,0 +1,338 @@
+<template>
+  <div class="box">
+    <a-table
+      ref="table"
+      size="middle"
+      :loading="loading"
+      :pagination="false"
+      :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+      rowKey="id"
+      :data-source="dataSource"
+      :columns="columns"
+    >
+      <!--         -->
+      <span slot="endTime" slot-scope="text,record">
+          <span :title="text" :class="{'activeRed':record.endTimePastDueFlag}">{{text}}</span>
+      </span>
+      <span slot="operation" slot-scope="text,record">
+          <a class="text-operation"
+             @click="ProcessingClick(record)">{{$t('Processing')}}</a>
+      </span>
+      <span slot="RelatedItems" slot-scope="text,record">
+          <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
+      </span>
+      <span slot="standardInformation" slot-scope="text,record">
+        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
+          {{text}}
+        </a>
+        <span v-else>--</span>
+      </span>
+    </a-table>
+    <div class="page" v-if="dataSource && dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'dealtWith',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        columns: [
+          {
+            title: this.$t('RelatedItems'),
+            align: 'center',
+            dataIndex: 'projectName',
+            ellipsis: true,
+            scopedSlots: { customRender: 'RelatedItems' },
+            width: 170
+          },
+          {
+            title: this.$t('standardInformation'),
+            align: 'center',
+            dataIndex: 'standardInfo',
+            ellipsis: true,
+            scopedSlots: { customRender: 'standardInformation' },
+            width: 170
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'center',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            dataIndex: 'createBy',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170,
+            scopedSlots: { customRender: 'endTime' }
+          },
+          {
+            title: this.$t('taskStatus'),
+            align: 'center',
+            dataIndex: 'statusShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 120,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        url: {
+          list: '/todoCenter/projectProcess/todoTaskList'
+        },
+        queryParam: {}
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      RelatedItemsClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/ProjectDetails',
+          query: {
+            id: item.projectLibraryId,
+            projectName: item.projectName,
+            projectNameId: item.projectNameId,
+            targetMarket: item.targetMarket,
+            studioEngineer: item.studioEngineer
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      standardInformationClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.bussDocumentLibraryId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      ProcessingClick(row) {
+        let query = {}
+        row.router = this.$route.path
+        if (row.flowType == '1') {
+          query = {
+            taskDefinitionKey: row.taskDefinitionKey,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            prcNum: row.prcNum,
+            isTrue: true
+          }
+          let newUrl = this.$router.resolve({
+            path: '/handshakeProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '10') {
+          let newUrl = this.$router.resolve({
+            path: '/ProjectDetails',
+            query: {
+              id: row.projectLibraryId,
+              projectName: row.projectName,
+              projectNameId: row.projectNameId,
+              targetMarket: row.targetMarket,
+              studioEngineer: row.studioEngineer,
+              type: '102'
+            }
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '2') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            projectLibraryId: row.projectLibraryId,
+            id: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            isDisplay: true,
+            flowType: 2,
+            Sponsor: 'designInitiatorName',
+            personLiable: 'designDutyName',
+            typeOfDeliverables: 'designDeliverableTypeName',
+            deliverableTemplate: 'designDeliverableTemplate',
+            DueDate: 'designDueDate',
+            remarks: 'designRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '3') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            studioEngineer: row.studioEngineer,
+            projectLibraryId: row.projectLibraryId,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 3,
+            isDisplay: true,
+            id: row.projectLibraryId,
+            Sponsor: 'prehomoInitiatorName',
+            personLiable: 'prehomoDutyName',
+            typeOfDeliverables: 'prehomoDeliverableTypeName',
+            deliverableTemplate: 'prehomoDeliverableTemplate',
+            DueDate: 'prehomoDueDate',
+            remarks: 'prehomoRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '4') {
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            id: row.projectLibraryId,
+            projectLibraryId: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 4,
+            isDisplay: true,
+            Sponsor: 'verifyInitiatorName',
+            personLiable: 'verifyDutyName',
+            typeOfDeliverables: 'verifyDeliverableTypeName',
+            deliverableTemplate: 'verifyDeliverableTemplate',
+            DueDate: 'verifyDueDate',
+            remarks: 'verifyRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }
+      },
+      searchQuery(value) {
+        this.queryParam = value
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .activeRed {
+    color: red;
+  }
+</style>

jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue

@@ -0,0 +1,355 @@
+<template>
+  <div class="box">
+    <a-table
+      ref="table"
+      size="middle"
+      :loading="loading"
+      :pagination="false"
+      :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+      rowKey="id"
+      :data-source="dataSource"
+      :columns="columns"
+    >
+      <!--         -->
+      <span slot="operation" slot-scope="text,record">
+          <a class="text-operation" v-if="record.flowType != '10'"
+            @click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
+          <a class="text-operation"
+             @click="viewClick(record)">{{$t('view')}}</a>
+      </span>
+      <span slot="RelatedItems" slot-scope="text,record">
+          <a @click="RelatedItemsClick(record)" :title="text">
+            {{text}}
+          </a>
+      </span>
+      <span slot="standardInformation" slot-scope="text,record">
+        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
+          {{text}}
+        </a>
+        <span v-else>--</span>
+      </span>
+    </a-table>
+    <div class="page" v-if="dataSource && dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'doneList',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        url: {
+          list: '/todoCenter/projectProcess/doneProcess'
+        },
+        queryParam: {},
+        columns: [
+          {
+            title: this.$t('RelatedItems'),
+            align: 'center',
+            dataIndex: 'projectName',
+            ellipsis: true,
+            scopedSlots: { customRender: 'RelatedItems' },
+            width: 170
+          },
+          {
+            title: this.$t('standardInformation'),
+            align: 'center',
+            dataIndex: 'standardInfo',
+            ellipsis: true,
+            scopedSlots: { customRender: 'standardInformation' },
+            width: 170
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'center',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            dataIndex: 'createBy',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('CurrentProcessor'),
+            align: 'center',
+            dataIndex: 'assigneeName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskStatus'),
+            align: 'center',
+            dataIndex: 'statusShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 120,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      monitoringProcessClick(row){
+        let newUrl = this.$router.resolve({
+          path: '/processDetails',
+          query: {
+            prcNum: row.prcNum,
+            prcType:row.flowType,
+            prcId:row.actiProcInstId,
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      RelatedItemsClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/ProjectDetails',
+          query: {
+            id: item.projectLibraryId,
+            projectName: item.projectName,
+            projectNameId: item.projectNameId,
+            targetMarket: item.targetMarket,
+            studioEngineer:item.studioEngineer,
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      standardInformationClick(item){
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.bussDocumentLibraryId,
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      viewClick(row) {
+        let query = {}
+        row.router = this.$route.path
+        if (row.flowType == '1') {
+          query = {
+            taskDefinitionKey:row.taskDefinitionKey,
+            taskIds:row.taskId,
+            prcType:row.flowType,
+            prcNum:row.prcNum,
+            isTrue:false,
+          }
+          let newUrl = this.$router.resolve({
+            path: '/handshakeProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }else if(row.flowType == '10'){
+          let newUrl = this.$router.resolve({
+            path: '/ProjectDetails',
+            query: {
+              id: row.projectLibraryId,
+              projectName: row.projectName,
+              projectNameId: row.projectNameId,
+              targetMarket: row.targetMarket,
+              studioEngineer:row.studioEngineer,
+              type:'102',
+            }
+          })
+          window.open(newUrl.href, '_blank')
+        }else if(row.flowType == '2'){
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds:row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            projectLibraryId:row.projectLibraryId,
+            id: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            isDisplay: false,
+            flowType: 2,
+            Sponsor: 'designInitiatorName',
+            personLiable: 'designDutyName',
+            typeOfDeliverables: 'designDeliverableTypeName',
+            deliverableTemplate: 'designDeliverableTemplate',
+            DueDate: 'designDueDate',
+            remarks: 'designRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }else if(row.flowType == '3'){
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds:row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            studioEngineer: row.studioEngineer,
+            projectLibraryId:row.projectLibraryId,
+            serialNumber: row.serialNumber,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 3,
+            isDisplay: false,
+            id: row.projectLibraryId,
+            Sponsor: 'prehomoInitiatorName',
+            personLiable: 'prehomoDutyName',
+            typeOfDeliverables: 'prehomoDeliverableTypeName',
+            deliverableTemplate: 'prehomoDeliverableTemplate',
+            DueDate: 'prehomoDueDate',
+            remarks: 'prehomoRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }else if(row.flowType == '4'){
+          row.taskId = row.taskId + ''
+          if (row.taskId.length > 30) {
+            row.taskId = ''
+          }
+          query = {
+            router: row.router,
+            taskIds: row.taskId,
+            actiProcInstId: row.actiProcInstId,
+            id: row.projectLibraryId,
+            projectLibraryId: row.projectLibraryId,
+            studioEngineer: row.studioEngineer,
+            serialNumber: row.serialNumber,
+            projectTaskInventoryId: row.projectLawsInventoryId,
+            TaskKey: row.taskDefinitionKey,
+            flowType: 4,
+            isDisplay: false,
+            Sponsor: 'verifyInitiatorName',
+            personLiable: 'verifyDutyName',
+            typeOfDeliverables: 'verifyDeliverableTypeName',
+            deliverableTemplate: 'verifyDeliverableTemplate',
+            DueDate: 'verifyDueDate',
+            remarks: 'verifyRemark',
+            projectName: row.projectName,
+            targetMarket: row.targetMarket,
+            projectNameId: row.projectNameId,
+            primaryKeyId: row.primaryKeyId,
+            PersonChargeFeedback: row.personChargeFeedback
+          }
+          let newUrl = this.$router.resolve({
+            path: '/taskListProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }
+      },
+      searchQuery(value) {
+        this.queryParam = value
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+  .text-operation{
+     margin-right: 8px;
+  }
+</style>

jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue

@@ -0,0 +1,259 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('RelatedItems')">
+                <span>{{$t('RelatedItems')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RelatedItems')"
+                       v-model="queryParam.projectName"></a-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standardInformation')">
+                <span>{{$t('standardInformation')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardInformation')"
+                       v-model="queryParam.standardInfo"></a-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text tree-select">
+              <div class="title-text" :title="$t('taskType')">
+                <span>{{$t('taskType')}}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('taskType')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="queryParam.flowType">
+                <a-select-option v-for="(item, key) in taskTypeList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('taskStatus')">
+                  <span>{{$t('taskStatus')}}</span>
+                </div>
+                <a-select :placeholder="$t('PleaseSelect')+$t('taskStatus')"
+                          class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          v-model="queryParam.status">
+                  <a-select-option v-for="(item, key) in taskStatusList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </div>
+            </a-col>
+          </template>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                   <a @click="handleToggleSearch" style="margin-left: 8px">
+                        {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                         <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                 </a>
+               </a-col>
+      </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator" style="margin-bottom: 8px">
+      <div @click="taskConfirmationHandlingClick"
+           class="operator-text">
+        <a-icon type="apartment"/>
+        {{$t('taskConfirmationHandling')}}
+      </div>
+    </div>
+    <a-tabs v-model="tabActive" @change="callback">
+      <a-tab-pane :key="$t('toDoProcess')" :tab="$t('toDoProcess')">
+        <dealtWith v-if="tabActive == $t('toDoProcess')" ref="dealtWithRef"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('processDone')" :tab="$t('processDone')">
+        <doneList v-if="tabActive == $t('processDone')" ref="doneListRef"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('sentProcess')" :tab="$t('sentProcess')">
+        <SentList v-if="tabActive == $t('sentProcess')" ref="SentListRef"/>
+      </a-tab-pane>
+    </a-tabs>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import dealtWith from './components/dealtWith'
+  import doneList from './components/doneList'
+  import SentList from './components/SentList'
+
+  export default {
+    name: 'index',
+    components: {
+      dealtWith,
+      doneList,
+      SentList
+    },
+    data() {
+      return {
+        queryParam: {},
+        toggleSearchStatus: false,
+        taskTypeList: [
+          {
+            name:this.$t('confirmationOfRegulationsList'),
+            value:'10',
+          },
+          {
+            name:this.$t('listTaskConfirmation'),
+            value:'1',
+          },
+          {
+            name:this.$t('designComplianceReview'),
+            value:'2',
+          },
+          {
+            name:this.$t('preHomeConfirmation'),
+            value:'3',
+          },
+          {
+            name:this.$t('verificationComplianceReview'),
+            value:'4',
+          },
+        ],
+        taskStatusList: [
+          {
+            name:this.$t('listToConfirm'),
+            value:'List to confirm',
+          },
+          {
+            name:this.$t('Finished'),
+            value:'Completed',
+          },
+          {
+            name:this.$t('inquiry'),
+            value:'Inquiry',
+          },
+          {
+            name:this.$t('toSubmit'),
+            value:'To submit',
+          },
+          {
+            name:this.$t('toAudit'),
+            value:'To audit',
+          },
+        ],
+        tabActive: this.$t('toDoProcess')
+      }
+    },
+    methods: {
+      callback(value) {
+        this.tabActive = value
+      },
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      searchQuery() {
+        if (this.tabActive == this.$t('toDoProcess')) {
+          this.$refs.dealtWithRef.searchQuery(this.queryParam )
+        } else if (this.tabActive == this.$t('processDone')) {
+          this.$refs.doneListRef.searchQuery(this.queryParam )
+        } else if (this.tabActive == this.$t('sentProcess')) {
+          this.$refs.SentListRef.searchQuery(this.queryParam )
+        }
+      },
+      searchReset() {
+        this.queryParam = {}
+        if (this.tabActive == this.$t('toDoProcess')) {
+          this.$refs.dealtWithRef.searchReset()
+        } else if (this.tabActive == this.$t('processDone')) {
+          this.$refs.doneListRef.searchReset()
+        } else if (this.tabActive == this.$t('sentProcess')) {
+          this.$refs.SentListRef.searchReset()
+        }
+      },
+      taskConfirmationHandlingClick() {
+        this.$router.push({
+          path: '/toDoTaskConfirmation'
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  @import '~@assets/less/common.less';
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  ::v-deep .ant-table-row:first-child {
+    background: #fff !important;
+    opacity: 0.9;
+  }
+
+  ::v-deep .ant-table-body {
+    background: transparent !important;
+  }
+</style>

jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue

@@ -0,0 +1,231 @@
+<template>
+  <div class="box">
+    <a-table
+      ref="table"
+      size="middle"
+      :loading="loading"
+      :pagination="false"
+      :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+      rowKey="id"
+      :data-source="dataSource"
+      :columns="columns"
+    >
+      <!--         -->
+      <span slot="operation" slot-scope="text,record">
+         <a class="text-operation"
+            @click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
+          <a class="text-operation"
+             @click="viewClick(record)">{{$t('view')}}</a>
+      </span>
+      <span slot="standardInformation" slot-scope="text,record">
+        <a @click="standardInformationClick(record)" :title="text">
+          {{text}}
+        </a>
+      </span>
+    </a-table>
+    <div class="page" v-if="dataSource && dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'SentList',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        url: {
+          list: '/todoCenter/lawsAssess/issuedProcess'
+        },
+        columns: [
+          {
+            title: this.$t('standardInformation'),
+            align: 'center',
+            dataIndex: 'standardInfo',
+            scopedSlots: { customRender: 'standardInformation' },
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'center',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('LastProcessor'),
+            align: 'center',
+            dataIndex: 'lastAssigneeName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('CurrentProcessor'),
+            align: 'center',
+            dataIndex: 'assigneeName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskStatus'),
+            align: 'center',
+            dataIndex: 'statusShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 120,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        queryParam: {}
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      monitoringProcessClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/processDetails',
+          query: {
+            prcNum: row.prcNum,
+            prcType: row.flowType,
+            prcId: row.actiProcInstId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      standardInformationClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.bussDocumentLibraryId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      viewClick(row) {
+        row.router = this.$route.path
+        let query = {}
+        if (row.flowType == '5') {
+          query = {
+            prcId: row.actiProcInstId,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            router: row.router,
+            prcNum: row.prcNum,
+            taskDefinitionKey: row.taskDefinitionKey,
+            isDisabled: true
+          }
+          let newUrl = this.$router.resolve({
+            path: '/regulatoryProcessReview',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '6') {
+          query = {
+            taskDefinitionKey: row.taskDefinitionKey,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            prcNum: row.prcNum,
+            prcId: row.actiProcInstId,
+            router: row.router,
+            isDisabled: true
+          }
+          let newUrl = this.$router.resolve({
+            path: '/evaluationProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }
+      },
+      searchQuery(value) {
+        this.queryParam = value
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+</style>

jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue

@@ -0,0 +1,214 @@
+<template>
+  <div class="box">
+    <a-table
+      ref="table"
+      size="middle"
+      :loading="loading"
+      :pagination="false"
+      :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+      rowKey="id"
+      :data-source="dataSource"
+      :columns="columns"
+    >
+      <!--         -->
+      <span slot="operation" slot-scope="text,record">
+          <a class="text-operation"
+             @click="ProcessingClick(record)">{{$t('Processing')}}</a>
+      </span>
+      <span slot="endTime" slot-scope="text,record">
+          <span :title="text" :class="{'activeRed':record.endTimePastDueFlag}">{{text}}</span>
+      </span>
+      <span slot="standardInformation" slot-scope="text,record">
+        <a @click="standardInformationClick(record)" :title="text">
+          {{text}}
+        </a>
+      </span>
+    </a-table>
+    <div class="page" v-if="dataSource && dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'dealtWith',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        columns: [
+          {
+            title: this.$t('standardInformation'),
+            align: 'center',
+            dataIndex: 'standardInfo',
+            scopedSlots: { customRender: 'standardInformation' },
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'center',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            dataIndex: 'createBy',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170,
+            scopedSlots: { customRender: 'endTime' }
+          },
+          {
+            title: this.$t('taskStatus'),
+            align: 'center',
+            dataIndex: 'statusShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 120,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        url: {
+          list: '/todoCenter/lawsAssess/todoTaskList'
+        },
+        total: 0,
+        queryParam: {}
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      standardInformationClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.bussDocumentLibraryId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      searchQuery(value) {
+        this.queryParam = value
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      ProcessingClick(row){
+        row.router = this.$route.path
+        let query = {}
+        if (row.flowType == '5') {
+          query = {
+            prcId:row.actiProcInstId,
+            taskIds:row.taskId,
+            prcType:row.flowType,
+            router:row.router,
+            prcNum:row.prcNum,
+            taskDefinitionKey:row.taskDefinitionKey,
+            isDisabled:false
+          }
+          let newUrl = this.$router.resolve({
+            path: '/regulatoryProcessReview',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '6') {
+          query = {
+            taskDefinitionKey:row.taskDefinitionKey,
+            taskIds:row.taskId,
+            prcType:row.flowType,
+            prcNum:row.prcNum,
+            prcId:row.actiProcInstId,
+            router:row.router,
+            isDisabled:false,
+          }
+          let newUrl = this.$router.resolve({
+            path: '/evaluationProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+  .activeRed{
+    color: red;
+  }
+</style>

jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue

@@ -0,0 +1,231 @@
+<template>
+  <div class="box">
+    <a-table
+      ref="table"
+      size="middle"
+      :loading="loading"
+      :pagination="false"
+      :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+      rowKey="id"
+      :data-source="dataSource"
+      :columns="columns"
+    >
+      <!--         -->
+      <span slot="operation" slot-scope="text,record">
+         <a class="text-operation"
+            @click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
+          <a class="text-operation"
+             @click="viewClick(record)">{{$t('view')}}</a>
+      </span>
+      <span slot="standardInformation" slot-scope="text,record">
+       <a @click="standardInformationClick(record)" :title="text">
+          {{text}}
+        </a>
+      </span>
+    </a-table>
+    <div class="page" v-if="dataSource && dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'doneList',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        columns: [
+          {
+            title: this.$t('standardInformation'),
+            align: 'center',
+            dataIndex: 'standardInfo',
+            ellipsis: true,
+            scopedSlots: { customRender: 'standardInformation' },
+            width: 170
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'center',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            dataIndex: 'createBy',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('CurrentProcessor'),
+            align: 'center',
+            dataIndex: 'assigneeName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskStatus'),
+            align: 'center',
+            dataIndex: 'statusShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 120,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        queryParam: {},
+        url: {
+          list: '/todoCenter/lawsAssess/doneProcess'
+        }
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      monitoringProcessClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/processDetails',
+          query: {
+            prcNum: row.prcNum,
+            prcType: row.flowType,
+            prcId: row.actiProcInstId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      standardInformationClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.bussDocumentLibraryId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      viewClick(row) {
+        row.router = this.$route.path
+        let query = {}
+        if (row.flowType == '5') {
+          query = {
+            prcId: row.actiProcInstId,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            router: row.router,
+            prcNum: row.prcNum,
+            taskDefinitionKey: row.taskDefinitionKey,
+            isDisabled: true
+          }
+          let newUrl = this.$router.resolve({
+            path: '/regulatoryProcessReview',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '6') {
+          query = {
+            taskDefinitionKey: row.taskDefinitionKey,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            prcNum: row.prcNum,
+            prcId: row.actiProcInstId,
+            router: row.router,
+            isDisabled: true
+          }
+          let newUrl = this.$router.resolve({
+            path: '/evaluationProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }
+      },
+      searchQuery(value) {
+        this.queryParam = value
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+</style>

jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue

@@ -0,0 +1,174 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standardInformation')">
+                <span>{{$t('standardInformation')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardInformation')"
+                       v-model="queryParam.standardInfo"></a-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text tree-select">
+              <div class="title-text" :title="$t('taskType')">
+                <span>{{$t('taskType')}}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('taskType')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="queryParam.flowType">
+                <a-select-option v-for="(item, key) in taskTypeList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <a-tabs v-model="tabActive" @change="callback">
+      <a-tab-pane :key="$t('toDoProcess')" :tab="$t('toDoProcess')">
+        <dealtWith v-if="tabActive == $t('toDoProcess')" ref="dealtWithRef"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('processDone')" :tab="$t('processDone')">
+        <doneList v-if="tabActive == $t('processDone')" ref="doneListRef"/>
+      </a-tab-pane>
+      <a-tab-pane :key="$t('sentProcess')" :tab="$t('sentProcess')">
+        <SentList v-if="tabActive == $t('sentProcess')" ref="SentListRef"/>
+      </a-tab-pane>
+    </a-tabs>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import dealtWith from './components/dealtWith'
+  import doneList from './components/doneList'
+  import SentList from './components/SentList'
+
+  export default {
+    name: 'index',
+    components: {
+      dealtWith,
+      doneList,
+      SentList
+    },
+    data() {
+      return {
+        queryParam: {},
+        taskTypeList: [
+          {
+            name: this.$t('collectionOfRegulatoryOpinions'),
+            value: '5'
+          },
+          {
+            name: this.$t('regulatoryTechnicalAssessment'),
+            value: '6'
+          }
+        ],
+        tabActive: this.$t('toDoProcess')
+      }
+    },
+    methods: {
+      callback(value) {
+        this.tabActive = value
+      },
+      searchQuery() {
+        if (this.tabActive == this.$t('toDoProcess')) {
+          this.$refs.dealtWithRef.searchQuery(this.queryParam )
+        } else if (this.tabActive == this.$t('processDone')) {
+          this.$refs.doneListRef.searchQuery(this.queryParam )
+        } else if (this.tabActive == this.$t('sentProcess')) {
+          this.$refs.SentListRef.searchQuery(this.queryParam )
+        }
+      },
+      searchReset() {
+        this.queryParam = {}
+        if (this.tabActive == this.$t('toDoProcess')) {
+          this.$refs.dealtWithRef.searchReset()
+        } else if (this.tabActive == this.$t('processDone')) {
+          this.$refs.doneListRef.searchReset()
+        } else if (this.tabActive == this.$t('sentProcess')) {
+          this.$refs.SentListRef.searchReset()
+        }
+      },
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  @import '~@assets/less/common.less';
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  ::v-deep .ant-table-row:first-child {
+    background: #fff !important;
+    opacity: 0.9;
+  }
+
+  ::v-deep .ant-table-body {
+    background: transparent !important;
+  }
+</style>

jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue

@@ -0,0 +1,266 @@
+<template>
+  <div>
+    <a-modal
+      :title="$t('batchProcessing')"
+      :width="700"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="handleCancel"
+    >
+      <template slot="footer">
+        <a-button key="back" @click="handleCancel">
+          {{$t('cancel')}}
+        </a-button>
+        <a-button type="danger" :loading="confirmLoading" v-if="taskDefinitionKey == 'dreqr'" @click="sendBackClick">
+          {{$t('sendBack')}}
+        </a-button>
+        <a-button type="primary" :loading="confirmLoading" @click="handleOk">
+          {{$t('confirm')}}
+        </a-button>
+      </template>
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24" v-if="taskDefinitionKey != 'dreqr'">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"></span>
+              </div>
+              <a-form-model-item class="itemModel" prop="flag">
+                <a-radio-group style="margin-top: 2px" @change="flagChange" class="box-input" v-model="formInline.flag">
+                  <a-radio value="0">
+                    {{$t('accept')}}
+                  </a-radio>
+                  <a-radio value="1">
+                    {{$t('disagree')}}
+                  </a-radio>
+                  <a-radio value="3" v-if="taskDefinitionKey == 'zrrjsrw'">
+                    {{$t('inquiry')}}
+                  </a-radio>
+                  <a-radio value="4" v-if="taskDefinitionKey == 'zrrqr'">
+                    {{$t('sendBack')}}
+                  </a-radio>
+                </a-radio-group>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24" v-if="isTrue">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('selectInquiry')">{{$t('selectInquiry')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="dreUserIdName">
+                <PersonnelSelection class="box-input"
+                                    :personneQuery="formInline"
+                                    :query="{db_field_name:'dreUserId',db_field_txt:$t('selectInquiry')}"
+                                    :isInput="true"
+                                    :isSingleChoice="true"
+                                    @change="PersonnelSelectionChange"
+                                    v-model="formInline.dreUserIdName"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="approvalOpinion">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')" v-model="formInline.approvalOpinion"
+                            :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+
+    </a-modal>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import moment from 'moment'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: 'batchProcessing',
+    components: {
+      PersonnelSelection
+    },
+    data() {
+      return {
+        formInline: {},
+        rules: {
+          flag: [
+            {
+              required: true,
+              message: this.$t('reviewResults') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          dreUserIdName: [
+            {
+              required: true,
+              message: this.$t('selectInquiry') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          approvalOpinion: [
+            {
+              max: 300,
+              message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ]
+        },
+        confirmLoading: false,
+        visible: false,
+        selectedRowKeys: [],
+        issue: false,
+        isTrue: false,
+        taskDefinitionKey: '',
+        taskIds: [],
+        projectLawsInventoryIds: []
+      }
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      getData(data) {
+        this.selectedRowKeys = data
+        this.taskDefinitionKey = this.selectedRowKeys[0].taskDefinitionKey
+        this.taskIds = []
+        this.projectLawsInventoryIds = []
+        this.selectedRowKeys.forEach(res => {
+          this.taskIds.push(res.taskId)
+          this.projectLawsInventoryIds.push(res.projectLawsInventoryId)
+        })
+        this.confirmLoading = false
+        this.visible = true
+        this.isTrue = false
+        this.$nextTick(() => {
+          this.formInline = {}
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      sendBackClick() {
+        this.formInline.flag = '1'
+        this.handleOk()
+      },
+      flagChange(event) {
+        if (event.target.value == 3) {
+          this.isTrue = true
+        } else {
+          this.isTrue = false
+        }
+      },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
+      addBatch() {
+        let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        let query = {
+          rejectUserId: this.userInfo().id,
+          rejectTime: rejectTime,
+          rejectCause: this.formInline.approvalOpinion,
+          taskIds: this.taskIds.join(','),
+          rejectType: '1'
+        }
+        postAction('/project/projectLawsInventoryRejectCauseEO/addBatch', query).then((res) => {
+
+        })
+      },
+      handleOk() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+            let query = {
+              ...this.formInline,
+              taskIds: this.taskIds.join(','),
+              userId: this.userInfo().id,
+              taskDefinitionKey: this.taskDefinitionKey,
+              handlingTime: handlingTime,
+              projectLawsInventoryIds: this.projectLawsInventoryIds.join(',')
+            }
+            if (this.formInline.flag == '1') {
+              this.addBatch()
+            }
+            if (!this.formInline.flag) {
+              query.flag = '0'
+            }
+            this.confirmLoading = true
+            postAction('/workFlow/completeTaskBatch', query).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visible = false
+                this.confirmLoading = false
+                this.$emit('batchProcessingForm')
+              } else {
+                this.confirmLoading = false
+                this.$message.warning(this.$t('operationFailed'))
+              }
+            })
+          }
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 84px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+</style>

jero-web/src/views/toDoCenter/taskConfirmation/index.vue

@@ -0,0 +1,354 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('RelatedItems')">
+                <span>{{$t('RelatedItems')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RelatedItems')"
+                       v-model="queryParam.projectName"></a-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standardInformation')">
+                <span>{{$t('standardInformation')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardInformation')"
+                       v-model="queryParam.standardInfo"></a-input>
+            </div>
+          </a-col>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator" style="margin-bottom: 16px">
+      <div @click="batchProcessingClick"
+           class="operator-text">
+        <a-icon type="apartment"/>
+        {{$t('batchProcessing')}}
+      </div>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+        :data-source="dataSource"
+        :rowKey="(record)=>JSON.stringify(record)"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+        <!--         -->
+        <span slot="operation" slot-scope="text,record">
+          <a class="text-operation"
+             @click="ProcessingClick(record)">{{$t('Processing')}}</a>
+        </span>
+        <span slot="RelatedItems" slot-scope="text,record">
+          <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
+       </span>
+        <span slot="standardInformation" slot-scope="text,record">
+        <a @click="standardInformationClick(record)" :title="text">{{text}}</a>
+       </span>
+      </a-table>
+      <div class="page" v-if="dataSource && dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+    <batchProcessing ref="batchProcessingRef" @batchProcessingForm="batchProcessingForm"/>
+  </a-card>
+</template>
+
+<script>
+  import batchProcessing from './components/batchProcessing'
+  import { getAction, postAction, deleteAction } from '@/api/manage'
+
+  export default {
+    name: 'index',
+    components: {
+      batchProcessing
+    },
+    data() {
+      return {
+        dataSource: [],
+        queryParam: {},
+        loading: false,
+        columns: [
+          {
+            title: this.$t('RelatedItems'),
+            align: 'center',
+            dataIndex: 'projectName',
+            ellipsis: true,
+            scopedSlots: { customRender: 'RelatedItems' },
+            width: 170
+          },
+          {
+            title: this.$t('standardInformation'),
+            align: 'center',
+            dataIndex: 'standardInfo',
+            ellipsis: true,
+            scopedSlots: { customRender: 'standardInformation' },
+            width: 170
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'center',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            dataIndex: 'createBy',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskStatus'),
+            align: 'center',
+            dataIndex: 'statusShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 120,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        url: {
+          list: '/todoCenter/projectProcess/todoTaskList'
+        }
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      RelatedItemsClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/ProjectDetails',
+          query: {
+            id: item.projectLibraryId,
+            projectName: item.projectName,
+            projectNameId: item.projectNameId,
+            targetMarket: item.targetMarket,
+            studioEngineer: item.studioEngineer
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      standardInformationClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.projectLawsInventoryId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      batchProcessingForm() {
+        this.selectedRowKeys = []
+        this.getList()
+      },
+      batchProcessingClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          let content = []
+          selectedRowKeys.forEach(res => {
+            content.push(JSON.parse(res))
+          })
+          for (let i = 0; i < content.length; i++) {
+            if (content[i].taskDefinitionKey != content[0].taskDefinitionKey) {
+              this.$message.warning(this.$t('processNodesAreInconsistentPleaseSelectConsistentData'))
+              return
+            }
+          }
+          this.$refs.batchProcessingRef.getData(JSON.parse(JSON.stringify(content)))
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      searchQuery() {
+        this.selectedRowKeys = []
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.selectedRowKeys = []
+        this.pageNo = 1
+        this.queryParam = {}
+        this.getList()
+      },
+      ProcessingClick(row) {
+        let query = {}
+        if (row.flowType == '1') {
+          query = {
+            taskDefinitionKey: row.taskDefinitionKey,
+            taskIds: row.taskId,
+            prcType: row.flowType,
+            prcNum: row.prcNum,
+            isTrue: true
+          }
+          let newUrl = this.$router.resolve({
+            path: '/handshakeProcess',
+            query: query
+          })
+          window.open(newUrl.href, '_blank')
+        }
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = []
+        if (value && value.length > 0) {
+          value.forEach(res => {
+            res = JSON.parse(res)
+            if (res.flowType == '1') {
+              this.selectedRowKeys.push(JSON.stringify(res))
+            } else {
+              this.$message.warning(this.$t('onlyDataTaskConfirmationProcessSelected'))
+            }
+          })
+        }
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          flowType: '1',
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  @import '~@assets/less/common.less';
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  ::v-deep .ant-table-row:first-child {
+    background: #fff !important;
+    opacity: 0.9;
+  }
+
+  ::v-deep .ant-table-body {
+    background: transparent !important;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+</style>