- {{ form.modelName }}
+
- -
@@ -169,8 +171,7 @@
form: {
title: '', // 调研标题
date: '', // 完成时间
- model: '', // 上传模板
- modelName: '',
+ modelList: [],
fileId: '',
fileName: '',
responUserList: '',
@@ -257,8 +258,7 @@
this.json = data || data.form
this.form.file = data.fileId || data.form.fileId
this.form.fileName = data.fileName || data.form.fileName
- this.form.model = data.model || data.form.model
- this.form.modelName = data.modelName || data.form.modelName
+ this.form.modelList = data.modelList || data.form.modelList
}).catch(e => {
})
})
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 28287653c..79f359ad7 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)
@@ -3658,9 +3644,51 @@ export default {
const data = this.formFieldListData
this.formFieldList = data.map((item) => {
if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
- return Object.assign({}, item, {
- options: this.allSelectOptions[item.selVal]
- })
+ if(item.attrField === 'WSSMR'){
+ return Object.assign({}, item, {
+ options: this.allSelectOptions["WSSMR"]
+ })
+ }else if(item.attrField === 'QCDW'){
+ return Object.assign({}, item, {
+ options: this.allSelectOptions["QCDW"]
+ })
+ }else if(item.attrField === 'CYSD'){
+ return Object.assign({}, item, {
+ options: this.allSelectOptions["WSCYSD"]
+ })
+ }else if(item.attrField === 'SYCXCLASS'){
+ return Object.assign({}, item, {
+ options: this.allSelectOptions["ENERGYTYPES"]
+ })
+ }else if(item.attrField === 'NYLX'){
+ return Object.assign({}, item, {
+ options: this.allSelectOptions["NYLXCLASS"]
+ })
+ }else if(item.attrField === 'SYCPX'){
+ return Object.assign({}, item, {
+ options: this.allSelectOptions["SYCPXCLASS"]
+ })
+ }else if(item.attrField === 'SYRZ'){
+ return Object.assign({}, item, {
+ options: this.allSelectOptions["SYRZCLASS"]
+ })
+ }else if(item.attrField === 'ZRBM'){
+ return Object.assign({}, item, {
+ options: this.allSelectOptions["ZRBMCLASS"]
+ })
+ }else if(item.attrField === 'ZRGCS'){
+ return Object.assign({}, item, {
+ options: this.allSelectOptions["ZRGCSCLASS"]
+ })
+ }else if(item.attrField === 'TXLB'){
+ return Object.assign({}, item, {
+ options: this.allSelectOptions["TXLBCLASS"]
+ })
+ }else {
+ return Object.assign({}, item, {
+ options: this.allSelectOptions[item.selVal]
+ })
+ }
} else {
return item
}
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index c6b2707c8..37267af2f 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -48,6 +48,12 @@
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
+
+
-
+
+
@@ -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();
},
/**
diff --git a/src/router/index.js b/src/router/index.js
index a5808bd79..40b714995 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2066,10 +2066,8 @@ router.onError((error) => {
})
router.beforeEach((to, from, next) => {
- console.log(111);
let toName = to.name
let token = store.state.token
- console.log(toName);
// 返回值为登录状态
if ((token === null || token === '') && (toName !== 'Login' && to.meta.requireAuth)) {
return next('/Login')