@@ -666,6 +666,16 @@ export default {
name: "bzrkStep3",
data () {
return {
+ xgdFileId: '',
+ fbgbjbdFileId: '',
+ bpgFileId: '',
+ ssgFileId: '',
+ zqyjgFileId: '',
+ jdwjFileId: '',
+ kwjFileId: '',
+ glwjFileId: '',
+ caFileId: '',
+ zbjbdFileId:'',
activeName:'1',
// 当前流程类型(1待办/2已办)
processType: 1,
@@ -818,6 +828,29 @@ export default {
},
},
methods: {
+ downloadFile (fileType) {
+ if(fileType === 'fbgbjbd'){
+ 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) {
if(checkedData) {
this.form.standSystem = checkedData.id
@@ -879,6 +912,16 @@ export default {
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg)
+ this.xgdFileId = processForm.xgd
+ this.fbgbjbdFileId = processForm.fbgbjbd
+ this.bpgFileId = processForm.bpg
+ this.ssgFileId = processForm.ssg
+ this.zqyjgFileId = processForm.zqyjg
+ this.jdwjFileId = processForm.jdwj
+ this.kwjFileId = processForm.kwj
+ this.glwjFileId = processForm.glwj
+ this.caFileId = processForm.ca
+ this.zbjbdFileId = processForm.zbjbd
this.getFormFieldList(processForm)
}
}).catch(e => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 1a84a2fe9..74c328123 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -718,6 +718,13 @@
placeholder="请输入采标编号"
clearable
>
+
{{'手动查找'}}
{{'手动查找'}}
@@ -1398,12 +1405,15 @@ export default {
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
+ // 解决 标准入库流程--圈住的字段,先手动输入,然后再手动查找,点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'dtbjh'){
- this.form.dtbjh = textArr.join(',')
+ this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'yybj'){
- this.form.yybj = textArr.join(',')
- }else {
- this.form.byybj = textArr.join(',')
+ this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
+ }else if(this.replaceLawType === 'cbbh'){
+ this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
+ } else {
+ this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
// this.$emit('input', textArr.join(','))
this.$refs.selections.clearSelection()
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index eb5a19493..e62214175 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -198,84 +198,84 @@
文本信息
-
-
-
-
- {{ form.xgd }}
-
-
- - -
-
-
-
-
- {{ form.fbgbjbd }}
-
-
- - -
-
-
-
-
- {{ form.zbjbd }}
-
-
- - -
-
-
-
-
- {{ form.bpg }}
-
-
- - -
-
-
-
-
- {{ form.ssg }}
-
-
- - -
-
-
-
-
-
-
- {{ form.kwj }}
-
-
- - -
-
-
-
-
- {{ form.zqyjg }}
-
-
- - -
-
-
-
-
- {{ form.ca }}
-
-
- - -
-
-
-
-
- {{ form.jdwj }}
-
-
- - -
-
-
-
-
+
+
+
+
+ {{ form.xgdName }}
+
+
+ - -
+
+
+
+
+ {{ form.fbgbjbdName }}
+
+
+ - -
+
+
+
+
+ {{ form.zbjbdName }}
+
+
+ - -
+
+
+
+
+ {{ form.bpgName }}
+
+
+ - -
+
+
+
+
+ {{ form.ssgName }}
+
+
+ - -
+
+
+
+
+
+
+ {{ form.kwjName }}
+
+
+ - -
+
+
+
+
+ {{ form.zqyjgName }}
+
+
+ - -
+
+
+
+
+ {{ form.caName }}
+
+
+ - -
+
+
+
+
+ {{ form.jdwjName }}
+
+
+ - -
+
+
+
+
适用范围
@@ -465,14 +465,15 @@
clearable
>
-
-
- {{ form.glwj }}
-
-
- - -
-
-
+
+
+ {{ form.glwjName }}
+
+
+ - -
+
+
+
@@ -670,6 +671,16 @@
name: "bzrkStep5",
data () {
return {
+ xgdFileId: '',
+ fbgbjbdFileId: '',
+ bpgFileId: '',
+ ssgFileId: '',
+ zqyjgFileId: '',
+ jdwjFileId: '',
+ kwjFileId: '',
+ glwjFileId: '',
+ caFileId: '',
+ zbjbdFileId:'',
// 当前流程类型(1待办/2已办)
processType: 1,
detailData: [],
@@ -790,6 +801,29 @@
},
},
methods: {
+ downloadFile (fileType) {
+ if(fileType === 'fbgbjbd'){
+ 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);
console.log(checkedData);
@@ -816,6 +850,16 @@
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg)
+ this.xgdFileId = processForm.xgd
+ this.fbgbjbdFileId = processForm.fbgbjbd
+ this.bpgFileId = processForm.bpg
+ this.ssgFileId = processForm.ssg
+ this.zqyjgFileId = processForm.zqyjg
+ this.jdwjFileId = processForm.jdwj
+ this.kwjFileId = processForm.kwj
+ this.glwjFileId = processForm.glwj
+ this.caFileId = processForm.ca
+ this.zbjbdFileId = processForm.zbjbd
this.getFormFieldList(processForm)
}
}).catch(e => {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index b0315ca40..6cb34f168 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -304,8 +304,6 @@ export default {
},
//提交事件
handleSubmit() {
- this.listForm.dataList.forEach(item => {
- if (item.workPeople !== undefined) {
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -321,10 +319,6 @@ export default {
}
}, e => {
});
- } else {
- this.$message.warning("请选择分发负责人");
- }
- });
},
//批量分发按钮
batchOperation(id) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 24dcc9a41..f001bac6b 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -80,55 +80,13 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -243,13 +178,12 @@
width="180px"
label="标准号">