From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 16:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/components/business/OperaCarsWindow.vue |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/admin/src/components/business/OperaCarsWindow.vue b/admin/src/components/business/OperaCarsWindow.vue
index c9fab94..895ab6d 100644
--- a/admin/src/components/business/OperaCarsWindow.vue
+++ b/admin/src/components/business/OperaCarsWindow.vue
@@ -5,7 +5,7 @@
       <el-form-item label="杞︾墝鍙�" prop="code">
         <el-input v-model="form.code" placeholder="璇疯緭鍏ヨ溅鐗屽彿" v-trim />
       </el-form-item>
-      <el-form-item label="涓氬姟绫诲瀷" prop="type">
+      <el-form-item label="澶囨敞" prop="type">
         <el-radio-group v-model="form.type">
           <el-radio :label="0">瀹夋嘲鍏姟杞�</el-radio>
           <el-radio :label="1">瀹夋嘲鐗╂祦杞�</el-radio>
@@ -22,8 +22,10 @@
       </el-form-item>
       <el-form-item label="閫夋嫨缁勭粐锛�" prop="groupId">
         <el-select v-model="form.groupId" @change="changeSel" clearable filterable placeholder="璇烽�夋嫨">
-          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id">
-          </el-option>
+          <template v-for="item in companyList">
+            <el-option  v-if="item.countNum && item.countNum>0" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </template>
         </el-select>
       </el-form-item>
       <el-form-item label="閫夋嫨杞︿富锛�" prop="memberId">
@@ -67,7 +69,7 @@
         code: [{ required: true, message: '璇疯緭鍏ヨ溅鐗屽彿' }],
         groupId: [{ required: true, message: '璇烽�夋嫨缁勭粐' }],
         type: [
-          { required: true, message: '璇烽�夋嫨涓氬姟绫诲瀷' }
+          { required: true, message: '璇烽�夋嫨澶囨敞' }
         ]
       }
     }
@@ -105,6 +107,7 @@
       if (form.groupId) {
         this.loadMember()
       }
+      this.form.memberId = ''
     },
     confirm() {
       console.log('form', this.form.cateId)
@@ -148,8 +151,8 @@
     },
     getCompany() {
       companyGetList({
-        model: {},
-        capacity: 1000,
+        model: { },//鏈夊憳宸ョ殑鏁版嵁
+        capacity: 10000,
         page: 1,
       }).then(res => {
         this.companyList = res.records || []

--
Gitblit v1.9.3