From 785476c50c3f4fe1e71fb59112d151fa61902a34 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 6 Jul 2022 15:48:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E6=94=B6=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/initiatingProcess.vue          | 10 ++++++
 .../components/feedbackInformation.vue        | 32 +++++++++--------
 .../processForm/regulatoryProcess/index.vue   | 34 ++++++++++++++++++-
 3 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
index a0c3d8489..83b65895a 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
@@ -293,6 +293,15 @@
       dateChange(item) {
         this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
       },
+      getUUID(){
+        var str=[];
+        var Chars='0123456789abcdefghijklmnopqrstuvwxyz';
+        for(var i=0;i<36;i++){
+          str[i]=Chars.substr(Math.floor(Math.random()*16),1)
+        }
+        str[0]=str[8]=str[13]=str[18]=str[23]='-';
+        return str.join("")
+      },
       submit() {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
@@ -302,6 +311,7 @@
               let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
               value.standId = value.id
               delete value.id
+              value.id = this.getUUID()
               value.currentUserName = this.userInfo().username
               Object.keys(value).forEach(res => {
                 if (value[res] && value[res] instanceof String) {
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index 5e82f8b97..559d8ce6f 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -26,10 +26,10 @@
                   <span class="Required">*</span>
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="relevantSections">
+                <a-form-model-item class="itemModel" prop="relatedSection">
                   <a-input class="box-input"
-                           :disabled="false"
-                           v-model="formInline.relatedSection"
+                           :disabled="disabled"
+                           v-model="item.relatedSection"
                            :placeholder="$t('PleaseEnter')+$t('relevantSections')"/>
                 </a-form-model-item>
               </div>
@@ -41,10 +41,10 @@
                   <span class="title-text-text"
                         :title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="questionsSuggestions">
+                <a-form-model-item class="itemModel" prop="issueOrSuggest">
                   <a-input class="box-input"
-                           :disabled="false"
-                           v-model="formInline.issueOrSuggest"
+                           :disabled="disabled"
+                           v-model="item.issueOrSuggest"
                            :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"/>
                 </a-form-model-item>
               </div>
@@ -58,8 +58,8 @@
                 </div>
                 <a-form-model-item class="itemModel">
                   <a-input class="box-input"
-                           :disabled="false"
-                           v-model="formInline.reason"
+                           :disabled="disabled"
+                           v-model="item.reason"
                            :placeholder="$t('PleaseEnter')+$t('reason')"/>
                 </a-form-model-item>
               </div>
@@ -71,9 +71,9 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="accessoryFile">
                   <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('accessoryFile')">
-                    {{ (formInline.accessoryFile === 'null' || formInline.accessoryFile === '' ||
-                    formInline.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                            @click="clickButtonToUpload('accessoryFile',index)">
+                    {{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
+                    item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                     }}
                   </a-button>
                 </a-form-model-item>
@@ -83,6 +83,7 @@
         </div>
       </a-form-model>
     </div>
+    <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
 </template>
 
@@ -104,7 +105,9 @@
     data() {
       return {
         formInline: {},
+        disabled:false,
         rules: {},
+        uploadIndex:'',
         dataList: [
           {
             relatedSection: '',
@@ -116,10 +119,11 @@
       }
     },
     methods: {
-      clickButtonToUpload(item) {
+      clickButtonToUpload(item,index) {
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true
         this.uploadName = item
+        this.uploadIndex = index
         getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
           if (res.success) {
             this.$refs.uploadFile.perentHandleFunc(res.result)
@@ -137,8 +141,8 @@
           })
         }
         /** 赋值给当前对应的表单文件 */
-        this.formInline[this.uploadName] = attIdList.join(',')
-        this.formInline = { ...this.formInline }
+        this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
+        this.dataList = [...this.dataList]
       },
       addData() {
         this.dataList.push({
diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index 5f980019f..a79ddd595 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -13,6 +13,7 @@
           :standardContentQuery="queryProject"
         />
         <feedbackInformation
+          v-if="isDisplay"
           ref="feedbackInformationRef"
           :title="$t('feedbackInformation')"
         />
@@ -35,6 +36,7 @@
   import circulationHistory from '../../components/regulatoryCirculationHistory'
   import footerProcess from '../../components/footerProcess'
   import feedbackInformation from '../../components/feedbackInformation'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
 
   export default {
     name: 'index',
@@ -49,7 +51,10 @@
 
       return {
         title: this.$t('collectionOfRegulatoryOpinions'),
-        url: {},
+        url: {
+          queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds',
+          list: '/lawsOpinionGather/lawsOpinionAssessmentResultEO/list'
+        },
         isDisplay: true,
         queryProject: {},
         standardContentList: [
@@ -87,8 +92,35 @@
       }
     },
     mounted() {
+      this.queryTaskDetailByTask(() => {
+        this.lawsOpinionAssessmentResult()
+      })
     },
     methods: {
+      queryTaskDetailByTask(callback) {
+        this.loading = true
+        getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
+          if (res instanceof String) {
+            this.queryProject = JSON.parse(res) || {}
+            callback && callback()
+          } else {
+            this.queryProject = res || {}
+            callback && callback()
+          }
+        })
+      },
+      lawsOpinionAssessmentResult() {
+        getAction(this.url.list, {
+          lawsOpinionGatherId: this.queryProject.id,
+          actiProcInstId: this.$route.query.prcId
+        }).then((res) => {
+          if (res.success) {
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
       preservation() {
 
       },