From 96c1e226f90bd7b0cc6a15dfd8af7455f0c7b04a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 30 Nov 2021 15:20:43 +0800 Subject: [PATCH 1/5] commit --- .../domesticStandardsAndRegulations/index.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index cd6263266..d5870ed0a 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -409,7 +409,7 @@
数据加载中……
取消 - 转换 + {{ OCRSubmitButton }}
@@ -1947,6 +1947,8 @@ export default { }, data() { return { + OCRSubmitLoading: false, + OCRSubmitButton: '', OCRType: '', OCRoptions: [], OCRDatas: [], @@ -2671,6 +2673,7 @@ export default { } else if (this.OCRDatas.length === 0) { this.$message.warning('请选择一个文件') } else { + this.OCRSubmitLoading = true if (this.OCRType === '0') { let json = { standNumber: this.ocrList[0].standYear ? this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber + '-' + this.ocrList[0].standYear : this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber, @@ -2687,6 +2690,7 @@ export default { }, (res) => { this.OCRModel = false + this.OCRSubmitLoading = false if (res.ok) { this.$message.success('OCR实别成功') } else { @@ -2705,6 +2709,7 @@ export default { _this: this }, res => { this.OCRModel = false + this.OCRSubmitLoading = false if (res.ok) { this.$message.success('拆分成功') } else { @@ -2720,12 +2725,15 @@ export default { if (type === '0') { text = 'OCR识别' this.OCRTitle = '选择OCR识别文件' + this.OCRSubmitButton = '转换' } else if (type === '1') { text = '拆分' this.OCRTitle = '选择拆分文件' + this.OCRSubmitButton = '拆分' } else if (type === '2') { text = '编辑' this.OCRTitle = '选择编辑文件' + } if (this.ocrList.length > 1 && (type === '0' || type === '1' || type === '2')) { this.$message.warning('仅能选择一条数据进行' + text) From fe515ee5f7485e79ba2fe617f26fe24e0836e143 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 30 Nov 2021 15:47:54 +0800 Subject: [PATCH 2/5] commit --- .../domesticStandardsAndRegulations/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index d5870ed0a..344e5e8cb 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2702,7 +2702,8 @@ export default { } else if (this.OCRType === '1') { let splitEo = {} splitEo.standId = this.OCRDatas[0].standId - splitEo.fileType = this.setWBType(this.OCRDatas[0].standFileClassify) + splitEo.fileType = this.OCRDatas[0].standFileClassify + // splitEo.fileType = this.setWBType(this.OCRDatas[0].standFileClassify) splitEo.attId = this.OCRDatas[0].attId splitEo.fileName = this.OCRDatas[0].fileName this.$http.postData('lawss/sarFileSplitInfo/fileSplit', splitEo, { From 03c60eaf298f4657e458b0d05e5da11a7025a1b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 30 Nov 2021 16:04:54 +0800 Subject: [PATCH 3/5] commit --- .../pages/creatProcess/xmpg2/step6.vue | 132 ++++++++---------- 1 file changed, 57 insertions(+), 75 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index a098e5bef..7e4958433 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -142,6 +142,7 @@ > @@ -193,6 +195,7 @@ @@ -217,6 +220,7 @@ :disabled="acceptShow" class="datePickLen" clearable + @click.native="handlePrice(scope.row)" v-model="scope.row.completionTime" type="date" placeholder="请选择日期"> @@ -582,6 +586,7 @@ export default { }, data() { return { + comFlag: true, total: 0, currentPage: 1, pageSize: 20, @@ -640,20 +645,10 @@ export default { listForm: { projectNumber: "", //项目编号 projectName: "", //项目名称 - dataList: [ - { - complianceReasons: "", - zcComplianceReasons: "" - } - ], //项目下的标准数据 + dataList: [], //项目下的标准数据 children: [] //标准下的分解单数据 }, - dataList: [ - { - complianceReasons: "", - zcComplianceReasons: "" - } - ], //展示的标准数据 + dataList: [], //展示的标准数据 commentText: "", //审批意见 detailData: [], //流程历史数据 userId: this.$store.getters.userInfo.userId, @@ -716,54 +711,17 @@ export default { item.countermeasures = this.batchEditForm.countermeasures; //完成时间 item.completionTime = this.batchEditForm.completionTime; + }else if(item.standId === items){ + item.complianceReasons = this.batchEditForm.complianceReasons; + //不合规 + item.noCompliance = this.batchEditForm.noCompliance; + //应对措施 + item.countermeasures = this.batchEditForm.countermeasures; + //完成时间 + item.completionTime = this.batchEditForm.completionTime; } }); }); - // for (let a = 0; a < this.dataList.length; a++) { - // for (let b = 0; b < this.selectList.length; b++) { - // if (this.dataList[a].id === this.selectList[b]) { - // console.log('11'); - // //合规 - // this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons - // //不合规 - // this.dataList[a].noCompliance = this.batchEditForm.noCompliance - // //应对措施 - // this.dataList[a].countermeasures = this.batchEditForm.countermeasures - // //完成时间 - // this.dataList[a].completionTime = this.batchEditForm.completionTime - // //合规 - // this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons - // //不合规 - // this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance - // //应对措施 - // this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures - // //完成时间 - // this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime - // } else { - // for (let i = 0; i < this.dataList[a].children.length; i++) { - // if (this.dataList[a].children[i].id === this.selectList[b]) { - // //合规 - // this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons - // //不合规 - // this.dataList[a].children[i].noCompliance = this.batchEditForm.noCompliance - // //应对措施 - // this.dataList[a].children[i].countermeasures = this.batchEditForm.countermeasures - // //完成时间 - // this.dataList[a].children[i].completionTime = this.batchEditForm.completionTime - // //合规 - // this.dataList[a].children[i].zcComplianceReasons = this.batchEditForm.zcComplianceReasons - // //不合规 - // this.dataList[a].children[i].zcNoCompliance = this.batchEditForm.zcNoCompliance - // //应对措施 - // this.dataList[a].children[i].zcCountermeasures = this.batchEditForm.zcCountermeasures - // //完成时间 - // this.dataList[a].children[i].zcCompletionTime = this.batchEditForm.zcCompletionTime - // } - // } - // } - // - // } - // } this.modalshowflag = false; }, cancelBatchEditForm() { @@ -871,6 +829,7 @@ export default { }, //动态表单读取 getFormFieldList(item) { + console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); if (item.form === undefined) { @@ -881,6 +840,9 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.listForm.dataList.forEach(item => { + if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); @@ -897,6 +859,7 @@ export default { dataChildren.forEach((item,index) => { dataListChildren = dataListChildren.concat(item) }) + dataListChildren = this.dataList.concat(dataListChildren) this.dataList = dataListChildren this.total = this.dataList.length; } else { @@ -904,6 +867,9 @@ export default { let dataChildren = [] let dataListChildren = [] this.listForm.dataList.forEach(item => { + if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); @@ -920,6 +886,7 @@ export default { dataChildren.forEach((item,index) => { dataListChildren = dataListChildren.concat(item) }) + dataListChildren = this.dataList.concat(dataListChildren) this.dataList = dataListChildren this.total = this.dataList.length; // this.dataList = item.form.dataList[0].children; @@ -964,31 +931,46 @@ export default { this.isSubmit = false; }); }, + handlePrice(row){ + if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){ + this.comFlag = true + }else{ + this.comFlag = false + } + }, //提交事件 handleSubmit() { - this.isSubmit = true; - this.listForm.commentText = this.commentText; - const json = JSON.stringify(this.listForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }, e => { - }); + // complianceReasons 合规原因 + // noCompliance 不合规项 + // countermeasures 应对措施 + //completionTime 完成时间 + if(!this.comFlag){ + this.$message.warning('请填写完整的不符合项信息') + }else{ + this.isSubmit = true; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }, e => { + }); + } }, //标准表格选择框改变 selectStandChange(data) { this.selectList = []; for (let i = 0; i < data.length; i++) { - this.selectList.push(data[i].id); + this.selectList.push(data[i].id || data[i].standId); localStorage.setItem("selectList", JSON.stringify(this.selectList)); } }, From f1db3eb9d1754020a1884ed741ddd5205fc5e354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 30 Nov 2021 16:30:13 +0800 Subject: [PATCH 4/5] commit --- .../pages/creatProcess/xmpg2/step6.vue | 5 +- .../pages/creatProcess/xmpg2/step7.vue | 86 +++++++++++++------ 2 files changed, 61 insertions(+), 30 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 7e4958433..16cfd87e2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -223,6 +223,7 @@ @click.native="handlePrice(scope.row)" v-model="scope.row.completionTime" type="date" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期"> @@ -940,10 +941,6 @@ export default { }, //提交事件 handleSubmit() { - // complianceReasons 合规原因 - // noCompliance 不合规项 - // countermeasures 应对措施 - //completionTime 完成时间 if(!this.comFlag){ this.$message.warning('请填写完整的不符合项信息') }else{ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index 9a1d4bcef..806cb6bc4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -468,36 +468,70 @@ export default { }, //动态表单读取 getFormFieldList(item) { + console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); - this.listForm.prcNum = this.prcNum; - this.listForm.prcName = this.prcName; - this.listForm["id"] = item.id; - this.listForm.dataList = item.dataList; - let dataChildren = [] - let dataListChildren = [] - this.listForm.dataList.forEach(item => { - item.children.forEach(items=> { - if(items.key === item.standId){ - this.$set(items, "standName", item.standName); - this.$set(items, "standEnName", item.standEnName); - this.$set(items, "standYear", item.standYear); - this.$set(items, "standSort", item.standSort); - this.$set(items, "standNumber", item.standNumber); + if (item.form === undefined) { + let dataChildren = [] + let dataListChildren = [] + this.listForm.prcNum = this.prcNum; + this.listForm.prcName = this.prcName; + this.listForm["id"] = item.id; + this.listForm.dataList = item.dataList; + this.listForm.dataList.forEach(item => { + if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){ + this.dataList.push(item) } + item.children.forEach(items=> { + if(items.key === item.standId){ + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + } + }) }) - }) - this.listForm.dataList.forEach(item => { - dataChildren.push(item.children) - }) - dataChildren.forEach((item,index) => { - dataListChildren = dataListChildren.concat(item) - }) - this.dataList = dataListChildren - this.total = this.dataList.length; - // this.dataList = item.dataList; - // this.dataList.distributePerson = item.dataList[0].distributePerson; - // this.listForm.breakdownList = item.breakdownList; + this.listForm.dataList.forEach(item => { + dataChildren.push(item.children) + }) + dataChildren.forEach((item,index) => { + dataListChildren = dataListChildren.concat(item) + }) + dataListChildren = this.dataList.concat(dataListChildren) + this.dataList = dataListChildren + this.total = this.dataList.length; + } else { + this.listForm = item.form; + let dataChildren = [] + let dataListChildren = [] + this.listForm.dataList.forEach(item => { + if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){ + this.dataList.push(item) + } + item.children.forEach(items=> { + if(items.key === item.standId){ + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + } + }) + }) + this.listForm.dataList.forEach(item => { + dataChildren.push(item.children) + }) + dataChildren.forEach((item,index) => { + dataListChildren = dataListChildren.concat(item) + }) + dataListChildren = this.dataList.concat(dataListChildren) + this.dataList = dataListChildren + this.total = this.dataList.length; + // this.dataList = item.form.dataList[0].children; + // this.total = item.form.dataList[0].children.length; + } + }); }, //驳回事件 From 2453adb36f089f417d8948a9b6a9ee4b9d710bb3 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 30 Nov 2021 17:40:49 +0800 Subject: [PATCH 5/5] commit --- src/components/CustomFormComponents/File.vue | 13 ++++++++++++- src/pages/details/otherStandardDetails/index.vue | 9 +++++---- .../components/EnterpriseStandardDatabase.vue | 4 ++-- .../foreignRegulationsDatabase/index.vue | 2 +- .../foreignStandardsAndRegulations/index.vue | 3 +-- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index 5a64f5188..371d7977e 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -22,13 +22,23 @@ v-if="reUpload || showUploadBtn">{{ uploadText || '重新上传' }} @@ -3282,7 +3282,9 @@ export default {