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 1/2] =?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 2/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20?= =?UTF-8?q?=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',