Merge branch 'dev_20231201_feizhi' into 'master'

Dev 20231201 feizhi

See merge request laws-foton-slrs/foton-laws-system-front!125
This commit is contained in:
高嵩
2023-12-13 04:11:58 +00:00
2 changed files with 4 additions and 3 deletions
@@ -247,6 +247,7 @@
</div>
</div>
<ProcessFooter
v-if="$route.query.operate !== 'view'"
show-transfer
show-submit
show-back
@@ -209,7 +209,7 @@
</div>
</div>
<div class="footer">
<pagination :total="totalNo" @pageChange="pageChangeNo" @pageSizeChange="pageSizeChangeNo"></pagination>
<pagination :total="totalNo" :page="pageNo" @pageChange="pageChangeNo" @pageSizeChange="pageSizeChangeNo"></pagination>
<el-drawer
title="查看"
:visible.sync="historySee"
@@ -864,13 +864,13 @@ export default {
this.$http.get("sarStandUnqualified/sar-stand-unqualified", {
...this.nonConformitySearch,
current: this.pageNo,
size: this.$store.getters.userInfo.configContent
size: this.pageSizeNo
}, {
_this: this
}, res => {
this.myLoading.loadData = false;
this.totalNo = res.data.total;
this.pageNo = 1;
// this.pageNo = 1;
this.nonList = res.data.records;
this.nonList.forEach(item => {
// 责任部门转换