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>
</div> </div>
<ProcessFooter <ProcessFooter
v-if="$route.query.operate !== 'view'"
show-transfer show-transfer
show-submit show-submit
show-back show-back
@@ -209,7 +209,7 @@
</div> </div>
</div> </div>
<div class="footer"> <div class="footer">
<pagination :total="totalNo" @pageChange="pageChangeNo" @pageSizeChange="pageSizeChangeNo"></pagination> <pagination :total="totalNo" :page="pageNo" @pageChange="pageChangeNo" @pageSizeChange="pageSizeChangeNo"></pagination>
<el-drawer <el-drawer
title="查看" title="查看"
:visible.sync="historySee" :visible.sync="historySee"
@@ -864,13 +864,13 @@ export default {
this.$http.get("sarStandUnqualified/sar-stand-unqualified", { this.$http.get("sarStandUnqualified/sar-stand-unqualified", {
...this.nonConformitySearch, ...this.nonConformitySearch,
current: this.pageNo, current: this.pageNo,
size: this.$store.getters.userInfo.configContent size: this.pageSizeNo
}, { }, {
_this: this _this: this
}, res => { }, res => {
this.myLoading.loadData = false; this.myLoading.loadData = false;
this.totalNo = res.data.total; this.totalNo = res.data.total;
this.pageNo = 1; // this.pageNo = 1;
this.nonList = res.data.records; this.nonList = res.data.records;
this.nonList.forEach(item => { this.nonList.forEach(item => {
// 责任部门转换 // 责任部门转换