gxwebsoft/jczxw-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
710356044
2022-01-04 21:04:46 +08:00
parent 5f90df0716 e15b3197fd
commit bf4a31a4a1
12 changed files with 285 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/views/water/drinking-water/collect/water-bill.vue
View File

@@ -13,6 +13,7 @@
<template #toolbar>
<!-- 搜索表单 -->
<a-form layout="inline" :model="where" :labelCol="{ offset: 1 }">
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="区域等级:">
<a-select
v-model:value="where.regionLevel"
@@ -23,6 +24,8 @@
<a-select-option :value="'县级'">县级</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="审核状态:">
<a-select
v-model:value="where.checked"
@@ -33,7 +36,8 @@
<a-select-option :value="0">未审核</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="表格名称:">
<a-input
v-model:value.trim="where.billName"
@@ -41,17 +45,41 @@
allow-clear
/>
</a-form-item>
<a-form-item label="上报时间:">
</a-col>
<!-- <a-form-item label="上报时间:">
<a-range-picker separator="~" v-model:value="reportTimeScope" />
</a-form-item>
</a-form-item> -->
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="起始时间:" name="reportTimeStart" >
<a-date-picker
v-model:value="where.reportTimeStart"
valueFormat="YYYY-MM-DD HH:mm:ss"
:locale="locale"
placeholder="请输入起始时间"
allow-clear
/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="结束时间:" name="reportTimeEnd">
<a-date-picker
v-model:value="where.reportTimeEnd"
valueFormat="YYYY-MM-DD HH:mm:ss"
:locale="locale"
placeholder="请输入结束时间"
allow-clear
/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
<a-space>
<a-button type="primary" @click="reload">查询</a-button>
<a-button @click="reset">重置</a-button>
</a-space>
</a-form-item>
</a-col>
</a-form>
</template>
<template #toolkit>
@@ -423,14 +451,14 @@ export default {
},
/* 刷新表格 */
reload() {
this.where.reportTimeStart = null;
this.where.reportTimeEnd = null;
if (this.reportTimeScope && this.reportTimeScope.length == 2) {
this.where.reportTimeStart =
this.reportTimeScope[0].format("Y-M-D H:m:s");
this.where.reportTimeEnd =
this.reportTimeScope[1].format("Y-M-D H:m:s");
}
// this.where.reportTimeStart = null;
// this.where.reportTimeEnd = null;
// if (this.reportTimeScope && this.reportTimeScope.length == 2) {
// this.where.reportTimeStart =
// this.reportTimeScope[0].format("Y-M-D H:m:s");
// this.where.reportTimeEnd =
// this.reportTimeScope[1].format("Y-M-D H:m:s");
// }
this.$refs.table.reload({
where: this.where,
});
@@ -567,6 +595,12 @@ export default {
</script>
<style lang="less">
.ant-col{
margin-top: 10px;
}
.ant-calendar-picker{
width: 100%;
}
.editable-cell {
position: relative;