From f3c15b3692e0ffb227a51e7182be93ff73113c30 Mon Sep 17 00:00:00 2001
From: houjunxiang <hjx@example.com>
Date: Thu, 27 Nov 2025 09:19:08 +0800
Subject: [PATCH] =?UTF-8?q?style:=E9=83=A8=E9=97=A8=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../company-dept-dialog.vue                   | 19 ++++++-------------
 nx/store/company-dept.js                      |  5 ++++-
 pages/index/me-popup.vue                      |  1 +
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/components/company-dept-dialog/company-dept-dialog.vue b/components/company-dept-dialog/company-dept-dialog.vue
index 08e2799..c76f1a9 100644
--- a/components/company-dept-dialog/company-dept-dialog.vue
+++ b/components/company-dept-dialog/company-dept-dialog.vue
@@ -1,6 +1,6 @@
 <template>
   <view v-if="dialogStore.show" class="company-dept-dialog">
-    <view class="company-dept-dialog__mask" @tap="handleCancel" />
+    <view class="company-dept-dialog__mask" />
     <view class="company-dept-dialog__panel">
       <view class="company-dept-dialog__header">
         <text class="company-dept-dialog__title">{{ dialogStore.title }}</text>
@@ -12,10 +12,7 @@
           <uni-data-select
             v-model="selectedCompanyModel"
             :localdata="companyOptionsForSelect"
-            collection=""
-            field="companyName"
-            orderby=""
-            :clear-icon="false"
+            :clear="false"
             @change="onCompanyChangeUni"
           />
         </view>
@@ -26,17 +23,14 @@
           <uni-data-select
             v-model="selectedDeptModel"
             :localdata="deptOptionsForSelect"
-            collection=""
-            field="deptName"
-            orderby=""
-            :clear-icon="false"
+            :clear="false"
             @change="onDeptChangeUni"
           />
         </view>
       </view>
       <view class="company-dept-dialog__footer">
-        <u-button @tap="handleCancel">取消</u-button>
-        <u-button type="primary" :disabled="!isConfirmEnabled" @tap="handleConfirm"> 确定 </u-button>
+        <u-button v-if="showCancel" style="width: 40%" @tap="handleCancel">取消</u-button>
+        <u-button style="width: 40%" type="primary" :disabled="!isConfirmEnabled" @tap="handleConfirm"> 确定 </u-button>
       </view>
     </view>
   </view>
@@ -48,7 +42,7 @@ import { storeToRefs } from 'pinia'
 import nx from '@/nx'
 
 const dialogStore = nx.$store('company-dept')
-const { companyList, selectedCompanyId, selectedDeptId } = storeToRefs(dialogStore)
+const { companyList, selectedCompanyId, selectedDeptId, showCancel } = storeToRefs(dialogStore)
 
 const deptOptions = computed(() => dialogStore.getDeptsByCompanyId(selectedCompanyModel.value))
 
@@ -189,7 +183,6 @@ const handleConfirm = () => {
   &__footer {
     display: flex;
     justify-content: space-between;
-    gap: 12px;
     margin-top: 24px;
   }
 }
diff --git a/nx/store/company-dept.js b/nx/store/company-dept.js
index f48acda..619bd50 100644
--- a/nx/store/company-dept.js
+++ b/nx/store/company-dept.js
@@ -2,6 +2,7 @@ import { defineStore } from 'pinia'
 
 const defaultState = () => ({
   show: false,
+  showCancel: false,
   title: '请选择当前业务办理归属的公司部门信息',
   companyList: [],
   selectedCompanyId: null,
@@ -20,13 +21,15 @@ const companyDeptStore = defineStore({
       onCancel = null,
       defaultCompanyId = null,
       defaultDeptId = null,
-      title = null
+      title = null,
+      showCancel = false
     }) {
       this.companyList = companyList
       this.onConfirm = onConfirm
       this.onCancel = onCancel
       this.title = title || '请选择当前业务办理归属的公司部门信息'
       this.show = true
+      this.showCancel = showCancel
       this.selectedCompanyId = defaultCompanyId
       this.selectedDeptId = defaultDeptId
       if (!this.selectedCompanyId && this.companyList.length > 0) {
diff --git a/pages/index/me-popup.vue b/pages/index/me-popup.vue
index d28141d..dde5533 100644
--- a/pages/index/me-popup.vue
+++ b/pages/index/me-popup.vue
@@ -74,6 +74,7 @@ const handleSelectCompany = () => {
     companyList: companyList.value,
     defaultCompanyId: selectedCompanyId.value,
     defaultDeptId: selectedDeptId.value,
+    showCancel: true,
     onConfirm: ({ companyId, deptId }) => {
       const selectedCompany = companyList.value.find(company => company.companyId === selectedCompanyId.value)
       const selectedDept = selectedCompany?.depts.find(dept => dept.deptId === selectedDeptId.value)