From 0c6e385b8725bb1cf154bf50177f98b69ad00833 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 12 Jul 2022 15:39:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=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

---
 .../components/initiatingProcess.vue          |   6 +-
 .../components/initiatingProcess.vue          | 104 ++++++++++--------
 .../technologyAssessment/index.vue            |  18 +--
 3 files changed, 71 insertions(+), 57 deletions(-)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
index 4c8e45171..c7e910665 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
@@ -260,9 +260,11 @@
         this.selectedRowKeys = value
         if (this.selectedRowKeys.length > 1) {
           this.selectedRowKeys.shift()
-          record.shift()
         }
-        this.selectedRowKeysRecord = record
+        this.selectedRowKeysRecord = record.filter(res=>{
+          return res.id == this.selectedRowKeys[0]
+        })
+        this.selectedRowKeysRecord = [...this.selectedRowKeysRecord]
       },
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index 1cf238d6c..5130a4307 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -42,7 +42,7 @@
                 </div>
                 <div class="title-text-content"
                      :class="{'title-text-content-one':!isTrue}">
-                  件大事发的科技示范和的空间是否和是科技示范的空间是多少
+                  {{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serial_number :''}}
                 </div>
                 <div class="title-text-right" v-if="isTrue">
                   <span @click="standardDecompositionDocumentClick">
