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:
super_liu
2021-12-28 17:50:45 +08:00
parent 6f6c28151e f9e8abe014
commit 07fbb8d06a
6 changed files with 117 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standCalendar/index.vue
+34 -11
View File
@@ -103,10 +103,10 @@
<!-- 会议编辑抽屉 --> <!-- 会议编辑抽屉 -->
<el-drawer <el-drawer
title="编辑人员信息" title="编辑会议信息"
:visible.sync="meetFlag" :visible.sync="meetFlag"
:before-close="falseDrawer" :before-close="falseDrawer"
size="600px" size="800px"
> >
<div class="content_form" style="height: calc(100% - 20px);overflow-y: auto"> <div class="content_form" style="height: calc(100% - 20px);overflow-y: auto">
<el-form class="label-input-form" ref="editMeetForm" :model="editMeetForm" label-width="80px"> <el-form class="label-input-form" ref="editMeetForm" :model="editMeetForm" label-width="80px">
@@ -241,9 +241,9 @@
<!-- 编辑框内的人员的table上的编辑 --> <!-- 编辑框内的人员的table上的编辑 -->
<el-drawer <el-drawer
title="编辑人员信息" :title="dialogTitle"
:visible.sync="editFlag" :visible.sync="editFlag"
size="500px" size="600px"
:before-close="falseDrawerTab" :before-close="falseDrawerTab"
custom-class="demo-drawer" custom-class="demo-drawer"
> >
@@ -339,6 +339,7 @@ export default {
// 议题选中时储存数组 // 议题选中时储存数组
deleteTable: [], deleteTable: [],
loading: false, loading: false,
dialogTitle: ''
} }
}, },
mounted() { mounted() {
@@ -619,10 +620,19 @@ export default {
fillFile: this.fillFile = [] fillFile: this.fillFile = []
} }
this.editMeetForm.attend.push(list) this.editMeetForm.attend.push(list)
this.dialogTitle = '新增人员信息'
this.add_partDialog(list)
}, },
add_partDialog(row) {
// 用来储存取消时原来的数据，防止取消时修改
localStorage.setItem('obj', JSON.stringify(row))
this.editForm = row
this.editFlag = true
},
// 编辑按钮 // 编辑按钮
edit_partForm(row) { edit_partForm(row) {
this.dialogTitle = '编辑人员信息'
// 用来储存取消时原来的数据，防止取消时修改 // 用来储存取消时原来的数据，防止取消时修改
localStorage.setItem('obj', JSON.stringify(row)) localStorage.setItem('obj', JSON.stringify(row))
this.editForm = row this.editForm = row
@@ -679,13 +689,26 @@ export default {
this.editFlag = false this.editFlag = false
}, },
falseDrawerTab() { falseDrawerTab() {
let Item = JSON.parse(localStorage.getItem('obj')) if (this.dialogTitle = '新增人员信息') {
this.editForm.fillPeopleId = Item.fillPeopleId let Items = JSON.parse(localStorage.getItem('objs'))
this.editForm.fillPeople = Item.fillPeople this.editMeetForm.attend = Items.attend
this.editForm.fillUnit = Item.fillUnit this.editMeetForm.content = Items.content
this.editForm.fillDept = Item.fillDept this.editMeetForm.date = Items.date
this.editForm.fillTel = Item.fillTel this.editMeetForm.files = Items.files
this.editForm.fillMail = Item.fillMail this.editMeetForm.id = Items.id
this.editMeetForm.partPeople = Items.partPeople
this.editMeetForm.place = Items.place
this.editMeetForm.title = Items.title
this.editMeetForm.type = Items.type
} else {
let Item = JSON.parse(localStorage.getItem('obj'))
this.editForm.fillPeopleId = Item.fillPeopleId
this.editForm.fillPeople = Item.fillPeople
this.editForm.fillUnit = Item.fillUnit
this.editForm.fillDept = Item.fillDept
this.editForm.fillTel = Item.fillTel
this.editForm.fillMail = Item.fillMail
}
this.editFlag = false this.editFlag = false
}, },
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
+26 -10
View File
@@ -295,7 +295,7 @@
</div> </div>
</div> </div>
<el-drawer <el-drawer
title="编辑人员信息" :title="isTitle"
:visible.sync="editFlag" :visible.sync="editFlag"
size="500px" size="500px"
> >
@@ -478,6 +478,7 @@ export default {
acceptShow: false, acceptShow: false,
roleShowflag: false, roleShowflag: false,
nodeList: [], nodeList: [],
isTitle: ''
} }
}, },
computed: { computed: {
@@ -539,6 +540,8 @@ export default {
fillFile: this.fillFile = [] fillFile: this.fillFile = []
} }
this.rh_pageData.myPartRole.push(list) this.rh_pageData.myPartRole.push(list)
this.isTitle = '新增人员信息'
this.add_partDialog(list)
}, },
fillFile_up(row) { fillFile_up(row) {
@@ -625,8 +628,17 @@ export default {
handleClose() { handleClose() {
this.upDialog = false this.upDialog = false
}, },
add_partDialog(row) {
// 用来储存取消时原来的数据，防止取消时修改
localStorage.setItem('obj', JSON.stringify(row))
this.fileListData = row
this.reData = this.fileListData.fillFile
this.editForm = row
this.editFlag = true
},
// 编辑按钮 // 编辑按钮
edit_partForm(row) { edit_partForm(row) {
this.isTitle = '编辑人员信息'
// 用来储存取消时原来的数据，防止取消时修改 // 用来储存取消时原来的数据，防止取消时修改
localStorage.setItem('obj', JSON.stringify(row)) localStorage.setItem('obj', JSON.stringify(row))
this.fileListData = row this.fileListData = row
@@ -639,15 +651,19 @@ export default {
this.editFlag = false this.editFlag = false
}, },
falseDrawer() { falseDrawer() {
let Item = JSON.parse(localStorage.getItem('obj')) if (this.isTitle === '新增人员信息') {
this.editForm.fillPeopleId = Item.fillPeopleId this.getData()
this.editForm.fillPeople = Item.fillPeople } else {
this.editForm.fillUnit = Item.fillUnit let Item = JSON.parse(localStorage.getItem('obj'))
this.editForm.fillDept = Item.fillDept this.editForm.fillPeopleId = Item.fillPeopleId
this.editForm.fillPost = Item.fillPost this.editForm.fillPeople = Item.fillPeople
this.editForm.fillTel = Item.fillTel this.editForm.fillUnit = Item.fillUnit
this.editForm.fillMail = Item.fillMail this.editForm.fillDept = Item.fillDept
this.editForm.fillFile = Item.fillFile this.editForm.fillPost = Item.fillPost
this.editForm.fillTel = Item.fillTel
this.editForm.fillMail = Item.fillMail
this.editForm.fillFile = Item.fillFile
}
this.editFlag = false this.editFlag = false
}, },
// 编辑框选人 // 编辑框选人
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+24 -9
View File
@@ -257,7 +257,7 @@
</div> </div>
</div> </div>
<el-drawer <el-drawer
title="编辑人员信息" :title="isTitle"
:visible.sync="editFlag" :visible.sync="editFlag"
size="500px" size="500px"
custom-class="demo-drawer" custom-class="demo-drawer"
@@ -356,7 +356,8 @@ export default {
fillDept: '', fillDept: '',
fillTel: '', fillTel: '',
fillMail: '', fillMail: '',
} },
isTitle: ''
} }
}, },
computed: { computed: {
@@ -416,21 +417,35 @@ export default {
fillMail: this.fillMail, fillMail: this.fillMail,
} }
this.ch_pageData.myPartRole.push(list) this.ch_pageData.myPartRole.push(list)
this.isTitle = '新增人员信息'
this.add_partDialog(list)
}, },
// 编辑框确认按钮 // 编辑框确认按钮
OkDrawer() { OkDrawer() {
this.editFlag = false this.editFlag = false
}, },
falseDrawer() { falseDrawer() {
let Item = JSON.parse(localStorage.getItem('obj')) if (this.isTitle = '新增人员信息') {
this.editForm.fillPeopleId = Item.fillPeopleId this.getData()
this.editForm.fillPeople = Item.fillPeople } else {
this.editForm.fillUnit = Item.fillUnit let Item = JSON.parse(localStorage.getItem('obj'))
this.editForm.fillDept = Item.fillDept this.editForm.fillPeopleId = Item.fillPeopleId
this.editForm.fillTel = Item.fillTel this.editForm.fillPeople = Item.fillPeople
this.editForm.fillMail = Item.fillMail this.editForm.fillUnit = Item.fillUnit
this.editForm.fillDept = Item.fillDept
this.editForm.fillTel = Item.fillTel
this.editForm.fillMail = Item.fillMail
}
this.editFlag = false this.editFlag = false
}, },
add_partDialog(row) {
// 用来储存取消时原来的数据，防止取消时修改
localStorage.setItem('obj', JSON.stringify(row))
this.fileListData = row
this.editForm = row
this.editFlag = true
},
/** 入会人员编辑 */ /** 入会人员编辑 */
edit_partForm(row) { edit_partForm(row) {
// 用来储存取消时原来的数据，防止取消时修改 // 用来储存取消时原来的数据，防止取消时修改
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+26 -26
View File
@@ -170,32 +170,32 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">-->
<el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled"> <!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<el-date-picker <!-- <el-date-picker-->
disabled <!-- disabled-->
v-model="form.ssrqgj" <!-- v-model="form.ssrqgj"-->
type="date" <!-- type="date"-->
placeholder="请选择实施日期(国际)"> <!-- placeholder="请选择实施日期(国际)">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled"> <!-- <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
<el-date-picker <!-- <el-date-picker-->
disabled <!-- disabled-->
v-model="form.xcxssrqgj" <!-- v-model="form.xcxssrqgj"-->
type="date" <!-- type="date"-->
placeholder="请选择新车型实施日期(国家)"> <!-- placeholder="请选择新车型实施日期(国家)">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled"> <!-- <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
<el-date-picker <!-- <el-date-picker-->
disabled <!-- disabled-->
v-model="form.zccssrqgj" <!-- v-model="form.zccssrqgj"-->
type="date" <!-- type="date"-->
placeholder="请选择在产车实施日期(国家)"> <!-- placeholder="请选择在产车实施日期(国家)">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
</div> </div>
<ProcessTitle> <ProcessTitle>
src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+6 -3
View File
@@ -82,7 +82,7 @@
style="display: none;" style="display: none;"
clearable clearable
></el-input> ></el-input>
<el-input v-model="form.bzfgName" placeholder="请选择标准法规工程师分线管理员" @click.native="choiceZRR(form.bzfgId)"></el-input> <el-input disabled v-model="form.bzfgName" placeholder="请选择标准法规工程师分线管理员"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -467,8 +467,11 @@
this.form.textType = data.textType || data.form.textType this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList this.form.modelList = data.modelList || data.form.modelList
this.form.modelNameList = data.modelNameList || data.form.modelNameList this.form.modelNameList = data.modelNameList || data.form.modelNameList
this.form.bzfgId = data.bzfgId || '' console.log(data);
this.form.bzfgName = data.bzfgName || '' this.form.bzfgId = data.startUser
this.form.bzfgName = data.startUserName
// this.form.bzfgId = data.bzfgId || ''
// this.form.bzfgName = data.bzfgName || ''
this.json = data this.json = data
this.data = data.info || data.data this.data = data.info || data.data
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+1 -1
View File
@@ -459,7 +459,7 @@ export default {
newText: '', newText: '',
reason: '', reason: '',
id: id, id: id,
department: this.$store.getters.userInfo.upDeptName, department: this.$store.getters.userInfo.institutionName,
responUserName: this.$store.getters.userInfo.userName, responUserName: this.$store.getters.userInfo.userName,
responUser: this.$store.getters.userInfo.userId responUser: this.$store.getters.userInfo.userId
} }