From 8a32f6f74c3fc39ae5e0fa73b721e19d6b567dc4 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 12 Jul 2022 09:41:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=B3=95=E8=A7=84=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   2 +
 jero-web/src/common/lang/zh-cn.js             |   2 +
 .../components/evaluatorFeedback.vue          | 280 ++++++++++++++++++
 .../components/evaluatorFeedbackList.vue      | 185 ++++++++++++
 .../processForm/evaluationProcess/index.vue   |  29 +-
 5 files changed, 485 insertions(+), 13 deletions(-)
 create mode 100644 jero-web/src/views/processCenter/components/evaluatorFeedback.vue
 create mode 100644 jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 9b08f22c0..5390bad63 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1112,4 +1112,6 @@ module.exports = {
   selectedStandard:'Selected standard',
   standardDecompositionDocument:'Standard decomposition document',
   pleaseSelectStandardFirst:'Please select a standard first',
+  RelevantMaterials:'RelevantMaterials',
+  evaluatorFeedback:'Evaluator feedback',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index d1d642381..e7216f749 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1112,8 +1112,10 @@ module.exports = {
   RegulationTaskConfirmationNotification:'任务确认通知',
   evaluationMethod:'评估方式',
   uploadRelevantMaterials:'相关资料上传',
+  RelevantMaterials:'相关资料',
   processBackground:'流程背景',
   selectedStandard:'所选标准',
   standardDecompositionDocument:'带入标准分解单',
   pleaseSelectStandardFirst:'请先选择标准',
+  evaluatorFeedback:'评估人反馈',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
new file mode 100644
index 000000000..3d5cfad06
--- /dev/null
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
@@ -0,0 +1,280 @@
+<template>
+  <div class="box">
+    <div class="box-text">
+      <div class="header-text">
+        {{title}}
+      </div>
+    </div>
+    <div class="content-text">
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('complianceResults')">{{$t('complianceResults')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="flag">
+                <a-radio-group style="margin-top: 2px" class="box-input" v-model="formInline.flag">
+                  <a-radio value="0">
+                    {{$t('accord')}}
+                  </a-radio>
+                  <a-radio value="1">
+                    {{$t('nonConformity')}}
+                  </a-radio>
+                </a-radio-group>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <div v-for="(item,index) in dataList" :key="index">
+          <div class="feedbackPoint">
+            {{$t('feedbackPoint')+(index+1)}}
+            <a-icon class="icon-size"
+                    @click="addData"
+                    v-if="(dataList.length-1) == index"
+                    type="plus-circle"/>
+            <a-icon class="icon-size"
+                    @click="deleteData"
+                    v-if="dataList.length > 1 && (dataList.length - 1) == index"
+                    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="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="relatedSection">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model="item.relatedSection"
+                           :placeholder="$t('PleaseEnter')+$t('relevantSections')"/>
+                </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('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="issueOrSuggest">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model="item.issueOrSuggest"
+                           :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"/>
+                </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">
+                  <span class="title-text-text" :title="$t('reason')">{{$t('reason')}}</span>
+                </div>
+                <a-form-model-item class="itemModel">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model="item.reason"
+                           :placeholder="$t('PleaseEnter')+$t('reason')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="accessoryFile">
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload('accessoryFile',index)">
+                    {{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
+                    item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+        </div>
+      </a-form-model>
+    </div>
+    <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import uploadFile from '@/components/uploadFile/file'
+  export default {
+    name: 'evaluatorFeedback',
+    components: {
+      uploadFile
+    },
+    props: {
+      title: {
+        type: String,
+        default: ''
+      },
+      feedbackDataList:{
+        type: Array,
+        default: (()=>{
+          return []
+        })
+      },
+    },
+    data() {
+      return {
+        formInline: {},
+        disabled:false,
+        rules: {},
+        uploadIndex:'',
+        dataList: []
+      }
+    },
+    mounted() {
+      if (this.feedbackDataList && this.feedbackDataList.length > 0){
+        this.dataList = this.feedbackDataList
+        this.dataList = [...this.dataList]
+      }else{
+        this.dataList = [
+          {
+            relatedSection: '',
+            issueOrSuggest: '',
+            reason: '',
+            accessoryFile: ''
+          }
+        ]
+      }
+    },
+    methods: {
+      clickButtonToUpload(item,index) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        this.uploadIndex = index
+        getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
+        this.dataList = [...this.dataList]
+      },
+      addData() {
+        this.dataList.push({
+          relatedSection: '',
+          issueOrSuggest: '',
+          reason: '',
+          accessoryFile: ''
+        })
+        this.dataList = [...this.dataList]
+      },
+      deleteData() {
+        this.dataList.pop()
+        this.dataList = [...this.dataList]
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
+  }
+
+  .box-text {
+    display: flex;
+    justify-content: space-between;
+    height: 60px;
+    line-height: 40px;
+
+    .header-text {
+      font-size: 16px;
+      font-weight: 400;
+      color: #000F16;
+    }
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 88px;
+    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;
+    color: #000F16;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    margin-bottom: 12px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .feedbackPoint {
+    font-size: 14px;
+    font-weight: 400;
+    color: #000F16;
+    margin-bottom: 10px;
+  }
+
+  .icon-size {
+    font-size: 18px;
+    margin-left: 8px;
+    cursor: pointer;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
new file mode 100644
index 000000000..68383c0c4
--- /dev/null
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
@@ -0,0 +1,185 @@
+<template>
+  <div class="box">
+    <div class="box-text">
+      <div class="header-text">
+        {{title}}
+      </div>
+    </div>
+    <div class="content-text">
+
+    </div>
+    <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import uploadFile from '@/components/uploadFile/file'
+  export default {
+    name: 'evaluatorFeedback',
+    components: {
+      uploadFile
+    },
+    props: {
+      title: {
+        type: String,
+        default: ''
+      },
+      feedbackDataList:{
+        type: Array,
+        default: (()=>{
+          return []
+        })
+      },
+    },
+    data() {
+      return {
+        formInline: {},
+        disabled:false,
+        rules: {},
+        uploadIndex:'',
+        dataList: []
+      }
+    },
+    mounted() {
+      if (this.feedbackDataList && this.feedbackDataList.length > 0){
+        this.dataList = this.feedbackDataList
+        this.dataList = [...this.dataList]
+      }else{
+        this.dataList = [
+          {
+            relatedSection: '',
+            issueOrSuggest: '',
+            reason: '',
+            accessoryFile: ''
+          }
+        ]
+      }
+    },
+    methods: {
+      clickButtonToUpload(item,index) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        this.uploadIndex = index
+        getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
+        this.dataList = [...this.dataList]
+      },
+      addData() {
+        this.dataList.push({
+          relatedSection: '',
+          issueOrSuggest: '',
+          reason: '',
+          accessoryFile: ''
+        })
+        this.dataList = [...this.dataList]
+      },
+      deleteData() {
+        this.dataList.pop()
+        this.dataList = [...this.dataList]
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
+  }
+
+  .box-text {
+    display: flex;
+    justify-content: space-between;
+    height: 60px;
+    line-height: 40px;
+
+    .header-text {
+      font-size: 16px;
+      font-weight: 400;
+      color: #000F16;
+    }
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 88px;
+    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;
+    color: #000F16;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    margin-bottom: 12px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .feedbackPoint {
+    font-size: 14px;
+    font-weight: 400;
+    color: #000F16;
+    margin-bottom: 10px;
+  }
+
+  .icon-size {
+    font-size: 18px;
+    margin-left: 8px;
+    cursor: pointer;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
index 94ec268cf..810c536e3 100644
--- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -12,11 +12,11 @@
           :url="url"
           :standardContentQuery="queryProject"
         />
-        <feedbackInformation
+        <evaluatorFeedback
           v-if="isDisplay"
           ref="feedbackInformationRef"
           :feedbackDataList="feedbackDataList"
-          :title="$t('feedbackInformation')"
+          :title="$t('evaluatorFeedback')"
         />
         <footerProcess
           v-if="isDisplay"
@@ -37,7 +37,7 @@
   import standardContent from '../../components/standardContent'
   import circulationHistory from '../../components/regulatoryCirculationHistory'
   import footerProcess from '../../components/footerProcess'
-  import feedbackInformation from '../../components/feedbackInformation'
+  import evaluatorFeedback from '../../components/evaluatorFeedback'
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import moment from 'moment'
   import { mapGetters } from 'vuex'
@@ -48,7 +48,7 @@
       standardContent,
       circulationHistory,
       footerProcess,
-      feedbackInformation
+      evaluatorFeedback
     },
     data() {
 
@@ -80,14 +80,17 @@
             value: 'endTime'
           },
           {
-            title: this.$t('enclosure'),
-            value: 'accessory_id',
+            title: this.$t('evaluationMethod'),
+            value: 'evaluationMethod',
+          },
+          {
+            title: this.$t('RelevantMaterials'),
+            value: 'RelevantMaterials',
             type: 2
           },
-          {},
           {
-            title: this.$t('taskDescription'),
-            value: 'taskExplain'
+            title: this.$t('processBackground'),
+            value: 'processBackground'
           }
           // {
           //   title: this.$t('remarks'),
@@ -97,10 +100,10 @@
       }
     },
     mounted() {
-      this.isDisplay = false
-      this.queryTaskDetailByTask(() => {
-        this.lawsOpinionAssessmentResult()
-      })
+      this.isDisplay = true
+      // this.queryTaskDetailByTask(() => {
+      //   this.lawsOpinionAssessmentResult()
+      // })
     },
     methods: {
       ...mapGetters(['userInfo']),