diff --git a/src/App.vue b/src/App.vue index 5ddb7f29c..77b537dbb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -69,34 +69,6 @@
-
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index e5f91a8f5..37d3d434e 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -617,6 +617,7 @@ color: #fff; } .nav-menu /deep/.el-submenu__title i { + font-size: 16px; color: #fff; } .nav-menu{ @@ -642,6 +643,7 @@ } .el-menu-item { + font-size: 16px; span { margin-left: 5px; font-weight: normal; @@ -678,6 +680,7 @@ background-color: red; } /deep/.el-submenu__title { + font-size: 16px; padding: 0 16px !important; span { font-weight: normal; @@ -712,7 +715,7 @@ } .el-menu-item { padding-left: 29px !important; - font-size: 14px; + font-size: 16px; font-weight: normal; height: 40px; line-height: 40px; diff --git a/src/pages/home2/components/navMenu/index.vue b/src/pages/home2/components/navMenu/index.vue index cfe0c4c93..862e81518 100644 --- a/src/pages/home2/components/navMenu/index.vue +++ b/src/pages/home2/components/navMenu/index.vue @@ -77,11 +77,11 @@ height: 40px; line-height: 40px; background: #fff; - font-size: 15px; + font-size: 14px; border-radius: 10px; } .menu-wrap { - height: 240px; + height: 200px; display: flex; flex-wrap: wrap; justify-content: space-between; diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index b3b911791..b774e6e8a 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -1310,7 +1310,7 @@ export default { .to-do-list { margin-right: 10px; border-radius: 3px; - height: calc(~'100% - 310px'); + height: calc(~'100% - 269px'); overflow: hidden; background: #FFFFFF; box-shadow: 1px 1px 10px rgba(0,0,0,0.1); diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue index 22a127dcb..bb26a0be7 100644 --- a/src/pages/home2/index.vue +++ b/src/pages/home2/index.vue @@ -173,7 +173,7 @@ export default { .right_wrapper { display: flex; flex-direction: column; - width: 30vw; + width: 25vw; height: 100%; } .search-condition { diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue index f0e0e31f3..d180f3e1e 100644 --- a/src/pages/localTool/standCalendar/index.vue +++ b/src/pages/localTool/standCalendar/index.vue @@ -33,8 +33,8 @@ - +
@@ -58,7 +58,7 @@ - 会议 + 会议 会议 {{ item.title }} @@ -71,6 +71,9 @@
会议内容 : {{ item.content }}
+
+ 会议地点 : {{ item.place }} +
会议附件 : {{ '-' }} diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 6b0cf9cb0..0e20c6bea 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -562,7 +562,7 @@ this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { + this.$http.post('lawss/activiti/startProcessRollBack', { type: '2' }, {}, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index df4797b8a..bd748eb42 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -559,7 +559,7 @@ export default { this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcessRollBack', { + this.$http.post('lawss/activiti/startProcessRollBack', { id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue index 633899635..669cbd9d2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -22,7 +22,7 @@ v-for="item in rh_pageData.comityOptionsOne" :key="item.id" v-if="item.id === rh_pageData.comityName"> - {{ item.name || '-'}} + {{ item.name || '-' }} @@ -74,7 +74,7 @@ {{ '-' }}
- {{ item.name.slice(0,30) + '...' }} {{ ';' }} + {{ item.name.slice(0, 30) + '...' }} {{ ';' }} {{ item.name }} {{ ';' }} @@ -193,12 +193,10 @@ -
+
- - - - - - - - - - - - - - - - - - - - - - - 上传文件 - - - - + + + + + + + + + + + + + + + + + + + + + + + 上传文件 + + + +
+ +
+ + + + + + + + + + + + + + + + + + +
+ +
+
@@ -269,7 +345,18 @@ export default { pId: this.$route.query.prcId, uploadFileLength: '', - commentText: '' + commentText: '', + roleShowflag: false, + nodeList: [], + // 人员编辑 + editFlag: false, + editForm: { + fillPeople: '', + fillUnit: '', + fillDept: '', + fillTel: '', + fillMail: '', + } } }, computed: { @@ -318,9 +405,55 @@ export default { // this.ch_pageData.comityFileNum = this.fileTextList }) }, - + /** 我司参与人员新增 */ + add_partForm() { + var list = { + fillPeople: this.fillPeople, + fillUnit: this.fillUnit, + fillDept: this.fillDept, + fillTel: this.fillTel, + fillMail: this.fillMail, + } + this.ch_pageData.myPartRole.push(list) + }, + // 编辑框确认按钮 + OkDrawer() { + this.editFlag = false + }, + falseDrawer() { + 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 + }, + /** 入会人员编辑 */ + edit_partForm(row) { + // 用来储存取消时原来的数据,防止取消时修改 + localStorage.setItem('obj', JSON.stringify(row)) + this.fileListData = row + this.editForm = row + this.editFlag = true + }, + // 编辑框选人 + choiceRole(type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.roleShowflag = true + }, + drawerCheck(data) { + if (data.length > 0) { + this.fileListData.fillPeopleId = data[0].id + this.fileListData.fillPeople = data[0].name + } + this.roleShowflag = false + }, /** 批量删除 */ - del_paryForm() { + del_partForm() { if (this.deleteDataList.length < 1) { this.$message.warning("请选择一条数据进行删除"); } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index e32405d1f..87ed68310 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -1181,7 +1181,7 @@ this.$message.warning('请选择责任人') } else { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { + this.$http.post('lawss/activiti/startProcessRollBack', { type: '9' }, {}, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 54a4aa84e..638d5b1bc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -813,7 +813,7 @@ export default { this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { + this.$http.post('lawss/activiti/startProcessRollBack', { type: '3' }, {}, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index a31b13053..0d1532167 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -829,7 +829,7 @@ export default { this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { + this.$http.post('lawss/activiti/startProcessRollBack', { id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 0974ca740..e77ff7e04 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -96,12 +96,12 @@ placeholder="请选择标准发布时间"> - -
- + +
+ @@ -110,7 +110,7 @@
@@ -233,7 +233,7 @@ @@ -370,7 +370,7 @@ export default { this.qbfsForm.releaseTime = this.selectList[0].releaseTime this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') - this.qbfsForm.unit = this.selectList[0].unit + this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.ListModel = false } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 086e2a1a8..33119c5c4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -104,12 +104,12 @@ placeholder="请选择标准发布时间"> - -
- + +
+ @@ -118,7 +118,7 @@
@@ -249,7 +249,7 @@ @@ -391,7 +391,7 @@ export default { this.qbfsForm.releaseTime = this.selectList[0].releaseTime this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') - this.qbfsForm.unit = this.selectList[0].unit + this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.ListModel = false } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 16c197c24..8981da546 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -64,10 +64,10 @@ placeholder="请选择计划标准发布时间"> - - - + + + @@ -133,7 +133,7 @@ export default { qbfsForm: { type: '5', unit: '', // 单位 - unitId: '', + unitName: '', esName: '', // 企标名称 planStatus: '', // 计划状态 reviseStatus: '', // 制修订状态 @@ -222,8 +222,8 @@ export default { idList += item.id nameList += item.name }) - this.$set(this.qbfsForm, 'unitId', idList) - this.$set(this.qbfsForm, 'unit', nameList) + this.$set(this.qbfsForm, 'unit', idList) + this.$set(this.qbfsForm, 'unitName', nameList) if(this.qbfsForm.unit){ this.$refs.qbfsForm.validateField('unit') } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 6da0c9887..23973cf52 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -81,10 +81,10 @@ placeholder="请选择初稿完成时间"> - - - + + + @@ -249,7 +249,7 @@ @@ -330,7 +330,7 @@ export default { esName2: [ {required: true, message: '请选择合并计划企标名称', trigger: 'blur'}, ], - unit: [ + unitName: [ {required: true, message: '请选择起草单位', trigger: 'change'}, ], esName: [ @@ -444,8 +444,8 @@ export default { idList += item.id nameList += item.name }) - this.$set(this.qbfsForm, 'unitId', idList) - this.$set(this.qbfsForm, 'unit', nameList) + this.$set(this.qbfsForm, 'unit', idList) + this.$set(this.qbfsForm, 'unitName', nameList) if(this.qbfsForm.unit){ this.$refs.qbfsForm.validateField('unit') } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index fda02ac8a..97a49d619 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -95,12 +95,12 @@ placeholder="请选择标准发布时间"> - -
- + +
+ @@ -109,7 +109,7 @@
@@ -240,7 +240,7 @@ @@ -379,7 +379,7 @@ export default { this.qbfsForm.releaseTime = this.selectList[0].releaseTime this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') - this.qbfsForm.unit = this.selectList[0].unit + this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.ListModel = false } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue index 7ccb9ed36..7ac67bbd9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue @@ -75,10 +75,10 @@ placeholder="请选择计划标准发布时间"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index 9ef124af9..5be9a3a1f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -75,10 +75,10 @@ placeholder="请选择计划标准发布时间"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index c749e3dfa..94cd454fb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -75,10 +75,10 @@ placeholder="请选择计划标准发布时间"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index ebcd79a4d..944f67249 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -75,10 +75,10 @@ placeholder="请选择计划标准发布时间"> - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 38eb4ec00..6978aa1c0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -75,10 +75,10 @@ placeholder="请选择计划标准发布时间"> - + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 07ebb1d69..d381a84b2 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -53,7 +53,7 @@ - +