Merge remote-tracking branch 'origin/master'

src/views/modules/sys/userInfo/UserInfoForm.vue

@@ -27,16 +27,21 @@
             </el-form-item>
             <el-form-item label=""  prop="headPortraitUrl"
                           style="position:absolute;top:0px;left:350px">
-              <el-upload
-                class="avatar-uploader"
-                :action="`${$http.BASE_URL}/sys/file/webupload/upload?uploadPath=headPortraitUrl`"
-                :on-success="handleAvatarSuccess1"
-                :before-upload="beforeAvatarUpload"
-                :show-file-list="false">
-                <img v-if="inputForm.headPortraitUrl" :src="inputForm.headPortraitUrl" class="avatar-uploader">
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                <div>头像</div>
-              </el-upload>
+              <el-popover
+                placement="right-end"
+                trigger="hover">
+                <el-button @click="showPhoto(inputForm.headPortraitUrl)">查看</el-button>
+                <el-upload slot="reference"
+                           class="avatar-uploader"
+                           :action="`${$http.BASE_URL}/sys/file/webupload/upload?uploadPath=headPortraitUrl`"
+                           :on-success="handleAvatarSuccess1"
+                           :before-upload="beforeAvatarUpload"
+                           :show-file-list="false">
+                  <img v-if="inputForm.headPortraitUrl" :src="inputForm.headPortraitUrl" class="avatar-uploader">
+                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                  <div>头像</div>
+                </el-upload>
+              </el-popover>
             </el-form-item>
           </el-col>
 
@@ -335,28 +340,38 @@
           </el-input>
         </el-form-item>
 
-<!--        <el-form-item label="头像"  prop="headPortraitUrl">-->
-<!--          <el-upload-->
-<!--            class="avatar-uploader"-->
-<!--            :action="`${$http.BASE_URL}/sys/file/webupload/upload?uploadPath=headPortraitUrl`"-->
-<!--            :on-success="handleAvatarSuccess1"-->
-<!--            :before-upload="beforeAvatarUpload"-->
-<!--            :show-file-list="false">-->
-<!--            <img v-if="inputForm.headPortraitUrl" :src="inputForm.headPortraitUrl" class="avatar">-->
-<!--            <i v-else class="el-icon-plus avatar-uploader-icon"></i>-->
-<!--          </el-upload>-->
-<!--        </el-form-item>-->
+        <el-form-item v-if="method === 'view' || method === 'edit'" label="手签章" prop="signatureUrl">
+          <el-popover
+            placement="right-end"
+            trigger="hover">
+            <el-button @click="showPhoto(inputForm.signatureUrl)">查看</el-button>
+            <el-upload slot="reference"
+              class="avatar-uploader"
+              :action="`${$http.BASE_URL}/sys/userInfo/webupload/upload?uploadPath=signatureUrl`"
+              :on-success="handleAvatarSuccess2"
+              :before-upload="beforeAvatarUpload"
+              :show-file-list="false">
+              <img v-if="inputForm.signatureUrl" :src="urlStart" class="avatar-uploader">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </el-popover>
+        </el-form-item>
 
-        <el-form-item label="手签章" prop="signatureUrl">
-          <el-upload
-            class="avatar-uploader"
-            :action="`${$http.BASE_URL}/sys/file/webupload/upload?uploadPath=signatureUrl`"
-            :on-success="handleAvatarSuccess2"
-            :before-upload="beforeAvatarUpload"
-            :show-file-list="false">
-            <img v-if="inputForm.signatureUrl" :src="inputForm.signatureUrl" class="avatar-uploader">
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-          </el-upload>
+        <el-form-item v-else-if="method === 'add'" label="手签章" prop="signatureUrl">
+          <el-popover
+            placement="right-end"
+            trigger="hover">
+            <el-button @click="showPhoto(inputForm.signatureUrl)">查看</el-button>
+            <el-upload slot="reference"
+                       class="avatar-uploader"
+                       :action="`${$http.BASE_URL}/sys/userInfo/webupload/upload?uploadPath=signatureUrl`"
+                       :on-success="handleAvatarSuccess2"
+                       :before-upload="beforeAvatarUpload"
+                       :show-file-list="false">
+              <img v-if="inputForm.signatureUrl" :src="urlStart" class="avatar-uploader">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </el-popover>
         </el-form-item>
 
         <el-form-item label="教育经历" prop="sysUserEducations">
@@ -374,7 +389,6 @@
           class="vxe-table-element"
           :data="sysUserEducations"
           style="margin-left: 5em"
-          height="500"
           @cell-click="dbclickFun"
           @edit-closed=""
           highlight-current-row
