diff --git a/pages/apply/subPages/BS/safeCheckCheck.vue b/pages/apply/subPages/BS/safeCheckCheck.vue index a29ee6e..bcebbe1 100644 --- a/pages/apply/subPages/BS/safeCheckCheck.vue +++ b/pages/apply/subPages/BS/safeCheckCheck.vue @@ -99,8 +99,10 @@ border="none" inputAlign="right"> - + + diff --git a/pages/apply/subPages/BS/safeCheckIndex.vue b/pages/apply/subPages/BS/safeCheckIndex.vue index 0c7d472..14d29fc 100644 --- a/pages/apply/subPages/BS/safeCheckIndex.vue +++ b/pages/apply/subPages/BS/safeCheckIndex.vue @@ -46,6 +46,10 @@ 检查类型: {{item.Nav_CheckType.NAME}} + + 状态: + {{item.FORM_CODE}} + 检查时间: {{item.CHECKTIME}} @@ -67,7 +71,7 @@ } from '../../../../utils/common' import { - orderPage + orderPageApp } from '../../../../services/apply/subPages/BS/safeCheck' import UniSearchBar from '../../../../uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue' @@ -112,8 +116,12 @@ extendRule(json, 'STATECHECK', 2, 0); extendInclude(json, 'Nav_CheckType') + extendInclude(json, 'Nav_User') if (this.keyword) { - extendRule(json, 'NAME', 9, this.keyword); + // extendRule(json, 'CheckUsers', 9, this.keyword); + // extendRule(json, 'Nav_User.NAME', 9, this.keyword); + // extendRule(json, 'NAME', 9, this.keyword); + json.Parameter1= this.keyword } if (this.searchStartTime && this.searchStartTime.length > 0) { @@ -131,7 +139,7 @@ Order: "1" }) // json.IgnoreDataRule = true - orderPage(json).then(res => { + orderPageApp(json).then(res => { this.total = res.TotalCount const newRes = (res.Data || []).map(i => { return { diff --git a/pages/apply/subPages/BS/safeCheckShow.vue b/pages/apply/subPages/BS/safeCheckShow.vue index da5e12c..9ca3b6d 100644 --- a/pages/apply/subPages/BS/safeCheckShow.vue +++ b/pages/apply/subPages/BS/safeCheckShow.vue @@ -120,8 +120,11 @@ - + --> + @@ -358,7 +361,7 @@