Skip to content

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

修改了报告管理历史报告

parent e6c31ade
Showing with 77 additions and 58 deletions
api/index.js
......@@ -31,3 +31,4 @@ export { default as soilEntrust } from './soil/soil-entrust'
export { default as soilSample } from './soil/soil-sample'
export { default as soilTest } from './soil/soil-test'
export { default as soilStatistics } from './soil/soil-statistics'
export { default as soilReport } from './soil/soil-report'
api/soil/soil-report.js 0 → 100644
/**
* 工作台
*/
import http from '../http'
// import { https } from '../https'
export default {
// 报告编制 历史报告分页列表
pageReportMakeHis: data =>
http.post('soil/v1/entrust/page_report_make_his', data).then(res => res),
// 报告审核 历史任务分页列表
pageReportCheckHis: data =>
http.post('soil/v1/entrust/page_report_check_his', data).then(res => res),
// 报告签发 历史任务分页列表
pageReportIssueHis: data =>
http.post('soil/v1/entrust/page_report_issue_his', data).then(res => res)
}
pages/soil-report-manage/report-audit/tabs/historyTask.vue
......@@ -38,12 +38,7 @@
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" show-search-btn="true" />
</Col>
<Col />
<Button @click="_downloadByIds">
下载
</Button>
</Col>
<Col />
<Col span="24">
<element-table
ref="pageTable"
:page-columns="pageColumns"
......@@ -103,7 +98,7 @@
<script>
// eslint-disable-next-line import/named
import { soilStatistics } from '../../../../api'
import { soilReport, soilStatistics } from '../../../../api'
import global from '../../../../api/config'
import OperationModal from '../../../../components/operation/Operation'
export default {
......@@ -113,22 +108,27 @@ export default {
return {
name: '',
pageColumns: [
{ title: '委托方', key: 'client', width: 200 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '报告是否生成', key: 'reported', width: 120 },
{ title: '状态', key: 'progress', width: 120, status: true },
{ title: '电话/手机', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '邮箱', key: 'email' },
{ title: '费用合计', key: 'fee', width: 120 },
{ title: '备注', key: 'remark' }
{
title: '委托商',
key: 'client',
width: 100,
fixed: 'left'
},
{ title: '委托编号', key: 'entrustCode', width: 100 },
{ title: '报告编号', key: 'reportCode', width: 100 },
{ title: '进度', key: 'progress', width: 110, status: true },
{ title: '状态', key: 'status', width: 100, status: true },
{ title: '委托日期', key: 'entrustDate', width: 100, date: true },
{ title: '钻孔位置', key: 'boreholeLocation', width: 100 },
{ title: '钻孔名称', key: 'boreholeName', width: 100 },
{ title: '水深', key: 'waterDepth', width: 100 },
{ title: '制表人', key: 'tabulater', width: 110 },
{ title: '制表日期', key: 'tabulateDate', width: 110, date: true }
],
btn: [
// { id: 'env-report-make-submit', type: 'primary', name: '提交' },
// { id: '', type: 'primary', name: '生成' },
// { id: '', type: 'primary', name: '下载' }
{ id: 'ZBC', type: 'primary', name: '下载' }
],
getPage: {},
searchOpen: false,
......@@ -155,7 +155,7 @@ export default {
async _page() {
const data = this.$serialize('lab-sample-form-his')
Object.assign(data, this.$refs.pageTable._searchParams())
const result = await soilStatistics.pageReportMake(data)
const result = await soilReport.pageReportCheckHis(data)
if (result) {
this.getPage = result
this.$refs.pageTable._initTable()
......
pages/soil-report-manage/report-audit/tabs/reportAudit.vue
......@@ -100,7 +100,6 @@ export default {
],
btn: [
{ id: '', type: 'primary', name: '提交' },
{ id: '', type: 'primary', name: '下载' },
{ id: '', type: 'primary', name: '退回' }
],
getPage: {},
......
pages/soil-report-manage/report-issue/tabs/historyTask.vue
......@@ -38,15 +38,10 @@
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" show-search-btn="true" />
</Col>
<Col />
<!-- <Button type="primary" @click="_submitReportCheck">-->
<!-- 提交-->
<!-- </Button>-->
<Button @click="_downloadByIds">
下载
</Button>
</Col>
<Col />
<Col span="24">
<element-table
ref="pageTable"
:page-columns="pageColumns"
......@@ -106,7 +101,7 @@
<script>
// eslint-disable-next-line import/named
import { soilStatistics } from '../../../../api'
import { soilReport, soilStatistics } from '../../../../api'
import global from '../../../../api/config'
import OperationModal from '../../../../components/operation/Operation'
export default {
......@@ -116,22 +111,27 @@ export default {
return {
name: '',
pageColumns: [
{ title: '委托方', key: 'client', width: 200 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '报告是否生成', key: 'reported', width: 120 },
{ title: '状态', key: 'progress', width: 120, status: true },
{ title: '电话/手机', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '邮箱', key: 'email' },
{ title: '费用合计', key: 'fee', width: 120 },
{ title: '备注', key: 'remark' }
{
title: '委托商',
key: 'client',
width: 100,
fixed: 'left'
},
{ title: '委托编号', key: 'entrustCode', width: 100 },
{ title: '报告编号', key: 'reportCode', width: 100 },
{ title: '进度', key: 'progress', width: 110, status: true },
{ title: '状态', key: 'status', width: 100, status: true },
{ title: '委托日期', key: 'entrustDate', width: 100, date: true },
{ title: '钻孔位置', key: 'boreholeLocation', width: 100 },
{ title: '钻孔名称', key: 'boreholeName', width: 100 },
{ title: '水深', key: 'waterDepth', width: 100 },
{ title: '制表人', key: 'tabulater', width: 110 },
{ title: '制表日期', key: 'tabulateDate', width: 110, date: true }
],
btn: [
// { id: 'env-report-make-submit', type: 'primary', name: '提交' },
// { id: '', type: 'primary', name: '生成' },
// { id: '', type: 'primary', name: '下载' }
{ id: 'ZBC', type: 'primary', name: '下载' }
],
getPage: {},
searchOpen: false,
......@@ -159,7 +159,7 @@ export default {
async _page() {
const data = this.$serialize('lab-sample-form-his')
Object.assign(data, this.$refs.pageTable._searchParams())
const result = await soilStatistics.pageReportMake(data)
const result = await soilReport.pageReportIssueHis(data)
if (result) {
this.getPage = result
this.$refs.pageTable._initTable()
......
pages/soil-report-manage/report-issue/tabs/reportIssue.vue
......@@ -124,7 +124,6 @@ export default {
],
btn: [
{ id: '', type: 'primary', name: '提交' },
{ id: '', type: 'primary', name: '下载' },
{ id: '', type: 'primary', name: '退回' }
],
getPage: {},
......
pages/soil-report-manage/report-make/ReportMakeHis.vue
......@@ -68,7 +68,7 @@
</template>
<script>
import UserInfo from '../../../components/user-info-single/AssignPerson'
import { soilTest } from '../../../api'
import { soilReport } from '../../../api'
import Operation from '../../../components/operation/Operation'
export default {
components: {
......@@ -98,20 +98,22 @@ export default {
],
getPage: {},
pageColumns: [
{ title: '委托商', key: 'client', width: 200 },
{ title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '委托日期', key: 'entrustDate', width: 120, date: true },
{ title: '钻孔位置', key: 'boreholeLocation', width: 120 },
{ title: '水深（米）', key: 'waterDepth', width: 120 },
{ title: '钻孔名称', key: 'boreholeName', width: 120 },
{ title: '进度', key: 'progress', width: 120, status: true },
{ title: '工程号', key: 'projectNo', width: 120 },
{ title: '报告编号', key: 'reportCode', width: 120 },
{ title: '制表日期', key: 'tabulateDate', width: 120, date: true },
{ title: '制表人', key: 'tabulater', width: 120 },
{ title: '批准日期', key: 'approveDate', width: 120, date: true },
{ title: '批准人', key: 'approver', width: 120 },
{ title: '检验类别', key: 'testType', width: 120 }
{
title: '委托商',
key: 'client',
width: 100,
fixed: 'left'
},
{ title: '委托编号', key: 'entrustCode', width: 100 },
{ title: '报告编号', key: 'reportCode', width: 100 },
{ title: '进度', key: 'progress', width: 110, status: true },
{ title: '状态', key: 'status', width: 100, status: true },
{ title: '委托日期', key: 'entrustDate', width: 100, date: true },
{ title: '钻孔位置', key: 'boreholeLocation', width: 100 },
{ title: '钻孔名称', key: 'boreholeName', width: 100 },
{ title: '水深', key: 'waterDepth', width: 100 },
{ title: '制表人', key: 'tabulater', width: 110 },
{ title: '制表日期', key: 'tabulateDate', width: 110, date: true }
],
searchOpen: false,
btn: [
......@@ -399,7 +401,7 @@ export default {
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await soilTest.pageExpTest(
const result = await soilReport.pageReportMakeHis(
this.$serializeForm(this.formObj)
)
if (result) {
......
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