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 @@
-
+
{{ '-' }}
-
+
{{ item.name }} {{ ';' }}
+
@@ -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 || '' }}
-
+
{{ scope.row.fillPost || '' }}
@@ -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.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..71d86492a 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="处理意见">
{{ stateText(scope.row.state) }}
@@ -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">
{{ scope.row.commentText }}
+ prop="completeFlag"
+ label="状态"
+ align="center">
{{ scope.row.endTime ? "已完成" : "未完成" }}
@@ -238,16 +246,16 @@
关闭
+
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 @@