From e5988362cbeeb75322214c0cb8175ed214ba410f Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 16 Nov 2022 17:03:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1.vue | 6362 +++++++++-------- .../pages/creatProcess/qbzxdlx/step2.vue | 96 +- .../pages/creatProcess/xmqdqr/step1.vue | 15 +- .../tabComponents/newProcess/index.vue | 5 +- .../regulatoryRepository/dataCenter/index.vue | 220 +- 5 files changed, 3442 insertions(+), 3256 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index d742dd1b1..1afbe241d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1,3161 +1,3299 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 92c969dcf..52a1f82f3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -193,19 +193,19 @@ v-model="qbfsForm.esMatingRelations" > - - - - - - - + + + + + + +
{{ item.name }} - - - + + + @@ -842,51 +842,51 @@ export default { if (res.success) { const _formData = new FormData() _formData.append('infoJson', JSON.stringify(this.qbfsForm)) - processCreatePlan(_formData).then(res => { - this.qbfsForm.planId = res.data - if (res.code === '200' || res.message === '入库成功'){ - this.isSubmit = true; - this.qbfsForm.type = '5' - this.qbfsForm.commentText = this.commentText; - let json = Object.assign(this.qbfsForm, this.roleForm); - this.$http.post("lawss/activiti/startProcessRollBack", { - createUser: this.$store.getters.userInfo.userId, - createUserName: this.$store.getters.userInfo.userName, - type: '25', - json: JSON.stringify({ - roleForm: this.roleForm, - qbfsForm: this.qbfsForm, - commentText: this.commentText - }) + // processCreatePlan(_formData).then(res => { + // this.qbfsForm.planId = res.data + // if (res.code === '200' || res.message === '入库成功'){ + this.isSubmit = true; + this.qbfsForm.type = '5' + this.qbfsForm.commentText = this.commentText; + let json = Object.assign(this.qbfsForm, this.roleForm); + this.$http.post("lawss/activiti/startProcessRollBack", { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '25', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: this.qbfsForm, + commentText: this.commentText + }) + }, { + _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 => { - 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 => { - if (res.success) { - this.$message.success("企标制修订立项计划-立项已完成"); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } - this.isSubmit = false; - this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); + if (res.success) { + this.$message.success("企标制修订立项计划-立项已完成"); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId } - }); + taskDel(taskId).then(res=>{ + return res + }) + } + this.isSubmit = false; + this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } }); } - }) + }); + // } + // }) } this.isSubmit = false }, e => { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 26cdb6e2d..9ce27d44d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -282,6 +282,18 @@ placeholder="请输入项目名称" > + + + + + + - + + + + + + + + + - + + + + + + + + + + + + type="date" + value-format="yyyy-MM-dd" + placeholder="请选择上传开始时间"> + + + + @@ -231,21 +255,21 @@
@@ -267,61 +291,61 @@ + class="upload-demo" + action="/api/att/attFile/uploadNew" + :before-upload="beginImportFile" + :on-preview="handlePreview" + :on-remove="handleRemove" + multiple + :limit="50" + :on-exceed="handleExceed" + :on-success="uploadSuccess" + :file-list="fileList"> 点击上传 @@ -409,6 +433,7 @@ export default { total: 0 }, dataCenterTable: [], + cbcdOptions: [], productModelAdd: { name: '', parentId: '', @@ -730,12 +755,17 @@ export default { }, searchInfo() { this.loading = true - if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){ - this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0] - this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1] - }else{ - this.dataCenterSearch.startDataUploadTime ='' - this.dataCenterSearch.endDataUploadTime = '' + // if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){ + // this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0] + // this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1] + // }else{ + // this.dataCenterSearch.startDataUploadTime ='' + // this.dataCenterSearch.endDataUploadTime = '' + // } + if(this.dataCenterSearch.endDataUploadTime < this.dataCenterSearch.startDataUploadTime){ + this.$message.warning('结束时间不能小于开始时间') + this.loading = false + return } this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, { _this: this @@ -806,35 +836,35 @@ export default { if (valid) { if (this.attributeTitle === '新增'){ this.$http.postData( - 'fileMaterialCenter/file-material', - this.attributeEO, - { - _this: this, - }, - (res) => { - if (res.ok) { - this.$message.success('新增成功') - this.submitLoading = false - this.cancelModel() - this.searchInfo() - } + 'fileMaterialCenter/file-material', + this.attributeEO, + { + _this: this, + }, + (res) => { + if (res.ok) { + this.$message.success('新增成功') + this.submitLoading = false + this.cancelModel() + this.searchInfo() } + } ) }else { this.$http.putData( - 'fileMaterialCenter/file-material', - this.attributeEO, - { - _this: this, - }, - (res) => { - if (res.ok) { - this.$message.success('修改成功') - this.submitLoading = false - this.cancelModel() - this.searchInfo() - } + 'fileMaterialCenter/file-material', + this.attributeEO, + { + _this: this, + }, + (res) => { + if (res.ok) { + this.$message.success('修改成功') + this.submitLoading = false + this.cancelModel() + this.searchInfo() } + } ) } }else{ @@ -868,7 +898,7 @@ export default {