@@ -73,13 +73,14 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
+                  <span class="title-text-text"
+                        :title="$t('uploadRelevantMaterials')">{{$t('uploadRelevantMaterials')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="accessory_id">
                   <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('accessory_id')">
-                    {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' ||
-                    formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                            @click="clickButtonToUpload('relatedDataFileId')">
+                    {{ (formInline.relatedDataFileId === 'null' || formInline.relatedDataFileId === '' ||
+                    formInline.relatedDataFileId == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                     }}
                   </a-button>
                 </a-form-model-item>
@@ -94,7 +95,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="taskExplain">
                   <a-textarea :placeholder="$t('pleaseEnter')+$t('processBackground')"
-                              v-model="formInline.taskExplain"
+                              v-model="formInline.processBackground"
                               :rows="4"/>
                 </a-form-model-item>
               </div>
@@ -108,7 +109,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="remarks">
                   <a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
-                              v-model="formInline.remarks"
+                              v-model="formInline.remark"
                               :rows="4"/>
                 </a-form-model-item>
               </div>
@@ -121,20 +122,18 @@
                   <span class="Required">*</span>
                   <span class="title-text-text" :title="$t('evaluationMethod')">{{$t('evaluationMethod')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="evaluatorIdsName">
-                  <a-select :placeholder="$t('PleaseSelect')+$t('evaluationMethod')"
-                            class="box-input"
-                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                            allowClear
-                            v-model="formInline.gatherResult">
-                    <a-select-option v-for="(item, key) in gatherResultList"
-                                     :key="key"
-                                     :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name">
-                           {{ item.name }}
-                     </span>
-                    </a-select-option>
-                  </a-select>
+                <a-form-model-item class="itemModel" prop="gatherResult">
+                  <a-tree-select
+                    tree-node-filter-prop="title"
+                    v-model="formInline.evaluationMethods"
+                    :maxTagCount="1"
+                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                    class="box-input"
+                    style="width: 100%"
+                    :tree-data="gatherResultList"
+                    tree-checkable
+                    :placeholder="$t('PleaseSelect')+$t('evaluationMethod')"
+                  />
                 </a-form-model-item>
               </div>
             </a-col>
@@ -144,13 +143,13 @@
                   <span class="Required">*</span>
                   <span class="title-text-text" :title="$t('Assessor')">{{$t('Assessor')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="evaluatorIdsName">
+                <a-form-model-item class="itemModel" prop="evaluatorsName">
                   <PersonnelSelection class="box-input"
                                       :personneQuery="formInline"
-                                      :query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor')}"
+                                      :query="{db_field_name:'evaluators',db_field_txt:$t('Assessor')}"
                                       :isInput="true"
                                       @change="PersonnelSelectionChange"
-                                      v-model="formInline.evaluatorIdsName"/>
+                                      v-model="formInline.evaluatorsName"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -211,16 +210,7 @@
         pageSize: 10,
         pageNo: 1,
         formInline: {},
-        gatherResultList: [
-          {
-            value: 'Underway',
-            name: this.$t('inProgress')
-          },
-          {
-            value: 'Completed',
-            name: this.$t('Finished')
-          }
-        ],
+        gatherResultList: [],
         rules: {
           endTime: [
             {
@@ -229,7 +219,7 @@
               trigger: 'change'
             }
           ],
-          evaluatorIdsName: [
+          evaluatorsName: [
             {
               required: true,
               message: this.$t('Assessor') + this.$t('cannotEmpty'),
@@ -288,6 +278,7 @@
     mounted() {
       document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess')
       this.getList()
+      this.getEvaluationMethodTree()
       if (this.$route.query.whetherTobring == '1') {
         this.isTrue = true
       } else {
@@ -306,6 +297,15 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      getEvaluationMethodTree() {
+        getAction('/sys/category/getEvaluationMethodTree').then((res) => {
+          if (res.success) {
+            this.gatherResultList = res.result
+          } else {
+            this.gatherResultList = []
+          }
+        })
+      },
       pageOnChange(page) {
         this.pageNo = page
         this.getList()
@@ -336,11 +336,21 @@
       },
       onSelectChange(value, record) {
         this.selectedRowKeys = value
+        this.selectedRowKeysRecord = []
         if (this.selectedRowKeys.length > 1) {
           this.selectedRowKeys.shift()
-          record.shift()
         }
-        this.selectedRowKeysRecord = record
+        let content = record.filter(res => {
+          return res.id == this.selectedRowKeys[0]
+        })
+        if (content && content.length > 0){
+          this.selectedRowKeysRecord.push({
+            standId:content[0].id,
+            serialNumber:content[0].serial_number,
+            title:content[0].title,
+            technologyTerritory:content[0].technology_territory,
+          })
+        }
       },
       standardDecompositionDocumentClick() {
         if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length > 0) {
@@ -392,7 +402,7 @@
         str[0] = str[8] = str[13] = str[18] = str[23] = '-'
         return str.join('')
       },
-      submit() {
+      submit(startTime) {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length == 0) {
@@ -400,11 +410,16 @@
             } else {
               this.JLoading = true
               let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
-              value.standId = value.id
+              if (this.isTrue){
+                value.evaluationType = 'Item evaluation'
+              }else{
+                value.evaluationType = 'Feedback evaluation'
+              }
+              value.startTime = startTime
+              value.flowStatus = 'Underway'
               value.taskAffirmDueDate = value.endTime
-              delete value.id
               value.id = this.getUUID()
-              value.currentUserName = this.userInfo().username
+              value.regulationOwnerId = this.userInfo().id
               Object.keys(value).forEach(res => {
                 if (value[res] && value[res] instanceof String) {
                   value[res] = value[res].replace(/\"/g, '“')
@@ -418,7 +433,7 @@
       },
       startProcess(value) {
         let query = {
-          type: 5,
+          type: 6,
           msg: JSON.stringify(value).replace(/\"/g, '\'')
         }
         postAction('/workFlow/startProcess', query).then((res) => {
@@ -437,13 +452,10 @@
         }
         postAction('/workFlow/completeTask', query).then((res) => {
           if (res.success) {
-            // setTimeout(() => {
-            //   window.close()
-            // }, 1000)
             this.$message.success(this.$t('OperationSuccessful'))
             this.JLoading = false
             this.$router.push({
-              path: '/collectionOfRegulatoryOpinions'
+              path: '/technologyAssessment'
             })
           } else {
             this.JLoading = false
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index 52090af72..991379955 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -49,7 +49,7 @@
                           class="box-input"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
-                          v-model="queryParam.gatherResult">
+                          v-model="queryParam.flowStatus">
                   <a-select-option v-for="(item, key) in gatherResultList"
                                    :key="key"
                                    :value="item.value">
@@ -228,14 +228,14 @@
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'evaluationMethod'
+            dataIndex: 'evaluationMethods'
           },
           {
             title: this.$t('ProcessStatus'),
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'ProcessStatus'
+            dataIndex: 'flowStatus'
           },
           {
             title: this.$t('dateOfInitiation'),
@@ -256,7 +256,7 @@
             align: 'center',
             ellipsis: true,
             width: 170,
-            dataIndex: 'remarks'
+            dataIndex: 'remark'
           },
           {
             title: this.$t('operation'),
@@ -333,13 +333,13 @@
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             this.visible = false
-            // let newUrl = this.$router.resolve({
-            //   path: '/evaluationInitiationProcess',
-            //   query: this.formInline
-            // })
             let newUrl = this.$router.resolve({
-              path: '/evaluationProcess'
+              path: '/evaluationInitiationProcess',
+              query: this.formInline
             })
+            // let newUrl = this.$router.resolve({
+            //   path: '/evaluationProcess'
+            // })
             window.open(newUrl.href, '_blank')
           }
         })