From 42e2757b124741b380206b7dd2934306cfbe1d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <pande@gxai-data.cn>
Date: Wed, 5 Jan 2022 17:59:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D1-4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drinking-water/collect/water-bill.vue     | 29 ++++++++++---------
 .../statistic/city/situation.vue              | 20 +++++++++++--
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/views/water/drinking-water/collect/water-bill.vue b/src/views/water/drinking-water/collect/water-bill.vue
index 5d1fabd..b393f0d 100644
--- a/src/views/water/drinking-water/collect/water-bill.vue
+++ b/src/views/water/drinking-water/collect/water-bill.vue
@@ -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
@@ -72,7 +61,19 @@
                 />
                 </a-form-item>
             </a-col>
-<a-col :lg="6" :md="12" :sm="24" :xs="24">
+                <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%;
diff --git a/src/views/water/drinking-water/statistic/city/situation.vue b/src/views/water/drinking-water/statistic/city/situation.vue
index bb48dc4..9313a27 100644
--- a/src/views/water/drinking-water/statistic/city/situation.vue
+++ b/src/views/water/drinking-water/statistic/city/situation.vue
@@ -18,6 +18,19 @@
           <template #county="{text}">
             {{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">
@@ -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{