From d2edce67e0823cb6760e9e9374b785f8642940ca 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, 10 Aug 2021 18:01:31 +0800 Subject: [PATCH 1/3] commit --- .../pages/creatProcess/xmpg/step3.vue | 14 +++--- .../pages/creatProcess/xmpg/step4.vue | 43 +++++++++++++------ 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index a675eae98..35ad69a7f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -348,6 +348,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -369,15 +370,12 @@ export default { this.listForm.breakdownList = []; for (let i = 0; i < item.pepdtos.length; i++) { for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { + console.log(item.pepdtos[i].xCXSSRQ === null); if(item.pepdtos[i].xCXSSRQ === null){ - this.listForm.breakdownList.xCXSSRQ = "" - } else { - this.listForm.breakdownList.xCXSSRQ = item.pepdtos[i].xCXSSRQ + item.pepdtos[i].xCXSSRQ = '' } - if(item.pepdtos[i].zCCSSRQ === null){ - this.listForm.breakdownList.zCCSSRQ = "" - } else { - this.listForm.breakdownList.zCCSSRQ = item.pepdtos[i].zCCSSRQ + if(item.pepdtos[i].zCCSSRQ === null){ + item.pepdtos[i].zCCSSRQ = '' } this.listForm.breakdownList.push({ itemsName: item.pepdtos[i].breakdownList[j].itemsName, @@ -396,6 +394,8 @@ export default { qualityEngineerName: item.pepdtos[i].qualityEngineerName, standNumber: item.pepdtos[i].standNumber, standName: item.pepdtos[i].standName, + xCXSSRQ : item.pepdtos[i].XCXSSRQ, + zCCSSRQ : item.pepdtos[i].ZCCSSRQ, }); } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index abc960d8d..dfde5a106 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -347,6 +347,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; +import Moment from 'moment'; import { inboundLiaisonDetail, saveTaskForPub } from "api/process"; export default { @@ -434,12 +435,24 @@ export default { handleTabs(name) { this.active = name; }, + //将时间戳转换为日期格式 + getLocalTime(item) { + return new Date(parseInt(item) * 1000).toLocaleDateString().replace(/:\d{1,2}$/, " "); + }, + +// 时间戳（毫秒）转化为标准时间格式 + getFullTime(item) { + const stamp = new Date(item); + const time = Moment(stamp).format('YYYY-MM-DD HH:mm:ss'); + return item = time + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -454,20 +467,22 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); - if(item.form === undefined){ - if (item.fenFlag === undefined ) { + if (item.form === undefined) { + if (item.fenFlag === undefined) { item.step3DTOS.forEach(item => { - item.implementerId = this.$store.getters.userInfo.userId - item.implementer = this.$store.getters.userInfo.userName - }) + item.implementerId = this.$store.getters.userInfo.userId; + item.implementer = this.$store.getters.userInfo.userName; + }); this.dataList = item.step3DTOS; + } else { this.dataList = item.dataList; this.dataList.forEach(item => { - item.implementerId = this.$store.getters.userInfo.userId - item.implementer = this.$store.getters.userInfo.userName - }) + item.implementerId = this.$store.getters.userInfo.userId; + item.implementer = this.$store.getters.userInfo.userName; + }); } + // this.getLocalTime() this.listForm.prcNum = this.prcNum; this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; @@ -480,8 +495,8 @@ export default { this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit; this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer; } else { - this.listForm = item.form - this.dataList = item.form.dataList + this.listForm = item.form; + this.dataList = item.form.dataList; } }); @@ -495,9 +510,9 @@ export default { this.listForm.dataList = this.dataList; _formData.append("id", this.bpnId || ""); _formData.append("prcType", "5"); - _formData.append('taskIds', this.taskIds) + _formData.append("taskIds", this.taskIds); _formData.append("json", JSON.stringify({ - form:this.listForm, + form: this.listForm, commentText: this.commentText })); saveTaskForPub(_formData).then(res => { @@ -516,7 +531,7 @@ export default { this.listForm.signFlag = ""; this.listForm.dataList = this.dataList; const json = JSON.stringify(this.listForm); - this.isSubmit = true + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -528,7 +543,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } - this.isSubmit = false + this.isSubmit = false; }, e => { }); From 8e29a8ac1d0740c8ad65af6fd0c3826f8f1cb51f Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 10 Aug 2021 20:20:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 3514f3266..b472b7646 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -546,12 +546,13 @@ From 2e58223f8aa2141652b09e29915ba3cfe494ed60 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 11 Aug 2021 09:20:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5--=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9Ftab=E9=A1=B5=E4=B8=8B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E6=97=A5=E6=9C=9F=E6=B2=A1=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home1/components/release/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue index 1e38acb4f..ec017fa9b 100644 --- a/src/pages/home1/components/release/index.vue +++ b/src/pages/home1/components/release/index.vue @@ -4,7 +4,7 @@