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

修复1-4问题

Browse Source
This commit is contained in:
庞东林
2022-01-05 17:59:03 +08:00
parent 19b5a12146
commit 42e2757b12
2 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,18 +25,7 @@
</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"
allowClear
placeholder="未选择"
>
<a-select-option :value="1">已审核</a-select-option>
<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
@@ -73,6 +62,18 @@
</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"
allowClear
placeholder="未选择"
>
<a-select-option :value="1">已审核</a-select-option>
<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 class="ele-text-right" :wrapper-col="{ span: 24 }">
<a-space>
<a-button type="primary" @click="reload">查询</a-button>
@@ -596,7 +597,7 @@ export default {
<style lang="less">
.ant-col{
margin-top: 10px;
margin-bottom: 10px;
}
.ant-calendar-picker{
width: 100%;

20
src/views/water/drinking-water/statistic/city/situation.vue
View File

@@ -19,6 +19,19 @@
{{text="市区"}}
</template>
<template #checknumber="{ text, record ,index }">
<div class="editable-cell">
<div v-if="editableData[index] && editableData[index].edable=='index1'" class="editable-cell-input-wrapper">
<a-input class="edit-input" v-model:value="editableData[index]['index1']" @pressEnter="save(index)" />
<check-outlined class="editable-cell-icon-check" @click="save(index)" />
</div>
<div v-else class="editable-cell-text-wrapper">
{{ (Array.isArray(text)? text[0]: text) || ' ' }}
<edit-outlined class="editable-cell-icon" @click="edit(record,index,'index1')" />
</div>
</div>
</template>
<template #enumber="{ text, record ,index }">
<div class="editable-cell">
<div v-if="editableData[index] && editableData[index].edable=='index3'" class="editable-cell-input-wrapper">
@@ -133,7 +146,9 @@ export default {
{title:"类型",dataIndex:"waterSourceProperty",},
{title:"监测时间",dataIndex:"monitorTime"},
// {title:"监测时间",dataIndex:"reportTime",customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY/MM/DD")},
{title:"应当监测项目个数",dataIndex:'index1', },
{title:"应当监测项目个数",dataIndex:'index1', slots: {
customRender: 'checknumber',
},},
{title:"未测个数",dataIndex:"noCheckNum",},
{title:"独立分析项目个数",dataIndex:"index3",
slots: {
@@ -296,7 +311,8 @@ export default {
.edit-input{
margin-right: 5px;
width: 200px;
min-width: 200px;
width: 100%;
}
}
.editable-cell-text-wrapper{