From b6bd32430b1663eb5e454c18ceaa941a85901078 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 24 Jun 2024 23:28:56 +0800
Subject: [PATCH 01/25] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Basic/GeneralSet/Comp/BSClue.vue  |  2 +-
 src/views/Clue/Order/Comp/MallOrderList.vue | 10 +++++++++-
 src/views/Clue/Order/Comp/OrderList.vue     | 10 +++++++++-
 src/views/Clue/Pool/index.vue               |  2 +-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/views/Basic/GeneralSet/Comp/BSClue.vue b/src/views/Basic/GeneralSet/Comp/BSClue.vue
index 8a2b1c5..7ca45c9 100644
--- a/src/views/Basic/GeneralSet/Comp/BSClue.vue
+++ b/src/views/Basic/GeneralSet/Comp/BSClue.vue
@@ -10,7 +10,7 @@
       </template>
       <el-radio-group
         v-model="form.usePhoneConfig"
-        :disabled="getConfig('usePhoneConfig').modifiable == 'false'"
+        :disabled="!getConfig('usePhoneConfig').modifiable"
       >
         <el-radio
           v-for="(item, index) in getConfig('usePhoneConfig').options"
diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue
index 42a6e56..689bcc0 100644
--- a/src/views/Clue/Order/Comp/MallOrderList.vue
+++ b/src/views/Clue/Order/Comp/MallOrderList.vue
@@ -60,6 +60,7 @@
       v-model:tableObject="tableObject"
       :tableColumns="allSchemas.tableColumns"
       @get-list="getTableList"
+      @get-checked-columns="getCheckedColumns"
     >
       <el-table-column type="expand">
         <template #default="{ row }">
@@ -104,7 +105,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        v-for="item in allSchemas.tableColumns"
+        v-for="item in showColumns"
         :key="item.field"
         :prop="item.field"
         :label="item.label"
@@ -282,6 +283,13 @@ async function getCurdSchemas() {
   }
 }
 
+const showColumns = ref([])
+
+// 初始化表格
+function getCheckedColumns(list) {
+  showColumns.value = list && list.length ? list : allSchemas.value.tableColumns
+}
+
 // 详情
 function handleDetail(row) {
   orderDetailDialog.value.open(row.clueId, row.signId)
diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue
index c1d937e..35c5190 100644
--- a/src/views/Clue/Order/Comp/OrderList.vue
+++ b/src/views/Clue/Order/Comp/OrderList.vue
@@ -79,9 +79,10 @@
       v-model:tableObject="tableObject"
       :tableColumns="allSchemas.tableColumns"
       @get-list="getTableList"
+      @get-checked-columns="getCheckedColumns"
     >
       <el-table-column
-        v-for="item in allSchemas.tableColumns"
+        v-for="item in showColumns"
         :key="item.field"
         :prop="item.field"
         :label="item.label"
@@ -232,6 +233,13 @@ async function getCurdSchemas() {
   }
 }
 
