打款验证

.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 金邻助家管理系统
+VITE_APP_TITLE = 金邻助家后台管理系统
 
 # 开发环境配置
 VITE_APP_ENV = 'development'

index.html

@@ -6,8 +6,8 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-  <link rel="icon" href="/favicon.ico">
-  <title>金邻助家管理系统</title>
+  <link rel="icon" href="/logo.png">
+  <title>金邻助家后台管理系统</title>
   <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
   <style>
     html,

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.8.9",
-  "description": "金邻助家管理系统",
+  "description": "金邻助家后台管理系统",
   "author": "金邻助家",
   "license": "MIT",
   "type": "module",

src/layout/components/Navbar.vue

@@ -5,7 +5,7 @@
     <top-nav v-if="settingsStore.topNav" id="topmenu-container" class="topmenu-container" />
 
     <div class="right-menu">
-      <template v-if="appStore.device !== 'mobile'">
+      <!-- <template v-if="appStore.device !== 'mobile'">
         <header-search id="header-search" class="right-menu-item" />
 
         <el-tooltip content="源码地址" effect="dark" placement="bottom">
@@ -28,7 +28,10 @@
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
-      </template>
+      </template> -->
+      <div class="right-menu-box">
+        欢迎您，<span class="right-menu-nickName">{{ userStore.user.nickName }}</span> <span class="right-menu-areaName">({{ areaName }})</span>
+      </div>
       <div class="avatar-container">
         <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
           <div class="avatar-wrapper">
@@ -67,11 +70,22 @@ import RuoYiDoc from '@/components/RuoYi/Doc'
 import useAppStore from '@/store/modules/app'
 import useUserStore from '@/store/modules/user'
 import useSettingsStore from '@/store/modules/settings'
+import { computed } from 'vue'
 
 const appStore = useAppStore()
 const userStore = useUserStore()
+console.log("TCL: userStore", userStore.user)
 const settingsStore = useSettingsStore()
 
+const areaE = {
+  "0":"平台",
+  "1":"区域",
+  "2":"服务中心",
+}
+const areaName = computed(()=>{
+    return areaE[userStore.user.dept.areaType]
+})
+
 function toggleSideBar() {
   appStore.toggleSideBar()
 }
@@ -212,4 +226,12 @@ function toggleTheme() {
     }
   }
 }
+
+.right-menu-nickName {
+color: #409EFF;
+  .right-menu-areaName {
+
+  }
+
+}
 </style>

src/store/modules/user.js

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

src/utils/request.js

@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: import.meta.env.VITE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 600000
 })
 
 // request拦截器

src/views/components/ListPage/Table.vue

@@ -30,7 +30,7 @@
                 <el-table-column v-else :label="item.label" :prop="item.tableProp || item.prop"
                     :width="item.width" show-overflow-tooltip></el-table-column>
             </template>
-            <el-table-column label="操作"  class-name="small-padding fixed-width" v-if="isScope">
+            <el-table-column label="操作"  class-name="small-padding fixed-width" v-if="isScope" fixed="right" min-width="120">
                 <template #default="scope">
                     <el-space wrap>
                         <div v-for="item in scopeBtns" :key="item.key">

src/views/finance/settlement/index.vue

@@ -1,8 +1,8 @@
 <template>
     <div>
         <ListPage :column="tableColumn" :tableApi="settlementOrderList" :isSelect="true" :scopeBtns="scopeBtns"
-            :searchBtns="searchBtns" ref="userTableRef" tableKey="mainOrderId" :tabList="tabList"
-            tabsearchKey="orderStatus" defaultTab="10" />
+            :searchBtns="searchBtns" ref="userTableRef" tableKey="orderId" :tabList="tabList"
+            :tabsearchKey="tabKey" defaultTab="10" />
         <DialogForm ref="dialogFormRef" :title="dialogData.title" :column="dialogData.column" @submit="submitForm"
             labelWidth="120px" />
     </div>
@@ -31,12 +31,15 @@ const {
     tableColumn,
     dialogData,
     tabList,
+    tabKey,
+    
 } = useFun[jlzj_area_type.value](proxy);
 const {
     dialogFormRef,
     userTableRef,
     searchBtns,
-    scopeBtns
+    scopeBtns,
+    submitForm
 } = useData({ proxy, jlzj_area_type });
 console.log('tableColumn', tableColumn);
 

