diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index d854e24e8..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] 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/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/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/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/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" > --> - + - + - + - + + @@ -1688,14 +1689,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 +2659,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){ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue index e7faf9028..02f842d16 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -162,6 +162,11 @@

{{ stateText(scope.row.state) }}
+ + 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/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index d4ddea515..a3b328df4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -164,12 +164,18 @@ + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index d5e82be16..ec06fe45c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -165,6 +165,11 @@
{{ stateText(scope.row.state) }}
+ + @@ -406,12 +411,11 @@ export default { reason: "修改理由", department: "提出部门", responUserName: "提出人", + stateText: "处理意见", + cause: "原因", }, dataList: [] }; - if (title === '上报意见.xls') { - params.columnName.stateText = "处理意见" - } params.dataList = JSON.parse(JSON.stringify(row)); params.dataList.forEach(item => { if (item.state === "1") { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index a48982069..623533ab4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -165,6 +165,11 @@
{{ stateText(scope.row.state) }}
+ + @@ -410,12 +415,11 @@ export default { reason: "修改理由", department: "提出部门", responUserName: "提出人", + stateText: "处理意见", + cause: "原因", }, dataList: [] }; - if (title === '上报意见.xls') { - params.columnName.stateText = "处理意见" - } params.dataList = JSON.parse(JSON.stringify(row)); params.dataList.forEach(item => { if (item.state === "1") { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 5c1bd115f..8fc381cb8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -165,6 +165,11 @@
{{ stateText(scope.row.state) }}
+ + @@ -409,12 +414,11 @@ export default { reason: "修改理由", department: "提出部门", responUserName: "提出人", + stateText: "处理意见", + cause: "原因", }, dataList: [] }; - if (title === '上报意见.xls') { - params.columnName.stateText = "处理意见" - } params.dataList = JSON.parse(JSON.stringify(row)); params.dataList.forEach(item => { if (item.state === "1") { diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue index 7c1bab24d..68dd068cc 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue @@ -162,15 +162,15 @@ - -

工程研究总院院长/FU/BU/SBU领导

+

工程研究总院院长

- +
@@ -420,7 +420,7 @@ export default { {required: true, message: "请选择技术管理中心主任", trigger: "change"} ], presidentName: [ - {required: true, message: "请选择工程研究总院院长/FU/BU/SBU领导", trigger: "change"} + {required: true, message: "请选择工程研究总院院长", trigger: "change"} ] }, } diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue index 1c2cdefb2..c4ac44874 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue @@ -137,6 +137,11 @@
{{ stateText(scope.row.state) }}
+ + @@ -329,12 +334,11 @@ reason: "修改理由", department: "提出部门", responUserName: "提出人", + stateText: "处理意见", + cause: "原因", }, dataList: [] }; - if (title === '上报意见.xls') { - params.columnName.stateText = "处理意见" - } params.dataList = JSON.parse(JSON.stringify(row)); params.dataList.forEach(item => { if (item.state === "1") { @@ -357,7 +361,7 @@ handleSave() { }, handleSubmit() { - this.isSubmit = true; + this.isSubmit = true; var json = this.json; json.hqFlag = '0'; json.commentText = this.commentText; diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue index 03240c55f..6a2b6643d 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue @@ -137,6 +137,11 @@
{{ stateText(scope.row.state) }}
+ + @@ -329,12 +334,11 @@ reason: "修改理由", department: "提出部门", responUserName: "提出人", + stateText: "处理意见", + cause: "原因", }, dataList: [] }; - if (title === '上报意见.xls') { - params.columnName.stateText = "处理意见" - } params.dataList = JSON.parse(JSON.stringify(row)); params.dataList.forEach(item => { if (item.state === "1") { diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue index c0401b9ae..40fd42ee2 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue @@ -137,6 +137,11 @@
{{ stateText(scope.row.state) }}
+ + @@ -329,12 +334,11 @@ reason: "修改理由", department: "提出部门", responUserName: "提出人", + stateText: "处理意见", + cause: "原因", }, dataList: [] }; - if (title === '上报意见.xls') { - params.columnName.stateText = "处理意见" - } params.dataList = JSON.parse(JSON.stringify(row)); params.dataList.forEach(item => { if (item.state === "1") { diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue index d89399ddb..fa042f0e9 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue @@ -137,6 +137,11 @@
{{ stateText(scope.row.state) }}
+ + @@ -344,12 +349,11 @@ reason: "修改理由", department: "提出部门", responUserName: "提出人", + stateText: "处理意见", + cause: "原因", }, dataList: [] }; - if (title === '上报意见.xls') { - params.columnName.stateText = "处理意见" - } params.dataList = JSON.parse(JSON.stringify(row)); params.dataList.forEach(item => { if (item.state === "1") { diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 16c7ba708..12180b323 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1437,25 +1437,26 @@