From dee176c88d4e532d8dd1bb70fa8b29078bae29dc Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 10 Jan 2022 10:52:56 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E5=8F=82=E4=BC=9A?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0ppt=EF=BC=8C=E5=88=86=E8=A7=A3=E5=8D=95?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 1 - .../processCenter/pages/creatProcess/bzhHd-rh/step1.vue | 4 ++-- .../processCenter/pages/creatProcess/bzhHy-ch/step1.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzrk/step3.vue | 6 ++++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index d854e24e8..cb52a85cf 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3124,7 +3124,6 @@ export default { }, // 分解单----查看标准条款相关 selectSarStandItems(id, flag) { - this.page7 = 1 this.standItemSearch.standId = this.sarStandardsInfoEO.id this.standItemSearch.fileType = this.fileType this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 27fa808db..f29296525 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -380,7 +380,7 @@ name="file" drag :file-list="rh_pageData.infoSources" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF, .pptx" :http-request="httpRequest" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" @@ -603,7 +603,7 @@ export default { // 判断上传文件格式 if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF' - || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.PPT' + || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.pptx' || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp') { return true } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 4d371e4af..fabbb545f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -312,7 +312,7 @@ name="file" drag :file-list="ch_pageData.fileTextList" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF,.pptx" :http-request="httpRequest" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" @@ -539,7 +539,7 @@ export default { // 判断上传文件格式 if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF' - || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.PPT' + || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.pptx' || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp' ) { return true diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index bdd925ede..03a6755d3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -158,6 +158,7 @@ :disabled="true" > --> - + - + Date: Fri, 7 Jan 2022 18:13:50 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index e98735506..b73da8dfd 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3713,7 +3713,7 @@ export default { } break case 'textStatus' : - this.orderBy = 5; + this.orderBy = 4; this.nowOrder = sortObj.column.order if (this.nowOrder === 'ascending') { this.nowOrder = 2 From d7808fd51419c201b992bdb5a0df5820240620c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 10 Jan 2022 11:02:50 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index cb52a85cf..40ed0b811 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -266,9 +266,9 @@

{{ sarStandardsInfoEO.issueTime || '-' }}

-

{{ - standMap[sarStandardsInfoEO.standNature] || '-' - }}

+ + +

