修改技术评估细节问题

jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue

@@ -230,7 +230,15 @@
     },
     methods: {
       CurrentStandard() {
-
+        let query = {
+          firstInitiation: '2',
+          whetherTobring: '1'
+        }
+        let newUrl = this.$router.resolve({
+          path: '/evaluationInitiationProcess',
+          query: query
+        })
+        window.open(newUrl.href, '_blank')
       },
       onSelectChange(value) {
         this.selectedRowKeys = value

jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue

@@ -81,7 +81,7 @@
         dataSource: [],
         url: {
           list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/list',
-          exportData:'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip',
+          exportData: 'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip'
         },
         selectedRowKeys: [],
         loading: false,
@@ -114,7 +114,15 @@
     },
     methods: {
       CurrentStandard() {
-
+        let query = {
+          firstInitiation: '2',
+          whetherTobring: '2'
+        }
+        let newUrl = this.$router.resolve({
+          path: '/evaluationInitiationProcess',
+          query: query
+        })
+        window.open(newUrl.href, '_blank')
       },
       onSelectChange(value) {
 

jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue

@@ -5,34 +5,37 @@
     />
     <div class="detail-box">
       <div class="detail-content" style="padding: 20px">
-        <div class="table-page-search-wrapper">
+        <div class="table-page-search-wrapper" v-if="whetherDisplay">
           <search ref="searchRef"
                   :flag="'1'"
                   :url="url"/>
         </div>
-        <a-table
+        <div v-if="whetherDisplay">
-          ref="table"
+          <a-table
-          size="middle"
+            ref="table"
-          :loading="loading"
+            size="middle"
-          :pagination="false"
+            :loading="loading"
-          :scroll="{x: '100%'}"
+            :pagination="false"
-          rowKey="id"
+            :scroll="{x: '100%'}"
-          :data-source="dataSource"
+            rowKey="id"
-          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}"
+            :data-source="dataSource"
-          :columns="columns"
+            :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}"
-        >
+            :columns="columns"
-        </a-table>
+          >
-        <div class="page" v-if="dataSource && dataSource.length > 0">
+          </a-table>
-          <a-pagination
+          <div class="page" v-if="dataSource && dataSource.length > 0">
-            :show-total="total => $t('total')+` ${total} `+$t('strip')"
+            <a-pagination
-            show-quick-jumper
+              :show-total="total => $t('total')+` ${total} `+$t('strip')"
-            :page-size.sync="pageSize"
+              show-quick-jumper
-            :total="total"
+              :page-size.sync="pageSize"
-            :current="pageNo"
+              :total="total"
-            @change="pageOnChange"
+              :current="pageNo"
-            @showSizeChange="SizeChange"
+              @change="pageOnChange"
-          />
+              @showSizeChange="SizeChange"
+            />
+          </div>
         </div>
+
         <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
           <a-row :gutter="24" style="margin-bottom: 10px">
             <a-col :span="24">
@@ -238,6 +241,7 @@
         },
         searchParmes: {},
         selectedRowKeysRecord: [],
+        whetherDisplay: false,
         columns: [
           {
             title: this.$t('standard'),
@@ -293,6 +297,11 @@
       } else {
         this.isTrue = false
       }
+      if (this.$route.query.firstInitiation == '1') {
+        this.whetherDisplay = true
+      } else {
+        this.whetherDisplay = false
+      }
       eventBUs.$on('searchQuery', search => {
         Object.keys(search).forEach(res => {
           if (search[res] instanceof Array) {
@@ -454,7 +463,9 @@
         value.startTime = startTime
         value.flowStatus = 'Underway'
         value.taskAffirmDueDate = value.endTime
-        value.lawsTechnologyEvaluationId = this.getUUID()
+        if (!value.lawsTechnologyEvaluationId){
+          value.lawsTechnologyEvaluationId = this.getUUID()
+        }
         value.regulationOwnerId = this.userInfo().id
         value.regulationOwnerName = this.userInfo().username
         Object.keys(value).forEach(res => {
@@ -474,14 +485,14 @@
           query = {
             type: 6,
             ...value,
-            firstInitiation:"1",
+            firstInitiation: this.$route.query.firstInitiation,
             msg: JSON.stringify({ itemList: dataList }).replace(/\"/g, '\'')
           }
         } else {
           query = {
             type: 6,
             ...value,
-            firstInitiation:"1",
+            firstInitiation: this.$route.query.firstInitiation,
             msg: JSON.stringify({ evaluators: value.evaluators }).replace(/\"/g, '\'')
           }
         }

jero-web/src/views/businessSupport/technologyAssessment/index.vue

@@ -339,6 +339,7 @@
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             this.visible = false
+            this.formInline.firstInitiation = '1'
             let newUrl = this.$router.resolve({
               path: '/evaluationInitiationProcess',
               query: this.formInline
@@ -365,9 +366,12 @@
           let newUrl = this.$router.resolve({
             path: '/evaluationResultsWhole',
             query: {
-              id:row.id,
+              id: row.id,
-              processBackground:row.processBackground,
+              processBackground: row.processBackground,
-              serialNumber:row.serialNumber
+              serialNumber: row.serialNumber,
+              title: row.title,
+              technologyTerritory: row.technologyTerritory,
+              standId: row.standId
             }
           })
           window.open(newUrl.href, '_blank')
@@ -375,9 +379,12 @@
           let newUrl = this.$router.resolve({
             path: '/evaluationResultsClause',
             query: {
-              id:row.id,
+              id: row.id,
-              processBackground:row.processBackground,
+              processBackground: row.processBackground,
-              serialNumber:row.serialNumber
+              serialNumber: row.serialNumber,
+              title: row.title,
+              technologyTerritory: row.technologyTerritory,
+              standId: row.standId
             }
           })
           window.open(newUrl.href, '_blank')