diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 1882f8b5f..0be934a70 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -1225,8 +1225,26 @@
+ placeholder="请输入关联模块--乘用车VPPS编码"
+ >
+
+
+
+
+
+
+
+
+
@@ -1240,18 +1258,6 @@
@click.native="choiceQCR('QCRBUSS', '查询起草人', sarBussionessSearch['QCRBUSS'])">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2581,17 +2585,17 @@ export default {
popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
- if (this.drawerTitle2 === 'VPPS编码') {
- this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
- this.sarBussionessSearch.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+ if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
+ this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+ this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
} else {
this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
}
} else {
- if (this.drawerTitle2 === 'VPPS编码') {
- this.sarBussionessSearch.VPPSBMBUSS = checkedData.code
- this.sarBussionessSearch.VPPSCNBUSS = checkedData.chineseName
+ if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
+ this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.code
+ this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.chineseName
} else {
this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.code
this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.chineseName
@@ -4336,37 +4340,29 @@ export default {
formFieldList.forEach((item) => {
const value = this.sarBussionessSearch[item.attrField]
// 时间格式处理
- if (value !== undefined && value !== null && value !== "" && item.attrField === 'VPPSBMBUSS') {
- advanceSearchVOList.push({
- connect: "and",
- field: 'CYCVPPSBM',
- type: 'like',
- value: value
- });
- }else if (value !== undefined && value !== null && value !== "" && item.attrField === 'VPPSCNBUSS') {
- advanceSearchVOList.push({
- connect: "and",
- field: 'CYCVPPSCN',
- type: 'like',
- value: value
- });
- }else if (value !== undefined && value !== null && value !== "" && item.attrField !== 'BARQ') {
+ if (value !== undefined && value !== null && value !== "" && item.attrField === 'BARQ') {
+ advanceSearchVOList.push({
+ connect: "and",
+ field: item.attrField || "",
+ type: 'EQUALS',
+ value: value
+ });
+ }else if (value !== undefined && value !== null && value !== "" && (item.attrField === 'FZRQBUSS' || item.attrField === 'FSRQBUSS')) {
advanceSearchVOList.push({
connect: advanceSearchVOList.length > 0 ? "and" : "",
field: item.attrField || "",
type: "between",
+ value: (value ? value[0]+','+value[1] : "") || "",
+ });
+ }else if (value !== undefined && value !== null && value !== "") {
+ advanceSearchVOList.push({
+ connect: "and",
+ field: item.attrField || "",
+ type: 'like',
value: value
});
}
})
- if (formData.BARQ !== undefined && formData.BARQ !== null && formData.BARQ !== '') {
- advanceSearchVOList.push({
- connect: "and",
- field: 'BARQ',
- type: 'EQUALS',
- value: formData.BARQ
- });
- }
}
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
this.SarExportSearchEo = formData;