Skip to content

P
patzn-cloud-web-back-soil
Commit eedf2d58 by lichengming
Options

修改了报告管理

parent aeea98a4
Showing with 32 additions and 67 deletions
pages/soil-report-manage/report-audit/tabs/historyTask.vue
...@@ -284,12 +284,7 @@ export default { ...@@ -284,12 +284,7 @@ export default {
}, },
_uploadByIds(id) { _uploadByIds(id) {
const tempData = { this.$refs.FileManage._open(id, 'entrustId')
id: id,
uploadFileUrl: '/v1/entrust_attachment/upload/',
downloadFileUrl: '/v1/entrust_attachment/download/'
}
this.$refs.FileManage._open(tempData, 'entrustId')
}, },
// 文件返回的数据 // 文件返回的数据
_fileResult(msg, data) { _fileResult(msg, data) {
......
pages/soil-report-manage/report-audit/tabs/reportAudit.vue
...@@ -318,12 +318,7 @@ export default { ...@@ -318,12 +318,7 @@ export default {
}, },
_uploadByIds(id) { _uploadByIds(id) {
const tempData = { this.$refs.FileManage._open(id, 'entrustId')
id: id,
uploadFileUrl: '/v1/entrust_attachment/upload/',
downloadFileUrl: '/v1/entrust_attachment/download/'
}
this.$refs.FileManage._open(tempData, 'entrustId')
}, },
// 文件返回的数据 // 文件返回的数据
_fileResult(msg, data) { _fileResult(msg, data) {
......
pages/soil-report-manage/report-issue/tabs/historyTask.vue
...@@ -36,62 +36,48 @@ ...@@ -36,62 +36,48 @@
</Form-item> </Form-item>
</Form> </Form>
<Col span="24"> <Col span="24">
<btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" show-search-btn="true" /> <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" style="height: 30px;" show-search-btn="true" />
</Col> </Col>
<!-- <Button type="primary" @click="_submitReportCheck">--> <!-- <Button type="primary" @click="_submitReportCheck">-->
<!-- 提交--> <!-- 提交-->
<!-- </Button>--> <!-- </Button>-->
<Col span="24"> <Col span="24">
<element-table <PTVXETable
ref="pageTable" ref="pageTable"
:page-columns="pageColumns" :tableHeight="tableHeight"
:table-height="tableHeight" :getPage="getPage"
:get-page="getPage" :iconMsg="iconMsg"
@on-result-change="_tableResultChange" @on-result-change="_tableResultChange" select-data>
show-check-box <vxe-table-column
select-data
>
<el-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
:prop="item.key" :field="item.key"
:label="item.title" :title="item.title"
:align="item.align" :min-width="100"
:width="item.width" :width="item.width"
:min-width="200"
:fixed="item.fixed?item.fixed:undefined" :fixed="item.fixed?item.fixed:undefined"
show-overflow-tooltip
sortable sortable
> >
<template slot-scope="scope" @click.stop="_handleIndex(scope)"> <template slot-scope="scope">
<span v-if="item.datetime"> <a @click.stop="_detailModal(scope.row.id,scope.row.type)"
{{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):'' }} v-if="item.detail">{{scope.row[item.key]}}</a>
</span> <div v-else-if="item.type">{{scope.row[item.key]?'政府':'企业'}}</div>
<div v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'): ''}}
</div>
<div v-else-if="item.key==='havePhoto'">{{scope.row[item.key]===1?'是':
scope.row[item.key]===0?'否':''}}
</div>
<div v-else-if="item.status"> <div v-else-if="item.status">
{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }} <span v-if="scope.row[item.key].display === '报告审核退回'||'报告签发退回' ===scope.row[item.key].display " style="color: red;">{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}</span>
<span v-else>{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}</span>
</div> </div>
<span v-else> <div v-else-if="item.judge">
{{ scope.row[item.key] }} {{Number(scope.row[item.key]) === 0? '否':'是'}}
</span> </div>
</template> <div v-else>{{scope.row[item.key]}}</div>
</el-table-column>
<el-table-column
slot="col"
:width="120"
label="操作"
align="center"
fixed="right"
>
<template slot-scope="scope">
<icon-list
:msg="iconMsg"
:row-data="scope.row"
:row-index="scope.$index"
@on-result-change="_iconClick"
/>
</template> </template>
</el-table-column> </vxe-table-column>
</element-table> </PTVXETable>
</Col> </Col>
</Row> </Row>
<fileManage ref="FileManage" @on-result-change="_fileResult" /> <fileManage ref="FileManage" @on-result-change="_fileResult" />
...@@ -131,7 +117,6 @@ export default { ...@@ -131,7 +117,6 @@ export default {
btn: [ btn: [
// { id: 'env-report-make-submit', type: 'primary', name: '提交' }, // { id: 'env-report-make-submit', type: 'primary', name: '提交' },
// { id: '', type: 'primary', name: '生成' }, // { id: '', type: 'primary', name: '生成' },
{ id: 'ZBC', type: 'primary', name: '下载' }
], ],
getPage: {}, getPage: {},
searchOpen: false, searchOpen: false,
...@@ -162,7 +147,7 @@ export default { ...@@ -162,7 +147,7 @@ export default {
const result = await soilReport.pageReportIssueHis(data) const result = await soilReport.pageReportIssueHis(data)
if (result) { if (result) {
this.getPage = result this.getPage = result
this.$refs.pageTable._initTable() this.$refs.pageTable._hideLoading()
} }
}, },
_clearPage() { _clearPage() {
...@@ -337,12 +322,7 @@ export default { ...@@ -337,12 +322,7 @@ export default {
}, },
_uploadByIds(id) { _uploadByIds(id) {
const tempData = { this.$refs.FileManage._open(id, 'entrustId')
id: id,
uploadFileUrl: '/v1/entrust_attachment/upload/',
downloadFileUrl: '/v1/entrust_attachment/download/'
}
this.$refs.FileManage._open(tempData, 'entrustId')
}, },
// 文件返回的数据 // 文件返回的数据
_fileResult(msg, data) { _fileResult(msg, data) {
......
pages/soil-report-manage/report-issue/tabs/reportIssue.vue
...@@ -352,12 +352,7 @@ export default { ...@@ -352,12 +352,7 @@ export default {
}, },
_uploadByIds(id) { _uploadByIds(id) {
const tempData = { this.$refs.FileManage._open(id, 'entrustId')
id: id,
uploadFileUrl: '/v1/entrust_attachment/upload/',
downloadFileUrl: '/v1/entrust_attachment/download/'
}
this.$refs.FileManage._open(tempData, 'entrustId')
}, },
// 文件返回的数据 // 文件返回的数据
_fileResult(msg, data) { _fileResult(msg, data) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment