应收款管理、弹窗组件修改

index.html

@@ -33,6 +33,9 @@
       color: #383838;
       color: #383838;
       padding: 0.2em 0;
       padding: 0.2em 0;
     }
     }
+    .el-dialog__header.dialog-header.show-close {
+      padding-right: 0 ;
+    }
 
 
     #loader-wrapper {
     #loader-wrapper {
       position: fixed;
       position: fixed;

src/App.vue

 <template>
 <template>
+  
+  <el-watermark :font="font" :content="content">
     <router-view />
     <router-view />
+  </el-watermark>
 </template>
 </template>
 
 
 <script setup>
 <script setup>
 import useSettingsStore from '@/store/modules/settings'
 import useSettingsStore from '@/store/modules/settings'
 import { handleThemeStyle } from '@/utils/theme'
 import { handleThemeStyle } from '@/utils/theme'
+import { reactive } from 'vue'
+const font = reactive({
+  color: 'rgba(0, 0, 0, .15)',
+})
+
+const content = reactive('csf')
 
 
 onMounted(() => {
 onMounted(() => {
   nextTick(() => {
   nextTick(() => {

src/api/financial/commission.js

@@ -256,3 +256,19 @@ export function expectedFortuneStatistics(data) {
     data: data
     data: data
   })
   })
 }
 }
+// 入账记录查询
+export function commissionEntryRecord(data) {
+  return request({
+    url: '/csf/api/commission/compare/records',
+    method: 'post',
+    data: data
+  })
+}
+// 入账操作记录查询
+export function commissionEntryEditRecords(data) {
+  return request({
+    url: '/csf/api/commission/edit/records',
+    method: 'post',
+    data: data
+  })
+}

src/components/commonDialog/index.vue

@@ -8,7 +8,8 @@
       :close-on-click-modal="closeOnClickModal"
       :close-on-click-modal="closeOnClickModal"
       :before-close="handleClose"
       :before-close="handleClose"
       center
       center
-      :show-close="false"
+      :show-close="showClose"
+      header-class="dialog-header"
     >
     >
       <template #header>
       <template #header>
         <div class="titleBox">{{ dialogTitle }}</div>
         <div class="titleBox">{{ dialogTitle }}</div>
@@ -18,7 +19,7 @@
       </div>
       </div>
 
 
       <template #footer>
       <template #footer>
-        <div class="dialog-footer">
+        <div class="dialog-footer" v-if="showAction">
           <!-- 取消按钮 -->
           <!-- 取消按钮 -->
           <el-button type="info" plain v-if="showCancle" @click="close">{{ cancleText }}</el-button>
           <el-button type="info" plain v-if="showCancle" @click="close">{{ cancleText }}</el-button>
           <!-- 确认按钮 -->
           <!-- 确认按钮 -->
@@ -50,7 +51,14 @@ const props = defineProps({
     type: String,
     type: String,
     default: '确认'
     default: '确认'
   },
   },
-
+  showAction: {
+    type: Boolean,
+    default: true
+  },
+  showClose: {
+    type: Boolean,
+    default: false
+  },
   showConfirm: {
   showConfirm: {
     type: Boolean,
     type: Boolean,
     default: true
     default: true
@@ -78,11 +86,9 @@ const props = defineProps({
 const showDialog = ref(props.openDialog)
 const showDialog = ref(props.openDialog)
 const emit = defineEmits(['confirm', 'close'])
 const emit = defineEmits(['confirm', 'close'])
 const close = () => {
 const close = () => {
-  showDialog.value = false
   emit('close')
   emit('close')
 }
 }
 const confirm = () => {
 const confirm = () => {
-  showDialog.value = false
   emit('confirm')
   emit('confirm')
 }
 }
 const handleClose = done => {
 const handleClose = done => {
@@ -109,6 +115,7 @@ watch(
   justify-content: center;
   justify-content: center;
   align-items: center;
   align-items: center;
   padding: 15px 0;
   padding: 15px 0;
+  color: rgba(0,0,0,0.9);
 }
 }
 .content {
 .content {
   padding: 0 15px;
   padding: 0 15px;
@@ -120,4 +127,5 @@ watch(
   align-items: center;
   align-items: center;
   padding: 20px 0;
   padding: 20px 0;
 }
 }
+
 </style>
 </style>