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:
yanyizhou
2021-10-22 18:00:16 +08:00
parent 9a0e1a82a2 2dce246427
commit 249bc99138
4 changed files with 208 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+72 -72
View File
@@ -2757,69 +2757,74 @@ export default {
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
}, },
// 编辑标准属性 // 编辑标准属性
selectStandardPro(item, state) { selectStandardPro(row, state) {
this.id = item.id this.id = row.id
this.collectId = item.collectId this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: row.id}, {
this.addOrUPdateFlag = 2 _this: this
this.modalshowtitle = '编辑国内标准' }, res => {
this.modalshowflag = true const item = res.data || {}
this.resolveFormFieldList(item.isRelateAccess) this.collectId = item.collectId
this.$nextTick(() => { this.addOrUPdateFlag = 2
Promise.all([this.queryDisplayLocation()]).then((values) => { this.modalshowtitle = '编辑国内标准'
const [displayLocation] = values this.modalshowflag = true
const formFieldList = this.formFieldList this.resolveFormFieldList(item.isRelateAccess)
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) this.$nextTick(() => {
if (this.sarStandardsInfoEO.standSystem) { Promise.all([this.queryDisplayLocation()]).then((values) => {
this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; const [displayLocation] = values
} const formFieldList = this.formFieldList
this.sarStandardsInfoEO.standSort = item.standSort this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') { if (this.sarStandardsInfoEO.standSystem) {
this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.replace(new RegExp(/-/gm), '/') this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
this.sarStandardsInfoEO.putTime = new Date(this.sarStandardsInfoEO.putTime) }
} this.sarStandardsInfoEO.standSort = item.standSort
Object.keys(item.attrInfoMap || {}).forEach((key) => { if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') {
if (item.attrInfoMap[key]) { this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.replace(new RegExp(/-/gm), '/')
this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key]) this.sarStandardsInfoEO.putTime = new Date(this.sarStandardsInfoEO.putTime)
} }
}) Object.keys(item.attrInfoMap || {}).forEach((key) => {
const dynamicFormField = this.sarStandardsInfoEO if (item.attrInfoMap[key]) {
this.sarStandardsInfoEO.EOPSSRQ = this.$moment(this.sarStandardsInfoEO.EOPSSRQ).isValid() ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key])
this.sarStandardsInfoEO['id'] = item.id }
this.standState = JSON.parse(JSON.stringify(this.sarStandardsInfoEO.standState)) })
formFieldList.forEach((field) => { const dynamicFormField = this.sarStandardsInfoEO
displayLocation.forEach((location) => { this.sarStandardsInfoEO.EOPSSRQ = this.$moment(this.sarStandardsInfoEO.EOPSSRQ).isValid() ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ
let value = this.sarStandardsInfoEO[field.attrField] this.sarStandardsInfoEO['id'] = item.id
let valueName = '' this.standState = JSON.parse(JSON.stringify(this.sarStandardsInfoEO.standState))
if (value && field.attrType === 'DATE_PICKER') { formFieldList.forEach((field) => {
value = this.$moment(value).format('YYYY-MM-DD') displayLocation.forEach((location) => {
} let value = this.sarStandardsInfoEO[field.attrField]
if (field.attrField === 'CYCVPPSBM') { let valueName = ''
this.defaultCheckedKeys1 = [value] if (value && field.attrType === 'DATE_PICKER') {
} value = this.$moment(value).format('YYYY-MM-DD')
if (field.attrField === 'KCCVPPSBM') { }
this.defaultCheckedKeys2 = [value] if (field.attrField === 'CYCVPPSBM') {
} this.defaultCheckedKeys1 = [value]
if (field.attrField === 'DYBXH') { }
this.defaultCheckedKeys3 = [value] if (field.attrField === 'KCCVPPSBM') {
} this.defaultCheckedKeys2 = [value]
field['value'] = value }
// 追加用户名称和部门名称和SVPPS名称 if (field.attrField === 'DYBXH') {
// if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') { this.defaultCheckedKeys3 = [value]
// let attrFieldName = field.attrField + 'Name' }
// valueName = dynamicFormField[attrFieldName] field['value'] = value
// } // 追加用户名称和部门名称和SVPPS名称
// field['valueName'] = valueName // if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') {
if (field.showRegionId === location.value) { // let attrFieldName = field.attrField + 'Name'
if (!location.child) { // valueName = dynamicFormField[attrFieldName]
location['child'] = [] // }
} // field['valueName'] = valueName
location['child'].push(field) if (field.showRegionId === location.value) {
} if (!location.child) {
}) location['child'] = []
}) }
this.dynamicFormField = displayLocation location['child'].push(field)
this.loading = false }
}) })
})
this.dynamicFormField = displayLocation
this.loading = false
})
})
}) })
}, },
// 修改过程中，将resId 修改成 attid // 修改过程中，将resId 修改成 attid
@@ -3753,15 +3758,10 @@ export default {
res.data.list[i].cancelCollectBtn = false res.data.list[i].cancelCollectBtn = false
} }
res.data.list[i].isSubmit = false res.data.list[i].isSubmit = false
if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.XCXSSRQ) { res.data.list[i].XCXSSRQ = res.data.list[i].xcxssrq
res.data.list[i].XCXSSRQ = res.data.list[i].attrInfoMap.XCXSSRQ res.data.list[i].ZCCSSRQ = res.data.list[i].zccssrq
} res.data.list[i].SSRQ = res.data.list[i].ssrq
if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) {
res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ
}
if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) {
res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ
}
} }
this.stahndinfoList = res.data.list this.stahndinfoList = res.data.list
this.total = res.data.count this.total = res.data.count
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+67 -62
View File
@@ -2669,71 +2669,76 @@ export default {
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
}, },
// 编辑 // 编辑
selectStandardPro (item, state) { selectStandardPro (row, state) {
this.drawerTitle = '修改企业标准' this.$http.get('lawss/sarBussionessStand/getStandInfoUpdateById', {id: row.id}, {
this.modalshowflag = true _this: this
this.resolveFormFieldList(true) }, res => {
this.$nextTick(() => { const item = res.data || {}
Promise.all([this.queryDisplayLocation()]).then((values) => { this.drawerTitle = '修改企业标准'
const [displayLocation] = values this.modalshowflag = true
const dynamicFormField = this.sarBussionessStandEO this.resolveFormFieldList(true)
const formFieldList = this.formFieldList this.$nextTick(() => {
formFieldList.forEach((field) => { Promise.all([this.queryDisplayLocation()]).then((values) => {
displayLocation.forEach((location) => { const [displayLocation] = values
let value = dynamicFormField[field.attrField] const dynamicFormField = this.sarBussionessStandEO
let valueName = '' const formFieldList = this.formFieldList
if (value && typeof value === 'number') { formFieldList.forEach((field) => {
value = this.$dateFormat(value, 'yyyy-MM-dd') displayLocation.forEach((location) => {
} let value = dynamicFormField[field.attrField]
field['value'] = value let valueName = ''
// 追加用户名称和部门名称 if (value && typeof value === 'number') {
if (field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS') { value = this.$dateFormat(value, 'yyyy-MM-dd')
let attrFieldName = field.attrField + 'Name' }
valueName = dynamicFormField[attrFieldName] field['value'] = value
} // 追加用户名称和部门名称
field['valueName'] = valueName if (field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS') {
if (field.showRegionId === location.value) { let attrFieldName = field.attrField + 'Name'
if (!location.child) { valueName = dynamicFormField[attrFieldName]
location['child'] = [] }
field['valueName'] = valueName
if (field.showRegionId === location.value) {
if (!location.child) {
location['child'] = []
}
location['child'].push(field)
}
})
})
this.dynamicFormField = displayLocation
this.loading = false
})
this.sarBussionessStandEO = JSON.parse(JSON.stringify(item))
this.sarBussionessStandEO["XCSJBUSS"] = this.dateFormatter()
this.standStatus = JSON.parse(JSON.stringify(this.sarBussionessStandEO.standStatus))
let subClass = item.standSubclass
this.sarBussionessStandEO.standSubclass = subClass
if (this.sarBussionessStandEO.issueTime != null && this.sarBussionessStandEO.issueTime !== '') {
this.sarBussionessStandEO.issueTime = new Date(this.sarBussionessStandEO.issueTime)
}
if (this.sarBussionessStandEO.putTime != null && this.sarBussionessStandEO.putTime !== '') {
this.sarBussionessStandEO.putTime = new Date(this.sarBussionessStandEO.putTime)
}
Object.keys(item.attrInfoMap || {}).forEach((key) => {
if (item.attrInfoMap[key]) {
// this.sarStandardsInfoEO[key] = item.attrInfoMap[key]
this.$set(this.sarBussionessStandEO, key, item.attrInfoMap[key])
}
})
this.sarBussionessStandEO['id'] = item.id
if (state === 'show') {
this.formdisableflag = true
} else {
// this.standGeneraSelectChange() // 负责细类初始化
// this.getOrgTreeSource()
this.addOrUPdateFlag = 2
this.formdisableflag = false
this.saveOldNum = item.standCode // 记录修改之前的标准编号
this.saveOldReplaceNum = item.replaceStandNum // 记录修改之前的代替标准编号
// let selectNode = this.getTreeNameByid(this.sarBussionessStandEO.responsibleUnit)
this.sarBussionessStandEO.orgName = item.responsibleUnitShow
} }
location['child'].push(field)
}
}) })
})
this.dynamicFormField = displayLocation
this.loading = false
}) })
this.sarBussionessStandEO = JSON.parse(JSON.stringify(item))
this.sarBussionessStandEO["XCSJBUSS"] = this.dateFormatter()
this.standStatus = JSON.parse(JSON.stringify(this.sarBussionessStandEO.standStatus))
let subClass = item.standSubclass
this.sarBussionessStandEO.standSubclass = subClass
if (this.sarBussionessStandEO.issueTime != null && this.sarBussionessStandEO.issueTime !== '') {
this.sarBussionessStandEO.issueTime = new Date(this.sarBussionessStandEO.issueTime)
}
if (this.sarBussionessStandEO.putTime != null && this.sarBussionessStandEO.putTime !== '') {
this.sarBussionessStandEO.putTime = new Date(this.sarBussionessStandEO.putTime)
}
Object.keys(item.attrInfoMap || {}).forEach((key) => {
if (item.attrInfoMap[key]) {
// this.sarStandardsInfoEO[key] = item.attrInfoMap[key]
this.$set(this.sarBussionessStandEO, key, item.attrInfoMap[key])
}
})
this.sarBussionessStandEO['id'] = item.id
if (state === 'show') {
this.formdisableflag = true
} else {
// this.standGeneraSelectChange() // 负责细类初始化
// this.getOrgTreeSource()
this.addOrUPdateFlag = 2
this.formdisableflag = false
this.saveOldNum = item.standCode // 记录修改之前的标准编号
this.saveOldReplaceNum = item.replaceStandNum // 记录修改之前的代替标准编号
// let selectNode = this.getTreeNameByid(this.sarBussionessStandEO.responsibleUnit)
this.sarBussionessStandEO.orgName = item.responsibleUnitShow
}
})
}, },
// 部门树结构，通过id，查出对应的树节点 // 部门树结构，通过id，查出对应的树节点
getTreeNameByid (treeid) { getTreeNameByid (treeid) {
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+68 -69
View File
@@ -2576,75 +2576,80 @@ export default {
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
}, },
// 编辑标准属性 // 编辑标准属性
selectStandardPro(item, state) { selectStandardPro(row, state) {
// this.sarStandardsInfoEO.country=JSON.parse(item.country ); // this.sarStandardsInfoEO.country=JSON.parse(item.country );
// console.log(this.sarStandardsInfoEO.country); // console.log(this.sarStandardsInfoEO.country);
this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: row.id}, {
this.addOrUPdateFlag = 2 _this: this
this.modalshowtitle = '编辑海外标准' }, res => {
this.modalshowflag = true const item = res.data || {}
this.resolveFormFieldList(item.isRelateAccess) this.addOrUPdateFlag = 2
this.$nextTick(() => { this.modalshowtitle = '编辑海外标准'
Promise.all([this.queryDisplayLocation()]).then((values) => { this.modalshowflag = true
const [displayLocation] = values this.resolveFormFieldList(item.isRelateAccess)
const formFieldList = this.formFieldList this.$nextTick(() => {
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) Promise.all([this.queryDisplayLocation()]).then((values) => {
this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; const [displayLocation] = values
if (item.country !== undefined && item.country !== null && item.country !== '') { const formFieldList = this.formFieldList
this.sarStandardsInfoEO.country = item.country.split(","); this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
} this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
this.sarStandardsInfoEO.standSort = item.standSort if (item.country !== undefined && item.country !== null && item.country !== '') {
if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') { this.sarStandardsInfoEO.country = item.country.split(",");
this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.replace(new RegExp(/-/gm), '/')
this.sarStandardsInfoEO.putTime = new Date(this.sarStandardsInfoEO.putTime)
}
Object.keys(item.attrInfoMap || {}).forEach((key) => {
item.attrInfoMap[key] = item.attrInfoMap[key] === null ? '' : item.attrInfoMap[key]
if (item.attrInfoMap[key] || item.attrInfoMap[key] === '') {
this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key])
} }
}) this.sarStandardsInfoEO.standSort = item.standSort
const dynamicFormField = this.sarStandardsInfoEO if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') {
this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.replace(new RegExp(/-/gm), '/')
this.sarStandardsInfoEO.EOPSSRQ = this.sarStandardsInfoEO.EOPSSRQ !== 'N/A' && this.sarStandardsInfoEO.EOPSSRQ !== 'TBD' ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ this.sarStandardsInfoEO.putTime = new Date(this.sarStandardsInfoEO.putTime)
this.sarStandardsInfoEO['id'] = item.id }
this.standState = JSON.parse(JSON.stringify(this.sarStandardsInfoEO.standState)) Object.keys(item.attrInfoMap || {}).forEach((key) => {
formFieldList.forEach((field) => { item.attrInfoMap[key] = item.attrInfoMap[key] === null ? '' : item.attrInfoMap[key]
displayLocation.forEach((location) => { if (item.attrInfoMap[key] || item.attrInfoMap[key] === '') {
let value = dynamicFormField[field.attrField] this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key])
let valueName = ''
if (value && field.attrType === 'DATE_PICKER') {
value = this.$moment(value).format('YYYY-MM-DD')
}
if (field.attrField === 'CYCVPPSBM') {
this.defaultCheckedKeys1 = [value]
}
if (field.attrField === 'KCCVPPSBM') {
this.defaultCheckedKeys2 = [value]
}
if (field.attrField === 'DYBXH') {
this.defaultCheckedKeys3 = [value]
}
field['value'] = value
// 追加用户名称和部门名称
if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') {
let attrFieldName = field.attrField + 'Name'
valueName = dynamicFormField[attrFieldName]
}
field['valueName'] = valueName
if (field.showRegionId === location.value) {
if (!location.child) {
location['child'] = []
}
location['child'].push(field)
} }
}) })
const dynamicFormField = this.sarStandardsInfoEO
this.sarStandardsInfoEO.EOPSSRQ = this.sarStandardsInfoEO.EOPSSRQ !== 'N/A' && this.sarStandardsInfoEO.EOPSSRQ !== 'TBD' ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ
this.sarStandardsInfoEO['id'] = item.id
this.standState = JSON.parse(JSON.stringify(this.sarStandardsInfoEO.standState))
formFieldList.forEach((field) => {
displayLocation.forEach((location) => {
let value = dynamicFormField[field.attrField]
let valueName = ''
if (value && field.attrType === 'DATE_PICKER') {
value = this.$moment(value).format('YYYY-MM-DD')
}
if (field.attrField === 'CYCVPPSBM') {
this.defaultCheckedKeys1 = [value]
}
if (field.attrField === 'KCCVPPSBM') {
this.defaultCheckedKeys2 = [value]
}
if (field.attrField === 'DYBXH') {
this.defaultCheckedKeys3 = [value]
}
field['value'] = value
// 追加用户名称和部门名称
if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') {
let attrFieldName = field.attrField + 'Name'
valueName = dynamicFormField[attrFieldName]
}
field['valueName'] = valueName
if (field.showRegionId === location.value) {
if (!location.child) {
location['child'] = []
}
location['child'].push(field)
}
})
})
this.dynamicFormField = displayLocation
this.loading = false
}) })
this.dynamicFormField = displayLocation
this.loading = false
}) })
}) })
}, },
// 查询二级菜单 // 查询二级菜单
selectChildMenu(row) { selectChildMenu(row) {
@@ -3526,15 +3531,9 @@ export default {
res.data.list[i].cancelCollectBtn = false res.data.list[i].cancelCollectBtn = false
} }
res.data.list[i].isSubmit = false res.data.list[i].isSubmit = false
if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.XCXSSRQ) { res.data.list[i].XCXSSRQ = res.data.list[i].xcxssrq
res.data.list[i].XCXSSRQ = res.data.list[i].attrInfoMap.XCXSSRQ.split(',')[0] res.data.list[i].ZCCSSRQ = res.data.list[i].zccssrq
} res.data.list[i].SSRQ = res.data.list[i].ssrq
if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) {
res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ.split(',')[0]
}
if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) {
res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ
}
} }
this.stahndinfoList = res.data.list this.stahndinfoList = res.data.list
this.total = res.data.count this.total = res.data.count
src/sysConfig/index.js
+1 -1
View File
@@ -12,7 +12,7 @@ const devInterfacePORT = '8033'
// 配置 idm 认证 // 配置 idm 认证
const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri=' const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
// 配置 前端服务 // 配置 前端服务
const devWebUrl = 'https://slrs.foton.com.cn/#/' const devWebUrl = 'http://62.234.136.153:8038/#/'
// webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录) // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
const webLoginType = 'dev' const webLoginType = 'dev'
// 云端端口号 // 云端端口号