对接待办中心

jero-web/src/store/modules/user.js

@@ -142,14 +142,14 @@ const user = {
           //Vue.ls.set(USER_AUTH,authData);
           sessionStorage.setItem(USER_AUTH, JSON.stringify(authData))
           sessionStorage.setItem(SYS_BUTTON_AUTH, JSON.stringify(allAuthData))
-          let gData = localStorage.getItem('gData')
+          // let gData = localStorage.getItem('gData')
-          if (!gData) {
+          // if (!gData) {
-            getAction('sys/user/queryUserTreeList', {}).then((res) => {
+          //   getAction('sys/user/queryUserTreeList', {}).then((res) => {
-              if (res.success) {
+          //     if (res.success) {
-                localStorage.setItem('gData', JSON.stringify(res.result))
+          //       localStorage.setItem('gData', JSON.stringify(res.result))
-              }
+          //     }
-            })
+          //   })
-          }
+          // }
           if (menuData && menuData.length > 0) {
             //update--begin--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
             menuData.forEach((item, index) => {

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()
       })

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

@@ -194,7 +194,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

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

@@ -14,7 +14,13 @@
       <span slot="operation" slot-scope="text,record">
           <a class="text-operation"
              @click="viewClick(record)">{{$t('view')}}</a>
-        </span>
+      </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
@@ -33,17 +39,19 @@
 
 <script>
   import { getAction, postAction, deleteAction } from '@/api/manage'
+
   export default {
     name: 'SentList',
-    data(){
+    data() {
-      return{
+      return {
-        dataSource:[],
+        dataSource: [],
-        loading:false,
+        loading: false,
-        columns:[
+        columns: [
           {
             title: this.$t('RelatedItems'),
             align: 'center',
             dataIndex: 'projectName',
+            scopedSlots: { customRender: 'RelatedItems' },
             ellipsis: true,
             width: 170
           },
@@ -51,6 +59,7 @@
             title: this.$t('standardInformation'),
             align: 'center',
             dataIndex: 'serialNumber',
+            scopedSlots: { customRender: 'standardInformation' },
             ellipsis: true,
             width: 170
           },
@@ -75,13 +84,13 @@
             ellipsis: true,
             width: 170
           },
-          {
+          // {
-            title: this.$t('TaskCutOffTime'),
+          //   title: this.$t('TaskCutOffTime'),
-            align: 'center',
+          //   align: 'center',
-            dataIndex: 'endTime',
+          //   dataIndex: 'endTime',
-            ellipsis: true,
+          //   ellipsis: true,
-            width: 170
+          //   width: 170
-          },
+          // },
           {
             title: this.$t('taskStatus'),
             align: 'center',
@@ -97,22 +106,71 @@
             scopedSlots: { customRender: 'operation' }
           }
         ],
-        selectedRowKeys:[],
+        selectedRowKeys: [],
-        pageSize:10,
+        pageSize: 10,
-        pageNo:1,
+        pageNo: 1,
-        total:0,
+        total: 0,
-        url:{
+        url: {
-          list:'/todoCenter/projectProcess/issuedProcess',
+          list: '/todoCenter/projectProcess/issuedProcess'
         },
-        queryParam:{},
+        queryParam: {}
       }
     },
     mounted() {
       this.getList()
     },
-    methods:{
+    methods: {
-      viewClick(val){
+      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')
+      },
+      viewClick(row) {
+        let query = {}
+        if (row.flowType == '1') {
+          query = {
+            taskDefinitionKey:row.taskDefinitionKey,
+            taskIds:row.actiProcInstId,
+            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')
+        }
       },
       searchQuery(value) {
         this.queryParam = value
@@ -133,7 +191,7 @@
         this.pageSize = pageSize
         this.getList()
       },
-      getList(){
+      getList() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
         Object.keys(queryParam).forEach(val => {
           if (queryParam[val] instanceof Array) {
@@ -160,7 +218,7 @@
             this.loading = false
           }
         })
-      },
+      }
     }
   }
 </script>

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

@@ -14,7 +14,13 @@
       <span slot="operation" slot-scope="text,record">
           <a class="text-operation"
              @click="ProcessingClick(record)">{{$t('Processing')}}</a>
-        </span>
+      </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
@@ -46,6 +52,7 @@
             align: 'center',
             dataIndex: 'projectName',
             ellipsis: true,
+            scopedSlots: { customRender: 'RelatedItems' },
             width: 170
           },
           {
@@ -53,6 +60,7 @@
             align: 'center',
             dataIndex: 'serialNumber',
             ellipsis: true,
+            scopedSlots: { customRender: 'standardInformation' },
             width: 170
           },
           {
@@ -105,8 +113,57 @@
       this.getList()
     },
     methods: {
-      ProcessingClick(val) {
+      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')
+      },
+      ProcessingClick(row) {
+        let query = {}
+        if (row.flowType == '1') {
+          query = {
+            taskDefinitionKey:row.taskDefinitionKey,
+            taskIds:row.actiProcInstId,
+            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')
+        }
       },
       searchQuery(value) {
         this.queryParam = value

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

@@ -15,6 +15,12 @@
           <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)" :title="text">{{text}}</a>
+      </span>
     </a-table>
     <div class="page" v-if="dataSource && dataSource.length > 0">
       <a-pagination
@@ -33,22 +39,24 @@
 
 <script>
   import { getAction, postAction, deleteAction } from '@/api/manage'
+
   export default {
     name: 'doneList',
-    data(){
+    data() {
-      return{
+      return {
-        dataSource:[],
+        dataSource: [],
-        loading:false,
+        loading: false,
-        url:{
+        url: {
-          list:'/todoCenter/projectProcess/doneProcess',
+          list: '/todoCenter/projectProcess/doneProcess'
         },
-        queryParam:{},
+        queryParam: {},
-        columns:[
+        columns: [
           {
             title: this.$t('RelatedItems'),
             align: 'center',
             dataIndex: 'projectName',
             ellipsis: true,
+            scopedSlots: { customRender: 'RelatedItems' },
             width: 170
           },
           {
@@ -56,6 +64,7 @@
             align: 'center',
             dataIndex: 'serialNumber',
             ellipsis: true,
+            scopedSlots: { customRender: 'standardInformation' },
             width: 170
           },
           {
@@ -68,7 +77,7 @@
           {
             title: this.$t('Sponsor'),
             align: 'center',
-            dataIndex: 'assigneeName',
+            dataIndex: 'createBy',
             ellipsis: true,
             width: 170
           },
@@ -79,13 +88,13 @@
             ellipsis: true,
             width: 170
           },
-          {
+          // {
-            title: this.$t('TaskCutOffTime'),
+          //   title: this.$t('TaskCutOffTime'),
-            align: 'center',
+          //   align: 'center',
-            dataIndex: 'endTime',
+          //   dataIndex: 'endTime',
-            ellipsis: true,
+          //   ellipsis: true,
-            width: 170
+          //   width: 170
-          },
+          // },
           {
             title: this.$t('taskStatus'),
             align: 'center',
@@ -101,18 +110,67 @@
             scopedSlots: { customRender: 'operation' }
           }
         ],
-        selectedRowKeys:[],
+        selectedRowKeys: [],
-        pageSize:10,
+        pageSize: 10,
-        pageNo:1,
+        pageNo: 1,
-        total:0,
+        total: 0
       }
     },
     mounted() {
       this.getList()
     },
-    methods:{
+    methods: {
-      viewClick(val){
+      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')
+      },
+      viewClick(row) {
+        let query = {}
+        if (row.flowType == '1') {
+          query = {
+            taskDefinitionKey:row.taskDefinitionKey,
+            taskIds:row.actiProcInstId,
+            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')
+        }
       },
       searchQuery(value) {
         this.queryParam = value
@@ -133,7 +191,7 @@
         this.pageSize = pageSize
         this.getList()
       },
-      getList(){
+      getList() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
         Object.keys(queryParam).forEach(val => {
           if (queryParam[val] instanceof Array) {
@@ -160,7 +218,7 @@
             this.loading = false
           }
         })
-      },
+      }
     }
   }
 </script>

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

@@ -14,7 +14,10 @@
       <span slot="operation" slot-scope="text,record">
           <a class="text-operation"
              @click="viewClick(record)">{{$t('view')}}</a>
-        </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
@@ -47,6 +50,7 @@
             title: this.$t('standardInformation'),
             align: 'center',
             dataIndex: 'standardInformation',
+            scopedSlots: { customRender: 'standardInformation' },
             ellipsis: true,
             width: 170
           },
@@ -101,6 +105,15 @@
       }
     },
     methods:{
+      standardInformationClick(item){
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.projectLawsInventoryId,
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
       viewClick(val){
 
       },

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

@@ -14,7 +14,10 @@
       <span slot="operation" slot-scope="text,record">
           <a class="text-operation"
              @click="ProcessingClick(record)">{{$t('Processing')}}</a>
-        </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
@@ -45,6 +48,7 @@
             title: this.$t('standardInformation'),
             align: 'center',
             dataIndex: 'standardInformation',
+            scopedSlots: { customRender: 'standardInformation' },
             ellipsis: true,
             width: 170
           },
@@ -95,6 +99,15 @@
       }
     },
     methods: {
+      standardInformationClick(item){
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.projectLawsInventoryId,
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
       searchQuery(value) {
         this.queryParam = value
         this.pageNo = 1

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

@@ -14,7 +14,10 @@
       <span slot="operation" slot-scope="text,record">
           <a class="text-operation"
              @click="viewClick(record)">{{$t('view')}}</a>
-        </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
@@ -45,6 +48,7 @@
             align: 'center',
             dataIndex: 'standardInformation',
             ellipsis: true,
+            scopedSlots: { customRender: 'standardInformation' },
             width: 170
           },
           {
@@ -101,6 +105,15 @@
       }
     },
     methods:{
+      standardInformationClick(item){
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.projectLawsInventoryId,
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
       viewClick(val){
 
       },

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

@@ -54,6 +54,12 @@
           <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
@@ -78,20 +84,21 @@
 
   export default {
     name: 'index',
-    components:{
+    components: {
       batchProcessing
     },
-    data(){
+    data() {
-      return{
+      return {
-        dataSource:[],
+        dataSource: [],
-        queryParam:{},
+        queryParam: {},
-        loading:false,
+        loading: false,
         columns: [
           {
             title: this.$t('RelatedItems'),
             align: 'center',
             dataIndex: 'projectName',
             ellipsis: true,
+            scopedSlots: { customRender: 'RelatedItems' },
             width: 170
           },
           {
@@ -99,6 +106,7 @@
             align: 'center',
             dataIndex: 'serialNumber',
             ellipsis: true,
+            scopedSlots: { customRender: 'standardInformation' },
             width: 170
           },
           {
@@ -137,24 +145,46 @@
             scopedSlots: { customRender: 'operation' }
           }
         ],
-        selectedRowKeys:[],
+        selectedRowKeys: [],
-        pageSize:10,
+        pageSize: 10,
-        pageNo:1,
+        pageNo: 1,
-        total:0,
+        total: 0,
-        url:{
+        url: {
-          list:'/todoCenter/projectProcess/todoTaskList',
+          list: '/todoCenter/projectProcess/todoTaskList'
-        },
+        }
       }
     },
     mounted() {
       this.getList()
     },
-    methods:{
+    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.pageNo = 1
         this.queryProcess()
       },
-      batchProcessingClick(){
+      batchProcessingClick() {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
           let content = []
@@ -181,8 +211,22 @@
         this.queryParam = {}
         this.getList()
       },
-      ProcessingClick(val){
+      ProcessingClick(row) {
-
+        let query = {}
+        if (row.flowType == '1') {
+          query = {
+            taskDefinitionKey: row.taskDefinitionKey,
+            taskIds: row.actiProcInstId,
+            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 = []
@@ -206,7 +250,7 @@
         this.pageSize = pageSize
         this.getList()
       },
-      getList(){
+      getList() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
         Object.keys(queryParam).forEach(val => {
           if (queryParam[val] instanceof Array) {
@@ -216,7 +260,7 @@
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
-          flowType:'1',
+          flowType: '1',
           ...queryParam
         }
         this.loading = true
@@ -234,7 +278,7 @@
             this.loading = false
           }
         })
-      },
+      }
     }
   }
 </script>
@@ -299,6 +343,7 @@
   ::v-deep .ant-table-body {
     background: transparent !important;
   }
+
   .page {
     text-align: right;
     margin-top: 20px;