对接法规意见收集

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue

@@ -313,6 +313,7 @@
               this.JLoading = true
               let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
               value.standId = value.id
+              value.taskAffirmDueDate = value.endTime
               delete value.id
               value.id = this.getUUID()
               value.currentUserName = this.userInfo().username
@@ -341,8 +342,6 @@
         })
       },
       completeTask(value, taskId) {
-        let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
-        value.operatorTime = operatorTime
         let query = {
           userid: this.userInfo().id,
           taskId: taskId,

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue

@@ -74,7 +74,8 @@
       >
          <span slot="operation" slot-scope="text,record">
            <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
-           <a class="text-operation" @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
+           <a class="text-operation" v-if="record.gatherResult == 'Completed'"
+              @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
         </span>
       </a-table>
       <div class="page" v-if="dataSource && dataSource.length > 0">
@@ -223,8 +224,16 @@
         // })
         window.open(newUrl.href, '_blank')
       },
-      viewProcessClick() {
+      viewProcessClick(row) {
-
+        let newUrl = this.$router.resolve({
+          path: '/processDetails',
+          query: {
+            prcNum: row.prcNum,
+            prcType: 5,
+            prcId: row.actiProcInstId
+          }
+        })
+        window.open(newUrl.href, '_blank')
       },
       evaluationResultsClick(row) {
         this.$refs.evaluationResultsListRef.getData(JSON.parse(JSON.stringify(row)))

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

@@ -138,7 +138,7 @@
         this.$refs.uploadFile.visible = true
         this.uploadName = item
         this.uploadIndex = index
-        getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+        getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
           if (res.success) {
             this.$refs.uploadFile.perentHandleFunc(res.result)
           } else {

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

@@ -33,27 +33,27 @@
         columns: [
           {
             title: this.$t('operationContent'),
-            dataIndex: 'name',
+            dataIndex: 'taskDefinitionKeyName',
             align: 'center',
-            width: '20%'
+            width: '25%'
           },
           {
             title: this.$t('Operator'),
-            dataIndex: 'assignee',
+            dataIndex: 'createBy',
             align: 'center',
-            width: '20%'
+            width: '25%'
           },
           {
             title: this.$t('role'),
-            dataIndex: 'approvalOpinion',
+            dataIndex: 'operatorRoleName',
             align: 'center',
-            width: '20%'
+            width: '25%'
           },
           {
             title: this.$t('operationTime'),
             dataIndex: 'createTime',
             align: 'center',
-            width: '20%',
+            width: '25%',
             customRender: function(t, r, index) {
               return moment(t).format('YYYY-MM-DD HH:mm:ss')
             }

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

@@ -13,12 +13,14 @@
     </div>
     <div class="action-bar">
     </div>
-    <circulationHistory/>
+    <regulatoryCirculationHistory v-if="$route.query.prcType == '5'"/>
+    <circulationHistory v-else/>
   </div>
 </template>
 
 <script>
   import circulationHistory from '../../components/circulationHistory'
+  import regulatoryCirculationHistory from '../../components/regulatoryCirculationHistory'
   import axios from 'axios'
   import Vue from 'vue'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -26,7 +28,8 @@
   export default {
     name: 'processDetails',
     components: {
-      circulationHistory
+      circulationHistory,
+      regulatoryCirculationHistory
     },
     data() {
       return {
@@ -45,6 +48,16 @@
       },
       // 请求转换流程图
       processNum() {
+        let params = {}
+        if (this.$route.query.prcType == 5){
+          params = {
+            prcId: this.$route.query.prcId
+          }
+        }else{
+          params = {
+            prcNum: this.$route.query.prcNum
+          }
+        }
         axios.request({
           url: '/jero-boot/workFlow/getImg?_t=' + new Date().getTime(),
           responseType: 'blob',
@@ -52,9 +65,7 @@
           headers: {
             'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)
           },
-          params: {
+          params: params
-            prcNum: this.$route.query.prcNum
-          }
         }).then(res => {
           this.processStep = window.URL.createObjectURL(res.data)
         })

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

@@ -146,10 +146,10 @@
           if (res.success) {
             if (num == 1) {
               this.$message.success(this.$t('OperationSuccessful'))
-              this.loading = false
               this.$router.push({
                 path: '/collectionOfRegulatoryOpinions'
               })
+              this.loading = false
             } else {
               this.completeTask()
             }

jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue

@@ -157,7 +157,8 @@
           path: '/processDetails',
           query: {
             prcNum: row.prcNum,
-            prcType:row.prcType
+            prcType:row.prcType,
+            prcId:row.prcId,
           }
         })
         window.open(newUrl.href, '_blank')

jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue

@@ -165,7 +165,8 @@
           path: '/processDetails',
           query: {
             prcNum: row.prcNum,
-            prcType:row.prcType
+            prcType:row.prcType,
+            prcId:row.prcId,
           }
         })
         window.open(newUrl.href, '_blank')

jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue

@@ -163,7 +163,8 @@
           path: '/processDetails',
           query: {
             prcNum: row.prcNum,
-            prcType:row.prcType
+            prcType:row.prcType,
+            prcId:row.prcId,
           }
         })
         window.open(newUrl.href, '_blank')