From 847cc2f78bdd0641e5e908d8cdac1b38da5899b3 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Fri, 16 Aug 2024 14:17:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E4=BA=BA=E5=A4=84=E7=90=86=E4=B8=BA?=
=?UTF-8?q?=E6=BB=9A=E5=8A=A8=E5=8A=A0=E8=BD=BD=E5=88=86=E9=A1=B5=E4=BA=BA?=
=?UTF-8?q?=E5=91=98=20=20=E6=95=B4=E6=94=B9=E9=80=9A=E7=9F=A5=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/apply/subPages/BS/riskSumbit.vue | 43 ++++++++++++++++---
.../subPages/BS/riskSumbitActualDealCheck.vue | 2 +
.../subPages/BS/riskSumbitNoticeCheck.vue | 6 ++-
.../subPages/BS/riskSumbitNoticeToActual.vue | 31 +++++++++----
.../subPages/BS/riskSumbitUserDepNew.vue | 29 ++++++++++---
5 files changed, 88 insertions(+), 23 deletions(-)
diff --git a/pages/apply/subPages/BS/riskSumbit.vue b/pages/apply/subPages/BS/riskSumbit.vue
index 7ebd16c..b809327 100644
--- a/pages/apply/subPages/BS/riskSumbit.vue
+++ b/pages/apply/subPages/BS/riskSumbit.vue
@@ -155,7 +155,7 @@
+ @select="handleSelected" @close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" />
@@ -201,8 +201,8 @@
} from '../../../../uni_modules/uview-ui/libs/mixin/mixin'
import {
- OrderPagedUseful2,
- OrderPagedUser,
+ UserPagedLimit,
+ UserPagedAll,
GetDpartMentNameHeader
} from '../../../../services/common'
@@ -256,6 +256,7 @@
name: 'user',
isMultiple: false,
showPopup: false,
+ totalCount: 0,
title: '人员选择',
index: 0,
dataLists: [],
@@ -576,15 +577,24 @@
},
//数据加载
- handleSearch(val) {
+ handleSearch(val, pageIndex) {
const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "NAME")
if (val) {
extendRule(json, 'NAME', 9, val);
}
if (this.selectorInfo.name == 'user') {
- OrderPagedUser(json).then(res => {
- this.selectorInfo.dataLists = res.map(i => {
+ //验收人
+ json.Limit = 20
+ json.Sort = 'NAME'
+ json.PageIndex = pageIndex ?? 1
+ if (pageIndex) {
+ json.Start = (pageIndex - 1) * json.Limit;
+ }
+
+ UserPagedAll(json).then(res => {
+ this.selectorInfo.totalCount = res.TotalCount
+ this.selectorInfo.dataLists = res.Data.map(i => {
return {
...i,
name: i.NAME,
@@ -593,8 +603,27 @@
})
})
} else if (this.selectorInfo.name == 'userDetailer') {
- OrderPagedUseful2(json).then(res => {
+ //整改责任人
+ // if (val) {
+ // extendRule(json, 'NAME', 9, val);
+ // }
+ json.Limit = 20
+ json.Sort = 'NAME'
+ json.PageIndex = pageIndex ?? 1
+ if (pageIndex) {
+ json.Start = (pageIndex - 1) * json.Limit;
+ }
+ UserPagedLimit(json).then(res => {
if (res.IsSuccessful) {
+ // this.selectorInfo.totalCount = res.TotalCount
+ // if (res.Data != undefined && res.Data.length > 0) {
+ // for (let i = 0; i < res.Data.length; i++) {
+ // res.Data[i].name = res.Data[i].NAME,
+ // res.Data[i].code = res.Data[i].CODE
+ // }
+ // }
+ // return res.Data
+ this.selectorInfo.totalCount = res.TotalCount
this.selectorInfo.dataLists = res.Data.map(i => {
return {
...i,
diff --git a/pages/apply/subPages/BS/riskSumbitActualDealCheck.vue b/pages/apply/subPages/BS/riskSumbitActualDealCheck.vue
index afcd2bb..02fac2e 100644
--- a/pages/apply/subPages/BS/riskSumbitActualDealCheck.vue
+++ b/pages/apply/subPages/BS/riskSumbitActualDealCheck.vue
@@ -76,6 +76,8 @@
inputAlign="right">
+ 附件
+
+ 附件
+
-
+
-
@@ -90,7 +91,8 @@
+ @search="handleShowSheet" @select="onConfirmPicker" @close="comPickerInfo.showSheet=false"
+ :total="comPickerInfo.totalCount" />
@@ -122,7 +124,7 @@
} from '../../../../uni_modules/uview-ui/libs/mixin/mixin'
import {
- OrderPagedUseful,
+ UserPagedLimit,
GetDpartMentNameHeader
} from '../../../../services/common'
@@ -168,6 +170,7 @@
columns: [],
dataLists: [],
title: '整改落实人选择',
+ totalCount: 0,
dataIndex: undefined,
dataIndex: undefined,
name: ''
@@ -275,7 +278,7 @@
},
//下拉数据加载
- async handleShowSheet(p) {
+ async handleShowSheet(p, pageIndex) {
const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "", 0)
if (p.name) {
@@ -286,9 +289,21 @@
extendRule(json, 'NAME', 9, p);
}
}
- let dataSelect = []
- OrderPagedUseful(json).then(res => {
- this.comPickerInfo.dataLists = res.map(i => {
+
+ // if (p.val) {
+ // extendRule(json, 'NAME', 9, p.val);
+ // }
+ json.PageIndex = pageIndex ?? 1
+ json.Limit = 20
+ json.Sort = 'NAME'
+ if (p.pageIndex) {
+ json.Start = (p.pageIndex - 1) * json.Limit;
+ }
+
+ // let dataSelect = []
+ UserPagedLimit(json).then(res => {
+ this.comPickerInfo.totalCount = res.TotalCount
+ this.comPickerInfo.dataLists = res.Data.map(i => {
return {
...i,
name: i.NAME,
diff --git a/pages/apply/subPages/BS/riskSumbitUserDepNew.vue b/pages/apply/subPages/BS/riskSumbitUserDepNew.vue
index 748d1bf..a06def0 100644
--- a/pages/apply/subPages/BS/riskSumbitUserDepNew.vue
+++ b/pages/apply/subPages/BS/riskSumbitUserDepNew.vue
@@ -124,7 +124,7 @@
+ @close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" />
@@ -175,9 +175,10 @@
} from '../../../../uni_modules/uview-ui/libs/mixin/mixin'
import {
- OrderPagedUseful2,
+ UserPagedLimit,
OrderPagedUseful,
OrderPagedUser,
+ UserPagedAll,
GetDpartMentNameHeader,
getEnum
} from '../../../../services/common'
@@ -273,6 +274,7 @@
selectorInfo: {
showPopup: false,
isMultiple: false,
+ totalCount: 0,
title: '人员选择',
index: 0,
dataLists: [],
@@ -615,7 +617,7 @@
},
//数据加载
- handleSearch(val) {
+ handleSearch(val, pageIndex) {
const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "NAME")
if (val) {
@@ -737,9 +739,17 @@
})
} else if (this.selectorInfo.name == 'usercheck') {
- OrderPagedUser(json).then(res => {
+ json.PageIndex = pageIndex ?? 1
+ json.Limit = 20
+ json.Sort = 'NAME'
+ if (pageIndex) {
+ json.Start = (pageIndex - 1) * json.Limit;
+ }
+
+ UserPagedAll(json).then(res => {
+ this.selectorInfo.totalCount = res.TotalCount
// if (res.IsSuccessful) {
- this.selectorInfo.dataLists = res.map(i => {
+ this.selectorInfo.dataLists = res.Data.map(i => {
return {
...i,
name: i.NAME,
@@ -749,7 +759,14 @@
// }
})
} else {
- OrderPagedUseful2(json).then(res => {
+ json.PageIndex = pageIndex ?? 1
+ json.Limit = 20
+ json.Sort = 'NAME'
+ if (pageIndex) {
+ json.Start = (pageIndex - 1) * json.Limit;
+ }
+ UserPagedLimit(json).then(res => {
+ this.selectorInfo.totalCount = res.TotalCount
if (res.IsSuccessful) {
this.selectorInfo.dataLists = res.Data.map(i => {
return {