From 655e13d717d53f33da3fde4b8bae05559b216cb2 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 28 Jun 2022 15:01:32 +0800 Subject: [PATCH 1/8] feat: There is no way the, bug #55699 --- .../pages/phone/qbzxdjhgk/step2.vue | 14 ++++++++------ .../pages/phone/qbzxdjhgk/step3.vue | 12 ++++++++++++ .../pages/phone/qbzxdjhgk/step4.vue | 12 ++++++++++++ .../pages/phone/qbzxdjhgk/step5.vue | 16 +++++++++++++++- 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue index 88f533b92..34e278ec2 100644 --- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue @@ -127,6 +127,7 @@ export default { type: '', commentText: '', qbfsForm: {}, + LXDList:[], isTransfer: false, isSubmit: false, saveLoading: false, @@ -220,13 +221,14 @@ export default { }) }, assemble(ids,names){ - let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i 0){ + this.qbfsForm.area = this.qbfsForm.area.join(',') + } this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { From 4c3793df516b1745b964d3459133970c04106839 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Tue, 28 Jun 2022 15:27:54 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20=E7=82=B9=E5=87=BB?= =?UTF-8?q?=20=E6=8F=90=E9=97=AE=20=E6=8C=89=E9=92=AE=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../personal/pages/my-questions/index.vue | 36 +++++++++++++------ .../regulatoryRepository/standQA/index.vue | 20 +++++++++-- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index efd2df19f..fb20e7549 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -1673,17 +1673,31 @@ export default { queBtn(){ this.fileList = [] // 清空提问 - const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand) - this.standType = selectedStand.classification - this.questionForm = { - pubQue : selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题 - classification: selectedStand.classification, //标准类型 - problemDescription: '', //问题 - questioner: this.$store.getters.userInfo.userId, //提问人 - standardEncdoing: selectedStand.standardEncdoing, //标准编号 - standardName: selectedStand.standardName, //标准名称 - standardId: selectedStand.standardId, //标准id - fileList: '', + if(this.standList.length === 0){ + this.standType = !this.activeType ? 'INLAND' : this.activeType + this.questionForm = { + pubQue : '',//公共问题 + classification: !this.activeType ? 'INLAND' : this.activeType, //标准类型 + problemDescription: '', //问题 + questioner: this.$store.getters.userInfo.userId, //提问人 + standardEncdoing: '', //标准编号 + standardName: '', //标准名称 + standardId:'', //标准id + fileList: '', + } + }else{ + const selectedStand = this.activestand == '0' || this.activeType === 'INLAND' ? this.standList[0] : this.standMap.get(this.activestand) + this.standType = selectedStand.classification + this.questionForm = { + pubQue : selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题 + classification: selectedStand.classification, //标准类型 + problemDescription: '', //问题 + questioner: this.$store.getters.userInfo.userId, //提问人 + standardEncdoing: selectedStand.standardEncdoing, //标准编号 + standardName: selectedStand.standardName, //标准名称 + standardId: selectedStand.standardId, //标准id + fileList: '', + } } this.dialogVisible = true }, diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index 573318d95..1c0fe93f9 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -1047,9 +1047,22 @@ export default { //提问按钮 queBtn(){ this.fileList = [] - const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand) - this.standType = selectedStand.classification - this.questionForm = { + if(this.standList.length === 0){ + this.standType = !this.activeType ? 'INLAND' : this.activeType + this.questionForm = { + pubQue : '',//公共问题 + classification: !this.activeType ? 'INLAND' : this.activeType, //标准类型 + problemDescription: '', //问题 + questioner: this.$store.getters.userInfo.userId, //提问人 + standardEncdoing: '', //标准编号 + standardName: '', //标准名称 + standardId:'', //标准id + fileList: '', + } + }else{ + const selectedStand = this.activestand == '0' || this.activeType === 'INLAND' ? this.standList[0] : this.standMap.get(this.activestand) + this.standType = selectedStand.classification + this.questionForm = { pubQue : selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题 classification: selectedStand.classification, //标准类型 problemDescription: '', //问题 @@ -1058,6 +1071,7 @@ export default { standardName: selectedStand.standardName, //标准名称 standardId: selectedStand.standardId, //标准id fileList: '', + } } this.dialogVisible = true }, From dbd7b74a28cef9dd48948c2f91d3dd19a207e60f Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 28 Jun 2022 17:57:00 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20?= =?UTF-8?q?=E6=94=B9=E6=94=B9=E6=94=B9=20=E4=BB=8E=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=BC=80=E5=A7=8B=20=E6=94=B9=E5=88=B0=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E5=8F=8A?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=93=20=E6=94=B9=E8=87=B3=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=B7=B2=E7=A1=AE=E8=AE=A4=E5=85=B3=E8=81=94=E4=B9=8B?= =?UTF-8?q?=E5=A4=9A=E2=80=A6=E2=80=A6=20=E5=BE=85=E6=94=B9=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/process.js | 8 ++ .../pages/creatProcess/qbrk/step1.vue | 4 +- .../qbzxdjhgk/component/establish.vue | 25 +++++- .../pages/creatProcess/qbzxdlx/step1.vue | 65 ++++++++++----- .../pages/creatProcess/qbzxdlx/step2.vue | 81 +++++++++++++------ .../enterpriseStandardPlan/index.vue | 6 +- 6 files changed, 139 insertions(+), 50 deletions(-) diff --git a/src/api/process.js b/src/api/process.js index 79874460a..ed2cf8171 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -93,6 +93,14 @@ export function processCreateBuss (data) { }) } +export function processCreatePlan (data) { + return axios({ + url: '/api/lawss/actSarItemsPlan/processCreatePlan', + method: 'post', + data + }) +} + export function processCreateFsBuss (data) { return axios({ url: '/api/lawss/actSarItemsBuss/processCreateFsBuss', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index cb7e6bce9..a6be96fce 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1630,6 +1630,8 @@ map.set('2','修订中') map.set('3','已取消') map.set('4','已完成') + map.set('5','立项已完成') + map.set('6','计划已确认') return map.get(item) }, modelProp(row,index){ @@ -2097,7 +2099,7 @@ this.standardSearchForm.page = 1 this.standardSearchForm.unit = '' this.standardSearchForm.esName = '' - this.standardSearchForm.planStatus = '0,3' + this.standardSearchForm.planStatus = '0,3,6' this.standardSearchForm.reviseStatus = '' setTimeout(() => { this.handleSearchStandard() diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index e7bc44a9c..f33243c47 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -23,7 +23,7 @@ @@ -424,6 +424,25 @@ export default { }, props: ['message'], data(){ + const standNameVerify = (rule, value, callback) => { + if(value === '' || value === null){ + return callback(new Error('请输入企标名称')) + }else { + this.$http.get('esRevisePlan/es-revise-plan/getDataByNameAndSort', { + bussSort: this.qbfsForm.bussSort, + esName: this.qbfsForm.esName, + }, { + _this: this, + }, res => { + if (res.data && res.data > 0) { + return callback(new Error('企标名称重复')) + }else { + callback() + } + }, e => { + }) + } + }; return { workModel: false, workSearch: { @@ -473,7 +492,7 @@ export default { unit: "", // 单位 unitName: "", esName: "", // 企标名称 - planStatus: "0", // 计划状态 + planStatus: "6", // 计划状态 reviseStatus: "", // 制修订类型 area: "", //适用车型 isRelate: "", //采用何种标准 @@ -500,7 +519,7 @@ export default { { required: true, message: "请选择企标类别", trigger: "blur" } ], esName: [ - { required: true, message: "请输入企标名称", trigger: "blur" } + { required: true, validator: standNameVerify, trigger: "blur" } ], reviseStatus: [ { required: true, message: "请选择制修订类型", trigger: "blur" } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 2995bc6b1..13187006c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -156,7 +156,7 @@ @@ -368,7 +368,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; import MechanismTree from "@/components/mechanismTree"; -import { queryTaskFirst, saveTaskFirst, taskDel, downloadStatus } from "@/api/process.js"; +import { queryTaskFirst, saveTaskFirst, taskDel, downloadStatus,processCreatePlan} from "@/api/process.js"; export default { components: { @@ -379,6 +379,25 @@ export default { }, name: "qbzxdlxStep1", data() { + const standNameVerify = (rule, value, callback) => { + if(value === '' || value === null){ + return callback(new Error('请输入企标名称')) + }else { + this.$http.get('esRevisePlan/es-revise-plan/getDataByNameAndSort', { + bussSort: this.addQblxData.bussSort, + esName: this.addQblxData.esName, + }, { + _this: this, + }, res => { + if (res.data && res.data > 0) { + return callback(new Error('企标名称重复')) + }else { + callback() + } + }, e => { + }) + } + }; return { tableLoading: false, importModalshowflag: false, //导入弹窗 @@ -445,15 +464,15 @@ export default { // unit: [ // { required: true, message: "请选择起草单位", trigger: "change" } // ], - // bussSort: [ - // { required: true, message: "请选择企标类别", trigger: "blur" } - // ], - // esName: [ - // { required: true, message: "请输入企标名称", trigger: "blur" } - // ], - // reviseStatus: [ - // { required: true, message: "请选择制修订类型", trigger: "blur" } - // ], + bussSort: [ + { required: true, message: "请选择企标类别", trigger: "blur" } + ], + esName: [ + { required: true, validator: standNameVerify, trigger: "blur" } + ], + reviseStatus: [ + { required: true, message: "请选择制修订类型", trigger: "blur" } + ], // resPersonName: [ // { required: true, message: "请输入评审责任人", trigger: "blur" } // ], @@ -959,16 +978,22 @@ export default { _this: this }, res => { if (res.success) { - resolve() - this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - // return res + const _formData = new FormData() + _formData.append('infoJson', JSON.stringify(newForm)) + processCreatePlan(_formData).then(res => { + if (res.result === '操作成功' || res.data === '入库成功') { + resolve() + this.$message.success(res.message); + if (this.bpnId !== undefined && this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + // return res + }) + } + } }) - } // this.$router.push("/processCenter"); } }); diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index cc61b2324..7e5d9bd36 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -13,7 +13,7 @@ - @@ -596,6 +596,25 @@ export default { CustomInputForAllStandards2 }, data(){ + const standNameVerify = (rule, value, callback) => { + if(value === '' || value === null){ + return callback(new Error('请输入企标名称')) + }else { + this.$http.get('esRevisePlan/es-revise-plan/getDataByNameAndSort', { + bussSort: this.qbfsForm.bussSort, + esName: this.qbfsForm.esName, + }, { + _this: this, + }, res => { + if (res.data && res.data > 0) { + return callback(new Error('企标名称重复')) + }else { + callback() + } + }, e => { + }) + } + }; return { active: '1', commentText: '', @@ -704,39 +723,39 @@ export default { examineName: "" }, qbfsFormRules: { - unit: [ - { required: true, message: "请选择起草单位", trigger: "change" } - ], + // unit: [ + // { required: true, message: "请选择起草单位", trigger: "change" } + // ], bussSort: [ { required: true, message: "请选择企标类别", trigger: "blur" } ], esName: [ - { required: true, message: "请输入企标名称", trigger: "blur" } + { required: true, validator: standNameVerify, trigger: "blur" } ], reviseStatus: [ { required: true, message: "请选择制修订类型", trigger: "blur" } ], - resPersonName: [ - { required: true, message: "请输入评审责任人", trigger: "blur" } - ], - wgLeaderName: [ - { required: true, message: "请输入工作组组长", trigger: "blur" } - ], - unitName: [ - { required: true, message: "请选择起草责任单位", trigger: "blur" } - ], - draftTime: [ - { required: true, message: "请输入计划标准初稿完成时间", trigger: "blur" } - ], - releaseTime: [ - {required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, - ], + // resPersonName: [ + // { required: true, message: "请输入评审责任人", trigger: "blur" } + // ], + // wgLeaderName: [ + // { required: true, message: "请输入工作组组长", trigger: "blur" } + // ], + // unitName: [ + // { required: true, message: "请选择起草责任单位", trigger: "blur" } + // ], + // draftTime: [ + // { required: true, message: "请输入计划标准初稿完成时间", trigger: "blur" } + // ], + // releaseTime: [ + // {required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, + // ], drafterName: [ {required: true, message: '请选择起草人', trigger: 'change'}, ], - newReason: [ - {required: true, message: '请输入立项原因', trigger: 'blur'}, - ], + // newReason: [ + // {required: true, message: '请输入立项原因', trigger: 'blur'}, + // ], }, } @@ -745,6 +764,19 @@ export default { this.getWorkData() this.processTable() this.getData() + + this.$http.get('/lawss/activiti/saveEditFile', { + model: 'model_lx' + },{ + _this: this + }, res => { + console.log(res) + if(res){ + this.qbfsForm.LXD = res.id + this.qbfsForm.LXDName = '立项单' + this.LXDList=this.assemble(res.id,'立项单'); + } + }) //查询下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this @@ -918,7 +950,6 @@ export default { this.getFileInfo(); }); this.type = item.type - this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName); }) }, // 请求上传的文件信息 diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 7dd20272b..db9788536 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -11,6 +11,8 @@ + + @@ -240,7 +242,7 @@ - + @@ -911,6 +913,8 @@ map.set('2','修订中') map.set('3','已取消') map.set('4','已完成') + map.set('5','立项已完成') + map.set('6','计划已确认') return map.get(item) }, TXJGcloseDrawer () { From 07eaed65a3ca22287c3b257cf808fca713e073d9 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Wed, 29 Jun 2022 13:24:55 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomFormComponents/File.vue | 85 ++++++++++++++++++- .../domesticStandardsAndRegulations/index.vue | 1 + 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index ff7bece28..8c53d94bb 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -53,7 +53,7 @@ multiple drag - :show-file-list="showUploadlist" + :show-file-list="!showModifyName && showUploadlist" :on-success="uploadSuccess" :before-upload="beforeUpload" :on-remove="removeOneFile" @@ -68,6 +68,43 @@
{{ tips }}
+ + + + + + +
+ 提交 + 取消 +
@@ -87,7 +124,13 @@ export default { uploadPath: 'api/att/attFile/uploadNew', defaultFileList: [], // 默认显示 showFileList: [], - importModalshowflagtemp: false + importModalshowflagtemp: false, + modifyFile: { + fileName: '', + fileId: '' + }, + openModifyFileNameDialog: false, + modifyFileNameLoading: false } }, props: { @@ -150,6 +193,10 @@ export default { }, showUploadBtn: { type: Boolean + }, + showModifyName: { + type: Boolean, + default: false } }, watch: { @@ -204,6 +251,32 @@ export default { } }, methods: { + handleRemoveFile(file){ + console.log('file = ', file) + const index = this.$refs.importFileAboutStand.uploadFiles.findIndex(e => e.response.data.id === file.response.data.id); + console.log('index = ', index) + this.$refs.importFileAboutStand.uploadFiles.splice(index, 1); + this.showFileList.splice(index, 1) + }, + handleModifyName(file) { + this.modifyFile.fileName = file.name + this.modifyFile.fileId = file.response.data.id + this.openModifyFileNameDialog = true + }, + handleModifyNameSubmite(){ + this.modifyFileNameLoading = true + this.$http.get('att/attFile/updateFileName', this.modifyFile, { + _this: this + }, res => { + if(res.ok){ + this.modifyFileNameLoading = false + this.openModifyFileNameDialog = false + // TODO 查修改成功后 回显新的 名称 + } + }, e => { + this.modifyFileNameLoading = false + }) + }, handleExceed(files, fileList) { if (this.exceed) { this.$message.warning(this.exceed) @@ -491,4 +564,12 @@ export default { color: rgba(64, 158, 255, 1); } } + .el-upload-list__item .el-icon-edit{ + position: absolute; + top: 5px; + right: 25px; + cursor: pointer; + opacity: .75; + color: #606266; + } diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 65c40907c..2e5c41fcb 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -749,6 +749,7 @@ :config="field" v-model="sarStandardsInfoEO[field.attrField]" :disabled="formdisableflag" + :show-modify-name="true" @fileSuccess="fileSuccess" > From ec5aa1f48188cbd4ff7d1526830be899074ab77c Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Wed, 29 Jun 2022 15:37:42 +0800 Subject: [PATCH 5/8] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20?= =?UTF-8?q?=E6=94=B9=E6=94=B9=E6=94=B9=20=E4=BB=8E=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=BC=80=E5=A7=8B=20=E6=94=B9=E5=88=B0=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E5=8F=8A?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=93=20=E6=94=B9=E8=87=B3=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=B7=B2=E7=A1=AE=E8=AE=A4=E5=85=B3=E8=81=94=E4=B9=8B?= =?UTF-8?q?=E5=A4=9A=E2=80=A6=E2=80=A6=20=E6=94=B9=E4=B8=BA=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk-product/step1.vue | 38 ++++++---- .../creatProcess/qbrk-product/step13.vue | 11 +++ .../pages/creatProcess/qbrk/step1.vue | 41 +++++++++- .../pages/creatProcess/qbrk/step13.vue | 11 +-- .../pages/creatProcess/qbrk/stepC1.vue | 4 +- .../pages/creatProcess/qbzxdjhgk/step5.vue | 8 +- .../pages/creatProcess/qbzxdlx/step1.vue | 25 +++---- .../pages/creatProcess/qbzxdlx/step2.vue | 75 ++++++++++--------- .../components/EnterpriseStandardDatabase.vue | 34 +++++---- .../enterpriseStandardPlan/index.vue | 4 +- 10 files changed, 161 insertions(+), 90 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 2f265bf1c..f077373ff 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -2988,20 +2988,32 @@ _this: this }, res => { if (res.success) { - this.submitLoading = false - this.isSubmit = false - if (this.$route.query.bpnId !== '') { - let taskId = { - id: this.$route.query.bpnId + const planForm = {} + planForm.reviseStatus = this.form.reviseStatus + planForm.standCode = this.form.DTQBBHBUSS + planForm.processType = "buss2"; + this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { + _this: this + }, res => { + if (res.ok) { + if (res.data === '操作成功') { + this.submitLoading = false + this.isSubmit = false + if (this.$route.query.bpnId !== '') { + let taskId = { + id: this.$route.query.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } + // 流程提交之后，应该流转至待办任务页面 + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { + } + } else { + this.$message.warning(res.data) } - taskDel(taskId).then(res=>{ - return res - }) - } - // 流程提交之后，应该流转至待办任务页面 - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - } else { - this.$message.warning(res.data) + }) } }) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 6b488757d..028384d5e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -2501,6 +2501,17 @@ return if (res.result === '操作成功' || res.ok) { // 自动匹配配置标准 this.saveConfStand(res.data) + const planForm = {} + planForm.planStatus = '4' + planForm.reviseStatus = this.form.reviseStatus + planForm.standCode = this.form.DTQBBHBUSS + planForm.processType = "buss2"; + this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { + _this: this + }, res => { + this.submitLoading = false + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + }) } else { this.$message.warning(res.message) this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index a6be96fce..e7b83f3ea 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -2927,6 +2927,43 @@ json.applyUpdUserId = this.form.applyUpdUserId json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName + + + + + const planForm = {} + planForm.id = this.form.planId + planForm.reviseStatus = this.form.reviseStatus + planForm.standCode = this.form.DTQBBHBUSS + planForm.processType = "buss1"; + this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { + _this: this + }, res => { + if (res.ok) { + if (res.data === '操作成功') { + this.submitLoading = false + this.isSubmit = false + if (this.$route.query.bpnId !== '') { + let taskId = { + id: this.$route.query.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } + // 流程提交之后，应该流转至待办任务页面 + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { + } + } else { + this.$message.warning(res.data) + } + }) + + return + + + + this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -2949,7 +2986,9 @@ this.$message.success(res.message) const planForm = {} planForm.id = this.form.planId - planForm.planStatus = '2' + planForm.reviseStatus = this.form.reviseStatus + planForm.standCode = this.form.DTQBBHBUSS + planForm.processType = "buss1"; this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 1297948fb..b84238721 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2554,17 +2554,12 @@ const planForm = {} planForm.id = this.form.planId planForm.planStatus = '4' + planForm.reviseStatus = this.form.reviseStatus + planForm.standCode = this.form.DTQBBHBUSS + planForm.processType = "buss1"; this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { _this: this }, res => { - if (this.$route.query.bpnId && this.$route.query.bpnId !== '') { - let taskId = { - id: this.$route.query.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } this.submitLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index c1f0c13b9..a355675ef 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -2720,7 +2720,9 @@ this.$message.success(res.message) const planForm = {} planForm.id = this.form.planId - planForm.planStatus = '2' + planForm.reviseStatus = this.form.reviseStatus + planForm.standCode = this.form.DTQBBHBUSS + planForm.processType = "buss1"; this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 9569bdd37..4586db6f2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -508,8 +508,12 @@ export default { handleSubmit(){ this.isSubmit = true this.qbfsForm.bzfgbzFlag = '0' - this.qbfsForm.planStatus = '未开始' - this.qbfsForm.area = this.qbfsForm.area.join(',') + this.qbfsForm.planStatus = '计划已确认' + if(this.qbfsForm.area && this.qbfsForm.length > 0){ + this.qbfsForm.area = this.qbfsForm.area.join(',') + }else { + this.qbfsForm.area = "" + } this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 13187006c..b807dce55 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -951,7 +951,6 @@ export default { }) }, listSubmit (item) { - console.log(item); return new Promise((resolve, reject) => { let newForm = Object.assign(this.roleForm, item,this.qblx_pageData); newForm.startUserName = this.$store.getters.userInfo.userName @@ -978,22 +977,16 @@ export default { _this: this }, res => { if (res.success) { - const _formData = new FormData() - _formData.append('infoJson', JSON.stringify(newForm)) - processCreatePlan(_formData).then(res => { - if (res.result === '操作成功' || res.data === '入库成功') { - resolve() - this.$message.success(res.message); - if (this.bpnId !== undefined && this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - // return res - }) - } - } + resolve() + this.$message.success(res.message); + if (this.bpnId !== undefined && this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + // return res }) + } // this.$router.push("/processCenter"); } }); diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 7e5d9bd36..b21ed321d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -582,7 +582,7 @@ import ProcessTitle from "../../components/ProcessTitle"; import MechanismTree from "@/components/mechanismTree"; import CustomInputForAllStandards from '@/components/CustomFormComponents/InputForAllStandards' import CustomInputForAllStandards2 from '@/components/CustomFormComponents/InputForAllStandards2' -import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst, taskDel } from "api/process"; +import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst, taskDel,processCreatePlan } from "api/process"; export default { @@ -816,46 +816,53 @@ export default { _this: this }, res => { if (res.success) { - 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) + 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 + }) }, { _this: this }, res => { - if (res.success) { - this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId + 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" }); } - 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/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 9b78b021f..b0a2dec3e 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -429,13 +429,13 @@ @@ -1210,7 +1210,7 @@ - + - + + + From be74ba81a1b1d13d594a29f9965bc65f9460eda4 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Wed, 29 Jun 2022 16:05:02 +0800 Subject: [PATCH 6/8] feat: There is no way the, --- .../processCenter/pages/creatProcess/qbrk-product/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index f077373ff..8cdd2205c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -2999,7 +2999,7 @@ if (res.data === '操作成功') { this.submitLoading = false this.isSubmit = false - if (this.$route.query.bpnId !== '') { + if (this.$route.query.bpnId && this.$route.query.bpnId !== '') { let taskId = { id: this.$route.query.bpnId } From 16e775db44b10554ce2a27d0ebb764ea120a13a8 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Wed, 29 Jun 2022 16:31:58 +0800 Subject: [PATCH 7/8] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E8=A1=A5=E6=BC=8F=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1.vue | 39 +------------------ 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index e7b83f3ea..531523a04 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -2927,43 +2927,6 @@ json.applyUpdUserId = this.form.applyUpdUserId json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName - - - - - const planForm = {} - planForm.id = this.form.planId - planForm.reviseStatus = this.form.reviseStatus - planForm.standCode = this.form.DTQBBHBUSS - planForm.processType = "buss1"; - this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { - _this: this - }, res => { - if (res.ok) { - if (res.data === '操作成功') { - this.submitLoading = false - this.isSubmit = false - if (this.$route.query.bpnId !== '') { - let taskId = { - id: this.$route.query.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } - // 流程提交之后，应该流转至待办任务页面 - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { - } - } else { - this.$message.warning(res.data) - } - }) - - return - - - - this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -2988,7 +2951,7 @@ planForm.id = this.form.planId planForm.reviseStatus = this.form.reviseStatus planForm.standCode = this.form.DTQBBHBUSS - planForm.processType = "buss1"; + planForm.processType = "buss1" this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { _this: this }, res => { From d21c1a3d23db5fe3a24977a67ac12039b0ff1613 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Thu, 30 Jun 2022 09:16:20 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomFormComponents/File.vue | 11 ++++++++--- .../components/EnterpriseStandardDatabase.vue | 1 + .../foreignStandardsAndRegulations/index.vue | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index 8c53d94bb..278d37d52 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -251,18 +251,19 @@ export default { } }, methods: { + // 删除 handleRemoveFile(file){ - console.log('file = ', file) const index = this.$refs.importFileAboutStand.uploadFiles.findIndex(e => e.response.data.id === file.response.data.id); - console.log('index = ', index) this.$refs.importFileAboutStand.uploadFiles.splice(index, 1); this.showFileList.splice(index, 1) }, + // 修改 handleModifyName(file) { this.modifyFile.fileName = file.name this.modifyFile.fileId = file.response.data.id this.openModifyFileNameDialog = true }, + // 修改dialog-确认 handleModifyNameSubmite(){ this.modifyFileNameLoading = true this.$http.get('att/attFile/updateFileName', this.modifyFile, { @@ -271,7 +272,11 @@ export default { if(res.ok){ this.modifyFileNameLoading = false this.openModifyFileNameDialog = false - // TODO 查修改成功后 回显新的 名称 + this.showFileList.forEach(item=>{ + if(item.response.data.id === this.modifyFile.fileId){ + item.name = this.modifyFile.fileName + } + }) } }, e => { this.modifyFileNameLoading = false diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index b0a2dec3e..ee5d345af 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -823,6 +823,7 @@ :config="field" v-model="sarBussionessStandEO[field.attrField]" :disabled="formdisableflag" + :show-modify-name="true" >