src/views/finance/settlement/useData.js

@@ -1,5 +1,5 @@
 import { ref, computed } from "vue";
-import { regionalsettlement, serviceSettlement } from "@/api/finance/settlement.js";
+import { applyOrderSettlement, serviceSettlement } from "@/api/finance/settlement.js";
 
 //功能
 export default ({ proxy, jlzj_area_type }) => {
@@ -9,8 +9,8 @@ export default ({ proxy, jlzj_area_type }) => {
 
     const dialogType = ref('applyfor');
     //打开弹窗 applyfor:申请  settlement：结算
-    const openDialog = (params, type) => {
-        console.log('ids', ids);
+    const openDialog = (data, type) => {
+		console.log("TCL: openDialog -> data", data)
         try {
             dialogType.value = type;
 
@@ -18,10 +18,11 @@ export default ({ proxy, jlzj_area_type }) => {
             let disabledData = {};
 
             if (type === 'applyfor') {
-                params = { mainOrderIds: params }
+
+                params = { mainOrderIds: data }
             }
             if (type === 'settlement') {
-                params = { ...params }
+                params = { ...data }
                 disabledData = {
                     payeeMethod: true,
                     payeeAccount: true,
@@ -51,9 +52,11 @@ export default ({ proxy, jlzj_area_type }) => {
     }
 
     const applyforSubmit = (data) => {
+		console.log("TCL: applyforSubmit -> data", data)
+		
         return new Promise(async (resolve, reject) => {
             const parmas = {
-                mainOrderIds: data.mainOrderIds,
+                secondOrderIds: data.mainOrderIds,
                 payeeMethod: data.payeeMethod,
                 payeeAccount: data.payeeAccount,
                 payeeBankName: data.payeeBankName,
@@ -83,7 +86,7 @@ export default ({ proxy, jlzj_area_type }) => {
             let res = null;
             //平台结算区域的申请
             if (jlzj_area_type.value === '0') {
-                res = await applyOrderSettlement(parmas)
+                res = await applyforSubmit(parmas)
             }
             //区域结算平台的申请
 
@@ -104,7 +107,7 @@ export default ({ proxy, jlzj_area_type }) => {
     const submitForm = async (data) => {
 
         try {
-            console.log('submit', data);
+            console.log('submit', data,dialogType.value);
             //申请
             if (dialogType.value === 'applyfor') {
                 await applyforSubmit(data);
@@ -166,7 +169,7 @@ export default ({ proxy, jlzj_area_type }) => {
                 key: 'examine',
                 func: (row) => {
                     console.log(row)
-                    openDialog([row.mainOrderId], 'applyfor')
+                    openDialog([row.orderId], 'applyfor')
                 },
                 // show: (row) => {
                 //     return jlzj_area_type.value === '20'
@@ -178,7 +181,7 @@ export default ({ proxy, jlzj_area_type }) => {
                 key: 'examine',
                 func: (row) => {
                     console.log(row)
-                    openDialog([row.mainOrderId], 'settlement')
+                    openDialog([row.orderId], 'settlement')
                 },
                 show: () => jlzj_area_type.value === '10',//区域公司才可以结算
             },
@@ -190,7 +193,7 @@ export default ({ proxy, jlzj_area_type }) => {
                     console.log(row)
                     router.push({
                         path: "/order-details",
-                        query: { id: row.mainOrderId }
+                        query: { id: row.orderId }
                     });
                 }
             },

src/views/finance/settlement/usePlatform.js

@@ -30,50 +30,73 @@ export default (proxy) => {
                 {
                     label: '订单开始时间',
                     prop: 'orderTime',
+                    width:'160px',
+                    isSearch: true,
+                    type: 'date',
+                    keys: ['orderTimeStart', 'orderTimeEnd'],
                 },
                 {
                     label: '订单完成时间',
                     prop: 'serviceEndTime',
+                    width:'160px',
+                    isSearch: true,
+                    type: 'date',
+                    keys: ['serviceEndTimeStart', 'serviceEndTimeEnd'],
                 },
                 {
                     label: '用户名称',
                     prop: 'userName',
+                    width:'140px',
+                    type: 'input',
+                    isSearch: true
                 },
                 {
                     label: '志愿者名称',
                     prop: 'volunteerName',
+                    width:'140px',
+                    type: 'input',
+                    isSearch: true
                 },
                 {
                     label: '服务项目',
-                    prop: 'businessDescribe',
+                    prop: 'businessTierName',
+                    width:'170px'
                 },
                 {
                     label: '订单总金额（元）',
                     prop: 'orderTotalPrice',
+                    width:'140px'
                 },
                 {
                     label: '订单状态',
                     prop: 'orderStatus',
                     type: 'dict',
-                    dict: lrr_service_status
+                    dict: lrr_service_status,
+                    isSearch: true
                 },
                 {
                     label: '区域公司',
                     prop: 'areaName',
                     type: 'input',
-                    isSearch: true
+                    isSearch: true,
+                    width:'150px'
                 },
                 {
                     label: '区域公司抽成金额',
                     prop: 'areaDistributionAmount',
+                     width:'150px'
                 },
                 {
                     label: '区域公司结算状态',
                     prop: 'areaSettlementStatus',
+                    type: 'dict',
+                    dict: area_settlement_status,
+                    width:'150px',
                 },
                 {
                     label: '区域公司结算时间',
                     prop: 'areaSettlementTime',
+                    width:'150px'
                 }
             ]
             ),
@@ -82,7 +105,7 @@ export default (proxy) => {
             column: [
                 {
                     label: '收款方式',
-                    prop: 'payerMethod',
+                    prop: 'payeeMethod',
                     type: 'select',
                     dictionary: 'settlement_application_payee_method',
                     rules: [
@@ -91,7 +114,7 @@ export default (proxy) => {
                 },
                 {
                     label: '收款账号',
-                    prop: 'payerAccount',
+                    prop: 'payeeAccount',
                     type: 'input',
                     rules: [
                         { required: true, message: '请输入收款账号', trigger: 'change' }
@@ -100,7 +123,7 @@ export default (proxy) => {
                 },
                 {
                     label: '收款银行名称',
-                    prop: 'payerBankName',
+                    prop: 'payeeBankName',
                     type: 'input',
                     rules: [
                         { required: true, message: '请输入收款银行名称', trigger: 'change' }
@@ -109,7 +132,7 @@ export default (proxy) => {
                 },
                 {
                     label: '收款人',
-                    prop: 'payerName',
+                    prop: 'payeeName',
                     type: 'input',
                     rules: [
                         { required: true, message: '请输入收款人', trigger: 'change' }
@@ -117,12 +140,13 @@ export default (proxy) => {
                 },
                 {
                     label: '收款人备注',
-                    prop: 'payerRemark',
+                    prop: 'payeeRemark',
                     type: 'textarea',
                 },
             ]
         },
         tabList,
+        tabKey:'areaSettlementStatus'
       
     }
 }

src/views/finance/withdrawal/index.vue

@@ -23,16 +23,21 @@
 
         <el-dialog v-model="dialogVerify" title="打款验证" :before-close="verifyCancel" width="500px">
             <div class="verify-box">
-                    <div>业务类型： 支付宝</div>
-                    <div>打款单总金额：<span class="price-size">¥{{ dialogRow.actualPaymentAmount }}</span></div>
-                </div>
-                <div class="yzm-box">
-                   <div><span style="color:red">*</span>
-                   验证密码：</div>
-                   <div>
-                    <el-input v-model="verifyCode" placeholder="请输入短信验证码" clearable />
-                   </div>
+                <div>业务类型： 支付宝</div>
+                <div>打款单总金额：<span class="price-size">¥{{ dialogRow.actualPaymentAmount }}</span></div>
+                <div>手机号： {{  userStore.phonenumber.slice(0, 3) + "****" + userStore.phonenumber.slice(7)}}</div>
+            </div>
+            <div class="yzm-box">
+                <div><span style="color:red">*</span>
+                    验证密码：</div>
+                <div>
+                    <el-input v-model="verifyCode" placeholder="请输入短信验证码" clearable >
+                        <template #append>
+                            <a @click="getCode">{{code === 60?'获取验证码':code}}</a>
+                        </template>
+                    </el-input>
                 </div>
+            </div>
             <template #footer>
                 <div class="dialog-footer">
                     <el-button @click="verifyCancel">取消</el-button>
@@ -51,10 +56,10 @@
 import { ref, computed } from 'vue';
 import ListPage from '@/views/components/ListPage/index.vue';
 import DialogForm from '@/views/components/DialogForm/index.vue';
-
+import useUserStore from '@/store/modules/user'
 import useData from './useData';
 
-
+ const userStore = useUserStore();
 const { proxy } = getCurrentInstance();
 
 const jlzj_area_type = ref('0');// 0: 平台 10:区域公司
@@ -75,12 +80,14 @@ const {
     dialogColumn,
     dialogRow,
     dialogVerify,
+    code,
     getList,
     submitForm,
     submitVerify,
     verifyClose,
     getVerList,
-    verifyCancel
+    verifyCancel,
+    getCode
 } = useData({ proxy, jlzj_area_type });
 console.log('tableColumn', dialogData);
 

src/views/finance/withdrawal/useData.js

@@ -1,4 +1,4 @@
-import { ref, computed } from "vue";
+import { ref, computed, watch } from "vue";
 import { auditorOrderSettlement,sendCode } from "@/api/finance/settlement.js";
 import useUserStore from '@/store/modules/user'
 import { takeList, paymentList, takeApproval, careatPayment,payoutCheck } from "@/api/finance/withdrawal.js";
@@ -75,7 +75,7 @@ export default ({ proxy, jlzj_area_type }) => {
                 rejectReason: data.rejectReason
             }
             const res = await takeApproval(parmas);
-            if (up_res.code === 200) {
+            if (res.code === 200) {
                 proxy.$modal.msgSuccess("审核成功");
                 return;
             }
@@ -146,27 +146,28 @@ export default ({ proxy, jlzj_area_type }) => {
                 payPassword:verifyCode.value
             }
             const res = await payoutCheck(parmas);
-            if (up_res.code === 200) {
+            if (res.code === 200) {
                 proxy.$modal.msgSuccess("操作成功");
+                verifyCancel();
+                userTableRef.value.resetForm();
                 return;
             }
             proxy.$modal.msgSuccess(res.msg);
         } catch (error) {
             console.log('error', error);
-        } finally {
-            userTableRef.value.resetForm();
-            dialogVerifyRef.value.handleDialog(false);
         }
     }
     const verifyCancel =()=>{
         dialogVerify.value = false;
         dialogRow.value = {};
         verifyCode.value ='';
+        clearInterval(timer);
+        timer = null;
+        code.value = 60;
     }
 
     const getVerList = async (data) => {
         console.log('dialogRow.value',dialogRow.value);
-        
         return takeList({ ...data,paymentRecordId: dialogRow.value.volunteerPaymentRecordsId})
     }
 
@@ -174,7 +175,40 @@ export default ({ proxy, jlzj_area_type }) => {
         dialogPlay.value = false;
         dialogRow.value = {};
     }
-    
+    const code = ref(60);
+    let timer=null;
+    watch(()=>code.value,()=>{
+        if(code.value === 0){
+            clearInterval(timer);
+            timer = null;
+            code.value = 60;
+        }
+    })
+    const getCode = async() => {
+        const userStore = useUserStore();
+        console.log("TCL: exportFile -> userStore", userStore)
+        if(code.value < 60){
+            proxy.$modal.msgError('请勿重复获取！');
+            return;
+        }
+        if(userStore.phonenumber && code.value === 60){
+            try {
+                const res =await sendCode(userStore.phonenumber);
+                if(res.code === 200){
+                    proxy.$modal.msgSuccess(res.msg);
+                    timer = setInterval(()=>{
+                        code.value--;
+                        console.log('定时器');
+                        
+                    },1000)
+                }else{
+                    proxy.$modal.msgError(res.msg);
+                }
+            } catch (error) {
+                console.log("TCL: exportFile -> error", error)
+            }
+        }
+    }
 
     return {
         dialogFormRef,
@@ -185,6 +219,7 @@ export default ({ proxy, jlzj_area_type }) => {
         dialogRow,
         dialogVerify,
         verifyCode,
+        code,
         openDialog,
         exportFile,
         submitForm,
@@ -193,21 +228,22 @@ export default ({ proxy, jlzj_area_type }) => {
         verifyClose,
         getVerList,
         verifyCancel,
+        getCode,
         tabList: [
             {
-                title: '待审核',
+                title: '每日流失审核',
                 name: '1'
             },
             {
-                title: '已驳回',
+                title: '审核驳回',
                 name: '3'
             },
             {
-                title: '待处理',
+                title: '支付宝提现申请单',
                 name: '2'
             },
             {
-                title: '打款单',
+                title: '打款单记录',
                 name: '4'
             },
         ],
@@ -232,17 +268,22 @@ export default ({ proxy, jlzj_area_type }) => {
                 label: '账户类型',
                 prop: 'payType',
                 type: 'dict',
-                dict: pay_type
+                dict: pay_type,
+                isSearch: true,
             },
             {
                 label: '申请时间',
                 prop: 'createTime',
+                type: 'date',
+                isSearch: true,
+                keys: ['start', 'end'],
             },
             {
                 label: '数据情况',
                 prop: 'isPay',
                 type: 'dict',
-                dict: is_pay
+                dict: is_pay,
+                isSearch: true,
             },
             {
                 label: '审核状态',
@@ -261,22 +302,28 @@ export default ({ proxy, jlzj_area_type }) => {
             {
                 label: '打款单总金额',
                 prop: 'totalPaymentAmount',
+                type: 'input',
+                isSearch: true
             },
             {
                 label: '实际打款金额',
                 prop: 'actualPaymentAmount',
+                type: 'input',
+                isSearch: true
             },
             {
                 label: '验证状态',
                 prop: 'isVerified',
                 type: 'dict',
-                dict: is_verified
+                dict: is_verified,
+                isSearch: true
             },
             {
                 label: '打款状态',
                 prop: 'paymentStatus',
                 type: 'dict',
-                dict: payment_status
+                dict: payment_status,
+                isSearch: true
             },
             {
                 label: '打款结果',
@@ -290,10 +337,16 @@ export default ({ proxy, jlzj_area_type }) => {
             {
                 label: '生成时间',
                 prop: 'createTime',
+                type: 'date',
+                isSearch: true,
+                keys: ['createTimeStart', 'createTimeEnd'],
             },
             {
                 label: '打款时间',
                 prop: 'paymentTime',
+                type: 'date',
+                isSearch: true,
+                keys: ['paymentTimeStart', 'paymentTimeEnd'],
             },
         ]),
         dialogColumn:ref([
@@ -424,23 +477,8 @@ export default ({ proxy, jlzj_area_type }) => {
                 key: 'details',
                 func: async(row) => {
                     console.log(row)
-                    const userStore = useUserStore();
-					console.log("TCL: exportFile -> userStore", userStore)
-                    if(userStore.phonenumber){
-                        try {
-                            const res =await sendCode(userStore.phonenumber);
-                            if(res.code === 200){
-                                proxy.$modal.msgSuccess(res.msg);
-                            }else{
-                                proxy.$modal.msgError(res.msg);
-                            }
-                        } catch (error) {
-							console.log("TCL: exportFile -> error", error)
-                        }finally {
-                            dialogRow.value = row;
-                            dialogVerify.value = true;
-                        }
-                    }
+                    dialogRow.value = row;
+                    dialogVerify.value = true;
                     
                 },
                 show: (row) => {

src/views/system/dept/index.vue

@@ -31,12 +31,12 @@
       <el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId"
          :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
          <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
-         <el-table-column prop="orderNum" label="排序" ></el-table-column>
-         <el-table-column prop="provinceName" label="省级" ></el-table-column>
-         <el-table-column prop="cityName" label="市级" ></el-table-column>
-         <el-table-column prop="districtName" label="区级" ></el-table-column>
-         <el-table-column prop="distributionRatio" label="分账比例" ></el-table-column>
-         <el-table-column prop="areaType" label="类型" >
+         <el-table-column prop="orderNum" label="排序"></el-table-column>
+         <el-table-column prop="provinceName" label="省级"></el-table-column>
+         <el-table-column prop="cityName" label="市级"></el-table-column>
+         <el-table-column prop="districtName" label="区级"></el-table-column>
+         <el-table-column prop="distributionRatio" label="分账比例"></el-table-column>
+         <el-table-column prop="areaType" label="类型">
             <template #default="scope">
                <dict-tag :options="jlzj_area_type" :value="scope.row.areaType" />
             </template>
@@ -48,7 +48,7 @@
                <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
             </template>
          </el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime" >
+         <el-table-column label="创建时间" align="center" prop="createTime">
             <template #default="scope">
                <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
@@ -61,8 +61,7 @@
                   v-hasPermi="['system:dept:add']">新增</el-button>
                <el-button v-if="scope.row.parentId != 0" link type="primary" icon="Delete"
                   @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
-                  <el-button link type="primary" icon="Setting"
-                  @click="handleSetting(scope.row)">区域设置</el-button>
+               <!-- <el-button link type="primary" icon="Setting" @click="handleSetting(scope.row)">区域设置</el-button> -->
             </template>
          </el-table-column>
       </el-table>
@@ -131,7 +130,7 @@
                   <el-form-item label="部门状态">
                      <el-radio-group v-model="form.status">
                         <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
-                           }}</el-radio>
+                        }}</el-radio>
                      </el-radio-group>
                   </el-form-item>
                </el-col>
@@ -139,7 +138,8 @@
 
                <el-col :span="12">
                   <el-form-item label="分账比例" prop="distributionRatio">
-                     <el-input v-model="form.distributionRatio" placeholder="请输入分账比例" maxlength="50" type="number"  :step="0.1" :min="0" :max="1">
+                     <el-input v-model="form.distributionRatio" placeholder="请输入分账比例" maxlength="50" type="number"
+                        :step="0.1" :min="0" :max="1">
                         <!-- <template #append>%</template> -->
                      </el-input>
                   </el-form-item>
@@ -148,11 +148,11 @@
                   <el-form-item label="状态">
                      <el-radio-group v-model="form.areaType">
                         <el-radio v-for="dict in jlzj_area_type" :key="dict.value" :value="dict.value">{{ dict.label
-                           }}</el-radio>
+                        }}</el-radio>
                      </el-radio-group>
                   </el-form-item>
                </el-col>
-               
+
             </el-row>
          </el-form>
          <template #footer>
@@ -170,7 +170,7 @@ import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild }
 import address from "./address";
 const router = useRouter();
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable,jlzj_area_type } = proxy.useDict("sys_normal_disable","jlzj_area_type");
+const { sys_normal_disable, jlzj_area_type } = proxy.useDict("sys_normal_disable", "jlzj_area_type");
 
 const deptList = ref([]);
 const open = ref(false);
@@ -222,9 +222,9 @@ function getList() {
 /** 取消按钮 */
 function cancel() {
    open.value = false;
-   province.value =[];
-   city.value =[];
-   district.value =[];
+   province.value = [];
+   city.value = [];
+   district.value = [];
    reset();
 }
 
@@ -300,7 +300,7 @@ function handleUpdate(row) {
 function submitForm() {
    proxy.$refs["deptRef"].validate(valid => {
       if (valid) {
-         if(form.value.distributionRatio){
+         if (form.value.distributionRatio) {
             form.value.distributionRatio = Number(form.value.distributionRatio);
          }
          if (form.value.deptId != undefined) {
@@ -331,13 +331,13 @@ function handleDelete(row) {
 }
 
 function handleSetting(row) {
-  if (!row.pointList) row.pointList = JSON.stringify([]) // 如果pointList为空，则设置为空数组
-  console.log(row, '>>>>>>row000009999');
-  
-  
-  const coordinate = row ? JSON.stringify(row) :'[]'
-  localStorage.setItem('mapDeptRow', coordinate);
-  router.push({ path: '/map-setting', query: { deptId: row.deptId } });
+   if (!row.pointList) row.pointList = JSON.stringify([]) // 如果pointList为空，则设置为空数组
+   console.log(row, '>>>>>>row000009999');
+
+
+   const coordinate = row ? JSON.stringify(row) : '[]'
+   localStorage.setItem('mapDeptRow', coordinate);
+   router.push({ path: '/map-setting', query: { deptId: row.deptId } });
 }
 
 function handleAreaOption() {

vite.config.js

@@ -39,8 +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.122:9527',
+          target: 'http://192.168.100.101:9527',
+          // target: 'http://192.168.100.122:9527',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         },