From 8aff182ef3a075540119a98a9ae03d80dd97318e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 14 十月 2024 18:15:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/components/business/OperaMemberWindow.vue |  135 ++++++++++++++++++++++++--------------------
 1 files changed, 74 insertions(+), 61 deletions(-)

diff --git a/admin/src/components/business/OperaMemberWindow.vue b/admin/src/components/business/OperaMemberWindow.vue
index df26e7c..b356deb 100644
--- a/admin/src/components/business/OperaMemberWindow.vue
+++ b/admin/src/components/business/OperaMemberWindow.vue
@@ -1,56 +1,45 @@
 <template>
-    <GlobalWindow
-        :title="title"
-        width="60%"
-        :visible.sync="visible"
-        :confirm-working="isWorking"
-        @confirm="confirm"
-    >
-        <el-form :model="form" ref="form" :rules="rules">
-            <el-form-item label="濮撳悕" prop="name">
-                <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>
-              <div style="font-size: 12px;color: #F56C6C"  >
-                娉細浠呮敮鎸侀�夋嫨 銆恵{companyType ===0?'鐩稿叧鏂圭粍缁�':'鍐呴儴缁勭粐'}}銆�
-              </div>
-            </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>
-            </el-form-item>
-            <el-form-item label="韬唤璇佸彿" prop="idcardNo" v-if="form.id ==null">
-                <el-input v-model="form.idcardNo" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" v-trim/>
-            </el-form-item>
-            <el-form-item label="淇敼韬唤璇佸彿" prop="idcardNoNew" v-if="form.id !=null">
-                <el-input v-model="form.idcardNoNew" placeholder="鍙慨鏀硅韩浠借瘉鍙�" v-trim/>
-              <div style="font-size: 12px" v-if="form.id !=null">
-                娉細褰撳墠韬唤璇佸彿涓�<span style="color: #F56C6C">銆恵{form.idcardDecode}}銆�</span>锛屽闇�淇敼锛岃鍦ㄨ緭鍏ユ爮濉啓鏂扮殑韬唤璇佸彿!
-              </div>
-            </el-form-item>
-            <el-form-item label="宸ュ彿" prop="code">
-                <el-input v-model="form.code" placeholder="璇疯緭鍏ュ憳宸ュ伐鍙�" v-trim/>
-            </el-form-item>
-          <el-form-item label="浜鸿劯鐓х墖" prop="faceImgFull" >
-            <UploadFaceImg
-                :file="{ 'imgurlfull': form.faceImgFull, 'imgurl': form.faceImg }"
-                :uploadData="uploadData"
-                @uploadSuccess="uploadAvatarSuccess"
-                @uploadEnd="isUploading = false"
-                @uploadBegin="isUploading = true"
-            />
-          </el-form-item>
-</el-form>
-</GlobalWindow>
+  <GlobalWindow :title="title" width="60%" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm">
+    <el-form :model="form" ref="form" :rules="rules">
+      <el-form-item label="濮撳悕" prop="name">
+        <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>
+        <div style="font-size: 12px;color: #F56C6C">
+          娉細浠呮敮鎸侀�夋嫨 銆恵{ companyType === 0 ? '鐩稿叧鏂圭粍缁�' : '鍐呴儴缁勭粐' }}銆�
+        </div>
+      </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>
+      </el-form-item>
+      <el-form-item label="韬唤璇佸彿" v-if="form.id == null">
+        <el-input v-model="form.idcardNo" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" v-trim />
+      </el-form-item>
+      <el-form-item label="淇敼韬唤璇佸彿" v-if="form.id != null">
+        <el-input v-model="form.idcardNoNew" placeholder="鍙慨鏀硅韩浠借瘉鍙�" v-trim />
+        <div style="font-size: 12px" v-if="form.id != null">
+          娉細褰撳墠韬唤璇佸彿涓�<span style="color: #F56C6C">銆恵{ form.idcardDecode }}銆�</span>锛屽闇�淇敼锛岃鍦ㄨ緭鍏ユ爮濉啓鏂扮殑韬唤璇佸彿!
+        </div>
+      </el-form-item>
+      <el-form-item label="宸ュ彿" prop="code">
+        <el-input v-model="form.code" placeholder="璇疯緭鍏ュ憳宸ュ伐鍙�" v-trim />
+      </el-form-item>
+      <el-form-item label="浜鸿劯鐓х墖" prop="faceImgFull">
+        <div class="upload_wrap">
+          <UploadFaceImg :file="{ 'imgurlfull': form.faceImgFull, 'imgurl': form.faceImg }" :uploadData="uploadData"
+            @uploadSuccess="uploadAvatarSuccess" @uploadEnd="isUploading = false" @uploadBegin="isUploading = true" />
+          <div class="content">
+            <div>1銆佽閫夋嫨娴呰壊鎴栦腑鎬ц儗鏅紝浣跨敤鍧囧寑鍏夌嚎鎷嶇収銆�</div>
+            <div>2銆佽淇濇寔闈㈤儴姝e闀滃ご锛屽嬁閬尅闈㈤儴锛屼繚鎸佷腑绔嬭〃鎯呫��</div>
+            <div>3銆佽閬垮厤鍚庢湡淇浘锛岀‘淇濅汉鑴歌疆寤撴竻鏅般�佸畬鏁达紝灏藉彲鑳藉噺灏戦潪鑴搁儴鍐呭鍗犳瘮銆�</div>
+          </div>
+        </div>
+      </el-form-item>
+    </el-form>
+  </GlobalWindow>
 </template>
 
 <script>
