优化

src/store/modules/user.js

@@ -13,7 +13,8 @@ const useUserStore = defineStore(
       avatar: '',
       roles: [],
       permissions: [],
-      phonenumber:''
+      phonenumber:'',
+      areaType:'', //部门类型
     }),
     actions: {
       // 登录
@@ -52,6 +53,7 @@ const useUserStore = defineStore(
             this.avatar = avatar
 
             this.phonenumber = user.phonenumber;
+            this.areaType =user.dept.areaType;
             resolve(res)
           }).catch(error => {
             reject(error)

src/views/finance/examine/index.vue

@@ -14,9 +14,11 @@ import ListPage from '@/views/components/ListPage/index.vue';
 import DialogForm from '@/views/components/DialogForm/index.vue';
 import { list } from "@/api/finance/settlement.js";
 import useData from './useData';
+import useUserStore from '@/store/modules/user'
 const { proxy } = getCurrentInstance();
 
-const jlzj_area_type = ref('0');// 0: 平台 10:区域公司
+const userStore = useUserStore();
+const jlzj_area_type = ref(userStore.areaType);// 0: 平台 10:区域公司 20:服务中心
 const {
     tableColumn,
     dialogData,

src/views/finance/examine/useData.js

@@ -85,7 +85,7 @@ export default ({proxy,jlzj_area_type}) => {
         submitForm,
         tableColumn:ref([
             {
-                label: jlzj_area_type === '0'?'区域中心':'服务中心',
+                label: jlzj_area_type.value === '0'?'区域中心':'服务中心',
                 prop: 'applicantType',
                 type: 'input',
                 isSearch: true

src/views/finance/settlement/index.vue

@@ -13,14 +13,15 @@ import { ref, computed } from 'vue';
 import ListPage from '@/views/components/ListPage/index.vue';
 import DialogForm from '@/views/components/DialogForm/index.vue';
 import { settlementOrderList } from "@/api/finance/settlement.js";
+import useUserStore from '@/store/modules/user'
 
 import useData from './useData';
 import usePlatform from './usePlatform';
 import useRegional from './useRegional';
 import useService from './useService';
 const { proxy } = getCurrentInstance();
-
-const jlzj_area_type = ref('0');// 0: 平台 10:区域公司 20:服务中心
+const userStore = useUserStore();
+const jlzj_area_type = ref(userStore.areaType);// 0: 平台 10:区域公司 20:服务中心
 const useFun ={
     "0":usePlatform,
     "10":useRegional,

src/views/finance/settlement/usePlatform.js

@@ -23,33 +23,33 @@ export default (proxy) => {
             [
                 {
                     label: '订单号',
-                    prop: 'mainOrderId',
+                    prop: 'outTradeNo',
                     type: 'input',
                     isSearch: true
                 },
                 {
                     label: '订单开始时间',
-                    prop: 'createTime',
+                    prop: 'orderTime',
                 },
                 {
                     label: '订单完成时间',
-                    prop: '',
+                    prop: 'serviceEndTime',
                 },
                 {
                     label: '用户名称',
-                    prop: 'clientName',
+                    prop: 'userName',
                 },
                 {
                     label: '志愿者名称',
-                    prop: 'name',
+                    prop: 'volunteerName',
                 },
                 {
                     label: '服务项目',
-                    prop: 'projectName',
+                    prop: 'businessDescribe',
                 },
                 {
                     label: '订单总金额（元）',
-                    prop: 'serviceTotalPrice',
+                    prop: 'orderTotalPrice',
                 },
                 {
                     label: '订单状态',
@@ -59,7 +59,9 @@ export default (proxy) => {
                 },
                 {
                     label: '区域公司',
-                    prop: '',
+                    prop: 'areaName',
+                    type: 'input',
+                    isSearch: true
                 },
                 {
                     label: '区域公司抽成金额',
@@ -67,11 +69,11 @@ export default (proxy) => {
                 },
                 {
                     label: '区域公司结算状态',
-                    prop: '',
+                    prop: 'areaSettlementStatus',
                 },
                 {
                     label: '区域公司结算时间',
-                    prop: '',
+                    prop: 'areaSettlementTime',
                 }
             ]
             ),
@@ -80,7 +82,7 @@ export default (proxy) => {
             column: [
                 {
                     label: '收款方式',
-                    prop: 'payeeMethod',
+                    prop: 'payerMethod',
                     type: 'select',
                     dictionary: 'settlement_application_payee_method',
                     rules: [
@@ -89,7 +91,7 @@ export default (proxy) => {
                 },
                 {
                     label: '收款账号',
-                    prop: 'payeeAccount',
+                    prop: 'payerAccount',
                     type: 'input',
                     rules: [
                         { required: true, message: '请输入收款账号', trigger: 'change' }
@@ -98,7 +100,7 @@ export default (proxy) => {
                 },
                 {
                     label: '收款银行名称',
-                    prop: 'payeeBankName',
+                    prop: 'payerBankName',
                     type: 'input',
                     rules: [
                         { required: true, message: '请输入收款银行名称', trigger: 'change' }
@@ -107,7 +109,7 @@ export default (proxy) => {
                 },
                 {
                     label: '收款人',
-                    prop: 'payeeName',
+                    prop: 'payerName',
                     type: 'input',
                     rules: [
                         { required: true, message: '请输入收款人', trigger: 'change' }
@@ -115,7 +117,7 @@ export default (proxy) => {
                 },
                 {
                     label: '收款人备注',
-                    prop: 'payeeRemark',
+                    prop: 'payerRemark',
                     type: 'textarea',
                 },
             ]

src/views/finance/settlement/useRegional.js

@@ -22,33 +22,33 @@ export default (proxy) => {
         tableColumn:ref([
             {
                 label: '订单号',
-                prop: 'mainOrderId',
+                prop: 'outTradeNo',
                 type: 'input',
                 isSearch: true
             },
             {
                 label: '订单开始时间',
-                prop: 'createTime',
+                prop: 'orderTime',
             },
             {
                 label: '订单完成时间',
-                prop: '',
+                prop: 'serviceEndTime',
             },
             {
                 label: '用户名称',
-                prop: 'clientName',
+                prop: 'userName',
             },
             {
                 label: '志愿者名称',
-                prop: 'name',
+                prop: 'volunteerName',
             },
             {
                 label: '服务项目',
-                prop: 'projectName',
+                prop: 'businessDescribe',
             },
             {
                 label: '订单总金额（元）',
-                prop: 'serviceTotalPrice',
+                prop: 'orderTotalPrice',
             },
             {
                 label: '订单状态',
@@ -59,19 +59,21 @@ export default (proxy) => {
             },
             {
                 label: '服务中心',
-                prop: '',
+                prop: 'serviceCentreName',
+                type: 'input',
+                isSearch: true
             },
             {
                 label: '抽成金额',
-                prop: 'serviceCentreDistributionAmount',
+                prop: 'areaDistributionAmount',
             },
             {
                 label: '结算状态',
-                prop: '',
+                prop: 'areaSettlementStatus',
             },
             {
                 label: '结算时间',
-                prop: '',
+                prop: 'areaSettlementTime',
             },
             {
                 label: '服务中心抽成金额',
@@ -79,7 +81,7 @@ export default (proxy) => {
             },
             {
                 label: '服务中心结算状态',
-                prop: '',
+                prop: 'serviceCentreSettlementStatus',
             },
         ]),
         dialogData: {

src/views/finance/settlement/useService.js

@@ -22,33 +22,33 @@ export default (proxy) => {
         tableColumn:ref([
             {
                 label: '订单号',
-                prop: 'mainOrderId',
+                prop: 'outTradeNo',
                 type: 'input',
                 isSearch: true
             },
             {
                 label: '订单开始时间',
-                prop: 'createTime',
+                prop: 'orderTime',
             },
             {
                 label: '订单完成时间',
-                prop: '',
+                prop: 'serviceEndTime',
             },
             {
                 label: '用户名称',
-                prop: 'clientName',
+                prop: 'userName',
             },
             {
                 label: '志愿者名称',
-                prop: 'name',
+                prop: 'volunteerName',
             },
             {
                 label: '服务项目',
-                prop: 'projectName',
+                prop: 'businessDescribe',
             },
             {
                 label: '订单总金额（元）',
-                prop: 'serviceTotalPrice',
+                prop: 'orderTotalPrice',
             },
             {
                 label: '订单状态',
@@ -58,15 +58,15 @@ export default (proxy) => {
             },
             {
                 label: '抽成金额',
-                prop: '',
+                prop: 'serviceCentreDistributionAmount',
             },
             {
                 label: '结算状态',
-                prop: '',
+                prop: 'serviceCentreSettlementStatus',
             },
             {
                 label: '结算时间',
-                prop: '',
+                prop: 'serviceCentreSettlementTime',
             },
         ]),
         dialogData: {

vite.config.js

@@ -39,7 +39,8 @@ export default defineConfig(({ mode, command }) => {
         '/dev-api': {
           // target: 'http://192.168.100.95:9527',
           // target: 'https://zybooks.tech/prod-api', 
-          target: 'http://192.168.100.101:9527',
+          // target: 'http://192.168.100.101:9527',
+          target: 'http://192.168.100.122:9527',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         },