Merge branch 'fix_foton_20240430'
# Conflicts: # src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue # src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
This commit is contained in:
wxyclub
@@ -245,6 +245,7 @@
|
||||
|
||||
<div style="width: 20%;">
|
||||
<el-button
|
||||
v-if="historyVersionUploadButton"
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
@@ -904,6 +905,11 @@ export default {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
// 是否展示 过程稿件 历史版本的上传文件按钮
|
||||
historyVersionUploadButton: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
}
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -20,6 +20,7 @@
|
||||
>
|
||||
<div style="flex: auto;">
|
||||
<formEditList
|
||||
:historyVersionUploadButton="false"
|
||||
:key="formKey"
|
||||
:formSub="form"
|
||||
:FBGBUSSFileListSub="FBGBUSSFileList"
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
>
|
||||
<div style="flex: auto;">
|
||||
<formEditList
|
||||
:historyVersionUploadButton="false"
|
||||
:key="formKey"
|
||||
:form="form"
|
||||
:isTrue="true"
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
>
|
||||
<div style="flex: auto;">
|
||||
<formEditList
|
||||
:historyVersionUploadButton="false"
|
||||
:key="formKey"
|
||||
:formSub="form"
|
||||
:isTrue="true"
|
||||
|
||||
@@ -150,6 +150,7 @@
|
||||
</div>
|
||||
<div v-show="active === '2'" style="flex: auto;">
|
||||
<formEditList
|
||||
:historyVersionUploadButton="false"
|
||||
:key="formKey"
|
||||
:isTrue="true"
|
||||
:formSub="form"
|
||||
|
||||
@@ -148,6 +148,7 @@
|
||||
</div>
|
||||
<div v-show="active === '2'" style="flex: auto;">
|
||||
<formEditList
|
||||
:historyVersionUploadButton="false"
|
||||
:key="formKey"
|
||||
:formSub="form"
|
||||
:is-true="true"
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
>
|
||||
<div style="flex: auto;overflow: auto">
|
||||
<formEditList
|
||||
:historyVersionUploadButton="false"
|
||||
:key="formKey"
|
||||
:formSub="form"
|
||||
:isTrue="true"
|
||||
|
||||
@@ -150,6 +150,7 @@
|
||||
</div>
|
||||
<div v-show="active === '2'" style="flex: auto;">
|
||||
<formEditList
|
||||
:historyVersionUploadButton="false"
|
||||
:key="formKey"
|
||||
:formSub="form"
|
||||
:is-true="true"
|
||||
|
||||
@@ -1920,7 +1920,7 @@ export default {
|
||||
this.saveLoading = true
|
||||
this.form.commentText = this.formTongGuo.commentText
|
||||
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
|
||||
const json = JSON.stringify(this.form);
|
||||
const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId : this.userId,
|
||||
|
||||
@@ -1920,7 +1920,7 @@ export default {
|
||||
this.saveLoading = true
|
||||
this.form.commentText = this.formTongGuo.commentText
|
||||
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
|
||||
const json = JSON.stringify(this.form);
|
||||
const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId : this.userId,
|
||||
|
||||
@@ -1918,7 +1918,7 @@ export default {
|
||||
this.saveLoading = true
|
||||
this.form.commentText = this.formTongGuo.commentText
|
||||
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
|
||||
const json = JSON.stringify(this.form);
|
||||
const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId : this.userId,
|
||||
|
||||
@@ -2014,7 +2014,7 @@ export default {
|
||||
this.saveLoading = true
|
||||
this.form.commentText = this.formTongGuo.commentText
|
||||
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
|
||||
const json = JSON.stringify(this.form);
|
||||
const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId : this.userId,
|
||||
|
||||
@@ -1920,7 +1920,7 @@ export default {
|
||||
this.saveLoading = true
|
||||
this.form.commentText = this.formTongGuo.commentText
|
||||
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
|
||||
const json = JSON.stringify(this.form);
|
||||
const json = JSON.stringify({ form: this.form, roleForm: this.roleForm })
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId : this.userId,
|
||||
|
||||
@@ -950,7 +950,7 @@ export default {
|
||||
if (this.saveExportType === "apart") {
|
||||
if (this.selectedList != null && this.selectedList != "") {
|
||||
const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 +
|
||||
"&exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
|
||||
"&exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName + "&id=" + this.pageId;
|
||||
window.open(exportURL);
|
||||
this.$message.success("导出信息成功");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user