From c3054507bfe45731183db68e5171cacd48d7aef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Feb 2022 15:00:09 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B7=B3=E8=BD=AC=E5=8F=8A=E5=A4=9A=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E7=A8=BF=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otherBussStandardDetails/index.vue | 43 ++++++++++++++----- .../components/EnterpriseStandardDatabase.vue | 2 +- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index d66c41d6c..28dbc4855 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -353,12 +353,12 @@

{{ sarStandardsInfoEO.standCode }}

{{ sarStandardsInfoEO.standName || '-' }}

{{ sarStandardsInfoEO.standEnName || '-' }}

@@ -1961,10 +1982,12 @@ export default { one: spanOneArr, } }, - child1Func(child1){ + child1Func(child1) { const list = [] - if(child1 && child1.length > 1){ - list.push(child1[0]) + if (child1 && child1.length > 1) { + for (let i = 0; i < child1.length; i++) { + list.push(child1[i]) + } return list } return child1 diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 84dbc5c83..0e75f5284 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -3374,7 +3374,7 @@ export default { let routeUrl = this.$router.resolve({ name: 'OtherBussStandardDetails', params: { - id: item.standId, + id: item.id, pageType: 'BUSINESS_STAND' } }) From 61328f48b8186fbfa34d4ed4926735a756fcc631 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 17 Feb 2022 16:23:34 +0800 Subject: [PATCH 02/10] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=20=E6=96=B0=E5=A4=8D=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/process.js | 8 + .../creatProcess/qbfs/common/formList.vue | 203 +++- .../qbfs/common/formListStep5.vue | 886 ++++++++++++++++++ .../pages/creatProcess/qbfs/step3.vue | 7 +- .../pages/creatProcess/qbfs/step4.vue | 83 +- .../pages/creatProcess/qbfs/step5.vue | 768 +++++++++++++++ src/router/index.js | 9 + 7 files changed, 1883 insertions(+), 81 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbfs/step5.vue diff --git a/src/api/process.js b/src/api/process.js index 3315c9fe4..979121fa1 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -93,6 +93,14 @@ export function processCreateBuss (data) { }) } +export function processCreateFsBuss (data) { + return axios({ + url: '/api/lawss/actSarItemsBuss/processCreateFsBuss', + method: 'post', + data + }) +} + export function processCreateLaws (data) { return axios({ url: '/api/lawss/actSarItemsLaws/processCreateLaws', diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue index e8616b1f0..e93d9d66e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue @@ -327,55 +327,65 @@ - - - - - - - + > - - - - - - - - - - - - - - - - - - - --> - @@ -522,13 +600,20 @@ export default { }, }, filters: { - ellipsis (value) { + ellipsis35 (value) { if (!value) return '' if (value.length > 35) { return value.slice(0,35) + '...' } return value }, + ellipsis15 (value) { + if (!value) return '' + if (value.length > 10) { + return value.slice(0,10) + '...' + } + return value + }, ellipsis2 (value) { if (!value) return '' if (value.length > 20) { @@ -549,6 +634,9 @@ export default { {value: '2',label: '废止'}, {value: '3',label: '继续有效'}, ], + showForm:{}, + showDrawerTitle:"", + showDrawer:false, form:{}, LXDList:[], FSDList:[], @@ -590,6 +678,23 @@ export default { ...mapGetters(['userInfo']) }, methods: { + detail(row){ + this.showDrawerTitle = '查看' + this.showDrawer = true + this.showForm = row + this.showForm.FSDList=this.assemble(this.showForm.FSD,this.showForm.FSDName); + console.log(this.showForm) + }, + showDrawerClose () { + this.showDrawer = false + }, + verifySort2(){ + if(this.showForm.reviewResults && this.showForm.reviewResults === '1'){ + return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1); + }else { + return "" + } + }, verifySort(){ if(this.form.reviewResults && this.form.reviewResults === '1'){ return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1); @@ -751,7 +856,7 @@ export default { form: { handler: function (val) { if(val){ - this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList); + this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.FSDList,this.LXDList); } }, deep: true //对象的深度验证 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue new file mode 100644 index 000000000..b04525431 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue @@ -0,0 +1,886 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue index ad406a516..0d6b6401c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue @@ -175,7 +175,6 @@ export default { let fileObj = await this.processEditFile(this.qbfsForm.FSD) if (fileObj) { const editFileInfo = fileObj - console.log(editFileInfo) if (editFileInfo && editFileInfo.editStatus === '1') { callback() } else { @@ -246,7 +245,7 @@ export default { releaseTime: [ {required: true, message: "请选择计划标准发布日期", trigger: "change"} ], - LXDName: [ + FSDName: [ { required: true, validator: validateFsOnlineFile, trigger: 'blur' } ], }, @@ -434,6 +433,8 @@ export default { const bringData = standObj.data const obj = { reviewResultsContent:"", + reviewUserId:this.$store.getters.userInfo.userId, + reviewUserName:this.$store.getters.userInfo.userName, draftTime:"", releaseTime:"", expirationDate:"", @@ -518,6 +519,8 @@ export default { info.LXD = this.qbfsForm.LXD info.FSDName = this.qbfsForm.FSDName info.FSD = this.qbfsForm.FSD + info.reviewUserId = this.$store.getters.userInfo.userId + info.reviewUserName = this.$store.getters.userInfo.userName infoList.push(info) this.qbfsForm.fileModelList = infoList let json = JSON.stringify(this.qbfsForm); diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue index 606dd3a29..44e200076 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue @@ -170,6 +170,19 @@ export default { formList }, data() { + const validateLxOnlineFile = async (rule, value, callback) => { + if(this.qbfsForm.LXD){ + let fileObj = await this.processEditFile(this.qbfsForm.LXD) + if (fileObj) { + const editFileInfo = fileObj + if (editFileInfo && editFileInfo.editStatus === '1') { + callback() + } else { + callback(new Error('请先在线编辑,再提交流程！')) + } + } + } + }; const validateFsOnlineFile = async (rule, value, callback) => { if(this.qbfsForm.FSD){ let fileObj = await this.processEditFile(this.qbfsForm.FSD) @@ -237,6 +250,9 @@ export default { bussFsSubUser2Name: [ {required: true, message: "请选择企标复审人", trigger: "change"} ], + QCRBUSS: [ + {required: true, message: "请选择主起草人", trigger: "change"} + ], reviewResults: [ {required: true, message: "请选择复审结果", trigger: "change"} ], @@ -246,9 +262,15 @@ export default { releaseTime: [ {required: true, message: "请选择计划标准发布日期", trigger: "change"} ], - LXDName: [ + expirationDate: [ + {required: true, message: "请选择截止日期", trigger: "change"} + ], + FSDName: [ { required: true, validator: validateFsOnlineFile, trigger: 'blur' } ], + LXDName: [ + { required: true, validator: validateLxOnlineFile, trigger: 'blur' } + ], }, } }, @@ -266,7 +288,6 @@ export default { if (val !== '' && val !== null && typeof (val) !== 'undefined') { if(val === '1'){ if (this.bpnId === undefined) { - this.getFsFile() } } } @@ -274,18 +295,8 @@ export default { }, }, methods:{ - async getFsFile(){ - let fileObj = await this.getSaveFile("model_fs") - if(fileObj){ - this.qbfsForm.FSD = fileObj.id - if(this.qbfsForm.standName){ - this.qbfsForm.FSDName = this.qbfsForm.standName + '-复审单' - }else { - this.qbfsForm.FSDName = '复审单' - } - this.FSDList=this.assemble(fileObj.id,this.qbfsForm.FSDName); - this.formKey++ - } + async getFile(){ + }, getSaveFile(model) { return new Promise((resolve, reject) => { @@ -331,7 +342,7 @@ export default { choiceZRRList (type, title, id) { this.nodeList2 = [] if(type === 'QCRBUSS'){ - if ( this.qbfsForm.QCRBUSSID != undefined && this.qbfsForm.QCRBUSSID.length > 0) { + if ( this.qbfsForm.QCRBUSSID !== undefined && this.qbfsForm.QCRBUSSID.length > 0) { this.nodeList2 = this.qbfsForm.QCRBUSSID.split(',') } } @@ -429,11 +440,18 @@ export default { * @description: 动态表单读取 */ async getFormFieldList (item) { + let standObj = await this.getStandInfoUpdateById(item.standId) + let fileObjFx = await this.getSaveFile("model_fs") + let fileObjLx = await this.getSaveFile("model_lx") + this.$nextTick(() => { const bringData = standObj.data const obj = { + reviewResults: "", reviewResultsContent:"", + reviewUserId:this.$store.getters.userInfo.userId, + reviewUserName:this.$store.getters.userInfo.userName, draftTime:"", releaseTime:"", expirationDate:"", @@ -441,6 +459,8 @@ export default { LXD:"", FSDName:"", FSD:"", + QCRBUSSID:"", + QCRBUSS:"", } const json = Object.assign(bringData, bringData.attrInfoMap,item,obj); this.qbfsForm = JSON.parse(JSON.stringify(json)) @@ -452,8 +472,24 @@ export default { this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName); - this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName); - this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName); + if(fileObjFx){ + this.qbfsForm.FSD = fileObjFx.id + if(this.qbfsForm.standName){ + this.qbfsForm.FSDName = this.qbfsForm.standName + '-复审单' + }else { + this.qbfsForm.FSDName = '复审单' + } + this.FSDList=this.assemble(fileObjFx.id,this.qbfsForm.FSDName); + } + if(fileObjLx){ + this.qbfsForm.LXD = fileObjLx.id + if(this.qbfsForm.standName){ + this.qbfsForm.LXDName = this.qbfsForm.standName + '-立项单' + }else { + this.qbfsForm.LXDName = '立项单' + } + this.LXDList=this.assemble(fileObjLx.id,this.qbfsForm.LXDName); + } this.standardDrawer = false this.verifySarStandard = true this.formKey++ @@ -507,19 +543,6 @@ export default { this.isSubmit = true this.saveLoading = true this.qbfsForm.commentText = this.commentText - const infoList = [] - const info = {} - info.reviewResults = this.qbfsForm.reviewResults - info.reviewResultsContent = this.qbfsForm.reviewResultsContent - info.draftTime = this.qbfsForm.draftTime - info.releaseTime = this.qbfsForm.releaseTime - info.expirationDate = this.qbfsForm.expirationDate - info.LXDName = this.qbfsForm.LXDName - info.LXD = this.qbfsForm.LXD - info.FSDName = this.qbfsForm.FSDName - info.FSD = this.qbfsForm.FSD - infoList.push(info) - this.qbfsForm.fileModelList = infoList let json = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { taskIds: this.$route.query.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue new file mode 100644 index 000000000..72abfacef --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue @@ -0,0 +1,768 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index df60b7780..37ea86e39 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2028,6 +2028,15 @@ const routes = [ title: '企标复审流程' } }, + { + path: '/bussFs3', + name: 'bussFs3', + component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/step5.vue'), + meta: { + requireAuth: true, + title: '企标复审流程' + } + }, //企标复审流程 { path: '/qbfsStep1', From f30beb07c556b9434ef3eb9c849104829346cdde Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 17 Feb 2022 16:38:33 +0800 Subject: [PATCH 03/10] commit --- src/components/navMenu/index.vue | 5 + src/pages/config/pages/operationLog/index.vue | 217 ++++++++++++++++++ src/router/index.js | 11 + 3 files changed, 233 insertions(+) create mode 100644 src/pages/config/pages/operationLog/index.vue diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index a69eb65aa..05b9cd0bd 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -320,6 +320,11 @@ path: '/standLawsAttrManage', menuId: '72a24657972d286b8b5d80735cf4eee2' }, + { + title: '操作日志', + path: '/OperationLog', + menuId: '' + }, // { // title: '资料中心管理', // path: '/dynamicInformationManage', diff --git a/src/pages/config/pages/operationLog/index.vue b/src/pages/config/pages/operationLog/index.vue new file mode 100644 index 000000000..8e1683844 --- /dev/null +++ b/src/pages/config/pages/operationLog/index.vue @@ -0,0 +1,217 @@ + + + diff --git a/src/router/index.js b/src/router/index.js index df60b7780..768506fb9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3555,6 +3555,17 @@ const routes = [ menuId: 'PGPZXNUFEXC85BVPV9AU' } }, + { + path: '/OperationLog', + name: 'OperationLog', + component: () => + import('@/pages/config/pages/operationLog/index'), + meta: { + requireAuth: true, + title: '操作日志', + menuId: '' + } + }, { path: '/processManage', name: 'ProcessManage', From 0536d94fa8b1a12c4f4e5fb86e2ac0881dc911ae Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 17 Feb 2022 16:38:58 +0800 Subject: [PATCH 04/10] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbrk-product/common/formEditList.vue | 6 ++++++ .../qbrk-product/common/formList.vue | 11 +++++++++-- .../qbrk-product/common/formListIn.vue | 6 ++++++ .../pages/creatProcess/qbrk-product/step1.vue | 17 ++++++++++++++--- .../pages/creatProcess/qbrk-product/step10.vue | 1 + .../pages/creatProcess/qbrk-product/step11.vue | 1 + .../pages/creatProcess/qbrk-product/step12.vue | 1 + .../pages/creatProcess/qbrk-product/step13.vue | 1 + .../pages/creatProcess/qbrk-product/step2.vue | 1 + .../pages/creatProcess/qbrk-product/step3.vue | 1 + .../pages/creatProcess/qbrk-product/step4.vue | 1 + .../pages/creatProcess/qbrk-product/step5.vue | 1 + .../pages/creatProcess/qbrk-product/step6.vue | 1 + .../pages/creatProcess/qbrk-product/step7.vue | 1 + .../pages/creatProcess/qbrk-product/step8.vue | 1 + .../pages/creatProcess/qbrk-product/step9.vue | 1 + .../pages/creatProcess/qbrk-product/stepC3.vue | 1 + .../pages/creatProcess/qbrk-product/stepC6.vue | 1 + .../creatProcess/qbrk-product/stepDetail.vue | 1 + 19 files changed, 50 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue index d63e8d7d1..fa735fc32 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -36,6 +36,12 @@ value-format="yyyy-MM-dd" > + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue index 1bb5a4afa..9e5409652 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue @@ -26,11 +26,13 @@ - - + + @@ -98,6 +100,11 @@ > + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue index 7ba81233b..1d7e99fce 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue @@ -35,6 +35,12 @@ + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 8c488a73c..23c7456f9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -49,9 +49,9 @@ value-format="yyyy-MM-dd" > - - + @@ -148,6 +148,12 @@ > + + + @@ -1293,6 +1299,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', @@ -1418,6 +1425,9 @@ standSort: [ { required: true, message: '请选择企标类别', trigger: 'change' } ], + expirationDate: [ + {required: true, message: "请选择截止日期", trigger: "change"} + ], standStatus: [ { required: true, message: '请选择标准状态', trigger: 'change' } ], @@ -1949,6 +1959,7 @@ XGDName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue index b373b8bc4..8d1da5cdd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue @@ -817,6 +817,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue index 5bcc7d41b..dbc985d81 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue @@ -818,6 +818,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue index 4bf55cfe3..6f2a0933f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue @@ -817,6 +817,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 571ed1416..82c9d634f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -840,6 +840,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue index 6e562d173..35e6d9385 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue @@ -820,6 +820,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 217bdb1e8..a77c2a919 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -884,6 +884,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue index f5ba8628a..e3cf7f36c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue @@ -817,6 +817,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index c48af796a..60a2e04a4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -915,6 +915,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 6931e578f..bc0163325 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -955,6 +955,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue index f072c64bb..20dfa2499 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue @@ -838,6 +838,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue index 63797a4a2..85af7d8cb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue @@ -818,6 +818,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue index 9688f6d75..93b59565e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue @@ -818,6 +818,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 14c79c17f..490aa5da1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -884,6 +884,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 20eadf631..947ab22ec 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -955,6 +955,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue index 8e748d219..d0db542be 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue @@ -795,6 +795,7 @@ standEnName: '', textStatusBuss: '', issueTime: '', + expirationDate: '', putTime: '', FZRQBUSS: '', FSRQBUSS: '', From 5d3771daf40510c29e773ae3d7e481fe80fc525f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 17 Feb 2022 16:53:08 +0800 Subject: [PATCH 05/10] feat: There is no way the, --- src/pages/processCenter/pages/creatProcess/qbfs/step5.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue index 72abfacef..5b5bc4ef0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue @@ -506,6 +506,9 @@ export default { this.isSubmit = false } }) + }, + async routerBussProStand(){ + }, //流程提交 handleSubmit(){ From ac08da7f3726ff9b8e3c76f545408077c8d5737a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Feb 2022 17:13:45 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E9=A2=84=E8=A7=88=E5=8F=8A=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otherBussStandardDetails/index.vue | 24 +++++++ .../details/otherStandardDetails/index.vue | 64 +++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 28dbc4855..902fed135 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -2455,6 +2455,14 @@ export default { } else { this.$message.error('没有在线预览文档权限！') } + this.$http.get('lawss/sarBussionessStand/logBuss', { + standCode: this.sarStandardsInfoEO.standCode, + standName: this.sarStandardsInfoEO.standName + }, { + _this: this + }, res => { + console.log(res); + }) }, showItemsModel (attField) { this.fileType = attField @@ -2495,6 +2503,14 @@ export default { } else { this.$message.error('请选择要下载的文件') } + this.$http.get('lawss/sarBussionessStand/logBussDownload1', { + standCode: this.sarStandardsInfoEO.standCode, + standName: this.sarStandardsInfoEO.standName + }, { + _this: this + }, res => { + console.log(res); + }) }, downloadFileByWater (attId, fileSuffix) { if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { @@ -2506,6 +2522,14 @@ export default { this.$message.error('请选择要下载的文件') } } + this.$http.get('lawss/sarBussionessStand/logBussDownload2', { + standCode: this.sarStandardsInfoEO.standCode, + standName: this.sarStandardsInfoEO.standName + }, { + _this: this + }, res => { + console.log(res); + }) }, /** * @author liruohao diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 8ae956e29..5516dea4c 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3109,6 +3109,27 @@ export default { this.$message.error('没有在线预览文档权限！') } } + if(this.$route.params.pageType === 'INLAND_STAND'){ + let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber + this.$http.get('sarStandardsInfo/sar-standards-info/logInvalid',{ + standNumber: standNumber, + standName: this.sarStandardsInfoEO.standName + }, { + _this: this + }, res => { + console.log(res); + }) + }else{ + let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber + this.$http.get('sarStandardsInfo/sar-standards-info/logForeign',{ + standNumber: standNumber, + standName: this.sarStandardsInfoEO.standEnName + }, { + _this: this + }, res => { + console.log(res); + }) + } }, showItemsModel(attField) { this.fileType = attField @@ -3164,6 +3185,28 @@ export default { } else { this.$message.error('请选择要下载的文件') } + if(this.$route.params.pageType === 'INLAND_STAND'){ + let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber + this.$http.get('sarStandardsInfo/sar-standards-info/logInvalidDownload1',{ + standNumber: standNumber, + standName: this.sarStandardsInfoEO.standName + }, { + _this: this + }, res => { + console.log(res); + }) + }else{ + let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber + this.$http.get('sarStandardsInfo/sar-standards-info/logForeignDownload1',{ + standNumber: standNumber, + standName: this.sarStandardsInfoEO.standEnName + }, { + _this: this + }, res => { + console.log(res); + }) + } + }, downloadFileByWater(attId, fileSuffix) { if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { @@ -3175,6 +3218,27 @@ export default { this.$message.error('请选择要下载的文件') } } + if(this.$route.params.pageType === 'INLAND_STAND'){ + let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber + this.$http.get('sarStandardsInfo/sar-standards-info/logInvalidDownload2',{ + standNumber: standNumber, + standName: this.sarStandardsInfoEO.standName + }, { + _this: this + }, res => { + console.log(res); + }) + }else{ + let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber + this.$http.get('sarStandardsInfo/sar-standards-info/logForeignDownload2',{ + standNumber: standNumber, + standName: this.sarStandardsInfoEO.standEnName + }, { + _this: this + }, res => { + console.log(res); + }) + } }, /** * @Description: 跳转流程 From 9cac2db68f728c9253382964d3ead64bbfc509d9 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 17 Feb 2022 17:24:13 +0800 Subject: [PATCH 07/10] feat: There is no way the, --- .../pages/creatProcess/qbfs/step5.vue | 136 +++++++++++++++++- 1 file changed, 131 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue index 5b5bc4ef0..205b292b7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue @@ -244,8 +244,103 @@ export default { bussFsSubUser2:'', bussFsSubUser2Name:'', }, - roleForm: { - jgUser: "" + formBuss: { + selListRep2:[], + id:'', + standNum:'', + standStatus:'', // 标准状态 + planId:'', + planStatus:'', + reviseStatus:'', + standSn:'', + modelData:[], + modelDataNameVerify:[], + modelDataZrUserVerify:[], + BARQ: '', + XGD: '', + XGDName: '', + // 基础信息 + country:[], + // 基础信息 + standSort: '', + standCode: '', + standYear: '', + standName: '', + standEnName: '', + textStatusBuss: '', + issueTime: '', + expirationDate: '', + putTime: '', + FZRQBUSS: '', + FSRQBUSS: '', + // 过程稿件 + FBGBUSS: '', + FBGBUSSName: '', + BZSMBUSS: '', + BZSMBUSSName: '', + LSBBBUSS: '', + LSBBBUSSName: '', + QTWJBUSS: '', + QTWJBUSSName: '', + // 适用范围 + QCDW: '', + QCDWID: '', + QCRBUSS: '', + QCRBUSSID: '', + WJSCRYBUSS: this.$store.getters.userInfo.userId, + WJSCRYBUSSName: this.$store.getters.userInfo.userName, + SYCXCLASS: '', + NYLXCLASS: '', + SYCPXCLASS: '', + TXLBBUSS: '', + VPPSBMBUSS: '', + VPPSCNBUSS: '', + KCVPPSBMBUSS: '', + KCVPPSCNBUSS: '', + CYCVPPSBMBUSS: '', + CYCVPPSCNBUSS: '', + DYBXHBUSS: '', + DYMCBUSS: '', + // 关联信息 + DTQBBHBUSS: '', + BDTQBBHBUSS: '', + XGJLBUSS: '', + XGLC: '', + GLWJBUSS: '', + GLWJBUSSName: '', + XCSJBUSS: '', + }, // 标准信息 + roleForm:{ + bussUser3: '', + bussUser3Name: '', + bussUser6: '', + bussUser6Name: '', + bussUser2: '', // 多实例 + bussUser2Name:'', // 多实例 + bussUser5:'', // 多实例 + bussUser5Name:'', // 多实例 + bussUser4:'', + bussUser4Name:'', + bussUser7:'', + bussUser7Name:'', + bussUser8:'', + bussUser8Name:'', + bussUser9:'', + bussUser9Name:'', + bussUser10:'', + bussUser10Name:'', + bussUser11:'', + bussUser11Name:'', + bussUser12:'', + bussUser12Name:'', + bussUser13:'', + bussUser13Name:'', + bussUser14:'', + bussUser14Name:'', + applyUpdUserId: '', + applyUpdUserName: '', + prcCreateUser: '', + prcCreateUserName: '', }, formRules: { commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }], @@ -490,7 +585,9 @@ export default { _formData.append('infoJson', json) processCreateFsBuss(_formData).then(res => { if (res.result === '操作成功' || res.data === '入库成功') { - this.$message.success(res.data) + if(this.qbfsForm.standSort && this.qbfsForm.standSort.indexOf("Q/QCBFC") !== -1){ + this.routerBussProStand() + } if (this.$route.query.bpnId !== '') { let taskId = { id: this.$route.query.bpnId @@ -502,13 +599,42 @@ export default { this.submitLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { - this.$message.warning(res.message) this.isSubmit = false } }) }, async routerBussProStand(){ - + this.roleForm.bussUser3 = this.qbfsForm.QCRBUSSID + this.roleForm.bussUser3Name = this.qbfsForm.QCRBUSS + this.roleForm.bussUser6 = this.qbfsForm.QCRBUSSID + this.roleForm.bussUser6Name = this.qbfsForm.QCRBUSS + this.roleForm.applyUpdUserId = this.qbfsForm.QCRBUSSID + this.roleForm.applyUpdUserName = this.qbfsForm.QCRBUSS + this.roleForm.prcCreateUser = this.qbfsForm.QCRBUSSID + this.roleForm.prcCreateUserName = this.qbfsForm.QCRBUSS + this.formBuss.expirationDate = this.qbfsForm.expirationDate + this.formBuss.QCRBUSS = this.qbfsForm.QCRBUSS + this.formBuss.QCRBUSSID = this.qbfsForm.QCRBUSSID + this.formBuss.QCDW = this.qbfsForm.QCDW + this.formBuss.QCDWID = this.qbfsForm.QCDWID + let _formData = new FormData() + _formData.append('id', this.bpnId || '') + _formData.append('createUser', this.qbfsForm.QCRBUSSID) + _formData.append('createUserName', this.qbfsForm.QCRBUSS) + _formData.append('prcType', 'buss2') + _formData.append('prcName', '企标制修订-产品标准') + _formData.append('json', JSON.stringify({ + taskInfo: '发起企标制修订流程', + form: this.formBuss, + roleForm: this.roleForm, + commentText: this.commentText + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('自动创建企标制修订-产品标准流程，跳转至主起草人流程中心草稿') + this.bpnId = res.result + }).catch(e => { + }) }, //流程提交 handleSubmit(){ From 22d2d0a62e1079d0d60216c307a8c958cc98dd80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Feb 2022 18:35:12 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 62 ++++++++++++++++++- .../pages/creatProcess/bzrk/step2.vue | 14 ++++- .../pages/creatProcess/bzrk/step3.vue | 14 ++++- .../pages/creatProcess/bzrk/step4.vue | 51 ++++++++++++++- .../pages/creatProcess/bzrk/step5.vue | 19 +++++- 5 files changed, 150 insertions(+), 10 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 043a35eef..ebbbcd779 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -629,6 +629,23 @@ :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3" :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"> + + + + @@ -743,7 +760,7 @@ clearable > - + + + + + @@ -1477,6 +1508,7 @@ export default { key1: 2, key2: 3, key3: 4, + key4: 5, treeData: [], // 人员数据 modalShowFlag: false, // drawer开关 modalShowRoleFlag: false, // drawer开关 @@ -1484,6 +1516,7 @@ export default { modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlag5: false, // drawer开关 modalShowRoleFlag5: false, modalShowTree: false, // 归档位置drawer开关 url: '', @@ -1571,7 +1604,8 @@ export default { cycvppscn: '', // 关联模块--乘用车vpps中文名称 kccvppsbm: '', // 关联模块--卡车VPPS编码 kccvppscn: '', // 关联模块--卡车vpps中文名称 - dybxh: '', // 模块结构单元变型号 + dybxh: '', // 模块结构单元变型号卡车 + dybxhcar: '', // 模块结构单元变型号乘用车 dymc: '', // 模块结构单元名称 // 关联信息 dtbjh: '', // 代替标准号 @@ -2459,6 +2493,15 @@ export default { this.urlChild = "sarModelTree/childByList" this.key3++ }, + choiceZRR5(type, title, id) { + this.drawerTitle = title + this.modalShowFlag5 = true + this.url = '' + this.urlChild = '' + this.url = "sarModelTree/listByType" + this.urlChild = "sarModelTree/childByList" + this.key4++ + }, choiceTree(type, title, id) { this.drawerTitle = title @@ -2989,9 +3032,24 @@ export default { } }, + popoverHideModel2(checkedIds, checkedData, isShow, isLoadChild, topId) { + if (checkedData && checkedData.length != 0) { + if (checkedData.length > 0) { + this.form.dybxhcar = checkedData.map(item => item.model).join(",") + this.form.dymccar = checkedData.map(item => item.name).join(",") + } else { + this.form.dybxhcar = checkedData.model + this.form.dymccar = checkedData.name + } + this.modalShowFlag5 = false + } + }, popoverHideModelCancel() { this.modalShowFlag4 = false }, + popoverHideModelCancel2() { + this.modalShowFlag5 = false + }, closeDrawer() { this.ListModel = false }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 001546aa4..c9dc34bae 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -407,9 +407,12 @@ - + + + + @@ -486,13 +489,20 @@ clearable > - + + + + {{ form.wssmr }} diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 4571b8626..d7d84b0f6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -370,9 +370,12 @@ - + + + + @@ -449,13 +452,20 @@ clearable > - + + + + {{form.wssmr}} diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index f5042d653..caca4b13c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -860,7 +860,7 @@ :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2" :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"> - + + + + + @@ -990,7 +1006,7 @@ clearable > - + + + + + @@ -1544,6 +1574,7 @@ export default { key1: 2, key2: 3, key3: 4, + key4: 5, defaultCheckedKeys1: [], defaultCheckedKeys2: [], defaultCheckedKeys3: [], @@ -1553,6 +1584,7 @@ export default { modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlag5: false, // drawer开关 modalShowTree: false, // 归档位置drawer开关 url: '', urlChild: '', @@ -2469,9 +2501,24 @@ export default { } }, + popoverHideModel2(checkedIds, checkedData, isShow, isLoadChild, topId) { + if (checkedData && checkedData.length != 0) { + if (checkedData.length > 0) { + this.form.dybxhcar = checkedData.map(item => item.model).join(",") + this.form.dymccar = checkedData.map(item => item.name).join(",") + } else { + this.form.dybxhcar = checkedData.model + this.form.dymccar = checkedData.name + } + this.modalShowFlag5 = false + } + }, popoverHideModelCancel() { this.modalShowFlag4 = false }, + popoverHideModelCancel2() { + this.modalShowFlag5 = false + }, processTable() { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index 036269fef..f27f578df 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -322,7 +322,7 @@ clearable > - + + + + @@ -406,13 +414,20 @@ clearable > - + + + + From 6a88b8111f69bd54aa90c6a9576a13f9f387e72f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Feb 2022 18:36:02 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E5=8D=95=E5=85=83=E5=8F=98=E5=9E=8B=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 104 +++++++++++++--- .../foreignStandardsAndRegulations/index.vue | 116 +++++++++++++++--- 2 files changed, 186 insertions(+), 34 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 15e6262ed..775c6512a 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -584,18 +584,7 @@ @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"> - + + + +