弹窗样式，bug

src/components/DialogSetDeptLeader/index.vue

@@ -20,7 +20,7 @@
           <el-radio-group v-model="treeReId" >
             <div style="display: flex; flex-direction: column">
               <el-radio class="mb-[12px] flex a-start" v-for="item in userList1" :key="item.userId" :value="item.userId">
-                <div>
+                <div class="flex f-c ">
                   <span style="margin: 0;line-height: 1;color: #333 !important;">{{ item.name }}</span>
                   <span style="line-height: 1;color: #333 !important;" class="ml-[10px]">{{ item.mobile }}</span>
                 </div>
@@ -38,10 +38,10 @@
         <div v-show=" userList1.length < 1">
           <el-radio-group v-model="treeReId" v-show="userList.length > 0">
             <div style="display: flex; flex-direction: column">
-              <el-radio class="mb-[12px] flex a-start" v-for="item in userList" :key="item.userId" :value="item.userId">
-                <div>
+              <el-radio class="mb-[20px] flex a-start" v-for="item in userList" :key="item.userId" :value="item.userId">
+                <div class="flex f-c ">
                   <span style="margin: 0;line-height: 1;color: #333 !important;">{{ item.name }}</span>
-                  <span style="line-height: 1;color: #333 !important;" class="ml-[10px]">{{ item.mobile }}</span>
+                  <span style="line-height: 1;color: #333 !important;" class="mt-[10px]">{{ item.mobile }}</span>
                 </div>
 
               </el-radio>
@@ -51,7 +51,7 @@
       </div>
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="handleClose">取消</el-button>
+          <el-button class="border-[#0083FF] color-[#0083FF]" @click="handleClose">取消</el-button>
           <el-button type="primary" @click="submit">
             确认
           </el-button>
@@ -327,7 +327,7 @@ const handleClose = () => {
 
   >div:last-child {
     padding: 0 32px;
-    border-left: 1px solid #ccc;
+    border-left: 1px solid #eee;
   }
 }
 </style>

src/views/operationManagement/modules/addCard.vue

@@ -19,7 +19,7 @@
         <el-input v-model="bankForm.bankAddress" :disabled="props.userInfo.isRead"></el-input>
       </el-form-item>
       <div style="display: flex; justify-content: flex-end" v-if="!props.userInfo.isRead">
-        <el-button @click="onSubmit(BankRef, 0)">取消</el-button>
+        <el-button class=" border-[#0083FF] text-[#0083FF] " @click="onSubmit(BankRef, 0)">取消</el-button>
         <el-button type="primary" @click="onSubmit(BankRef, 1)">确定</el-button>
       </div>
     </el-form>

src/views/operationManagement/modules/allocation.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="allocation">
-    <el-input v-model="searchValue" style="width: 240px" placeholder="输入姓名、手机号、工号查找" clearable @change="handleFilter">
-      <template #prefix>
-        <el-icon class="el-input__icon"><Search /></el-icon>
-      </template>
+    <el-input v-model="searchValue" style="width: 100%" class="search-input2" placeholder="输入姓名、手机号、工号查找" :prefix-icon="Search" clearable >
+      <template #append>
+                  <el-button text type="primary"  @click="handleFilter" >搜索</el-button>
+                </template>
     </el-input>
-    <el-row :gutter="20" class="allocation-content">
+    <el-row :gutter="20" class="dialog-mian">
       <el-col :span="12" style="padding: 10px; box-sizing: border-box;">
         <el-tree
           ref="treeRef"
@@ -17,20 +17,23 @@
           @node-click="handleNodeClick"
         />
       </el-col>
-      <el-col :span="12" style="padding: 10px; box-sizing: border-box;border-left: 1px solid #ccc;">
+      <el-col :span="12" style="padding: 10px; box-sizing: border-box;border-left: 1px solid #eee;">
         <el-radio-group v-if="userList?.length>0" v-model="radioValue" class="allocation-radio">
-          <el-radio v-for="item in userListSelect" :value="item.id" size="large">
-            <template #default>
-              <div>{{ item.name }}</div>
-              <div>{{ item.id }}</div>
-            </template>
+          <div style="display: flex; flex-direction: column">
+            <el-radio v-for="item in userListSelect" :value="item.id" size="large" class="mb-[20px] flex items-start">
+            <div class="flex f-c ">
+              <span style="margin: 0;line-height: 1;color: #333 !important;">{{ item.name }}</span>
+              <span style="line-height: 1;color: #333 !important;" class="mt-[10px]">{{ item.id }}</span>
+            </div>
           </el-radio>
