Merge branch 'dev_20231201_feizhi' into 'master'

Dev 20231201 feizhi

See merge request laws-foton-slrs/foton-laws-system-front!126

src/common/preview/index.js

@@ -5,7 +5,14 @@ import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
 import { getBusStandFileByAttId } from 'api/process'
 let Base64 = require('js-base64').Base64;
 import store from '@/store'
+import { Loading  } from "element-ui";
+
 export default attId => {
+    const loading = Loading.service({
+        lock: true,
+        text: '正在加载文件',
+        spinner: 'el-icon-loading',
+    })
     getBusStandFileByAttId({
         attId
     }).then(res => {
@@ -22,6 +29,7 @@ export default attId => {
 
             }
         }
-    }).catch(e => {
+    }).finally(() => {
+        loading.close()
     })
 }

src/pages/config/pages/roleManage/index.vue

@@ -362,7 +362,7 @@
                   tooltip-effect="dark"
                   style="width: 100%;"
                   border
-                  height="100%"
+                  height="93%"
                   :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
             <el-table-column

src/pages/processCenter/pages/creatProcess/qbrk/step13.vue

@@ -2697,7 +2697,7 @@
                         // 自动匹配配置标准
                         this.saveConfStand(res.data)
                         const planForm = {}
-                        planForm.id = this.form.esId
+                        planForm.id = this.form.esId || this.form.nowEsId
                         planForm.planStatus = '4'
                         planForm.reviseStatus = this.form.reviseStatus
                         planForm.standCode = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS : this.form.standCode

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -559,7 +559,7 @@
                             </el-form>
                         </div>
                         <div class="table-wrap" style="height: 100%;">
-                            <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
+                            <div style="position: absolute;height: calc(100% - 66px);width: 100%;">
                                 <el-table
                                         ref="selection"
                                         :data="QYBZList"
@@ -570,6 +570,15 @@
                                         @selection-change="handleSelectionQYBZ"
                                         :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
                                     <el-table-column type="selection" width="55" align="center"/>
+                                    <el-table-column
+                                        type="index"
+                                        width="55"
+                                        label="序号"
+                                        align="center">
+                                    <template slot-scope="{scope, column, $index}">
+                                        {{ ($index + 1) + (QYBZform.page - 1) * QYBZform.pageSize }}
+                                    </template>
+                                    </el-table-column>
                                     <el-table-column
                                             label="企标编号"
                                             prop="standCode"
@@ -614,11 +623,12 @@
                             <pagination :page="QYBZform.page" :total="QYBZform.total" @pageChange="QYBZpageChange" @pageSizeChange="QYBZpageSizeChange"></pagination>
                             <loading :loading="QYBZShow">数据加载中……</loading>
                         </div>
+                        <div class="demo-drawer-footer">
+                            <el-button size="mini" @click="QYBZcloseDrawer">取消</el-button>
+                            <el-button type="primary" size="mini" @click="QYBZenterDrawer">导入</el-button>
+                        </div>
                     </div>
-                    <div class="demo-drawer-footer">
+                    
-                        <el-button size="mini" @click="QYBZcloseDrawer">取消</el-button>
-                        <el-button type="primary" size="mini" @click="QYBZenterDrawer">导入</el-button>
-                    </div>
                 </div>
             </el-drawer>
             <el-drawer
@@ -807,7 +817,7 @@
                 QYBZmodal: false,
                 QYBZform: {
                     page: 1,
-                    pageSzie: this.$store.getters.userInfo.configContent,
+                    pageSize: this.$store.getters.userInfo.configContent,
                     validFlag: '0',
                     userId: this.$store.getters.userInfo.userId,
                     standCode: '',
@@ -1729,7 +1739,7 @@
                 overflow: hidden;
                 display: flex;
                 flex-direction: column;
-
+                height:80%;
                 .table-wrap {
                     flex: auto;
                     overflow: hidden;

src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue

@@ -109,6 +109,16 @@
             fixed="left"
             align="center">
         </el-table-column>
+        <el-table-column
+        label="序号"
+          type="index"
+          width="55"
+          fixed="left"
+          align="center">
+          <template slot-scope="{scope, column, $index}">
+            {{ ($index + 1) + (sarSarAccessEOSearch.page - 1) * sarSarAccessEOSearch.pageSize }}
+          </template>
+      </el-table-column>
         <el-table-column
             prop="lawNumber"
             fixed="left"
@@ -268,7 +278,7 @@ export default {
     searchSarAccess() {//多条件和模糊查询
       this.$http.get("sarStandUnqualified/businessDeptIssue", {
         current: this.sarSarAccessEOSearch.page,
-        pageSize: this.$store.getters.userInfo.configContent,
+        pageSize: this.sarSarAccessEOSearch.pageSize,
         ...this.sarSarAccessEOSearch,
       }, {
         _this: this
@@ -367,7 +377,6 @@ export default {
       this.searchSarAccess()
     },
     pageSizeChange(pageSize) {
-      this.sarSarAccessEOSearch.page = 1
       this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent
       this.searchSarAccess()
     },

src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue

@@ -92,6 +92,16 @@
           fixed="left"
           align="center">
         </el-table-column>
+        <el-table-column
+        type="index"
+        fixed="left"
+        width="55"
+        label="序号"
+        align="center">
+      <template slot-scope="{scope, column, $index}">
+        {{ ($index + 1) + (pageNo - 1) * pageSize }}
+      </template>
+    </el-table-column>
         <el-table-column
           prop="standId"
           width="180px"