From 18f2365d0b8a248a034556bc40508fe561b22e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 15 Dec 2021 16:47:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B224?= =?UTF-8?q?=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue | 4 ++-- .../processCenter/pages/creatProcess/qbzxdjhgk/step2.vue | 4 ++-- .../processCenter/pages/creatProcess/qbzxdjhgk/step3.vue | 4 ++-- .../processCenter/pages/creatProcess/qbzxdjhgk/step4.vue | 4 ++-- .../processCenter/pages/creatProcess/qbzxdjhgk/step5.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/wbsm/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/wbsm/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/wbsm/step4.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/wbsm/step5.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step4.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step5.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step6.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step7.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue | 4 ++-- src/pages/processCenter/pages/phone/bzqdfb/step4.vue | 4 ++-- src/pages/processCenter/pages/phone/jrbzhxh/step3.vue | 4 ++-- src/pages/processCenter/pages/phone/jrbzhxh/step4.vue | 4 ++-- src/pages/processCenter/pages/phone/xmpg/step2.vue | 4 ++-- src/pages/processCenter/pages/phone/xmpg/step5.vue | 4 ++-- src/pages/processCenter/pages/phone/xmpg/step6.vue | 4 ++-- 42 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue index 0802b80b5..7ccb9ed36 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue @@ -203,7 +203,7 @@ sortable="custom" align="center"> diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 38d19e256..268900670 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -282,7 +282,7 @@ sortable="custom" align="center"> Date: Wed, 15 Dec 2021 17:13:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B224?= =?UTF-8?q?=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/zczqyj/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/zczqyj/step4.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/zczqyj/step5.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/zczqyj/step6.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/zczqyj/step7.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/zczqyj/step8.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/zczqyj/step9.vue | 4 ++-- .../pages/creatProcess/zdrzbzORzchgxxmsc/step2.vue | 4 ++-- .../pages/creatProcess/zdrzbzORzchgxxmsc/step3.vue | 4 ++-- .../pages/creatProcess/zdrzbzORzchgxxmsc/step4.vue | 4 ++-- .../pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue | 4 ++-- .../pages/creatProcess/zdrzbzORzchgxxmsc/step6.vue | 4 ++-- .../pages/creatProcess/zdrzbzORzchgxxmsc/step7.vue | 4 ++-- .../pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue | 4 ++-- .../pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue | 4 ++-- src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue | 4 ++-- src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue | 4 ++-- src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue | 4 ++-- src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue | 4 ++-- src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue | 4 ++-- src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue | 4 ++-- src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue | 4 ++-- src/pages/processCenter/pages/phone/xmpg/step7.vue | 4 ++-- src/pages/processCenter/pages/phone/xmpg2/step2.vue | 4 ++-- src/pages/processCenter/pages/phone/xmpg2/step7.vue | 4 ++-- src/pages/processCenter/pages/phone/xmqdqr/step5.vue | 4 ++-- src/pages/processCenter/pages/phone/zczqyj/step4.vue | 4 ++-- src/pages/processCenter/pages/phone/zczqyj/step5.vue | 4 ++-- src/pages/processCenter/pages/phone/zczqyj/step6.vue | 4 ++-- src/pages/processCenter/pages/phone/zczqyj/step7.vue | 4 ++-- src/pages/processCenter/pages/phone/zczqyj/step8.vue | 4 ++-- src/pages/processCenter/pages/phone/zczqyj/step9.vue | 4 ++-- 33 files changed, 66 insertions(+), 66 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue index 46f002e35..fe6239fec 100644 --- a/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue @@ -96,7 +96,7 @@ sortable="custom" align="center"> Date: Wed, 15 Dec 2021 17:49:03 +0800 Subject: [PATCH 3/5] commit --- .../pages/creatProcess/bzdy/step1-1.vue | 16 +- .../pages/creatProcess/bzdy/step1.vue | 15 +- .../pages/creatProcess/bzjd/step1-1.vue | 287 ++++++++++-------- .../pages/creatProcess/bzjd/step1.vue | 212 +++++++------ .../pages/creatProcess/bzjd/step2.vue | 68 +---- .../pages/creatProcess/bzjd/step3.vue | 127 ++++---- .../pages/creatProcess/bzjd/step4.vue | 68 +---- .../pages/creatProcess/bzjd/step5.vue | 68 +---- .../pages/creatProcess/bzjd/step6.vue | 68 +---- .../pages/creatProcess/bzzqyj/step1-1.vue | 8 +- .../pages/creatProcess/bzzqyj/step1.vue | 11 +- 11 files changed, 385 insertions(+), 563 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 4478669ad..79dff1783 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -24,7 +24,7 @@
- + { if (res.success) { this.$message.success('流程发起成功') + let taskId = { + id: this.$route.query.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) this.$router.push('/processCenter') } this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 67eba24cf..ae1b8ef08 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -257,12 +257,13 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import { saveTaskFirst } from 'api/process' -import { getBusStandFileByAttId } from 'api/process' +import { getBusStandFileByAttId,taskDel } from 'api/process' export default { name: "bzdyStep1", data() { return { + bpnId: '', foldFormFlag: false, fileMadel2: false, commentText: '', @@ -571,6 +572,14 @@ export default { }, {}, res => { if (res.success) { this.$message.success('流程发起成功') + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push('/processCenter') } this.isSubmit = false @@ -590,7 +599,9 @@ export default { }) } }, - mounted () {}, + mounted () { + this.bpnId = this.$route.query.bpnId + }, } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 02735c0ca..fd96c045c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -1,6 +1,6 @@ @@ -434,11 +421,15 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import { saveTaskFirst, queryTaskFirst } from 'api/process' + import { saveTaskFirst, queryTaskFirst,taskDel } from 'api/process' export default { name: "bzjdStep1-1", data() { return { + listModel3: false, + standInfoList3: [], + spinShow3: false, + selectedList3: [], //折叠的标志,true为折叠,false为不折叠 foldFormFlag: false, itermsConditionsFlag: false, @@ -535,6 +526,51 @@ ProcessTitle }, methods: { + handleSelection3 (data) { + this.selectedList3 = []; + for (let i = 0; i < data.length; i++) { + this.selectedList3.push(data[i].id); + } + }, + getDbList () { + this.$http.get('lawss/sarStandCompareHis/page', { + page: 1, + pageSize: 9999, + newNumOrName: this.form.itemsNum + }, { + _this: this + }, res => { + this.standInfoList3 = res.data.list + console.log(res); + }, e => { + }) + }, + addDbList () { + this.listModel3 = true + }, + closeDrawer3 () { + this.listModel3 = false + }, + enterDrawer3 () { + if (this.selectedList3.length === 1) { + let deposit = new Map(); + this.standInfoList3.forEach(item => { + deposit.set(item.id, item); + }); + let bringData = []; + for (let i = 0; i < this.selectedList3.length; i++) { + bringData.push(deposit.get(this.selectedList3[i])); + } + this.form.itemsNum1 = bringData[0].oldStandNum + this.form.itemsName1 = bringData[0].oldStandName + this.form.oldNumber = bringData[0].oldStandId + this.listModel3 = false + } else if (this.selectedList3.length > 1) { + this.$message.warning("只能选择一条数据进行导入"); + } else { + this.$message.warning("请选择一条数据进行导入"); + } + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag @@ -679,20 +715,14 @@ } this.form.itemsNum = bringData[0].showNumber this.form.itemsName = bringData[0].standName - // if (bringData[0].splitStatus === '0') { - // this.form.itemsNum = bringData[0].standNumSplit - // this.form.itemsName = bringData[0].standNameSplit - // } else { - // this.form.itemsNum = bringData[0].showNumber - // this.form.itemsName = bringData[0].standName - // } this.form.standId = bringData[0].standId this.sarType = bringData[0].standType this.standId = bringData[0].standId this.statusId = bringData[0].id this.form.statusId = bringData[0].id this.listModel = false; - this.listModel2 = true + this.listModel3 = true + this.getDbList() this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { infoId: bringData[0].id, page: 1, @@ -857,6 +887,12 @@ }, {}, res => { if (res.success) { this.$message.success('流程发起成功') + let taskId = { + id: this.$route.query.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) this.$router.push('/processCenter') } }) @@ -927,6 +963,9 @@ height: calc(~'100% - 107px'); overflow: auto; } + .content2 { + height: calc(~'100% - 57px') !important; + } .standardForComments { height: 100%; background: #fff; diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 0935d0099..27d9b6888 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -46,28 +46,19 @@ clearable > - + +
+ 导入 +
+
+ - - - - - - - + 隐藏基础信息 展开基础信息 - - -
@@ -446,6 +380,49 @@ @checkedRole="saveUserInfo" :nodeList="nodeList" > + +
+
+
+
+ + + + + + + +
+
+
+ 数据加载中…… + +
+
@@ -454,12 +431,18 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {saveTaskFirst} from 'api/process' +import {saveTaskFirst, taskDel} from 'api/process' export default { name: "bzjdStep1", data() { return { + bpnId: '', + listModel3: false, + standInfoList3: [], + spinShow3: false, + selectedList3: [], + //折叠的标志,true为折叠,false为不折叠 foldFormFlag: false, itermsConditionsFlag: false, @@ -562,6 +545,50 @@ export default { ProcessTitle }, methods: { + handleSelection3 (data) { + this.selectedList3 = []; + for (let i = 0; i < data.length; i++) { + this.selectedList3.push(data[i].id); + } + }, + getDbList () { + this.$http.get('lawss/sarStandCompareHis/page', { + page: 1, + pageSize: 9999, + newNumOrName: this.form.itemsNum + }, { + _this: this + }, res => { + this.standInfoList3 = res.data.list + }, e => { + }) + }, + addDbList () { + this.listModel3 = true + }, + closeDrawer3 () { + this.listModel3 = false + }, + enterDrawer3 () { + if (this.selectedList3.length === 1) { + let deposit = new Map(); + this.standInfoList3.forEach(item => { + deposit.set(item.id, item); + }); + let bringData = []; + for (let i = 0; i < this.selectedList3.length; i++) { + bringData.push(deposit.get(this.selectedList3[i])); + } + this.form.itemsNum1 = bringData[0].oldStandNum + this.form.itemsName1 = bringData[0].oldStandName + this.form.oldNumber = bringData[0].id + this.listModel3 = false + } else if (this.selectedList3.length > 1) { + this.$message.warning("只能选择一条数据进行导入"); + } else { + this.$message.warning("请选择一条数据进行导入"); + } + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag @@ -582,14 +609,6 @@ export default { } }) window.open(routeUrl.href, '_blank') - // this.$store.commit('setDetailMap', this.$route.path) - // this.$router.push({ - // name: 'ItemSplitInfo', - // query: { - // infoId: row.id, - // result: row.result, - // } - // }) }, setMap(data) { data.forEach(item => { @@ -651,7 +670,6 @@ export default { item.ZCCSSRQ = item.attrInfoMap.ZCCSSRQ } }) - this.total2 = res.data.count this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this @@ -711,13 +729,6 @@ export default { } this.form.itemsNum = bringData[0].showNumber this.form.itemsName = bringData[0].standName - // if (bringData[0].splitStatus === '0') { - // this.form.itemsNum = bringData[0].standNumSplit - // this.form.itemsName = bringData[0].standNameSplit - // } else { - // this.form.itemsNum = bringData[0].showNumber - // this.form.itemsName = bringData[0].standName - // } this.form.standId = bringData[0].standId this.sarType = bringData[0].standType this.standId = bringData[0].standId @@ -725,7 +736,8 @@ export default { this.form.statusId = bringData[0].id this.form.fileType = bringData[0].fileType this.listModel = false; - this.listModel2 = true + this.listModel3 = true + this.getDbList() this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { infoId: bringData[0].id, page: 1, @@ -767,13 +779,6 @@ export default { for (let i = 0; i < this.selectedList2.length; i++) { bringData.push(deposit.get(this.selectedList2[i])); } - // if (bringData[0].splitStatus === '0') { - // this.form.itemsNum1 = bringData[0].standNumSplit - // this.form.itemsName1 = bringData[0].standNameSplit - // } else { - // this.form.itemsNum1 = bringData[0].showNumber - // this.form.itemsName1 = bringData[0].standName - // } if (bringData[0].standYear) { this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear } else { @@ -897,6 +902,14 @@ export default { }, {}, res => { if (res.success) { this.$message.success('流程发起成功') + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push('/processCenter') } }) @@ -972,6 +985,9 @@ export default { height: calc(~'100% - 107px'); overflow: auto; } + .content2 { + height: calc(~'100% - 57px') !important; + } .standardForComments { height: 100%; diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 4b69ae72a..5bad6f19c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -40,28 +40,14 @@ clearable > - + - - - - - - - + 隐藏基础信息 展开基础信息 - diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index ac2a92c75..c36e59a94 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -40,28 +40,14 @@ clearable > - + - - - - - - - + 隐藏基础信息 展开基础信息 - @@ -131,6 +67,7 @@
批量编辑 + 查看比对
加载中... + +
+
+
+
+ {{ item1.itemsNum }} +
+
+
+
+
+
+
+ {{ item2.itemsNum }} +
+
+
+
+
+
@@ -503,6 +463,11 @@ name: "bzjdStep3", data() { return { + BDmodel: false, + oldNumber: '', + leftData: [], + rightData: [], + modalshowflag2: false, itemId: '', drawerModal: false, @@ -571,6 +536,30 @@ ProcessTitle }, methods: { + getBDList () { + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'LEFT' + }, { + _this: this + }, res => { + this.leftData = res.data + }, e => { + }) + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'RIGHT' + }, { + _this: this + }, res => { + this.rightData = res.data + }, e => { + }) + }, + checkBD () { + this.BDmodel = true + this.getBDList() + }, itemEdit (row) { this.itemId = row.id this.modalshowflag2 = true @@ -819,6 +808,7 @@ this.form.itemsName1 = data.itemsName1 || '' this.form.itemsNum1 = data.itemsNum1 || '' } + this.oldNumber = data.oldNumber || '' this.sarType = data.standInData || data.sarType this.json = data let itemList @@ -839,8 +829,6 @@ item.itemsTitle = item.itermsConditions item.applyArctic = item.applyArctic || [] }) - - this.itemList = itemList this.loading = false }).catch(e => { @@ -872,6 +860,9 @@ padding: 0 20px 0; } } + .myText { + line-height: 20px; + } .myDataPick { /deep/.el-form-item__content { margin-left: 0px !important; diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 2163d6e9d..53cae2420 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -40,28 +40,14 @@ clearable >
- + - - - - - - - + 隐藏基础信息 展开基础信息 - diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 143354727..86a29e90e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -40,28 +40,14 @@ clearable > - + - - - - - - - + 隐藏基础信息 展开基础信息 - diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 9154689b2..a521f2e7f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -40,28 +40,14 @@ clearable > - + - - - - - - - + 隐藏基础信息 展开基础信息 - diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 811f5d5b1..a9f2bbf5a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -347,7 +347,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {saveTaskFirst, queryTaskFirst} from 'api/process' +import {saveTaskFirst, queryTaskFirst,taskDel} from 'api/process' export default { name: "bzzqyjStep1-1", @@ -771,6 +771,12 @@ export default { }, {}, res => { if (res.success) { this.$message.success('流程发起成功') + let taskId = { + id: this.$route.query.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) this.$router.push('/processCenter') } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 6c38bb7cb..a3f687cf5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -362,12 +362,13 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {saveTaskFirst} from 'api/process' +import {saveTaskFirst, taskDel} from 'api/process' export default { name: "bzzqyjStep1", data() { return { + bpnId: '', fileUrl: 'api/att/attFile/upload', fileMadel: false, OCRoptions: [], @@ -792,6 +793,14 @@ export default { }, {}, res => { if (res.success) { this.$message.success('流程发起成功') + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push('/processCenter') this.isSubmit = false } else { From b4cdcebcee7430afeafcc100b99f1afad101c381 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 15 Dec 2021 17:49:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8?= =?UTF-8?q?=EF=BC=8C=E8=B4=A3=E4=BB=BB=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=B9=B2?= =?UTF-8?q?=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 28 +++++++++---------- .../pages/creatProcess/bzrk/step4.vue | 28 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index c10b13f16..538b5899e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -499,13 +499,13 @@ - + + + + + + + @@ -689,13 +689,13 @@ - + + + + + + + - + + + + + + + - + + + + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue index 1bb102429..c2f2fbd80 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue @@ -1,7 +1,7 @@