From 426db6f6ad22dd1ce5b2bbe6de75f7042995a49c Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Mon, 11 Apr 2022 15:56:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB=E4=B8=8B=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E9=A1=B5=E7=A0=81=EF=BC=8C=E4=BC=9A=E6=8A=8A=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=E6=89=80=E6=9C=89=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=B1=95=E7=A4=BA=E5=87=BA=E6=9D=A5=EF=BC=88=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E6=A0=87=E5=87=86=E5=BA=93=E4=B9=9F=E8=BF=99=E6=A0=B7?= =?UTF-8?q?=E3=80=81=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E9=87=8C=E7=9A=84?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=E4=B9=9F=E8=BF=99=E6=A0=B7?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 31 ++++++++++++++++--- .../localProductsOrProjectLibrary/index.vue | 17 ++++++++-- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 62fa258af..7f2d602f4 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -1812,6 +1812,8 @@ export default { }, data() { return { + seniorQuery: false, // 是否为高级查询 + seniorQueryForm: {}, // 人员树形和部门树形参数 nodeList: [], nodeList2: [], @@ -3146,6 +3148,13 @@ export default { }, // 点击搜索按钮 searchBtnClick() { + if (this.seniorQuery === true) { + this.standCommonlySearch.page = 1 + this.seniorQuery = false + } + for (let key in this.sarStandardsSearch) { + this.sarStandardsSearch[key] = '' + } this.getDomesticStandardTable() }, // 搜索 @@ -3190,6 +3199,8 @@ export default { item.page = 1 this.standCommonlySearch.page = 1 this.standCommonlySearch.sarStandardsSearch = JSON.stringify(item) || '' + this.seniorQuery = true + this.seniorQueryForm = item this.getDomesticStandardTable(item) }, // 清空搜索框 @@ -3883,13 +3894,23 @@ export default { // 分页点击后方法 pageChange(page) { this.standCommonlySearch.page = page - this.getDomesticStandardTable() + if (this.seniorQuery === false) { + this.getDomesticStandardTable() + } else { + this.seniorQueryForm.page = page + this.getDomesticStandardTable(this.seniorQueryForm) + } }, // 分页每页显示数改变后方法 pageSizeChange(pageSize) { this.standCommonlySearch.pageSize = pageSize this.standCommonlySearch.page = 1 - this.getDomesticStandardTable() + if (this.seniorQuery === false) { + this.getDomesticStandardTable() + } else { + this.seniorQueryForm.page = page + this.getDomesticStandardTable(this.seniorQueryForm) + } }, /** * // 分页查询标准 @@ -4031,9 +4052,9 @@ export default { this.advanceSearchMapping[key] = '' } //情况基本字段 - for (let key in this.sarStandardsSearch) { - this.sarStandardsSearch[key] = '' - } + // for (let key in this.sarStandardsSearch) { + // this.sarStandardsSearch[key] = '' + // } }, // 查询处于游离态的标准 selectConfiguraStand() { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 9bdd9ccad..7dd6c03b5 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -932,6 +932,7 @@ export default { }, // 切换tabs handleClick(tab, event) { + this.page = 1 this.localProEO.prodectCode = this.ifMaintaince; this.insideHandleClick(); }, @@ -1203,8 +1204,9 @@ export default { }, // 条件分页查询 getLocalProductTableBtn() { + this.page = 1 this.projectLibrarySearch.page = 1; - this.isAdvancedSearch = false; + this.isAdvancedSearch = true; this.getLocalProductTable(); }, // 查询本地产品 @@ -1236,6 +1238,7 @@ export default { }, getLocalProductTableBtns() { + this.page = 1 this.projectLibrarySearch.page = 1; this.isAdvancedSearch = false; this.getLocalProductTables(); @@ -1415,12 +1418,20 @@ export default { // 分页点击后方法 pageChange(page) { this.page = page; - this.getLocalProductTable(); + if (this.isAdvancedSearch = true) { + this.getLocalProductTable() + } else { + this.getLocalProductTables() + } }, // 分页每页显示数改变后方法 pageSizeChange(pageSize) { this.pageSize = pageSize; - this.getLocalProductTable(); + if (this.isAdvancedSearch = true) { + this.getLocalProductTable() + } else { + this.getLocalProductTables() + } // 此处需要调用接口，修改个人配置 }, /** From 69d69a88fca954aea8dce184f22ae94c06470fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 11 Apr 2022 16:00:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?52537=20=E3=80=90=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E3=80=91=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E6=B5=81=E7=A8=8B=20=E7=82=B9=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=B2=A1=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step7.vue | 2 +- .../pages/phone/bzzqyj/step4-2.vue | 7 +- .../pages/phone/bzzqyj/step6.vue | 297 ++++++++---------- .../pages/phone/bzzqyj/step7.vue | 179 +++++------ .../pages/phone/bzzqyj/step8.vue | 176 +++++------ .../pages/phone/bzzqyj/step9.vue | 43 +-- 6 files changed, 285 insertions(+), 419 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 740498b71..dbd5afef8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -502,7 +502,7 @@ export default { this.oldData = JSON.parse(JSON.stringify(newArr)) let arr = [] newArr.forEach(item => { - if (item.state != '3') { + if (item.state !== '3') { arr.push(item) } }) diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue index bcd02a2e5..9ce738a76 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue @@ -10,7 +10,7 @@
审批历史
-
+
+ width="70px"> + width="180px"> 审批历史
-
+
+ width="70px"> import { Dialog } from 'vant'; + import isMobile from "@/store/isMobile"; import ProcessHeaderPhone from '../../components/ProcessHeaderPhone' import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; @@ -209,56 +208,57 @@ export default { name: "phoneBzdyStep6", - data() { - return { - data2: [], - itermsConditionsFlag: false, - itermsConditionsTitle: '', - drawerModal: false, - histortData: [], - oldData: [], - data: [], - commentText6: "", - oldText: "", - newText: "", - reason: "", - taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId, - roleRow: {}, - nodeList: [], - type: "", - defaultProps: { - children: "children", - label: "name" - }, - treeData: [], // 人员数据 - modalshowflag: false, // drawer开关 - drawerTitle: "", //drawer标题 - textarea: "", // 意见 - ListModel: false, // 新增编辑抽屉开关 - active: "1", // 默认显示 - isSubmit: false, - saveLoading: false, - form: { - cid: "", // 编号 - endTime: "", // 结束日期 - cname: "", // 名称 - fjList: [], - fjListId: '', - textType: '', - modelList: [], - modelNameList: '', - user7: '', - user7Name: '', - }, - formRules: { - responUserList: [ - {required: true, message: "请选择责任人", trigger: "change"} - ] - }, - json: {} - }; - }, + data() { + return { + data2: [], + commentText6: '', + itermsConditionsFlag: false, + itermsConditionsTitle: '', + drawerModal: false, + histortData: [], + oldData: [], + data: [], + commentText: "", + oldText: "", + newText: "", + reason: "", + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId, + roleRow: {}, + nodeList: [], + type: "", + defaultProps: { + children: "children", + label: "name" + }, + treeData: [], // 人员数据 + modalshowflag: false, // drawer开关 + drawerTitle: "", //drawer标题 + textarea: "", // 意见 + ListModel: false, // 新增编辑抽屉开关 + active: "1", // 默认显示 + isSubmit: false, + saveLoading: false, + form: { + cid: "", // 编号 + endTime: "", // 结束日期 + cname: "", // 名称 + fjList: [], + fjListId: '', + textType: '', + modelList: [], + modelNameList: '', + user7: '', + user7Name: '' + }, + formRules: { + user7: [ + {required: true, message: "请选择审批领导", trigger: "change"} + ] + }, + json: {} + }; + }, components: { [Dialog.Component.name]: Dialog.Component, ProcessHeaderPhone, @@ -368,122 +368,89 @@ } }, upload(row, title) { - if (row.length > 0) { - var params = { - columnName: { - chapterNumber: "章条编号", - chapterName: "章节名称", - commentText: "修改意见内容（包括理由或依据）", - oldText: "修改前", - newText: "修改后", - reason: "修改理由", - department: "提出部门", - responUserName: "提出人", - stateText: "处理意见", - cause: "原因", - }, - 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 => { - }); - } else { - this.$message.warning('无上报数据') - } + this.$message.warning('手机端不支持该操作') }, handleTabs(name) { this.active = name; }, - handleSubmit() { - this.$refs['bzzqyjForm'].validate((valid) => { - if (valid) { - this.isSubmit = true; - var json = this.json; - json.hqFlag = '0'; - json.commentText = this.commentText6; - json.user7 = this.form.user7; - json.user7Name = this.form.user7Name; - this.$http.post("lawss/activiti/completeTask", { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success("提交成功"); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }); - } else { - this.$message.warning('请选择审批领导') - } - }) - }, - handleSubmitNo() { - if (this.commentText6) { - this.isSubmit = true; - var json = this.json; - json.hqFlag = '1'; - json.commentText = this.commentText6; - this.$http.post("lawss/activiti/completeTask", { - json: JSON.stringify(json), - taskIds: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success("驳回成功"); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }); - } else { - this.$message.warning("请输入反馈意见"); - } - }, - getData() { - return new Promise((resolve, reject) => { - inboundLiaisonDetail({ - taskIds: this.taskIds, - pId: this.pId - }).then(res => { - let data = JSON.parse(res.mesg); - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } - this.commentText6 = data.commentText6 || '' - this.form.cid = data.cid || data.form.cid; - this.form.endTime = data.endTime || data.form.endTime; - this.form.cname = data.cname || data.form.cname; - let newArr = data.info ? data.info : data.form.data - this.oldData = JSON.parse(JSON.stringify(newArr)) - let arr = [] - newArr.forEach(item => { - if (item.state != '3') { - arr.push(item) - } - }) - this.json = data - this.data2 = newArr - this.data = arr - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList - }).catch(e => { - }); + handleSubmit() { + this.$refs['bzzqyjForm'].validate((valid) => { + if (valid) { + this.isSubmit = true; + var json = this.json; + json.hqFlag = '0'; + json.commentText = this.commentText6; + json.user7 = this.form.user7; + json.user7Name = this.form.user7Name; + this.$http.post("lawss/activiti/completeTask", { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success("提交成功"); + this.$router.push("/processCenter"); + } + this.isSubmit = false; }); + } else { + this.$message.warning('请选择审批领导') + } + }) + }, + handleSubmitNo() { + if (this.commentText6) { + this.isSubmit = true; + var json = this.json; + json.hqFlag = '1'; + json.commentText = this.commentText6; + this.$http.post("lawss/activiti/completeTask", { + json: JSON.stringify(json), + taskIds: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success("驳回成功"); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }); + } else { + this.$message.warning("请输入反馈意见"); } + }, + getData() { + return new Promise((resolve, reject) => { + inboundLiaisonDetail({ + taskIds: this.taskIds, + pId: this.pId + }).then(res => { + let data = JSON.parse(res.mesg); + this.commentText6 = data.commentText6 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName + this.form.fjList = data.fjList || data.form.fjList + this.form.cid = data.cid || data.form.cid; + this.form.endTime = data.endTime || data.form.endTime; + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.user7 = data.form ? data.form.user7 : (data.user7 ? data.user7 : '') + this.form.user7Name = data.form ? data.form.user7Name : (data.user7Name ? data.user7Name : '') + let newArr = data.info ? data.info : data.form.data + this.oldData = JSON.parse(JSON.stringify(newArr)) + let arr = [] + newArr.forEach(item => { + if (item.state !== '3') { + arr.push(item) + } + }) + this.json = data + this.data2 = newArr + this.data = arr + }).catch(e => { + }); + }); + } }, mounted() { this.getHistoryData(); diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue index e49f79f2b..a8733236b 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue @@ -10,7 +10,7 @@
审批历史
-
+
+ width="70px"> 0) { - var params = { - columnName: { - chapterNumber: "章条编号", - chapterName: "章节名称", - commentText: "修改意见内容（包括理由或依据）", - oldText: "修改前", - newText: "修改后", - reason: "修改理由", - department: "提出部门", - responUserName: "提出人", - stateText: "处理意见", - cause: "原因", - }, - 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 => { - }); - } else { - this.$message.warning('无上报数据') - } - }, + upload(row, title) { + this.$message.warning('手机端不支持该操作') + }, handleTabs(name) { this.active = name; }, - handleSubmit() { - this.isSubmit = true - var json = this.json - json.bdFlag = '0' - json.commentText = this.commentText7 - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('提交成功') - this.$router.push('/processCenter') - } - this.isSubmit = false - }) - }, - handleSubmitNo() { - if (this.commentText7) { - this.isSubmit = true - var json = this.json - json.bdFlag = '1' - json.commentText = this.commentText7 - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskIds: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('驳回成功') - this.$router.push('/processCenter') - } - this.isSubmit = false - }) - } else { - this.$message.warning('请输入反馈意见') + handleSubmit() { + this.isSubmit = true + var json = this.json + json.bdFlag = '0' + json.commentText = this.commentText7 + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') + } + this.isSubmit = false + }) + }, + handleSubmitNo() { + if (this.commentText7) { + this.isSubmit = true + var json = this.json + json.bdFlag = '1' + json.commentText = this.commentText7 + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskIds: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('驳回成功') + this.$router.push('/processCenter') } - }, - getData() { - return new Promise((resolve, reject) => { - inboundLiaisonDetail({ - taskIds: this.taskIds, - pId: this.pId - }).then(res => { - let data = JSON.parse(res.mesg); - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } - this.commentText7 = data.commentText7 || '' - this.form.cid = data.cid || data.form.cid; - this.form.endTime = data.endTime || data.form.endTime; - this.form.cname = data.cname || data.form.cname; - this.oldData = JSON.parse(JSON.stringify(data.info)) - var arr = [] - data.info.forEach(item => { - if (item.state != '3') { - arr.push(item) - } - }) - this.json = data - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList - this.data = arr - }).catch(e => { - }); - }); + this.isSubmit = false + }) + } else { + this.$message.warning('请输入反馈意见') } + }, + getData() { + return new Promise((resolve, reject) => { + inboundLiaisonDetail({ + taskIds: this.taskIds, + pId: this.pId + }).then(res => { + let data = JSON.parse(res.mesg) + this.commentText7 = data.commentText7 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName + this.form.fjList = data.fjList || data.form.fjList + this.form.cid = data.cid || data.form.cid; + this.form.endTime = data.endTime || data.form.endTime; + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + let newArr = data.info ? data.info : data.form.data + this.oldData = JSON.parse(JSON.stringify(newArr)) + let arr = [] + newArr.forEach(item => { + if (item.state !== '3') { + arr.push(item) + } + }) + this.json = data + this.data2 = newArr + this.data = arr + }).catch(e => { + }) + }) + }, }, mounted() { this.getHistoryData(); diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue index adfbfff54..83dae7ecd 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue @@ -3,14 +3,14 @@ - +
基础信息
审批历史
-
+
+ width="70px"> 0) { - var params = { - columnName: { - chapterNumber: "章条编号", - chapterName: "章节名称", - commentText: "修改意见内容（包括理由或依据）", - oldText: "修改前", - newText: "修改后", - reason: "修改理由", - department: "提出部门", - responUserName: "提出人", - stateText: "处理意见", - cause: "原因", - }, - 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 => { - }); - } else { - this.$message.warning('无上报数据') - } + this.$message.warning('手机端不支持该操作') }, handleTabs(name) { this.active = name; }, handleSave() { }, - handleSubmit() { - this.isSubmit = true - var json = this.json - json.directorFlag = '0' - json.commentText = this.commentText8 - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('提交成功') - this.$router.push('/processCenter') - } - this.isSubmit = false - }) - }, - handleSubmitNo() { - if (this.commentText8) { - this.isSubmit = true - var json = this.json - json.directorFlag = '1' - json.commentText = this.commentText8 - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskIds: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('驳回成功') - this.$router.push('/processCenter') - } - this.isSubmit = false - }) - } else { - this.$message.warning('请输入反馈意见') + handleSubmit() { + this.isSubmit = true + var json = this.json + json.directorFlag = '0' + json.commentText = this.commentText8 + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') + } + this.isSubmit = false + }) + }, + handleSubmitNo() { + if (this.commentText8) { + this.isSubmit = true + var json = this.json + json.directorFlag = '1' + json.commentText = this.commentText8 + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskIds: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('驳回成功') + this.$router.push('/processCenter') } - }, - getData() { - return new Promise((resolve, reject) => { - inboundLiaisonDetail({ - taskIds: this.taskIds, - pId: this.pId - }).then(res => { - let data = JSON.parse(res.mesg); - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } - this.form.cid = data.cid || data.form.cid; - this.form.endTime = data.endTime || data.form.endTime; - this.form.cname = data.cname || data.form.cname; - this.oldData = JSON.parse(JSON.stringify(data.info)) - var arr = [] - this.commentText8 = data.commentText8 || '' - data.info.forEach(item => { - if (item.state != '3') { - arr.push(item) - } - }) - this.json = data - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList - this.data = arr - }).catch(e => { - }); - }); + this.isSubmit = false + }) + } else { + this.$message.warning('请输入反馈意见') } + }, + getData() { + return new Promise((resolve, reject) => { + inboundLiaisonDetail({ + taskIds: this.taskIds, + pId: this.pId + }).then(res => { + let data = JSON.parse(res.mesg) + this.commentText8 = data.commentText8 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName + this.form.fjList = data.fjList || data.form.fjList + this.form.cid = data.cid || data.form.cid; + this.form.endTime = data.endTime || data.form.endTime; + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + let newArr = data.info ? data.info : data.form.data + this.oldData = JSON.parse(JSON.stringify(newArr)) + let arr = [] + newArr.forEach(item => { + if (item.state !== '3') { + arr.push(item) + } + }) + this.json = data + this.data2 = newArr + this.data = arr + }).catch(e => { + }) + }) + }, }, mounted() { this.getHistoryData(); diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue index ce22c9357..f324f0822 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue @@ -10,7 +10,7 @@
审批历史
-
+
+ width="70px"> 0) { - var params = { - columnName: { - chapterNumber: "章条编号", - chapterName: "章节名称", - commentText: "修改意见内容（包括理由或依据）", - oldText: "修改前", - newText: "修改后", - reason: "修改理由", - department: "提出部门", - responUserName: "提出人", - stateText: "处理意见", - cause: "原因", - }, - 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 => { - }); - } else { - this.$message.warning('无上报数据') - } - }, + upload(row, title) { + this.$message.warning('手机端不支持该操作') + }, handleTabs(name) { this.active = name; }, From 68e167e000651756dbb9efe54176369219ff7a44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 11 Apr 2022 16:03:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?52486=20=E3=80=90=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E3=80=91=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95=E5=8F=91?= =?UTF-8?q?=E5=B8=83/=E6=9B=B4=E6=96=B0=E6=B5=81=E7=A8=8B=20=E4=BC=9A?= =?UTF-8?q?=E7=AD=BE=E8=8A=82=E7=82=B9=E4=B8=8D=E8=A6=81=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/phone/bzqdfb/step2.vue | 541 ------------------ src/router/index.js | 10 - 2 files changed, 551 deletions(-) delete mode 100644 src/pages/processCenter/pages/phone/bzqdfb/step2.vue diff --git a/src/pages/processCenter/pages/phone/bzqdfb/step2.vue b/src/pages/processCenter/pages/phone/bzqdfb/step2.vue deleted file mode 100644 index b05d708bf..000000000 --- a/src/pages/processCenter/pages/phone/bzqdfb/step2.vue +++ /dev/null @@ -1,541 +0,0 @@ - - - - - - - diff --git a/src/router/index.js b/src/router/index.js index e061fc802..0bd717c52 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2423,16 +2423,6 @@ const routes = [ title: '标准清单发布/更新流程' } }, - { - path: '/phoneBzqdfbStep2', - name: 'phoneBzqdfbStep2', - component: () => import('@/pages/processCenter/pages/phone/bzqdfb/step2.vue'), - meta: { - isBoolean: true, - requireAuth: true, - title: '标准清单发布/更新流程' - } - }, { path: '/phoneBzpgStep2', name: 'phoneBzpgStep2', From 10c4f5b7189187776fe4bec52ab36aca432f5eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 11 Apr 2022 16:17:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?52491=20=E3=80=90=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E3=80=91=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95=E5=8F=91?= =?UTF-8?q?=E5=B8=83/=E6=9B=B4=E6=96=B0=E6=B5=81=E7=A8=8B=20=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=90=8D=E7=A7=B0=E3=80=81=E6=B8=85=E5=8D=95=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E5=86=85=E5=AE=B9=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E5=A4=AA=E6=B5=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/phone/bzqdfb/step4.vue | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue index b00a935c0..54fe1bc8c 100644 --- a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue @@ -10,33 +10,19 @@
审批历史
-
+
- - - - - - + +