测试问题修改
This commit is contained in:
parent
3efa283b3c
commit
97e554d6ac
File diff suppressed because it is too large
Load Diff
|
|
@ -1,46 +1,49 @@
|
|||
<template>
|
||||
<div class="app-container" id="backRecord">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
|
||||
<el-form-item label="退料日期">
|
||||
<el-form-item label="退料日期" prop="time">
|
||||
<el-date-picker
|
||||
v-model="queryParams.time"
|
||||
type="daterange"
|
||||
value-format="yyyy-MM-dd"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="往来单位">
|
||||
<el-select v-model="queryParams.unitId" clearable @change="GetProData" style="width: 240px" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in unitList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="工程名称">
|
||||
<el-select v-model="queryParams.proId" clearable @change="GetUnitData" style="width: 240px" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in proList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="协议号" prop="agreementCode">
|
||||
<el-input
|
||||
v-model="queryParams.agreementCode"
|
||||
placeholder="请输入协议号"
|
||||
clearable
|
||||
:maxlength="20"
|
||||
end-placeholder="结束日期"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="往来单位" prop="unitId">
|
||||
<el-select
|
||||
v-model="queryParams.unitId"
|
||||
clearable
|
||||
@change="GetProData"
|
||||
style="width: 240px"
|
||||
placeholder="请选择"
|
||||
>
|
||||
<el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="工程名称" prop="proId">
|
||||
<el-select
|
||||
v-model="queryParams.proId"
|
||||
clearable
|
||||
@change="GetUnitData"
|
||||
style="width: 240px"
|
||||
placeholder="请选择"
|
||||
>
|
||||
<el-option v-for="item in proList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="协议号" prop="agreementCode"> -->
|
||||
<!-- <el-input -->
|
||||
<!-- v-model="queryParams.agreementCode" -->
|
||||
<!-- placeholder="请输入协议号" -->
|
||||
<!-- clearable -->
|
||||
<!-- :maxlength="20" -->
|
||||
<!-- style="width: 240px" -->
|
||||
<!-- @keyup.enter.native="handleQuery" -->
|
||||
<!-- /> -->
|
||||
<!-- </el-form-item> -->
|
||||
<el-form-item label="机具名称" prop="typeName">
|
||||
<el-input
|
||||
v-model="queryParams.typeName"
|
||||
|
|
@ -72,26 +75,17 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-col :span="1.5">
|
||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
|
||||
<el-table v-loading="loading" :data="leaseAuditList">
|
||||
<!-- <el-table-column type="selection" width="55" align="center" /> -->
|
||||
|
|
@ -108,24 +102,21 @@
|
|||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
v-show="total > 0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
:page-sizes="[5,10,15,20,30]"
|
||||
:page-sizes="[5, 10, 15, 20, 30]"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { backRecord,exportList,getUnitData,getProData } from "@/api/stquery/backRecord";
|
||||
import { backRecord, exportList, getUnitData, getProData } from '@/api/stquery/backRecord'
|
||||
|
||||
export default {
|
||||
name: "backRecord",
|
||||
name: 'backRecord',
|
||||
dicts: ['sys_normal_disable'],
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -153,98 +144,101 @@ export default {
|
|||
dictType: undefined,
|
||||
status: undefined,
|
||||
|
||||
time:null, //申请时间
|
||||
unitId:null, //来往单位id
|
||||
proId:null, //工程id
|
||||
|
||||
time: null, //申请时间
|
||||
unitId: null, //来往单位id
|
||||
proId: null, //工程id
|
||||
typeName: '',
|
||||
typeModelName: '',
|
||||
keyWord: '',
|
||||
types: 1, // 1申请列表 2审核列表
|
||||
},
|
||||
unitList:[], //来往单位集合
|
||||
proList:[], //工程集合
|
||||
};
|
||||
unitList: [], //来往单位集合
|
||||
proList: [], //工程集合
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
this.getUnitList();
|
||||
this.getProList();
|
||||
this.getList()
|
||||
this.getUnitList()
|
||||
this.getProList()
|
||||
},
|
||||
methods: {
|
||||
// 获取 申请列表
|
||||
async getList() {
|
||||
this.loading = true;
|
||||
this.loading = true
|
||||
|
||||
const params = {
|
||||
unitId:this.queryParams.unitId,
|
||||
proId:this.queryParams.proId,
|
||||
keyWord:this.queryParams.keyWord,
|
||||
agreementCode:this.queryParams.agreementCode,
|
||||
typeName:this.queryParams.typeName,
|
||||
typeModelName:this.queryParams.typeModelName,
|
||||
startTime:this.queryParams.time && this.queryParams.time[0],
|
||||
endTime:this.queryParams.time && this.queryParams.time[1],
|
||||
unitId: this.queryParams.unitId,
|
||||
proId: this.queryParams.proId,
|
||||
keyWord: this.queryParams.keyWord,
|
||||
agreementCode: this.queryParams.agreementCode,
|
||||
typeName: this.queryParams.typeName,
|
||||
typeModelName: this.queryParams.typeModelName,
|
||||
startTime: this.queryParams.time && this.queryParams.time[0],
|
||||
endTime: this.queryParams.time && this.queryParams.time[1],
|
||||
pageSize: this.queryParams.pageSize,
|
||||
pageNum: this.queryParams.pageNum
|
||||
pageNum: this.queryParams.pageNum,
|
||||
}
|
||||
|
||||
const res = await backRecord(params)
|
||||
this.loading = false;
|
||||
this.leaseAuditList = res.data.rows;
|
||||
this.total = res.data.total;
|
||||
|
||||
this.loading = false
|
||||
this.leaseAuditList = res.data.rows
|
||||
this.total = res.data.total
|
||||
},
|
||||
|
||||
// 获取 来往单位 列表数据
|
||||
async getUnitList(){
|
||||
async getUnitList() {
|
||||
const params = {
|
||||
id:this.queryParams.proId
|
||||
id: this.queryParams.proId,
|
||||
}
|
||||
const res = await getUnitData(params)
|
||||
this.unitList = res.data
|
||||
console.log('GetUnitData ======================',res)
|
||||
console.log('GetUnitData ======================', res)
|
||||
},
|
||||
// 获取 工程名称 列表数据
|
||||
async getProList(){
|
||||
async getProList() {
|
||||
const params = {
|
||||
id:this.queryParams.unitId
|
||||
id: this.queryParams.unitId,
|
||||
}
|
||||
const res = await getProData(params)
|
||||
this.proList = res.data
|
||||
console.log('GetProData ======================',res)
|
||||
console.log('GetProData ======================', res)
|
||||
},
|
||||
|
||||
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
dictId: undefined,
|
||||
dictName: undefined,
|
||||
dictType: undefined,
|
||||
status: "0",
|
||||
remark: undefined
|
||||
};
|
||||
this.resetForm("form");
|
||||
status: '0',
|
||||
remark: undefined,
|
||||
}
|
||||
this.resetForm('form')
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
this.queryParams.pageNum = 1
|
||||
this.getList()
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.dateRange = [];
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
this.dateRange = []
|
||||
this.resetForm('queryForm')
|
||||
this.handleQuery()
|
||||
},
|
||||
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('material/backRecord/export', {
|
||||
...this.queryParams
|
||||
}, `综合查询_退料记录_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
this.download(
|
||||
'material/backRecord/export',
|
||||
{
|
||||
...this.queryParams,
|
||||
},
|
||||
`综合查询_退料记录_${new Date().getTime()}.xlsx`
|
||||
)
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
::v-deep.el-table .fixed-width .el-button--mini {
|
||||
|
|
|
|||
|
|
@ -8,27 +8,30 @@
|
|||
value-format="yyyy-MM-dd"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期">
|
||||
</el-date-picker>
|
||||
end-placeholder="结束日期"
|
||||
style="width: 240px"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="往来单位">
|
||||
<el-select v-model="queryParams.unitId" clearable @change="GetProData" style="width: 240px" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in unitList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
<el-select
|
||||
v-model="queryParams.unitId"
|
||||
clearable
|
||||
@change="GetProData"
|
||||
style="width: 240px"
|
||||
placeholder="请选择"
|
||||
>
|
||||
<el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="工程名称">
|
||||
<el-select v-model="queryParams.proId" clearable @change="GetUnitData" style="width: 240px" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in proList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
<el-select
|
||||
v-model="queryParams.proId"
|
||||
clearable
|
||||
@change="GetUnitData"
|
||||
style="width: 240px"
|
||||
placeholder="请选择"
|
||||
>
|
||||
<el-option v-for="item in proList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="机具名称" prop="typeName">
|
||||
|
|
@ -62,26 +65,17 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-col :span="1.5">
|
||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
|
||||
<el-table v-loading="loading" :data="leaseAuditList">
|
||||
<!-- <el-table-column type="selection" width="55" align="center" /> -->
|
||||
|
|
@ -99,24 +93,21 @@
|
|||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
v-show="total > 0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
:page-sizes="[5,10,15,20,30]"
|
||||
:page-sizes="[5, 10, 15, 20, 30]"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { leaseRecord,exportList,getUnitData,getProData } from "@/api/stquery/stquery";
|
||||
import { leaseRecord, exportList, getUnitData, getProData } from '@/api/stquery/stquery'
|
||||
|
||||
export default {
|
||||
name: "leaseRecord",
|
||||
name: 'leaseRecord',
|
||||
dicts: ['sys_normal_disable'],
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -144,99 +135,100 @@ export default {
|
|||
dictType: undefined,
|
||||
status: undefined,
|
||||
|
||||
time:null, //申请时间
|
||||
unitId:null, //来往单位id
|
||||
proId:null, //工程id
|
||||
time: null, //申请时间
|
||||
unitId: null, //来往单位id
|
||||
proId: null, //工程id
|
||||
|
||||
types: 1, // 1申请列表 2审核列表
|
||||
},
|
||||
unitList:[], //来往单位集合
|
||||
proList:[], //工程集合
|
||||
};
|
||||
unitList: [], //来往单位集合
|
||||
proList: [], //工程集合
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
this.getUnitList();
|
||||
this.getProList();
|
||||
this.getList()
|
||||
this.getUnitList()
|
||||
this.getProList()
|
||||
},
|
||||
methods: {
|
||||
// 获取 申请列表
|
||||
async getList() {
|
||||
this.loading = true;
|
||||
this.loading = true
|
||||
|
||||
const params = {
|
||||
unitId:this.queryParams.unitId,
|
||||
proId:this.queryParams.proId,
|
||||
keyWord:this.queryParams.keyWord,
|
||||
typeName:this.queryParams.typeName,
|
||||
typeModelName:this.queryParams.typeModelName,
|
||||
startTime:this.queryParams.time && this.queryParams.time[0],
|
||||
endTime:this.queryParams.time && this.queryParams.time[1],
|
||||
unitId: this.queryParams.unitId,
|
||||
proId: this.queryParams.proId,
|
||||
keyWord: this.queryParams.keyWord,
|
||||
typeName: this.queryParams.typeName,
|
||||
typeModelName: this.queryParams.typeModelName,
|
||||
startTime: this.queryParams.time && this.queryParams.time[0],
|
||||
endTime: this.queryParams.time && this.queryParams.time[1],
|
||||
pageSize: this.queryParams.pageSize,
|
||||
pageNum: this.queryParams.pageNum
|
||||
pageNum: this.queryParams.pageNum,
|
||||
}
|
||||
|
||||
const res = await leaseRecord(params)
|
||||
this.loading = false;
|
||||
this.leaseAuditList = res.data.rows;
|
||||
this.total = res.data.total;
|
||||
|
||||
this.loading = false
|
||||
this.leaseAuditList = res.data.rows
|
||||
this.total = res.data.total
|
||||
},
|
||||
|
||||
// 获取 来往单位 列表数据
|
||||
async getUnitList(){
|
||||
async getUnitList() {
|
||||
const params = {
|
||||
id:this.queryParams.proId
|
||||
id: this.queryParams.proId,
|
||||
}
|
||||
const res = await getUnitData(params)
|
||||
this.unitList = res.data
|
||||
console.log('GetUnitData ======================',res)
|
||||
console.log('GetUnitData ======================', res)
|
||||
},
|
||||
// 获取 工程名称 列表数据
|
||||
async getProList(){
|
||||
async getProList() {
|
||||
const params = {
|
||||
id:this.queryParams.unitId
|
||||
id: this.queryParams.unitId,
|
||||
}
|
||||
const res = await getProData(params)
|
||||
this.proList = res.data
|
||||
console.log('GetProData ======================',res)
|
||||
console.log('GetProData ======================', res)
|
||||
},
|
||||
|
||||
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
dictId: undefined,
|
||||
dictName: undefined,
|
||||
dictType: undefined,
|
||||
status: "0",
|
||||
remark: undefined
|
||||
};
|
||||
this.resetForm("form");
|
||||
status: '0',
|
||||
remark: undefined,
|
||||
}
|
||||
this.resetForm('form')
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
this.queryParams.pageNum = 1
|
||||
this.getList()
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.dateRange = [];
|
||||
this.resetForm("queryForm");
|
||||
this.getUnitList();
|
||||
this.getProList();
|
||||
this.handleQuery();
|
||||
this.dateRange = []
|
||||
this.resetForm('queryForm')
|
||||
this.getUnitList()
|
||||
this.getProList()
|
||||
this.handleQuery()
|
||||
},
|
||||
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('material/leaseRecord/export', {
|
||||
...this.queryParams
|
||||
}, `综合查询_领料记录_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
this.download(
|
||||
'material/leaseRecord/export',
|
||||
{
|
||||
...this.queryParams,
|
||||
},
|
||||
`综合查询_领料记录_${new Date().getTime()}.xlsx`
|
||||
)
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
::v-deep.el-table .fixed-width .el-button--mini {
|
||||
|
|
|
|||
Loading…
Reference in New Issue