From 9f4768eb28d50f8e770dda28a3ce54ae5056e1c8 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 6 Aug 2021 17:13:24 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93--=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=20=E9=99=A4?= =?UTF-8?q?=E4=BA=86=E6=97=B6=E9=97=B4=20=E5=85=B6=E4=BB=96=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=9B=9E=E6=98=BE=E7=9A=84=E5=86=85=E5=AE=B9=E5=81=9A?= =?UTF-8?q?=E6=88=90=E6=82=AC=E6=B5=AE=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/pages/details.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 5e825cfc8..377f873c3 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -12,8 +12,14 @@ 产品平台: {{ localProEO.projectPlatfor }} 项目编号: {{ localProEO.projectNumber }} - 项目名称: {{ localProEO.projectName }} - + + +
{{ localProEO.projectName }}
+
+
项目名称: {{localProEO.projectName && localProEO.projectName.substring(0,15)+"..." }}
+
项目名称: {{localProEO.projectName}}
+ + 项目分类:{{ localProEO.projectClassification }} @@ -449,7 +455,7 @@ export default { let deleteTagList = [] this.selectList1.forEach(item => { //项目id-标准id,项目id-标准id - deleteTagList.push( this.proId + '-' + item ) + deleteTagList.push(this.proId + '-' + item) }) this.id = deleteTagList.join(',') this.$http.post('sarStandProjectLibrary/deleteByIds', { @@ -726,6 +732,7 @@ export default { this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 this.setMap(this.zrbmMap, res.data.ZRBMCLASS) this.setMap(this.textStatusMap, res.data.WBZTCLASS) + console.log(this.getLocalPro) this.showLocalProductData(this.getLocalPro) }, e => { }) From d43546fc3ce30b7a63c53634722882f964faf89b Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Sun, 8 Aug 2021 09:46:46 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=AF=94=E5=AF=B9--?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=B7=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=BA=94=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/details.vue | 1 - .../pages/standInvolveProjectDetail.vue | 18 ++++++++++++++- .../pags/consultationDetails.vue | 23 +++++++++++++++---- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index c5488eaf5..bb19c111f 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -646,7 +646,6 @@ export default { }, // 点击查看 handlePreview(data) { - debugger let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index e881b4ce8..04bb340e5 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -60,13 +60,18 @@ width="180" > +

- {{ this.$route.query.item.cid }} + {{ $route.query.item.cid }}

- {{ this.$route.query.item.cname || '-' }} + {{ $route.query.item.cname || '-' }}

- {{ this.$route.query.item.endTime || '-' }} + {{ $route.query.item.endTime || '-' }}

- {{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}} + {{ $route.query.item.startTime + ' ~ ' + $route.query.item.endTime}} -

@@ -166,6 +166,21 @@ } }) }, + + //点击查看 + handlePreview(data) { + console.log(data); + return + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: data.id, + pageType: data.standType + } + }); + window.open(routeUrl.href, "_blank"); + }, + // 获取详情信息列表 getList() { this.spinShow = true From 5e68c10d498659f09a8883ae2439ef409390fafb Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Sun, 8 Aug 2021 09:51:08 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 4 ++-- .../accessStandardsAndRegulations/index.vue | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 5f429c122..8f5a892f1 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -300,11 +300,11 @@ export default { // path: '/convertDocView', // menuId: '3F52K25546' // }, - { + /*{ title: '菜单管理', path: '/menuManage', menuId: '87b8b4f5817a7829696e63185c744d52' - }, + },*/ { title: '链接管理', path: '/linkManage', diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index 5fae96a98..686e52b43 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -9,9 +9,9 @@
-
+
@@ -68,13 +68,13 @@ export default { name: "listProject" }); continue; - } else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") { + }/* else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") { list.push({ label: "重点标准跟踪清单", name: "listTracking" }); continue; - } else if (entity.id === "5a75523729b04102a565167004d640e9") { + }*/ else if (entity.id === "5a75523729b04102a565167004d640e9") { list.push({ label: "其他清单", name: "listOther" From 9c30db39761ce9f934b078572b022ef04ba04b57 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Sun, 8 Aug 2021 09:51:20 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C--=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9Ctab=E9=A1=B5=E5=92=8C?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9Ctab?= =?UTF-8?q?=E9=A1=B5=E7=82=B9=E5=87=BB=E6=AF=94=E6=A0=87=E5=87=86=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A5=E6=A0=87=E5=87=86=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/technologyInvolveProject.vue | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 7ae835bc2..9ea5ba731 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -65,14 +65,19 @@ label="标准/政策号" width="180" > - + + {}) - }, // 分页查询 + }, + //点击查看详情 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'INLAND_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, + // 分页查询 resetSelect () { this.sarProject.country = '' this.sarProject.standCode='' From dd4cf4a36c0259645e39de639681272c3073fc81 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Sun, 8 Aug 2021 09:54:43 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C--=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9Ctab=E9=A1=B5=E5=92=8C?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9Ctab?= =?UTF-8?q?=E9=A1=B5=E7=82=B9=E5=87=BB=E6=AF=94=E6=A0=87=E5=87=86=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A5=E6=A0=87=E5=87=86=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/technologyInvolveProject.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 9ea5ba731..53b6bf83e 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -271,7 +271,7 @@ name: "technologyInvolveProject", name: 'OtherStandardDetails', params: { id: item.standId, - pageType: 'INLAND_STAND' + pageType: item.standType + '_STAND' } }) window.open(routeUrl.href, '_blank') From 79dacb01de27a85951128280c00990be10ab570a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Sun, 8 Aug 2021 11:46:38 +0800 Subject: [PATCH 06/13] commit --- .../pages/creatProcess/bzjd/step1-1.vue | 4 ++-- .../pages/creatProcess/bzjd/step1.vue | 4 ++-- .../pages/creatProcess/bzjd/step2.vue | 4 ++-- .../pages/creatProcess/bzjd/step3.vue | 14 +++++++------- .../pages/creatProcess/bzjd/step4.vue | 4 ++-- .../pages/creatProcess/bzjd/step5.vue | 4 ++-- .../pages/creatProcess/bzjd/step6.vue | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 2bd84c26a..edcdc36b2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -103,13 +103,13 @@ + + - - - - - - Date: Sun, 8 Aug 2021 13:37:28 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step3.vue | 52 ++++++++++--------- .../pages/creatProcess/xmpg/step1-1.vue | 7 +-- .../pages/creatProcess/xmpg/step1.vue | 4 +- 3 files changed, 35 insertions(+), 28 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index b2d848d1b..187975a72 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -397,7 +397,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, saveinboundTask } from "api/process"; +import { inboundLiaisonDetail, saveTaskForPub } from "api/process"; export default { name: "bzqdfbStep3", @@ -693,16 +693,24 @@ export default { getFormFieldList (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 - this.dataList = item.dataList - this.listForm.applyUpdUserId = item.applyUpdUserId - this.listForm.jlUserId = item.jlUserId - this.listForm.zrUserId = item.zrUserId - this.fileIds = item.fileId; - this.getFileInfo(); + if(item.form === undefined){ + this.listForm.prcNum = this.prcNum + this.listForm.prcName = this.prcName + this.listForm['id'] = item.id + this.listForm.dataList = item.dataList + this.dataList = item.dataList + this.listForm.applyUpdUserId = item.applyUpdUserId + this.listForm.jlUserId = item.jlUserId + this.listForm.zrUserId = item.zrUserId + this.fileIds = item.fileId; + this.getFileInfo(); + } else { + this.listForm = item.form + this.dataList = item.form.dataList + this.listForm.dataList = item.form.dataList + this.fileIds = item.form.fileId; + this.getFileInfo(); + } }) }, //保存事件 @@ -713,23 +721,19 @@ export default { _formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "4"); + _formData.append('taskIds', this.taskIds) _formData.append("json", JSON.stringify({ - taskInfo: '根据会签意见修订', form: this.listForm, - roleForm: this.roleForm, - prcNum: this.$route.query.prcNum, - taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId, commentText: this.commentText })); - saveinboundTask(_formData).then(res => { - this.saveLoading = false; - this.$message.success("保存成功"); - this.$router.push('/processCenter') - this.bpnId = res.result; - }).catch(e => { - this.saveLoading = false; - }); + + // saveTaskForPub(_formData).then(res => { + // this.saveLoading = false; + // this.$message.success("保存成功"); + // this.bpnId = res.result; + // }).catch(e => { + // this.saveLoading = false; + // }); }, //提交事件 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index baef49e58..66f7e7ff7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -531,13 +531,13 @@ export default { queryTaskFirst({ bpnId: this.$route.query.bpnId }).then(res => { - let mes = JSON.parse(res.mes); + console.log(mes.form.dataList); this.listForm = mes.form; this.roleForm = mes.roleForm; this.commentText = mes.commentText; this.dataList = mes.form.dataList; this.dataList.forEach(item => { - if(!item.projectLine){ + if(!item.productLine){ this.dataList = null } }) @@ -760,8 +760,9 @@ export default { //选择拆分标准确定事件 OkDrawer() { if (this.selectedList.length == 1) { - this.listForm.standNumber = this.selectedList[0].standNumber; + this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; this.listForm.standName = this.selectedList[0].standName; + this.listForm.standType = this.selectedList[0].standType; this.listForm.id = this.selectedList[0].id; this.$http.get("SarStandItems/sar-stand-items/findAllItems", { ids: this.listForm.id, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index a36e82cb4..fd53bcbf2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -470,6 +470,7 @@ export default { listForm: { standNumber: "", //标准编号 standName: "",//标准名称 + standType: "", //标准类型 XCXSSRQ: "", //新车型实施日期 ZCCSSRQ: "", //在产车实施日期 certifiedEngineer: "", //认证工程师 @@ -732,8 +733,9 @@ export default { //选择拆分标准确定事件 OkDrawer() { if (this.selectedList.length === 1) { - this.listForm.standNumber = this.selectedList[0].standSortShow + '-' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; + this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; this.listForm.standName = this.selectedList[0].standName; + this.listForm.standType = this.selectedList[0].standType; this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj this.listForm.id = this.selectedList[0].id; From dd8b15406cc3d96aca3b96f7e9b5085a8ef1559b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 8 Aug 2021 14:16:57 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue | 3 ++- src/pages/processCenter/pages/creatProcess/xmpg/step1.vue | 1 + src/pages/processCenter/pages/creatProcess/xmpg/step4.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg/step5.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg/step6.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg/step7.vue | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 66f7e7ff7..5e3894f7f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -531,7 +531,7 @@ export default { queryTaskFirst({ bpnId: this.$route.query.bpnId }).then(res => { - console.log(mes.form.dataList); + let mes = JSON.parse(res.mes); this.listForm = mes.form; this.roleForm = mes.roleForm; this.commentText = mes.commentText; @@ -763,6 +763,7 @@ export default { this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; this.listForm.standName = this.selectedList[0].standName; this.listForm.standType = this.selectedList[0].standType; + this.listForm.standId = this.selectedList[0].id; this.listForm.id = this.selectedList[0].id; this.$http.get("SarStandItems/sar-stand-items/findAllItems", { ids: this.listForm.id, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index fd53bcbf2..ad4acb396 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -736,6 +736,7 @@ export default { this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; this.listForm.standName = this.selectedList[0].standName; this.listForm.standType = this.selectedList[0].standType; + this.listForm.standId = this.selectedList[0].id; this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj this.listForm.id = this.selectedList[0].id; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 06ec3df9c..6b7dfb9d1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -64,7 +64,7 @@ style="width: 100%" border @selection-change="selectStandChange" - :height="sarProStateTableHeight" + height="56%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> Date: Sun, 8 Aug 2021 14:44:47 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86--?= =?UTF-8?q?=E6=8B=86=E5=88=86=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=A0=87=E5=87=86=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A5=E6=A0=87=E5=87=86=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/index.vue | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index fd2a4796b..1d6be7da5 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -186,12 +186,20 @@ prop="standNumber" label="标准号/政策号" align="center"> + + Date: Sun, 8 Aug 2021 15:08:40 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85,?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=88=86=E8=A7=A3=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 24f5c3bb9..28b2f0d98 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -188,11 +188,11 @@ /> 上传时间：{{ dateFormat(file.modifyTime) }} - - - - - + 标准分解单

From 9af8203bf332a82a23707ecff6f9cfb56a2dac3b Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 8 Aug 2021 15:11:46 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85,?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=88=86=E8=A7=A3=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 28b2f0d98..afc9a4ef2 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -188,11 +188,11 @@ /> 上传时间：{{ dateFormat(file.modifyTime) }} - 标准分解单 + + + + +

@@ -376,12 +376,12 @@ 上传时间：{{ dateFormat(file.modifyTime) }}

- - - - - - + 标准分解单 From 600c5f6d62ccd8ef60537c9d2f428c4890157ab2 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Sun, 8 Aug 2021 15:20:31 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index 22836fdde..8db39fdaf 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -39,7 +39,7 @@
导入 导出 - 删除 + 模板下载 批量复制 合并条款 From 3ee0a71810467fcbea979521f49caf2d365876cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 8 Aug 2021 15:43:14 +0800 Subject: [PATCH 13/13] commit --- src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue | 1 - src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue | 4 +++- src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index c5656481f..8f1fdd0e5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -370,7 +370,6 @@ export default { if(this.peopleFlag === true){ this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); - console.log(json) this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 39e39eeb9..dce551cfb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -64,7 +64,7 @@ align="center">