+
+
+
+
+
+
+
+
+ 查询
+
+
+
+ 清空
+
+
+
+
+
+
+
加载中...
{
- res.data.forEach((item)=>{
+ res.data.records.forEach((item)=>{
var idList = []
var NameList = ''
item.roles.forEach((items)=>{
@@ -242,7 +298,9 @@
item.idList = idList
item.NameList = NameList
})
- this.data = res.data
+ // this.data = res.data
+ this.data = res.data.records
+ this.total = res.data.total
})
},
addModal () { // 点击新增按钮
@@ -317,7 +375,7 @@
#post-manage {
height: 100%;
.content {
- height: calc(~'100% - 53px')
+ height: calc(~'100% - 105px - 56px')
}
.filter-tree {
height: calc(~'100% - 50px')
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 77f052cef..4703414ce 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -459,7 +459,7 @@
clearable>
+ prop="textStatusBuss" label-width="150px" class="add-form-item">
文本状态
关联模块--VPPS编码
-
+
@@ -1004,10 +1004,10 @@
-
+
-
+
@@ -1189,7 +1189,7 @@
0){
this.sarBussionessStandEO.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
+ this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessStandEO.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
}else {
this.sarBussionessStandEO.VPPSBMBUSS = checkedData.code
+ this.sarBussionessSearch.VPPSBMBUSS = checkedData.code
this.sarBussionessStandEO.VPPSCNBUSS = checkedData.chineseName
}
}
@@ -1942,16 +1945,19 @@ export default {
if(checkedData) {
if(checkedData.length > 0){
this.sarBussionessStandEO.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
+ this.sarBussionessSearch.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
}else {
this.sarBussionessStandEO.TXLBBUSS = checkedData.menuName
+ this.sarBussionessSearch.TXLBBUSS = checkedData.menuName
}
}
this.modalShowFlag1 = false
this.$forceUpdate()
},
- choiceZRR2 (type, title, id) {
+ choiceZRR2 (type, title, id,multFlag) {
this.drawerTitle = title
this.modalShowFlag2 = true
+ this.multipleFlag2 = multFlag
this.url = ''
this.urlChild = ''
this.url="sarVppsTree/list"
@@ -2759,7 +2765,7 @@ export default {
const value = nowstandinfo[item.attrField]
// 时间格式处理
if (item.attrType === 'DATE_PICKER' && value) {
- nowstandinfo[item.attrField] = this.$dateFormat(this.sarBussionessStandEO[item.attrField], 'yyyy-MM-dd hh:mm:ss')
+ nowstandinfo[item.attrField] = this.$moment(this.sarBussionessStandEO[item.attrField]).format('YYYY-MM-DD')
} else if (item.attrType === 'DATE_PICKER' && !value) {
delete nowstandinfo[item.attrField]
}
@@ -3283,28 +3289,6 @@ export default {
this.tableFlag = item
// item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
this.getBussionStandTable(item,'',type)
-
-
- this.sarBussionessSearch.applyCountry = ''
- this.sarBussionessSearch.standGenera = ''
- this.sarBussionessSearch.standSubclass = ''
- this.sarBussionessSearch.issueTime = ''
- this.sarBussionessSearch.putTime = ''
- this.sarBussionessSearch.responsibleUnit = ''
- this.sarBussionessSearch.classifyCode = ''
- this.sarBussionessSearch.standCode = ''
- this.sarBussionessSearch.standName = ''
- this.sarBussionessSearch.numberName = ''
- this.sarBussionessSearch.standSort = ''
- this.sarBussionessSearch.replaceStandNum = ''
- this.sarBussionessSearch.orgName = ''
- this.sarBussionessSearch.id = ''
- this.sarBussionessSearch.synopsis = ''
- this.sarBussionessSearch.classifyCode = ''
- this.sarBussionessSearch.quoteStand = ''
- this.sarBussionessSearch.standStatus = ''
- this.sarBussionessSearch.citationUser = ''
- this.sarBussionessSearch.advanceSearchVOStr = ''
},
// 清空搜索框
clearAllSearch (flag) {
@@ -3329,6 +3313,8 @@ export default {
this.sarBussionessSearch.quoteStand = ''
this.sarBussionessSearch.standStatus = ''
this.sarBussionessSearch.citationUser = ''
+ this.sarBussionessSearch.TXLBBUSS = ''
+ this.sarBussionessSearch.VPPSBMBUSS = ''
this.sarBussionessSearch.advanceSearchVOStr = ''
this.pageChange(1)
this.getBussionStandTable(this.sarBussionessSearch)
diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue
index fccb551d2..8168842a6 100644
--- a/src/pages/searchCenter/pages/advancedSearch.vue
+++ b/src/pages/searchCenter/pages/advancedSearch.vue
@@ -795,8 +795,20 @@
-
+
+
@@ -1489,11 +1501,9 @@ export default {
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
- this.standForm.cycvppsbm = checkedData.map(item => item.code).join(",")
- this.standForm.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+ this.standForm.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
}else {
- this.standForm.cycvppsbm = checkedData.code
- this.standForm.cycvppscn = checkedData.chineseName
+ this.standForm.VPPSBMBUSS = checkedData.code
}
}
this.modalShowFlag2 = false
@@ -1694,6 +1704,7 @@ export default {
}
}
}
+ this.$forceUpdate()
this.searchSarBykey();
},
/**