From 7a3afc097563d1aab78cdca11850929cc7468235 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 2 Jun 2022 16:47:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=B6=88=E6=81=AF=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home2/components/release/index.vue  |  80 ++++++++-----
 .../home2/components/releaseBuss/index.vue    |  88 +++++++++++----
 .../home2/components/releaseUs/index.vue      | 106 ++++++++++++++----
 src/pages/home2/index.vue                     |   8 +-
 .../creatProcess/qbrk-product/step13.vue      |   3 +
 .../pages/creatProcess/qbrk/step12.vue        |   8 +-
 .../pages/creatProcess/qbrk/step13.vue        |   7 ++
 7 files changed, 227 insertions(+), 73 deletions(-)

diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue
index 241c77914..e380ef56a 100644
--- a/src/pages/home2/components/release/index.vue
+++ b/src/pages/home2/components/release/index.vue
@@ -16,7 +16,6 @@
               border
               style="cursor:pointer;"
               :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-          style="width: 100%">
           <el-table-column
                   label="序号"
                   type="index"
@@ -26,31 +25,33 @@
           <el-table-column
                   label="标准编号">
               <template slot-scope="scope">
-                  <a v-if="scope.row.standYear" class="table-jump" style="color: #333333"
-                     @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{
-                      scope.row.standNumber
-                      }}-{{ scope.row.standYear }}</a>
-                  <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
-                      {{ scope.row.standSort }}
-                      {{ scope.row.standNumber }}</a>
+                  <span @click="handlePreview(scope.row)">{{ scope.row.standard }}</span>
               </template>
           </el-table-column>
           <el-table-column
                   prop="standName"
                   label="标准名称">
               <template slot-scope="scope">
-                  <span @click="handlePreview(scope.row)">{{ scope.row.standName }}</span>
+                  <span @click="handlePreview(scope.row)">{{ scope.row.standardName }}</span>
               </template>
           </el-table-column>
           <el-table-column
                   width="120"
                   label="发布时间">
               <template slot-scope="scope">
