结算

src/layout/components/Navbar.vue

@@ -31,7 +31,9 @@
       </template> -->
       <div class="right-menu-box">
         欢迎您，<span class="right-menu-nickName">{{ userStore.user.nickName }}</span> 
-        ( <dict-tag :options="jlzj_area_type" :value="userStore.user.dept.status" /> )
+        <!-- ( <dict-tag :options="jlzj_area_type" :value="userStore.user.dept.areaType" /> ) -->
+        ( {{ userStore.user.dept.deptName }} )
+
       </div>
       <div class="avatar-container">
         <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">

src/views/components/DialogForm/index.vue

@@ -33,6 +33,12 @@
                         :disabled="disables[item.prop]"></el-date-picker>
                 </el-form-item>
 
+                <el-form-item :label="item.label" v-if="item.type === 'picker'" :prop="item.prop" :rules="item.rules">
+                    <el-date-picker v-model="form[item.prop]" value-format="YYYY-MM-DD" type="datetime"
+                     :disabled="disables[item.prop]"></el-date-picker>
+                </el-form-item>
+
+
                 <!-- 下拉框选择 -->
                 <el-form-item :label="item.label" v-if="item.type === 'select' && item.dictionary" :prop="item.prop"
                     :rules="item.rules">

src/views/components/ListPage/Search.vue

