From 8ef1fdeaef89c662493b45e9c752b99f8660a5c4 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 6 Aug 2021 14:04:48 +0800 Subject: [PATCH 01/34] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=9F=A5=E7=9C=8B=E7=9A=84dialog=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E8=BF=87=E5=A4=A7=E7=9A=84ui=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 01f2866bd..22cb60d74 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -203,6 +203,7 @@ + 查看 @@ -224,7 +225,7 @@ destroy-on-close :wrapperClosable="false" class="seeHisToryDraw" - size="1000px" + size="600px" >
From 930759eaa5d226ce550789b11203110ed0600603 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 6 Aug 2021 14:08:37 +0800 Subject: [PATCH 02/34] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=B8=8D=E4=BC=9A=E7=AD=BE=20=E5=9C=A8=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BF=AE=E8=AE=A2=E8=8A=82=E7=82=B9?= =?UTF-8?q?=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/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index c38d5d117..b00082a3f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -810,7 +810,7 @@ - +

修订申请人

From 2df6b33b420759356aa5ff5a66cc2fc0a14032ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 6 Aug 2021 14:27:01 +0800 Subject: [PATCH 03/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step4.vue | 23 +++++++++++++++++-- .../pages/creatProcess/xmpg2/step3.vue | 20 +++++++++------- .../pages/creatProcess/xmpg2/step4.vue | 15 ++++++++++-- .../pages/creatProcess/xmpg2/step5.vue | 1 + 4 files changed, 47 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 72226053d..7b9b0d664 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -399,8 +399,27 @@ export default { }, //驳回事件 beforeBack() { - this.listForm.approvalOpinion = "1"; - this.handleSubmit(); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.approvalOpinion = "1"; + this.saveLoading = 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.saveLoading = false + }); + }/**/ }, //提交事件 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue index c59d0535d..81f1b0667 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue @@ -282,7 +282,7 @@ export default { }, // 点击查看 handlePreview(item) { - console.log(item) + console.log(item); let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { @@ -304,14 +304,14 @@ export default { }, res => { this.standardData = res.data.list; this.standardData.forEach(item => { - if(item.attrInfoMap === null){ - this.$set(item, "ZCCSSRQ", ''); - this.$set(item, "XCXSSRQ", ''); - }else{ + if (item.attrInfoMap === null) { + this.$set(item, "ZCCSSRQ", ""); + this.$set(item, "XCXSSRQ", ""); + } else { this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); } - }) + }); this.totalNo = res.data.count; }, e => { }); @@ -354,7 +354,10 @@ export default { }, //提交事件 handleSubmit() { - this.isSubmit = true + if (!this.listForm.jgUser) { + this.$message.warning("请选择架构经理"); + } else { + this.isSubmit = true; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -368,9 +371,10 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } - this.isSubmit = false + this.isSubmit = false; }, e => { }); + } }, choiceZRR(scope, type, title, id) { if (scope != null) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index 7bf689c06..7f30f2f5b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -108,12 +108,12 @@ > @@ -370,6 +370,7 @@ 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, @@ -430,6 +431,7 @@ export default { if (this.type === 1) { this.dataList[this.zrIndex].liablePeopleId = data[0].id this.dataList[this.zrIndex].liablePeople = data[0].name + this.$forceUpdate() } else if(this.type === 2) { this.dataList.forEach( item => { this.selectList.forEach( items => { @@ -437,6 +439,7 @@ export default { item.liablePeopleId = data[0].id item.liablePeople = data[0].name } + this.$forceUpdate() }) }) } @@ -451,6 +454,14 @@ export default { return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; } }, + watch: { + // dataList: { + // deep: true, + // handler (val) { + // console.log('dataList update', val) + // } + // } + }, mounted() { this.processTable(); this.getData(); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 1f133c46f..eae3ab927 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -315,6 +315,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); From 23b53acfd5944fc2618060783580aaa5f84a0771 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Fri, 6 Aug 2021 14:29:30 +0800 Subject: [PATCH 04/34] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/linkManage/index.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index 6f7caa83e..846e6f474 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -50,7 +50,10 @@ + placeholder="请输入链接"> + From 4dd2f05b04fcf1643ba2c414a7f48dc3dbf26170 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Fri, 6 Aug 2021 14:31:17 +0800 Subject: [PATCH 05/34] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/linkManage/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index 846e6f474..c8f93bc6b 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -51,7 +51,7 @@ label="链接"> From 0267a00eefe43f8da5f9daf2b89aedb8bb5173f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 6 Aug 2021 14:55:45 +0800 Subject: [PATCH 06/34] =?UTF-8?q?=E6=B8=85=E5=8D=95=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step4.vue | 71 ++++++++++++++++--- 1 file changed, 63 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 7b9b0d664..f1966e1a7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -37,18 +37,40 @@ clearable > - -
-

{{ listForm.modelName }} + + + + + + + + + + + + + + + + + + + + + + +

+

{{ item.name }} @@ -255,6 +277,7 @@ export default { selectList: [], //选择标准的选择框 bringData: [], commentText: "", //填写会签意见 + fileList:[], page: 1, total: 0, pageSize: this.$store.getters.userInfo.configContent, @@ -356,6 +379,9 @@ export default { this.listForm.applyUpdUserId = item.applyUpdUserId; this.listForm.jlUserId = item.jlUserId; this.listForm.zrUserId = item.zrUserId; + this.fileIds = item.fileId; + console.log(this.fileIds); + this.getFileInfo(); }); }, // 请求上传的文件信息 @@ -365,11 +391,15 @@ export default { }, { _this: this }, res => { - console.log(res); this.$nextTick(() => { res.data.map(item => { - this.listForm.modelName = item.oldFileName; - this.listForm.model = item.id; + // 赋值要回显的上传文件内容 + this.fileList.push({ + name: item.oldFileName, + uid: item.uid, + status: item.status, + id: item.id + }); }); }); }, e => { @@ -499,6 +529,31 @@ export default { padding: 0 20px 0; } } + p { + & > a { + cursor: pointer; + } + + & > i { + display: inline-block; + margin-left: 3px; + width: 18px; + height: 16px; + background-repeat: no-repeat; + background-size: 100% 100%; + background-position: center center; + vertical-align: sub; + cursor: pointer; + } + + .icon-download { + background-image: url("~assets/images/shangqi/img/download.png"); + } + + .icon-download2 { + background-image: url("~assets/images/shangqi/img/download2.png"); + } + } .choiceBtn { .el-button--primary { From b1e39201f567260dd1fe4cfe3d36d37323af678a Mon Sep 17 00:00:00 2001 From: song2048 <2639528268@qq.com> Date: Fri, 6 Aug 2021 15:10:47 +0800 Subject: [PATCH 07/34] =?UTF-8?q?=E5=9C=A8=E8=A1=A8=E6=A0=BC=E5=90=8E?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E2=80=9C=E6=93=8D=E4=BD=9C=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 601dc8728..03ea3ab2f 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -189,7 +189,7 @@ align="center" label="项目经理"> - + From eee6759ca148fde91e16dd52b88a99beb802a305 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 6 Aug 2021 17:48:58 +0800 Subject: [PATCH 17/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E5=BA=94=E8=AF=A5=E8=B7=9F=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=BA=93=E4=B8=80=E8=87=B4=EF=BC=8C=E5=8F=AF=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=B8=8A=E4=BC=A0=E5=A4=9A=E4=B8=AA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 130 ++++++++++++++---- 1 file changed, 102 insertions(+), 28 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index b00082a3f..5676fad34 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -217,14 +217,15 @@ clearable >

- {{ form.xgdName }} + - 重新上传 + + 查看已上传的文件
@@ -233,7 +234,8 @@ class="common-button-primary" size="mini" @click="fileUpload('xgd')"> - 点击上传 + + 点击上传
@@ -245,14 +247,15 @@ clearable >
- {{ form.fbgbjbdName }} + - 重新上传 + + 查看已上传的文件
@@ -261,6 +264,7 @@ class="common-button-primary" size="mini" @click="fileUpload('fbgbjbd')"> + 点击上传
@@ -273,14 +277,15 @@ clearable >
- {{ form.zbjbdName }} + - 重新上传 + + 查看已上传的文件
@@ -289,6 +294,7 @@ class="common-button-primary" size="mini" @click="fileUpload('zbjbd')"> + 点击上传
@@ -301,14 +307,15 @@ clearable >
- {{ form.bpgName }} + - 重新上传 + + 查看已上传的文件
@@ -317,6 +324,7 @@ class="common-button-primary" size="mini" @click="fileUpload('bpg')"> + 点击上传
@@ -329,14 +337,15 @@ clearable >
- {{ form.ssgName }} + - 重新上传 + + 查看已上传的文件
@@ -345,6 +354,7 @@ class="common-button-primary" size="mini" @click="fileUpload('ssg')"> + 点击上传
@@ -359,14 +369,15 @@ clearable >
- {{ form.kwjName }} + - 重新上传 + + 查看已上传的文件
@@ -375,6 +386,7 @@ class="common-button-primary" size="mini" @click="fileUpload('kwj')"> + 点击上传
@@ -387,14 +399,15 @@ clearable >
- {{ form.zqyjgName }} + - 重新上传 + + 查看已上传的文件
@@ -403,6 +416,7 @@ class="common-button-primary" size="mini" @click="fileUpload('zqyjg')"> + 点击上传
@@ -415,14 +429,15 @@ clearable >
- {{ form.caName }} + - 重新上传 + + 查看已上传的文件
@@ -431,6 +446,7 @@ class="common-button-primary" size="mini" @click="fileUpload('ca')"> + 点击上传
@@ -443,14 +459,15 @@ clearable >
- {{ form.jdwjName }} + - 重新上传 + + 查看已上传的文件
@@ -459,6 +476,7 @@ class="common-button-primary" size="mini" @click="fileUpload('jdwj')"> + 点击上传
@@ -702,7 +720,16 @@ clearable >
- {{ form.glwjName }} + + + + 查看已上传文件 + +
+ 点击上传
@@ -1196,6 +1224,16 @@ data () { return { fileList: [], + caFileList: [], + FBGBJBDFileList: [], + xgdFileList: [], + bpgFileList: [], + ssgFileList: [], + zqyjgFileList: [], + jdwjFileList: [], + zbjbdFileList: [], + kwjFileList: [], + qlwjFileList: [], filterText:'', textStatusMap: {}, // 文本状态id与name对应 standardDrawer: false, @@ -1332,7 +1370,7 @@ zqyjg: '', // 征求意见稿 jdwj: '', // 解读文件 zbjbd: '', // 增补件 - kwj: '', // 勘误件 + kwj: '', // 勘 误件 caName: '', // 草案 fbgbjbdName: '', // 发布稿 xgdName: '', // 修改单 @@ -2040,43 +2078,54 @@ // 导入标准数据成功后执行 importFileSuccess (response, file,fileList) { // 上传成功后判断是否是两条数据是的话替换掉旧数据 - if (fileList.length > 1) { - this.fileList = fileList.splice(0, 1) - } + // if (fileList.length > 1) { + // this.fileList = fileList.splice(0, 1) + // } if (response.ok) { - this.fileMadel = false - this.fileList = [] + // this.fileMadel = false + // this.fileList = [] if(this.fileType === 'fbgbjbd'){ + this.FBGBJBDFileList=fileList; this.form.fbgbjbd = response.data.id; this.form.fbgbjbdName = response.data.name; }else if(this.fileType === 'xgd'){ - this.form.xgd = response.data.id; + this.xgdFileList=fileList; + this.form.xgd = response.data.id; this.form.xgdName = response.data.name; }else if(this.fileType === 'bpg'){ + this.bpgFileList=fileList; this.form.bpg = response.data.id; this.form.bpgName = response.data.name; }else if(this.fileType === 'ssg'){ + this.ssgFileList=fileList; this.form.ssg = response.data.id; this.form.ssgName = response.data.name; }else if(this.fileType === 'zqyjg'){ + this.zqyjgFileList=fileList; this.form.zqyjg = response.data.id; this.form.zqyjgName = response.data.name; }else if(this.fileType === 'jdwj'){ + this.jdwjFileList=fileList; this.form.jdwj = response.data.id; this.form.jdwjName = response.data.name; }else if(this.fileType === 'kwj'){ + this.kwjFileList=fileList; this.form.kwj = response.data.id; this.form.kwjName = response.data.name; }else if(this.fileType === 'xgd'){ + this.xgdFileList=fileList; this.form.xgd = response.data.id; this.form.xgdName = response.data.name; }else if(this.fileType === 'glwj'){ + this.qlwjFileList=fileList; this.form.glwj = response.data.id; this.form.glwjName = response.data.name; }else if(this.fileType === 'ca'){ + this.caFileList=fileList; this.form.ca = response.data.id; this.form.caName = response.data.name; }else if(this.fileType === 'zbjbd'){ + this.zbjbdFileList=fileList; this.form.zbjbd = response.data.id; this.form.zbjbdName = response.data.name; } @@ -2089,8 +2138,33 @@ }, fileUpload (type) { this.fileType = ''; - this.fileMadel = true + // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表 + this.fileType = type; + if (type==='ca'){ + this.fileList=this.caFileList; + }else if (type==='fbgbjbd'){ + this.fileList=this.FBGBJBDFileList; + }else if (type==='xgd'){ + this.fileList=this.xgdFileList; + }else if(type==='bpg'){ + this.fileList=this.bpgFileList; + }else if (type==='ssg'){ + this.fileList=this.ssgFileList; + }else if (type==='zqyjg'){ + this.fileList=this.zqyjgFileList; + }else if (type==='jdwj'){ + this.fileList=this.jdwjFileList; + }else if (type==='zbjbd'){ + this.fileList=this.zbjbdFileList; + }else if (type==='kwj'){ + this.fileList=this.kwjFileList; + }else if (type==='glwj'){ + this.fileList=this.qlwjFileList; + } + + this.fileMadel = true; + }, popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { From 5489e13b926e36b73deca5dcfadb81a2631b3077 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 6 Aug 2021 17:53:46 +0800 Subject: [PATCH 18/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E4=B8=8D=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 5676fad34..5f38e84b8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1451,9 +1451,9 @@ { required: true, message: '请选择文本状态', trigger: 'change' } ] , - // issueTime: [ - // { required: true, message: '请选择标准发布日期', trigger: 'change' } - // ], + issueTime: [ + { required: false, message: '请选择标准发布日期', trigger: 'change' } + ], qcdw: [ { required: true, message: '请选择起草单位', trigger: 'change' } ], From 07940a5b8c27db0fbb7ec37c0d5e8a47aa321990 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 6 Aug 2021 17:57:03 +0800 Subject: [PATCH 19/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E8=AE=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=20=E6=A0=87=E5=87=86=E6=80=A7=E8=B4=A8?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=EF=BC=8C?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E4=B8=8D=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 28fbcddac..9d7c27f09 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1138,13 +1138,13 @@ export default { { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' } ], standNature: [ - { required: false, message: '请选择标准性质', trigger: 'change' } + { required: true, message: '请选择标准性质', trigger: 'change' } ], textStatus: [ { required: true, message: '请选择文本状态', trigger: 'change' } ], issueTime: [ - { required: true, message: '请选择标准发布日期', trigger: 'change' } + { required: false, message: '请选择标准发布日期', trigger: 'change' } ], qcdw: [ { required: true, message: '请选择起草单位', trigger: 'change' } From 43f5a92ba79488f65e36783a5801669244eef356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 6 Aug 2021 17:58:37 +0800 Subject: [PATCH 20/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1-1.vue | 19 ++++++++++++------- .../pages/creatProcess/xmpg/step1.vue | 1 - .../pages/creatProcess/xmpg2/step5.vue | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 385f8b8b7..baef49e58 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -533,9 +533,14 @@ export default { }).then(res => { let mes = JSON.parse(res.mes); this.listForm = mes.form; - this.dataList = mes.form.dataList; this.roleForm = mes.roleForm; this.commentText = mes.commentText; + this.dataList = mes.form.dataList; + this.dataList.forEach(item => { + if(!item.projectLine){ + this.dataList = null + } + }) }); }, checkedRole(data) { @@ -866,12 +871,12 @@ export default { }, computed: {}, watch: { - dataList: { - deep: true, - handler (val) { - console.log('dataList update', val) - } - } + // dataList: { + // deep: true, + // handler (val) { + // console.log('dataList update', val) + // } + // } }, mounted() { //从数据库中查询下拉框数据 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 7b8e2183f..a36e82cb4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -662,7 +662,6 @@ export default { saveTaskFirst(_formData).then(res => { this.saveLoading = false; this.$message.success("保存成功"); - this.$router.push("/processCenter"); }).catch(e => { this.saveLoading = false; }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index eae3ab927..39e39eeb9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -315,7 +315,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res.mesg) + console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); From 13d969a4a7464da910bd6e907ffdc099e13138c5 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 7 Aug 2021 11:23:13 +0800 Subject: [PATCH 21/34] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84id=E4=B8=AD=E5=B8=A6=E6=9C=89','=E5=AD=97=E7=AC=A6,?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=97=B6=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step3.vue | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 26187ebbd..352131b8a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -836,29 +836,26 @@ export default { methods: { downloadFile (fileType) { if(fileType === 'fbgbjbd'){ - if(this.fbgbjbdFileId.search(',')){ - this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); - console.log(this.fbgbjbdFileId); - } - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId.replace(",",""); }else if(fileType === 'xgd'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId + + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId.replace(",",""); }else if(fileType === 'bpg'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId.replace(",",""); }else if(fileType === 'ssg'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId.replace(",",""); }else if(fileType === 'zqyjg'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId.replace(",",""); }else if(fileType === 'jdwj'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId.replace(",",""); }else if(fileType === 'kwj'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId.replace(",",""); }else if(fileType === 'glwj'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId.replace(",",""); }else if(fileType === 'ca'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId.replace(",",""); }else if(fileType === 'zbjbd'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId.replace(",",""); } }, popoverHide (checkedIds, checkedData) { 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 22/34] =?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 23/34] =?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 24/34] =?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 25/34] =?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 26/34] 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 27/34] =?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 28/34] =?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 29/34] =?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 30/34] =?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 31/34] =?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 32/34] =?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 33/34] 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">