diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue
index ce8ba31e6..301d09b3c 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue
@@ -24,16 +24,47 @@
-
-
- 国内标准入库
- 海外标准入库
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
+
-
+
-
-
- 是
- 否
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
是
否
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -145,56 +201,56 @@
-
-
+
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -202,84 +258,37 @@
文本信息
-
-
-
-
- {{ form.xgdName }}
-
-
- - -
-
-
-
-
- {{ form.fbgbjbdName }}
-
-
- - -
-
-
-
-
- {{ form.zbjbdName }}
-
-
- - -
-
-
-
-
- {{ form.ssgName }}
-
-
- - -
-
-
-
-
- {{ form.caName }}
-
-
- - -
-
-
-
-
-
-
- {{ form.kwjName }}
-
-
- - -
-
-
-
-
- {{ form.jdwjName }}
-
-
- - -
-
-
-
-
- {{ form.bpgName }}
-
-
- - -
-
-
-
-
- {{ form.zqyjgName }}
-
-
- - -
-
-
-
-
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ form.glwjName }}
-
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
@@ -719,6 +613,7 @@
},
nodeKey: 'id',
defaultCheckedKeys: [],
+ commentCycleDate:'',
form: {
// 基础信息
textStatus: '', // 文本状态
@@ -801,6 +696,27 @@
qcdwOption: [], // 起草单位
data: [], // 标准列表数据
ListForm: {}, // 新增数据
+ lawsTypeOptions: [],
+ lawsTextStateOptions: [],
+ lawsSyqyOptions: [],
+ lawsSycxOptions: [],
+ lawsYearOptions: [],
+ lawsLabelOptions: [],
+ CYSDLAWSOptions: [],
+ TGRLAWSOptions: [],
+ TGDWLAWSOptions: [],
+ NYLXLAWSOptions: [],
+ YYRZLAWSOptions: [],
+ ZRBMLAWSOptions: [],
+ ZRGCSLAWSOptions: [],
+ ZCWBLAWSFileId: '',
+ GCWBLAWSFileId: '',
+ JDWJLAWSFileId: '',
+ GLWJLAWSFileId:'',
+ ZCWBLAWSFileMap: [],
+ GCWBLAWSFileMap: [],
+ JDWJLAWSFileMap: [],
+ GLWJLAWSFileMap: [],
user1: '',
user2: '',
user3: '',
@@ -824,31 +740,15 @@
},
methods: {
downloadFile (fileType) {
- if(fileType === 'fbgbjbd'){
- if(this.fbgbjbdFileId.search(',')){
- this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
- console.log(this.fbgbjbdFileId);
+ if(fileType === 'ZCWBLAWS'){
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ZCWBLAWSFileId
+ }else if(fileType === 'GCWBLAWS'){
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.GCWBLAWSFileId
+ }else if(fileType === 'JDWJLAWS'){
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.JDWJLAWSFileId
+ }else if(fileType === 'GLWJLAWS'){
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.GLWJLAWSFileId
}
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
- }else if(fileType === 'xgd'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
- }else if(fileType === 'bpg'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
- }else if(fileType === 'ssg'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
- }else if(fileType === 'zqyjg'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
- }else if(fileType === 'jdwj'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
- }else if(fileType === 'kwj'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
- }else if(fileType === 'glwj'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
- }else if(fileType === 'ca'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
- }else if(fileType === 'zbjbd'){
- window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
- }
},
popoverHide (checkedIds, checkedData) {
console.log(checkedIds);
@@ -876,6 +776,12 @@
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg)
+ const dateArr = []
+ if(processForm.commentCycleStart && processForm.commentCycleEnd){
+ dateArr[0] = processForm.commentCycleStart
+ dateArr[1] = processForm.commentCycleEnd
+ this.commentCycleDate = dateArr
+ }
this.xgdFileId = processForm.xgd
this.fbgbjbdFileId = processForm.fbgbjbd
this.bpgFileId = processForm.bpg
@@ -891,7 +797,21 @@
this.form.kccvppsbm = processForm.kccvppsbm
this.form.cycvppsbm = processForm.cycvppsbm
this.form.dybxh = processForm.dybxh
+
+ this.ZCWBLAWSFileId = processForm.ZCWBLAWS
+ this.GCWBLAWSFileId = processForm.GCWBLAWS
+ this.JDWJLAWSFileId = processForm.JDWJLAWS
+ this.GLWJLAWSFileId = processForm.GLWJLAWS
+
this.getFormFieldList(processForm)
+
+ this.ZCWBLAWSFileMap=this.assemble(processForm.ZCWBLAWS,processForm.ZCWBLAWSName);
+
+ this.GCWBLAWSFileMap=this.assemble(processForm.GCWBLAWS,processForm.GCWBLAWSName);
+
+ this.JDWJLAWSFileMap=this.assemble(processForm.JDWJLAWS,processForm.JDWJLAWSName);
+
+ this.GLWJLAWSFileMap=this.assemble(processForm.GLWJLAWS,processForm.GLWJLAWSName);
}
}).catch(e => {
})
@@ -992,6 +912,19 @@
this.qcdwOption = res.data.QCDW // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
+ this.lawsTypeOptions = res.data.lawsType
+ this.lawsTextStateOptions = res.data.lawsTextState
+ this.lawsSyqyOptions = res.data.lawsSyqy
+ this.lawsSycxOptions = res.data.lawsSycx
+ this.lawsYearOptions = res.data.lawsYear
+ this.lawsLabelOptions = res.data.lawsLabel
+ this.CYSDLAWSOptions = res.data.CYSDLAWS
+ this.TGRLAWSOptions = res.data.TGRLAWS
+ this.TGDWLAWSOptions = res.data.TGDWLAWS
+ this.NYLXLAWSOptions = res.data.NYLXLAWS
+ this.YYRZLAWSOptions = res.data.YYRZLAWS
+ this.ZRBMLAWSOptions = res.data.ZRBMLAWS
+ this.ZRGCSLAWSOptions = res.data.ZRGCSLAWS
})
}
}
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index f6ed92d04..0a73a8524 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -363,7 +363,7 @@ export default {
case 'laws1':
// 政策入库流程
this.$router.push({
- name: 'zcrkwStep1'
+ name: 'zcrkStep1'
})
break
case '1':