From ec4477b20028795ab8427db2e2f50e034e247419 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Fri, 25 Oct 2024 15:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/customer/customer.vue                    |  2 +-
 src/views/finance/component/addScheduleListLog.vue | 12 ++++++++++++
 src/views/finance/scheduleList.vue                 | 14 ++++++++++++++
 src/views/schedule/schedule.vue                    | 14 ++++++++++++++
 4 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/views/customer/customer.vue b/src/views/customer/customer.vue
index b1e09f8..5f6a94c 100644
--- a/src/views/customer/customer.vue
+++ b/src/views/customer/customer.vue
@@ -367,7 +367,7 @@ export default {
         },
         {
           label: "区域",
-          prop: 'villate',
+          prop: 'village',
           width: 200,
           customFn: row => {
             return (
diff --git a/src/views/finance/component/addScheduleListLog.vue b/src/views/finance/component/addScheduleListLog.vue
index 37fdb6e..931f36a 100644
--- a/src/views/finance/component/addScheduleListLog.vue
+++ b/src/views/finance/component/addScheduleListLog.vue
@@ -81,6 +81,17 @@
         </div>
       </template>
 
+      <template #remark>
+        <div class="xy-table-item" >
+          <div class="xy-table-item-label">
+            备注 ：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.remark" style="width: 300px;" type="textarea" :autosize="{ minRows: 2 }"></el-input>
+          </div>
+        </div>
+      </template>
+
       <template v-slot:upload_list>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -179,6 +190,7 @@
           lat: "",
           lng: "",
           type: "",
+          remark: "",
           upload_list: [],
           created_at:''
         },
diff --git a/src/views/finance/scheduleList.vue b/src/views/finance/scheduleList.vue
index a1db71e..c2176ce 100644
--- a/src/views/finance/scheduleList.vue
+++ b/src/views/finance/scheduleList.vue
@@ -545,6 +545,20 @@ export default {
           minWidth: 220,
           align:'left'
         },
+        {
+          label: "区域",
+          prop: 'village',
+          width: 200,
+          customFn: row => {
+            return (
+              <span>
+                {
+                  row.customer?.village?.reduce((pre, cur, index) => (pre + (index === 0 ? "" : "/") + cur.village_name),"")
+                }
+              </span>
+            )
+          }
+        },
         {
           prop:'customer.area_detail.value',
           label:'区',
diff --git a/src/views/schedule/schedule.vue b/src/views/schedule/schedule.vue
index e5ba272..9c91609 100644
--- a/src/views/schedule/schedule.vue
+++ b/src/views/schedule/schedule.vue
@@ -145,6 +145,20 @@ export default {
           align:'left',
           prop:'product.name'
         },
+        {
+          label: "区域",
+          prop: 'village',
+          width: 200,
+          customFn: row => {
+            return (
+              <span>
+                {
+                  row.customer?.village?.reduce((pre, cur, index) => (pre + (index === 0 ? "" : "/") + cur.village_name),"")
+                }
+              </span>
+            )
+          }
+        },
         {
           label:'上门区域',
           width: 200,