@@ -394,7 +408,7 @@
           <vxe-table-column field="education" title="学历"
                             :edit-render="{name: '$select', options: $dictUtils.getDictList('sys_user_education')}">
             <template v-slot:edit="scope" >
-              <vxe-select v-model="scope.row.education">
+              <vxe-select v-model="scope.row.education" transfer>
                 <vxe-option
                   v-for="item in $dictUtils.getDictList('sys_user_education')"
                   :key="item.value"
@@ -407,7 +421,7 @@
           <vxe-table-column field="degree" title="学位"
                             :edit-render="{name: '$select', options: $dictUtils.getDictList('sys_user_degree')}">
             <template v-slot:edit="scope" >
-              <vxe-select v-model="scope.row.degree">
+              <vxe-select v-model="scope.row.degree" transfer>
                 <vxe-option
                   v-for="item in $dictUtils.getDictList('sys_user_degree')"
                   :key="item.value"
@@ -420,7 +434,7 @@
           <vxe-table-column field="educationType" title="学历性质"
                             :edit-render="{name: '$select', options: $dictUtils.getDictList('sys_user_education_type')}">
             <template v-slot:edit="scope" >
-              <vxe-select v-model="scope.row.educationType">
+              <vxe-select v-model="scope.row.educationType" transfer>
                 <vxe-option
                   v-for="item in $dictUtils.getDictList('sys_user_education_type')"
                   :key="item.value"
@@ -432,12 +446,12 @@
           </vxe-table-column>
           <vxe-table-column field="entranceDate" title="入学日期" :edit-render="{}">
             <template v-slot:edit="scope" >
-              <vxe-input v-model="scope.row.entranceDate" placeholder="入学日期" type="date"></vxe-input>
+              <vxe-input v-model="scope.row.entranceDate" placeholder="入学日期" type="date" transfer></vxe-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="graduationDate" title="毕业日期" :edit-render="{}">
             <template v-slot:edit="scope" >
-              <vxe-input v-model="scope.row.graduationDate" placeholder="毕业日期" type="date"></vxe-input>
+              <vxe-input v-model="scope.row.graduationDate" placeholder="毕业日期" type="date"transfer></vxe-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="educationCertificateUrl" title="学历证书" :edit-render="{}">
@@ -466,8 +480,7 @@
                 :on-success="(res,file)=> handleAvatarSuccess4(res,file,scope)"
                 :before-upload="beforeAvatarUpload"
                 :show-file-list="false">
-                <img v-if="scope.row.degreeCertificateUrl" :src="scope.row.degreeCertificateUrl" class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                <img :src="scope.row.degreeCertificateUrl" class="avatar">
               </el-upload>
             </template>
           </vxe-table-column>
@@ -493,7 +506,6 @@
           class="vxe-table-element"
           :data="sysUserContracts"
           style="margin-left: 5em"
-          height="500"
           @cell-click="dbclickFun"
           @edit-closed=""
           highlight-current-row
@@ -503,7 +515,7 @@
         <vxe-table-column field="contractType" title="合同类型"
                           :edit-render="{name: '$select', options: $dictUtils.getDictList('sys_user_contract_type')}">
           <template v-slot:edit="scope">
-            <vxe-select v-model="scope.row.contractType">
+            <vxe-select v-model="scope.row.contractType" transfer>
               <vxe-option
                 v-for="item in $dictUtils.getDictList('sys_user_contract_type')"
                 :key="item.value"
@@ -525,22 +537,22 @@
         </vxe-table-column>
         <vxe-table-column field="contractBeginDate" title="合同起始日期" :edit-render="{}">
           <template v-slot:edit="scope">
-            <vxe-input v-model="scope.row.contractBeginDate" placeholder="合同起始日期" type="date"></vxe-input>
+            <vxe-input v-model="scope.row.contractBeginDate" placeholder="合同起始日期" type="date"transfer></vxe-input>
           </template>
         </vxe-table-column>
         <vxe-table-column field="contractEndDate" title="合同终止日期" :edit-render="{}">
           <template v-slot:edit="scope">
-            <vxe-input v-model="scope.row.contractEndDate" placeholder="合同终止日期" type="date"></vxe-input>
+            <vxe-input v-model="scope.row.contractEndDate" placeholder="合同终止日期" type="date"transfer></vxe-input>
           </template>
         </vxe-table-column>
         <vxe-table-column field="probationEndDate" title="试用期结束日期" :edit-render="{}">
           <template v-slot:edit="scope">
