From 5f68c8d693f6f56e1a42866abc0a8011cad051ba Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Sat, 8 Nov 2025 16:33:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                             |  1 +
 src/views/AccompanyOrder/AccompanyOrder.vue | 39 ++++++++++++++++++---
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/.env.production b/.env.production
index ba5571f..b521353 100644
--- a/.env.production
+++ b/.env.production
@@ -2,6 +2,7 @@
 ENV='production'
 
 # base api
+#https://yikangyang.ali251.langye.net
 VUE_APP_BASE_API=''
 VUE_APP_UPLOAD_API=/api/admin/upload-file
 VUE_APP_PREVIEW_API=http://view.ali251.langye.net:8012/onlinePreview
diff --git a/src/views/AccompanyOrder/AccompanyOrder.vue b/src/views/AccompanyOrder/AccompanyOrder.vue
index 37302c0..1fa5247 100644
--- a/src/views/AccompanyOrder/AccompanyOrder.vue
+++ b/src/views/AccompanyOrder/AccompanyOrder.vue
@@ -11,6 +11,7 @@
                     <el-option v-for="[key, value] in pay_status" :key="key" :label="value" :value="key" />
                   </el-select>
                 </el-form-item>
+
                 <el-form-item label="服务状态">
                   <el-select v-model="searchForm.status" placeholder="请选择服务状态" clearable @clear="handleSearch">
                     <el-option v-for="[key, value] in status" :key="key" :label="value" :value="key" />
@@ -18,6 +19,11 @@
                     <el-option label="未分配" value="unassigned" />
                   </el-select>
                 </el-form-item>
+                <el-form-item label="产品区域">
+                  <el-select v-model="searchForm.site_id" placeholder="请选择产品区域" clearable @clear="handleSearch">
+                    <el-option v-for="item in siteList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
                 <el-form-item>
                   <el-button
                     v-if="isHasAuth('search')"
@@ -102,6 +108,19 @@
           width="160"
           title="订单项目"
         />
+        <vxe-column
+          header-align="center"
+          field="site_id"
+          width="120"
+          title="产品区域"
+          align="center"
+        >
+        <template #default="{ row }">
+          <div v-for="item in siteList">
+            <div v-if="item.id===row.site_id">{{item.name}}</div>
+          </div>
+        </template>
+        </vxe-column>
         <vxe-column
           header-align="center"
           field="accompany_product.price"
@@ -132,7 +151,7 @@
           header-align="center"
           field="time"
           width="180"
-          title="就诊时间"
+          title="服务时间"
         />
 
         <vxe-column
@@ -277,7 +296,7 @@ import { destroy, index, save } from '@/api/accompany-order/accompany-order'
 import { index as nurseIndex } from '@/api/nurse/nurse'
 import axios from 'axios'
 import { getToken } from '@/utils/auth'
-
+import { index as getSite} from '@/api/site/site'
 export default {
   name: 'AccompanyOrder',
   components: {
@@ -289,7 +308,7 @@ export default {
     return {
       isShowAssign: false,
       nurses: [],
-
+      siteList:[],
       uploadSize,
       examineKey: 0,
       isShowAdd: false,
@@ -353,6 +372,7 @@ export default {
     if(this.$route.query.order_id){
       this.order_id = this.$route.query.order_id
     }
+    this.getSites()
     this.getNurses()
     this.getList()
   },
@@ -434,7 +454,13 @@ export default {
         })
       }
     },
-
+    async getSites(){
+      const res = await getSite({
+        page: 1,
+        page_size: 999,
+      })
+      this.siteList = res.data
+    },
     async getList() {
       this.loading = true
       try {
@@ -448,6 +474,10 @@ export default {
             key: 'pay_status',
             op: 'eq',
             value: this.searchForm.pay_status || ''
+          },{
+            key: 'site_id',
+            op: 'eq',
+            value: this.searchForm.site_id || ''
           }
         ].filter(item => item.value !== '')
 
@@ -575,6 +605,7 @@ export default {
     resetSearch() {
       this.searchForm = {
         pay_status: '',
+        site_id:'',
         status: ''
       }
       this.select.page = 1