{{ sarStandardsInfoEO.standSystem || '-' @@ -374,7 +374,7 @@ v-else-if="child.attrType === 'DATE_PICKER'" class="modular-content-p-val" > - {{ child.value ? child.value.substring(0, 10) : '-' }} + {{ child.value ? child.value : '-' }} { + console.log(location); location.isShowImp = '0' if (dynamicFormField) { let value = dynamicFormField[field.attrField] From ba460a972f7ef9d9f2d67dc0dc77bdfbed076589 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 10 Jan 2022 11:03:50 +0800 Subject: [PATCH 04/13] commit --- .../pages/creatProcess/bzzqyj/step1.vue | 2 +- .../pages/creatProcess/bzzqyj/step6.vue | 740 +++++++++--------- 2 files changed, 387 insertions(+), 355 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 3e72263b0..a24757b4e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -162,7 +162,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 8877bd708..cc5272498 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -12,11 +12,11 @@

@@ -26,18 +26,18 @@ + disabled + v-model="form.endTime" + type="date" + placeholder="请选择结束日期"> @@ -76,6 +76,14 @@ - -
+ + + +
@@ -96,71 +104,71 @@ + type="index" + label="序号" + width="55" + align="center"> + prop="chapterNumber" + align="center" + sortable + label="章条编号" + width="101px"> + prop="chapterName" + align="center" + width="200px" + label="章节名称"> + prop="commentText" + align="center" + label="修改意见内容（包括理由或依据）"> + prop="oldText" + align="center" + label="修改前"> + prop="newText" + align="center" + label="修改后"> + prop="reason" + align="center" + label="修改理由"> + prop="department" + align="center" + label="提出部门"> + prop="responUserName" + align="center" + label="提出人"> + prop="state" + align="center" + label="处理意见"> @@ -171,11 +179,11 @@
+ type="textarea" + :rows="3" + resize="none" + placeholder="请输入意见" + v-model="commentText6">
@@ -183,24 +191,24 @@
+ height="100%" + ref="selection" + :data="histortData" + tooltip-effect="dark" + style="width: 100%" + border + row-key="id" + :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"> + prop="comment" + label="流程信息" + align="center"> + prop="completeFlag" + label="状态" + align="center"> @@ -238,16 +246,16 @@
关闭 + From e55addd0fb2cb7b00eabae4061fb82b2cec21140 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 10 Jan 2022 11:43:33 +0800 Subject: [PATCH 05/13] commit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index cc5272498..175bd287e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -82,7 +82,7 @@ style="display: none;" clearable > - + @@ -350,7 +350,7 @@ methods: { choiceZRR () { this.nodeList = []; - if (this.form.user7.length > 0) { + if (this.form.user7.length) { this.nodeList = this.form.user7.split(","); } this.modalshowflag = true; From 12e6842554304b73d3168b8297ef3294474e9861 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 10 Jan 2022 11:46:10 +0800 Subject: [PATCH 06/13] commit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 175bd287e..71d86492a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -350,8 +350,8 @@ methods: { choiceZRR () { this.nodeList = []; - if (this.form.user7.length) { - this.nodeList = this.form.user7.split(","); + if (this.form.user7) { + this.nodeList.push(this.form.user7) } this.modalshowflag = true; }, From 112cd844acb89b29293a1010f784c8162bf9fc6a Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 10 Jan 2022 11:47:14 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=85=A5=E5=BA=93=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHd-rh/step3.vue | 4 +++- .../pages/creatProcess/bzhHd-rh/step4.vue | 20 ++++++++++++++----- .../pages/creatProcess/bzhHd-rh/step5.vue | 10 +++++++++- .../pages/creatProcess/bzhHd-rh/step6-1.vue | 2 +- .../pages/creatProcess/bzhHd-rh/step6.vue | 2 +- .../pages/creatProcess/bzrk/step1.vue | 17 ++++++++++++---- .../pages/creatProcess/bzrk/step4.vue | 15 ++++++++++---- 7 files changed, 53 insertions(+), 17 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index 1ef79891d..dfa40f025 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -142,7 +142,7 @@ - + + + @@ -120,14 +120,20 @@ - + @@ -417,10 +423,14 @@ export default { this.$preview(attId) }, /** 点击对应附件进行下载*/ - previews(val) { + previews(val,type) { let attId = val if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + if (type === 'down') { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } else { + this.$preview(attId) + } } }, } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue index d7556c1ce..d2312e5d0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -176,7 +176,7 @@ {{ scope.row.fillDept || '' }} - + @@ -368,6 +368,7 @@ accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :http-request="httpRequest" :before-upload="handleBeforeUpload" + :on-preview="handlePreview" :before-remove="handleBeforeRemove" :on-success="handleOnsuccess" > @@ -625,6 +626,13 @@ export default { this.fileListData.fillFile = this.reData }, + handlePreview(file) { + let attId = file.id + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, + handleClose() { this.upDialog = false }, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue index db367a6a7..2c1e42f4f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue @@ -114,7 +114,7 @@ - + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue index dcbfb6485..ebdccd1f1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue @@ -125,7 +125,7 @@ - + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index b0b5fd664..4540d8489 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1695,6 +1695,17 @@ export default { filterText(val) { this.$refs.tree.filter(val); }, + 'form.standInData' : { + handler: function () { + if(this.form.standInData === '1') { + this.rules.standYear[0].required = false; + this.rules.standName[0].required = false + } else { + this.rules.standYear[0].required = true; + this.rules.standName[0].required = true + } + } + }, /*'form.standInData': { handler: function (val) { this.verifySarStandard = false @@ -1840,14 +1851,10 @@ export default { this.rules.standName[0].required = false this.rules.standEnName[0].required = true; this.rules.standNature[0].required = false - this.rules.standYear[0].required = false; - this.rules.standName[0].required = false } else { this.rules.standName[0].required = true this.rules.standNature[0].required = true this.rules.standEnName[0].required = false; - this.rules.standYear[0].required = true; - this.rules.standName[0].required = true } this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN' //切换清空表单 @@ -3054,6 +3061,8 @@ export default { this.isSubmit = false } }) + } else { + this.isSubmit = false } }) } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 025968104..fcb217efe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1688,14 +1688,10 @@ export default { this.rules.standName[0].required = false this.rules.standEnName[0].required = true; this.rules.standNature[0].required = false - this.rules.standYear[0].required = false; - this.rules.standName[0].required = false } else { this.rules.standName[0].required = true this.rules.standNature[0].required = true this.rules.standEnName[0].required = false; - this.rules.standYear[0].required = true; - this.rules.standName[0].required = true } this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN' }, @@ -2662,6 +2658,17 @@ export default { } } }, + 'form.standInData' : { + handler: function () { + if(this.form.standInData === '1') { + this.rules.standYear[0].required = false; + this.rules.standName[0].required = false + } else { + this.rules.standYear[0].required = true; + this.rules.standName[0].required = true + } + } + }, form(val){ if(this.form){ From 29e32bd0de8f21c0c6b396c2a155a5ef0e97c7b6 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 10 Jan 2022 14:19:30 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=BA=B3=E5=85=A5?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=EF=BC=8C=E8=AF=AF=E9=80=89?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=8F=96=E6=B6=88=E9=80=89?= =?UTF-8?q?=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index fcb217efe..bb2a4bb25 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -55,14 +55,14 @@ > - + - + 是 否 + From e3f233d6f0ce81d4c0a2ef10320ced695594c272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 10 Jan 2022 15:20:35 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 62 ++++++++++++------- 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 16c7ba708..6a3408093 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1437,25 +1437,26 @@