From 453b6b5bf2efcbf98b0c885a218a898313b77267 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 5 Nov 2021 10:02:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=20-=20=E5=85=B7=E4=BD=93?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/zczqyj/step1.vue | 391 ++++++++++++++++-- .../pages/creatProcess/zczqyj/step2.vue | 37 +- .../pages/creatProcess/zczqyj/step3.vue | 36 +- .../pages/creatProcess/zczqyj/step4.vue | 26 +- .../pages/creatProcess/zczqyj/step5.vue | 172 +++++--- .../pages/creatProcess/zczqyj/step6.vue | 45 +- .../pages/creatProcess/zczqyj/step7.vue | 45 +- .../pages/creatProcess/zczqyj/step8.vue | 45 +- .../pages/creatProcess/zczqyj/step9.vue | 45 +- 9 files changed, 661 insertions(+), 181 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue index 0db56f208..ebb071570 100644 --- a/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue @@ -23,16 +23,23 @@
- +
- 选择征求意见政策 + 选择征求意见政策
+ + + - +

责任对接人

@@ -101,7 +109,8 @@ - +

法规认证工程师

@@ -114,7 +123,8 @@ - +

法规认证部部长

@@ -127,7 +137,8 @@ - +

法规认证部副总监

@@ -172,6 +183,144 @@ @submit="handleSubmit" > + + +
+
+
+ + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + +
+ + 数据获取中 +
+
+
+ + + + + + + + 带入 + + 取消 + +
+
@@ -190,11 +339,34 @@ export default { }, data() { return { + tableHeight: { + standardTableHeight: null + }, + tableData: { + // 标准表格数据 + standardData: [], + // 任务分解单数据 + taskTableData: [] + }, + loadSarStandard: false, + lawsTextStateOptions: [], + standardDrawer: false, + standardSearchForm: { + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + total: 0, + standType: 'INLAND', + standSort: '', + standName: '', + standEnName: '', + standNumber: '' + }, isSubmit: false, active: "1", //默认显示基础信息页面 // 基础信息form表单 form: { - cid: '', // 政策编号 + lawsNumber: '', // 政策编号 + lawsName: "", // 政策名称 endTime: '', // 责任部门领导审批 截止时间 cycleTime: '',//政策征求意见周期 cname: '', // 名称 @@ -205,9 +377,12 @@ export default { fjListId: '' }, formRules: { - cid: [ + lawsNumber: [ {required: true, message: '请输入政策编号', trigger: 'change'}, ], + lawsName: [ + {required: true, message: '请输入政策名称', trigger: 'change'}, + ], endTime: [ {required: true, message: '请选择截止时间', trigger: 'change'}, ], @@ -230,18 +405,18 @@ export default { roleForm: { startUserName: this.$store.getters.userInfo.userName,//发起人 startUser: this.$store.getters.userInfo.userId, - responseDockerId:"",//责任对接人 - responseDockerName:"", - responseUserId:"",//责任人 - responseUserName:"", - lawsProveEngineerId:"",//法规认证工程师 - lawsProveEngineerName:"", - lawsProveMinisterId:"",//法规认证部部长 - lawsProveMinisterName:"", - lawsProveViceChiefId:"",//法规认证部副总监 - lawsProveViceChiefName:"", - lawsProveChiefId:"",//法规认证部总监 - lawsProveChiefName:"", + responseDockerId: "",//责任对接人 + responseDockerName: "", + responseUserId: "",//责任人 + responseUserName: "", + lawsProveEngineerId: "",//法规认证工程师 + lawsProveEngineerName: "", + lawsProveMinisterId: "",//法规认证部部长 + lawsProveMinisterName: "", + lawsProveViceChiefId: "",//法规认证部副总监 + lawsProveViceChiefName: "", + lawsProveChiefId: "",//法规认证部总监 + lawsProveChiefName: "", }, // 角色验证 roleFormRules: { @@ -269,6 +444,134 @@ export default { } }, methods: { + handleProcessStandardNext(status) { + switch (status) { + // 新增 + case 1: + this.selectedList = [] + this.standardCheckedList = [] + this.standardDrawer = false + this.verifySarStandard = true + this.clearFormData(this.form) + break + // 带入 + case 2: + if (this.standardCheckedList.length === 1) { + this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, { + _this: this + }, res => { + if (res && res.data) { + const bringData = res.data + + const json = Object.assign(bringData, bringData.attrInfoMap); + this.form = JSON.parse(JSON.stringify(json)) + this.form.TGRLAWS = JSON.parse(JSON.stringify(json)).TGRLAWS && JSON.parse(JSON.stringify(json)).TGRLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGRLAWS.split(',') : [] + this.form.TGDWLAWS = JSON.parse(JSON.stringify(json)).TGDWLAWS && JSON.parse(JSON.stringify(json)).TGDWLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGDWLAWS.split(',') : [] + this.form.NYLXLAWS = JSON.parse(JSON.stringify(json)).NYLXLAWS && JSON.parse(JSON.stringify(json)).NYLXLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).NYLXLAWS.split(',') : [] + this.form.YYRZLAWS = JSON.parse(JSON.stringify(json)).YYRZLAWS && JSON.parse(JSON.stringify(json)).YYRZLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).YYRZLAWS.split(',') : [] + this.form.ZRBMLAWS = JSON.parse(JSON.stringify(json)).ZRBMLAWS && JSON.parse(JSON.stringify(json)).ZRBMLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRBMLAWS.split(',') : [] + this.form.ZRGCSLAWS = JSON.parse(JSON.stringify(json)).ZRGCSLAWS && JSON.parse(JSON.stringify(json)).ZRGCSLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRGCSLAWS.split(',') : [] + this.form.prcNum = this.prcNum + this.form.prcName = this.prcName + this.form['id'] = bringData.id + this.standardDrawer = false + this.verifySarStandard = true + this.busVsFunc() + this.modelFunc() + this.$forceUpdate() + } + // 遍历对象初始化文件信息 + for (const p in this.form) { + if (typeof (this.form[p]) != "function") { + this.initializeFileList(p, this.form[p]); + } + } + console.log("res", res); + }) + + } else if (this.standardCheckedList.length > 1) { + this.$message.warning('最多可以带入一条政策信息') + } else { + this.$message.warning('请选择要带入的政策信息') + } + break + // 取消 + case 3: + this.selectedList = [] + this.standardCheckedList = [] + this.standardDrawer = false + break + } + }, + handleStandardPageChange(page) { + this.standardSearchForm.page = page + this.handleSearchStandard() + }, + handleStandardPageSizeChange(pageSize) { + this.standardSearchForm.pageSize = pageSize + this.handleSearchStandard() + }, + // 点击查看 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: 'OtherLawsStandDetails', + params: { + id: item.id, + pageType: 'LAWS_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, + standSelectChange(data) { + this.selectedList = [] + for (let i = 0; i < data.length; i++) { + this.selectedList.push(data[i].id) + } + this.standardCheckedList = data + }, + //清空搜索条件 + handleResetSearch() { + this.standardSearchForm.lawsNumber = '' + this.standardSearchForm.lawsName = '' + this.standardSearchForm.standType = 'INLAND' + this.standardSearchForm.standNumber = '' + this.standardSearchForm.standSort = '' + this.standardSearchForm.standName = '' + this.standardSearchForm.standEnName = '' + setTimeout(() => { + this.handleSearchStandard() + }, 100) + }, + /** + * 关闭修订 Drawer 的监听 + * @param done + */ + handleReviseDrawerClose(done) { + done() + }, + getDomesticStandardTable() { + this.loadSarStandard = true + this.$http.get('lawss/sarLawsInfo/page', this.standardSearchForm, {}, res => { + this.loadSarStandard = false + if (res.ok) { + this.tableData.standardData = res.data.list + this.standardSearchForm.total = res.data.count + } + }, e => { + this.loadSarStandard = false + }) + }, + handleSearchStandard() { + this.standardDrawer = true + this.$nextTick(() => { + // 动态设置表格高度 + this.tableHeight.standardTableHeight = $('.standard-table-wrap').height() + window.onresize = () => { + this.tableHeight.standardTableHeight = $('.standard-table-wrap').height() + } + }) + this.getDomesticStandardTable() + }, //基础信息/人员信息 handleTabs(type) { this.active = type; @@ -286,24 +589,19 @@ export default { if (this.type === "responseDockerId") { this.roleForm.responseDockerId = data[0].id; this.roleForm.responseDockerName = data[0].name; - } - else if(this.type === "responseUserId"){ + } else if (this.type === "responseUserId") { this.roleForm.responseUserId = data[0].id; this.roleForm.responseUserName = data[0].name; - } - else if(this.type === "lawsProveEngineerId"){ + } else if (this.type === "lawsProveEngineerId") { this.roleForm.lawsProveEngineerId = data[0].id; this.roleForm.lawsProveEngineerName = data[0].name; - } - else if(this.type === "lawsProveMinisterId"){ + } else if (this.type === "lawsProveMinisterId") { this.roleForm.lawsProveMinisterId = data[0].id; this.roleForm.lawsProveMinisterName = data[0].name; - } - else if(this.type === "lawsProveViceChiefId"){ + } else if (this.type === "lawsProveViceChiefId") { this.roleForm.lawsProveViceChiefId = data[0].id; this.roleForm.lawsProveViceChiefName = data[0].name; - } - else if(this.type === "lawsProveChiefId"){ + } else if (this.type === "lawsProveChiefId") { this.roleForm.lawsProveChiefId = data[0].id; this.roleForm.lawsProveChiefName = data[0].name; } @@ -340,9 +638,10 @@ export default { this.isSubmit = true this.$http.get('lawss/activiti/startProcess', { type: 'laws2' - }, {}, res => { + }, {_this: this}, res => { if (res.ok) { var json = Object.assign(this.form, this.roleForm) + console.log('644',json) json.commentText = this.commentText json.filesId = this.addFjList json.filesName = this.form.fjListName @@ -350,7 +649,7 @@ export default { json: JSON.stringify(json), taskId: res.data, userId: this.$store.getters.userInfo.userId - }, {}, res => { + }, {_this: this}, res => { if (res.success) { this.$message.success('流程发起成功') this.$router.push('/processCenter') @@ -450,5 +749,31 @@ export default { } } } + .standard-content { + height: 100%; + padding: 10px 0 0; + .content { + height: 100%; + display: flex; + flex-direction: column; + padding: 0 10px; + .standard-table-wrap { + flex: auto; + overflow-y: auto; + } + .pagination { + position: static; + /deep/ .pagination-slot { + padding: 0; + } + } + .search-area { + display: flex; + justify-content: left; + background: #FFF; + padding: 10px 10px 0; + } + } + } } diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue index bdac53808..46f002e35 100644 --- a/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue @@ -23,14 +23,22 @@
- + + + + { + responUserAndInstitutionNameMap += "{\"" + item.id + "\":\"" + item.institutionName + "\"}" + ","; + }); + responUserAndInstitutionNameMap = "[" + responUserAndInstitutionNameMap; + responUserAndInstitutionNameMap = responUserAndInstitutionNameMap.substring(0, responUserAndInstitutionNameMap.length - 1) + responUserAndInstitutionNameMap = responUserAndInstitutionNameMap + "]"; + this.form.responUserAndInstitutionNameMap = responUserAndInstitutionNameMap; + console.log('260',this.form.responUserAndInstitutionNameMap) + //用来给后端传选择的责任人和对应的提出部门↑ + data.forEach(item => { if (nameList.length > 0) { nameList += ","; @@ -284,6 +307,8 @@ export default { json.responUserList = this.form.responUserList; json.responUserListName = this.form.responUserListName; json.introduce = false; + //给后端用来判断人的map + json.responUserAndInstitutionNameMap = this.form.responUserAndInstitutionNameMap; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), taskId: this.taskIds, @@ -307,7 +332,9 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.cid = data.cid + console.log('335',data) + this.form.lawsNumber = data.lawsNumber + this.form.lawsName = data.lawsName this.form.endTime = data.endTime this.form.cname = data.cname this.form.fjList = data.fjList diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step3.vue index 3c217e476..222641981 100644 --- a/src/pages/processCenter/pages/creatProcess/zczqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step3.vue @@ -23,14 +23,22 @@
- + + + +
@@ -57,6 +65,7 @@ :data="data" tooltip-effect="dark" border + height="330px" style="width: 100%; flex: auto;" class="drag-table" :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px', @@ -113,11 +122,11 @@ @@ -264,9 +273,11 @@ export default { acceptShow: false, saveLoading: false, form: { - cid: '', // 编号 + lawsNumber: '', // 政策编号 + lawsName: '', // 政策名称 endTime: '', // 结束日期 cname: '', // 名称 + department: '',//提出部门 fjList: [], fjListId: '', }, @@ -364,11 +375,12 @@ export default { commentText: '', oldText: '', newText: '', + changeReason: '', reason: '', + department: '', id: id, responUserName: this.$store.getters.userInfo.userName, responUser: this.$store.getters.userInfo.userId, - department: this.$store.getters.userInfo.orgName } this.data.push(json) }, @@ -439,7 +451,10 @@ export default { json.commentText = this.commentText json.info = this.data json.form = this.form - json.department = this.$store.getters.userInfo.orgName + for (let i = 0; i < json.info.length; i++) { + json.info[i].department = this.form.department + } + this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -475,11 +490,16 @@ export default { } this.form.fjList = data.fjList || data.form.fjList this.form.fjListId = data.fjListId || data.form.fjListId - this.form.cid = data.cid || data.form.cid + this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber + this.form.lawsName = data.lawsName || data.form.lawsName this.form.endTime = data.endTime || data.form.endTime + this.form.department = data.department this.todoId = res.id this.json = data this.data = data.info || data.data || data.form.data || [] + for (let i = 0; i < this.data.length; i++) { + this.data[i].department = data.department + } }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step4.vue index ac2f56863..c695686d0 100644 --- a/src/pages/processCenter/pages/creatProcess/zczqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step4.vue @@ -23,14 +23,22 @@
- + + + +
@@ -82,7 +90,7 @@ label="修改后"> @@ -92,9 +100,6 @@ align="center" label="原因" width="200px"> - - - { this.form = JSON.parse(JSON.stringify(item)); - this.form.cid = item.form.cid + this.form.lawsNumber = item.form.lawsNumber + this.form.lawsName = item.form.lawsName }); }, }, diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step5.vue index 8ec812277..a6d777fda 100644 --- a/src/pages/processCenter/pages/creatProcess/zczqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step5.vue @@ -24,14 +24,22 @@
- + + + +
@@ -39,18 +47,6 @@ - - - - - - - - - - - -
新增 - - - - - - 生成汇总单 - - 生成上报意见 + size="mini">导出Excel + + + + +
+ + + + + + + + + + + @@ -267,6 +294,8 @@ export default { name: "zczqyjStep5", data() { return { + //修订的标志 + changeFlag:false, acceptShow: false, drawerModal: false, histortData: [], @@ -294,7 +323,9 @@ export default { isSubmit: false, saveLoading: false, form: { - cid: "", // 编号 + lawsNumber: '', // 政策编号 + lawsName: '', // 政策名称 + department: '',//提出部门 endTime: "", // 结束日期 cname: "", // 名称 fjList: [], @@ -314,10 +345,33 @@ export default { ProcessTitle }, methods: { - addDelete() { - this.data.splice(1, 1) + changeOpinion() { + this.changeFlag = !this.changeFlag + }, + addDelete(index, row) { + console.log('362',index, row); + this.$confirm('此操作将删除该数据, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.data.splice(index, 1) + this.$message({ + type: 'success', + message: '删除成功!' + }); + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); + console.log('379',this.data) + }, addModal() { + console.log('318',this.form.form.department) + this.changeFlag = true var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); var json = { chapterNumber: '', @@ -325,13 +379,16 @@ export default { commentText: '', oldText: '', newText: '', + changeReason: '', reason: '', + department: this.form.form.department, id: id, responUserName: this.$store.getters.userInfo.userName, responUser: this.$store.getters.userInfo.userId, - department: this.$store.getters.userInfo.orgName + addFlag:true, + // department: this.$store.getters.userInfo.orgName } - this.data.push(json) + this.data.unshift(json) }, handleTransfer() { this.drawerModal = true @@ -389,24 +446,15 @@ export default { commentText: "修改意见内容（包括理由或依据）", oldText: "修改前", newText: "修改后", - reason: "修改理由", + changeReason: "修改理由", + reason:"原因", department: "提出部门", responUserName: "提出人", - stateText: "处理意见" }, dataList: [] }; params.dataList = JSON.parse(JSON.stringify(row)); - params.dataList.forEach(item => { - if (item.state === "1") { - item.stateText = "上报"; - } else if (item.state === "2") { - item.stateText = "处理后上报"; - } else { - item.stateText = "不上报"; - } - }); - this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { + this.$http.downloadFile("/api/policy/activiti/exportExcel", params, title, res => { }); }, handleTabs(name) { @@ -416,12 +464,14 @@ export default { }, handleSubmit() { if (this.data.length < 1) { - this.$message.warning("请输入征求意见搞"); + this.$message.warning("请输入征求意见稿"); } else { this.isSubmit = true; var json = this.json; json.actionFlag = 0; json.commentText = this.commentText; + json.info = this.data + json.form = this.form this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), taskId: this.taskIds, @@ -462,10 +512,19 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { + if (res) { + const processForm = JSON.parse(res.mesg) + this.getFormFieldList(processForm) + } let data = JSON.parse(res.mesg); + this.form.department = data.form.department + console.log(this.form.department,'517') + // 给后端的选人信息 + this.form.responUserAndInstitutionNameMap = data.form.responUserAndInstitutionNameMap this.form.fjList = data.fjList || data.form.fjList this.form.fjListId = data.fjListId || data.form.fjListId - this.form.cid = data.cid || data.form.cid; + this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber + this.form.lawsName = data.lawsName || data.form.lawsName this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; this.oldData = JSON.parse(JSON.stringify(data.info)) @@ -475,13 +534,26 @@ export default { arr.push(item) } }) + // for (let i = 0; i < this.data.length; i++) { + // this.data[i].department = data.department + // } this.json = data this.data = arr this.oldData = data.oldinfo }).catch(e => { }); }); - } + }, + /** + * @description: 动态表单读取 + */ + getFormFieldList(item) { + this.$nextTick(() => { + this.form = JSON.parse(JSON.stringify(item)); + this.form.lawsNumber = item.form.lawsNumber + this.form.lawsName = item.form.lawsName + }); + }, }, mounted() { this.getHistoryData(); diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step6.vue index d7044143a..72d627941 100644 --- a/src/pages/processCenter/pages/creatProcess/zczqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step6.vue @@ -23,12 +23,20 @@
- + + + + @@ -82,7 +90,7 @@ label="修改后"> @@ -92,9 +100,6 @@ align="center" label="原因" width="200px"> - - - - + + + + + + + +
@@ -246,7 +251,8 @@ export default { isSubmit: false, saveLoading: false, form: { - cid: "", // 编号 + lawsNumber: '', // 政策编号 + lawsName: '', // 政策名称 endTime: "", // 结束日期 cname: "", // 名称 fjList: [], @@ -395,7 +401,8 @@ export default { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList this.form.fjListId = data.fjListId || data.form.fjListId - this.form.cid = data.cid || data.form.cid; + this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber + this.form.lawsName = data.lawsName || data.form.lawsName this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; this.oldData = JSON.parse(JSON.stringify(data.info)) diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step7.vue index 65bae92ad..1f9007cdc 100644 --- a/src/pages/processCenter/pages/creatProcess/zczqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step7.vue @@ -23,12 +23,20 @@
- + + + + @@ -82,7 +90,7 @@ label="修改后"> @@ -92,9 +100,6 @@ align="center" label="原因" width="200px"> - - - - + + + + + + + +
@@ -246,7 +251,8 @@ export default { isSubmit: false, saveLoading: false, form: { - cid: "", // 编号 + lawsNumber: '', // 政策编号 + lawsName: '', // 政策名称 endTime: "", // 结束日期 cname: "", // 名称 fjList: [], @@ -395,7 +401,8 @@ export default { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList this.form.fjListId = data.fjListId || data.form.fjListId - this.form.cid = data.cid || data.form.cid; + this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber + this.form.lawsName = data.lawsName || data.form.lawsName this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; this.oldData = JSON.parse(JSON.stringify(data.info)) diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step8.vue index 30ca02bb3..4585e577d 100644 --- a/src/pages/processCenter/pages/creatProcess/zczqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step8.vue @@ -23,12 +23,20 @@
- + + + + @@ -82,7 +90,7 @@ label="修改后"> @@ -92,9 +100,6 @@ align="center" label="原因" width="200px"> - - - - + + + + + + + +
@@ -246,7 +251,8 @@ export default { isSubmit: false, saveLoading: false, form: { - cid: "", // 编号 + lawsNumber: '', // 政策编号 + lawsName: '', // 政策名称 endTime: "", // 结束日期 cname: "", // 名称 fjList: [], @@ -395,7 +401,8 @@ export default { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList this.form.fjListId = data.fjListId || data.form.fjListId - this.form.cid = data.cid || data.form.cid; + this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber + this.form.lawsName = data.lawsName || data.form.lawsName this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; this.oldData = JSON.parse(JSON.stringify(data.info)) diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step9.vue index eaa4dded5..16637a4b6 100644 --- a/src/pages/processCenter/pages/creatProcess/zczqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step9.vue @@ -23,12 +23,20 @@
- + + + + @@ -82,7 +90,7 @@ label="修改后"> @@ -92,9 +100,6 @@ align="center" label="原因" width="200px"> - - - - + + + + + + + +
@@ -246,7 +251,8 @@ export default { isSubmit: false, saveLoading: false, form: { - cid: "", // 编号 + lawsNumber: '', // 政策编号 + lawsName: '', // 政策名称 endTime: "", // 结束日期 cname: "", // 名称 fjList: [], @@ -395,7 +401,8 @@ export default { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList this.form.fjListId = data.fjListId || data.form.fjListId - this.form.cid = data.cid || data.form.cid; + this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber + this.form.lawsName = data.lawsName || data.form.lawsName this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; this.oldData = JSON.parse(JSON.stringify(data.info)) From b8b1792eb5bde82ec31dc2d1879a2bbfda4f9a8d Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 5 Nov 2021 10:52:10 +0800 Subject: [PATCH 2/4] feat: There is no way the,#50742 --- public/static/pdf/web/viewer.js | 2 +- src/pages/details/index.vue | 2 +- .../details/otherStandardDetails/index.vue | 840 +++++++++++------- 3 files changed, 520 insertions(+), 324 deletions(-) diff --git a/public/static/pdf/web/viewer.js b/public/static/pdf/web/viewer.js index 107e87dd3..3c764dc0b 100644 --- a/public/static/pdf/web/viewer.js +++ b/public/static/pdf/web/viewer.js @@ -6655,7 +6655,7 @@ var PDFPageView = function () { watermark_y_space: 180,//水印y轴间隔 watermark_color: 'rgba(192, 192, 192)',//水印字体颜色 watermark_alpha: 0.5,//水印透明度 - watermark_fontsize: '20px',//水印字体大小 + watermark_fontsize: '25px',//水印字体大小 watermark_font: '微软雅黑',//水印字体 watermark_width: 120,//水印宽度 watermark_height: 80,//水印长度 diff --git a/src/pages/details/index.vue b/src/pages/details/index.vue index 4083f31e8..a3fd3b704 100644 --- a/src/pages/details/index.vue +++ b/src/pages/details/index.vue @@ -1,6 +1,6 @@