-            <vxe-input v-model="scope.row.probationEndDate" placeholder="试用期结束日期" type="date"></vxe-input>
+            <vxe-input v-model="scope.row.probationEndDate" placeholder="试用期结束日期" type="date"transfer></vxe-input>
           </template>
         </vxe-table-column>
         <vxe-table-column field="processingDate" title="办理日期" :edit-render="{}">
           <template v-slot:edit="scope">
-            <vxe-input v-model="scope.row.processingDate" placeholder="办理日期" type="date"></vxe-input>
+            <vxe-input v-model="scope.row.processingDate" placeholder="办理日期" type="date"transfer></vxe-input>
           </template>
         </vxe-table-column>
           <vxe-table-column field="fileUrl" title="文件" :edit-render="{}">
@@ -555,7 +567,7 @@
                 :before-upload="beforeAvatarUpload"
                 :show-file-list="false">
                 <img v-if="scope.row.fileUrl" :src="scope.row.fileUrl" class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                <i v-else class="el-icon-plus avatar-uploader-table"></i>
               </el-upload>
             </template>
           </vxe-table-column>
@@ -580,7 +592,6 @@
           class="vxe-table-element"
           :data="sysUserLanguages"
           style="margin-left: 5em"
-          height="500"
           @cell-click="dbclickFun"
           @edit-closed=""
           highlight-current-row
@@ -589,7 +600,7 @@
           <vxe-table-column field="languages" title="语种"
                             :edit-render="{name: '$select', options: $dictUtils.getDictList('sys_user_languages')}">
             <template v-slot:edit="scope">
-              <vxe-select v-model="scope.row.languages">
+              <vxe-select v-model="scope.row.languages" transfer>
                 <vxe-option
                   v-for="item in $dictUtils.getDictList('sys_user_languages')"
                   :key="item.value"
@@ -602,7 +613,7 @@
           <vxe-table-column field="level" title="熟练程度"
                             :edit-render="{name: '$select', options: $dictUtils.getDictList('sys_user_proficiency')}">
             <template v-slot:edit="scope">
-              <vxe-select v-model="scope.row.level">
+              <vxe-select v-model="scope.row.level" transfer>
                 <vxe-option
                   v-for="item in $dictUtils.getDictList('sys_user_proficiency')"
                   :key="item.value"
@@ -619,7 +630,7 @@
           </vxe-table-column>
           <vxe-table-column field="getDate" title="获证日期" :edit-render="{}">
             <template v-slot:edit="scope">
-              <vxe-input v-model="scope.row.getDate" placeholder="获证日期" type="date"></vxe-input>
+              <vxe-input v-model="scope.row.getDate" placeholder="获证日期" type="date"transfer></vxe-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="fileUrl" title="文件" :edit-render="{}">
@@ -634,7 +645,7 @@
                 :before-upload="beforeAvatarUpload"
                 :show-file-list="false">
                 <img v-if="scope.row.fileUrl" :src="scope.row.fileUrl" class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                <i v-else class="el-icon-plus avatar-uploader-table"></i>
               </el-upload>
             </template>
           </vxe-table-column>
@@ -659,7 +670,6 @@
           class="vxe-table-element"
           :data="sysUserWorks"
           style="margin-left: 5em"
-          height="500"
           @cell-click="dbclickFun"
           @edit-closed=""
           highlight-current-row
@@ -682,12 +692,12 @@
           </vxe-table-column>
           <vxe-table-column field="beginDate" title="起始日期" :edit-render="{}">
             <template v-slot:edit="scope">
-              <vxe-input v-model="scope.row.beginDate" placeholder="起始日期" type="date"></vxe-input>
+              <vxe-input v-model="scope.row.beginDate" placeholder="起始日期" type="date"transfer></vxe-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="endDate" title="终止日期" :edit-render="{}">
             <template v-slot:edit="scope">
-              <vxe-input v-model="scope.row.endDate" placeholder="终止日期" type="date"></vxe-input>
+              <vxe-input v-model="scope.row.endDate" placeholder="终止日期" type="date"transfer></vxe-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="witness" title="证明人" :edit-render="{}">
@@ -721,7 +731,6 @@
           class="vxe-table-element"
           :data="sysUserCertificates"
           style="margin-left: 5em"
-          height="500"
           @cell-click="dbclickFun"
           @edit-closed=""
           highlight-current-row
@@ -730,7 +739,7 @@
           <vxe-table-column field="certificateName" title="证书名称"
                             :edit-render="{name: '$select', options: $dictUtils.getDictList('sys_user_certificate_name')}">
             <template v-slot:edit="scope">
