From f4f68514c57d423c30a316d59cba8df1f9ff0e88 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 31 十月 2024 18:17:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/components/business/OperaMemberWindow.vue |   65 +++++++++++++++++++++-----------
 1 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/admin/src/components/business/OperaMemberWindow.vue b/admin/src/components/business/OperaMemberWindow.vue
index c38445d..c4b80a8 100644
--- a/admin/src/components/business/OperaMemberWindow.vue
+++ b/admin/src/components/business/OperaMemberWindow.vue
@@ -11,7 +11,7 @@
           娉細浠呮敮鎸侀�夋嫨 銆恵{ companyType === 0 ? '鐩稿叧鏂圭粍缁�' : '鍐呴儴缁勭粐' }}銆�
         </div>
       </el-form-item>
-      <el-form-item label="閫夋嫨宀椾綅锛�" prop="positionId" >
+      <el-form-item label="閫夋嫨宀椾綅锛�" prop="positionId">
         <el-select v-model="form.positionId" clearable filterable placeholder="璇烽�夋嫨">
           <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
           </el-option>
@@ -34,18 +34,15 @@
         <el-input v-model="form.code" placeholder="璇疯緭鍏ュ憳宸ュ伐鍙�" v-trim />
       </el-form-item>
       <el-form-item label="鍏ヨ亴鏃ユ湡" prop="jobDate">
-        <el-date-picker
-            v-model="form.jobDate"
-            value-format="yyyy-MM-dd"
-            type="date">
+        <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-radio-group v-model="form.radio" @input="isDangyuan">
-            <el-radio :label="0">闈炲厷鍛�</el-radio>
-            <el-radio :label="1">鍏氬憳</el-radio>
-          </el-radio-group>
-        </el-form-item>
+      <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 label="浜鸿劯鐓х墖" prop="faceImgFull">
         <div class="upload_wrap">
           <UploadFaceImg :file="{ 'imgurlfull': form.faceImgFull, 'imgurl': form.faceImg }" :uploadData="uploadData"
@@ -67,12 +64,12 @@
 import UploadAvatarImage from '@/components/common/UploadAvatarImage'
 import UploadFaceImg from '@/components/common/UploadFaceImg'
 import { checkMobile, validIdCardNo, validIdCardNoNew } from '@/utils/form'
-import { allList   } from '@/api/business/position'
+import { allList } from '@/api/business/position'
 export default {
   name: 'OperaCompanyWindow',
   extends: BaseOpera,
   components: { GlobalWindow, UploadAvatarImage, UploadFaceImg },
-  data () {
+  data() {
     return {
       uploadData: {
         folder: 'member'
@@ -115,14 +112,14 @@
       }
     }
   },
-  created () {
+  created() {
     this.config({
       api: '/business/member.js',
       'field.id': 'id'
     })
   },
   methods: {
-    handleChangeCompany (value) {
+    handleChangeCompany(value) {
       if (this.form.company && this.form.company.length > 1) {
         this.form.companyId = this.form.company[this.form.company.length - 1]
       }
@@ -132,12 +129,31 @@
      * @title 绐楀彛鏍囬
      * @target 缂栬緫鐨勫璞�
      */
-    open (title, target, depart, companyType) {
+    open(title, target, depart, companyType) {
       this.title = title
       this.department = depart
       this.visible = true
+      this.form = {
+        id: null,
+        name: '',
+        type: '',
+        company: [],
+        code: '',
+        idcardNo: '',
+        idcardNoNew: '',
+        linkName: '',
+        idcardDecode: '',
+        companyId: null,
+        idcardType: 0,
+        phone: '',
+        faceImg: '',
+        jobDate: null,
+        isDangyuan: 0,
+        positionId: null,
+        faceImgFull: ''
+      }
       this.companyType = companyType
-      this.positionList()
+      this.getPositionList()
       // 鏂板缓
       if (target == null) {
         this.$nextTick(() => {
@@ -165,14 +181,14 @@
         }
       })
     },
-    getPositionList () {
+    getPositionList() {
       allList({})
         .then(res => {
           this.positionList = res
         })
     },
     // 涓婁紶鍥剧墖
-    uploadAvatarSuccess (file) {
+    uploadAvatarSuccess(file) {
       this.form.faceImg = file.imgurl
       this.form.faceImgFull = file.imgurlfull
     }
@@ -180,19 +196,22 @@
 }
 </script>
 <style lang="scss" scoped>
-.upload_wrap{
+.upload_wrap {
   display: flex;
   align-items: center;
-  .avatar-uploader{
+
+  .avatar-uploader {
     display: flex;
     align-items: center;
     justify-content: center;
   }
-  ::v-deep .avatar{
+
+  ::v-deep .avatar {
     max-width: 90px;
     max-height: 90px;
   }
-  .content{
+
+  .content {
     display: flex;
     flex-direction: column;
     justify-content: center;

--
Gitblit v1.9.3