对接法规技术评估

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

@@ -1131,4 +1131,5 @@ module.exports = {
   clauseEvaluation:'Clause evaluation',
   standardDocuments:'Standard documents',
   pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list',
+  reviewComments:'Review comments',
 }

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

@@ -1135,4 +1135,5 @@ module.exports = {
   clauseEvaluation:'条款评估',
   standardDocuments:'标准文件',
   pleaseCompleteTheEvaluationMethodorEvaluator:'请补全列表中评估方式或评估人',
+  reviewComments:'审核意见',
 }

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

@@ -50,7 +50,7 @@
                   <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
-                <div class="title-text-right" v-if="disabled">
+                <div class="title-text-right" :title="item.relatedSection" v-if="disabled">
                   {{item.relatedSection}}
                 </div>
                 <a-form-model-item class="itemModel" v-if="!disabled"
@@ -72,7 +72,7 @@
                   <span class="title-text-text"
                         :title="$t('problemDescription')">{{$t('problemDescription')}}</span>
                 </div>
-                <div class="title-text-right" v-if="disabled">
+                <div class="title-text-right" :title="item.issueOrSuggest" v-if="disabled">
                   {{item.issueOrSuggest}}
                 </div>
                 <a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'" v-if="!disabled"
@@ -94,8 +94,9 @@
                   <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
                 </div>
                 <div class="title-text-right" v-if="disabled">
-                  <span style="color: #21c9cc" v-if="item.accessoryFile" @click="viewUploadedFilesClick(item.accessoryFile)">
+                  <span style="color: #21c9cc;cursor: pointer"
-                     {{$t('viewUploadedFiles')}}
+                        v-if="item.accessoryFile" @click="viewUploadedFilesClick(item.accessoryFile)">
+                     {{$t('viewFile')}}
                   </span>
                   <span v-else>
                      --
@@ -113,6 +114,25 @@
             </a-col>
           </a-row>
         </div>
+        <div class="box-text" style="margin-top: 10px" v-if="disabled">
+          <div class="header-text">
+            {{$t('sponsorReview')}}
+          </div>
+        </div>
+        <a-row :gutter="24" v-if="disabled">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('reviewComments')">{{$t('reviewComments')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="approvalOpinion">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('reviewComments')" v-model="formInline.approvalOpinion"
+                            :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
       </a-form-model>
     </div>
     <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
@@ -124,6 +144,7 @@
   import { getAction, postAction } from '@/api/manage'
   import uploadFile from '@/components/uploadFile/file'
   import viewFileModel from '@/components/viewFileModel/index'
+
   export default {
     name: 'evaluatorFeedback',
     components: {
@@ -157,6 +178,18 @@
               trigger: 'change'
             }
           ],
+          approvalOpinion: [
+            {
+              required: true,
+              message: this.$t('reviewComments') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 300,
+              message: this.$t('reviewComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
           relatedSection: [
             {
               required: true,
@@ -315,7 +348,7 @@
   }
 
   .itemModel {
-    width: calc(100% - 130px);
+    width: calc(100% - 110px);
     display: inline-block;
     margin-top: 2px;
     margin-bottom: 12px;
@@ -324,8 +357,8 @@
   .title-text-right {
     display: inline-block;
     width: calc(100% - 130px);
-    padding-top: 15px;
+    padding-top: 12px;
-    font-size: 14px;
+    font-size: 16px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -351,7 +384,7 @@
   }
 
   .feedbackPoint {
-    font-size: 14px;
+    font-size: 16px;
     font-weight: 400;
     color: #000F16;
     margin-bottom: 10px;

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

@@ -68,7 +68,7 @@
       getList() {
         let query = {
           actiProcInstId: this.$route.query.prcId,
-          flowType: '5'
+          flowType: this.$route.query.prcType
         }
         getAction('/lawsOpinionGather/lawsProcessHistoryEO/list', query).then((res) => {
           if (res.success) {

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

@@ -26,10 +26,12 @@
         />
         <footerProcess
           v-if="isDisplay"
-          isPreservation
+          :isPreservation="isPreservation"
           :isSubmit="true"
+          :isSendBack="isSendBack"
           @preservation="preservation"
           @submit="submit"
+          @sendBack="sendBack"
         />
         <circulationHistory v-if="isDisplay"/>
       </div>
@@ -70,7 +72,9 @@
         isDisplay: true,
         feedbackDataList: [],
         queryProject: {},
-        complianceResult:{},
+        complianceResult: {},
+        isPreservation: false,
+        isSendBack: false,
         isTrue: false,
         standardContentList: [
           {
@@ -107,6 +111,13 @@
     },
     mounted() {
       this.isDisplay = false
+      if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+        this.isPreservation = true
+        this.isSendBack = false
+      } else {
+        this.isPreservation = false
+        this.isSendBack = true
+      }
       this.queryTaskDetailByTask()
     },
     methods: {
@@ -176,15 +187,40 @@
           }
         })
       },
+      sendBack() {
+        if (this.isTrue) {
+
+        } else {
+          this.$refs.evaluatorFeedbackRef.preservationData((res) => {
+            this.loading = true
+            this.queryProject.approvalOpinion = res.approvalOpinion
+            this.queryProject.flag = '2'
+            this.completeTask()
+          })
+        }
+      },
       submit() {
-        this.$refs.evaluatorFeedbackRef.submitData((res) => {
+        if (this.isTrue) {
-          this.insertBatch(res, 2)
+
-        })
+        } else {
+          this.$refs.evaluatorFeedbackRef.submitData((res) => {
+            if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+              this.loading = true
+              this.insertBatch(res, 2)
+            } else {
+              this.loading = true
+              this.queryProject.approvalOpinion = res.approvalOpinion
+              this.queryProject.flag = '1'
+              this.completeTask()
+            }
+          })
+        }
       },
       completeTask() {
         let query = {
           userid: this.userInfo().id,
           taskId: this.$route.query.taskIds,
+          flag: this.queryProject.flag,
           json: JSON.stringify(this.queryProject).replace(/\"/g, '\'')
         }
         postAction('/workFlow/completeTask', query).then((res) => {