From db8281d25b112bfff2a43e04d3fcc5f50750580b Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Mon, 9 May 2022 18:05:30 +0800
Subject: [PATCH] =?UTF-8?q?[add]=20=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectDetails/index.vue                  |  6 +-
 .../ParameterItemCollectionList.vue           | 91 ++++++++++++-------
 .../components/TaskParameterCollection.vue    |  4 +-
 3 files changed, 66 insertions(+), 35 deletions(-)

diff --git a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue
index 3f86cd06a..d4590295c 100644
--- a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue
+++ b/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue
@@ -52,7 +52,7 @@
           <ProjectDetailsName v-if="textTitle === '项目详情'"/>
           <listOfRegulations v-else-if="textTitle === '法规清单'"/>
           <TaskList v-else-if="textTitle === '任务清单'"/>
-          <ParameterItemCollectionList item collection v-else-if="textTitle === '认证参数收集'"/>
+          <ParameterItemCollectionList v-else-if="textTitle === '认证参数收集'" :paramsManifest='paramsManifest'/>
           <nonConformance v-else-if="textTitle === '未符合项'"/>
         </div>
       </div>
@@ -92,11 +92,13 @@ export default {
       url: {
         logList: '',
         historicalVersionUrl: ''
-      }
+      },
+      paramsManifest: {},
     }
   },
   mounted() {
     this.textColor()
+    this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
   },
   methods: {
     textColor() {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index a3d888d06..1fe959eec 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -113,22 +113,22 @@
       />
     </div>
     <a-modal v-model="areaVisible" :title="$t('parameterTemplate')" width='750px' :footer="null">
-      <parameter-template v-if='areaVisible' @areaVisible='handleCancel' :templateTitle='templatetitle'
-                          :selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version'></parameter-template>
+<!--      <parameter-template v-if='areaVisible' @areaVisible='handleCancel' :templateTitle='templatetitle'-->
+<!--                          :selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version'></parameter-template>-->
     </a-modal>
-    <configure ref="configureRef" :url='url' :itemId='itemId'/>
+<!--    <configure ref="configureRef" :url='url' :itemId='itemId'/>-->
   </a-card>
 </template>
 
 <script>
 // import ImportFile from '@/components/ImportFile/index'
 // import ParameterTemplate from '../dialog/ParameterTemplate'
-// import { getAction,postAction } from '../../../api/manage'
+import { getAction,postAction } from '../../../api/manage'
 // import Configure from '../dialog/configure'
 import axios from 'axios'
 
 export default {
-  name: 'TaskParameterCollection',
+  name: 'ParameterItemCollectionList',
   // components:{
   //   ImportFile,
   //   ParameterTemplate,
@@ -184,14 +184,15 @@ export default {
       selectedRowKeys: [],
       queryParam: {},
       url: {
-        list: 'params/manifest/page',
-        add: 'params/manifest/add',
-        edit: 'params/manifest/edit',
-        queryById: 'params/manifest/queryById',
-        deleteBatch: 'params/manifest/delete',
-        deleteAll: 'params/manifest/deleteBatch',
-        conAdd: 'params/config/addBatch',
-        conList: 'params/config/list',
+        getHeader: 'params/collectManifest/getHeader',
+        list: 'params/collectManifest/list',
+        // add: 'params/manifest/add',
+        // edit: 'params/manifest/edit',
+        // queryById: 'params/manifest/queryById',
+        // deleteBatch: 'params/manifest/delete',
+        // deleteAll: 'params/manifest/deleteBatch',
+        // conAdd: 'params/config/addBatch',
+        // conList: 'params/config/list',
       },
       loading: false,
       dataSource: [],
@@ -208,8 +209,14 @@ export default {
       itemId: ''
     }
   },
+  props: {
+    paramsManifest: {
+      type: Object,
+      default: {},
+      require: true
+    }
+  },
   mounted() {
-    this.getlist()
   },
   methods:{
     paramsManifestClick(item) {
@@ -224,14 +231,14 @@ export default {
       this.$confirm({
         content: _this.$t('ConfirmDelete'),
         onOk() {
-          getAction(_this.url.deleteBatch, { id: val.id }).then((res) => {
-            if (res.success) {
-              _this.$message.success(_this.$t('OperationSuccessful'))
-              _this.getlist()
-            } else {
-              _this.$message.warning(_this.$t('operationFailed'))
-            }
-          })
+          // getAction(_this.url.deleteBatch, { id: val.id }).then((res) => {
+          //   if (res.success) {
+          //     _this.$message.success(_this.$t('OperationSuccessful'))
+          //     _this.getlist()
+          //   } else {
+          //     _this.$message.warning(_this.$t('operationFailed'))
+          //   }
+          // })
         }
       })
     },
@@ -268,9 +275,9 @@ export default {
       this.areaVisible = true
       let _this = this
       let query = {
-        id: edit.id
+        paramsManifestId: this.paramsManifest.id
       }
-      getAction(_this.url.queryById, query).then((res) => {
+      getAction(_this.url.getHeader, query).then((res) => {
         if (res.success) {
           console.log(res,'res..')
           this.templatetitle = res.result.title
@@ -326,15 +333,32 @@ export default {
     },
     getlist() {
       let query = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
-        ...this.queryParam
+        paramsManifestId: this.paramsManifest.id,
+        flag: '7'
       }
-      console.log(this.$route.query,'this.query')
-      getAction(this.url.list, query).then((res) => {
+      console.log(this.paramsManifest,'this.paramsManifestthis.paramsManifestthis.paramsManifest')
+      getAction(this.url.getHeader, query).then((res) => {
         if(res.success) {
-          this.total =  res.result.total
-          this.dataSource = res.result.records || []
+          console.log(res,'头部，，，')
+          // this.total =  res.result.total
+          // this.dataSource = res.result.records || []
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+      // let query = {
+      //   pageSize: this.pageSize,
+      //   pageNo: this.pageNo,
+      //   ...this.queryParam
+      // }
+      // console.log(this.paramsManifest,'this.paramsManifestthis.paramsManifest')
+      // // console.log(this.$route.query,'this.query')
+      getAction(this.url.list, {}).then((res) => {
+        if(res.success) {
+          console.log(res,'oooo')
+          // this.total =  res.result.total
+          // this.dataSource = res.result.records || []
           this.loading = false
         } else {
           this.loading = false
@@ -342,6 +366,11 @@ export default {
       })
     }
   },
+  watch: {
+    paramsManifest(newVal, oldVal) {
+      this.getlist()
+    }
+  }
 }
 </script>
 
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
index 629ad1225..f0a069921 100644
--- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
@@ -173,10 +173,10 @@
     },
     methods:{
       paramsManifestClick(item) {
-        let Obj = {...item, ...this.$route.query}
+        localStorage.setItem('paramsManifest',JSON.stringify(item))
         let newUrl = this.$router.resolve({
           path: '/ParameterItemCollection',
-          query: Obj,
+          query: this.$route.query,
         })
         window.open(newUrl.href, '_blank')
       },