-                  <span>{{scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{scope.row.releaseDate ? $moment(scope.row.releaseDate).format('YYYY-MM-DD') : '' }}</span>
               </template>
           </el-table-column>
       </el-table>
-      <div class="more" @click="togo">更多 ⋙</div>
+      <div class="more" v-if="!pageVerify" @click="togo">更多 ⋙</div>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+              v-if="pageVerify"
+              style="position: static;"
+              :page="page"
+              :total="total"
+              @pageChange="pageChange"
+              @pageSizeChange="pageSizeChange"></pagination>
   </div>
 </template>
 
@@ -61,8 +62,13 @@ export default {
   mixins: [],
   data() {
     return {
-      putTime: '',
-      standardReleaseList: [],  //标准发布数据
+        loading: false,
+        pageVerify: false,
+        page: 1,
+        pageSize: 10,
+        total: 0,
+        putTime: '',
+        standardReleaseList: [],  //标准发布数据
     }
   },
   computed: {},
@@ -73,16 +79,33 @@ export default {
     // this.addDate()
   },
   methods: {
+      pageChange(page) {
+          this.page = page
+          this.pageSize = this.$store.getters.userInfo.configContent
+          this.getAdvice()
+      },
+      // 分页每页显示数改变后方法
+      pageSizeChange(pageSize) {
+          this.pageSize = this.$store.getters.userInfo.configContent
+          this.getAdvice()
+          // 此处需要调用接口，修改个人配置
+      },
       togo () {
-          this.$router.push('/processCenter')
+        if(this.total && this.total > 10){
+            this.pageVerify = true
+            this.pageSize = this.$store.getters.userInfo.configContent
+        }else {
+            this.pageVerify = false
+        }
+        this.getAdvice()
       },
     // 点击查看
     handlePreview (item) {
       let routeUrl = this.$router.resolve({
         name: 'OtherStandardDetails',
         params: {
-          id: item.id,
-          pageType: item.standType + '_STAND'
+          id: item.standardId,
+          pageType: item.resourceType + '_STAND'
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -93,22 +116,21 @@ export default {
     },
     //获取数据
     getAdvice() {
-      let obj = {}
-      obj.limit = 10
-        this.$http.get("/lawss/NewsFeed/getNewsFeed", {
+      this.loading = true
+      this.$http.get("/lawss/NewsFeed/getNewsFeed", {
             messageType: 'GNWBZFG',
-            page: 1,
-            paeSize: 10
+            page: this.page,
+            pageSize: this.pageSize
         }, {
-            _this: this
+            _this: this,loading: 'loading'
         }, res => {
-        let arr = res.data
-        arr.forEach(item => {
-          if(item.standName !== ""){
-            this.standardReleaseList.push(item)
-          }
-        })
+            this.standardReleaseList = res.data.records
+            this.total = res.data.total
+            this.loading = false
       }, e => {
+            this.loading = false
+            this.standardReleaseList = []
+            this.total = 0
       })
     },
   },
@@ -127,7 +149,7 @@ export default {
   /deep/.more {
       position: absolute;
       right: 0;
-      bottom: 0;
+      bottom: 2px;
       font-size: 12px;
       float: right;
       color: #4788c0;
diff --git a/src/pages/home2/components/releaseBuss/index.vue b/src/pages/home2/components/releaseBuss/index.vue
index 3d4eb5660..b0648aee3 100644
--- a/src/pages/home2/components/releaseBuss/index.vue
+++ b/src/pages/home2/components/releaseBuss/index.vue
@@ -16,7 +16,6 @@
               border
               style="cursor:pointer;"
               :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-          style="width: 100%">
           <el-table-column
                   label="序号"
                   type="index"
@@ -24,20 +23,35 @@
                   width="55">
           </el-table-column>
           <el-table-column
-                  prop="standName"
-                  label="名称">
+                  label="标准编号">
               <template slot-scope="scope">
-                  <span @click="handlePreview(scope.row)">{{ scope.row.standName }}</span>
+                  <span @click="handlePreview(scope.row)">{{ scope.row.standard }}</span>
+              </template>
+          </el-table-column>
+          <el-table-column
+                  prop="standName"
+                  label="标准名称">
+              <template slot-scope="scope">
+                  <span @click="handlePreview(scope.row)">{{ scope.row.standardName }}</span>
               </template>
           </el-table-column>
           <el-table-column
                   width="120"
                   label="发布时间">
               <template slot-scope="scope">
-                  <span>{{scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{scope.row.releaseDate ? $moment(scope.row.releaseDate).format('YYYY-MM-DD') : '' }}</span>
               </template>
           </el-table-column>
       </el-table>
+      <div class="more" v-if="!pageVerify" @click="togo">更多 ⋙</div>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+              v-if="pageVerify"
+              style="position: static;"
+              :page="page"
+              :total="total"
+              @pageChange="pageChange"
+              @pageSizeChange="pageSizeChange"></pagination>
   </div>
 </template>
 
@@ -48,6 +62,11 @@ export default {
   mixins: [],
   data() {
     return {
+      loading: false,
+      pageVerify: false,
+      page: 1,
+      pageSize: 10,
+      total: 0,
       putTime: '',
       standardReleaseList: [],  //标准发布数据
     }
@@ -60,12 +79,32 @@ export default {
     // this.addDate()
   },
   methods: {
+      pageChange(page) {
+          this.page = page
+          this.pageSize = this.$store.getters.userInfo.configContent
+          this.getAdvice()
+      },
+      // 分页每页显示数改变后方法
+      pageSizeChange(pageSize) {
+          this.pageSize = this.$store.getters.userInfo.configContent
+          this.getAdvice()
+          // 此处需要调用接口，修改个人配置
+      },
+      togo () {
+          if(this.total && this.total > 10){
+              this.pageVerify = true
+              this.pageSize = this.$store.getters.userInfo.configContent
+          }else {
+              this.pageVerify = false
+          }
+          this.getAdvice()
+      },
     // 点击查看
     handlePreview (item) {
         let routeUrl = this.$router.resolve({
             name: 'OtherBussStandardDetails',
             params: {
-                id: item.id,
+                id: item.standardId,
                 pageType: 'BUSINESS_STAND'
             }
         })
@@ -77,23 +116,22 @@ export default {
     },
     //获取数据
     getAdvice() {
-      let obj = {}
-      obj.limit = 10
-      this.$http.get("/lawss/NewsFeed/getNewsFeed", {
+        this.loading = true
+        this.$http.get("/lawss/NewsFeed/getNewsFeed", {
             messageType: 'QYBZFB',
-            page: 1,
-            paeSize: 10
+            page: this.page,
+            pageSize: this.pageSize
         }, {
-            _this: this
+            _this: this,loading: 'loading'
         }, res => {
-        let arr = res.data
-        arr.forEach(item => {
-          if(item.standName !== ""){
-            this.standardReleaseList.push(item)
-          }
+            this.standardReleaseList = res.data.records
+            this.total = res.data.total
+            this.loading = false
+        }, e => {
+            this.loading = false
+            this.standardReleaseList = []
+            this.total = 0
         })
-      }, e => {
-      })
     },
   },
 
@@ -108,6 +146,18 @@ export default {
   /deep/.el-table td > .cell{
     font-size: 13px;
   }
+    /deep/.more {
+        position: absolute;
+        right: 0;
+        bottom: 2px;
+        font-size: 12px;
+        float: right;
+        color: #4788c0;
+        &:hover {
+            color: #3a8ee6;
+            cursor: pointer;
+        }
+    }
     width: 100%;
   .time-title {
     margin: 15px;
diff --git a/src/pages/home2/components/releaseUs/index.vue b/src/pages/home2/components/releaseUs/index.vue
index a456f9c2a..b30c59bd0 100644
--- a/src/pages/home2/components/releaseUs/index.vue
+++ b/src/pages/home2/components/releaseUs/index.vue
@@ -16,7 +16,6 @@
               border
               style="cursor:pointer;"
               :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-          style="width: 100%">
           <el-table-column
                   label="序号"
                   type="index"
@@ -24,20 +23,36 @@
                   width="55">
           </el-table-column>
           <el-table-column
-                  prop="standName"
-                  label="名称">
+                  prop="standard"
+                  label="标准编号">
               <template slot-scope="scope">
-                  <span @click="handlePreview(scope.row)">{{ scope.row.standName }}</span>
+                  <span @click="handlePreview(scope.row)">{{ scope.row.standard }}</span>
+              </template>
+          </el-table-column>
+          <el-table-column
+                  prop="standardName"
+                  label="标准名称">
+              <template slot-scope="scope">
+                  <span @click="handlePreview(scope.row)">{{ scope.row.standardName }}</span>
               </template>
           </el-table-column>
           <el-table-column
                   width="120"
-                  label="发布时间">
+                  label="文本状态">
               <template slot-scope="scope">
-                  <span>{{scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ textStatusMap[scope.row.textState] }}</span>
               </template>
           </el-table-column>
       </el-table>
+      <div class="more" @click="togo">更多 ⋙</div>
+      <loading :loading="loading">加载中...</loading>
+      <pagination
+              v-if="pageVerify"
+              style="position: static;"
+              :page="page"
+              :total="total"
+              @pageChange="pageChange"
+              @pageSizeChange="pageSizeChange"></pagination>
   </div>
 </template>
 
@@ -48,25 +63,65 @@ export default {
   mixins: [],
   data() {
     return {
+      loading: false,
+      pageVerify: false,
+      page: 1,
+      pageSize: 10,
+      total: 0,
       putTime: '',
       standardReleaseList: [],  //标准发布数据
+      textStatusMap: {} // 文本状态id与name对应
     }
   },
   computed: {},
   watch: {},
   mounted() {
+      this.$http.get('sys/dictype/getDicTypeListCode', '', {
+          _this: this
+      }, res => {
+            if (res.data.WBZTCLASS !== undefined && res.data.WBZTCLASS !== null){
+                this.setMap(res.data.WBZTCLASS) // 文本状态
+            }
+      }, e => {
+      })
     this.getDate()
     this.getAdvice()
     // this.addDate()
   },
   methods: {
+      pageChange(page) {
+          this.page = page
+          this.pageSize = this.$store.getters.userInfo.configContent
+          this.getAdvice()
+      },
+      // 分页每页显示数改变后方法
+      pageSizeChange(pageSize) {
+          this.pageSize = this.$store.getters.userInfo.configContent
+          this.getAdvice()
+          // 此处需要调用接口，修改个人配置
+      },
+      togo () {
+          if(this.total && this.total > 10){
+              this.pageVerify = true
+              this.pageSize = this.$store.getters.userInfo.configContent
+          }else {
+              this.pageVerify = false
+          }
+          this.getAdvice()
+      },
+      // 将文本状态的id与name对应
+      setMap(data) {
+          data.forEach(item => {
+              this.$set(this.textStatusMap, item.value, item.label)
+          })
+      },
     // 点击查看
     handlePreview (item) {
       let routeUrl = this.$router.resolve({
         name: 'OtherStandardDetails',
         params: {
-          id: item.id,
-          pageType: item.standType + '_STAND'
+          id: item.standardId,
+          pageType: item.resourceType + '_STAND'
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -77,23 +132,22 @@ export default {
     },
     //获取数据
     getAdvice() {
-      let obj = {}
-      obj.limit = 10
+        this.loading = true
         this.$http.get("/lawss/NewsFeed/getNewsFeed", {
             messageType: 'ZYBZFG',
-            page: 1,
-            paeSize: 10
+            page: this.page,
+            pageSize: this.pageSize
         }, {
-            _this: this
+            _this: this,loading: 'loading'
         }, res => {
-        let arr = res.data
-        arr.forEach(item => {
-          if(item.standName !== ""){
-            this.standardReleaseList.push(item)
-          }
+            this.standardReleaseList = res.data.records
+            this.total = res.data.total
+            this.loading = false
+        }, e => {
+            this.loading = false
+            this.standardReleaseList = []
+            this.total = 0
         })
-      }, e => {
-      })
     },
   },
 
@@ -108,6 +162,18 @@ export default {
   /deep/.el-table td > .cell{
     font-size: 13px;
   }
+    /deep/.more {
+        position: absolute;
+        right: 0;
+        bottom: 2px;
+        font-size: 12px;
+        float: right;
+        color: #4788c0;
+        &:hover {
+            color: #3a8ee6;
+            cursor: pointer;
+        }
+    }
     width: 100%;
   .time-title {
     margin: 15px;
diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue
index 5e1f016da..1f3dfe2f7 100644
--- a/src/pages/home2/index.vue
+++ b/src/pages/home2/index.vue
@@ -15,15 +15,15 @@
                  <span slot="label"><i class="el-icon-s-order"></i> 标准征求意见</span>
                  <solicitOpinions></solicitOpinions>
              </el-tab-pane>
-             <el-tab-pane name="release">
+             <el-tab-pane name="release" style="overflow-y: auto;height: 100%">
                  <span slot="label"><i class="el-icon-s-promotion"></i> 国内外标准法规入库</span>
                  <release></release>
              </el-tab-pane>
-            <el-tab-pane name="releaseUs">
-               <span slot="label"><i class="el-icon-s-promotion"></i> 在研标准法规入库</span>
+            <el-tab-pane name="releaseUs" style="overflow-y: auto;height: 100%">
+               <span slot="label"><i class="el-icon-s-operation"></i> 在研标准法规入库</span>
                <releaseUs></releaseUs>
             </el-tab-pane>
-           <el-tab-pane name="releaseBuss">
+           <el-tab-pane name="releaseBuss" style="overflow-y: auto;height: 100%">
                <span slot="label"><i class="el-icon-s-promotion"></i> 企业标准发布</span>
                <releaseBuss></releaseBuss>
            </el-tab-pane>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
index 279f5ffa9..3563153bd 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
@@ -2298,6 +2298,7 @@
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
                 this.fileInfoHandle()
+                this.isSubmit = true
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
@@ -2313,10 +2314,12 @@
                     commentText: this.formTongGuo.commentText
                 }))
                 saveTaskForPub(_formData).then(res => {
+                    this.isSubmit = false
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
                 }).catch(e => {
+                    this.isSubmit = false
                     this.saveLoading = false
                 })
             },
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
index c6675e43b..1647257d6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
@@ -2339,6 +2339,7 @@
                 // }
                 this.fileInfoHandle()
                 this.saveLoading = true
+                this.isSubmit = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
@@ -2355,10 +2356,12 @@
                 }))
                 saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
+                    this.isSubmit = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
                 }).catch(e => {
                     this.saveLoading = false
+                    this.isSubmit = false
                 })
             },
             fileInfoHandle(){
@@ -2475,6 +2478,7 @@
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
+                        this.saveLoading = true
                         this.form.commentText = this.formTongGuo.commentText
                         this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                         this.form.topId = this.pId
@@ -2490,7 +2494,7 @@
                                 // this.$message.success(res.message)
                                 // 流程提交之后，应该流转至待办任务页面
                                 this.isSubmit = false
-                                this.submitLoading = false
+                                this.saveLoading = false
                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                 // this.processCreateBuss(json)
                                 // if(this.formTongGuo.approvalOpinion === '1'){
@@ -2502,6 +2506,8 @@
                                 //     this.processCreateLaws(json)
                                 // }
                             }else {
+                                this.isSubmit = false
+                                this.saveLoading = false
                                 this.$message.success(res.message)
                             }
                         })
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index 8b1c360f5..018bb827c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -2340,6 +2340,7 @@
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
                 this.fileInfoHandle()
+                this.isSubmit = true
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
@@ -2356,10 +2357,12 @@
                     commentText: this.formTongGuo.commentText
                 }))
                 saveTaskForPub(_formData).then(res => {
+                    this.isSubmit = false
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
                 }).catch(e => {
+                    this.isSubmit = false
                     this.saveLoading = false
                 })
             },
@@ -2479,6 +2482,7 @@
                         this.$refs['formTongGuo'].validate((valid) => {
                             if (valid) {
                                 this.isSubmit = true
+                                this.saveLoading = true
                                 this.form.commentText = this.formTongGuo.commentText
                                 this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                 this.form.topId = this.pId
@@ -2494,6 +2498,7 @@
                                         // this.$message.success(res.message)
                                         // 流程提交之后，应该流转至待办任务页面
                                         this.isSubmit = false
+                                        this.saveLoading = false
                                         this.processCreateBuss(json)
                                         // if(this.formTongGuo.approvalOpinion === '1'){
                                         //     this.$message.warning("驳回成功")
@@ -2504,6 +2509,8 @@
                                         //     this.processCreateLaws(json)
                                         // }
                                     }else {
+                                        this.isSubmit = false
+                                        this.saveLoading = false
                                         this.$message.success(res.message)
                                     }
                                 })