Merge branch 'master' of https://172.16.32.165/lighter/vue-intergration-platform

src/layout/HeaderV2/function-list/UserInfo.vue

@@ -30,11 +30,17 @@
 
       <div class="button">
         <el-button type="primary" plain @click="emit('password')">修改密码</el-button>
+        <el-button type="warning" plain @click="uploadSignature">上传签名</el-button>
         <el-button type="danger" plain @click="emit('logout')">退出登录</el-button>
       </div>
     </template>
   </el-popover>
-
+  <el-dialog title="上传签名" v-model="signatureDialog" :close-on-click-modal="false" :close-on-press-escape="false"
+             destroy-on-close>
+    <!-- LUpload组件 -->
+    <LUpload :otherData="paramData" :headers="headerData" v-model="urlList" :multiple="false"
+             :sendUrl="sendUrl" :signatureData="signatureData" @closeSignatureDialog="closeSignatureDialog"/>
+  </el-dialog>
 </template>
 
 <script setup name='UserInfo' lang="ts">
@@ -42,6 +48,7 @@ import {genTextPortrait} from '@/utils/portrait'
 import UserInfoDisplay from "@/layout/HeaderV2/function-list/UserInfoDisplay.vue";
 import {useUserStore} from "@/pinia/user-store";
 import {stringNotBlank} from "@/utils/blank-utils";
+import LUpload from "@/views/settings/permissions/LUpload.vue";
 
 const emit = defineEmits(['password', 'logout'])
 
@@ -58,6 +65,35 @@ const errorHandler = () => {
   return true
 }
 
+// 上传签名图片
+const baseurl = import.meta.env.VITE_BASE_URL
+const signatureData = ref({
+  uploadUrl: baseurl + '/settings/setAutographImage',
+  coversList: [],
+  fileList: [],
+  param: {code: ''},
+  limitCountImg: 1,
+  pSize: 2,
+  showBtnDealImg: true,
+  noneBtnImg: false,
+})
+const signatureDialog = ref(false)
+const uploadSignature = () => {
+  signatureData.value.param.code = userInfo.code
+  paramData.value.code = userInfo.code
+  signatureDialog.value = true
+}
+const closeSignatureDialog = (flag:any) => {
+  if (flag) {
+    signatureDialog.value = false
+  }
+}
+const sendUrl = ref(baseurl+'/settings/setAutographImage')
+const urlList = ref([])
+const headerData = {
+  token: localStorage.token,
+}
+const paramData = ref({code:''})
 </script>
 
 <style scoped lang="scss">

src/views/settings/permissions/UserRoleSettings.vue

@@ -73,12 +73,11 @@
           <el-table-column prop="socialNo" label="身份证"></el-table-column>
           <el-table-column prop="phoneNo" label="手机号码"></el-table-column>
           <el-table-column prop="ybCode" label="医保编码"></el-table-column>
-          <el-table-column label="操作" fixed="right" width="180">
+          <el-table-column label="操作" fixed="right" width="108">
             <template v-slot="scope">
               <el-button-group>
                 <el-button text bg type="primary" @click="clickToEdit(scope.$index, scope.row)">编辑</el-button>
                 <el-button text bg size="small" @click="viewUserRoles(scope.row)" v-if="competence">角色</el-button>
-                <el-button text bg type="warning" size="small" @click="uploadSignature(scope.row)">上传签名</el-button>
               </el-button-group>
             </template>
           </el-table-column>
@@ -123,12 +122,6 @@
                                @close="editDialog = false"
                                :index="roleIndex"
                                @changeTheData="changeTheData"/>
-  <el-dialog title="上传签名" v-model="signatureDialog" :close-on-click-modal="false" :close-on-press-escape="false"
-             destroy-on-close>
-    <!-- LUpload组件 -->
-    <LUpload :otherData="paramData" :headers="headerData" v-model="urlList" :multiple="false"
-             :sendUrl="sendUrl" :signatureData="signatureData" @closeSignatureDialog="closeSignatureDialog"/>
-  </el-dialog>
 </template>
 
 <script setup>
@@ -349,37 +342,4 @@ const dropDownSelection = [
   {code: 9, name: '全部'},
 ]
 
-// 上传签名图片
-const baseurl = import.meta.env.VITE_BASE_URL
-const signatureData = ref({
-  uploadUrl: baseurl + '/settings/setAutographImage',
-  coversList: [],
-  fileList: [],
-  param: {code: ''},
-  limitCountImg: 1,
-  pSize: 2,
-  showBtnDealImg: true,
-  noneBtnImg: false,
-})
-const signatureDialog = ref(false)
-const uploadSignature = (val) => {
-  signatureData.value.param.code = val.code
-  paramData.value.code = val.code
-  if (val.autographImag) {
-    signatureData.value.coversList.push(val.autographImag)
-  }
-  signatureDialog.value = true
-}
-const closeSignatureDialog = (flag) => {
-  if (flag) {
-    signatureDialog.value = false
-  }
-}
-const sendUrl = ref(baseurl+'/settings/setAutographImage')
-const urlList = ref([])
-const headerData = {
-  token: localStorage.token,
-}
-const paramData = ref({})
-
 </script>