@@ -344,7 +344,7 @@ export default {
standSystemOptions: [],
QYBZform: {
page: 1,
- pageSzie: this.$store.getters.userInfo.configContent,
+ pageSize: this.$store.getters.userInfo.configContent,
validFlag: '0',
userId: this.$store.getters.userInfo.userId,
standCode: '',
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index fb1329fd4..6ba125ffd 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -436,7 +436,7 @@
@@ -514,7 +514,7 @@ export default {
standSystemOptions: [],
QYBZform: {
page: 1,
- pageSzie: this.$store.getters.userInfo.configContent,
+ pageSize: this.$store.getters.userInfo.configContent,
validFlag: '0',
userId: this.$store.getters.userInfo.userId,
standCode: '',
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 84d5db3ed..c64f123cf 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -4289,7 +4289,7 @@ export default {
},
// 分页查询国内标准
getDomesticStandardTable(item) {
- console.log(item)
+ console.log('4292',item)
if (item !== '' && item !== null && item !== undefined) {
item.pageSize = this.$store.getters.userInfo.configContent
}
@@ -4330,9 +4330,26 @@ export default {
// // 自定义属性字段高级搜索处理
//advanceSearchVOStr
const advanceSearchVOList = [];
+ console.log('4333',this.advanceSearchMapping)
for (let key in this.advanceSearchMapping) {
+ console.log('key',key)
const value = this.advanceSearchMapping[key];
- if (value !== null && value !== '') {
+ console.log('value',value)
+ if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
+ advanceSearchVOList.push({
+ connect: "and",
+ field: key || '',
+ type: 'regexp',
+ value: value.join(',')
+ });
+ }else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ' )){
+ advanceSearchVOList.push({
+ connect: "and",
+ field: key || '',
+ type: 'between',
+ value: value.join(',')
+ });
+ }else if (value !== null && value !== ''){
advanceSearchVOList.push({
connect: "and",
field: key || '',
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 1f8b30b35..0ed587664 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -3810,9 +3810,26 @@ export default {
// // 自定义属性字段高级搜索处理
//advanceSearchVOStr
const advanceSearchVOList = [];
+ console.log('4333',this.advanceSearchMapping)
for (let key in this.advanceSearchMapping) {
+ console.log('key',key)
const value = this.advanceSearchMapping[key];
- if (value !== null && value !== '') {
+ console.log('value',value)
+ if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
+ advanceSearchVOList.push({
+ connect: "and",
+ field: key || '',
+ type: 'regexp',
+ value: value.join(',')
+ });
+ }else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ' )){
+ advanceSearchVOList.push({
+ connect: "and",
+ field: key || '',
+ type: 'between',
+ value: value.join(',')
+ });
+ }else if (value !== null && value !== ''){
advanceSearchVOList.push({
connect: "and",
field: key || '',