From dc79419f90bd4b9622e06320e15e3e056c13d89b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 15 十月 2024 19:07:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 admin/src/components/business/OperaMemberWindow.vue |   43 +++++++++++++++++++++++++++++++++++++------
 1 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/admin/src/components/business/OperaMemberWindow.vue b/admin/src/components/business/OperaMemberWindow.vue
index b356deb..7b12553 100644
--- a/admin/src/components/business/OperaMemberWindow.vue
+++ b/admin/src/components/business/OperaMemberWindow.vue
@@ -11,6 +11,12 @@
           娉細浠呮敮鎸侀�夋嫨 銆恵{ companyType === 0 ? '鐩稿叧鏂圭粍缁�' : '鍐呴儴缁勭粐' }}銆�
         </div>
       </el-form-item>
+      <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>
+        </el-select>
+      </el-form-item>
       <el-form-item label="鎵嬫満鍙�" prop="phone">
         <el-input v-model="form.phone" placeholder="璇疯緭鍏ユ墜鏈哄彿" v-trim />
         <div style="color: #F56C6C;font-size: 12px">娉細鍛樺伐鎵嬫満鍙峰皢浣滀负骞冲彴鐧诲綍璐﹀彿锛屽垵濮嬪瘑鐮佷负绯荤粺榛樿瀵嗙爜閰嶇疆椤�</div>
@@ -27,6 +33,19 @@
       <el-form-item label="宸ュ彿" prop="code">
         <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>
+      </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="faceImgFull">
         <div class="upload_wrap">
           <UploadFaceImg :file="{ 'imgurlfull': form.faceImgFull, 'imgurl': form.faceImg }" :uploadData="uploadData"
@@ -48,11 +67,12 @@
 import UploadAvatarImage from '@/components/common/UploadAvatarImage'
 import UploadFaceImg from '@/components/common/UploadFaceImg'
 import { checkMobile, validIdCardNo, validIdCardNoNew } from '@/utils/form'
+import { fetchList as positionList } from '@/api/business/position'
 export default {
   name: 'OperaCompanyWindow',
   extends: BaseOpera,
   components: { GlobalWindow, UploadAvatarImage, UploadFaceImg },
-  data() {
+  data () {
     return {
       uploadData: {
         folder: 'member'
@@ -64,6 +84,7 @@
       },
       companyType: 0,
       department: [],
+      positionList: [],
       // 琛ㄥ崟鏁版嵁
       form: {
         id: null,
@@ -79,6 +100,9 @@
         idcardType: 0,
         phone: '',
         faceImg: '',
+        jobDate: null,
+        isDangyuan: 0,
+        positionId: null,
         faceImgFull: ''
       },
       // 楠岃瘉瑙勫垯
@@ -91,14 +115,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]
       }
@@ -108,11 +132,12 @@
      * @title 绐楀彛鏍囬
      * @target 缂栬緫鐨勫璞�
      */
-    open(title, target, depart, companyType) {
+    open (title, target, depart, companyType) {
       this.title = title
       this.department = depart
       this.visible = true
       this.companyType = companyType
+      this.positionList()
       // 鏂板缓
       if (target == null) {
         this.$nextTick(() => {
@@ -140,8 +165,14 @@
         }
       })
     },
+    getPositionList () {
+      positionList({})
+        .then(res => {
+          this.positionList = res
+        })
+    },
     // 涓婁紶鍥剧墖
-    uploadAvatarSuccess(file) {
+    uploadAvatarSuccess (file) {
       this.form.faceImg = file.imgurl
       this.form.faceImgFull = file.imgurlfull
     }
@@ -171,4 +202,4 @@
     line-height: 24px;
   }
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.3