From 156c8f176c20c8f8f438750577a1e24375ae7762 Mon Sep 17 00:00:00 2001
From: Leo_Ding <2405260743@qq.com>
Date: Thu, 13 Nov 2025 16:04:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=AF=B9=E8=B1=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E5=A4=8D=E7=BA=BF=E4=B8=8B=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |  4 +--
 .../serverList/components/EditDialog.vue      |  1 +
 .../serverList/components/LineOrder2.vue      | 27 +++++++++++++++++--
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/.env.dev b/.env.dev
index 20d9c5c..7f35d1d 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,8 +12,8 @@ VITE_ROUTER_BASE=/
 VITE_ROUTER_HISTORY=hash
 
 # api
-VITE_API_BASIC='http://10.10.1.39:8040'
-# VITE_API_BASIC='http://115.239.217.220:8021'
+# VITE_API_BASIC='http://10.10.1.39:8040'
+VITE_API_BASIC='http://115.239.217.220:8021'
 VITE_API_UPLOAD='http://115.239.217.220:9458'
 VITE_API_HTTP=/api/v1/
 # storage
diff --git a/src/views/serverObj/serverList/components/EditDialog.vue b/src/views/serverObj/serverList/components/EditDialog.vue
index 12390f2..ce41314 100644
--- a/src/views/serverObj/serverList/components/EditDialog.vue
+++ b/src/views/serverObj/serverList/components/EditDialog.vue
@@ -636,6 +636,7 @@ function handleOk() {
                 // params.stationId=storage.local.getItem('stationId')
                 // 单独封装一个同步校验函数
                 if (params.identityType === '1' && !isValidIdCard(params.identityNo)) {
+                    hideLoading()
                     return message.error('请输入正确的身份证号码')
                 }
                 let result = null
diff --git a/src/views/serverObj/serverList/components/LineOrder2.vue b/src/views/serverObj/serverList/components/LineOrder2.vue
index b0e5964..010a801 100644
--- a/src/views/serverObj/serverList/components/LineOrder2.vue
+++ b/src/views/serverObj/serverList/components/LineOrder2.vue
@@ -106,6 +106,9 @@
                 <template v-if="column.key === 'categoryType'">
                     <span>{{ dicsStore.getDictLabel('PROJECT_TYPE', record.categoryType) }}</span>
                 </template>
+                 <template v-if="column.key === 'categoryId'">
+                    <span>{{categoryList.find(item=>item.id==record.categoryId).name}}</span>
+                </template>
             </template>
         </a-table>
     </a-modal>
@@ -142,6 +145,7 @@ const mapVisible = ref(false)
 const stationList = ref([])
 const spining = ref(false)
 const areaCascaderRef=ref()
+const categoryList = ref([])
 formRules.value = {
     name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
     identityType: [{ required: true, message: '请选择证件类型', trigger: 'change' }],
@@ -169,7 +173,7 @@ const serviceList = ref([])
 // 表格列定义
 const columns = [
     { title: '类型', dataIndex: 'categoryType', key: 'categoryType', align: 'center', width: 100, },
-    { title: '分类名称', dataIndex: 'name', key: 'name', align: 'center', width: 180, },
+    { title: '分类名称', dataIndex: 'categoryId', key: 'categoryId', align: 'center', width: 180, },
     { title: '项目名称', dataIndex: 'name', key: 'name', align: 'center', },
     { title: '价格', dataIndex: 'price', key: 'price', align: 'center', },
     { title: '简介', dataIndex: 'remark', key: 'remark', align: 'center', },
@@ -190,6 +194,7 @@ const rowSelection = computed(() => ({
     }),
 }))
 getSeveicePeople()
+getCategoriesAll()
 async function getSeveicePeople() {
     try {
         const { success, data, total } = await apis.serviceStaffList
@@ -208,6 +213,21 @@ async function getSeveicePeople() {
 
     }
 }
+async function getCategoriesAll() {
+    try {
+        const { success, data, total } = await apis.projectType
+            .getProjectListAll({
+                pageSize: 100, current: 1,
+            })
+            .catch(() => {
+                throw new Error()
+            })
+        if (config('http.code.success') === success) {
+            categoryList.value = data.map(item => ({ id: item.id, name: item.name }))
+        }
+    } catch (error) {
+    }
+}
 function onAreaChange(value, labels) {
     formData.value.areaLabels = [...labels]
 }
@@ -260,6 +280,7 @@ const handleRemove = (item) => {
 // 确认选择
 const handleConfirm = () => {
     modalVisible.value = false
+
 }
 
 // 取消
@@ -354,7 +375,8 @@ function handleOk() {
                     params.plannedServiceStartDate = formData.value.planeDate[0]
                     params.plannedEndDate = formData.value.planeDate[1]
                 }
-                params.projects = serviceList.value
+                params.projects =selectedServices.value
+                console.log(params)
                 let result = null
                 switch (modal.value.type) {
                     case 'create':
@@ -391,6 +413,7 @@ function handleOk() {
  */
 function handleCancel() {
     selectedServices.value = []
+    formData.value={}
     hideModal()
 }