From 014bb14170308d4ac67d3f8bc1283c332ac1486f Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 25 Oct 2024 10:27:36 +0800
Subject: [PATCH] sc

---
 src/views/Clue/Order/Comp/SchoolSettle.vue      | 13 ++++++++++++-
 src/views/MiniMall/MallSet/Comp/SupplierSet.vue |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/Clue/Order/Comp/SchoolSettle.vue b/src/views/Clue/Order/Comp/SchoolSettle.vue
index 7af0098..d12f4d4 100644
--- a/src/views/Clue/Order/Comp/SchoolSettle.vue
+++ b/src/views/Clue/Order/Comp/SchoolSettle.vue
@@ -248,6 +248,16 @@
         <el-form-item label="结算金额">
           {{ settleAmount }}
         </el-form-item>
+        <el-form-item label="结算日期">
+          <el-date-picker
+            v-model="form.settlementDate"
+            type="date"
+            placeholder="选择日期时间"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            :clearable="false"
+          />
+        </el-form-item>
         <el-form-item label="结算备注" prop="remark">
           <Editor v-model:modelValue="form.remark" />
         </el-form-item>
@@ -270,7 +280,7 @@ import { getPlaceList } from '@/api/school/place'
 import { getClassTypeList } from '@/api/school/class'
 import * as SettleApi from '@/api/clue/settle'
 
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
 import { removeNullField } from '@/utils/index'
 
 const message = useMessage() // 消息弹窗
@@ -395,6 +405,7 @@ function batchSettle() {
     showDailog.value = true
     form.value = {
       settlementIds: selectList.value.map((it) => it.settlementId),
+      settlementDate: formatDate(new Date()),
       reamrk: undefined
     }
     settleAmount.value = selectList.value.reduce((pre, cur) => pre + cur.settlementMoney, 0)
diff --git a/src/views/MiniMall/MallSet/Comp/SupplierSet.vue b/src/views/MiniMall/MallSet/Comp/SupplierSet.vue
index f35ac9d..d4274d1 100644
--- a/src/views/MiniMall/MallSet/Comp/SupplierSet.vue
+++ b/src/views/MiniMall/MallSet/Comp/SupplierSet.vue
@@ -17,6 +17,7 @@
     </el-form>
     <el-table v-loading="loading" :data="tableList">
       <el-table-column prop="label" label="供应商名称" />
+      <!-- <el-table-column prop="" label="微信群名称" /> -->
       <el-table-column prop="sort" label="排序" width="100px" />
       <el-table-column prop="remark" label="备注" />
       <el-table-column