+const showColumns = ref([])
+
+// 初始化表格
+function getCheckedColumns(list) {
+  showColumns.value = list && list.length ? list : allSchemas.value.tableColumns
+}
+
 // 详情
 function handleDetail(row) {
   orderDetailDialog.value.open(row.clueId, row.signId)
diff --git a/src/views/Clue/Pool/index.vue b/src/views/Clue/Pool/index.vue
index 58e3113..00887ae 100644
--- a/src/views/Clue/Pool/index.vue
+++ b/src/views/Clue/Pool/index.vue
@@ -214,7 +214,7 @@ const showColumns = ref([])
 
 // 初始化表格
 function getCheckedColumns(list) {
-  showColumns.value = list
+  showColumns.value = list && list.length ? list : allSchemas.value.tableColumns
 }
 
 function resetQuery() {

From 93d7f2b43d02bcdc3e94b8e9872fd77b52ba9976 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 25 Jun 2024 16:58:37 +0800
Subject: [PATCH 02/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/school/place/index.js               |  2 +-
 src/components/Form/src/Form.vue            |  1 +
 src/views/Clue/Order/Comp/MallOrderList.vue |  2 +-
 src/views/Clue/Order/Comp/OrderList.vue     | 19 ++++++++++++++-
 src/views/Clue/Set/Comp/GeneralSet.vue      |  9 ++++++-
 src/views/Clue/Set/index.vue                |  6 ++++-
 src/views/SchoolManagement/Place/index.vue  | 26 +++++++++++++++------
 7 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/src/api/school/place/index.js b/src/api/school/place/index.js
index 6e61327..f0c1dec 100644
--- a/src/api/school/place/index.js
+++ b/src/api/school/place/index.js
@@ -35,5 +35,5 @@ export const updatePlaceStatus = async (id, status) => {
     id,
     status
   }
-  return request.put({ url: '/admin-api/crm/sch-place/update-status', data: data })
+  return request.put({ url: '/admin-api/crm/sch-place/status/update', data: data })
 }
diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index f78267d..d3a00bf 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -233,6 +233,7 @@ export default defineComponent({
                   vModel={formModel.value[item.field]}
                   {...(autoSetPlaceholder && setTextPlaceholder(item))}
                   {...setComponentProps(item)}
+                  filterable
                   format={item.component == 'DatePicker' ? 'YYYY-MM-DD' : null}
                   value-format={item.component == 'DatePicker' ? 'YYYY-MM-DD' : null}
                   style={baseSty + item.componentProps?.style}
diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue
index 689bcc0..bcb6b3c 100644
--- a/src/views/Clue/Order/Comp/MallOrderList.vue
+++ b/src/views/Clue/Order/Comp/MallOrderList.vue
@@ -152,7 +152,7 @@
             class="mr-10px"
             link
             style="padding: 0; margin-left: 0"
-            v-if="scope.row.isPayoff == false"
+            v-if="scope.row.isPayoff == '未结清'"
             v-hasPermi="['clue:order:return']"
             @click="feeBack(scope.row)"
           >
diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue
index 35c5190..58ab559 100644
--- a/src/views/Clue/Order/Comp/OrderList.vue
+++ b/src/views/Clue/Order/Comp/OrderList.vue
@@ -115,12 +115,22 @@
             class="mr-10px"
             link
             style="padding: 0; margin-left: 0"
-            v-if="scope.row.isPayoff == false"
+            v-if="scope.row.isPayoff == '未结清'"
             v-hasPermi="['clue:order:return']"
             @click="feeBack(scope.row)"
           >
             回款
           </el-button>
+          <el-button
+            type="primary"
+            class="mr-10px"
+            link
+            style="padding: 0; margin-left: 0"
+            v-hasPermi="['clue:order:add-fee']"
+            @click="handleAddFee(scope.row)"
+          >
+            添加支出
+          </el-button>
           <el-button
             type="primary"
             class="mr-10px"
@@ -139,6 +149,7 @@
     <DialogOrder ref="orderDetailDialog" />
     <DialogFeeback ref="feedbackDialog" />
     <DialogAfterSale ref="afterSaleDialog" />
+    <DialogExtraFee ref="extraFeeDialog" />
   </div>
 </template>
 
@@ -152,6 +163,7 @@ import { getClassTypePage } from '@/api/school/class'
 import DialogOrder from './DialogOrder.vue'
 import DialogFeeback from './DialogFeeback.vue'
 import DialogAfterSale from './DialogAfterSale.vue'
+import DialogExtraFee from './DialogExtraPay.vue'
 
 import { removeNullField } from '@/utils'
 
@@ -257,6 +269,11 @@ function feeBack(row) {
   feedbackDialog.value.open(row.signId)
 }
 
+const extraFeeDialog = ref()
+function handleAddFee(row) {
+  extraFeeDialog.value.open(row.signId)
+}
+
 // 取消登记
 async function cancelDeal(row) {
   try {
diff --git a/src/views/Clue/Set/Comp/GeneralSet.vue b/src/views/Clue/Set/Comp/GeneralSet.vue
index 6d6060d..7f5f92d 100644
--- a/src/views/Clue/Set/Comp/GeneralSet.vue
+++ b/src/views/Clue/Set/Comp/GeneralSet.vue
@@ -18,7 +18,7 @@
         </el-radio>
       </el-radio-group>
     </el-form-item>
-    <el-form-item v-if="getConfig('deliveryAutoStartPurchaseConfig')">
+    <el-form-item v-if="getConfig('deliveryAutoStartPurchaseConfig') && props.appType == 2">
       <template #label>
         <Tooltip
           v-if="getConfig('deliveryAutoStartPurchaseConfig').remark"
@@ -66,6 +66,13 @@ import * as ConfigApi from '@/api/system/set'
 
 const message = useMessage()
 
+const props = defineProps({
+  appType: {
+    type: Number,
+    default: 1
+  }
+})
+
 const form = ref({})
 
 const configList = ref([])
diff --git a/src/views/Clue/Set/index.vue b/src/views/Clue/Set/index.vue
index c3d1153..b04e75c 100644
--- a/src/views/Clue/Set/index.vue
+++ b/src/views/Clue/Set/index.vue
@@ -34,7 +34,7 @@
         <OtherPayType v-if="tabIndex == 37" />
       </el-tab-pane>
       <el-tab-pane label="常规设置" :name="40" v-if="checkPermi(['clue:setting:general-setting'])">
-        <GeneralSet v-if="tabIndex == 40" />
+        <GeneralSet v-if="tabIndex == 40" :appType="appStore.getAppInfo?.instanceType" />
       </el-tab-pane>
       <!-- <el-tab-pane label="消息通知" :name="50" v-if="checkPermi(['mall:setting:prod'])">
         <MsgSend v-if="tabIndex == 50" />
@@ -56,6 +56,10 @@ import OtherPayType from './Comp/OtherPayType.vue'
 import GeneralSet from './Comp/GeneralSet.vue'
 import { checkPermi } from '@/utils/permission'
 
+import { useAppStore } from '@/store/modules/app'
+
+const appStore = useAppStore()
+
 const tabIndex = ref(0)
 </script>
 
diff --git a/src/views/SchoolManagement/Place/index.vue b/src/views/SchoolManagement/Place/index.vue
index f09c2d9..660cb57 100644
--- a/src/views/SchoolManagement/Place/index.vue
+++ b/src/views/SchoolManagement/Place/index.vue
@@ -190,8 +190,10 @@
         <el-table-column label="启用" width="100">
           <template #default="scope">
             <el-switch
-              v-model="scope.row.showInMap"
-              :disabled="checkPermi(['school:place:update'])"
+              v-model="scope.row.status"
+              :active-value="0"
+              :inactive-value="1"
+              :disabled="!checkPermi(['school:place:update'])"
               @change="changePlaceStatus(scope.row)"
             />
           </template>
@@ -531,11 +533,21 @@ function closePlaceList() {
   fullScreenPlaceList.value = false
 }
 
-async function changePlaceStatus() {
-  // const resp = await updatePlace(item);
-  //     if (resp.code == 200) {
-  resetMarkers()
-  // }
+async function changePlaceStatus(row) {
+  try {
+    // 修改状态的二次确认
+    const text = row.status == 0 ? '启用' : '停用'
+    await message.confirm('确认要"' + text + '""' + row.name + '"场地吗?')
+    // 发起修改状态
+    await PlaceApi.updatePlaceStatus({ placeId: row.placeId, status: row.status })
+    message.success('修改成功')
+    // 刷新列表
+    // await getList()
+    resetMarkers()
+  } catch {
+    // 取消后，进行恢复按钮
+    row.status = row.status == 0 ? 1 : 0
+  }
 }
 
 // const isRanging = ref(false)

From f63104591b9f440848f8bb1b141af78fad9baa9e Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 25 Jun 2024 19:31:55 +0800
Subject: [PATCH 03/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Clue/Order/Comp/OrderList.vue       |  17 ++-
 src/views/Clue/Pool/Comp/DialogClue.vue       | 138 ++++++++++++++++--
 src/views/Clue/Pool/Comp/DialogSchoolInfo.vue |  23 +++
 src/views/Clue/Pool/Comp/DrawerClue.vue       | 117 ++++++++++++++-
 src/views/SchoolManagement/Place/index.vue    |   2 +-
 5 files changed, 273 insertions(+), 24 deletions(-)
 create mode 100644 src/views/Clue/Pool/Comp/DialogSchoolInfo.vue

diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue
index 58ab559..fbb4e93 100644
--- a/src/views/Clue/Order/Comp/OrderList.vue
+++ b/src/views/Clue/Order/Comp/OrderList.vue
@@ -87,7 +87,22 @@
         :prop="item.field"
         :label="item.label"
         min-width="120px"
-      />
+      >
+        <template #default="{ row }">
+          <el-popover
+            placement="top"
+            width="500px"
+            trigger="click"
+            v-if="item.form?.component == 'Editor' && row[item.field]"
+          >
+            <template #reference>
+              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+            </template>
+            <div v-dompurify-html="row.remark"></div>
+          </el-popover>
+          <span v-else>{{ row[item.field] }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="240px" fixed="right">
         <template #default="scope">
           <el-button
diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue
index 4ace2a1..803a903 100644
--- a/src/views/Clue/Pool/Comp/DialogClue.vue
+++ b/src/views/Clue/Pool/Comp/DialogClue.vue
@@ -47,15 +47,15 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane v-if="appStore.getAppInfo?.instanceType == 1" label="位置信息" name="map">
-        <div class="flex justify-between">
+        <div class="flex justify-between items-center">
           <el-select
             v-model="areaValue"
             filterable
             clearable
             remote
-            style="width: 350px"
+            style="width: 250px"
             reserve-keyword
-            placeholder="请输入关键词"
+            placeholder="输入并搜索位置"
             :remote-method="remoteMethod"
             @change="currentSelect"
           >
@@ -70,17 +70,44 @@
               <span style="float: right; color: #8492a6; font-size: 13px">{{ item.district }}</span>
             </el-option>
           </el-select>
+          <div class="flex-1 flex items-center ml-10px mr-10px">
+            <div class="w-100px">线索位置：</div>
+            <el-input v-model="address" disabled placeholder="请输入线索位置" clearable />
+          </div>
           <el-checkbox v-model="showSchool" :label="true" @change="handleShowSchool">
             展示场地
           </el-checkbox>
         </div>
         <div id="dialogMap" class="mt-20px" style="height: 400px; width: 100%"></div>
-        <div class="flex items-center mt-10px mb-10px">
-          <div class="w-100px">线索位置：</div>
-          <el-input v-model="address" placeholder="请输入线索位置" clearable />
-        </div>
+        <el-collapse v-model="collaspeKey" class="box-card">
+          <el-collapse-item title="附近驾校" name="nearbySchool">
+            <template #header>附近驾校</template>
+            <div style="padding: 10px">
+              <div v-if="nearbySchoolSearching">正在搜索中...</div>
+              <template v-else>
+                <div v-for="p in nearbySchoolList" :key="p.index">
+                  <div
+                    class="hover-pointer"
+                    style="font-size: 14px; color: blue"
+                    @click="getClassType(p)"
+                  >
+                    <i v-if="p.recommend" class="el-icon-star-off"></i>
+                    驾校: {{ p.deptName }}-{{ p.name }}
+                  </div>
+                  <div class="mt5">地址：{{ p.address }}</div>
+                  <div class="mt5">
+                    直线距离: {{ p.distance }} 公里;
+                    <span class="ml0">步行距离：{{ p.walkdistance }}</span>
+                  </div>
+                  <el-divider style="margin: 6px 0 !important" />
+                </div>
+              </template>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
       </el-tab-pane>
     </el-tabs>
+    <DialogSchoolInfo ref="schoolInfoDialog" />
     <template #footer>
       <span>
         <el-button @click="dialogVisible = false">取 消</el-button>
@@ -97,7 +124,10 @@ import * as ClueApi from '@/api/clue'
 import { getDiyFieldList } from '@/api/clue/clueField'
 import { formatDate } from '@/utils/formatTime'
 import AMapLoader from '@amap/amap-jsapi-loader'
-import ImgPostion from '@/assets/imgs/flag/flag_red.png'
+
+import DialogSchoolInfo from './DialogSchoolInfo.vue'
+
+import ImgPostion from '@/assets/imgs/flag/position_blue.png'
 import FlagRed from '@/assets/imgs/flag/flag_red.png'
 import FlagYellow from '@/assets/imgs/flag/flag_yellow.png'
 import FlagPurple from '@/assets/imgs/flag/flag_purple.png'
@@ -201,8 +231,8 @@ const open = async (type, id) => {
     }
   }
   if (appStore.getAppInfo?.instanceType == 1 && !dialogMap.value) {
-    nextTick(() => {
-      getSchoolPlace()
+    nextTick(async () => {
+      await getSchoolPlace()
       initMap(info.value)
       remoteMethod(address.value)
     })
@@ -220,10 +250,9 @@ function resetForm() {
 }
 
 const placeList = ref([])
-function getSchoolPlace() {
-  getPlaceList().then((data) => {
-    placeList.value = data.placeList
-  })
+async function getSchoolPlace() {
+  const data = await getPlaceList()
+  placeList.value = data.placeList
 }
 
 const emit = defineEmits(['success'])
@@ -237,6 +266,10 @@ async function handleSave() {
     message.info('请将跟进人填写完整！')
     return
   }
+  if (!address.value) {
+    message.info('请选择学员位置！')
+    return
+  }
   // 提交请求
   formLoading.value = true
   try {
@@ -299,7 +332,7 @@ function initMap(data) {
       }
     }
     dialogMap.value = new AMap.Map('dialogMap', {
-      zoom: 12,
+      zoom: 14,
       zooms: [2, 22],
       center: [defaultLatLng.value.lng, defaultLatLng.value.lat]
     })
@@ -321,6 +354,74 @@ function initMap(data) {
   })
 }
 
+const collaspeKey = ref('nearbySchool')
+const nearbySchoolSearching = ref(false)
+const nearbySchoolList = ref([])
+function getNearbySchool(info) {
+  if (info.lng && info.lat) {
+    nearbySchoolList.value = []
+    nearbySchoolSearching.value = true
+    // 推荐的场地
+    let places1 = []
+    // 普通的场地
+    let places2 = []
+
+    const p2 = [info.lng, info.lat]
+    for (let i = 0; i < placeList.value.length; i++) {
+      const element = placeList.value[i]
+      const p1 = [element.lng, element.lat]
+      // 计算直线距离
+      element.distance = (aMap.value.GeometryUtil.distance(p1, p2) / 1000).toFixed(2)
+      element.recommend ? places1.push(element) : places2.push(element)
+    }
+    // 按直线距离排序
+    // 排序
+    if (places1.length > 1) {
+      places1 = places1.sort((a, b) => a.distance - b.distance)
+    }
+    // 排序
+    if (places2.length > 1) {
+      places2 = places2.sort((a, b) => a.distance - b.distance)
+    }
+    // 取普通场地和推荐场地，组合, 取四个
+    nearbySchoolList.value = []
+    for (let i = 0; i < 4; i++) {
+      places1.length > i && nearbySchoolList.value.push(places1[i])
+      places2.length > i && nearbySchoolList.value.push(places2[i])
+      if (nearbySchoolList.value.length === 4) {
+        break
+      }
+    }
+    // 计算步行距离
+    nearbySchoolList.value.map(async (item) => {
+      const p1 = [item.lng, item.lat]
+      const resp = await getWalkingDistance(p1, p2)
+      item.walkdistance = resp
+    })
+    nearbySchoolSearching.value = false
+  }
+}
+
+// 获取两点之间的步行距离
+async function getWalkingDistance(start, end) {
+  return new Promise((resolve) => {
+    aMap.value.plugin('AMap.Walking', () => {
+      const walking = new aMap.value.Walking()
+      let num = 0
+      walking.search(start, end, (status, result) => {
+        if (status === 'complete') {
+          result.routes.forEach((item) => {
+            num += item.distance
+          })
+          resolve(num > 1000 ? `${(num / 1000).toFixed(2)} 公里` : `${num} 米`)
+        } else {
+          resolve('步行数据无法确定')
+        }
+      })
+    })
+  })
+}
+
 function regeoCode(lng, lat) {
   try {
     geoCoder.value.getAddress([lng, lat], (status, result) => {
@@ -345,6 +446,7 @@ function addmark(lat, lng, AMap) {
   })
   dialogMap.value.add(marker.value)
   dialogMap.value.setCenter([lat, lng], '', 500)
+  getNearbySchool({ lat: lng, lng: lat })
 }
 function removeMarker() {
   dialogMap.value.remove(marker.value)
@@ -376,6 +478,7 @@ function handleShowSchool() {
         extData: place,
         clickable: true
       })
+      marker.on('click', (ev) => showSchoolInfo(ev.target.getExtData()))
       schoolMarkers.value.push(marker)
     }
   } else {
@@ -383,6 +486,11 @@ function handleShowSchool() {
   }
 }
 
+const schoolInfoDialog = ref()
+function showSchoolInfo(val) {
+  schoolInfoDialog.value.open(val)
+}
+
 function remoteMethod(searchValue) {
   if (searchValue !== '') {
     setTimeout(() => {
diff --git a/src/views/Clue/Pool/Comp/DialogSchoolInfo.vue b/src/views/Clue/Pool/Comp/DialogSchoolInfo.vue
new file mode 100644
index 0000000..8b0f4ed
--- /dev/null
+++ b/src/views/Clue/Pool/Comp/DialogSchoolInfo.vue
@@ -0,0 +1,23 @@
+<template>
+  <el-dialog width="800px" :title="title" v-model="show" append-to-body>
+    <div v-dompurify-html="detail" class="mb-20px"></div>
+  </el-dialog>
+</template>
+
+<script setup name="DialogSchoolInfo">
+const title = ref('')
+const show = ref(false)
+const detail = ref('')
+
+function open(info) {
+  title.value = `【${info.schoolName}】详细信息`
+  show.value = true
+  detail.value = info.schoolRemark || '该驾校暂未配置详细信息'
+}
+
+defineExpose({
+  open
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/Clue/Pool/Comp/DrawerClue.vue b/src/views/Clue/Pool/Comp/DrawerClue.vue
index 9bbff93..145b661 100644
--- a/src/views/Clue/Pool/Comp/DrawerClue.vue
+++ b/src/views/Clue/Pool/Comp/DrawerClue.vue
@@ -83,6 +83,32 @@
             展示场地
           </el-checkbox>
           <div id="dialogMap" class="mt-20px" style="height: 400px; width: 100%"></div>
+          <el-collapse v-model="collaspeKey" class="box-card">
+            <el-collapse-item title="附近驾校" name="nearbySchool">
+              <template #header>附近驾校</template>
+              <div style="padding: 10px">
+                <div v-if="nearbySchoolSearching">正在搜索中...</div>
+                <template v-else>
+                  <div v-for="p in nearbySchoolList" :key="p.index">
+                    <div
+                      class="hover-pointer"
+                      style="font-size: 14px; color: blue"
+                      @click="getClassType(p)"
+                    >
+                      <i v-if="p.recommend" class="el-icon-star-off"></i>
+                      驾校: {{ p.deptName }}-{{ p.name }}
+                    </div>
+                    <div class="mt5">地址：{{ p.address }}</div>
+                    <div class="mt5">
+                      直线距离: {{ p.distance }} 公里;
+                      <span class="ml0">步行距离：{{ p.walkdistance }}</span>
+                    </div>
+                    <el-divider style="margin: 6px 0 !important" />
+                  </div>
+                </template>
+              </div>
+            </el-collapse-item>
+          </el-collapse>
         </div>
       </el-tab-pane>
       <el-tab-pane label="操作记录" name="operateRecord">
@@ -114,6 +140,7 @@
     </el-tabs>
     <!-- 新建编辑跟进信息 -->
     <DialogFollow ref="followRef" @success="getFollowList" />
+    <DialogSchoolInfo ref="schoolInfoDialog" />
   </el-drawer>
 </template>
 
@@ -124,6 +151,7 @@ import * as FollowApi from '@/api/clue/followRecord'
 import { getPlaceList } from '@/api/school/place'
 
 import DialogFollow from './DialogFollow.vue'
+import DialogSchoolInfo from './DialogSchoolInfo.vue'
 import AMapLoader from '@amap/amap-jsapi-loader'
 import { formatDate, dateFormatter } from '@/utils/formatTime'
 
@@ -214,8 +242,8 @@ async function open(id) {
     infoIndex.value = 'followRecord'
 
     if (appStore.getAppInfo?.instanceType == 1 && !dialogMap.value) {
-      nextTick(() => {
-        getSchoolPlace()
+      nextTick(async () => {
+        await getSchoolPlace()
         initMap(info.value)
       })
     }
@@ -225,10 +253,9 @@ async function open(id) {
 }
 
 const placeList = ref([])
-function getSchoolPlace() {
-  getPlaceList().then((data) => {
-    placeList.value = data.placeList
-  })
+async function getSchoolPlace() {
+  const data = await getPlaceList()
+  placeList.value = data.placeList
 }
 
 const defaultLatLng = ref({
@@ -249,7 +276,7 @@ function initMap(data) {
       }
     }
     dialogMap.value = new AMap.Map('dialogMap', {
-      zoom: 12,
+      zoom: 14,
       zooms: [2, 22],
       center: [defaultLatLng.value.lng, defaultLatLng.value.lat]
     })
@@ -285,6 +312,7 @@ function handleShowSchool() {
         extData: place,
         clickable: true
       })
+      marker.on('click', (ev) => showSchoolInfo(ev.target.getExtData()))
       schoolMarkers.value.push(marker)
     }
   } else {
@@ -302,7 +330,82 @@ function addmark(lat, lng, AMap) {
   })
   dialogMap.value.add(marker.value)
   dialogMap.value.setCenter([lat, lng], '', 500)
+  getNearbySchool({ lat: lng, lng: lat })
 }
+
+const collaspeKey = ref('nearbySchool')
+const nearbySchoolSearching = ref(false)
+const nearbySchoolList = ref([])
+function getNearbySchool(info) {
+  if (info.lng && info.lat) {
+    nearbySchoolList.value = []
+    nearbySchoolSearching.value = true
+    // 推荐的场地
+    let places1 = []
+    // 普通的场地
+    let places2 = []
+
+    const p2 = [info.lng, info.lat]
+    for (let i = 0; i < placeList.value.length; i++) {
+      const element = placeList.value[i]
+      const p1 = [element.lng, element.lat]
+      // 计算直线距离
+      element.distance = (aMap.value.GeometryUtil.distance(p1, p2) / 1000).toFixed(2)
+      element.recommend ? places1.push(element) : places2.push(element)
+    }
+    // 按直线距离排序
+    // 排序
+    if (places1.length > 1) {
+      places1 = places1.sort((a, b) => a.distance - b.distance)
+    }
+    // 排序
+    if (places2.length > 1) {
+      places2 = places2.sort((a, b) => a.distance - b.distance)
+    }
+    // 取普通场地和推荐场地，组合, 取四个
+    nearbySchoolList.value = []
+    for (let i = 0; i < 4; i++) {
+      places1.length > i && nearbySchoolList.value.push(places1[i])
+      places2.length > i && nearbySchoolList.value.push(places2[i])
+      if (nearbySchoolList.value.length === 4) {
+        break
+      }
+    }
+    // 计算步行距离
+    nearbySchoolList.value.map(async (item) => {
+      const p1 = [item.lng, item.lat]
+      const resp = await getWalkingDistance(p1, p2)
+      item.walkdistance = resp
+    })
+    nearbySchoolSearching.value = false
+  }
+}
+
+// 获取两点之间的步行距离
+async function getWalkingDistance(start, end) {
+  return new Promise((resolve) => {
+    aMap.value.plugin('AMap.Walking', () => {
+      const walking = new aMap.value.Walking()
+      let num = 0
+      walking.search(start, end, (status, result) => {
+        if (status === 'complete') {
+          result.routes.forEach((item) => {
+            num += item.distance
+          })
+          resolve(num > 1000 ? `${(num / 1000).toFixed(2)} 公里` : `${num} 米`)
+        } else {
+          resolve('步行数据无法确定')
+        }
+      })
+    })
+  })
+}
+
+const schoolInfoDialog = ref()
+function showSchoolInfo(val) {
+  schoolInfoDialog.value.open(val)
+}
+
 function removeMarker() {
   dialogMap.value.remove(marker.value)
 }
diff --git a/src/views/SchoolManagement/Place/index.vue b/src/views/SchoolManagement/Place/index.vue
index 660cb57..520789a 100644
--- a/src/views/SchoolManagement/Place/index.vue
+++ b/src/views/SchoolManagement/Place/index.vue
@@ -539,7 +539,7 @@ async function changePlaceStatus(row) {
     const text = row.status == 0 ? '启用' : '停用'
     await message.confirm('确认要"' + text + '""' + row.name + '"场地吗?')
     // 发起修改状态
-    await PlaceApi.updatePlaceStatus({ placeId: row.placeId, status: row.status })
+    await PlaceApi.updatePlaceStatus(row.placeId, row.status)
     message.success('修改成功')
     // 刷新列表
     // await getList()

From 848830a21b9172c3c96617ecc39b1dee2ebef50f Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Wed, 26 Jun 2024 18:24:45 +0800
Subject: [PATCH 04/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Clue/Order/Comp/DialogOrder.vue     |  17 +-
 src/views/Clue/Pool/Comp/DialogClue.vue       |   8 +-
 src/views/Clue/Pool/Comp/DialogFollow.vue     |  24 ++-
 src/views/Clue/Pool/Comp/DialogSchoolInfo.vue |   2 +-
 src/views/Clue/Pool/Comp/DialogSuccess.vue    |  34 ++-
 src/views/Clue/Pool/Comp/DrawerClue.vue       |  11 +-
 src/views/Clue/Pool/index.vue                 |   5 +-
 src/views/MiniMall/Product/add.vue            |  11 +-
 src/views/SchoolManagement/Class/index.vue    | 202 ++++++++----------
 9 files changed, 169 insertions(+), 145 deletions(-)

diff --git a/src/views/Clue/Order/Comp/DialogOrder.vue b/src/views/Clue/Order/Comp/DialogOrder.vue
index 309dcb6..e16714c 100644
--- a/src/views/Clue/Order/Comp/DialogOrder.vue
+++ b/src/views/Clue/Order/Comp/DialogOrder.vue
@@ -38,13 +38,15 @@
           <el-table-column prop="extraPayMoney" label="金额" />
           <el-table-column prop="remark" label="备注" />
         </el-table>
-        <el-divider direction="horizontal" content-position="left">额外支出</el-divider>
-        <el-table :data="extraPayList" border stripe>
-          <el-table-column type="index" width="50" />
-          <el-table-column prop="extraPayType" label="支出项" />
-          <el-table-column prop="extraPayMoney" label="金额" />
-          <el-table-column prop="remark" label="备注" />
-        </el-table>
+        <div v-if="checkPermi(['clue:order:add-fee'])">
+          <el-divider direction="horizontal" content-position="left">额外支出</el-divider>
+          <el-table :data="extraPayList" border stripe>
+            <el-table-column type="index" width="50" />
+            <el-table-column prop="extraPayType" label="支出项" />
+            <el-table-column prop="extraPayMoney" label="金额" />
+            <el-table-column prop="remark" label="备注" />
+          </el-table>
+        </div>
       </el-tab-pane>
       <el-tab-pane label="回款记录" name="returnRecord">
         <el-table :data="returnRecordList" border stripe>
@@ -78,6 +80,7 @@ import { getSimpleFieldList as getOrderFieldList } from '@/api/clue/orderField'
 import { getPaymentPage } from '@/api/clue/payment'
 import { getAfterSalePage } from '@/api/clue/afterSale'
 
+import { checkPermi } from '@/utils/permission'
 import { formatDate } from '@/utils/formatTime'
 
 const tabName = ref('clueInfo')
diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue
index 803a903..259f197 100644
--- a/src/views/Clue/Pool/Comp/DialogClue.vue
+++ b/src/views/Clue/Pool/Comp/DialogClue.vue
@@ -24,10 +24,10 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column prop="followTime" label="下次跟进时间">
+          <el-table-column prop="nextFollowTime" label="下次跟进时间">
             <template #default="{ row }">
               <el-date-picker
-                v-model="row.followTime"
+                v-model="row.nextFollowTime"
                 type="date"
                 placeholder="选择日期时间"
                 :disabled="!row.editable"
@@ -266,7 +266,7 @@ async function handleSave() {
     message.info('请将跟进人填写完整！')
     return
   }
-  if (!address.value) {
+  if (appStore.getAppInfo?.instanceType == 1 && !address.value) {
     message.info('请选择学员位置！')
     return
   }
@@ -304,7 +304,7 @@ async function handleSave() {
 function handleAppendFollow() {
   followList.value.push({
     userId: undefined,
-    followTime: formatDate(new Date()),
+    nextFollowTime: formatDate(new Date()),
     editable: true
   })
 }
diff --git a/src/views/Clue/Pool/Comp/DialogFollow.vue b/src/views/Clue/Pool/Comp/DialogFollow.vue
index 3b93047..e5705bb 100644
--- a/src/views/Clue/Pool/Comp/DialogFollow.vue
+++ b/src/views/Clue/Pool/Comp/DialogFollow.vue
@@ -25,6 +25,18 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="意向状态" prop="intentionState">
+              <el-select v-model="form.intentionState" filterable>
+                <el-option
+                  v-for="item in intentionOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="24" :offset="0">
@@ -80,9 +92,12 @@
 <script setup name="DialogFollow">
 import { getSkillPage } from '@/api/clue/skill'
 import { createFollow } from '@/api/clue/followRecord'
+import { getDictOptions } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
+const intentionOptions = getDictOptions('intention_state')
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
@@ -97,18 +112,19 @@ const rules = {
   content: { required: true, message: '跟进内容不可为空', trigger: 'blur' }
 }
 
-const open = async (clueId) => {
+const open = async (clueId, status) => {
   dialogVisible.value = true
   dialogTitle.value = '新增跟进记录'
-  resetForm(clueId)
+  resetForm(clueId, status)
 }
 
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-function resetForm(clueId) {
+function resetForm(clueId, status) {
   form.value = {
     clueId,
-    operateTime: undefined,
+    operateTime: formatDate(new Date(), 'YYYY-MM-DD HH:mm'),
     nextFollowTime: undefined,
+    intentionState: status,
     content: undefined
   }
 }
diff --git a/src/views/Clue/Pool/Comp/DialogSchoolInfo.vue b/src/views/Clue/Pool/Comp/DialogSchoolInfo.vue
index 8b0f4ed..20a6bdb 100644
--- a/src/views/Clue/Pool/Comp/DialogSchoolInfo.vue
+++ b/src/views/Clue/Pool/Comp/DialogSchoolInfo.vue
@@ -12,7 +12,7 @@ const detail = ref('')
 function open(info) {
   title.value = `【${info.schoolName}】详细信息`
   show.value = true
-  detail.value = info.schoolRemark || '该驾校暂未配置详细信息'
+  detail.value = info.introduce || '该驾校暂未配置详细信息'
 }
 
 defineExpose({
diff --git a/src/views/Clue/Pool/Comp/DialogSuccess.vue b/src/views/Clue/Pool/Comp/DialogSuccess.vue
index 11478a0..2954fb1 100644
--- a/src/views/Clue/Pool/Comp/DialogSuccess.vue
+++ b/src/views/Clue/Pool/Comp/DialogSuccess.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog title="成交登记" v-model="show" width="820px">
+  <Dialog title="成交登记" v-model="show" width="900px">
     <Descriptions
       :title="`线索信息-${info.name}`"
       :data="info"
@@ -124,7 +124,9 @@
         </el-col>
         <!-- 进销存模式 -->
         <el-col :span="24" :offset="0" v-if="appStore.getAppInfo?.instanceType == 2">
-          <el-divider direction="horizontal" content-position="left">成交产品</el-divider>
+          <el-divider direction="horizontal" content-position="left">
+            成交产品<span v-if="prodTotalPrice">，应收：{{ prodTotalPrice }}</span>
+          </el-divider>
           <el-button
             class="mb-5px"
             type="primary"
@@ -161,6 +163,11 @@
                   placeholder="选择规格"
                   filterable
                   :disabled="!row.productId"
+                  @change="
+                    row.price = specsOptions(row.productId).find(
+                      (it) => it.specsId == row.specsId
+                    ).price
+                  "
                 >
                   <el-option
                     v-for="item in specsOptions(row.productId)"
@@ -171,6 +178,7 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column prop="price" label="销售单价" width="100px" />
             <el-table-column prop="signNum" label="成交数量" width="100px">
               <template #default="{ row }">
                 <el-input-number
@@ -199,7 +207,9 @@
           </el-table>
         </el-col>
         <el-col :span="24" :offset="0" class="mb-18px">
-          <el-divider direction="horizontal" content-position="left">其他费用</el-divider>
+          <el-divider direction="horizontal" content-position="left">
+            其他费用<span v-if="extraTotalPrice">，应收：{{ extraTotalPrice }}</span>
+          </el-divider>
           <el-button
             class="mb-5px"
             type="primary"
@@ -247,6 +257,13 @@
               </template>
             </el-table-column>
           </el-table>
+          <el-divider
+            v-if="prodTotalPrice + extraTotalPrice"
+            direction="horizontal"
+            content-position="left"
+          >
+            合计应收：{{ prodTotalPrice + extraTotalPrice }}
+          </el-divider>
         </el-col>
         <el-col :span="24" :offset="0">
           <el-form-item label="备注">
@@ -302,6 +319,17 @@ const props = defineProps({
   }
 })
 
+const prodTotalPrice = computed(() => {
+  return form.value.signProducts.reduce(
+    (pre, cur) => pre + (cur?.price || 0) * (cur?.signNum || 0),
+    0
+  )
+})
+
+const extraTotalPrice = computed(() => {
+  return form.value.extraPay.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
+})
+
 const showSchema = computed(() => {
   const arr = [
     {
diff --git a/src/views/Clue/Pool/Comp/DrawerClue.vue b/src/views/Clue/Pool/Comp/DrawerClue.vue
index 145b661..51d63d6 100644
--- a/src/views/Clue/Pool/Comp/DrawerClue.vue
+++ b/src/views/Clue/Pool/Comp/DrawerClue.vue
@@ -42,6 +42,7 @@
     <el-tabs v-model="infoIndex" type="border-card">
       <el-tab-pane label="跟进记录" name="followRecord">
         <el-button
+          v-if="followList.length"
           v-hasPermi="['clue:pool:update']"
           class="mb-10px"
           type="primary"
@@ -139,7 +140,7 @@
       </el-tab-pane>
     </el-tabs>
     <!-- 新建编辑跟进信息 -->
-    <DialogFollow ref="followRef" @success="getFollowList" />
+    <DialogFollow ref="followRef" @success="followSuccess" />
     <DialogSchoolInfo ref="schoolInfoDialog" />
   </el-drawer>
 </template>
@@ -252,6 +253,12 @@ async function open(id) {
   }
 }
 
+function followSuccess() {
+  ClueApi.getClue(id).then((data) => {
+    info.value = { ...data, ...data.diyParams }
+  })
+}
+
 const placeList = ref([])
 async function getSchoolPlace() {
   const data = await getPlaceList()
@@ -418,7 +425,7 @@ defineExpose({
 
 const followRef = ref()
 function addFollow() {
-  followRef.value.open(info.value.clueId)
+  followRef.value.open(info.value.clueId, info.value.intentionState)
 }
 
 function destroyMap() {
diff --git a/src/views/Clue/Pool/index.vue b/src/views/Clue/Pool/index.vue
index 00887ae..9ee8e1c 100644
--- a/src/views/Clue/Pool/index.vue
+++ b/src/views/Clue/Pool/index.vue
@@ -69,6 +69,7 @@
               text
               style="padding: 0"
               @click="handleFollow(row)"
+              v-if="queryType != 4"
               v-hasPermi="['clue:pool:update']"
             >
               快速新增
@@ -109,7 +110,7 @@
             <el-button
               type="primary"
               link
-              :disabled="scope.row.state == '已成交'"
+              :disabled="scope.row.state == '成交'"
               @click="handleSuccess(scope.row)"
               v-hasPermi="['clue:pool:enroll']"
             >
@@ -268,7 +269,7 @@ function handleDetail(row) {
 }
 
 function handleFollow(row) {
-  followRef.value.open(row.clueId)
+  followRef.value.open(row.clueId, row.intentionState)
 }
 
 async function makeCall(phone) {
diff --git a/src/views/MiniMall/Product/add.vue b/src/views/MiniMall/Product/add.vue
index 6c43b3b..e076345 100644
--- a/src/views/MiniMall/Product/add.vue
+++ b/src/views/MiniMall/Product/add.vue
@@ -387,14 +387,16 @@ function onSubmit() {
           const element = diyFieldList.value[i]
           data.diyParams[element.field] = data[element.field]
         }
-        const id = route.query.id
+        const id = route.query.id || form.value.productId
         if (!id) {
-          await ProductApi.createProduct(data)
+          const resp = await ProductApi.createProduct(data)
           message.success(t('common.createSuccess'))
+          form.value.productId = resp
         } else {
           await ProductApi.updateProduct(data)
           message.success(t('common.updateSuccess'))
         }
+        getDetail()
       }
     } catch (error) {
       console.log(error)
@@ -461,10 +463,11 @@ const formLoading = ref(false)
 
 /** 获得详情 */
 const getDetail = async () => {
-  if (route.query?.id) {
+  const id = route.query?.id || form.value.productId
+  if (id) {
     formLoading.value = true
     try {
-      const res = await ProductApi.getProduct(route.query.id)
+      const res = await ProductApi.getProduct(id)
       let diyField = {}
       if (res.diyParams) {
         diyField = isObject(res.diyParams) ? res.diyParams : JSON.parse(res.diyParams)
diff --git a/src/views/SchoolManagement/Class/index.vue b/src/views/SchoolManagement/Class/index.vue
index 1c03d3e..8ba53ac 100644
--- a/src/views/SchoolManagement/Class/index.vue
+++ b/src/views/SchoolManagement/Class/index.vue
@@ -2,21 +2,16 @@
   <div>
     <el-form :model="searchForm" ref="searchRef" inline label-width="0">
       <el-form-item>
-        <el-input
-          v-model="searchForm.schoolName"
-          placeholder="请输入驾校名称"
+        <el-cascader
+          :options="schoolOption"
+          v-model="searchForm.schPlace"
           clearable
-          style="width: 180px"
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-input
-          v-model="searchForm.placeName"
-          placeholder="请输入场地名称"
-          clearable
-          style="width: 180px"
-          @keyup.enter="handleQuery"
+          filterable
+          show-all-levels
+          style="width: 300px"
+          placeholder="选择驾校/场地"
+          :props="{ expandTrigger: 'hover', multiple: false, checkStrictly: true }"
+          @change="handleQuery"
         />
       </el-form-item>
       <el-form-item>
@@ -69,85 +64,67 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="20">
-      <el-col :span="6" :offset="0">
-        <div class="head-container" style="max-height: 700px; overflow-y: auto">
-          <el-tree
-            ref="tree"
-            :data="schoolOption"
-            accordion
-            node-key="id"
-            highlight-current
-            :default-expanded-keys="selectNodes.map((item) => item.id)"
-            @node-click="handleNodeClick"
+    <el-table
+      :data="tableList"
+      v-loading="loading"
+      border
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="50" />
+      <el-table-column type="index" label="序号" width="60" />
+      <el-table-column
+        v-for="col in columns"
+        :prop="col.props"
+        :key="col.props"
+        :label="col.label"
+        :width="col.width"
+        show-overflow-tooltip
+      />
+      <el-table-column label="备注" width="260">
+        <template #default="{ row }">
+          <div v-dompurify-html="row.remark"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" width="80">
+        <template #default="{ row }">
+          <el-switch
+            v-model="row.status"
+            :active-value="0"
+            :inactive-value="1"
+            :disabled="!checkPermi(['school:class:update'])"
+            @change="handleChangeStatus(row)"
           />
-        </div>
-      </el-col>
-      <el-col :span="18" :offset="0">
-        <el-table
-          :data="tableList"
-          v-loading="loading"
-          border
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="50" />
-          <el-table-column type="index" label="序号" width="60" />
-          <el-table-column
-            v-for="col in columns"
-            :prop="col.props"
-            :key="col.props"
-            :label="col.label"
-            :width="col.width"
-            show-overflow-tooltip
-          />
-          <el-table-column label="备注" width="260">
-            <template #default="{ row }">
-              <div v-dompurify-html="row.remark"></div>
-            </template>
-          </el-table-column>
-          <el-table-column label="状态" width="80">
-            <template #default="{ row }">
-              <el-switch
-                v-model="row.status"
-                :active-value="0"
-                :inactive-value="1"
-                :disabled="!checkPermi(['school:class:update'])"
-                @change="handleChangeStatus(row)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" width="120px">
-            <template #default="{ row }">
-              <el-button
-                type="primary"
-                style="padding: 0"
-                text
-                v-hasPermi="['school:class:update']"
-                @click="handleOpenDialog('update', row.typeId)"
-              >
-                修改
-              </el-button>
-              <el-button
-                type="danger"
-                style="padding: 0"
-                text
-                v-hasPermi="['school:class:delete']"
-                @click="handleRemove(row.typeId)"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <!-- 分页 -->
-        <Pagination
-          v-model:limit="searchForm.pageSize"
-          v-model:page="searchForm.pageNo"
-          :total="total"
-          @pagination="getList"
-        />
-      </el-col>
-    </el-row>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="120px">
+        <template #default="{ row }">
+          <el-button
+            type="primary"
+            style="padding: 0"
+            text
+            v-hasPermi="['school:class:update']"
+            @click="handleOpenDialog('update', row.typeId)"
+          >
+            修改
+          </el-button>
+          <el-button
+            type="danger"
+            style="padding: 0"
+            text
+            v-hasPermi="['school:class:delete']"
+            @click="handleRemove(row.typeId)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination
+      v-model:limit="searchForm.pageSize"
+      v-model:page="searchForm.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
     <Dialog title="批量修改" v-model="batchStatusDialogShow" width="400px">
       <el-form :model="statusForm" ref="statusRef" label-width="80px">
         <el-form-item label="选择状态" prop="status">
@@ -186,8 +163,7 @@ const total = ref(0)
 const tableList = ref([])
 
 const searchForm = ref({
-  schoolName: undefined,
-  placeName: undefined,
+  schPlace: undefined,
   typeName: undefined,
   licenseType: undefined,
   pageNo: 1,
@@ -195,41 +171,24 @@ const searchForm = ref({
 })
 
 const schoolOption = ref([])
-const selectNodes = ref([])
+// const selectNodes = ref([])
 
 async function getSchoolList() {
   try {
     const data = await PlaceApi.getPlaceList()
     schoolOption.value = data.schoolList.map((item) => ({
-      id: item.schoolId,
+      value: item.schoolId,
       label: item.schoolName,
-      level: 1,
       children: data.placeList
         .filter((place) => item.schoolId === place.schoolId)
         .map((place) => ({
-          id: place.placeId,
-          label: place.name,
-          level: 2
+          value: place.placeId,
+          label: place.name
         }))
     }))
   } catch {}
 }
 
-function handleNodeClick(data, node) {
-  if (data.level === 1) {
-    selectNodes.value = [{ id: data.id, name: data.label }]
-    searchForm.value.schoolName = data.label
-  } else {
-    selectNodes.value = [
-      { id: node.parent.data.id, name: node.parent.data.label },
-      { id: data.id, name: data.label }
-    ]
-    searchForm.value.schoolName = node.parent.data.label
-    searchForm.value.placeName = data.label
-  }
-  handleQuery()
-}
-
 const columns = [
   { props: 'schoolName', label: '驾校', width: '100px' },
   { props: 'placeName', label: '场地' },
@@ -248,7 +207,15 @@ function handleQuery() {
 async function getList() {
   loading.value = true
   try {
-    const data = await ClassApi.getClassTypePage(searchForm.value)
+    const params = { ...searchForm.value }
+    if (params.schPlace && params.schPlace.length) {
+      params.schoolId = params.schPlace[0]
+      if (params.schPlace.length == 2) {
+        params.placeId = params.schPlace[1]
+      }
+    }
+    delete params.schPlace
+    const data = await ClassApi.getClassTypePage(params)
     tableList.value = data.list
     total.value = data.total
   } finally {
@@ -263,8 +230,7 @@ function handleOpenDialog(type, id = null) {
 
 function handleReset() {
   searchForm.value = {
-    schoolName: undefined,
-    placeName: undefined,
+    schPlace: undefined,
     typeName: undefined,
     licenseType: undefined,
     pageNo: 1,

From 6f4067d50cbcb49fac020a8563983cc24e5c3b7c Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Thu, 27 Jun 2024 15:09:53 +0800
Subject: [PATCH 05/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Clue/Order/Comp/DialogDelivery.vue  | 158 ++++++++++++++++--
 src/views/Clue/Order/Comp/DialogOrder.vue     |  56 ++++++-
 src/views/Clue/Order/Comp/MallOrderList.vue   |  13 +-
 src/views/Clue/Pool/Comp/DrawerClue.vue       |   8 +-
 .../MiniMall/Purchase/Comp/DialogAdd.vue      |   9 +-
 5 files changed, 214 insertions(+), 30 deletions(-)

diff --git a/src/views/Clue/Order/Comp/DialogDelivery.vue b/src/views/Clue/Order/Comp/DialogDelivery.vue
index 990fda5..f9c5652 100644
--- a/src/views/Clue/Order/Comp/DialogDelivery.vue
+++ b/src/views/Clue/Order/Comp/DialogDelivery.vue
@@ -1,16 +1,92 @@
 <template>
-  <el-dialog title="发货" v-model="show" width="600px">
-    <el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
-      <el-form-item label="发货仓库" prop="warehouseId">
-        <el-select v-model="form.warehouseId" placeholder="选择仓库" filterable>
-          <el-option
-            v-for="item in warehouseOptions"
-            :key="item.warehouseId"
-            :label="item.warehouseName"
-            :value="item.warehouseId"
-          />
-        </el-select>
-      </el-form-item>
+  <el-dialog title="发货" v-model="show" width="700px">
+    <el-form :model="form" ref="formRef" :rules="rules" label-width="85px">
+      <el-row :gutter="20">
+        <el-col :span="8" :offset="0">
+          <el-form-item label="待发数量">
+            <span class="font-bold">：{{ form.sendTotalNum }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="16" :offset="0" v-if="autoAuditPurchase == 'true'">
+          <el-form-item label="发货方式">
+            <el-radio-group v-model="form.sendType">
+              <el-radio :label="1"> 立即采购发货 </el-radio>
+              <el-radio :label="2"> 使用库存发货 </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <template v-if="form.sendType == 1">
+        <el-row :gutter="20">
+          <el-col :span="12" :offset="0">
+            <el-form-item label="供应商" prop="supplier">
+              <el-select v-model="form.supplier" placeholder="选择供应商" filterable>
+                <el-option
+                  v-for="item in supplierOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" :offset="0">
+            <el-form-item label="采购数量" prop="purchaseNum">
+              <el-input-number
+                :min="form.sendTotalNum"
+                v-model="form.purchaseNum"
+                :controls="false"
+                placeholder="请输入"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12" :offset="0">
+            <el-form-item label="采购单价" prop="unitPrice">
+              <el-input-number
+                :min="0"
+                :controls="false"
+                v-model="form.unitPrice"
+                placeholder="请输入"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" :offset="0">
+            <el-form-item label="存放仓库" prop="warehouseId">
+              <el-select
+                v-model="form.warehouseId"
+                placeholder="请选择"
+                filterable
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in warehouseOptions"
+                  :key="item.warehouseId"
+                  :label="item.warehouseName"
+                  :value="item.warehouseId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </template>
+      <template v-else>
+        <el-table :data="inventoryList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" />
+          <el-table-column prop="id" label="入库批次号" width="150px" />
+          <el-table-column prop="warehouseName" label="存放仓库" width="120px" />
+          <el-table-column prop="unitPrice" label="采购价" width="90px" />
+          <el-table-column prop="remainNum" label="剩余库存" width="90px" />
+          <el-table-column label="发货数量">
+            <template #default="{ row }">
+              <el-input-number v-model="row.sendNum" size="small" :min="1" :controls="false" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </template>
       <el-form-item label="备注">
         <Editor v-model:modelValue="form.remark" />
       </el-form-item>
@@ -27,10 +103,13 @@
 <script setup name="DialogDelivery">
 import { getSimpleWarehouseList } from '@/api/mall/warehouse'
 import { createDelivery } from '@/api/clue/delivery'
+import { getConfigList } from '@/api/system/set'
+import { getDictOptions } from '@/utils/dict'
 
 const message = useMessage() // 消息弹窗
 
 const warehouseOptions = ref([])
+const supplierOptions = getDictOptions('erp_supplier')
 function getOptions() {
   getSimpleWarehouseList().then((data) => {
     warehouseOptions.value = data
@@ -38,9 +117,9 @@ function getOptions() {
 }
 
 const show = ref(false)
-function open(id) {
+function open(id, signNum) {
   show.value = true
-  resetForm(id)
+  resetForm(id, signNum)
 }
 defineExpose({
   open
@@ -48,12 +127,21 @@ defineExpose({
 
 const form = ref({})
 const rules = ref({
+  supplier: { required: true, message: '供应商不可为空', trigger: 'change' },
+  warehouseId: { required: true, message: '仓库不可为空', trigger: 'change' },
+  purchaseNum: { required: true, message: '采购数量不可为空', trigger: 'change,blur' },
+  unitPrice: { required: true, message: '采购单价不可为空', trigger: 'change,blur' },
   warehouseId: { required: true, message: '仓库不可为空', trigger: 'change' }
 })
-function resetForm(id) {
+function resetForm(id, num) {
   form.value = {
+    sendType: 2,
+    sendTotalNum: num,
     signProductId: id,
     warehouseId: undefined,
+    supplier: undefined,
+    purchaseNum: num,
+    unitPrice: undefined,
     remark: undefined
   }
 }
@@ -64,8 +152,26 @@ const formRef = ref()
 async function onSubmit() {
   // 校验表单
   if (!formRef.value) return
-  const valid = await formRef.value.validate()
-  if (!valid) return
+
+  if (form.value.sendType == 1) {
+    const valid = await formRef.value.validate()
+    if (!valid) return
+  } else {
+    if (!deliveryArr.value.length) {
+      message.info('请选择库存发货！')
+      return
+    } else {
+      const deliveryCount = deliveryArr.value.reduce((pre, cur) => pre + cur.sendNum, 0)
+      if (deliveryCount < form.value.sendTotalNum) {
+        message.info('所选发货库存少于待发货数量，请重新选择后再发货！')
+        return
+      } else if (deliveryCount > form.value.sendTotalNum) {
+        message.info('所选发货库存多于待发货数量，请重新选择后再发货！')
+        return
+      }
+    }
+  }
+
   // 提交请求
   formLoading.value = true
   try {
@@ -78,8 +184,26 @@ async function onSubmit() {
   }
 }
 
+const inventoryList = ref([
+  { id: 123, warehouseName: '自营仓', unitPrice: 120, remainNum: 5 },
+  { id: 234, warehouseName: '自营仓', unitPrice: 100, remainNum: 5 },
+  { id: 345, warehouseName: '供应商仓', unitPrice: 110, remainNum: 999 }
+])
+
+const deliveryArr = ref([])
+function handleSelectionChange(val) {
+  deliveryArr.value = val
+}
+
+const autoAuditPurchase = ref('false')
 onMounted(() => {
   getOptions()
+  getConfigList({ module: 3 }).then((data) => {
+    // 获取所有配置项
+    autoAuditPurchase.value = data.find(
+      (it) => it.configKey == 'purchaseAuditAutoCompleteConfig'
+    ).configValue
+  })
 })
 </script>
 
diff --git a/src/views/Clue/Order/Comp/DialogOrder.vue b/src/views/Clue/Order/Comp/DialogOrder.vue
index e16714c..e2f7e5c 100644
--- a/src/views/Clue/Order/Comp/DialogOrder.vue
+++ b/src/views/Clue/Order/Comp/DialogOrder.vue
@@ -7,13 +7,20 @@
       <el-tab-pane label="成交信息" name="orderInfo">
         <Descriptions :data="orderInfo" :schema="orderSchema" :columns="2" labelWidth="130px" />
         <template v-if="orderInfo.signProducts && orderInfo.signProducts.length">
-          <el-divider direction="horizontal" content-position="left">成交产品</el-divider>
+          <el-divider direction="horizontal" content-position="left">
+            成交产品<span v-if="prodTotalPrice">，应收：{{ prodTotalPrice }}</span>
+          </el-divider>
           <el-table :data="orderInfo.signProducts" border stripe>
             <el-table-column type="index" width="50" />
             <el-table-column prop="productName" label="成交产品" />
             <el-table-column prop="specsName" label="产品规格" />
-            <el-table-column prop="signNum" label="成交数量" />
-            <el-table-column prop="warehouseName" label="发货仓库" />
+            <el-table-column prop="signNum" label="成交数量" width="100px" />
+            <el-table-column prop="warehouseName" label="发货仓库" width="150px" />
+            <el-table-column label="发货状态" width="100px">
+              <template #default="scope">
+                {{ scope.row.warehouseName ? '已发货' : '待发货' }}
+              </template>
+            </el-table-column>
             <el-table-column label="发货备注">
               <template #default="scope">
                 <el-popover
@@ -31,15 +38,26 @@
             </el-table-column>
           </el-table>
         </template>
-        <el-divider direction="horizontal" content-position="left">其他费用</el-divider>
+        <el-divider direction="horizontal" content-position="left">
+          其他费用<span v-if="extraTotalPrice">，应收：{{ extraTotalPrice }}</span>
+        </el-divider>
         <el-table :data="orderInfo.extraPay" border stripe>
           <el-table-column type="index" width="50" />
           <el-table-column prop="extraPayType" label="费用项" />
           <el-table-column prop="extraPayMoney" label="金额" />
           <el-table-column prop="remark" label="备注" />
         </el-table>
+        <el-divider
+          v-if="prodTotalPrice + extraTotalPrice"
+          direction="horizontal"
+          content-position="left"
+        >
+          合计应收：{{ prodTotalPrice + extraTotalPrice }}
+        </el-divider>
         <div v-if="checkPermi(['clue:order:add-fee'])">
-          <el-divider direction="horizontal" content-position="left">额外支出</el-divider>
+          <el-divider direction="horizontal" content-position="left">
+            额外支出<span v-if="extraPayTotalFee">，合计：{{ extraPayTotalFee }}</span>
+          </el-divider>
           <el-table :data="extraPayList" border stripe>
             <el-table-column type="index" width="50" />
             <el-table-column prop="extraPayType" label="支出项" />
@@ -86,11 +104,31 @@ import { formatDate } from '@/utils/formatTime'
 const tabName = ref('clueInfo')
 const show = ref(false)
 const clueInfo = ref({})
-const orderInfo = ref({})
+const orderInfo = ref({
+  signProducts: [],
+  extraPay: []
+})
 const returnRecordList = ref([])
 const aftersaleList = ref([])
 const extraPayList = ref([])
 
+const prodTotalPrice = computed(() => {
+  return orderInfo.value.signProducts.reduce(
+    (pre, cur) => pre + (cur?.price || 0) * (cur?.signNum || 0),
+    0
+  )
+})
+
+// 其他费用
+const extraTotalPrice = computed(() => {
+  return orderInfo.value.extraPay.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
+})
+
+// 额外支出
+const extraPayTotalFee = computed(() => {
+  return extraPayList.value.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
+})
+
 function open(clueId, orderId) {
   try {
     show.value = true
@@ -122,6 +160,9 @@ const orderSchema = ref([])
 function getFields() {
   getClueFieldList().then((data) => {
     const arr = useCrudSchemas(data).allSchemas.detailSchema
+    if (arr.length % 2 != 0) {
+      arr.push({})
+    }
     clueSchema.value = [
       ...arr,
       {
@@ -140,6 +181,9 @@ function getFields() {
 
   getOrderFieldList().then((data) => {
     const arr = useCrudSchemas(data).allSchemas.detailSchema
+    if (arr.length % 2 != 0) {
+      arr.push({})
+    }
     orderSchema.value = [
       ...arr,
       {
diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue
index bcb6b3c..f2f75ca 100644
--- a/src/views/Clue/Order/Comp/MallOrderList.vue
+++ b/src/views/Clue/Order/Comp/MallOrderList.vue
@@ -68,9 +68,14 @@
             <el-table :data="row.signProducts" stripe style="width: 900px">
               <el-table-column prop="productName" label="成交产品" />
               <el-table-column prop="specsName" label="产品规格" />
-              <el-table-column prop="signNum" label="成交数量" />
-              <el-table-column prop="warehouseName" label="发货仓库" />
-              <el-table-column label="发货备注">
+              <el-table-column prop="signNum" label="成交数量" width="100px" />
+              <el-table-column prop="warehouseName" label="发货仓库" width="150px" />
+              <el-table-column label="发货状态" width="100px">
+                <template #default="scope">
+                  {{ scope.row.warehouseName ? '已发货' : '待发货' }}
+                </template>
+              </el-table-column>
+              <el-table-column label="发货备注" width="100px">
                 <template #default="scope">
                   <el-popover
                     placement="top"
@@ -335,7 +340,7 @@ function getOptions() {
 }
 const deliveryDialog = ref()
 function handleDelivery(row) {
-  deliveryDialog.value.open(row.id)
+  deliveryDialog.value.open(row.id, row.signNum)
 }
 
 const userOptions = ref([])
diff --git a/src/views/Clue/Pool/Comp/DrawerClue.vue b/src/views/Clue/Pool/Comp/DrawerClue.vue
index 51d63d6..3c2d997 100644
--- a/src/views/Clue/Pool/Comp/DrawerClue.vue
+++ b/src/views/Clue/Pool/Comp/DrawerClue.vue
@@ -179,7 +179,11 @@ const props = defineProps({
 })
 
 const showSchema = computed(() => {
-  const arr = [
+  const arr1 = [...props.schema]
+  if (arr1.length % 2 != 0) {
+    arr1.push({})
+  }
+  const arr2 = [
     {
       field: 'requirement',
       label: '诉求',
@@ -192,7 +196,7 @@ const showSchema = computed(() => {
       isEditor: true
     }
   ]
-  return [...props.schema, ...arr]
+  return [...arr1, ...arr2]
 })
 
 const followList = ref([])
diff --git a/src/views/MiniMall/Purchase/Comp/DialogAdd.vue b/src/views/MiniMall/Purchase/Comp/DialogAdd.vue
index 7be7701..9c672aa 100644
--- a/src/views/MiniMall/Purchase/Comp/DialogAdd.vue
+++ b/src/views/MiniMall/Purchase/Comp/DialogAdd.vue
@@ -42,7 +42,13 @@
         </el-col>
         <el-col :span="12" :offset="0">
           <el-form-item label="采购数量" prop="num">
-            <el-input-number :min="1" v-model="form.num" placeholder="请输入" style="width: 100%" />
+            <el-input-number
+              :min="1"
+              v-model="form.num"
+              :controls="false"
+              placeholder="请输入"
+              style="width: 100%"
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -51,6 +57,7 @@
           <el-form-item label="采购单价" prop="unitPrice">
             <el-input-number
               :min="0"
+              :controls="false"
               v-model="form.unitPrice"
               placeholder="请输入"
               style="width: 100%"

From bae1f2608ab2e3ccb7e1fe4196de2be0b732a597 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Thu, 27 Jun 2024 15:29:54 +0800
Subject: [PATCH 06/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Clue/Order/Comp/DialogDelivery.vue | 12 +++++++++---
 src/views/Clue/Order/Comp/DialogOrder.vue    |  1 -
 src/views/Clue/Order/Comp/MallOrderList.vue  |  1 -
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/Clue/Order/Comp/DialogDelivery.vue b/src/views/Clue/Order/Comp/DialogDelivery.vue
index f9c5652..8398971 100644
--- a/src/views/Clue/Order/Comp/DialogDelivery.vue
+++ b/src/views/Clue/Order/Comp/DialogDelivery.vue
@@ -7,9 +7,9 @@
             <span class="font-bold">：{{ form.sendTotalNum }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="16" :offset="0" v-if="autoAuditPurchase == 'true'">
+        <el-col :span="16" :offset="0">
           <el-form-item label="发货方式">
-            <el-radio-group v-model="form.sendType">
+            <el-radio-group v-model="form.sendType" :disabled="autoAuditPurchase == 'false'">
               <el-radio :label="1"> 立即采购发货 </el-radio>
               <el-radio :label="2"> 使用库存发货 </el-radio>
             </el-radio-group>
@@ -82,7 +82,13 @@
           <el-table-column prop="remainNum" label="剩余库存" width="90px" />
           <el-table-column label="发货数量">
             <template #default="{ row }">
-              <el-input-number v-model="row.sendNum" size="small" :min="1" :controls="false" />
+              <el-input-number
+                v-model="row.sendNum"
+                size="small"
+                :min="1"
+                :max="row.remainNum"
+                :controls="false"
+              />
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/Clue/Order/Comp/DialogOrder.vue b/src/views/Clue/Order/Comp/DialogOrder.vue
index e2f7e5c..eac284e 100644
--- a/src/views/Clue/Order/Comp/DialogOrder.vue
+++ b/src/views/Clue/Order/Comp/DialogOrder.vue
@@ -15,7 +15,6 @@
             <el-table-column prop="productName" label="成交产品" />
             <el-table-column prop="specsName" label="产品规格" />
             <el-table-column prop="signNum" label="成交数量" width="100px" />
-            <el-table-column prop="warehouseName" label="发货仓库" width="150px" />
             <el-table-column label="发货状态" width="100px">
               <template #default="scope">
                 {{ scope.row.warehouseName ? '已发货' : '待发货' }}
diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue
index f2f75ca..ecfbf13 100644
--- a/src/views/Clue/Order/Comp/MallOrderList.vue
+++ b/src/views/Clue/Order/Comp/MallOrderList.vue
@@ -69,7 +69,6 @@
               <el-table-column prop="productName" label="成交产品" />
               <el-table-column prop="specsName" label="产品规格" />
               <el-table-column prop="signNum" label="成交数量" width="100px" />
-              <el-table-column prop="warehouseName" label="发货仓库" width="150px" />
               <el-table-column label="发货状态" width="100px">
                 <template #default="scope">
                   {{ scope.row.warehouseName ? '已发货' : '待发货' }}

From 906b63feee0f8ff742c04907450f50b17c04eb22 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Thu, 27 Jun 2024 17:14:30 +0800
Subject: [PATCH 07/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Setting/src/Setting.vue |   5 +
 .../src/components/InterfaceDisplay.vue       |   1 -
 src/views/Home/Index.vue                      | 116 +++++++++---------
 src/views/MiniMall/Product/add.vue            |   4 +-
 src/views/MiniMall/Purchase/index.data.js     |   2 +-
 5 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/src/layout/components/Setting/src/Setting.vue b/src/layout/components/Setting/src/Setting.vue
index bdeb2ca..3420e5a 100644
--- a/src/layout/components/Setting/src/Setting.vue
+++ b/src/layout/components/Setting/src/Setting.vue
@@ -12,6 +12,11 @@ import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
 import ColorRadioPicker from './components/ColorRadioPicker.vue'
 // import InterfaceDisplay from './components/InterfaceDisplay.vue'
 // import LayoutRadioPicker from './components/LayoutRadioPicker.vue'
+import { useWatermark } from '@/hooks/web/useWatermark'
+
+const { setWatermark } = useWatermark()
+
+setWatermark('安徽莳松科技有限公司')
 
 const { t } = useI18n()
 const appStore = useAppStore()
diff --git a/src/layout/components/Setting/src/components/InterfaceDisplay.vue b/src/layout/components/Setting/src/components/InterfaceDisplay.vue
index 598d2c8..b791a85 100644
--- a/src/layout/components/Setting/src/components/InterfaceDisplay.vue
+++ b/src/layout/components/Setting/src/components/InterfaceDisplay.vue
@@ -124,7 +124,6 @@ const fixedMenuChange = (show: boolean) => {
 const setWater = () => {
   setWatermark(water.value)
 }
-setWater()
 
 const layout = computed(() => appStore.getLayout)
 
diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index b362e9f..0a5ee37 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -67,8 +67,61 @@
         </el-row>
       </el-skeleton>
     </el-card>
-    <el-row class="mt-10px" :gutter="10" justify="space-between">
-      <!-- <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24" class="mb-10px">
+    <div class="mt-10px flex">
+      <el-card shadow="never" class="flex-1">
+        <template #header>
+          <div class="flex justify-between">
+            <span>成交率</span>
+          </div>
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <el-skeleton :loading="loading" animated>
+            <Echart :options="lineOptionsData" :height="280" />
+          </el-skeleton>
+        </el-skeleton>
+      </el-card>
+      <el-card shadow="never" class="ml-10px">
+        <template #header>
+          <div class="flex justify-between items-center">
+            <span>跟进榜Top10</span>
+            <el-radio-group v-model="followDate" size="small" @change="getFollowList">
+              <el-radio :label="1">本日</el-radio>
+              <el-radio :label="2">本月</el-radio>
+            </el-radio-group>
+          </div>
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <ul class="follow-wrap">
+            <!-- <TransitionGroup name="flip"> -->
+            <li
+              class="follow-item number-font mb-18px text-14px"
+              v-for="(item, index) in followList"
+              :key="index"
+            >
+              <span class="mr-10px">NO.{{ index + 1 }}</span>
+              <span class="mr-10px">{{ item.username }}</span>
+              <span>已跟进{{ item.followNum }}条线索</span>
+            </li>
+            <br />
+            <!-- </TransitionGroup> -->
+          </ul>
+        </el-skeleton>
+      </el-card>
+      <el-card shadow="never" class="ml-10px">
+        <template #header>
+          <div class="flex justify-between"> 本月成交榜Top10 </div>
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <el-table :data="signList" size="small">
+            <el-table-column type="index" />
+            <el-table-column prop="username" label="姓名" width="100" />
+            <el-table-column prop="followNum" label="成交数量" width="70" />
+            <el-table-column prop="deptName" label="所属组织" />
+          </el-table>
+        </el-skeleton>
+      </el-card>
+    </div>
+    <!-- <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24" class="mb-10px">
         <el-card shadow="never">
           <template #header>
             <div class="flex justify-between ">
@@ -80,65 +133,6 @@
           </el-skeleton>
         </el-card>
       </el-col> -->
-      <el-col :xl="8" :lg="8" :md="12" :sm="12" :xs="24" class="mb-10px">
-        <el-card shadow="never">
-          <template #header>
-            <div class="flex justify-between">
-              <span>成交率</span>
-            </div>
-          </template>
-          <el-skeleton :loading="loading" animated>
-            <el-skeleton :loading="loading" animated>
-              <Echart :options="lineOptionsData" :height="280" />
-            </el-skeleton>
-          </el-skeleton>
-        </el-card>
-      </el-col>
-      <el-col :xl="8" :lg="8" :md="12" :sm="12" :xs="24" class="mb-10px">
-        <el-card shadow="never">
-          <template #header>
-            <div class="flex justify-between items-center">
-              <span>跟进榜Top10</span>
-              <el-radio-group v-model="followDate" size="small" @change="getFollowList">
-                <el-radio :label="1">本日</el-radio>
-                <el-radio :label="2">本月</el-radio>
-              </el-radio-group>
-            </div>
-          </template>
-          <el-skeleton :loading="loading" animated>
-            <ul class="follow-wrap">
-              <!-- <TransitionGroup name="flip"> -->
-              <li
-                class="follow-item number-font mb-18px text-14px"
-                v-for="(item, index) in followList"
-                :key="index"
-              >
-                <span class="mr-10px">NO.{{ index + 1 }}</span>
-                <span class="mr-10px">{{ item.username }}</span>
-                <span>已跟进{{ item.followNum }}条线索</span>
-              </li>
-              <br />
-              <!-- </TransitionGroup> -->
-            </ul>
-          </el-skeleton>
-        </el-card>
-      </el-col>
-      <el-col :xl="8" :lg="8" :md="12" :sm="12" :xs="24" class="mb-10px">
-        <el-card shadow="never">
-          <template #header>
-            <div class="flex justify-between"> 本月成交榜Top10 </div>
-          </template>
-          <el-skeleton :loading="loading" animated>
-            <el-table :data="signList" size="small">
-              <el-table-column type="index" />
-              <el-table-column prop="username" label="姓名" width="100" />
-              <el-table-column prop="followNum" label="成交数量" width="70" />
-              <el-table-column prop="deptName" label="所属组织" />
-            </el-table>
-          </el-skeleton>
-        </el-card>
-      </el-col>
-    </el-row>
   </div>
 </template>
 <script setup lang="ts" name="Home">
diff --git a/src/views/MiniMall/Product/add.vue b/src/views/MiniMall/Product/add.vue
index e076345..0f48eb5 100644
--- a/src/views/MiniMall/Product/add.vue
+++ b/src/views/MiniMall/Product/add.vue
@@ -488,8 +488,8 @@ const getDetail = async () => {
       productCategory: undefined,
       productBrand: undefined,
       productIntro: undefined,
-      mainImage: 'https://ss-cloud.ahduima.com/1001/1796426117251600384.png',
-      carouselImages: ['https://ss-cloud.ahduima.com/1001/1796426117251600384.png'],
+      mainImage: '',
+      carouselImages: [],
       productSpecList: [],
       skuList: [],
       detailInfo: null,
diff --git a/src/views/MiniMall/Purchase/index.data.js b/src/views/MiniMall/Purchase/index.data.js
index e4dd097..e456eb0 100644
--- a/src/views/MiniMall/Purchase/index.data.js
+++ b/src/views/MiniMall/Purchase/index.data.js
@@ -125,7 +125,7 @@ const crudSchemas = reactive([
     label: '备注',
     field: 'remark',
     isSearch: false,
-    isTable: true
+    isTable: false
   }
 ])
 export const { allSchemas } = useCrudSchemas(crudSchemas)

From ed0727fa43cf0b66792e032ad0b408cb575ca73f Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Thu, 27 Jun 2024 17:25:35 +0800
Subject: [PATCH 08/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Clue/Order/Comp/DialogDelivery.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/Clue/Order/Comp/DialogDelivery.vue b/src/views/Clue/Order/Comp/DialogDelivery.vue
index 8398971..f756f35 100644
--- a/src/views/Clue/Order/Comp/DialogDelivery.vue
+++ b/src/views/Clue/Order/Comp/DialogDelivery.vue
@@ -10,7 +10,12 @@
         <el-col :span="16" :offset="0">
           <el-form-item label="发货方式">
             <el-radio-group v-model="form.sendType" :disabled="autoAuditPurchase == 'false'">
-              <el-radio :label="1"> 立即采购发货 </el-radio>
+              <el-radio :label="1">
+                <Tooltip
+                  message="必须在进销存的“通用配置-常规配置”中，将 ’采购申请自动通过‘ 设置为“是”"
+                />
+                立即采购发货
+              </el-radio>
               <el-radio :label="2"> 使用库存发货 </el-radio>
             </el-radio-group>
           </el-form-item>

From 31f028d8d83132e8cefecd72121f9f31fe5010d4 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Thu, 27 Jun 2024 17:58:44 +0800
Subject: [PATCH 09/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/web/useWatermark.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hooks/web/useWatermark.ts b/src/hooks/web/useWatermark.ts
index 4a31359..07cd09c 100644
--- a/src/hooks/web/useWatermark.ts
+++ b/src/hooks/web/useWatermark.ts
@@ -15,14 +15,14 @@ export function useWatermark(appendEl: HTMLElement | null = document.body) {
     clear()
 
     const can = document.createElement('canvas')
-    can.width = 300
+    can.width = 500
     can.height = 240
 
     const cans = can.getContext('2d')
     if (cans) {
       cans.rotate((-20 * Math.PI) / 120)
       cans.font = '15px Vedana'
-      cans.fillStyle = 'rgba(0, 0, 0, 0.15)'
+      cans.fillStyle = 'rgba(0, 0, 0, 0.05)'
       cans.textAlign = 'left'
       cans.textBaseline = 'middle'
       cans.fillText(str, can.width / 20, can.height)

From fa2481ea3d167368d37c71e785b9a9d3151d73db Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 28 Jun 2024 11:24:27 +0800
Subject: [PATCH 10/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mall/warehouse/index.js               |  5 ++
 src/components/Echart/src/Echart.vue          |  1 +
 src/views/Clue/Order/Comp/DialogDelivery.vue  | 63 +++++++++++++------
 src/views/Clue/Order/Comp/DialogOrder.vue     |  8 +--
 src/views/Clue/Order/Comp/MallOrderList.vue   | 10 +--
 src/views/Home/echarts-data.ts                | 20 +-----
 .../Inventory/Comp/InventoryRecord.vue        | 11 +++-
 7 files changed, 65 insertions(+), 53 deletions(-)

diff --git a/src/api/mall/warehouse/index.js b/src/api/mall/warehouse/index.js
index 18ba1b2..6858d62 100644
--- a/src/api/mall/warehouse/index.js
+++ b/src/api/mall/warehouse/index.js
@@ -38,3 +38,8 @@ export const getInventoryList = async (params) => {
 export const getInventoryRecord = async (params) => {
   return await request.get({ url: '/admin-api/crm/erp-inventory-record/page', params })
 }
+
+// 获取剩余库存
+export const getRemainInventoryList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-inventory-detail/list', params })
+}
diff --git a/src/components/Echart/src/Echart.vue b/src/components/Echart/src/Echart.vue
index 31f2eea..7604765 100644
--- a/src/components/Echart/src/Echart.vue
+++ b/src/components/Echart/src/Echart.vue
@@ -66,6 +66,7 @@ watch(
   (options) => {
     if (echartRef) {
       echartRef?.setOption(options)
+      resizeHandler()
     }
   },
   {
diff --git a/src/views/Clue/Order/Comp/DialogDelivery.vue b/src/views/Clue/Order/Comp/DialogDelivery.vue
index f756f35..8145090 100644
--- a/src/views/Clue/Order/Comp/DialogDelivery.vue
+++ b/src/views/Clue/Order/Comp/DialogDelivery.vue
@@ -36,10 +36,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" :offset="0">
-            <el-form-item label="采购数量" prop="purchaseNum">
+            <el-form-item label="采购数量" prop="num">
               <el-input-number
                 :min="form.sendTotalNum"
-                v-model="form.purchaseNum"
+                v-model="form.num"
                 :controls="false"
                 placeholder="请输入"
                 style="width: 100%"
@@ -81,17 +81,17 @@
       <template v-else>
         <el-table :data="inventoryList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" />
-          <el-table-column prop="id" label="入库批次号" width="150px" />
+          <el-table-column prop="batchNo" label="入库批次号" width="150px" />
           <el-table-column prop="warehouseName" label="存放仓库" width="120px" />
-          <el-table-column prop="unitPrice" label="采购价" width="90px" />
-          <el-table-column prop="remainNum" label="剩余库存" width="90px" />
+          <el-table-column prop="price" label="采购价" width="90px" />
+          <el-table-column prop="num" label="剩余库存" width="90px" />
           <el-table-column label="发货数量">
             <template #default="{ row }">
               <el-input-number
                 v-model="row.sendNum"
                 size="small"
                 :min="1"
-                :max="row.remainNum"
+                :max="row.num"
                 :controls="false"
               />
             </template>
@@ -112,7 +112,7 @@
 </template>
 
 <script setup name="DialogDelivery">
-import { getSimpleWarehouseList } from '@/api/mall/warehouse'
+import { getSimpleWarehouseList, getRemainInventoryList } from '@/api/mall/warehouse'
 import { createDelivery } from '@/api/clue/delivery'
 import { getConfigList } from '@/api/system/set'
 import { getDictOptions } from '@/utils/dict'
@@ -127,10 +127,17 @@ function getOptions() {
   })
 }
 
+function getRemainInventory(signProductId) {
+  getRemainInventoryList({ signProductId }).then((data) => {
+    inventoryList.value = data
+  })
+}
+
 const show = ref(false)
-function open(id, signNum) {
+function open(row) {
   show.value = true
-  resetForm(id, signNum)
+  resetForm(row)
+  getRemainInventory(row.id)
 }
 defineExpose({
   open
@@ -140,18 +147,20 @@ const form = ref({})
 const rules = ref({
   supplier: { required: true, message: '供应商不可为空', trigger: 'change' },
   warehouseId: { required: true, message: '仓库不可为空', trigger: 'change' },
-  purchaseNum: { required: true, message: '采购数量不可为空', trigger: 'change,blur' },
+  num: { required: true, message: '采购数量不可为空', trigger: 'change,blur' },
   unitPrice: { required: true, message: '采购单价不可为空', trigger: 'change,blur' },
   warehouseId: { required: true, message: '仓库不可为空', trigger: 'change' }
 })
-function resetForm(id, num) {
+function resetForm(row) {
   form.value = {
     sendType: 2,
-    sendTotalNum: num,
-    signProductId: id,
+    sendTotalNum: row.signNum,
+    signProductId: row.id,
+    productId: row.productId,
+    specsId: row.specsId,
     warehouseId: undefined,
     supplier: undefined,
-    purchaseNum: num,
+    num: row.signNum,
     unitPrice: undefined,
     remark: undefined
   }
@@ -186,7 +195,25 @@ async function onSubmit() {
   // 提交请求
   formLoading.value = true
   try {
-    await createDelivery(form.value)
+    let params = {
+      signProductId: form.value.signProductId,
+      sendType: form.value.sendType,
+      remark: form.value.remark
+    }
+    if (params.sendType == 1) {
+      params.purchaseOrder = {
+        productId: form.value.productId,
+        specsId: form.value.specsId,
+        supplier: form.value.supplier,
+        num: form.value.num,
+        unitPrice: form.value.unitPrice,
+        warehouseId: form.value.warehouseId
+      }
+    } else {
+      params.detailList = inventoryList.value
+    }
+
+    await createDelivery(params)
     message.success('发货成功！')
     show.value = false
     emit('success')
@@ -195,11 +222,7 @@ async function onSubmit() {
   }
 }
 
-const inventoryList = ref([
-  { id: 123, warehouseName: '自营仓', unitPrice: 120, remainNum: 5 },
-  { id: 234, warehouseName: '自营仓', unitPrice: 100, remainNum: 5 },
-  { id: 345, warehouseName: '供应商仓', unitPrice: 110, remainNum: 999 }
-])
+const inventoryList = ref([])
 
 const deliveryArr = ref([])
 function handleSelectionChange(val) {
diff --git a/src/views/Clue/Order/Comp/DialogOrder.vue b/src/views/Clue/Order/Comp/DialogOrder.vue
index eac284e..bc8d260 100644
--- a/src/views/Clue/Order/Comp/DialogOrder.vue
+++ b/src/views/Clue/Order/Comp/DialogOrder.vue
@@ -15,18 +15,14 @@
             <el-table-column prop="productName" label="成交产品" />
             <el-table-column prop="specsName" label="产品规格" />
             <el-table-column prop="signNum" label="成交数量" width="100px" />
-            <el-table-column label="发货状态" width="100px">
-              <template #default="scope">
-                {{ scope.row.warehouseName ? '已发货' : '待发货' }}
-              </template>
-            </el-table-column>
+            <el-table-column label="发货状态" prop="sendState" width="100px" />
             <el-table-column label="发货备注">
               <template #default="scope">
                 <el-popover
                   placement="top"
                   width="500px"
                   trigger="click"
-                  v-if="scope.row.warehouseName && scope.row.sendRemark"
+                  v-if="scope.row.sendRemark"
                 >
                   <template #reference>
                     <el-button type="primary" style="padding: 0" text>点击查看</el-button>
diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue
index ecfbf13..31c6837 100644
--- a/src/views/Clue/Order/Comp/MallOrderList.vue
+++ b/src/views/Clue/Order/Comp/MallOrderList.vue
@@ -69,11 +69,7 @@
               <el-table-column prop="productName" label="成交产品" />
               <el-table-column prop="specsName" label="产品规格" />
               <el-table-column prop="signNum" label="成交数量" width="100px" />
-              <el-table-column label="发货状态" width="100px">
-                <template #default="scope">
-                  {{ scope.row.warehouseName ? '已发货' : '待发货' }}
-                </template>
-              </el-table-column>
+              <el-table-column label="发货状态" prop="sendState" width="100px" />
               <el-table-column label="发货备注" width="100px">
                 <template #default="scope">
                   <el-popover
@@ -95,7 +91,7 @@
                     type="primary"
                     class="mr-10px"
                     link
-                    :disabled="!!scope.row.warehouseName"
+                    :disabled="scope.row.sendState == '已发货'"
                     style="padding: 0; margin-left: 0"
                     v-hasPermi="['clue:order:send']"
                     @click="handleDelivery(scope.row)"
@@ -339,7 +335,7 @@ function getOptions() {
 }
 const deliveryDialog = ref()
 function handleDelivery(row) {
-  deliveryDialog.value.open(row.id, row.signNum)
+  deliveryDialog.value.open(row)
 }
 
 const userOptions = ref([])
diff --git a/src/views/Home/echarts-data.ts b/src/views/Home/echarts-data.ts
index c47b05c..502d1e3 100644
--- a/src/views/Home/echarts-data.ts
+++ b/src/views/Home/echarts-data.ts
@@ -42,25 +42,7 @@ export const lineOptions: EChartsOption = {
       show: false
     }
   },
-  series: [
-    {
-      name: '成交率',
-      smooth: true,
-      type: 'line',
-      data: [100, 120, 161, 134, 105, 160, 165, 114, 163, 185, 118, 123],
-      animationDuration: 2800,
-      animationEasing: 'cubicInOut'
-    },
-    {
-      name: t('analysis.actual'),
-      smooth: true,
-      type: 'line',
-      itemStyle: {},
-      data: [120, 82, 91, 154, 162, 140, 145, 250, 134, 56, 99, 123],
-      animationDuration: 2800,
-      animationEasing: 'quadraticOut'
-    }
-  ]
+  series: []
 }
 
 export const pieOptions: EChartsOption = {
diff --git a/src/views/MiniMall/Inventory/Comp/InventoryRecord.vue b/src/views/MiniMall/Inventory/Comp/InventoryRecord.vue
index 122c619..8b65fc0 100644
--- a/src/views/MiniMall/Inventory/Comp/InventoryRecord.vue
+++ b/src/views/MiniMall/Inventory/Comp/InventoryRecord.vue
@@ -63,7 +63,16 @@
       <el-table-column prop="changeTime" label="变动时间" :formatter="dateFormatter" />
       <el-table-column prop="changeUserName" label="变动人员" />
       <el-table-column prop="warehouseName" label="所属仓库" />
-      <el-table-column prop="remark" label="备注" />
+      <el-table-column prop="remark" label="备注">
+        <template #default="scope">
+          <el-popover placement="top" width="500px" trigger="click" v-if="scope.row.remark">
+            <template #reference>
+              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+            </template>
+            <div v-dompurify-html="scope.row.remark"></div>
+          </el-popover>
+        </template>
+      </el-table-column>
     </el-table>
     <Pagination
       v-model:limit="searchForm.pageSize"

From 4d4519689548811aee158dcd2266b866e52b331e Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 28 Jun 2024 12:02:45 +0800
Subject: [PATCH 11/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Clue/Order/Comp/Delivery.vue        | 20 +++++++++----------
 .../Inventory/Comp/InventoryRecord.vue        | 14 ++++++++++---
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/views/Clue/Order/Comp/Delivery.vue b/src/views/Clue/Order/Comp/Delivery.vue
index 868a03f..6b50606 100644
--- a/src/views/Clue/Order/Comp/Delivery.vue
+++ b/src/views/Clue/Order/Comp/Delivery.vue
@@ -67,25 +67,23 @@
     </el-form>
 
     <el-table v-loading="loading" :data="tableList" border>
-      <el-table-column prop="signId" label="成交单号" min-width="150px" />
-      <el-table-column prop="name" label="线索名称" min-width="200px" />
-      <el-table-column prop="phone" label="联系方式" min-width="150px" />
+      <el-table-column prop="signId" label="成交单号" min-width="120px" />
+      <el-table-column prop="name" label="线索名称" min-width="120px" />
+      <el-table-column prop="phone" label="联系方式" width="120px" />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
-      <el-table-column
-        prop="dealDate"
-        label="登记时间"
-        min-width="150px"
-        :formatter="dateFormatter"
-      />
+      <el-table-column prop="dealDate" label="登记时间" width="120px" :formatter="dateFormatter" />
       <el-table-column prop="productName" label="成交产品" min-width="150px" />
       <el-table-column prop="specsName" label="产品规格" min-width="150px" />
+      <el-table-column prop="signNum" label="销售数量" width="90px" />
       <el-table-column
         prop="createTime"
         label="发货时间"
-        min-width="150px"
+        width="120px"
         :formatter="dateFormatter"
       />
-      <el-table-column prop="warehouseName" label="发货仓库" min-width="100px" />
+      <el-table-column prop="batchNo" label="发货批次" min-width="120px" />
+      <el-table-column prop="warehouseName" label="发货仓库" min-width="120px" />
+      <el-table-column prop="sendNum" label="发货数量" width="90px" />
       <el-table-column label="发货备注">
         <template #default="scope">
           <el-popover
diff --git a/src/views/MiniMall/Inventory/Comp/InventoryRecord.vue b/src/views/MiniMall/Inventory/Comp/InventoryRecord.vue
index 8b65fc0..f903f09 100644
--- a/src/views/MiniMall/Inventory/Comp/InventoryRecord.vue
+++ b/src/views/MiniMall/Inventory/Comp/InventoryRecord.vue
@@ -1,6 +1,12 @@
 <template>
   <div>
     <el-form inline :model="searchForm" class="-mb-15px" label-width="0">
+      <el-form-item>
+        <el-select v-model="searchForm.changeType" placeholder="变动类型" clearable filterable>
+          <el-option label="入库" :value="1" />
+          <el-option label="出库" :value="2" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-select
           v-model="searchForm.productId"
@@ -53,13 +59,13 @@
       <el-table-column type="index" width="50px" />
       <el-table-column prop="productName" label="产品名称" />
       <el-table-column prop="specsName" label="规格" />
-      <el-table-column label="变动类型">
+      <el-table-column label="变动类型" width="90px">
         <template #default="{ row }">
           {{ ['', '入库', '出库'][row.changeType] }}
         </template>
       </el-table-column>
-      <el-table-column prop="num" label="数量" />
-      <!-- <el-table-column prop="money" label="金额" /> -->
+      <el-table-column prop="num" label="变动数量" width="90px" />
+      <el-table-column prop="batchNo" label="批次号" />
       <el-table-column prop="changeTime" label="变动时间" :formatter="dateFormatter" />
       <el-table-column prop="changeUserName" label="变动人员" />
       <el-table-column prop="warehouseName" label="所属仓库" />
@@ -92,6 +98,7 @@ const searchForm = ref({
   pproductId: undefined,
   specsId: undefined,
   warehouseId: undefined,
+  changeType: undefined,
   pageNo: 1,
   pageSize: 20
 })
@@ -111,6 +118,7 @@ function resetQuery() {
     productId: undefined,
     specsId: undefined,
     warehouseId: undefined,
+    changeType: undefined,
     pageNo: 1,
     pageSize: 20
   }

From 204879679840de7aff63ad4190f7193327ef163e Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 28 Jun 2024 15:59:58 +0800
Subject: [PATCH 12/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/MiniMall/Inventory/Comp/InventoryRecord.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/MiniMall/Inventory/Comp/InventoryRecord.vue b/src/views/MiniMall/Inventory/Comp/InventoryRecord.vue
index f903f09..97716d3 100644
--- a/src/views/MiniMall/Inventory/Comp/InventoryRecord.vue
+++ b/src/views/MiniMall/Inventory/Comp/InventoryRecord.vue
@@ -49,6 +49,10 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item>
+        <el-input v-model="searchForm.batchNo" placeholder="批次号" clearable />
+      </el-form-item>
+
       <el-form-item>
         <el-button @click="handleSearch"> 搜索 </el-button>
         <el-button @click="resetQuery"> 重置 </el-button>
@@ -93,12 +97,14 @@
 import { dateFormatter } from '@/utils/formatTime'
 import { getSimpleWarehouseList, getInventoryRecord } from '@/api/mall/warehouse'
 import { getSimpleProductList } from '@/api/mall/product'
+import { removeNullField } from '@/utils'
 
 const searchForm = ref({
   pproductId: undefined,
   specsId: undefined,
   warehouseId: undefined,
   changeType: undefined,
+  batchNo: undefined,
   pageNo: 1,
   pageSize: 20
 })
@@ -119,6 +125,7 @@ function resetQuery() {
     specsId: undefined,
     warehouseId: undefined,
     changeType: undefined,
+    batchNo: undefined,
     pageNo: 1,
     pageSize: 20
   }
@@ -150,7 +157,7 @@ function changeProd(val) {
 async function getList() {
   loading.value = true
   try {
-    const data = await getInventoryRecord(searchForm.value)
+    const data = await getInventoryRecord(removeNullField(searchForm.value))
     tableList.value = data.list
     total.value = data.total
   } finally {

From a33cbab7e3f34a54b98999be8cec788e6c0013b8 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Sat, 29 Jun 2024 20:26:05 +0800
Subject: [PATCH 13/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Clue/Order/Comp/MallOrderList.vue | 6 +++---
 src/views/Clue/Order/Comp/OrderList.vue     | 6 +++---
 src/views/Clue/Pool/index.vue               | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue
index 31c6837..8df8280 100644
--- a/src/views/Clue/Order/Comp/MallOrderList.vue
+++ b/src/views/Clue/Order/Comp/MallOrderList.vue
@@ -233,7 +233,7 @@ const tableObject = ref({
   loading: false,
   total: 1,
   pageSize: 20,
-  currentPage: 1
+  pageNo: 1
 })
 
 function resetQuery() {
@@ -241,7 +241,7 @@ function resetQuery() {
     signProduct: undefined
   }
   searchRef.value.reset()
-  tableObject.value.currentPage = 1
+  tableObject.value.pageNo = 1
   getTableList()
 }
 // 查询
@@ -253,7 +253,7 @@ async function getTableList() {
     const params = {
       ...queryParams,
       ...searchForm.value,
-      pageNo: tableObject.value.currentPage,
+      pageNo: tableObject.value.pageNo,
       pageSize: tableObject.value.pageSize
     }
     const data = await SignApi.getSignPage(removeNullField(params))
diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue
index fbb4e93..8059b49 100644
--- a/src/views/Clue/Order/Comp/OrderList.vue
+++ b/src/views/Clue/Order/Comp/OrderList.vue
@@ -203,7 +203,7 @@ const tableObject = ref({
   loading: false,
   total: 1,
   pageSize: 20,
-  currentPage: 1
+  pageNo: 1
 })
 
 const placeOptions = computed(() => {
@@ -218,7 +218,7 @@ function resetQuery() {
     signProduct: undefined
   }
   searchRef.value.reset()
-  tableObject.value.currentPage = 1
+  tableObject.value.pageNo = 1
   getTableList()
 }
 // 查询
@@ -230,7 +230,7 @@ async function getTableList() {
     const params = {
       ...queryParams,
       ...searchForm.value,
-      pageNo: tableObject.value.currentPage,
+      pageNo: tableObject.value.pageNo,
       pageSize: tableObject.value.pageSize
     }
     const data = await SignApi.getSignPage(removeNullField(params))
diff --git a/src/views/Clue/Pool/index.vue b/src/views/Clue/Pool/index.vue
index 9ee8e1c..c54d918 100644
--- a/src/views/Clue/Pool/index.vue
+++ b/src/views/Clue/Pool/index.vue
@@ -208,7 +208,7 @@ const tableObject = ref({
   loading: false,
   total: 1,
   pageSize: 20,
-  currentPage: 1
+  pageNo: 1
 })
 
 const showColumns = ref([])
@@ -220,7 +220,7 @@ function getCheckedColumns(list) {
 
 function resetQuery() {
   searchRef.value.reset()
-  tableObject.value.currentPage = 1
+  tableObject.value.pageNo = 1
   getTableList()
 }
 
@@ -232,7 +232,7 @@ async function getTableList() {
     const queryParams = await searchRef.value.getFormModel()
     const params = {
       ...queryParams,
-      pageNo: tableObject.value.currentPage,
+      pageNo: tableObject.value.pageNo,
       pageSize: tableObject.value.pageSize,
       queryType: queryType.value
     }

From 6a414d07df1a519f586a76bf7c35a9f98ba56294 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 1 Jul 2024 12:08:00 +0800
Subject: [PATCH 14/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.base                                  |  6 ++++--
 index.html                                 |  2 +-
 src/api/school/place/index.js              |  4 ++--
 src/views/Basic/User/UserForm.vue          | 13 +++++++------
 src/views/Basic/User/index.vue             |  8 ++++----
 src/views/Clue/Pool/Comp/DialogClue.vue    |  2 +-
 src/views/Clue/Pool/Comp/DialogFollow.vue  |  2 ++
 src/views/Clue/Pool/Comp/DrawerClue.vue    |  6 ++++--
 src/views/SchoolManagement/Place/index.vue |  8 ++++----
 9 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/.env.base b/.env.base
index 6a61f7b..a5f94e7 100644
--- a/.env.base
+++ b/.env.base
@@ -4,10 +4,12 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://118.31.23.45:48080'
+# VITE_BASE_URL='http://118.31.23.45:48080'
+VITE_BASE_URL='http://114.55.169.15:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
+# VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
+VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=/crm-api
diff --git a/index.html b/index.html
index 533c69b..a622563 100644
--- a/index.html
+++ b/index.html
@@ -141,7 +141,7 @@
     <script type="module" src="/src/main.js"></script>
     <script type="text/javascript">
       window._AMapSecurityConfig = {
-        securityJsCode: 'a2f0d14a4c5c1e387f9271b1045a781d' // 你的密钥
+        securityJsCode: 'f653df5a2c5f44ae68faaab6f6a6b8ab' // 你的密钥
       }
     </script>
   </body>
diff --git a/src/api/school/place/index.js b/src/api/school/place/index.js
index f0c1dec..0c743e7 100644
--- a/src/api/school/place/index.js
+++ b/src/api/school/place/index.js
@@ -30,9 +30,9 @@ export const deletePlace = async (id) => {
   return await request.delete({ url: '/admin-api/crm/sch-place/delete?id=' + id })
 }
 
-export const updatePlaceStatus = async (id, status) => {
+export const updatePlaceStatus = async (placeId, status) => {
   const data = {
-    id,
+    placeId,
     status
   }
   return request.put({ url: '/admin-api/crm/sch-place/status/update', data: data })
diff --git a/src/views/Basic/User/UserForm.vue b/src/views/Basic/User/UserForm.vue
index 941d81a..3130993 100644
--- a/src/views/Basic/User/UserForm.vue
+++ b/src/views/Basic/User/UserForm.vue
@@ -9,8 +9,8 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="用户昵称" prop="nickname">
-            <el-input v-model="formData.nickname" placeholder="请输入用户昵称" />
+          <el-form-item label="用户姓名" prop="nickname">
+            <el-input v-model="formData.nickname" placeholder="请输入用户姓名" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -69,8 +69,8 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item v-if="formData.id === undefined" label="用户名称" prop="username">
-            <el-input v-model="formData.username" placeholder="请输入用户名称" />
+          <el-form-item v-if="formData.id === undefined" label="登录账号" prop="username">
+            <el-input v-model="formData.username" placeholder="请输入登录账号" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -142,8 +142,8 @@ const formData = ref({
   hireDate: ''
 })
 const formRules = ref<any>({
-  username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
-  nickname: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
+  username: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }],
+  nickname: [{ required: true, message: '用户姓名不能为空', trigger: 'blur' }],
   password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
   email: [
     {
@@ -153,6 +153,7 @@ const formRules = ref<any>({
     }
   ],
   mobile: [
+    { required: true, message: '手机号不能为空', trigger: 'blur' },
     {
       pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
       message: '请输入正确的手机号码',
diff --git a/src/views/Basic/User/index.vue b/src/views/Basic/User/index.vue
index d04a2e8..7af1f6e 100644
--- a/src/views/Basic/User/index.vue
+++ b/src/views/Basic/User/index.vue
@@ -7,10 +7,10 @@
     <el-col :span="20" :xs="24">
       <!-- 搜索 -->
       <el-form :model="queryParams" ref="queryFormRef" inline label-width="68px">
-        <el-form-item label="用户名称" prop="username">
+        <el-form-item label="登录账号" prop="username">
           <el-input
             v-model="queryParams.username"
-            placeholder="请输入用户名称"
+            placeholder="请输入登录账号"
             clearable
             @keyup.enter="handleQuery"
             class="!w-240px"
@@ -40,8 +40,8 @@
       </el-form>
       <el-table v-loading="loading" :data="list">
         <el-table-column label="用户编号" key="id" prop="id" />
-        <el-table-column label="用户名称" prop="username" />
-        <el-table-column label="用户昵称" prop="nickname" />
+        <el-table-column label="登录账号" prop="username" />
+        <el-table-column label="用户姓名" prop="nickname" />
         <el-table-column label="部门" key="deptName" prop="deptName" />
         <el-table-column label="手机号码" prop="mobile" width="120" />
         <el-table-column label="状态" key="status">
diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue
index 259f197..9eae359 100644
--- a/src/views/Clue/Pool/Comp/DialogClue.vue
+++ b/src/views/Clue/Pool/Comp/DialogClue.vue
@@ -320,7 +320,7 @@ let geoCoder = ref(null)
 
 function initMap(data) {
   AMapLoader.load({
-    key: '2ffb0e2ea90b1df0b8be48ed66e18fc8', //设置您的key
+    key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key
     version: '2.0',
     plugins: ['AMap.Geocoder', 'AMap.AutoComplete']
   }).then((AMap) => {
diff --git a/src/views/Clue/Pool/Comp/DialogFollow.vue b/src/views/Clue/Pool/Comp/DialogFollow.vue
index e5705bb..abae556 100644
--- a/src/views/Clue/Pool/Comp/DialogFollow.vue
+++ b/src/views/Clue/Pool/Comp/DialogFollow.vue
@@ -147,6 +147,8 @@ function getSkillList() {
   })
 }
 
+const emit = defineEmits(['success'])
+
 async function handleSave() {
   // 校验表单
   if (!formRef.value) return
diff --git a/src/views/Clue/Pool/Comp/DrawerClue.vue b/src/views/Clue/Pool/Comp/DrawerClue.vue
index 3c2d997..4eff57c 100644
--- a/src/views/Clue/Pool/Comp/DrawerClue.vue
+++ b/src/views/Clue/Pool/Comp/DrawerClue.vue
@@ -258,9 +258,11 @@ async function open(id) {
 }
 
 function followSuccess() {
-  ClueApi.getClue(id).then((data) => {
+  ClueApi.getClue(clueId.value).then((data) => {
     info.value = { ...data, ...data.diyParams }
   })
+  getFollowList()
+  emit('getList')
 }
 
 const placeList = ref([])
@@ -276,7 +278,7 @@ const defaultLatLng = ref({
 
 function initMap(data) {
   AMapLoader.load({
-    key: '2ffb0e2ea90b1df0b8be48ed66e18fc8', //设置您的key
+    key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key
     version: '2.0'
   }).then((AMap) => {
     aMap.value = AMap
diff --git a/src/views/SchoolManagement/Place/index.vue b/src/views/SchoolManagement/Place/index.vue
index 520789a..ba21c03 100644
--- a/src/views/SchoolManagement/Place/index.vue
+++ b/src/views/SchoolManagement/Place/index.vue
@@ -137,7 +137,7 @@
           </el-form>
         </el-tab-pane>
         <el-tab-pane label="描述" name="desc">
-          <Editor v-model:modelValue="placeForm.remark" />
+          <Editor v-model:modelValue="placeForm.introduce" />
         </el-tab-pane>
       </el-tabs>
       <div class="flex items-center justify-center mt-10px">
@@ -268,7 +268,7 @@ const placeTab = ref('info')
 
 function initMap() {
   AMapLoader.load({
-    key: '2ffb0e2ea90b1df0b8be48ed66e18fc8', //设置您的key
+    key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key
     version: '2.0',
     plugins: ['AMap.Geocoder']
   }).then((AMap) => {
@@ -391,7 +391,7 @@ function handleInsertPlace(schoolId) {
     lng: undefined,
     name: undefined,
     address: undefined,
-    remark: undefined,
+    introduce: undefined,
     phone: undefined,
     schoolId: schoolId,
     showInMap: true,
@@ -556,7 +556,7 @@ const placeForm = ref({
   lng: undefined,
   name: undefined,
   address: undefined,
-  remark: undefined,
+  introduce: undefined,
   phone: undefined,
   flagColor: 'red'
 })

From ac0c15a1a24eac0ff41742863afd880576ab9b97 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 1 Jul 2024 14:49:13 +0800
Subject: [PATCH 15/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon.ico                          | Bin 4286 -> 7886 bytes
 src/api/school/sch/index.js                 |   6 +++---
 src/views/Clue/Pool/Comp/DialogClue.vue     |  15 +++++++++++++--
 src/views/SchoolManagement/School/index.vue |   3 ++-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/public/favicon.ico b/public/favicon.ico
index 5a7de08267811feb034bb0c54ab38ca417731aab..b72b5ec0afd97f9f4ebf0704279f6a62cfae1c2b 100644
GIT binary patch
literal 7886
zcmeHMYiv~45k9V?tRkf`ZKcX-QB6dDv`G{ZB_t4xS&Vo0zHCB>F<`GTPRuib&?FGd
zW7jYIT6?jv9c&Dt4kU>1Y$DQ%Qjw5^wo=ljzbf@1Q`%BBtyoH+KwVGgyVtW^w(DJ2
z5GiVVrK`F3oH;Xh&Y3f3zPU<es7y6sf?_&B?Hi}mBTA|4Z0Eh{4yAs}ZR7Yx|FYYZ
zTJklezQsH|M0xo}JFYPE{QvrV&%pb~^oj2u)+c@zU)dJay3)x#anz#Y2Tl6^Kwxh=
z-m&&aE4<?(<@%?QpiZqp|NW`P{pg5AKiFr|_ja0eq*uR|igzr1t!07QR$H%5W6}S^
z117z_*U^8d+ob*NCcV1FS2Pw~i9D<?=IA!q?h*YZsqH^@O!picFoq9rH|dQIi}poW
zf2~OaoAqBL${+1LQaWpLYq_HjHam9f)Uq%@4JF=`^Di=w_87<aM=g4-nf2FM^vVX4
zcCIsr+t&oXEIi3*d%1QZvPdId@9Q>?%zyI&KQ+u5n|{bX(C&M9PrXG0VT*RHH>rQE
zNquWf>V8JAO{P0qp%1q$VtZ}fhHW?d{7+ziGuz%+Qjk{vTf59Z9qG~k;FkZ&28(vS
zWYLc2P1?Si^{+6gYq@b=cseTeXWJ`uYFlLR4gDkQUFP?J$JW0fKwFAurPY6Qhe-#!
zc<tM?R*^rj(SOg*7p$Sa@0j%RvyT34%S`HAq95+4G?qmx4Qj7&bhp{-Zd`3E)83Zx
zEv0Pxd>_@%ok^iNkEL9H$L~yfy~U!v4aTP;1GImQdA4UIY&U7!Qj<EKHfZZp21OUM
z?zn!Q_l5q4WL#@dTaUTlGOvJYAD=-XGqwIhU5?N1ZRB;Y!MgL@uMNx;dA%$3<+koB
zleV&c$M%uAFW3Jje4sq<pR|-}j_pt8Q%zA`TKxw)U_1Lf``zx%BkTTxNxjeMKXuFQ
zsxpVgcC3B-B0VDgh;g#t#rFCqW)9UA<((Fu(dhnm-g8ZCdoAy|jTZH<b9^3t*R{f+
zrX>YgGPbi)k8E449b|o9l{WVGBk(u)AZXKkzwLK5MbqMQD7?w&zE+F&G_dWPOy2X>
zCGmOq9s4}{oWbj^g%Zbxyx!ZyX6VH;Y;P*@T~6dp^={kF`yICP+JD&3@uqi`b*bkW
z_Bq?<<31PPe~~hOX=1#K1PyAL?~9*zA!~|vL*P+b>wA#1qtP$hcC0(co1N>d4~4UL
zrSWn1QggVYDz2Y>p659pZ}@q{Zp5GF`M$WGn%Q|DY%-@&wf|ARA5OXd5NmgDa@HMl
z-?K{FBH!?GmEVHTZ^eGco|AaPdZDu|$nh_z|62IN#ojw>=XfbpIGr}?k5RSn5vuk+
zkW&AiT5}lj4zafPIgU50INq!@E{IIfj!N^Yv)}m}>{tui`MFdp6F!c$FCyNAdCzTT
z+cyNJ(E5VOm)1?Y_Zz~KjJ{f9Ed6)=9BY<n1H!+xLYthZA8}s#TZ+Bejq?hwCetrG
zsc8F}sdpgOZfE=9cedX<>weWeE?Tbtvc256+`7P@FYP=B9gQVEYT#I3Cv&e&#kzM2
z&sgb>)#f|h9B<+GZolLGUYJY<@3~8MtY`i8bMq-Y+nM|7z(aQ@;~z^~?+Pu~+4D}U
zMXa}dKB#>x<2l~v$^MggSNDXM!iCd+B|JAv?O4lxFXxQp7ZP(o5$l^q&bivc+=Vx*
zGjV)Jh1M<SEcDxP7JF}G-`n}sld}l1Fmddydhaatj<?VF_`Y-YeruUV%_RkgZ<U^O
za-u<f&~1Oyf|>WF8*{7sqrrl2w*`I1t(N=0B#&IzMWXW;h#F%=p4g0GPb}w(XUG%t
z3}+5{F4lw_FN8B1V}qHV*rdBWvGLhivD+u*#4=BYVj1Dnv6I|aal0or<xWp5J3H&j
zU6XQn+ziSH6P?T;8q6e$Wf2YK5DkaoT2ZIqQihtux6~;rxTf*ne4TpJSbekhrNZ*S
z@Fxx#H{`<qiM~jg_6GL$Xk!E;10TQMd_B(@jbGZM71{*E=~m7aQppGY2L=}WyQeOF
z-J+Xw9d|rJEEc`V=)vCUcf0W|ux&CvwAtq!V_NrF11vil|C@b*WzzRron_}!l1KNf
zG~ScGt>xMS@f^;{*Z;{jd;~jy6@@R63PzOn-PP7<H#P(=j6S8k3v2{DDwq)bkdGVz
zxsi-dq=Er~|B!#9A5^g44Y-fxHy2I&B6#YH^S{pWuOSBj)<aveOE8|`yB*IPjo|C5
z3fu>5=f-vIWr1&s44k=w=YZv;J&_8Aa^ojpC*cEb;vDiNd6#v?yaO*a%$@mr=}Sfh
zBf0UBV59xT#hLCgZrOHjRGh!u-Jk4PFc9z$`hkDk*oX1vUiQhu&bnUDLqt}%Ft;99
zN8S^uV4VIJtvH5qV;eWF!JNQ`kWycOoZ2}vVxhuZ8_OihmG^;7)@9`If*(4U>80q~
zwm7iXt`z{cjN~sa%#h*E*MSv8ULqZ+_TS&X&blE#2PP1{=py4E$jc)^&GxI-vH}x1
zxjP?UKkLDJg?}{a&cBg=GRFUNA}`NPJm*Hfy~&t*Jdr2Wd(ZORFKy#mg1uKqYA9SY
z*}^!k4|DI%X;aBb*9W{9&s|wAWZUw2uQqVbT348NPdXXt`nmpgQr6X$&ue_EbJA$3
zZ<>62TiMuaqUpZ<^WM)1lfr$T{;tl^Idz5_)gXCPY_muGCEKI^r~>MY;<g&Tmt?8I
z@j2>uYN<NQ?SnNQHCX9US8{XIkP0cnUBmKDIWi#^c^G~VP2gMdu+I*~u#%g+@SotV
zUB++HiQ)5OI^tI%A94(wbEvN;_Q|_o+GOLwb1)iMi~2Nb)7w}3^JE+-&RxlK5cl1E
zcs|<a=-m@G7NWL{`d&v>U>^FMTC%-A&#|w6)XcSGw7V~SJ8HCYKI3e*&rXh0z{qkY
z^Z0A1y}HNZ8Ffz7IBngloLsT<Y2y>bXY@zPwH2`2KFeoMZ$O*-!WoDfA@Um322mrB
zevV&pOpLZrV5*%%NIxjfAk^6K+_PNoM14bQ3(zZbj`Ie!Gw``DoH3|Tp*|(;c5MJT
zLP@^;{|q%C)Spm$5*|0@diGyYU$J$U1#YO3I5|?jUAuCRNqk29#@PVfBQ>}_d^_q8
z;iBB{Ci0K=jyzCm3c&KC@ug~ya^BA8#!xDro9*LJ!Es2bpIuby^jW3OoKouNbxOVW
i6{X&trPMq8*W$<g{J})-<7#&-OR1q5N)3mcasL7tYlxZv

literal 4286
zcmcJTdr*|u8OGm?f3Tad7j|KHxq~xpVq;A@HfgF7QY~O)Go9%q6O&2POq*#slbPnf
zwzf$$rcG^ZYDE+@N@~3q7I49+L1DRyKt#F7{U!nn%U;+^j39aYobU7VmKqZ!%ltTJ
zSayHU`<%1G3`F<gD=CS@cRHviG7-^306(IqfcUxez;ko)aP73vWS*HOKQcc(`EOGi
zR&wu;oQt=<<9oRBOyt@H_b#&<l)`QE<Qu}=2O`OR$au%s-|H`o@34@VA7p~hTzTdI
zW>1^k7e(&;Z`VJu(?k;=T7X%N)jqMq!dMyZeDC3iF!z6r<gpp<b;R4g-kBRs<J-Xw
zOD5J3V1a9o$?vfl(>w+67kxV&jDKh*=XMMH7BzC%0ZZgW^F*GR;m`LJ8Nxh;MnV_2
zo#Aeu7~L8}V>!_RD+rBki)NV^cA^7!L1e&FY)JDI!(TGDXW-mnR@`bh?a0EnGI=P9
zy>>$Z2m|CjGIt$Z+!8}0*)asCbu>FBggr}a!3yv^PwX`@<_>sE4e5ZqN9V>rmTRUF
zbU(T+S`C+7@m<V{Wrg9*u{^fR!tk>92s-#UA`Fo4_`PSqdlNi_8Le1D!YO<=@vm4O
z$%$c4iIKfW(ZR8ZbU?mO?%glC2lvBQG7OL4g2E>3CE|D(x!lD@#>|2OxWk0scT#t^
zS6+JEa8?X~2srB%*M&`SJoL{S_(0yf@}t;S27g&Z0Hpg)z+Z89e{|ZcvsAWtlnyU!
zrooK~1ov;@oE;J_FsSek>;)U+*tyTdzLW6F6!^;ZVSuI_-@Jq7m6vJu4@{*G56tUW
zpGZTSVx!<}kX-N$2;dyp7%$QPemsxlS=d(&zn~%_Fjb*XpK`!o{mnXPeP))<t(vBW
z6+z8`gw{8<hF9sEf473*{tbMyk`q4Rl=wT=4e>mj8zZ^l<f%#t+f<ca1;}5k{o41S
zIdhtt(mtaz8JDbkVw*i#>Wb$NF4{~3AH+q%ce-ErK%W3!iN7WAAnu?S-NPqStq)-K
z^r;$jQ1|uDpfTeToz0w~uIE_Ym=?0<MKv(|Cv$bR+NRgj2>w^$yVAEIfqUV+#(N3e
zk2~QhGcbJDsny&3bvhLwfBl_1IF%8kGpjCBvvt~9zrr8d9#JR!m$M(Jd}05>Eb4nd
zJ`&DTz3>To1b>z3MIY{C28N5L>h#j;Kcx$R41YcR4PV_s^-rhhbVi8kGeYX7r!U!S
zQoWp`s}X+Qa=*iY4)hJLtt9w=1?Lsv?f#1(Q9@*K9WgR|GWA#mr*$@egH|Q{flqJW
zfn&Lc>e2!ND{_P?Q{22wTP^vKVHzF$V&C_+Q16C#BfNFp?<R7W!g_f>VUHBP>oj2B
zhz=UjK_mQU{=dKMNf%Wv_mX3|SB)O*b?E`FSmwIXFFL5s)z(Cu`t>S;|CO%wi8Gz>
zcD{3+@uDaWG)hk4Wq*?l=C;AD68_*>&6hq4$5NbB{u8&riVPuS;Bxqt{>2%98FcW<
z-UZpz{a%6r-kQ#JN!+2ZHi^e<CWcG)eyWr9aB`qo8vq%A0xdUpP`YG<jz2k0$5O`C
zWvMPZGH~SzFPEpdSh{~I$*tUjx*TndvG$kG5d1H9tWBCZ5AXT6Wk&PiZ-!4eWiJQL
zVlOzSEey11RDgo*;nzASe&PasylhNhMTQVEu*guJI?20C4ZK-ZuG|5!UO@-1?s+hq
zI^Ru<fVZmstt6IsGnpm7aET1EQ+OFObD$L+v}#sjrQmt_4Dufvpu;~N7N|>>j@Xfb
z(FH3R_9nI5>KFImbdI(<s`{m$5&SQ;znMJU26x+^Wq(k(6sPRvK%16>Z5j@?YYO33
z34gFFoDTl5j|!g{5?GNTRI+4*l?*4In&hHK`i1Yt`Ne(~9lZ9R?`G5acM|n*SGN8s
znFXUbf8oK55?7tV%W!hALlXom0foB5=@9%tUGVsTz3@jvj0}t(u4OpB%*i{yd<G&@
z(>6`D*|GZP1pkYzYvxb4teMYa#Zj_Lo>g|rUJiD`FX%!C-Qg-g2Nw4TGLa#a|M&na
z8A`8a_#|~g>R_v;>eddvKnJhy{!TWvy`7|kyQ1Zf^VxYMQp~8#D(_{d@N%#l^n?dP
zJ>eOEc0bbbz}_Ep9p1mVhmnEN1LG{D9z=$tSMNjqf-V*rZoG@=pcx%l%Ab3d&aIih
z8eE<zGjd3HuFonv;f0Swy;tcAw}tw{)gLWtU%mU$jvzAdZ8N0Ece41=e(Ccd-3R$I
z`33fG>{+mp&i+1G+xk}WiODJh<6N)JDmfKzAKZd|2|w0ncYeRMI&V=sBLj;JI14`X
znA}4Vday6K$fZk1`Dluh#aSF*>g2+Oy}Ud24Cm@=8E1fdP!-j*CXKqY;$HSP>1S?o
zig|DLDt@t+^XG}oKAp^97_-1JPiEbH%mN~Xwb-w{LX;}_oG4M?Bhm>5iNXX9qIrUK
L_}7DgzT)vecywrn

diff --git a/src/api/school/sch/index.js b/src/api/school/sch/index.js
index 6f82a9e..05e21b7 100644
--- a/src/api/school/sch/index.js
+++ b/src/api/school/sch/index.js
@@ -24,10 +24,10 @@ export const deleteSchool = async (id) => {
   return await request.delete({ url: '/admin-api/crm/sch-school/delete?id=' + id })
 }
 
-export const updateSchoolStatus = async (id, status) => {
+export const updateSchoolStatus = async (schoolId, status) => {
   const data = {
-    id,
+    schoolId,
     status
   }
-  return request.put({ url: '/admin-api/crm/sch-school/update-status', data: data })
+  return request.put({ url: '/admin-api/crm/sch-school/status/update', data: data })
 }
diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue
index 9eae359..69fca4e 100644
--- a/src/views/Clue/Pool/Comp/DialogClue.vue
+++ b/src/views/Clue/Pool/Comp/DialogClue.vue
@@ -7,7 +7,7 @@
       <el-tab-pane label="跟进信息" name="follow">
         <el-button type="primary" @click="handleAppendFollow">新增跟进人</el-button>
         <el-table :data="followList">
-          <el-table-column label="跟进人">
+          <el-table-column label="跟进人" width="180px">
             <template #default="{ row }">
               <el-select
                 v-model="row.userId"
@@ -24,13 +24,23 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column prop="nextFollowTime" label="下次跟进时间">
+          <el-table-column prop="nextFollowTime" label="下次跟进时间" width="180px">
             <template #default="{ row }">
               <el-date-picker
                 v-model="row.nextFollowTime"
                 type="date"
                 placeholder="选择日期时间"
                 :disabled="!row.editable"
+                style="width: 100%"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="content" label="跟进内容">
+            <template #default="{ row }">
+              <el-input
+                v-model="row.content"
+                placeholder="输入跟进内容"
+                :disabled="!row.editable"
               />
             </template>
           </el-table-column>
@@ -304,6 +314,7 @@ async function handleSave() {
 function handleAppendFollow() {
   followList.value.push({
     userId: undefined,
+    content: undefined,
     nextFollowTime: formatDate(new Date()),
     editable: true
   })
diff --git a/src/views/SchoolManagement/School/index.vue b/src/views/SchoolManagement/School/index.vue
index bbf4b34..5c65cf5 100644
--- a/src/views/SchoolManagement/School/index.vue
+++ b/src/views/SchoolManagement/School/index.vue
@@ -140,7 +140,8 @@ async function changeStatus(row) {
     const text = row.status === CommonStatusEnum.ENABLE ? '启用' : '停用'
     await message.confirm('确认要"' + text + '""' + row.schoolName + '"驾校吗?')
     // 发起修改状态
-    await api.updateSchoolStatus(row.id, row.status)
+    await api.updateSchoolStatus(row.schoolId, row.status)
+    message.success('修改成功')
     // 刷新列表
     await getList()
   } catch {

From cb44360b8a2e1d4003b4406089b318be75e7ff0c Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 1 Jul 2024 15:15:19 +0800
Subject: [PATCH 16/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Clue/Pool/index.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/Clue/Pool/index.vue b/src/views/Clue/Pool/index.vue
index c54d918..cd83f1d 100644
--- a/src/views/Clue/Pool/index.vue
+++ b/src/views/Clue/Pool/index.vue
@@ -83,7 +83,12 @@
             <span>{{ formatDate(row[item.field]) }}</span>
           </div>
           <div v-else-if="item.field == 'remark' || item.form?.component == 'Editor'">
-            <p v-dompurify-html="row.remark"></p>
+            <el-popover placement="top" width="500px" trigger="click" v-if="row[item.field]">
+              <template #reference>
+                <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+              </template>
+              <div v-dompurify-html="row[item.field]"></div>
+            </el-popover>
           </div>
           <span v-else>{{ row[item.field] }}</span>
         </template>

From ac83a22ca634fd79c306a1638e12405789e2273b Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 1 Jul 2024 17:29:48 +0800
Subject: [PATCH 17/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Basic/User/UserForm.vue | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/views/Basic/User/UserForm.vue b/src/views/Basic/User/UserForm.vue
index 3130993..a745737 100644
--- a/src/views/Basic/User/UserForm.vue
+++ b/src/views/Basic/User/UserForm.vue
@@ -152,14 +152,7 @@ const formRules = ref<any>({
       trigger: ['blur', 'change']
     }
   ],
-  mobile: [
-    { required: true, message: '手机号不能为空', trigger: 'blur' },
-    {
-      pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
-      message: '请输入正确的手机号码',
-      trigger: 'blur'
-    }
-  ]
+  mobile: [{ required: true, message: '手机号不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 const deptList = ref<Tree[]>([]) // 树形结构

From 2e30a103fde6da02c06f4c46f8e325a5c30ccd8b Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 1 Jul 2024 18:01:21 +0800
Subject: [PATCH 18/25] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Clue/Pool/Comp/DialogClue.vue | 2 +-
 src/views/Clue/Pool/Comp/DrawerClue.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue
index 69fca4e..35afdf6 100644
--- a/src/views/Clue/Pool/Comp/DialogClue.vue
+++ b/src/views/Clue/Pool/Comp/DialogClue.vue
@@ -262,7 +262,7 @@ function resetForm() {
 const placeList = ref([])
 async function getSchoolPlace() {
   const data = await getPlaceList()
-  placeList.value = data.placeList
+  placeList.value = data.placeList.filter((it) => it.status == 0 && it.schoolStatus == 0)
 }
 
 const emit = defineEmits(['success'])
diff --git a/src/views/Clue/Pool/Comp/DrawerClue.vue b/src/views/Clue/Pool/Comp/DrawerClue.vue
index 4eff57c..cd75d81 100644
--- a/src/views/Clue/Pool/Comp/DrawerClue.vue
+++ b/src/views/Clue/Pool/Comp/DrawerClue.vue
@@ -268,7 +268,7 @@ function followSuccess() {
 const placeList = ref([])
 async function getSchoolPlace() {
   const data = await getPlaceList()
-  placeList.value = data.placeList
+  placeList.value = data.placeList.filter((it) => it.status == 0 && it.schoolStatus == 0)
 }
 
 const defaultLatLng = ref({

From 7e049dfd08a02a4990b4056fd7fbb5058fc23cb3 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 1 Jul 2024 18:14:48 +0800
Subject: [PATCH 19/25] bug

---
 src/views/Clue/Pool/Comp/DialogClue.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue
index 35afdf6..a52c15a 100644
--- a/src/views/Clue/Pool/Comp/DialogClue.vue
+++ b/src/views/Clue/Pool/Comp/DialogClue.vue
@@ -272,6 +272,10 @@ async function handleSave() {
   if (!formRef.value) return
   const valid = await formRef.value.getElFormRef().validate()
   if (!valid) return
+  if (!followList.value && followList.value.length == 0) {
+    message.info('请添加跟进人')
+    return
+  }
   if (followList.value && followList.value.length && followList.value.some((it) => !it.userId)) {
     message.info('请将跟进人填写完整！')
     return

From c2eac572c0c53f3a22e2356eb4a9ca074fe5654a Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 2 Jul 2024 10:35:32 +0800
Subject: [PATCH 20/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Message/src/Message.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/layout/components/Message/src/Message.vue b/src/layout/components/Message/src/Message.vue
index 348c47c..f51751f 100644
--- a/src/layout/components/Message/src/Message.vue
+++ b/src/layout/components/Message/src/Message.vue
@@ -34,9 +34,9 @@ onMounted(() => {
   // 首次加载小红点
   getUnreadCount()
   // 轮询刷新小红点
-  msgInterval.value = setInterval(() => {
-    getUnreadCount()
-  }, 1000 * 60 * 2)
+  // msgInterval.value = setInterval(() => {
+  //   getUnreadCount()
+  // }, 1000 * 60 * 2)
 })
 
 onUnmounted(() => {

From a4c5143ee5c7b2058b298f0af6c7427953f3a863 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 2 Jul 2024 15:03:33 +0800
Subject: [PATCH 21/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Clue/Pool/Comp/DialogClue.vue    |  7 +++++++
 src/views/SchoolManagement/Class/index.vue | 10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue
index a52c15a..127f7aa 100644
--- a/src/views/Clue/Pool/Comp/DialogClue.vue
+++ b/src/views/Clue/Pool/Comp/DialogClue.vue
@@ -31,6 +31,8 @@
                 type="date"
                 placeholder="选择日期时间"
                 :disabled="!row.editable"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 style="width: 100%"
               />
             </template>
@@ -521,6 +523,10 @@ function remoteMethod(searchValue) {
 function currentSelect(val) {
   const area = areaList.value.find((it) => it.name == val)
   if (area) {
+    defaultLatLng.value = {
+      lng: area.location?.lng,
+      lat: area.location?.lat
+    }
     addmark(area.location?.lng, area.location?.lat, aMap.value)
     dialogMap.value.setCenter([area.location?.lng, area.location?.lat], '', 500)
     regeoCode(area.location?.lng, area.location?.lat)
@@ -528,6 +534,7 @@ function currentSelect(val) {
 }
 
 function destroyMap() {
+  areaValue.value = undefined
   dialogMap.value = null
   aMap.value = null
 }
diff --git a/src/views/SchoolManagement/Class/index.vue b/src/views/SchoolManagement/Class/index.vue
index 8ba53ac..12e18f7 100644
--- a/src/views/SchoolManagement/Class/index.vue
+++ b/src/views/SchoolManagement/Class/index.vue
@@ -269,11 +269,17 @@ async function handleChangeStatus(row) {
     // 删除的二次确认
     await message.confirm('是否确认修改状态')
     // 发起删除
-    await ClassApi.updateClassTypeStatus(row.typeId, row.status)
+    await ClassApi.updateClassTypeStatus({
+      typeId: row.typeId,
+      status: row.status
+    })
     message.success('修改成功')
     // 刷新列表
     await getList()
-  } catch {}
+  } catch {
+    // 取消后，进行恢复按钮
+    row.status = row.status === 1 ? 0 : 1
+  }
 }
 
 const batchStatusDialogShow = ref(false)

From 87a2fe09dec1468dcf1eab264b9a252b1d9fba6d Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Wed, 3 Jul 2024 15:11:43 +0800
Subject: [PATCH 22/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UploadFile/src/UploadFile.vue |  3 ++-
 src/views/Basic/Library/index.vue            | 12 +++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 66dd51d..a8442d5 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -44,7 +44,8 @@ const props = defineProps({
   modelValue: propTypes.oneOfType<string | string[]>([String, Array<String>]).isRequired,
   title: propTypes.string.def('文件上传'),
   updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
-  fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
+  // fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
+  fileType: propTypes.array.def([]),
   accept: propTypes.string.def('*'),
   fileSize: propTypes.number.def(5), // 大小限制(MB)
   limit: propTypes.number.def(5), // 数量限制
diff --git a/src/views/Basic/Library/index.vue b/src/views/Basic/Library/index.vue
index 608ba01..68352fa 100644
--- a/src/views/Basic/Library/index.vue
+++ b/src/views/Basic/Library/index.vue
@@ -65,7 +65,7 @@
           </el-table-column>
           <el-table-column prop="files" label="附件">
             <template #default="{ row }">
-              <el-link type="primary" underline :href="row.fileUrl" target="_blank">
+              <el-link type="primary" underline target="_blank" @click="handleDownload(row.files)">
                 {{ row.files }}
               </el-link>
             </template>
@@ -195,6 +195,16 @@ function handleClickLib(index) {
   getResourceList()
 }
 
+function handleDownload(href) {
+  if (href) {
+    let a = document.createElement('a')
+    a.download = href //指定下载的文件名
+    a.href = href //  URL对象
+    a.click() // 模拟点击
+    URL.revokeObjectURL(a.href) // 释放URL 对象
+  }
+}
+
 function openResource(type, id) {
   resourceDialog.value.open(type, libraryList.value[libraryIndex.value], id)
 }

From e1ff8213bfc4c56c5e6ef64698e14b14f12cf3d5 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Thu, 4 Jul 2024 18:58:18 +0800
Subject: [PATCH 23/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Search/src/Search.vue          |   5 +
 src/views/Clue/Order/Comp/OrderList.vue       |   2 +-
 src/views/Clue/Pool/Comp/DialogClue.vue       | 139 +++++++++++-------
 src/views/Clue/Pool/Comp/DialogSuccess.vue    |   2 +-
 src/views/Clue/Pool/Comp/DrawerClue.vue       |   9 +-
 src/views/Clue/Pool/index.vue                 |   4 +-
 .../Class/Comp/DialogClass.vue                |   2 +-
 src/views/SchoolManagement/Class/index.vue    |  10 +-
 src/views/SchoolManagement/Place/index.vue    |  10 +-
 9 files changed, 113 insertions(+), 70 deletions(-)

diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue
index c60109b..084982e 100644
--- a/src/components/Search/src/Search.vue
+++ b/src/components/Search/src/Search.vue
@@ -59,6 +59,11 @@ const usedSchema = ref([])
 
 const newSchema = computed(() => {
   let schema: FormSchema[] = cloneDeep(usedSchema.value)
+  schema.forEach((item: FormSchema) => {
+    if (item.component == 'TreeSelect') {
+      item.componentProps['check-strictly'] = true
+    }
+  })
   if (props.expand && props.expandField && !unref(visible)) {
     const index = findIndex(schema, (v: FormSchema) => v.field === props.expandField)
     if (index > -1) {
diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue
index 8059b49..5439d22 100644
--- a/src/views/Clue/Order/Comp/OrderList.vue
+++ b/src/views/Clue/Order/Comp/OrderList.vue
@@ -322,7 +322,7 @@ async function getClassTypeOptions() {
 
 function getOptions() {
   // 驾校
-  getPlaceList().then((data) => {
+  getPlaceList({ placeStatus: 0, schoolStatus: 0, isSearchSchool: true }).then((data) => {
     schoolOptions.value = data.schoolList
     allPlaceOptions.value = data.placeList
   })
diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue
index 127f7aa..d516729 100644
--- a/src/views/Clue/Pool/Comp/DialogClue.vue
+++ b/src/views/Clue/Pool/Comp/DialogClue.vue
@@ -1,6 +1,6 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px" @close="destroyMap">
-    <el-tabs v-model="tabName">
+    <el-tabs v-model="tabName" @tab-change="changeTab">
       <el-tab-pane label="线索信息" name="info">
         <Form ref="formRef" v-loading="formLoading" :rules="rules" isCol :schema="formSchema" />
       </el-tab-pane>
@@ -41,6 +41,8 @@
             <template #default="{ row }">
               <el-input
                 v-model="row.content"
+                type="textarea"
+                :autoSize="{ minRows: 2 }"
                 placeholder="输入跟进内容"
                 :disabled="!row.editable"
               />
@@ -60,18 +62,15 @@
       </el-tab-pane>
       <el-tab-pane v-if="appStore.getAppInfo?.instanceType == 1" label="位置信息" name="map">
         <div class="flex justify-between items-center">
-          <el-select
+          <el-autocomplete
             v-model="areaValue"
-            filterable
             clearable
-            remote
             style="width: 250px"
-            reserve-keyword
             placeholder="输入并搜索位置"
-            :remote-method="remoteMethod"
-            @change="currentSelect"
+            :fetch-suggestions="remoteMethod"
+            @select="currentSelect"
           >
-            <el-option
+            <!-- <el-option
               v-for="item in areaList"
               :key="item.id"
               :label="item.name"
@@ -80,8 +79,8 @@
             >
               <span style="float: left">{{ item.name }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px">{{ item.district }}</span>
-            </el-option>
-          </el-select>
+            </el-option> -->
+          </el-autocomplete>
           <div class="flex-1 flex items-center ml-10px mr-10px">
             <div class="w-100px">线索位置：</div>
             <el-input v-model="address" disabled placeholder="请输入线索位置" clearable />
@@ -119,18 +118,17 @@
         </el-collapse>
       </el-tab-pane>
     </el-tabs>
+    <div style="position: absolute; top: 75px; right: 20px">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="handleSave">保 存</el-button>
+    </div>
     <DialogSchoolInfo ref="schoolInfoDialog" />
-    <template #footer>
-      <span>
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button :disabled="formLoading" type="primary" @click="handleSave">保 存</el-button>
-      </span>
-    </template>
   </Dialog>
 </template>
 
 <script setup name="DialogClue">
 import { useAppStore } from '@/store/modules/app'
+import { useUserStore } from '@/store/modules/user'
 import { getPlaceList } from '@/api/school/place'
 import * as ClueApi from '@/api/clue'
 import { getDiyFieldList } from '@/api/clue/clueField'
@@ -139,7 +137,7 @@ import AMapLoader from '@amap/amap-jsapi-loader'
 
 import DialogSchoolInfo from './DialogSchoolInfo.vue'
 
-import ImgPostion from '@/assets/imgs/flag/position_blue.png'
+import ImgPostion from '@/assets/imgs/flag/position_black.png'
 import FlagRed from '@/assets/imgs/flag/flag_red.png'
 import FlagYellow from '@/assets/imgs/flag/flag_yellow.png'
 import FlagPurple from '@/assets/imgs/flag/flag_purple.png'
@@ -148,7 +146,6 @@ import FlagBlue from '@/assets/imgs/flag/flag_blue.png'
 import FlagBlack from '@/assets/imgs/flag/flag_black.png'
 
 const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
 const appStore = useAppStore()
 
 const props = defineProps({
@@ -161,8 +158,14 @@ const props = defineProps({
 })
 
 const formSchema = computed(() => {
+  const newSchema = [...props.schema]
+  newSchema.forEach((it) => {
+    if (it.field == 'consultTime') {
+      it.componentProps['disabled-date'] = dateAfterToday
+    }
+  })
   return [
-    ...props.schema,
+    ...newSchema,
     {
       component: 'Input',
       label: '诉求',
@@ -185,6 +188,10 @@ const formSchema = computed(() => {
   ]
 })
 
+const dateAfterToday = (t) => {
+  return t.getTime() > Date.now()
+}
+
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@@ -204,7 +211,6 @@ const tabName = ref('info')
 const followList = ref([])
 
 const areaValue = ref('')
-const areaList = ref([])
 const address = ref('')
 const defaultLatLng = ref({
   lat: 31.86119,
@@ -235,36 +241,54 @@ const open = async (type, id) => {
       formLoading.value = false
     }
   } else {
-    followList.value = []
+    followList.value = [
+      {
+        userId: useUserStore().getUser.id,
+        content: undefined,
+        nextFollowTime: formatDate(new Date()),
+        editable: true
+      }
+    ]
     address.value = ''
     defaultLatLng.value = {
       lat: 31.86119,
       lng: 117.283042
     }
-  }
-  if (appStore.getAppInfo?.instanceType == 1 && !dialogMap.value) {
-    nextTick(async () => {
-      await getSchoolPlace()
-      initMap(info.value)
-      remoteMethod(address.value)
+    nextTick(() => {
+      formRef.value.setValues(info.value)
     })
   }
 }
 
+function changeTab() {
+  if (tabName.value == 'map') {
+    if (!dialogMap.value) {
+      nextTick(async () => {
+        await getSchoolPlace()
+        initMap(info.value)
+        // remoteMethod(address.value)
+      })
+    }
+  } else {
+    destroyMap()
+  }
+}
+
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 function resetForm() {
   info.value.address = undefined
   info.value.lat = undefined
   info.value.lng = undefined
+  info.value.consultTime = formatDate(new Date())
   info.value.followUsers = []
   info.value.diyParams = {}
 }
 
 const placeList = ref([])
 async function getSchoolPlace() {
-  const data = await getPlaceList()
-  placeList.value = data.placeList.filter((it) => it.status == 0 && it.schoolStatus == 0)
+  const data = await getPlaceList({ placeStatus: 0 })
+  placeList.value = data.placeList
 }
 
 const emit = defineEmits(['success'])
@@ -274,7 +298,7 @@ async function handleSave() {
   if (!formRef.value) return
   const valid = await formRef.value.getElFormRef().validate()
   if (!valid) return
-  if (!followList.value && followList.value.length == 0) {
+  if (!followList.value || followList.value.length == 0) {
     message.info('请添加跟进人')
     return
   }
@@ -303,11 +327,11 @@ async function handleSave() {
       }
     }
     if (formType.value === 'create') {
-      await ClueApi.createClue(params)
-      message.success(t('common.createSuccess'))
+      const data = await ClueApi.createClue(params)
+      message.success(data)
     } else {
-      await ClueApi.updateClue(params)
-      message.success(t('common.updateSuccess'))
+      const data = await ClueApi.updateClue(params)
+      message.success(data)
     }
     dialogVisible.value = false
     // 发送操作成功的事件
@@ -353,11 +377,9 @@ function initMap(data) {
       zooms: [2, 22],
       center: [defaultLatLng.value.lng, defaultLatLng.value.lat]
     })
-    if (data.lng || data.lat) {
-      addmark(data.lng, data.lat, AMap)
-    }
+    addmark(defaultLatLng.value.lng, defaultLatLng.value.lat, AMap)
     AutoComplete.value = new AMap.AutoComplete({
-      city: '全国'
+      city: '合肥'
     })
     geoCoder.value = new AMap.Geocoder()
     dialogMap.value.on('click', (e) => {
@@ -459,7 +481,8 @@ function addmark(lat, lng, AMap) {
   marker.value = new AMap.Marker({
     position: new AMap.LngLat(lat, lng),
     zoom: 13,
-    icon: ImgPostion
+    icon: ImgPostion,
+    offset: [-16, -32]
   })
   dialogMap.value.add(marker.value)
   dialogMap.value.setCenter([lat, lng], '', 500)
@@ -508,28 +531,34 @@ function showSchoolInfo(val) {
   schoolInfoDialog.value.open(val)
 }
 
-function remoteMethod(searchValue) {
-  if (searchValue !== '') {
-    setTimeout(() => {
-      AutoComplete.value?.search(searchValue, (status, result) => {
-        if (result.tips?.length) {
-          areaList.value = result?.tips
-        }
-      })
-    }, 200)
+function remoteMethod(searchValue, cb) {
+  if (searchValue) {
+    AutoComplete.value?.search(searchValue, (status, result) => {
+      if (result.tips?.length) {
+        // areaList.value = result?.tips
+        const list = result.tips.map((it) => ({
+          ...it,
+          value: it.name
+        }))
+        cb(list)
+      } else {
+        cb([])
+      }
+    })
+  } else {
+    cb([])
   }
 }
 
 function currentSelect(val) {
-  const area = areaList.value.find((it) => it.name == val)
-  if (area) {
+  if (val) {
     defaultLatLng.value = {
-      lng: area.location?.lng,
-      lat: area.location?.lat
+      lng: val.location?.lng,
+      lat: val.location?.lat
     }
-    addmark(area.location?.lng, area.location?.lat, aMap.value)
-    dialogMap.value.setCenter([area.location?.lng, area.location?.lat], '', 500)
-    regeoCode(area.location?.lng, area.location?.lat)
+    addmark(val.location?.lng, val.location?.lat, aMap.value)
+    dialogMap.value.setCenter([val.location?.lng, val.location?.lat], '', 500)
+    regeoCode(val.location?.lng, val.location?.lat)
   }
 }
 
diff --git a/src/views/Clue/Pool/Comp/DialogSuccess.vue b/src/views/Clue/Pool/Comp/DialogSuccess.vue
index 2954fb1..2734060 100644
--- a/src/views/Clue/Pool/Comp/DialogSuccess.vue
+++ b/src/views/Clue/Pool/Comp/DialogSuccess.vue
@@ -445,7 +445,7 @@ async function getClassTypeOptions() {
 function getOptions() {
   if (appStore.getAppInfo?.instanceType == 1) {
     // 驾校
-    getPlaceList().then((data) => {
+    getPlaceList({ placeStatus: 0, schoolStatus: 0, isSearchSchool: true }).then((data) => {
       schoolOptions.value = data.schoolList
       allPlaceOptions.value = data.placeList
     })
diff --git a/src/views/Clue/Pool/Comp/DrawerClue.vue b/src/views/Clue/Pool/Comp/DrawerClue.vue
index cd75d81..3e153aa 100644
--- a/src/views/Clue/Pool/Comp/DrawerClue.vue
+++ b/src/views/Clue/Pool/Comp/DrawerClue.vue
@@ -156,7 +156,7 @@ import DialogSchoolInfo from './DialogSchoolInfo.vue'
 import AMapLoader from '@amap/amap-jsapi-loader'
 import { formatDate, dateFormatter } from '@/utils/formatTime'
 
-import ImgPostion from '@/assets/imgs/flag/position_blue.png'
+import ImgPostion from '@/assets/imgs/flag/position_black.png'
 import FlagRed from '@/assets/imgs/flag/flag_red.png'
 import FlagYellow from '@/assets/imgs/flag/flag_yellow.png'
 import FlagPurple from '@/assets/imgs/flag/flag_purple.png'
@@ -267,8 +267,8 @@ function followSuccess() {
 
 const placeList = ref([])
 async function getSchoolPlace() {
-  const data = await getPlaceList()
-  placeList.value = data.placeList.filter((it) => it.status == 0 && it.schoolStatus == 0)
+  const data = await getPlaceList({ placeStatus: 0 })
+  placeList.value = data.placeList
 }
 
 const defaultLatLng = ref({
@@ -339,7 +339,8 @@ function addmark(lat, lng, AMap) {
   marker.value = new AMap.Marker({
     position: new AMap.LngLat(lat, lng),
     zoom: 13,
-    icon: ImgPostion
+    icon: ImgPostion,
+    offset: [-16, -32]
   })
   dialogMap.value.add(marker.value)
   dialogMap.value.setCenter([lat, lng], '', 500)
diff --git a/src/views/Clue/Pool/index.vue b/src/views/Clue/Pool/index.vue
index cd83f1d..8149f8e 100644
--- a/src/views/Clue/Pool/index.vue
+++ b/src/views/Clue/Pool/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="relative">
-      <el-tabs v-model="queryType" size="small" @tab-change="getTableList">
+      <el-tabs v-model="queryType" size="small" @tab-change="resetQuery">
         <el-tab-pane label="全部" name="0" />
         <el-tab-pane name="1">
           <template #label>
@@ -149,7 +149,7 @@
       ref="formRef"
       :userOptions="userOptions"
       :schema="allSchemas.formSchema"
-      @sucess="getTableList"
+      @success="getTableList"
     />
     <DrawerClue
       v-if="!loading"
diff --git a/src/views/SchoolManagement/Class/Comp/DialogClass.vue b/src/views/SchoolManagement/Class/Comp/DialogClass.vue
index 4059f54..4cebace 100644
--- a/src/views/SchoolManagement/Class/Comp/DialogClass.vue
+++ b/src/views/SchoolManagement/Class/Comp/DialogClass.vue
@@ -16,7 +16,7 @@
                   :options="props.schoolOption"
                   v-model="formData.schPlace"
                   filterable
-                  :props="{ value: 'id' }"
+                  :props="{ value: 'value' }"
                   show-all-levels
                   style="width: 100%"
                 />
diff --git a/src/views/SchoolManagement/Class/index.vue b/src/views/SchoolManagement/Class/index.vue
index 12e18f7..0edfe16 100644
--- a/src/views/SchoolManagement/Class/index.vue
+++ b/src/views/SchoolManagement/Class/index.vue
@@ -51,7 +51,7 @@
         >
         <el-button
           type="danger"
-          @click="handleBatchDelete"
+          @click="handleBatchDelete([])"
           v-hasPermi="['school:class:batch-delete']"
           >批量删除</el-button
         >
@@ -175,7 +175,11 @@ const schoolOption = ref([])
 
 async function getSchoolList() {
   try {
-    const data = await PlaceApi.getPlaceList()
+    const data = await PlaceApi.getPlaceList({
+      placeStatus: 0,
+      schoolStatus: 0,
+      isSearchSchool: true
+    })
     schoolOption.value = data.schoolList.map((item) => ({
       value: item.schoolId,
       label: item.schoolName,
@@ -240,7 +244,7 @@ function handleReset() {
 }
 
 async function handleBatchDelete(arr = []) {
-  if (!arr.length || !selectRows.value.length) {
+  if (!arr.length && !selectRows.value.length) {
     message.info('请选择表格行！')
     return
   }
diff --git a/src/views/SchoolManagement/Place/index.vue b/src/views/SchoolManagement/Place/index.vue
index ba21c03..febc57c 100644
--- a/src/views/SchoolManagement/Place/index.vue
+++ b/src/views/SchoolManagement/Place/index.vue
@@ -325,7 +325,10 @@ function regeoCode() {
 async function getPageData() {
   schoolList.value = []
   tableData.value = []
-  const data = await PlaceApi.getPlaceList()
+  const data = await PlaceApi.getPlaceList({
+    schoolStatus: 0,
+    isSearchSchool: true
+  })
   if (data.schoolList) {
     schoolList.value = data.schoolList.map((item) => ({ ...item, showInMap: true }))
   }
@@ -363,7 +366,7 @@ function handleClickSchool(item) {
 function createMarkersInMap() {
   for (let i = 0; i < tableData.value.length; i++) {
     const element = tableData.value[i]
-    if (!element.schoolShow || !element.showInMap) {
+    if (!element.schoolShow || !element.showInMap || element.status == 1) {
       continue
     }
     const markerIcon = flagMap[element.flagColor || 'red']
@@ -542,7 +545,8 @@ async function changePlaceStatus(row) {
     await PlaceApi.updatePlaceStatus(row.placeId, row.status)
     message.success('修改成功')
     // 刷新列表
-    // await getList()
+    // await getPageData()
+    tableData.value.find((item) => item.placeId == row.placeId).status = row.status
     resetMarkers()
   } catch {
     // 取消后，进行恢复按钮

From ab0c7701678e6df98925ca15da749b42738f9fa4 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 5 Jul 2024 15:18:51 +0800
Subject: [PATCH 24/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Clue/Order/Comp/DialogOrder.vue   |   8 +-
 src/views/Clue/Order/Comp/MallOrderList.vue |   7 +-
 src/views/Clue/Pool/Comp/ClueMap.vue        | 269 ++++++++++++++++++++
 src/views/Clue/Pool/Comp/DialogClue.vue     |   3 +-
 src/views/Clue/Pool/index.vue               | 227 +++++++++--------
 src/views/Home/Index.vue                    |   2 +-
 6 files changed, 407 insertions(+), 109 deletions(-)
 create mode 100644 src/views/Clue/Pool/Comp/ClueMap.vue

diff --git a/src/views/Clue/Order/Comp/DialogOrder.vue b/src/views/Clue/Order/Comp/DialogOrder.vue
index bc8d260..2244a25 100644
--- a/src/views/Clue/Order/Comp/DialogOrder.vue
+++ b/src/views/Clue/Order/Comp/DialogOrder.vue
@@ -108,9 +108,11 @@ const aftersaleList = ref([])
 const extraPayList = ref([])
 
 const prodTotalPrice = computed(() => {
-  return orderInfo.value.signProducts.reduce(
-    (pre, cur) => pre + (cur?.price || 0) * (cur?.signNum || 0),
-    0
+  return (
+    orderInfo.value.signProducts?.reduce(
+      (pre, cur) => pre + (cur?.price || 0) * (cur?.signNum || 0),
+      0
+    ) || 0
   )
 })
 
diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue
index 8df8280..4846595 100644
--- a/src/views/Clue/Order/Comp/MallOrderList.vue
+++ b/src/views/Clue/Order/Comp/MallOrderList.vue
@@ -67,9 +67,10 @@
           <div class="p-10px flex justify-center">
             <el-table :data="row.signProducts" stripe style="width: 900px">
               <el-table-column prop="productName" label="成交产品" />
-              <el-table-column prop="specsName" label="产品规格" />
-              <el-table-column prop="signNum" label="成交数量" width="100px" />
-              <el-table-column label="发货状态" prop="sendState" width="100px" />
+              <el-table-column prop="specsName" label="产品规格" width="100px" />
+              <el-table-column prop="signNum" label="成交数量" width="90px" />
+              <el-table-column prop="remark" label="成交备注" />
+              <el-table-column label="发货状态" prop="sendState" width="90px" />
               <el-table-column label="发货备注" width="100px">
                 <template #default="scope">
                   <el-popover
diff --git a/src/views/Clue/Pool/Comp/ClueMap.vue b/src/views/Clue/Pool/Comp/ClueMap.vue
new file mode 100644
index 0000000..e3afcc6
--- /dev/null
+++ b/src/views/Clue/Pool/Comp/ClueMap.vue
@@ -0,0 +1,269 @@
+<template>
+  <div class="relative w-full h-full">
+    <div id="mapClue" style="height: 100%"></div>
+    <el-autocomplete
+      v-model="areaValue"
+      clearable
+      style="position: absolute; top: 20px; left: 20px; width: 400px"
+      placeholder="输入并搜索位置"
+      :fetch-suggestions="remoteMethod"
+      @select="currentSelect"
+    />
+    <el-collapse v-model="collaspeKey" class="box-card">
+      <el-collapse-item name="nearbySchool">
+        <template #title>
+          <span class="ml-10px font-bold" style="font-size: 16px">附近驾校</span>
+        </template>
+        <div style="padding: 0 10px">
+          <div v-if="nearbySchoolSearching">正在搜索中...</div>
+          <template v-else>
+            <div v-for="p in nearbySchoolList" :key="p.index">
+              <div class="hover-pointer" style="font-size: 14px; color: blue">
+                <i v-if="p.recommend" class="el-icon-star-off"></i>
+                驾校: {{ p.deptName }}-{{ p.name }}
+              </div>
+              <div class="mt5">地址：{{ p.address }}</div>
+              <div class="mt5">
+                直线距离: {{ p.distance }} 公里;
+                <span class="ml0">步行距离：{{ p.walkdistance }}</span>
+              </div>
+              <el-divider style="margin: 3px 0 !important" />
+            </div>
+          </template>
+        </div>
+      </el-collapse-item>
+    </el-collapse>
+    <DialogSchoolInfo ref="placeInfoDialog" />
+  </div>
+</template>
+
+<script setup name="ClueMap">
+import { getPlaceList } from '@/api/school/place'
+
+import ImgPostion from '@/assets/imgs/flag/position_black.png'
+import FlagRed from '@/assets/imgs/flag/flag_red.png'
+import FlagYellow from '@/assets/imgs/flag/flag_yellow.png'
+import FlagPurple from '@/assets/imgs/flag/flag_purple.png'
+import FlagGreen from '@/assets/imgs/flag/flag_green.png'
+import FlagBlue from '@/assets/imgs/flag/flag_blue.png'
+import FlagBlack from '@/assets/imgs/flag/flag_black.png'
+import AMapLoader from '@amap/amap-jsapi-loader'
+
+import DialogSchoolInfo from './DialogSchoolInfo.vue'
+
+// 地图相关
+const clueMap = ref(null)
+const aMap = ref(null)
+const areaValue = ref('')
+
+const flagMap = {
+  red: FlagRed,
+  yellow: FlagYellow,
+  purple: FlagPurple,
+  green: FlagGreen,
+  blue: FlagBlue,
+  black: FlagBlack
+}
+
+const defaultLatLng = ref({
+  lat: 31.86119,
+  lng: 117.283042
+})
+
+let AutoComplete = ref(null)
+function initMap() {
+  AMapLoader.load({
+    key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key
+    version: '2.0',
+    plugins: ['AMap.AutoComplete']
+  }).then((AMap) => {
+    aMap.value = AMap
+    AutoComplete.value = new AMap.AutoComplete({
+      city: '合肥'
+    })
+    clueMap.value = new AMap.Map('mapClue', {
+      zoom: 14,
+      zooms: [2, 22],
+      center: [defaultLatLng.value.lng, defaultLatLng.value.lat]
+    })
+    getPageData()
+  })
+}
+
+const placeList = ref([])
+
+async function getPageData() {
+  placeList.value = []
+  const data = await getPlaceList({
+    placeStatus: 0
+  })
+  if (data.placeList) {
+    placeList.value = data.placeList
+    createMarkersInMap()
+    getNearbySchool(defaultLatLng.value)
+  }
+}
+
+// 生成markers
+function createMarkersInMap() {
+  for (let i = 0; i < placeList.value.length; i++) {
+    const element = placeList.value[i]
+    const markerIcon = flagMap[element.flagColor || 'red']
+    const tmpMarker = new aMap.value.Marker({
+      map: clueMap.value,
+      position: [element.lng, element.lat],
+      icon: markerIcon,
+      label: {
+        content: element.name,
+        direction: 'right'
+      },
+      extData: element
+    })
+    tmpMarker.on('click', handleClickMarker)
+  }
+}
+
+const placeInfoDialog = ref()
+function handleClickMarker(ev) {
+  placeInfoDialog.value.open(ev.target.getExtData())
+}
+
+function remoteMethod(searchValue, cb) {
+  if (searchValue) {
+    AutoComplete.value?.search(searchValue, (status, result) => {
+      if (result.tips?.length) {
+        // areaList.value = result?.tips
+        const list = result.tips.map((it) => ({
+          ...it,
+          value: it.name
+        }))
+        cb(list)
+      } else {
+        cb([])
+      }
+    })
+  } else {
+    cb([])
+  }
+}
+
+function currentSelect(val) {
+  if (val) {
+    defaultLatLng.value = {
+      lng: val.location?.lng,
+      lat: val.location?.lat
+    }
+    addmark(val.location?.lng, val.location?.lat, aMap.value)
+  }
+}
+
+const marker = ref(null)
+function addmark(lat, lng, AMap) {
+  marker.value && removeMarker()
+  marker.value = new AMap.Marker({
+    position: new AMap.LngLat(lat, lng),
+    zoom: 14,
+    icon: ImgPostion,
+    offset: [-16, -32]
+  })
+  clueMap.value.add(marker.value)
+  clueMap.value.setCenter([lat, lng], true)
+  getNearbySchool({ lat: lng, lng: lat })
+}
+
+const nearbySchoolList = ref([])
+const nearbySchoolSearching = ref(false)
+const collaspeKey = ref('nearbySchool')
+
+function getNearbySchool(info) {
+  if (info.lng && info.lat) {
+    nearbySchoolList.value = []
+    nearbySchoolSearching.value = true
+    // 推荐的场地
+    let places1 = []
+    // 普通的场地
+    let places2 = []
+
+    const p2 = [info.lng, info.lat]
+    for (let i = 0; i < placeList.value.length; i++) {
+      const element = placeList.value[i]
+      const p1 = [element.lng, element.lat]
+      // 计算直线距离
+      element.distance = (aMap.value.GeometryUtil.distance(p1, p2) / 1000).toFixed(2)
+      element.recommend ? places1.push(element) : places2.push(element)
+    }
+    // 按直线距离排序
+    // 排序
+    if (places1.length > 1) {
+      places1 = places1.sort((a, b) => a.distance - b.distance)
+    }
+    // 排序
+    if (places2.length > 1) {
+      places2 = places2.sort((a, b) => a.distance - b.distance)
+    }
+    // 取普通场地和推荐场地，组合, 取四个
+    nearbySchoolList.value = []
+    for (let i = 0; i < 4; i++) {
+      places1.length > i && nearbySchoolList.value.push(places1[i])
+      places2.length > i && nearbySchoolList.value.push(places2[i])
+      if (nearbySchoolList.value.length === 4) {
+        break
+      }
+    }
+    // 计算步行距离
+    nearbySchoolList.value.map(async (item) => {
+      const p1 = [item.lng, item.lat]
+      const resp = await getWalkingDistance(p1, p2)
+      item.walkdistance = resp
+    })
+    nearbySchoolSearching.value = false
+  }
+}
+
+// 获取两点之间的步行距离
+async function getWalkingDistance(start, end) {
+  return new Promise((resolve) => {
+    aMap.value.plugin('AMap.Walking', () => {
+      const walking = new aMap.value.Walking()
+      let num = 0
+      walking.search(start, end, (status, result) => {
+        if (status === 'complete') {
+          result.routes.forEach((item) => {
+            num += item.distance
+          })
+          resolve(num > 1000 ? `${(num / 1000).toFixed(2)} 公里` : `${num} 米`)
+        } else {
+          resolve('步行数据无法确定')
+        }
+      })
+    })
+  })
+}
+
+function removeMarker() {
+  clueMap.value.remove(marker.value)
+}
+
+function destroyMap() {
+  areaValue.value = undefined
+  clueMap.value = null
+  aMap.value = null
+}
+
+defineExpose({ destroyMap })
+
+onMounted(() => {
+  nextTick(() => {
+    initMap()
+  })
+})
+</script>
+
+<style scoped lang="scss">
+.box-card {
+  position: absolute;
+  right: 10px;
+  bottom: 10px;
+  width: 40%;
+}
+</style>
diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue
index d516729..5e1c407 100644
--- a/src/views/Clue/Pool/Comp/DialogClue.vue
+++ b/src/views/Clue/Pool/Comp/DialogClue.vue
@@ -485,7 +485,7 @@ function addmark(lat, lng, AMap) {
     offset: [-16, -32]
   })
   dialogMap.value.add(marker.value)
-  dialogMap.value.setCenter([lat, lng], '', 500)
+  dialogMap.value.setCenter([lat, lng], true)
   getNearbySchool({ lat: lng, lng: lat })
 }
 function removeMarker() {
@@ -557,7 +557,6 @@ function currentSelect(val) {
       lat: val.location?.lat
     }
     addmark(val.location?.lng, val.location?.lat, aMap.value)
-    dialogMap.value.setCenter([val.location?.lng, val.location?.lat], '', 500)
     regeoCode(val.location?.lng, val.location?.lat)
   }
 }
diff --git a/src/views/Clue/Pool/index.vue b/src/views/Clue/Pool/index.vue
index 8149f8e..d3c75a8 100644
--- a/src/views/Clue/Pool/index.vue
+++ b/src/views/Clue/Pool/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="relative">
-      <el-tabs v-model="queryType" size="small" @tab-change="resetQuery">
+      <el-tabs v-model="queryType" size="small" @tab-change="quickChange">
         <el-tab-pane label="全部" name="0" />
         <el-tab-pane name="1">
           <template #label>
@@ -31,6 +31,14 @@
           </template>
         </el-tab-pane>
         <el-tab-pane label="公海" name="4" />
+        <el-tab-pane
+          v-if="appStore.getAppInfo?.instanceType == 1"
+          label="地图总览"
+          name="5"
+          style="height: calc(100vh - 160px)"
+        >
+          <ClueMap ref="mapClue" v-if="queryType == 5" />
+        </el-tab-pane>
       </el-tabs>
       <div class="absolute" style="right: 10px; top: 0">
         <el-button plain v-hasPermi="['clue:pool:import']">导入</el-button>
@@ -39,110 +47,112 @@
         </el-button>
       </div>
     </div>
-    <!-- 搜索工作栏 -->
-    <Search v-if="!loading" ref="searchRef" :schema="allSchemas.searchSchema" labelWidth="0">
-      <template #actionMore>
-        <el-button @click="getTableList" v-hasPermi="['clue:pool:search']"> 搜索 </el-button>
-        <el-button @click="resetQuery" v-hasPermi="['clue:pool:reset']"> 重置 </el-button>
-      </template>
-    </Search>
-    <!-- 列表 -->
-    <SSTable
-      v-if="!loading"
-      class="mt-20px"
-      v-model:tableObject="tableObject"
-      :tableColumns="allSchemas.tableColumns"
-      @get-list="getTableList"
-      @get-checked-columns="getCheckedColumns"
-    >
-      <el-table-column
-        v-for="item in showColumns"
-        :key="item.field"
-        :prop="item.field"
-        :label="item.label"
-        min-width="120px"
+    <template v-if="queryType != 5">
+      <!-- 搜索工作栏 -->
+      <Search v-if="!loading" ref="searchRef" :schema="allSchemas.searchSchema" labelWidth="0">
+        <template #actionMore>
+          <el-button @click="getTableList" v-hasPermi="['clue:pool:search']"> 搜索 </el-button>
+          <el-button @click="resetQuery" v-hasPermi="['clue:pool:reset']"> 重置 </el-button>
+        </template>
+      </Search>
+      <!-- 列表 -->
+      <SSTable
+        v-if="!loading"
+        class="mt-20px"
+        v-model:tableObject="tableObject"
+        :tableColumns="allSchemas.tableColumns"
+        @get-list="getTableList"
+        @get-checked-columns="getCheckedColumns"
       >
-        <template #default="{ row }">
-          <div v-if="item.field == 'followRecord'">
-            <el-button
-              type="primary"
-              text
-              style="padding: 0"
-              @click="handleFollow(row)"
-              v-if="queryType != 4"
-              v-hasPermi="['clue:pool:update']"
-            >
-              快速新增
-            </el-button>
-          </div>
-          <div v-else-if="item.field == 'contact'">
-            <span>{{ row[item.field] }}</span>
-            <Icon class="ml-5px" icon="ep:phone" @click="makeCall(row.contact)" />
-          </div>
-          <div v-else-if="item.form?.component == 'DatePicker'">
-            <span>{{ formatDate(row[item.field]) }}</span>
-          </div>
-          <div v-else-if="item.field == 'remark' || item.form?.component == 'Editor'">
-            <el-popover placement="top" width="500px" trigger="click" v-if="row[item.field]">
-              <template #reference>
-                <el-button type="primary" style="padding: 0" text>点击查看</el-button>
-              </template>
-              <div v-dompurify-html="row[item.field]"></div>
-            </el-popover>
-          </div>
-          <span v-else>{{ row[item.field] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="200px" fixed="right">
-        <template #default="scope">
-          <el-button
-            type="primary"
-            link
-            @click="handleDetail(scope.row)"
-            v-hasPermi="['clue:pool:detail']"
-          >
-            详情
-          </el-button>
-          <template v-if="queryType != 4">
-            <el-button
-              type="primary"
-              link
-              @click="handleEdit(scope.row)"
-              v-hasPermi="['clue:pool:update']"
-            >
-              修改
-            </el-button>
-            <el-button
-              type="primary"
-              link
-              :disabled="scope.row.state == '成交'"
-              @click="handleSuccess(scope.row)"
-              v-hasPermi="['clue:pool:enroll']"
-            >
-              登记
-            </el-button>
-            <el-button
-              type="primary"
-              link
-              v-hasPermi="['clue:pool:release']"
-              @click="handleRelease(scope.row.clueId)"
-            >
-              释放
-            </el-button>
+        <el-table-column
+          v-for="item in showColumns"
+          :key="item.field"
+          :prop="item.field"
+          :label="item.label"
+          min-width="120px"
+        >
+          <template #default="{ row }">
+            <div v-if="item.field == 'followRecord'">
+              <el-button
+                type="primary"
+                text
+                style="padding: 0"
+                @click="handleFollow(row)"
+                v-if="queryType != 4"
+                v-hasPermi="['clue:pool:update']"
+              >
+                快速新增
+              </el-button>
+            </div>
+            <div v-else-if="item.field == 'contact'">
+              <span>{{ row[item.field] }}</span>
+              <Icon class="ml-5px" icon="ep:phone" @click="makeCall(row.contact)" />
+            </div>
+            <div v-else-if="item.form?.component == 'DatePicker'">
+              <span>{{ formatDate(row[item.field]) }}</span>
+            </div>
+            <div v-else-if="item.field == 'remark' || item.form?.component == 'Editor'">
+              <el-popover placement="top" width="500px" trigger="click" v-if="row[item.field]">
+                <template #reference>
+                  <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+                </template>
+                <div v-dompurify-html="row[item.field]"></div>
+              </el-popover>
+            </div>
+            <span v-else>{{ row[item.field] }}</span>
           </template>
-          <template v-else>
+        </el-table-column>
+        <el-table-column label="操作" width="200px" fixed="right">
+          <template #default="scope">
             <el-button
               type="primary"
               link
-              v-hasPermi="['clue:pool:gain']"
-              @click="handleGain(scope.row.clueId)"
+              @click="handleDetail(scope.row)"
+              v-hasPermi="['clue:pool:detail']"
             >
-              获取
+              详情
             </el-button>
+            <template v-if="queryType != 4">
+              <el-button
+                type="primary"
+                link
+                @click="handleEdit(scope.row)"
+                v-hasPermi="['clue:pool:update']"
+              >
+                修改
+              </el-button>
+              <el-button
+                type="primary"
+                link
+                :disabled="scope.row.state == '成交'"
+                @click="handleSuccess(scope.row)"
+                v-hasPermi="['clue:pool:enroll']"
+              >
+                登记
+              </el-button>
+              <el-button
+                type="primary"
+                link
+                v-hasPermi="['clue:pool:release']"
+                @click="handleRelease(scope.row.clueId)"
+              >
+                释放
+              </el-button>
+            </template>
+            <template v-else>
+              <el-button
+                type="primary"
+                link
+                v-hasPermi="['clue:pool:gain']"
+                @click="handleGain(scope.row.clueId)"
+              >
+                获取
+              </el-button>
+            </template>
           </template>
-        </template>
-      </el-table-column>
-    </SSTable>
+        </el-table-column>
+      </SSTable>
+    </template>
 
     <DialogClue
       v-if="!loading"
@@ -164,11 +174,13 @@
 </template>
 
 <script setup name="CluePool">
+import { useAppStore } from '@/store/modules/app'
 import { getSimpleFieldList } from '@/api/clue/clueField'
 import DialogClue from './Comp/DialogClue.vue'
 import DrawerClue from './Comp/DrawerClue.vue'
 import DialogSuccess from './Comp/DialogSuccess.vue'
 import DialogFollow from './Comp/DialogFollow.vue'
+import ClueMap from './Comp/ClueMap.vue'
 import { getSimpleUserList as getUserOption } from '@/api/system/user'
 
 import { removeNullField } from '@/utils'
@@ -177,6 +189,7 @@ import { formatDate } from '@/utils/formatTime'
 import * as ClueApi from '@/api/clue'
 
 const message = useMessage() // 消息弹窗
+const appStore = useAppStore()
 
 const searchRef = ref()
 const queryType = ref('2')
@@ -223,10 +236,24 @@ function getCheckedColumns(list) {
   showColumns.value = list && list.length ? list : allSchemas.value.tableColumns
 }
 
+const mapClue = ref()
+function quickChange(name) {
+  try {
+    if (name != '5') {
+      resetQuery()
+      mapClue.value && mapClue.value.destroyMap()
+    }
+  } catch (error) {
+    console.log(error)
+  }
+}
+
 function resetQuery() {
-  searchRef.value.reset()
-  tableObject.value.pageNo = 1
-  getTableList()
+  nextTick(() => {
+    searchRef.value && searchRef.value.reset()
+    tableObject.value.pageNo = 1
+    getTableList()
+  })
 }
 
 async function getTableList() {
diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index 0a5ee37..0c91a41 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -102,7 +102,7 @@
               <span class="mr-10px">{{ item.username }}</span>
               <span>已跟进{{ item.followNum }}条线索</span>
             </li>
-            <br />
+            <!-- <br /> -->
             <!-- </TransitionGroup> -->
           </ul>
         </el-skeleton>

From 08ada50d1a76cc146a0b2a23baeec0d50f844b2d Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 5 Jul 2024 15:29:18 +0800
Subject: [PATCH 25/25] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Clue/Order/Comp/MallOrderList.vue | 18 +++++++++---------
 src/views/Clue/Order/Comp/OrderList.vue     | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue
index 4846595..8ffef86 100644
--- a/src/views/Clue/Order/Comp/MallOrderList.vue
+++ b/src/views/Clue/Order/Comp/MallOrderList.vue
@@ -206,6 +206,15 @@ import DialogDelivery from './DialogDelivery.vue'
 
 import { removeNullField } from '@/utils'
 
+const userOptions = ref([])
+onMounted(() => {
+  getUserOption().then((data) => {
+    userOptions.value = data
+    getCurdSchemas()
+  })
+  getOptions()
+})
+
 const message = useMessage() // 消息弹窗
 
 const allSchemas = ref({})
@@ -338,15 +347,6 @@ const deliveryDialog = ref()
 function handleDelivery(row) {
   deliveryDialog.value.open(row)
 }
-
-const userOptions = ref([])
-onMounted(() => {
-  getUserOption().then((data) => {
-    userOptions.value = data
-    getCurdSchemas()
-  })
-  getOptions()
-})
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue
index 5439d22..f9c89c0 100644
--- a/src/views/Clue/Order/Comp/OrderList.vue
+++ b/src/views/Clue/Order/Comp/OrderList.vue
@@ -182,6 +182,15 @@ import DialogExtraFee from './DialogExtraPay.vue'
 
 import { removeNullField } from '@/utils'
 
+const userOptions = ref([])
+onMounted(() => {
+  getUserOption().then((data) => {
+    userOptions.value = data
+    getCurdSchemas()
+  })
+  getOptions()
+})
+
 const message = useMessage() // 消息弹窗
 
 const allSchemas = ref({})
@@ -327,15 +336,6 @@ function getOptions() {
     allPlaceOptions.value = data.placeList
   })
 }
-
-const userOptions = ref([])
-onMounted(() => {
-  getUserOption().then((data) => {
-    userOptions.value = data
-    getCurdSchemas()
-  })
-  getOptions()
-})
 </script>
 
 <style lang="scss" scoped></style>