From c88fe3ea9fd8bd1ea556b4769a1a0cd6c9b5661d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 05 三月 2025 11:38:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/components/business/OperaMemberWindow.vue |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/business/OperaMemberWindow.vue b/admin/src/components/business/OperaMemberWindow.vue
index e371f39..2cc8ad5 100644
--- a/admin/src/components/business/OperaMemberWindow.vue
+++ b/admin/src/components/business/OperaMemberWindow.vue
@@ -5,8 +5,14 @@
         <el-input v-model="form.name" placeholder="璇疯緭鍏ュ鍚�" v-trim />
       </el-form-item>
       <el-form-item label="鎵�灞炵粍缁�" prop="companyId">
-        <el-cascader v-model="form.company" :options="department" @change="handleChangeCompany" :show-all-levels="false"
-          clearable filterable :props="departprops"></el-cascader>
+<!--        <el-cascader v-model="form.company" :options="department" @change="handleChangeCompany" :show-all-levels="false"
+          clearable filterable :props="departprops"></el-cascader>-->
+        <el-select v-model="form.companyId"  clearable filterable placeholder="璇烽�夋嫨">
+          <template v-for="item in companyList">
+            <el-option  v-if="item.countNum && item.countNum>0" :key="item.id" :label="item.companyNamePath" :value="item.id">
+            </el-option>
+          </template>
+        </el-select>
         <div style="font-size: 12px;color: #F56C6C">
           娉細浠呮敮鎸侀�夋嫨 銆恵{ companyType === 0 ? '鐩稿叧鏂圭粍缁�' : '鍐呴儴缁勭粐' }}銆�
         </div>
@@ -37,12 +43,12 @@
         <el-date-picker v-model="form.jobDate" value-format="yyyy-MM-dd" type="date">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="鏄惁鍏氬憳" prop="isDangyuan">
+<!--      <el-form-item label="鏄惁鍏氬憳" prop="isDangyuan">
         <el-radio-group v-model="form.isDangyuan">
           <el-radio :label="0">闈炲厷鍛�</el-radio>
           <el-radio :label="1">鍏氬憳</el-radio>
         </el-radio-group>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="浜鸿劯鐓х墖" prop="faceImgFull">
         <div class="upload_wrap">
           <UploadFaceImg :file="{ 'imgurlfull': form.faceImgFull, 'imgurl': form.faceImg }" :uploadData="uploadData"
@@ -97,6 +103,7 @@
 import { checkMobile, validIdCardNo, validIdCardNoNew } from '@/utils/form'
 import { allList } from '@/api/business/position'
 import { upload } from '@/api/system/common'
+import {companyGetList} from "@/api/business/company";
 export default {
   name: 'OperaCompanyWindow',
   extends: BaseOpera,
@@ -124,6 +131,7 @@
       companyType: 0,
       department: [],
       positionList: [],
+      companyList: [],
       // 琛ㄥ崟鏁版嵁
       form: {
         id: null,
@@ -161,9 +169,20 @@
     })
   },
   methods: {
+    getCompany() {
+      companyGetList({
+        model: {type:this.companyType } ,
+        capacity: 10000,
+        page: 1,
+      }).then(res => {
+        this.companyList = res.records || []
+
+      })
+    },
     openCamera() {
       this.paisheModal = true
       this.isShowCamera = true
+      this.blobFileCamera = ''
       const that = this
       this.$nextTick(() => {
         var mediaOpts = { audio: false, video: true }
@@ -201,6 +220,7 @@
     // 鐐瑰嚮鎷嶆憚
     setImage() {
       const that = this
+      this.blobFileCamera = ''
       that.isShowCamera = false
       const video = document.querySelector('#videoCamera')
       const canvas = document.querySelector('#canvasCamera')
@@ -243,6 +263,7 @@
           // this.updateImg = false
           this.form.faceImg = res.imgaddr
           this.form.faceImgFull = res.url
+          this.isShowCropper = false
           // this.$emit('uploadSuccess', { imgurl: res.imgaddr, imgurlfull: res.url, name: res.originname })
           // this.$emit('uploadEnd')
         }, () => {
@@ -311,7 +332,8 @@
         faceImgFull: ''
       }
       this.companyType = companyType
-      this.getPositionList()
+      this.getCompany()
+      // this.getPositionList()
       // 鏂板缓
       if (target == null) {
         this.$nextTick(() => {
@@ -319,6 +341,8 @@
           this.form[this.configData['field.id']] = null
           this.form.company = []
         })
+
+        this.getCompany()
         return
       }
       // 缂栬緫

--
Gitblit v1.9.3