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-12-24 09:39:07 +08:00
parent cd266ad321 cfec86ba0c
commit c5af6abb74
7 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+3 -3
View File
@@ -470,9 +470,9 @@
this.form.modelList = data.modelList || data.form.modelList
this.form.responUserList = data.form.responUserList
this.form.responUserListName = data.form.responUserListName
this.form.fileName = data.form.fileName || data.fileName || ''
this.form.fileId = data.form.fileId || data.fileId || ''
this.form.dyhz = data.form.dyhz || data.dyhz || ''
this.form.fileName = data.form? data.form.fileName : ''
this.form.fileId = data.form ? data.form.fileId : ''
this.form.dyhz = data.form ? data.form.dyhz : ''
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+5 -5
View File
@@ -374,14 +374,14 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.dyhz = data.dyhz || data.form.dyhz
this.form.dyhz = data.form ? data.form.dyhz : ''
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.file = data.fileId || data.form.fileId
this.form.fileName = data.fileName || data.form.fileName
this.form.fileId = data.fileId || data.form.fileId
this.form.modelList = data.modelList || data.form.modelList
this.form.file = data.form ? data.form.fileId : ''
this.form.fileName = data.form ? data.form.fileName : ''
this.form.fileId = data.form ? data.form.fileId : ''
this.form.modelList = data.form ? data.form.modelList : []
this.form.fjList = data.fjList || data.form.fjList
}).catch(e => {
})
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+12 -12
View File
@@ -478,19 +478,19 @@ export default {
this.listForm.dataList.forEach(item => {
if(item.workPeople !== ''){
this.dataList.push(item)
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
}
})
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
}
})
})
this.listForm.dataList.forEach(item => {
dataChildren.push(item.children)
src/pages/processCenter/pages/phone/bzdy/step4.vue
+5 -5
View File
@@ -315,14 +315,14 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.dyhz = data.dyhz || data.form.dyhz
this.form.dyhz = data.form ? data.form.dyhz : ''
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.file = data.fileId || data.form.fileId
this.form.fileName = data.fileName || data.form.fileName
this.form.fileId = data.fileId || data.form.fileId
this.form.modelList = data.modelList || data.form.modelList
this.form.file = data.form ? data.form.fileId : ''
this.form.fileName = data.form ? data.form.fileName : ''
this.form.fileId = data.form ? data.form.fileId : ''
this.form.modelList = data.form ? data.form.modelList : []
this.form.fjList = data.fjList || data.form.fjList
}).catch(e => {
})
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+3 -7
View File
@@ -1267,7 +1267,6 @@ export default {
},
// 编辑按钮
editTghisRow(row) {
console.log(row);
// 用来储存取消时原来的数据，防止取消时修改
localStorage.setItem("obj", JSON.stringify(row));
@@ -1300,14 +1299,13 @@ export default {
},
// 抽屉提交按钮
saveInfo() {
console.log(this.editRowData);
if (this.editRowData.ssrq !== '') {
if (this.editRowData.ssrq !== '' && this.editRowData.ssrq !== null) {
this.editRowData.ssrq = this.editRowData.ssrq.join(',')
}
if (this.editRowData.xcxssrqgj !== ''){
if (this.editRowData.xcxssrqgj !== '' && this.editRowData.xcxssrqgj !== null){
this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
}
if (this.editRowData.zccssrqgj !== ''){
if (this.editRowData.zccssrqgj !== '' && this.editRowData.zccssrqgj !== null){
this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
}
this.drawerEdit = false
@@ -2127,8 +2125,6 @@ export default {
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
console.log('能源类型',res.data.NYLXCLASS);
console.log('适用车型',res.data.ENERGYTYPES);
this.allSelectOptions = res.data || {}
this.regionOptions = res.data.REGION // 基础信息 区域list
this.applyArcticOptions = res.data.NYLXCLASS // 能源类型