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/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){