+          </div>
+
         </el-radio-group>
         <el-empty v-else description="暂无数据" />
       </el-col>
     </el-row>
-    <div style="display: flex; justify-content: flex-end">
-      <el-button @click="onSubmit('取消')">取消</el-button>
+    <div style="display: flex;justify-content: flex-end">
+      <el-button class=" border-[#0083FF] text-[#0083FF] " @click="onSubmit('取消')">取消</el-button>
       <el-button type="primary" @click="onSubmit('确定')">确定</el-button>
     </div>
   </div>
@@ -39,6 +42,7 @@
 <script setup lang="ts">
 import api from '@/api'
 import { ElMessage } from 'element-plus'
+import { Search } from "@element-plus/icons-vue";
 
 const cascaderProps = {
   value: 'id',
@@ -173,20 +177,56 @@ defineExpose({
 </script>
 
 <style scoped lang="scss">
+:deep(.search-input2) {
+  --el-border-color: #F7F7F7;
+  --el-input-hover-border-color: #F7F7F7;
+}
+
+:deep(.search-input2 >.el-input__wrapper) {
+  background-color: #F7F7F7;
+}
+
+:deep(.search-input2 .el-button__text--expand) {
+  color: #0083FF;
+
+  &::before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    width: 1px;
+    height: 24px;
+    background: #EEEEEE;
+    margin: auto;
+  }
+}
 .allocation {
   .allocation-content {
     width: 100%;
     margin: 20px;
-    border: 1px solid #ccc;
     border-radius: 5px;
-    .allocation-radio{
-      display: flex;
-      flex-direction: column;
-      :deep(.el-radio) {
-        margin-right: 0;
-        margin-top: 10px;
-      }
-    }
+  }
+}
+
+.dialog-mian {
+  display: flex;
+  border-radius: 10px;
+  min-height: 500px;
+  margin-top: 24px;
+
+
+
+  >div {
+    width: 50%;
+    box-sizing: border-box;
+    max-height: 500px;
+    overflow-y: auto;
+  }
+
+  >div:last-child {
+    padding: 0 32px;
+    border-left: 1px solid #eee;
   }
 }
 </style>

src/views/personnel/memberManagement.vue

@@ -140,7 +140,7 @@
         </el-table>
         <template #footer>
           <div class="dialog-footer">
-            <el-button @click="dialogVisible = false">取消</el-button>
+            <el-button class="border-[#0083FF] color-[#0083FF]" @click="dialogVisible = false">取消</el-button>
             <el-button type="primary" @click="confirmTransfer">
               确认转移
             </el-button>
@@ -153,7 +153,11 @@
 
       <el-dialog v-model="changeDeptDialog" title="变更机构" width="600" append-to-body draggable>
         <div>
-          <el-input v-model="filterText" style="width: 240px" placeholder="请输入机构名称查找" :prefix-icon="Search" />
+          <el-input v-model="filterText" style="width: 100%" class="search-input2" placeholder="请输入机构名称查找" :prefix-icon="Search">
+            <template #append>
+                  <el-button text type="primary" class="" >搜索</el-button>
+                </template>
+          </el-input>
           <el-tree ref="treeRef" style="max-width: 600px" class="filter-tree" :data="deptTreeData" :props="defaultProps"
             :default-expand-all="true" :expand-on-click-node="false" :filter-node-method="filterNode"
             @node-click="treeClick">
@@ -171,7 +175,7 @@
         </div>
         <template #footer>
           <div class="dialog-footer">
-            <el-button @click="changeDeptDialog = false">取消</el-button>
+            <el-button class="border-[#0083FF] color-[#0083FF]" @click="changeDeptDialog = false">取消</el-button>
             <el-button type="primary" @click="submitChangeDept"> 确认 </el-button>
           </div>
         </template>
@@ -736,10 +740,34 @@ function manySetDeptUser() {
 
 </script>
 <style lang="scss" scoped>
+:deep(.search-input2) {
+  --el-border-color: #F7F7F7;
+  --el-input-hover-border-color: #F7F7F7;
+}
+
+:deep(.search-input2 >.el-input__wrapper) {
+  background-color: #F7F7F7;
+}
+
+:deep(.search-input2 .el-button__text--expand) {
+  color: #0083FF;
+
+  &::before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    width: 1px;
+    height: 24px;
+    background: #EEEEEE;
+    margin: auto;
+  }
+}
 :deep( .el-tree-node>.el-tree-node__content .el-icon) {
   color: #666;
 }
-:deep(.el-input-group__append) {
+:deep(.member-tree .el-input-group__append) {
   color: #fff;
   background: linear-gradient( 91deg, #4FCAFF 0%, #2B62FF 100%);
 }

src/views/personnel/modules/editInstitution.vue

@@ -2,7 +2,7 @@
   <div class="institution">
     <PageMain title="基本信息" class="vh100">
       <el-form label-position="top" label-width="auto" :rules="rules" :model="form" ref="ruleFormRef" class="h-full">
-        <div class="h-[calc(100%-64px)]">
+        <div class="h-[calc(100%-100px)]">
           <el-row :gutter="24">
             <el-col :span="12">
               <el-form-item label="机构名称" prop="name">
@@ -50,7 +50,7 @@
             </el-col>
           </el-row>
         </div>
-        <div>
+        <div class="flex justify-center h-64px items-center b-t-(1px solid #F4F4F4)">
           <el-button @click="router.back()">取 消</el-button>
           <el-button type="primary" @click="confirm(ruleFormRef)">
             保 存

src/views/receivable/handingFee/ticket.vue

@@ -146,6 +146,57 @@
         <el-button type="primary" @click="handleAddSubmit">确定</el-button>
       </template>
     </el-dialog>
+    <el-dialog v-model="countShow" width="600" title="开票并结算">
+      <el-form ref="CountForm" :model="countForm" :rules="countRules" label-width="120">
+        <el-form-item prop="invoiceParty" label="开票方">
+          <el-input v-model="countForm.invoiceParty" placeholder="请输入"></el-input>
+        </el-form-item>
+        <el-form-item prop="receivableSupervisePremium" label="应收手续费">
+          <el-input v-model="countForm.receivableSupervisePremium" placeholder="请输入"></el-input>
+        </el-form-item>
+        <el-form-item prop="overinflatedAmount" label="虚增金额">
+          <el-input v-model="countForm.overinflatedAmount" placeholder="请输入"></el-input>
+        </el-form-item>
+        <el-form-item prop="taxPoint" label="税点">
+          <el-input v-model="countForm.taxPoint" placeholder="请输入"></el-input>
+        </el-form-item>
+        <el-form-item prop="receivableSupervisePremium" label="应收金额">
+          <el-input v-model="countForm.receivableSupervisePremium" placeholder="请输入"></el-input>
+        </el-form-item>
+        <el-form-item prop="actualReceivedAmount" label="是实收金额">
+          <el-input v-model="countForm.actualReceivedAmount" placeholder="请输入"></el-input>
+        </el-form-item>
+        <el-form-item prop="receivePaymentDate" label="收款日期">
+          <el-date-picker v-model="countForm.receivePaymentDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss" />
+        </el-form-item>
+        <el-form-item prop="attachmentIds" label="收款凭证" class="upload-btn">
+          <el-upload style="margin: 0 10px 10px 0" :auto-upload="false" multiple v-if="!countForm.h"
+            :show-file-list="false" accept=".png, .jpg, .jpeg" @change="uploadImage" drag>
+            <el-button size="large" icon="Plus" />
+          </el-upload>
+          <div class="imageDiv" v-for="(item, index) in imageUrl" :key="item">
+            <img :src="item" />
+            <div class="model">
+              <span class="icon-view" @click="handelViewImage(item, index)">
+                <el-icon>
+                  <View />
+                </el-icon>
+              </span>
+              <span class="icon-del" @click="handelDelImage(item, index)">
+                <el-icon>
+                  <Delete />
+                </el-icon>
+              </span>
+            </div>
+          </div>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button plain @click="handelCancel">取消</el-button>
+        <el-button type="primary" @click="handelComfirm(CountForm)">确定</el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -164,6 +215,8 @@ const multipleSearch = ref('')
 const orderTypesearch = ref('')
 const yearrangesearch = ref('')
 const datesearch = ref('')
+const countShow = ref(false)
+const  countForm = ref({})
 //获取保险公司协议
 const getByCompanyId = () => {
   api.dispatchApi.getByCompanyIdt(route.query.id).then((res: any) => {
@@ -321,6 +374,7 @@ const handleBack = () => {
   router.back()
 }
 const handleTicket = () => {
+  countShow.value = true
   api.financeApi.invoicingCheck({
     incomeIds: selectedList.value.map(v => v.id),
     companyId: route.query.id,
@@ -394,6 +448,7 @@ const initCompany = () => {
     }
   })
 }
+
 onMounted(() => {
   initData()
   initCompany()
@@ -456,4 +511,4 @@ onMounted(() => {
     height: 80px;
   }
 }
-</style>
+</style>