From 89d704b7ee671f12bac9cfd1a69b0217306391c1 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 28 Nov 2021 17:03:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomFormComponents/DatePickerGroup.vue | 3 + .../pages/creatProcess/bzrk/step1.vue | 91 ++++++++---- .../pages/creatProcess/bzrk/step2.vue | 84 +++++++---- .../pages/creatProcess/bzrk/step3.vue | 72 ++++++---- .../pages/creatProcess/bzrk/step4.vue | 133 +++++++++++++----- 5 files changed, 270 insertions(+), 113 deletions(-) diff --git a/src/components/CustomFormComponents/DatePickerGroup.vue b/src/components/CustomFormComponents/DatePickerGroup.vue index f085b157d..0af7a27ef 100644 --- a/src/components/CustomFormComponents/DatePickerGroup.vue +++ b/src/components/CustomFormComponents/DatePickerGroup.vue @@ -145,6 +145,9 @@ export default { watch: { value (val) { this.tagList = val !== '' && val !== null ? val.split(',') : [] + this.tagList=this.tagList.map((item)=>item.substring(0,10)) + console.log("this.tagList",this.tagList); + }, tagList: { handler (val) { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 53e1d1e1f..a9346131b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -167,32 +167,61 @@
- - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + @@ -1243,10 +1272,15 @@ import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; + import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup' + import CusTomDataPickerGroup + from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup"; export default { name: "bzrkStep1", components: { + CusTomDataPickerGroup, + CustomDatePickGroup, TreeSelectModule, ProcessHeader, ProcessFooter, @@ -1727,6 +1761,7 @@ this.roleForm.zrUserName=nameList; } if (this.drawerTitle === '选择我司署名人'){ + this.roleForm.wssmrId=idList; this.form.wssmr = nameList } }, @@ -2700,21 +2735,27 @@ }, handleSubmit() { + debugger // this.form.country=this.countryArr; this.$refs['form'].validate((valid) => { if (valid) { this.$refs['userForm'].validate((valid) => { if (valid) { + this.fileInfoHandle() this.isSubmit = true this.form.country=this.countryArr; - var json = Object.assign(this.form, this.roleForm) + console.log("this.form",this.form.wssmr); + var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId json.jlUserId = this.form.jlUserId json.commentText = this.commentText json.applyUpdUserId = this.form.applyUpdUserId json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName + + console.log("JSON.stringify(json)",JSON.stringify(json)); + return this.$http.get('lawss/activiti/startProcess', {type: '1'}, { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 0102ee586..df0cba406 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -152,35 +152,53 @@
- - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + @@ -769,6 +787,8 @@ import ProcessTitle from '../../components/ProcessTitle' import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process' import TreeSelect from '@/components/treeSelect/treeSelect.vue'; + import CusTomDataPickerGroup + from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup"; export default { name: "bzrkStep2", @@ -956,6 +976,7 @@ } }, components: { + CusTomDataPickerGroup, ProcessHeader, ProcessFooter, ProcessTitle, @@ -1209,13 +1230,16 @@ _this: this }, res => { if (res.success) { - if(this.formTongGuo.approvalOpinion === '1'){ - this.$message.warning("驳回成功") + console.log("this.formTongGuo.approvalOpinion",this.formTongGuo.approvalOpinion); + if(this.formTongGuo.approvalOpinion == '1'){ + console.log("shibai"); + this.$message.warning("驳回成功") this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else{ - this.processCreateStand(json) + console.log("hello"); + this.processCreateStand(json) } } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index e82ef4c25..0f20fe9d3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -151,32 +151,53 @@
- - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + @@ -691,6 +712,8 @@ import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process' import TreeSelect from '@/components/treeSelect/treeSelect.vue'; +import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup' + export default { name: "bzrkStep3", @@ -866,6 +889,7 @@ export default { } }, components: { + CustomDatePickGroup, ProcessHeader, ProcessFooter, ProcessTitle, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index ece46416c..f4bbac89b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -155,29 +155,48 @@
- - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + @@ -787,7 +806,9 @@ width = "800" :key="key1" :lazy=true - :multiple=false + :multiple=true + :check-strictly= true + :show-checkBox=true :modalShowFlag="modalShowFlag2" :drawerTitle="drawerTitle" :url="url" @@ -802,7 +823,9 @@ width = "800" :key="key2" :lazy=true - :multiple=false + :multiple=true + :check-strictly=true + :show-checkBox=true :modalShowFlag="modalShowFlag3" :drawerTitle="drawerTitle" :url="url" @@ -817,7 +840,9 @@ width = "800" :key="key3" :lazy=true - :multiple=false + :multiple=true + :check-strictly= true + :show-checkBox=true :modalShowFlag="modalShowFlag4" :drawerTitle="drawerTitle" :url="url" @@ -909,15 +934,17 @@ > - - - + + + + + + + + + + + @@ -1340,6 +1367,12 @@ @checkedRole="checkedRole" :nodeList="nodeList" > +
@@ -1358,10 +1391,13 @@ import { import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; +import CusTomDataPickerGroup + from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup"; export default { name: "bzrkStep4", components: { + CusTomDataPickerGroup, TreeSelectModule, ProcessHeader, ProcessFooter, @@ -1476,7 +1512,7 @@ export default { { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' } ], standEnName: [ - { required: true, message: '请输入标准英文名称', trigger: 'blur' }, + { required: false, message: '请输入标准英文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' } ], /*standNature: [ @@ -1633,6 +1669,34 @@ export default { } }) }, + checkedRole2 (data) { + console.log('1712',this.drawerTitle) + let idList = '' + let nameList = '' + data.forEach( item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + if (this.drawerTitle === '选择责任人'){ + this.roleForm.zrUserId=idList; + this.roleForm.zrUserName=nameList; + } + if (this.drawerTitle === '选择我司署名人'){ + this.form.wssmr = nameList + } + }, + choiceZRRS (type, title, id) { + console.log('2077',title) + this.nodeList = [] + this.nodeList.push(id) + this.userType = type + this.drawerTitle = title + this.modalShowRoleFlag = true + }, choiceZRR1 (type, title, id) { this.drawerTitle = title this.modalShowFlag1 = true @@ -1665,6 +1729,7 @@ export default { this.urlChild="sarModelTree/childByList" this.key3++ }, + busVsFunc(){ this.$http.get('sarVppsTree/list', '', { _this: this From 00a61eec5da8181de46fe50716518ec8962f28d6 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 28 Nov 2021 17:04:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index a9346131b..44be17e03 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2755,7 +2755,6 @@ json.prcCreateUserName = this.form.prcCreateUserName console.log("JSON.stringify(json)",JSON.stringify(json)); - return this.$http.get('lawss/activiti/startProcess', {type: '1'}, { _this: this }, res => {