This commit is contained in:
parent
88b7a51b22
commit
98e7d5a3fb
|
|
@ -33,9 +33,9 @@ service.interceptors.request.use(config => {
|
||||||
const headers = config.headers || {}
|
const headers = config.headers || {}
|
||||||
const {
|
const {
|
||||||
isToken = true,
|
isToken = true,
|
||||||
encryptRequest = true,
|
encryptRequest = false,
|
||||||
checkIntegrity = true,
|
checkIntegrity = false,
|
||||||
encryptResponse = true,
|
encryptResponse = false,
|
||||||
repeatSubmit = false
|
repeatSubmit = false
|
||||||
} = headers
|
} = headers
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -51,13 +51,13 @@
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="类型名称"
|
label="类型名称"
|
||||||
align="center"
|
align="center"
|
||||||
prop="specificationType"
|
prop="machineTypeName"
|
||||||
:show-overflow-tooltip="true"
|
:show-overflow-tooltip="true"
|
||||||
/>
|
/>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="规格型号"
|
label="规格型号"
|
||||||
align="center"
|
align="center"
|
||||||
prop="machineTypeName"
|
prop="specificationType"
|
||||||
:show-overflow-tooltip="true"
|
:show-overflow-tooltip="true"
|
||||||
/>
|
/>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,18 @@
|
||||||
v-show="showSearch"
|
v-show="showSearch"
|
||||||
label-width="68px"
|
label-width="68px"
|
||||||
>
|
>
|
||||||
|
<el-form-item>
|
||||||
|
<el-date-picker
|
||||||
|
v-model="queryParams.time"
|
||||||
|
type="daterange"
|
||||||
|
value-format="yyyy-MM-dd"
|
||||||
|
range-separator="至"
|
||||||
|
start-placeholder="开始日期"
|
||||||
|
end-placeholder="结束日期"
|
||||||
|
style="width: 240px"
|
||||||
|
>
|
||||||
|
</el-date-picker>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item prop="keyWord">
|
<el-form-item prop="keyWord">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.keyWord"
|
v-model="queryParams.keyWord"
|
||||||
|
|
@ -173,6 +185,9 @@ export default {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
keyWord: undefined,
|
keyWord: undefined,
|
||||||
|
time: [],
|
||||||
|
startTime: undefined,
|
||||||
|
endTime: undefined,
|
||||||
},
|
},
|
||||||
queryInBoundInfo:{
|
queryInBoundInfo:{
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
|
|
@ -186,6 +201,10 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
const end = new Date()
|
||||||
|
let start = new Date()
|
||||||
|
start.setMonth(start.getMonth() - 1)
|
||||||
|
this.queryParams.time = [this.format(start), this.format(end)]
|
||||||
if(this.$route.query.code){
|
if(this.$route.query.code){
|
||||||
this.queryParams.keyWord=this.$route.query.code
|
this.queryParams.keyWord=this.$route.query.code
|
||||||
}
|
}
|
||||||
|
|
@ -193,9 +212,17 @@ export default {
|
||||||
},
|
},
|
||||||
components: {},
|
components: {},
|
||||||
methods: {
|
methods: {
|
||||||
|
format(date) {
|
||||||
|
const y = date.getFullYear()
|
||||||
|
const m = String(date.getMonth() + 1).padStart(2, '0')
|
||||||
|
const day = String(date.getDate()).padStart(2, '0')
|
||||||
|
return `${y}-${m}-${day}`
|
||||||
|
},
|
||||||
/** 查询修试入库列表 */
|
/** 查询修试入库列表 */
|
||||||
getList() {
|
getList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
|
this.queryParams.startTime = this.queryParams.time ? this.queryParams.time[0] : '';
|
||||||
|
this.queryParams.endTime = this.queryParams.time ? this.queryParams.time[1] : '';
|
||||||
getTestedListApi(this.queryParams).then((response) => {
|
getTestedListApi(this.queryParams).then((response) => {
|
||||||
this.testedList = response.data.rows;
|
this.testedList = response.data.rows;
|
||||||
this.total = response.data.total;
|
this.total = response.data.total;
|
||||||
|
|
@ -212,6 +239,10 @@ export default {
|
||||||
resetQuery() {
|
resetQuery() {
|
||||||
this.resetForm("queryForm");
|
this.resetForm("queryForm");
|
||||||
this.queryParams.keyWord = null;
|
this.queryParams.keyWord = null;
|
||||||
|
const end = new Date()
|
||||||
|
let start = new Date()
|
||||||
|
start.setMonth(start.getMonth() - 1)
|
||||||
|
this.queryParams.time = [this.format(start), this.format(end)]
|
||||||
this.handleQuery();
|
this.handleQuery();
|
||||||
},
|
},
|
||||||
//一级页面审核按钮
|
//一级页面审核按钮
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue