对接待办中心

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

@@ -156,12 +156,12 @@
             </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'">
           <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 +175,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 +271,8 @@
         },
         disabled: false,
         uploadIndex: '',
-        dataList: []
+        dataList: [],
+        isTrue:false,
       }
     },
     mounted() {
@@ -283,8 +296,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: {

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

@@ -282,6 +282,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' }
+          }
         ]
       }
     },
@@ -306,10 +381,18 @@
     },
     computed: {
       columns() {
-        if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+        let disabled = false
-          return this.columnsTwo
+        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 +428,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 +444,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/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/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue

@@ -115,8 +115,40 @@
         })
         window.open(newUrl.href, '_blank')
       },
-      viewClick(val) {
+      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

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

@@ -114,8 +114,40 @@
         })
         window.open(newUrl.href, '_blank')
       },
-      viewClick(val){
+      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

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

@@ -9,7 +9,7 @@
                 <span>{{$t('standardInformation')}}</span>
               </div>
               <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardInformation')"
-                       v-model="queryParam.title"></a-input>
+                       v-model="queryParam.serialNumber"></a-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -21,7 +21,7 @@
                         class="box-input"
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
                         allowClear
-                        v-model="queryParam.taskType">
+                        v-model="queryParam.flowType">
                 <a-select-option v-for="(item, key) in taskTypeList"
                                  :key="key"
                                  :value="item.value">
@@ -81,7 +81,6 @@
             value: '6'
           }
         ],
-        taskStatusList: [],
         tabActive: this.$t('toDoProcess')
       }
     },