@@ -58,12 +47,12 @@
 import GlobalWindow from '@/components/common/GlobalWindow'
 import UploadAvatarImage from '@/components/common/UploadAvatarImage'
 import UploadFaceImg from '@/components/common/UploadFaceImg'
-import {checkMobile, validIdCardNo, validIdCardNoNew} from '@/utils/form'
+import { checkMobile, validIdCardNo, validIdCardNoNew } from '@/utils/form'
 export default {
   name: 'OperaCompanyWindow',
   extends: BaseOpera,
-  components: { GlobalWindow, UploadAvatarImage,UploadFaceImg },
-  data () {
+  components: { GlobalWindow, UploadAvatarImage, UploadFaceImg },
+  data() {
     return {
       uploadData: {
         folder: 'member'
@@ -73,7 +62,7 @@
         value: 'id',
         checkStrictly: true
       },
-      companyType:0,
+      companyType: 0,
       department: [],
       // 琛ㄥ崟鏁版嵁
       form: {
@@ -102,14 +91,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]
       }
@@ -119,7 +108,7 @@
      * @title 绐楀彛鏍囬
      * @target 缂栬緫鐨勫璞�
      */
-    open (title, target, depart,companyType) {
+    open(title, target, depart, companyType) {
       this.title = title
       this.department = depart
       this.visible = true
@@ -140,7 +129,7 @@
           this.form[key] = target[key]
           this.form.idcardNo = ''
         }
-        this.form.company =[]
+        this.form.company = []
         if (target.companyId && target.companyPath) {
           var array = target.companyPath.split('/')
           array.forEach(item => {
@@ -152,10 +141,34 @@
       })
     },
     // 涓婁紶鍥剧墖
-    uploadAvatarSuccess (file) {
+    uploadAvatarSuccess(file) {
       this.form.faceImg = file.imgurl
       this.form.faceImgFull = file.imgurlfull
     }
   }
 }
 </script>
+<style lang="scss" scoped>
+.upload_wrap{
+  display: flex;
+  align-items: center;
+  .avatar-uploader{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  ::v-deep .avatar{
+    max-width: 90px;
+    max-height: 90px;
+  }
+  .content{
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    font-size: 12px;
+    color: #999999;
+    margin-left: 12px;
+    line-height: 24px;
+  }
+}
+</style>
\ No newline at end of file

--
Gitblit v1.9.3