-              <vxe-select v-model="scope.row.certificateName">
+              <vxe-select v-model="scope.row.certificateName" transfer>
                 <vxe-option
                   v-for="item in $dictUtils.getDictList('sys_user_certificate_name')"
                   :key="item.value"
@@ -747,12 +756,12 @@
           </vxe-table-column>
           <vxe-table-column field="regineDate" title="注册日期" :edit-render="{}">
             <template v-slot:edit="scope">
-              <vxe-input v-model="scope.row.regineDate" placeholder="注册日期" type="date"></vxe-input>
+              <vxe-input v-model="scope.row.regineDate" placeholder="注册日期" type="date"transfer></vxe-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="issueDate" title="发证日期" :edit-render="{}">
             <template v-slot:edit="scope">
-              <vxe-input v-model="scope.row.issueDate" placeholder="发证日期" type="date"></vxe-input>
+              <vxe-input v-model="scope.row.issueDate" placeholder="发证日期" type="date"transfer></vxe-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="issuingAuthority" title="发证机关" :edit-render="{}">
@@ -763,7 +772,7 @@
           <vxe-table-column field="major" title="专业"
                             :edit-render="{name: '$select', options: $dictUtils.getDictList('sys_user_major')}">
             <template v-slot:edit="scope">
-              <vxe-select v-model="scope.row.major">
+              <vxe-select v-model="scope.row.major" transfer>
                 <vxe-option
                   v-for="item in $dictUtils.getDictList('sys_user_major')"
                   :key="item.value"
@@ -785,7 +794,7 @@
                 :before-upload="beforeAvatarUpload"
                 :show-file-list="false">
                 <img v-if="scope.row.fileUrl" :src="scope.row.fileUrl" class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                <i v-else class="el-icon-plus avatar-uploader-table"></i>
               </el-upload>
             </template>
           </vxe-table-column>
@@ -810,7 +819,6 @@
           class="vxe-table-element"
           :data="sysUserTitles"
           style="margin-left: 5em"
-          height="500"
           @cell-click="dbclickFun"
           @edit-closed=""
           highlight-current-row
@@ -828,7 +836,7 @@
           </vxe-table-column>
           <vxe-table-column field="getDate" title="取得日期" :edit-render="{}">
             <template v-slot:edit="scope">
-              <vxe-input v-model="scope.row.getDate" placeholder="取得日期" type="date"></vxe-input>
+              <vxe-input v-model="scope.row.getDate" placeholder="取得日期" type="date"transfer></vxe-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="getAccess" title="取得途径" :edit-render="{}">
@@ -853,7 +861,7 @@
                 :before-upload="beforeAvatarUpload"
                 :show-file-list="false">
                 <img v-if="scope.row.fileUrl" :src="scope.row.fileUrl" class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                <i v-else class="el-icon-plus avatar-uploader-table"></i>
               </el-upload>
             </template>
           </vxe-table-column>
@@ -878,7 +886,6 @@
           class="vxe-table-element"
           :data="sysUserFamilys"
           style="margin-left: 5em"
-          height="500"
           @cell-click="dbclickFun"
           @edit-closed=""
           highlight-current-row
@@ -902,7 +909,7 @@
           <vxe-table-column field="sex" title="成员性别"
                             :edit-render="{name: '$select', options: $dictUtils.getDictList('sex')}">
             <template v-slot:edit="scope">
-              <vxe-select v-model="scope.row.sex">
+              <vxe-select v-model="scope.row.sex" transfer>
                 <vxe-option
                   v-for="item in $dictUtils.getDictList('sex')"
                   :key="item.value"
@@ -938,7 +945,6 @@
           class="vxe-table-element"
           :data="sysUserTrains"
           style="margin-left: 5em"
-          height="500"
           @cell-click="dbclickFun"
           @edit-closed=""
           highlight-current-row
@@ -961,18 +967,18 @@
           </vxe-table-column>
           <vxe-table-column field="trainBeginDate" title="培训起始日期" :edit-render="{}">
             <template v-slot:edit="scope">
-              <vxe-input v-model="scope.row.trainBeginDate" placeholder="培训起始日期" type="date"></vxe-input>
+              <vxe-input v-model="scope.row.trainBeginDate" placeholder="培训起始日期" type="date"transfer></vxe-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="trainEndDate" title="培训终止日期" :edit-render="{}">
             <template v-slot:edit="scope">
-              <vxe-input v-model="scope.row.trainEndDate" placeholder="培训终止日期" type="date"></vxe-input>
+              <vxe-input v-model="scope.row.trainEndDate" placeholder="培训终止日期" type="date"transfer></vxe-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="trainLevel" title="培训类型"
                             :edit-render="{name: '$select', options: $dictUtils.getDictList('sys_user_training_type')}">
             <template v-slot:edit="scope">