@@ -82,7 +82,7 @@ const handlerFormData = () => {
         const parmas = {}
         for (let i = 0; i < array.length; i++) {
             const element = array[i];
-            if (element.type === 'date' && formInline[element.prop].length > 0) {
+            if (element.type === 'date' && formInline[element.prop]&&formInline[element.prop].length > 0) {
                 parmas[element.keys[0]] = formInline[element.prop][0];
                 parmas[element.keys[1]] = formInline[element.prop][1];
             } else if (formInline[element.prop]) {

src/views/components/ListPage/Table.vue

@@ -2,7 +2,7 @@
     <div class="app-container">
         <!-- 表格数据 -->
         <el-table v-loading="loading" :data="data" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" v-if="isSelect"/>
+            <el-table-column type="selection" width="55" align="center" v-if="isSelect" fixed/>
             <template v-for="item in column" :key="item.prop">
 
                 <el-table-column v-if="item.type === 'img'" :label="item.label" :prop="item.tableProp || item.prop"
@@ -28,7 +28,7 @@
                 </el-table-column>
 
                 <el-table-column v-else :label="item.label" :prop="item.tableProp || item.prop"
-                    :width="item.width" show-overflow-tooltip></el-table-column>
+                    :width="item.width" show-overflow-tooltip  ></el-table-column>
             </template>
             <el-table-column label="操作"  class-name="small-padding fixed-width" v-if="isScope" fixed="right" min-width="120">
                 <template #default="scope">

src/views/finance/examine/index.vue

@@ -1,8 +1,8 @@
 <template>
     <div>
         <ListPage :column="tableColumn" :tableApi="list" :isSelect="true" :scopeBtns="scopeBtns"
-            :searchBtns="searchBtns" ref="userTableRef" tableKey="mainOrderId" :tabList="tabList"
-            tabsearchKey="orderStatus" defaultTab="10" />
+            :searchBtns="searchBtns" ref="userTableRef" tableKey="id" :tabList="tabList"
+            tabsearchKey="auditorStatus" defaultTab="10" />
         <DialogForm ref="dialogFormRef" :title="dialogData.title" :column="dialogData.column" @submit="submitForm"
             labelWidth="120px" />
     </div>
@@ -26,7 +26,8 @@ const {
     dialogFormRef,
     userTableRef,
     searchBtns,
-    scopeBtns
+    scopeBtns,
+    submitForm
 } = useData({ proxy, jlzj_area_type });
 console.log('tableColumn', tableColumn);
 

src/views/finance/examine/useData.js

@@ -7,8 +7,10 @@ export default ({proxy,jlzj_area_type}) => {
      const userTableRef = ref(null);
      const { 
         lrr_service_status,
-        settlement_application_auditor_status
-     } = proxy.useDict("lrr_service_status","settlement_application_auditor_status");
+        settlement_application_auditor_status,
+        area_settlement_status,
+
+     } = proxy.useDict("lrr_service_status","settlement_application_auditor_status","area_settlement_status");
 
      const tabList =computed(() => {
         let data = []
@@ -24,14 +26,7 @@ export default ({proxy,jlzj_area_type}) => {
      const openDialog = (ids) => {
         console.log('ids', ids);
         try {
-            const disabledData = {
-                // payeeMethod: true,
-                // payeeAccount: true,
-                // payeeBankName: true,
-                // payeeName: true,
-                // payeeRemark: true
-            }
-            dialogFormRef.value.initForm({mainOrderIds:ids}, disabledData)
+            dialogFormRef.value.initForm({ids:ids}, {})
         } catch (error) {
             console.log('error', error);
         } finally {
@@ -56,21 +51,20 @@ export default ({proxy,jlzj_area_type}) => {
         try {
             console.log('submit', data);
             const parmas = {
-                ids: data.mainOrderIds,
+                ids: data.ids,
                 auditorStatus:  data.auditorStatus,
                 auditorRemark: data.auditorRemark
             }
             const res = await auditorOrderSettlement(parmas);
-               if (up_res.code === 200) {
+               if (res.code === 200) {
                     proxy.$modal.msgSuccess("审核成功");
+                    userTableRef.value.resetForm();
+                    dialogFormRef.value.handleDialog(false);
                     return;
                 }
                 proxy.$modal.msgSuccess(res.msg);
         } catch (error) {
             console.log('error', error);
-        } finally {
-            userTableRef.value.resetForm();
-            dialogFormRef.value.handleDialog(false);
         }
     }
 
@@ -86,120 +80,98 @@ export default ({proxy,jlzj_area_type}) => {
         tableColumn:ref([
             {
                 label: jlzj_area_type.value === '0'?'区域中心':'服务中心',
-                prop: 'applicantType',
+                prop: 'areaName',
                 type: 'input',
-                isSearch: true
+                isSearch: true,
+                width:'150px'
             },
             {
-                label: '申请人',
-                prop: 'createBy',
+                label: '订单号',
+                prop: 'outTradeNo',
+                type: 'input',
+                isSearch: true,
+                width:'200px',
             },
             {
-                label: '申请时间',
-                prop: 'createTime',
+                label: '申请人',
+                prop: 'applyUserName',
+                type: 'input',
+                isSearch: true
             },
             {
-                label: '订单号',
-                prop: 'orderId',
+                label: '申请时间',
+                prop: 'applyTime',
+                width:'160px',
+                    isSearch: true,
+                    type: 'date',
+                    keys: ['applyTimeStart', 'applyTimeEnd'],
             },
             {
                 label: '订单开始时间',
-                prop: 'createTime',
+                prop: 'orderTime',
+                width:'160px',
             },
             {
                 label: '订单完成时间',
-                prop: 'updateTime',
+                prop: 'serviceEndTime',
+                width:'160px',
             },
             {
                 label: '用户名称',
-                prop: 'createBy',
+                prop: 'userNickName',
+                width:'140px',
+                type: 'input',
+                isSearch: true
             },
             {
                 label: '志愿者名称',
-                prop: 'updateBy',
-        
+                prop: 'volunteerName',
+                width:'140px',
+                type: 'input',
+                isSearch: true
             },
             {
                 label: '服务项目',
-                prop: '',
+                prop: 'businessTierName',
+                width:'170px'
             },
             {
                 label: '订单总金额（元）',
-                prop: 'amount',
+                prop: 'orderTotalPrice',
+                width:'140px'
             },
             {
                 label: '订单状态',
                 prop: 'orderStatus',
                 type: 'dict',
-                dict: lrr_service_status
+                dict: lrr_service_status,
+                isSearch: false,
+                width:'150px'
             },
             {
-                label: '抽成金额',
-                prop: 'amount',
+                label: '区域公司抽成金额',
+                prop: 'areaDistributionAmount',
+                 width:'150px'
             },
             {
-                label: '结算状态',
-                prop: 'auditorStatus',
+                label: '区域公司结算状态',
+                prop: 'areaSettlementStatus',
+                type: 'dict',
+                dict: area_settlement_status,
+                width:'150px',
             },
             {
                 label: '审核状态',
                 prop: 'auditorStatus',
+                type: 'dict',
+                isSearch: true,
+                dict:settlement_application_auditor_status,
+                width:'150px',
             },
         ]),
         dialogData: {
-            title: '结算申请',
+            title: '审核',
             column: [
-                {
-                    label: '区域',
-                    prop: 'payeeMethod',
-                    type: 'select',
-                    dictionary: 'settlement_application_payee_method',
-                    rules: [
-                        { required: true, message: '请选择收款方式', trigger: 'change' }
-                    ],
-                },
-                {
-                    label: '提交人',
-                    prop: 'payeeAccount',
-                    type: 'input',
-                    rules: [
-                        { required: true, message: '请输入收款账号', trigger: 'change' }
-                    ],
-        
-                },
-                {
-                    label: '区域抽成',
-                    prop: 'payeeBankName',
-                    type: 'input',
-                    rules: [
-                        { required: true, message: '请输入收款银行名称', trigger: 'change' }
-                    ],
-        
-                },
-                {
-                    label: '订单编号',
-                    prop: 'payeeName',
-                    type: 'input',
-                    rules: [
-                        { required: true, message: '请输入收款人', trigger: 'change' }
-                    ],
-                },
-                {
-                    label: '服务项目',
-                    prop: 'payeeName',
-                    type: 'input',
-                    rules: [
-                        { required: true, message: '请输入收款人', trigger: 'change' }
-                    ],
-                },
-                {
-                    label: '订单状态',
-                    prop: 'payeeName',
-                    type: 'input',
-                    rules: [
-                        { required: true, message: '请输入收款人', trigger: 'change' }
-                    ],
-                },
                 {
                     label: '审核状态',
                     prop: 'auditorStatus',
@@ -256,11 +228,11 @@ export default ({proxy,jlzj_area_type}) => {
                 key: 'examine',
                 func: (row) => {
                     console.log(row)
-                    openDialog([row.mainOrderId])
+                    openDialog([row.id])
                 },
-                // show: (row) => {
-                //     return jlzj_area_type.value === '20'
-                // }
+                show:(row)=>{
+                    return row.auditorStatus === '10'
+                }
             },
             {
                 label: '查看详情',

src/views/finance/settlement/index.vue

@@ -3,7 +3,9 @@
         <ListPage :column="tableColumn" :tableApi="settlementOrderList" :isSelect="true" :scopeBtns="scopeBtns"
             :searchBtns="searchBtns" ref="userTableRef" tableKey="orderId" :tabList="tabList"
             :tabsearchKey="tabKey" defaultTab="10" />
-        <DialogForm ref="dialogFormRef" :title="dialogData.title" :column="dialogData.column" @submit="submitForm"
+        <DialogForm ref="dialogFormRef" :title="dialogType ==='settlement'?costdialogData.title : dialogData.title" 
+        :column="dialogType ==='settlement'?costdialogData.column : dialogData.column" 
+        @submit="submitForm"
             labelWidth="120px" />
     </div>
 </template>
@@ -21,7 +23,7 @@ import useRegional from './useRegional';
 import useService from './useService';
 const { proxy } = getCurrentInstance();
 const userStore = useUserStore();
-const jlzj_area_type = ref(userStore.user.dept.status);// 0: 平台 3:区域公司 4:服务中心
+const jlzj_area_type = ref(userStore.user.dept.areaType);// 0: 平台 3:区域公司 4:服务中心
 const useFun ={
     "0":usePlatform,
     "3":useRegional,
@@ -29,7 +31,6 @@ const useFun ={
 }
 const {
     tableColumn,
-    dialogData,
     tabList,
     tabKey,
 } = useFun[jlzj_area_type.value](proxy);
@@ -39,6 +40,9 @@ const {
     userTableRef,
     searchBtns,
     scopeBtns,
+    dialogData,
+    costdialogData,
+    dialogType,
     submitForm
 } = useData({ proxy, jlzj_area_type });
 console.log('tableColumn', tableColumn);

src/views/finance/settlement/useData.js

@@ -17,27 +17,20 @@ export default ({ proxy, jlzj_area_type }) => {
 
     const dialogType = ref('applyfor');
     //打开弹窗 applyfor:申请  settlement：结算
-    const openDialog = (data, type) => {
-		console.log("TCL: openDialog -> data", data)
+    const openDialog = (data, type,row) => {
+		console.log("TCL: openDialog -> data", data,row)
         try {
             dialogType.value = type;
 
-            let params = {};
+            let params = { mainOrderIds: data };
             let disabledData = {};
 
-            if (type === 'applyfor') {
-                params = { mainOrderIds: data }
-            }
-            if (type === 'settlement') {
-                params = { ...data }
-                disabledData = {
-                    payeeMethod: true,
-                    payeeAccount: true,
-                    payeeBankName: true,
-                    payeeName: true,
-                    payeeRemark: true
-                }
-            }
+            // if (type === 'applyfor') {
+            //     params = { mainOrderIds: data }
+            // }
+            // if (type === 'settlement') {
+            //     params = { mainOrderIds: data }
+            // }
 
             dialogFormRef.value.initForm(params, disabledData)
         } catch (error) {
@@ -68,7 +61,8 @@ export default ({ proxy, jlzj_area_type }) => {
                 payeeAccount: data.payeeAccount,
                 payeeBankName: data.payeeBankName,
                 payeeName: data.payeeName,
-                payeeRemark: data.payeeRemark
+                payeeRemark: data.payeeRemark,
+              
             }
             const res = await applyOrderSettlement(parmas);
             if (up_res.code === 200) {
@@ -81,33 +75,32 @@ export default ({ proxy, jlzj_area_type }) => {
     }
 
     const settlementSubmit = async (data) => {
-        return new Promise(async (resolve, reject) => {
-            const parmas = {
-                orderId: data.orderId,
-                payeeId: data.payeeId,
-                payeeName: data.payeeName,
-                payeeBank: data.payeeBank,
-                payeeBankAccount: data.payeeBankAccount,
-                payeeRemark: data.payeeRemark
-            }
-            let res = null;
-            //平台结算区域的申请
-            if (jlzj_area_type.value === QU_YU) {
-                res = await regionalsettlement(parmas)
-            }
+		console.log("TCL: settlementSubmit -> data", data)
+        const parmas = {
+            secondOrderIds: data.mainOrderIds,
+            payerMethod: data.payerMethod,
+            payerAccount: data.payerAccount,
+            payerBankName: data.payerBankName,
+            payerName: data.payerName,
+            payerRemark: data.payerRemark,
+            payerTime:data.payerTime
+        }
+        let res = null;
+        //平台结算区域的申请
+        if (jlzj_area_type.value === PING_TAI ) {
+            res = await regionalsettlement(parmas)
+        }
 
-            //区域结算服务中心
-            if (jlzj_area_type.value === FU_WU_ZHONG_XIN) {
-                res = await serviceSettlement(parmas)
-            }
-            
-            if (up_res.code === 200) {
-                proxy.$modal.msgSuccess("审核成功");
-                resolve()
-            }
-            proxy.$modal.msgSuccess(res.msg);
-            reject()
-        })
+        //区域结算服务中心
+        if (jlzj_area_type.value === QU_YU) {
+            res = await serviceSettlement(parmas)
+        }
+        
+        if (res.code === 200) {
+            proxy.$modal.msgSuccess("审核成功");
+            return;
+        }
+        proxy.$modal.msgSuccess(res.msg);
     }
 
     //申请提交
@@ -132,9 +125,11 @@ export default ({ proxy, jlzj_area_type }) => {
 
 
 
+
     return {
         dialogFormRef,
         userTableRef,
+        dialogType,
         openDialog,
         exportFile,
         submitForm,
@@ -180,10 +175,10 @@ export default ({ proxy, jlzj_area_type }) => {
                     openDialog([row.orderId], 'applyfor')
                 },
                 hasPermi:["finance:apply"],
-                // show:(row)=>{
-				// 	console.log("TCL: exportFile -> row", row.orderStatus === '4')
-                //     return row.orderStatus === '4'
-                // }
+                show:(row)=>{
+					console.log("TCL: exportFile -> row", row.orderStatus === '4')
+                    return row.areaSettlementStatus === '10'
+                }
             },
             {
                 label: '费用结算',
@@ -193,7 +188,11 @@ export default ({ proxy, jlzj_area_type }) => {
                     console.log(row)
                     openDialog([row.orderId], 'settlement')
                 },
-                hasPermi:["finance:settlement"] 
+                hasPermi:["finance:settlement"],
+                show:(row)=>{
+					console.log("TCL: exportFile -> row", row.orderStatus === '4')
+                    return row.areaSettlementStatus === '40'
+                }
             },
             {
                 label: '查看详情',
@@ -208,7 +207,105 @@ export default ({ proxy, jlzj_area_type }) => {
                 },
                 hasPermi:["finance:details"] 
             },
-        ]
+        ],
+        dialogData: {
+            title: '结算申请',
+            column: [
+                {
+                    label: '收款方式',
+                    prop: 'payeeMethod',
+                    type: 'select',
+                    dictionary: 'settlement_application_payee_method',
+                    rules: [
+                        { required: true, message: '请选择收款方式', trigger: 'change' }
+                    ],
+                },
+                {
+                    label: '收款账号',
+                    prop: 'payeeAccount',
+                    type: 'input',
+                    rules: [
+                        { required: true, message: '请输入收款账号', trigger: 'change' }
+                    ],
+        
+                },
+                {
+                    label: '收款银行名称',
+                    prop: 'payeeBankName',
+                    type: 'input',
+                    rules: [
+                        { required: true, message: '请输入收款银行名称', trigger: 'change' }
+                    ],
+        
+                },
+                {
+                    label: '收款人',
+                    prop: 'payeeName',
+                    type: 'input',
+                    rules: [
+                        { required: true, message: '请输入收款人', trigger: 'change' }
+                    ],
+                },
+                {
+                    label: '收款人备注',
+                    prop: 'payeeRemark',
+                    type: 'textarea',
+                },
+            ]
+        },
+        costdialogData: {
+            title: '费用结算',
+            column: [
+                {
+                    label: '付款方式',
+                    prop: 'payerMethod',
+                    type: 'select',
+                    dictionary: 'settlement_application_payee_method',
+                    rules: [
+                        { required: true, message: '请选择付款方式', trigger: 'change' }
+                    ],
+                },
+                {
+                    label: '付款账号',
+                    prop: 'payerAccount',
+                    type: 'input',
+                    rules: [
+                        { required: true, message: '请输入付款账号', trigger: 'change' }
+                    ],
+        
+                },
+                {
+                    label: '付款银行名称',
+                    prop: 'payerBankName',
+                    type: 'input',
+                    rules: [
+                        { required: true, message: '请输入付款银行名称', trigger: 'change' }
+                    ],
+        
+                },
+                {
+                    label: '付款人',
+                    prop: 'payerName',
+                    type: 'input',
+                    rules: [
+                        { required: true, message: '请输入付款人', trigger: 'change' }
+                    ],
+                },
+                {
+                    label: '付款时间',
+                    prop: 'payerTime',
+                    type: 'picker',
+                    rules: [
+                        { required: true, message: '请选择付款时间', trigger: 'change' }
+                    ],
+                },
+                {
+                    label: '付款人备注',
+                    prop: 'payerRemark',
+                    type: 'textarea',
+                },
+            ]
+        },
 
     }
 }

src/views/finance/settlement/usePlatform.js

@@ -46,7 +46,7 @@ export default (proxy) => {
                 },
                 {
                     label: '用户名称',
-                    prop: 'userName',
+                    prop: 'userNickName',
                     width:'140px',
                     type: 'input',
                     isSearch: true
@@ -73,7 +73,8 @@ export default (proxy) => {
                     prop: 'orderStatus',
                     type: 'dict',
                     dict: lrr_service_status,
-                    isSearch: true
+                    isSearch: true,
+                    width:'150px'
                 },
                 {
                     label: '区域公司',
@@ -97,55 +98,11 @@ export default (proxy) => {
                 {
                     label: '区域公司结算时间',
                     prop: 'areaSettlementTime',
-                    width:'150px'
+                    width:'160px'
                 }
             ]
             ),
-        dialogData: {
-            title: '结算申请',
-            column: [
-                {
-                    label: '收款方式',
-                    prop: 'payeeMethod',
-                    type: 'select',
-                    dictionary: 'settlement_application_payee_method',
-                    rules: [
-                        { required: true, message: '请选择收款方式', trigger: 'change' }
-                    ],
-                },
-                {
-                    label: '收款账号',
-                    prop: 'payeeAccount',
-                    type: 'input',
-                    rules: [
-                        { required: true, message: '请输入收款账号', trigger: 'change' }
-                    ],
-        
-                },
-                {
-                    label: '收款银行名称',
-                    prop: 'payeeBankName',
-                    type: 'input',
-                    rules: [
-                        { required: true, message: '请输入收款银行名称', trigger: 'change' }
-                    ],
-        
-                },
-                {
-                    label: '收款人',
-                    prop: 'payeeName',
-                    type: 'input',
-                    rules: [
-                        { required: true, message: '请输入收款人', trigger: 'change' }
-                    ],
-                },
-                {
-                    label: '收款人备注',
-                    prop: 'payeeRemark',
-                    type: 'textarea',
-                },
-            ]
-        },
+      
         tabList,
         tabKey:'areaSettlementStatus'
       

src/views/finance/settlement/useRegional.js

@@ -29,12 +29,12 @@ export default (proxy) => {
                 width:'200px',
             },
             {
-                label: '订单开始时间',
+                label: '订单时间',
                 prop: 'orderTime',
                 width:'160px',
                 isSearch: true,
                 type: 'date',
-                keys: ['orderTimeStart', 'orderTimeEnd'],
+                keys: ['serviceCompleteStartTime', 'serviceCompleteEndTime'],
             },
             {
                 label: '订单完成时间',
@@ -42,11 +42,11 @@ export default (proxy) => {
                 width:'160px',
                 isSearch: true,
                 type: 'date',
-                keys: ['serviceEndTimeStart', 'serviceEndTimeEnd'],
+                keys: ['serviceCompleteStartTime', 'serviceCompleteEndTime'],
             },
             {
                 label: '用户名称',
-                prop: 'userName',
+                prop: 'userNickName',
                 width:'140px',
                 type: 'input',
                 isSearch: true
@@ -73,17 +73,20 @@ export default (proxy) => {
                 prop: 'orderStatus',
                 type: 'dict',
                 dict: lrr_service_status,
-                isSearch: true
+                isSearch: false,
+                width:'100px'
             },
             {
                 label: '服务中心',
                 prop: 'serviceCentreName',
                 type: 'input',
-                isSearch: true
+                isSearch: true,
+                width:'150px'
             },
             {
                 label: '抽成金额',
                 prop: 'areaDistributionAmount',
+                 width:'150px'
             },
             {
                 label: '结算状态',
@@ -95,65 +98,24 @@ export default (proxy) => {
             {
                 label: '结算时间',
                 prop: 'areaSettlementTime',
+                width:'160px',
             },
             {
                 label: '服务中心抽成金额',
                 prop: 'serviceCentreDistributionAmount',
-                type: 'dict',
-                dict: service_centre_settlement_stauts,
                 width:'150px',
             },
             {
                 label: '服务中心结算状态',
                 prop: 'serviceCentreSettlementStatus',
+                width:'100px',
+                type: 'dict',
+                dict: service_centre_settlement_stauts,
             },
         ]),
-        dialogData: {
-            title: '结算申请',
-            column: [
-                {
-                    label: '收款方式',
-                    prop: 'payeeMethod',
-                    type: 'select',
-                    dictionary: 'settlement_application_payee_method',
-                    rules: [
-                        { required: true, message: '请选择收款方式', trigger: 'change' }
-                    ],
-                },
-                {
-                    label: '收款账号',
-                    prop: 'payeeAccount',
-                    type: 'input',
-                    rules: [
-                        { required: true, message: '请输入收款账号', trigger: 'change' }
-                    ],
-        
-                },
-                {
-                    label: '收款银行名称',
-                    prop: 'payeeBankName',
-                    type: 'input',
-                    rules: [
-                        { required: true, message: '请输入收款银行名称', trigger: 'change' }
-                    ],
-        
-                },
-                {
-                    label: '收款人',
-                    prop: 'payeeName',
-                    type: 'input',
-                    rules: [
-                        { required: true, message: '请输入收款人', trigger: 'change' }
-                    ],
-                },
-                {
-                    label: '收款人备注',
-                    prop: 'payeeRemark',
-                    type: 'textarea',
-                },
-            ]
-        },
+       
         tabList,
+        tabKey:'areaSettlementStatus'
       
     }
 }

src/views/finance/settlement/useService.js

@@ -45,7 +45,7 @@ export default (proxy) => {
             },
             {
                 label: '用户名称',
-                prop: 'userName',
+                prop: 'userNickName',
                 width:'140px',
                 type: 'input',
                 isSearch: true
@@ -92,51 +92,7 @@ export default (proxy) => {
                  width:'150px'
             },
         ]),
-        dialogData: {
-            title: '结算申请',
-            column: [
-                {
-                    label: '收款方式',
-                    prop: 'payeeMethod',
-                    type: 'select',
-                    dictionary: 'settlement_application_payee_method',
-                    rules: [
-                        { required: true, message: '请选择收款方式', trigger: 'change' }
-                    ],
-                },
-                {
-                    label: '收款账号',
-                    prop: 'payeeAccount',
-                    type: 'input',
-                    rules: [
-                        { required: true, message: '请输入收款账号', trigger: 'change' }
-                    ],
-        
-                },
-                {
-                    label: '收款银行名称',
-                    prop: 'payeeBankName',
-                    type: 'input',
-                    rules: [
-                        { required: true, message: '请输入收款银行名称', trigger: 'change' }
-                    ],
-        
-                },
-                {
-                    label: '收款人',
-                    prop: 'payeeName',
-                    type: 'input',
-                    rules: [
-                        { required: true, message: '请输入收款人', trigger: 'change' }
-                    ],
-                },
-                {
-                    label: '收款人备注',
-                    prop: 'payeeRemark',
-                    type: 'textarea',
-                },
-            ]
-        },
+     
         tabList,
         tabKey:''
     }