From 03f58ab166acec9275efcde6b30a47d93e8cb93b Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 21 Jun 2021 18:35:11 +0800 Subject: [PATCH 01/14] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step2.vue | 59 +++++++++++-------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index b936728b9..aaa5948fa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -597,7 +597,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail} from 'api/process' + import {inboundLiaisonDetail,processCreateStand} from 'api/process' export default { name: "bzrkStep2", data () { @@ -728,30 +728,43 @@ }, handleSave() {}, handleSubmit() { - var json = this.form - json.zrUserId = this.$store.getters.userInfo.userId - json.jlUserId = this.$store.getters.userInfo.userId - json.applyUpdUserId = this.$store.getters.userInfo.userId - json.prcCreateUser = this.$store.getters.userInfo.userId - json.prcCreateUserName = this.$store.getters.userInfo.account - this.$http.get('lawss/activiti/startProcess', {type: '1'}, { - _this: this - }, res => { - if (res.ok) { - this.$http.post('lawss/activiti/completeTask', { - taskIds: res.data, - userId : this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - console.log(res); - if (res.ok) { - } - }) + const json = JSON.stringify(this.form); + console.log(json) + // this.$http.post('lawss/activiti/completeTask', { + // taskIds: res.data, + // userId : this.$store.getters.userInfo.userId, + // json: json + // }, { + // _this: this + // }, res => { + // console.log(res); + // if (res.ok) { + // this.processCreateStand(json) + // } + // }) + }, + + /** + * @description: 流程入库 + * @date: 2020-11-18 21:47:58 + * @auth: chenxiaoxi + */ + processCreateStand(json) { + const _formData = new FormData() + _formData.append('infoJson', json) + processCreateStand(_formData).then(res => { + if (res.result === '操作成功' || res.data === '入库成功') { + this.$message.success(res.data) + setTimeout(() => { + this.$router.push({ + name: 'ProcessCenter' + }) + }, 100) + } else { + this.$message.warning(res.message) } }) - } + }, }, mounted () { this.getData() From 68bcaee2c71d57b17f5f2960282071074a6a2563 Mon Sep 17 00:00:00 2001 From: yf <428080876@qq.com> Date: Tue, 22 Jun 2021 09:30:03 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/router/index.js b/src/router/index.js index 22500369a..a782539a5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -222,6 +222,15 @@ const routes = [ title: '标准需求（翻译）申请流程' } }, + { + path: '/processDetail', + name: 'ProcessDetail', + component: () => import('@/pages/processCenter/pages/processDetail/index.vue'), + meta: { + requireAuth: true, + title: '流程详情' + } + }, { path: '/bzffStep1', name: 'bzffStep1', From 537cb139e0c563a49c5ce1a5367f894c867526c4 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 22 Jun 2021 10:12:52 +0800 Subject: [PATCH 03/14] =?UTF-8?q?feat:=20=E9=BB=98=E8=AE=A4=E7=94=A8?= =?UTF-8?q?=E6=88=B7admin=20=E6=9A=82=E4=B8=8D=E5=8A=A0=E5=AF=86=E7=99=BB?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/processList/tabComponents/processCenter/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index f55bc97d9..a1ee99149 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -221,7 +221,10 @@ export default { name: 'bzrkStep2', query: { taskIds: row.taskIds, - prcId: row.prcId + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType } }) } From 21bc8229c53725db3e537f468c73c03648b51cf4 Mon Sep 17 00:00:00 2001 From: youyuzihan Date: Tue, 22 Jun 2021 13:11:10 +0800 Subject: [PATCH 04/14] =?UTF-8?q?update:tab=E9=A1=B5=E9=9D=A2=E7=BC=96?= =?UTF-8?q?=E5=86=99=E3=80=81=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index bcf09c84c..c2080cfa8 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -1098,8 +1098,15 @@ export default { this.$http.get('sarStandProjectLibrary/queryProject', this.localProTableSearch, { _this: this, loading: 'loading' }, res => { - console.log(res.data) - this.localProTableList = res.data.Maintenance.records + // console.log(res.data) + if (this.localProTableSearch.prodectCode === 'Maintenance') { + this.localProTableList = res.data.Maintenance.records + } + else if (this.localProTableSearch.prodectCode === 'notMaintenance') + { + this.localProTableList = res.data.notMaintenance.records + + } this.total = res.data.count // this.localProTableList.map((item) => { // this.xmztOptions.map((opr) => { From bb760d6bb4bc1d33cbb619ae78c33e79a5e802c4 Mon Sep 17 00:00:00 2001 From: yf <428080876@qq.com> Date: Tue, 22 Jun 2021 13:37:47 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processList/tabComponents/alreadyProcess/index.vue | 6 +++--- .../pages/processList/tabComponents/alreadySend/index.vue | 6 +++--- .../processList/tabComponents/monitorProcess/index.vue | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index 2351d1a65..52aa76563 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue @@ -124,7 +124,7 @@ - 办理 + 查看 @@ -167,7 +167,7 @@ export default { methods: { handleCommand (command) { switch (command[1]) { - case '办理': + case '查看': this.dealWith(command[0]) break } @@ -210,7 +210,7 @@ export default { pageSizeChange (pageSize) { // 数量改变 this.queryProcess() }, - dealWith (row) { // 办理 + dealWith (row) { // 查看 this.$router.push({ name: 'ProcessDetail', query: { diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index 446f7a84e..ec7c033cb 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -124,7 +124,7 @@ - 办理 + 查看 @@ -167,7 +167,7 @@ export default { methods: { handleCommand (command) { switch (command[1]) { - case '办理': + case '查看': this.dealWith(command[0]) break } @@ -211,7 +211,7 @@ export default { pageSizeChange (pageSize) { // 数量改变 this.queryProcess() }, - dealWith (row) { // 办理 + dealWith (row) { // 查看 this.$router.push({ name: 'ProcessDetail', query: { diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue index 24bd71036..43a7c2803 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue @@ -124,7 +124,7 @@ - 查看 + 查看 @@ -211,7 +211,7 @@ export default { pageSizeChange (pageSize) { // 数量改变 this.queryProcess() }, - dealWith (row) { // 办理 + dealWith (row) { // 查看 this.$router.push({ name: 'ProcessDetail', query: { From 594c6b57cb9bfac95e581627b20971f214529a8b Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 22 Jun 2021 13:41:40 +0800 Subject: [PATCH 06/14] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=B8=8D=E4=BC=9A=E7=AD=BE=E5=8D=95=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step2.vue | 53 +++++++++++++------ 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index aaa5948fa..bf4171d2c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -602,6 +602,9 @@ name: "bzrkStep2", data () { return { + userId:this.$store.getters.userInfo.userId, + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId, approvalOpinion: '', // 通过/驳回 textarea: '', // 意见 title: '', // 新增编辑抽屉标题 @@ -668,6 +671,10 @@ glwj: '', // 关联文件 xglc: '', // 相关流程 chjl: '', // 参会记录 + //流程信息 + prcNum:'', + prcName:'', + standType: '', }, // 标准信息 standSortOptions: [], // 标准类别 standNatureOptions: [], // 标准性质 @@ -688,6 +695,9 @@ user3: '', user4: '', user5: '', + // 流程路由信息 + prcNum : this.$route.query.prcNum, + prcName : this.$route.query.prcName, } }, components: { @@ -699,16 +709,29 @@ getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ - taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId + taskIds: this.taskIds, + pId: this.pId }).then(res => { if (res) { - this.form = JSON.parse(res.mesg) + const processForm = JSON.parse(res.mesg) + this.getFormFieldList(processForm) } }).catch(e => { }) }) }, + /** + * @description: 动态表单读取 + */ + getFormFieldList (item) { + this.$nextTick(() => { + this.form = JSON.parse(JSON.stringify(item)) + this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' + this.form.prcNum = this.prcNum + this.form.prcName = this.prcName + this.form['id'] = item.id + }) + }, closeDrawer() { this.ListModel = false }, @@ -730,18 +753,18 @@ handleSubmit() { const json = JSON.stringify(this.form); console.log(json) - // this.$http.post('lawss/activiti/completeTask', { - // taskIds: res.data, - // userId : this.$store.getters.userInfo.userId, - // json: json - // }, { - // _this: this - // }, res => { - // console.log(res); - // if (res.ok) { - // this.processCreateStand(json) - // } - // }) + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId : this.userId, + json: json + }, { + _this: this + }, res => { + console.log(res); + if (res.success) { + this.processCreateStand(json) + } + }) }, /** From 90de2621785aec360907845a41337abeec48e4e9 Mon Sep 17 00:00:00 2001 From: yf <428080876@qq.com> Date: Tue, 22 Jun 2021 15:22:55 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 57 +- .../pages/creatProcess/bzrk/step3.vue | 843 ++++++++++++++++++ .../pages/creatProcess/bzrk/step4.vue | 843 ++++++++++++++++++ .../tabComponents/processCenter/index.vue | 28 +- .../tabComponents/taskDraft/index.vue | 1 + src/router/index.js | 18 + 6 files changed, 1773 insertions(+), 17 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzrk/step3.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzrk/step4.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index dbe623393..ea102bdf8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -545,21 +545,21 @@ -
- - -
- - -
- - -
+ + + + + + + + + + + + + + +
@@ -623,6 +623,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' + import {saveTaskFirst} from "api/process"; export default { name: "bzrkStep1", data () { @@ -737,7 +738,31 @@ handleTabs(name) { this.active = name }, - handleSave() {}, + //保存 + handleSave() { + this.saveLoading = true + let _formData = new FormData() + // _formData.append('id', this.bpnId) + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.uName) + _formData.append('prcType', this.$route.query.type) + _formData.append('json', JSON.stringify({ + prcForm: this.prcForm, + sarAccessInfoList: this.sarAccessInfoList, + sarAccessInfoListADMIN: this.sarAccessInfoListADMIN, + bzqdForm: this.bzqdForm, + listInfo: this.listInfo, + id: this.id + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + // this.$router.push('/processCenter') + // this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { var json = this.form json.zrUserId = this.$store.getters.userInfo.userId diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue new file mode 100644 index 000000000..17a7e98ea --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -0,0 +1,843 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue new file mode 100644 index 000000000..67d7ba459 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -0,0 +1,843 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index a1ee99149..349d54a99 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -214,7 +214,11 @@ export default { this.queryProcess() }, dealWith (row) { // 办理 - switch(row.prcType) { + this.setHandleInfo(JSON.stringify(row)) + const prcType = row.prcType + console.log(prcType) + console.log(row.taskInfo) + switch(prcType) { case '1': if (row.taskInfo === '标准法规业务经理审批') { this.$router.push({ @@ -227,6 +231,28 @@ export default { prcType: row.prcType } }) + }else if (row.taskInfo === '责任人会签'){ + this.$router.push({ + name: 'step3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '申请人修订'){ + this.$router.push({ + name: 'step4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } } }, diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index a666b610f..b6842a975 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -209,6 +209,7 @@ export default { this.queryProcess() }, dealWith (row) { // 办理 + //草稿办理待开发 }, ...mapMutations(['setProcess', 'setHandleInfo']), ...mapActions(['setMenu']) diff --git a/src/router/index.js b/src/router/index.js index a782539a5..0872bd5bc 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -249,6 +249,24 @@ const routes = [ title: '标准入库流程' } }, + { + path: '/bzrkStep3', + name: 'bzrkStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/bzrk/step3.vue'), + meta: { + requireAuth: true, + title: '标准入库流程' + } + }, + { + path: '/bzrkStep4', + name: 'bzrkStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/bzrk/step4.vue'), + meta: { + requireAuth: true, + title: '标准入库流程' + } + }, { path: '/bzrkStep2', name: 'bzrkStep2', From f2c6a2e3b566904d7930e090250b7664a31678fc Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 22 Jun 2021 15:35:22 +0800 Subject: [PATCH 08/14] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=B8=8D=E4=BC=9A=E7=AD=BE=E5=8D=95=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 7 ++++--- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index dbe623393..a4cfc2651 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -44,7 +44,8 @@ + placeholder="请选择标准年份" + value-format="yyyy"> @@ -756,8 +757,8 @@ }, { _this: this }, res => { - console.log(res); - if (res.ok) { + if (res.success) { + this.$message.success(res.message) } }) } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index bf4171d2c..463fabfb2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -45,7 +45,8 @@ disabled v-model="form.standYear" type="year" - placeholder="请选择标准年份"> + placeholder="请选择标准年份" + value-format="yyyy"> From 130526f87310ef8c455e680ef4f35b03a8e59b8d Mon Sep 17 00:00:00 2001 From: yf <428080876@qq.com> Date: Tue, 22 Jun 2021 16:36:50 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step2.vue | 96 ++++++++++++++++++- 1 file changed, 94 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index bf4171d2c..0e94664d4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -7,7 +7,8 @@
基础信息
-
审批历史
+
审批历史
+
@@ -581,6 +582,75 @@
+
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+
{ + this.detailData = res + }, e => {}) + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -791,6 +882,7 @@ }, mounted () { this.getData() + this.processTable() this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { From 521418857e42f07eec88cf9bbb359ffd52a5befd Mon Sep 17 00:00:00 2001 From: yf <428080876@qq.com> Date: Tue, 22 Jun 2021 16:41:43 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 1a6f59d44..3a1d1af18 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -7,7 +7,7 @@
基础信息
-
审批历史
+
流程信息
@@ -547,19 +547,19 @@
- - - - - - - - - - - - - + + +
+ + +
+ +
@@ -629,7 +629,7 @@ name: "bzrkStep1", data () { return { - textarea: '', // 意见 + commentText: '', // 意见 title: '', // 新增编辑抽屉标题 ListModel: false, // 新增编辑抽屉开关 active: '1', // 默认显示 @@ -768,6 +768,7 @@ var json = this.form json.zrUserId = this.$store.getters.userInfo.userId json.jlUserId = this.$store.getters.userInfo.userId + json.commentText = this.commentText json.applyUpdUserId = this.$store.getters.userInfo.userId json.prcCreateUser = this.$store.getters.userInfo.userId json.prcCreateUserName = this.$store.getters.userInfo.account From 9558fad001e4d977a482ff499b1a8f2f2e79c501 Mon Sep 17 00:00:00 2001 From: yf <428080876@qq.com> Date: Tue, 22 Jun 2021 16:44:32 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 4262162d9..f0bc5a136 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -530,7 +530,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="textarea"> + v-model="commentText">
From c389384feb358942005fb4de32a3d1e6d864a9b6 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 22 Jun 2021 16:48:57 +0800 Subject: [PATCH 12/14] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=84=8F=E8=A7=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index f0bc5a136..ada10c0d7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -844,6 +844,8 @@ handleSave() {}, handleSubmit() { const json = JSON.stringify(this.form); + json.commentText = this.commentText + json.approvalOpinion = this.approvalOpinion console.log(json) this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, From 789f3b05f397df07b483b4b87672cde7402bfcda Mon Sep 17 00:00:00 2001 From: yf <428080876@qq.com> Date: Tue, 22 Jun 2021 17:07:10 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 3a1d1af18..663aee630 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -551,7 +551,7 @@
Date: Tue, 22 Jun 2021 18:00:43 +0800 Subject: [PATCH 14/14] commit --- src/components/navMenu/index.vue | 107 ++++--- .../components/CollectionStandard.vue | 295 ++---------------- .../personal/pages/my-collection/index.vue | 29 +- 3 files changed, 103 insertions(+), 328 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 59880e236..1779fb412 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -334,60 +334,59 @@ export default { // } ] }, - // { - // title: '个人中心', - // path: '/personal', - // 'icon-class': 'ucenter', - // menuId: 'ZY9RFA4M35', - // children: [ - // { - // title: '我的消息', - // path: '/dynamics', - // menuId: 'JCEV4AEV32' - // }, - // { - // title: '我的企标', - // path: '/MyEnterpriseStandard', - // menuId: 'LKU3W23UMEHDM9VLDHGK' - // }, - // { - // title: '我的收藏', - // path: '/collection', - // menuId: 'JY5LKL2HPD' - // }, - // - // { - // title: '我的浏览', - // path: '/browsing', - // menuId: 'HAEY2A4LMX' - // }, - // { - // title: '已收分享', - // path: '/push', - // menuId: '9F8T7DPYHE' - // }, - // { - // title: '已发分享', - // path: '/forward', - // menuId: 'K45Y9TGKZV2K4XP4CETD' - // }, - // { - // title: '我的问答', - // path: '/questionsAndAnswers', - // menuId: '8VKLZATQQG4NQHXV9UDS' - // }, - // { - // title: '我的板块', - // path: '/plate', - // menuId: 'TUYHX8JBWV' - // } - // // { - // // title: '个人信息', - // // path: '/info', - // // menuId: '8K7FDHG89G' - // // } - // ] - // }, + { + title: '个人中心', + path: '/personal', + 'icon-class': 'ucenter', + menuId: 'ZY9RFA4M35', + children: [ + // { + // title: '我的消息', + // path: '/dynamics', + // menuId: 'JCEV4AEV32' + // }, + // { + // title: '我的企标', + // path: '/MyEnterpriseStandard', + // menuId: 'LKU3W23UMEHDM9VLDHGK' + // }, + { + title: '我的收藏', + path: '/collection', + menuId: 'JY5LKL2HPD' + }, + // { + // title: '我的浏览', + // path: '/browsing', + // menuId: 'HAEY2A4LMX' + // }, + // { + // title: '已收分享', + // path: '/push', + // menuId: '9F8T7DPYHE' + // }, + // { + // title: '已发分享', + // path: '/forward', + // menuId: 'K45Y9TGKZV2K4XP4CETD' + // }, + // { + // title: '我的问答', + // path: '/questionsAndAnswers', + // menuId: '8VKLZATQQG4NQHXV9UDS' + // }, + // { + // title: '我的板块', + // path: '/plate', + // menuId: 'TUYHX8JBWV' + // } + // { + // title: '个人信息', + // path: '/info', + // menuId: '8K7FDHG89G' + // } + ] + }, // { // title: '搜索中心', // path: '/advancedSearch', diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue index f0e80e88b..57f18d034 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue @@ -6,7 +6,7 @@
- - 取消收藏 + + + + + + +
@@ -40,62 +46,31 @@
-
+
所属板块：{{ item.collectType === 'INLAND_STAND' ? '国内标准法规' : (item.collectType === 'FOREIGN_STAND' ? '海外标准法规' : '企业标准') }} -
标题：{{ item.collectTitle }}
+
标题：{{ item.name }}
-
标题：{{ item.collectTitle }}
+
标题：{{ item.name }}
 - 创建时间：{{getDate(item.creationTime)}} + 创建时间：{{getDate(item.createTime)}}
取消收藏 -
-
- 添加笔记 -
-
笔记{{index2 +1 }}: {{note.noteContentValue}}
-
- 查看此条笔记 - 修改笔记 - 删除笔记 -
-
-
数据获取中
- -
- - - - - -
-
- 取消 - 确认 -
-
@@ -113,7 +88,7 @@ export default { loadDate: false, // 查询 search: { - collectionStandard: '' + name: '' }, // 分页 total: 0, @@ -121,108 +96,25 @@ export default { rows: 10, // 数据内容 standardList: [], - // 对话框状态 - standardModal: false, - // 对话框标题 - standardTitle: '', - // 对话框内容 - standardForm: { - textarea: '', - collectId: '', - id: '' - }, - modalType: '', - // 是否读写 - noteType: false, - // 计算 - // 笔记规则 - standardFormRules: { - textarea: [ - {required: true, message: '笔记不能为空', trigger: 'blur'}, - {type: 'string', max: 20000, message: '最多输入20000字符'} - ] - }, checkAll: false, // 是否全选 indeterminate: false, // 是否半选 - isSubmit: false, selectedList: [], selectedAllInfoList: [] } }, methods: { - // 对话框关闭清除表单 - noteChange (type) { - if (!type) { - this.$refs['standardForm'].resetFields() - } - }, // 重置 resetSelect () { - this.search.collectionStandard = '' + this.search.name = '' this.pageChange(1) }, - // 笔记数字提示 - descInput () { - if (this.standardForm.textarea.length > 20000) { - this.error('最多输入20000字') - } - }, - error (msg) { - this.$Message.error(msg) - }, - // 跳转 - detailsStandard (item) { - console.log(item); - this.$http.get('lawss/sarMenu/judgeSarMenuByRole', { - sarId: item.collectResId, - sarType: item.collectType - }, { - _this: this - }, res => { - if (res.ok) { - if (item.collectType === 'BUSINESS_STAND') { - // if (this.$hasPermission('YJUHC32R7G')) { - let routeUrl = this.$router.resolve({ - name: 'OtherBussStandardDetails', - params: { - id: item.collectResId, - pageType: item.collectType - } - }) - window.open(routeUrl.href, '_blank') - // } else { - // this.$message.warning('无权访问') - // } - } else { - // if (this.$hasPermission('SSA6WR4HV8')) { - let routeUrl = this.$router.resolve({ - name: 'OtherStandardDetails', - params: { - id: item.collectResId, - pageType: item.collectType - } - }) - window.open(routeUrl.href, '_blank') - // } else { - // this.$message.warning('无权访问') - // } - } - } else { - this.$message.error(res.message) - } - }, e => { - this.$message.error('无权访问') - }) - }, // 分页 pageChange (page) { this.page = page - this.saveNote = '' this.selectStandard() }, pageSizeChange (pageSize) { this.rows = pageSize - this.saveNote = '' this.selectStandard() }, // 搜索 @@ -232,36 +124,19 @@ export default { }, // 查询、加载数据 selectStandard () { - this.$http.get('person/personCollect/page', { - pageNo: this.page, - pageSize: this.$store.getters.userInfo.configContent, - modeType: 'STAND', - collectTitle: this.search.collectionStandard, - userId: this.$store.getters.userInfo.userId + this.$http.get('sarPersonalCenter/sar-user-star/getList', { + current: this.page, + size: this.$store.getters.userInfo.configContent, + userId: this.$store.getters.userInfo.userId, + name: this.search.name }, { _this: this, loading: 'loading' }, res => { - // for (let i = 0; i < res.data.list.length; i++) { - // res.data.list[i].checked = false - // res.data.list[i].check = false - // res.data.list[i].seeBtn = '查看笔记' - // } - res.data.list.map((item, index) => { - item.checked = false - }) this.standardList = [] - this.standardList = res.data.list - this.total = res.data.count + this.standardList = res.data.records + this.total = res.data.total this.contentOpen = true - // if (this.saveNote !== '') { - // this.standardList[this.saveNote].check = true - // if (this.standardList[this.saveNote].check === true) { - // this.standardList[this.saveNote].seeBtn = '关闭笔记' - // } else { - // this.standardList[this.saveNote].seeBtn = '查看笔记' - // } - // } }, e => {}) }, // 取消收藏 @@ -273,130 +148,28 @@ export default { confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { - this.$http.put('person/personCollect/updateByUserId ', { - modeType: 'STAND', - id: id - }, { - _this: this - }, res => { - this.contentOpen = false - this.pageChange(1) - }, e => { - }) - }).catch(() => { - }) - }, - // 查看笔记 - writeStandardNotes (item, index) { - item.check = !item.check - if (item.check === true) { - item.seeBtn = '关闭笔记' - } else { - item.seeBtn = '查看笔记' - } - for (let i = 0; i < this.standardList.length; i++) { - if (i !== index) { - this.standardList[i].check = false - this.standardList[i].seeBtn = '查看笔记' - } - } - }, - // 添加笔记 - createStandardNote (item, index) { - this.standardModal = true - this.noteType = false - this.modalType = 1 - this.standardTitle = '添加笔记' - this.standardForm.textarea = '' - this.standardForm = item - this.saveNote = index - }, - // 查看此条笔记 - viewStandardData (note) { - this.standardModal = true - this.standardTitle = '查看笔记' - this.standardForm.textarea = note.noteContentValue - this.noteType = true - this.modalType = 3 - }, - // 修改笔记 - noteStandardEdit (note, index) { - this.standardModal = true - this.noteType = false - this.standardTitle = '修改笔记' - this.modalType = 2 - this.standardForm.id = note.id - this.standardForm.textarea = note.noteContentValue - this.saveNote = index - }, - // 删除笔记 - noteStandardDel (note, index) { - this.saveNote = index - this.$confirm('确认删除该条数据?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning', - confirmButtonClass: 'common-button-primary', - roundButton: true - }).then(() => { - this.$http.post('lawss/utNoteInfo/deleteNote', { - ids: note.id - }, - { + var json = {} + json.userId = this.$store.getters.userInfo.userId + json.id = id + this.$http.postData('/sarPersonalCenter/sar-user-star/delete',json, { _this: this }, res => { if (res.ok) { - this.selectStandard() - } else { + this.$message.success('已取消收藏') + this.contentOpen = false + this.pageChange(1) } - }).catch(() => { + }, e => { }) - }) - }, - closeModal () { - this.standardModal = false - this.$refs['standardForm'].resetFields() - }, - // 保存笔记 （新增、编辑） - saveClass () { - this.$refs['standardForm'].validate((valid) => { - if (valid) { - this.standardModal = false - if (this.modalType === 1) { - let noteForm = {} - noteForm.noteContentValue = this.standardForm.textarea - noteForm.sourceType = 'COSTAND' - noteForm.noteName = this.standardForm.collectTitle - noteForm.sarId = this.standardForm.id - noteForm.forwardId = this.standardForm.collectResId - this.$http.post('lawss/utNoteInfo/saveNote', noteForm, { - _this: this, - loading: 'isSubmit' - }, res => { - this.selectStandard() - }, e => { - }) - } else if (this.modalType === 2) { - let noteForm = { - id: this.standardForm.id, - noteContentValue: this.standardForm.textarea - } - this.$http.post('lawss/utNoteInfo/updateNote', noteForm, { - _this: this - }, res => { - this.selectStandard() - }, e => { - }) - } - } else { - this.$message.error('请正确输入') - } + }).catch(() => { }) }, getDate (date) { return date != null ? date.substring(0, date.indexOf(' ')) : '' }, cancleCollectBatch () { + console.log(this.selectedList); + return if (this.selectedList.length === 0) { this.$confirm('请先选择数据进行取消收藏', '提示', { showCancelButton: false, diff --git a/src/pages/personal/pages/my-collection/index.vue b/src/pages/personal/pages/my-collection/index.vue index 94e0f944e..2f383b30e 100644 --- a/src/pages/personal/pages/my-collection/index.vue +++ b/src/pages/personal/pages/my-collection/index.vue @@ -17,19 +17,22 @@ export default { data () { return { active: 'CollectionStandard', - tabsList: [ { - title: '已收藏的标准法规', - name: 'CollectionStandard' - }, { - title: '已收藏的动态&资料 ', - name: 'CollectionDynamics' - }, { - title: '已收藏的政策', - name: 'CollectionLaws' - }, { - title: '已收藏的标准拆分', - name: 'CollectionBreak' - }] + tabsList: [ + { + title: '已收藏的标准法规', + name: 'CollectionStandard' + }, + // { + // title: '已收藏的动态&资料 ', + // name: 'CollectionDynamics' + // }, { + // title: '已收藏的政策', + // name: 'CollectionLaws' + // }, { + // title: '已收藏的标准拆分', + // name: 'CollectionBreak' + // } + ] } }, methods: {