FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-03-28 11:28:25 +08:00
parent 49e654d963 f28a12a676
commit 9e3bead02f
3 changed files with 88 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+40 -40
View File
@@ -1896,46 +1896,46 @@ export default {
this.form.standInData = this.standardSearchForm.standType === 'INLAND' ? '0' : '1'
},
},*/
'form.standNumber': {
handler: function () {
this.standardSearchForm.standNumber = this.form.standNumber
},
},
'standardSearchForm.standNumber': {
handler: function () {
this.form.standNumber = this.standardSearchForm.standNumber
},
},
'form.standSort': {
handler: function () {
this.standardSearchForm.standSort = this.form.standSort
},
},
'standardSearchForm.standSort': {
handler: function () {
this.form.standSort = this.standardSearchForm.standSort
},
},
'form.standName': {
handler: function () {
this.standardSearchForm.standName = this.form.standName
},
},
'standardSearchForm.standName': {
handler: function () {
this.form.standName = this.standardSearchForm.standName
},
},
'form.standEnName': {
handler: function () {
this.standardSearchForm.standEnName = this.form.standEnName
},
},
'standardSearchForm.standEnName': {
handler: function () {
this.form.standEnName = this.standardSearchForm.standEnName
},
},
// 'form.standNumber': {
// handler: function () {
// this.standardSearchForm.standNumber = this.form.standNumber
// },
// },
// 'standardSearchForm.standNumber': {
// handler: function () {
// this.form.standNumber = this.standardSearchForm.standNumber
// },
// },
// 'form.standSort': {
// handler: function () {
// this.standardSearchForm.standSort = this.form.standSort
// },
// },
// 'standardSearchForm.standSort': {
// handler: function () {
// this.form.standSort = this.standardSearchForm.standSort
// },
// },
// 'form.standName': {
// handler: function () {
// this.standardSearchForm.standName = this.form.standName
// },
// },
// 'standardSearchForm.standName': {
// handler: function () {
// this.form.standName = this.standardSearchForm.standName
// },
// },
// 'form.standEnName': {
// handler: function () {
// this.standardSearchForm.standEnName = this.form.standEnName
// },
// },
// 'standardSearchForm.standEnName': {
// handler: function () {
// this.form.standEnName = this.standardSearchForm.standEnName
// },
// },
},
methods: {
// 标准来源改变事件
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+2 -2
View File
@@ -621,14 +621,14 @@ export default {
const advanceSearchVOList = [];
for (let key in formData) {
const value = formData[key];
if (value !== null && value !== '' && value.length > 0 && (key === 'SYRZ' || key === 'CLLX')) {
if (value !== null && value !== '' && value !== undefined && value !== [] && (key === 'SYRZ' || key === 'CLLX')) {
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'regexp',
value: value.join(',')
});
} else if (value !== null && value !== '' && value.length > 0 && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
} else if (value !== null && value !== '' && value !== undefined && value !== [] && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
advanceSearchVOList.push({
connect: "and",
field: key || '',
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+46 -1
View File
@@ -3718,6 +3718,43 @@ export default {
},
// 搜索
getDomesticStandardTableBtn(item) {
// // 自定义属性字段高级搜索处理
//advanceSearchVOStr
const advanceSearchVOList = [];
for (let key in this.advanceSearchMapping) {
const value = this.advanceSearchMapping[key];
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 !== '' && (key === 'BARQ')) {
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'equals',
value: value
});
} else if (value !== null && value !== '' && (key === 'TXLBName')) {
} else if (value !== null && value !== '') {
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'like',
value: value
});
}
}
item.advanceSearchVOStr = advanceSearchVOList
sessionStorage.setItem('tableFlag', JSON.stringify(item))
this.tableFlag = item
item.page = 1
@@ -4575,7 +4612,15 @@ export default {
});
}
}
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
if(item.advanceSearchVOStr){
advanceSearchVOList.push({
connect: item.advanceSearchVOStr[0].connect,
field: item.advanceSearchVOStr[0].field,
type: item.advanceSearchVOStr[0].type,
value: item.advanceSearchVOStr[0].value,
})
}
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList)
this.SarExportSearchEo = formData
formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null
formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null