-              <vxe-select v-model="scope.row.trainLevel">
+              <vxe-select v-model="scope.row.trainLevel" transfer>
                 <vxe-option
                   v-for="item in $dictUtils.getDictList('sys_user_training_type')"
                   :key="item.value"
@@ -1004,7 +1010,7 @@
                 :before-upload="beforeAvatarUpload"
                 :show-file-list="false">
                 <img v-if="scope.row.fileUrl" :src="scope.row.fileUrl" class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                <i v-else class="el-icon-plus avatar-uploader-table"></i>
               </el-upload>
             </template>
           </vxe-table-column>
@@ -1034,7 +1040,6 @@
           class="vxe-table-element"
           :data="sysUserDuties"
           style="margin-left: 5em"
-          height="500"
           @cell-click="dbclickFun"
           @edit-closed=""
           highlight-current-row
@@ -1047,12 +1052,12 @@
           </vxe-table-column>
           <vxe-table-column field="postBeginDate" title="任职开始日期" :edit-render="{}">
             <template v-slot:edit="scope">
-              <vxe-input v-model="scope.row.postBeginDate" placeholder="任职开始日期" type="date"></vxe-input>
+              <vxe-input v-model="scope.row.postBeginDate" placeholder="任职开始日期" type="date"transfer></vxe-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="postEndDate" title="任职结束日期" :edit-render="{}">
             <template v-slot:edit="scope">
-              <vxe-input v-model="scope.row.postEndDate" placeholder="任职结束日期" type="date"></vxe-input>
+              <vxe-input v-model="scope.row.postEndDate" placeholder="任职结束日期" type="date"transfer></vxe-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="postOffice" title="任职机构" :edit-render="{}">
@@ -1081,7 +1086,6 @@
           class="vxe-table-element"
           :data="sysUserRewards"
           style="margin-left: 5em"
-          height="500"
           @cell-click="dbclickFun"
           @edit-closed=""
           highlight-current-row
@@ -1090,7 +1094,7 @@
           <vxe-table-column field="rewardsType" title="奖惩类型"
                             :edit-render="{name: '$select', options: $dictUtils.getDictList('sys_user_rewards')}">
             <template v-slot:edit="scope">
-              <vxe-select v-model="scope.row.rewardsType">
+              <vxe-select v-model="scope.row.rewardsType" transfer>
                 <vxe-option
                   v-for="item in $dictUtils.getDictList('sys_user_rewards')"
                   :key="item.value"
@@ -1146,7 +1150,6 @@
           class="vxe-table-element"
           :data="sysUserAchievements"
           style="margin-left: 5em"
-          height="500"
           @cell-click="dbclickFun"
           @edit-closed=""
           highlight-current-row
@@ -1175,7 +1178,7 @@
           <vxe-table-column field="post" title="担任职务"
                             :edit-render="{name: '$select', options: $dictUtils.getDictList('sys_user_post')}">
             <template v-slot:edit="scope">
-              <vxe-select v-model="scope.row.post">
+              <vxe-select v-model="scope.row.post" transfer>
                 <vxe-option
                   v-for="item in $dictUtils.getDictList('sys_user_post')"
                   :key="item.value"
@@ -1211,7 +1214,6 @@
           class="vxe-table-element"
           :data="sysUserArchives"
           style="margin-left: 5em"
-          height="500"
           @cell-click="dbclickFun"
           @edit-closed=""
           highlight-current-row
@@ -1220,7 +1222,7 @@
           <vxe-table-column field="archivesName" title="项目名称"
                             :edit-render="{name: '$select', options: $dictUtils.getDictList('sys_user_archives')}">
             <template v-slot:edit="scope">
-              <vxe-select v-model="scope.row.archivesName">
+              <vxe-select v-model="scope.row.archivesName" transfer>
                 <vxe-option
                   v-for="item in $dictUtils.getDictList('sys_user_archives')"
                   :key="item.value"
@@ -1247,7 +1249,7 @@
                 :before-upload="beforeAvatarUpload"
                 :show-file-list="false">
                 <img v-if="scope.row.fileUrl" :src="scope.row.fileUrl" class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                <i v-else class="el-icon-plus avatar-uploader-table"></i>
               </el-upload>
             </template>
           </vxe-table-column>
@@ -1292,6 +1294,7 @@
   export default {
     data () {
       return {
+        urlStart: '',
         scope: {},
         visable: false,
         gridData: [],