Merge branch 'fix_foton_20240619' into 'master'
Fix foton 20240619 See merge request laws-foton-slrs/foton-laws-system-front!202
This commit is contained in:
@@ -460,7 +460,7 @@
|
|||||||
type="textarea"
|
type="textarea"
|
||||||
v-model="plForm.changePoint"
|
v-model="plForm.changePoint"
|
||||||
placeholder="请输入国内标准的差异点"
|
placeholder="请输入国内标准的差异点"
|
||||||
maxlength="500"
|
maxlength="1000"
|
||||||
:autosize="{minRows:10,maxRows:10}"
|
:autosize="{minRows:10,maxRows:10}"
|
||||||
></el-input>
|
></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|||||||
@@ -473,7 +473,7 @@
|
|||||||
type="textarea"
|
type="textarea"
|
||||||
v-model="plForm.changePoint"
|
v-model="plForm.changePoint"
|
||||||
placeholder="请输入国内标准的差异点"
|
placeholder="请输入国内标准的差异点"
|
||||||
maxlength="500"
|
maxlength="1000"
|
||||||
:autosize="{minRows:10,maxRows:10}"
|
:autosize="{minRows:10,maxRows:10}"
|
||||||
></el-input>
|
></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|||||||
@@ -413,7 +413,7 @@
|
|||||||
type="textarea"
|
type="textarea"
|
||||||
v-model="editForm.changePoint"
|
v-model="editForm.changePoint"
|
||||||
placeholder="请输入国内标准的差异点"
|
placeholder="请输入国内标准的差异点"
|
||||||
maxlength="500"
|
maxlength="1000"
|
||||||
:autosize="{minRows:10,maxRows:10}"
|
:autosize="{minRows:10,maxRows:10}"
|
||||||
></el-input>
|
></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|||||||
@@ -64,6 +64,9 @@
|
|||||||
<ProcessTitle>
|
<ProcessTitle>
|
||||||
<template slot="title">拆分信息</template>
|
<template slot="title">拆分信息</template>
|
||||||
</ProcessTitle>
|
</ProcessTitle>
|
||||||
|
<div style="margin:5px 0">
|
||||||
|
<el-button size="mini" type="primary" @click="exportInfo">导出</el-button>
|
||||||
|
</div>
|
||||||
<el-table border
|
<el-table border
|
||||||
ref="filterTable"
|
ref="filterTable"
|
||||||
:data="itemList"
|
:data="itemList"
|
||||||
@@ -319,6 +322,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<loading :loading="loading">加载中...</loading>
|
<loading :loading="loading">加载中...</loading>
|
||||||
|
<!-- 导出 -->
|
||||||
|
<ExportDialog ref="exportDialogRef" @exportName="exportName" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -326,6 +331,7 @@
|
|||||||
import ProcessHeader from '../../components/ProcessHeader'
|
import ProcessHeader from '../../components/ProcessHeader'
|
||||||
import ProcessFooter from '../../components/ProcessFooter'
|
import ProcessFooter from '../../components/ProcessFooter'
|
||||||
import ProcessTitle from '../../components/ProcessTitle'
|
import ProcessTitle from '../../components/ProcessTitle'
|
||||||
|
import ExportDialog from '@/components/hzwlComponents/exportDialog'
|
||||||
import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
|
import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
|
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
|
||||||
@@ -371,9 +377,20 @@
|
|||||||
ReceiptDescription,
|
ReceiptDescription,
|
||||||
ProcessHeader,
|
ProcessHeader,
|
||||||
ProcessFooter,
|
ProcessFooter,
|
||||||
ProcessTitle
|
ProcessTitle,
|
||||||
|
ExportDialog
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
exportInfo () {
|
||||||
|
this.$refs.exportDialogRef.openModel()
|
||||||
|
},
|
||||||
|
exportName (name) {
|
||||||
|
const exportURL = '/api/lawss/activiti/exportStandardReadInfo?exportFileName=' + name + '&taskId=' + this.taskIds
|
||||||
|
window.open(exportURL)
|
||||||
|
this.$refs.exportDialogRef.cancel()
|
||||||
|
this.$message.success('导出信息成功')
|
||||||
|
this.exportLoading = false
|
||||||
|
},
|
||||||
handleResize() {
|
handleResize() {
|
||||||
this.$nextTick(()=> {
|
this.$nextTick(()=> {
|
||||||
this.$refs.filterTable.doLayout();
|
this.$refs.filterTable.doLayout();
|
||||||
|
|||||||
Reference in New Issue
Block a user