Commit 0b839309 authored by 许珑标's avatar 许珑标

增加手机号:员工管理;发薪详情;代发代付

parent 16da6ffa
...@@ -72,6 +72,13 @@ ...@@ -72,6 +72,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="56">
<el-col :span="8">
<el-form-item label="手机号码" prop="userMobile">
<el-input v-model="formData.userMobile" placeholder="请输入员工手机号码"></el-input>
</el-form-item>
</el-col>
</el-row>
</div> </div>
</el-card> </el-card>
<!-- 缴纳基数 --> <!-- 缴纳基数 -->
...@@ -393,6 +400,7 @@ export default { ...@@ -393,6 +400,7 @@ export default {
banks: [], banks: [],
loading: false, loading: false,
formData: { formData: {
userMobile: '',
annex: null, annex: null,
payeeAccBank: null, payeeAccBank: null,
contractId: null, contractId: null,
......
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
<dict-tag :options="dict.type.payee_acc_type" :value="scope.row.payeeAccType" /> <dict-tag :options="dict.type.payee_acc_type" :value="scope.row.payeeAccType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="手机号" align="center" prop="userMobile" />
<el-table-column label="性别" align="center" prop="gender" /> <el-table-column label="性别" align="center" prop="gender" />
<el-table-column label="五险一金承担方式" align="center" prop="bearType" width="110"> <el-table-column label="五险一金承担方式" align="center" prop="bearType" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
......
...@@ -60,12 +60,10 @@ ...@@ -60,12 +60,10 @@
<el-table v-loading="loading" :data="payDetailList"> <el-table v-loading="loading" :data="payDetailList">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="明细流水号" align="center" prop="bizNo" />
<el-table-column label="支付类型" align="center" prop="payTitle" />
<el-table-column label="收款账户" align="center"> <el-table-column label="收款账户" align="center">
<el-table-column label="户名" align="center" prop="payeeAccName" /> <el-table-column label="户名" align="center" prop="payeeAccName" fixed/>
<el-table-column label="账户" align="center" prop="payeeAccNo" /> <el-table-column label="账户" align="center" prop="payeeAccNo" fixed/>
<el-table-column label="类型" align="center" prop="payeeAccType" > <el-table-column label="类型" align="center" prop="payeeAccType" width="150" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
...@@ -79,6 +77,9 @@ ...@@ -79,6 +77,9 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="手机号" align="center" prop="payeeMobile" />
<el-table-column label="明细流水号" align="center" prop="bizNo" />
<el-table-column label="支付类型" align="center" prop="payTitle" />
<el-table-column label="交易金额" align="center" prop="amount" /> <el-table-column label="交易金额" align="center" prop="amount" />
<el-table-column label="手续费" align="center" prop="transFee" /> <el-table-column label="手续费" align="center" prop="transFee" />
<el-table-column label="支付状态" align="center" prop="payStatus" > <el-table-column label="支付状态" align="center" prop="payStatus" >
......
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
<dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus" /> <dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="手机号" align="center" prop="payeeMobile" />
<el-table-column label="备注" align="center" prop="payRemark" /> <el-table-column label="备注" align="center" prop="payRemark" />
<el-table-column label="失败原因" align="center" prop="failReason" :show-overflow-tooltip="true"/> <el-table-column label="失败原因" align="center" prop="failReason" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
......
...@@ -60,9 +60,9 @@ ...@@ -60,9 +60,9 @@
:highlight-current-row="true" :highlight-selection-row="true" :stripe="true"> :highlight-current-row="true" :highlight-selection-row="true" :stripe="true">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="收款账户" align="center"> <el-table-column label="收款账户" align="center">
<el-table-column label="户名" align="center" prop="payeeAccName" /> <el-table-column label="户名" align="center" prop="payeeAccName" fixed/>
<el-table-column label="账户" align="center" prop="payeeAccNo" /> <el-table-column label="账户" align="center" prop="payeeAccNo" fixed/>
<el-table-column label="类型" align="center" prop="payeeAccType" > <el-table-column label="类型" align="center" prop="payeeAccType" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="手机号码" align="center" prop="payeeMobile" />
<el-table-column label="支付金额" align="center" prop="amount" /> <el-table-column label="支付金额" align="center" prop="amount" />
<el-table-column label="支付类型" align="center" prop="payTitle" /> <el-table-column label="支付类型" align="center" prop="payTitle" />
<el-table-column label="备注" align="center" prop="payRemark" /> <el-table-column label="备注" align="center" prop="payRemark" />
...@@ -139,6 +140,9 @@ ...@@ -139,6 +140,9 @@
<el-option label="对公账户" :value="2" /> <el-option label="对公账户" :value="2" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="手机号码" prop="payeeMobile">
<el-input v-model="form.payeeMobile" placeholder="请输入收款人手机号" />
</el-form-item>
<el-form-item label="金额" prop="amount"> <el-form-item label="金额" prop="amount">
<el-input-number style="width: 100%" v-model="form.amount" :precision="2" :step="0.1" placeholder="请输入支付金额" /> <el-input-number style="width: 100%" v-model="form.amount" :precision="2" :step="0.1" placeholder="请输入支付金额" />
</el-form-item> </el-form-item>
...@@ -351,6 +355,7 @@ export default { ...@@ -351,6 +355,7 @@ export default {
payeeAccType: 1, payeeAccType: 1,
isPrivateAcc: 1, isPrivateAcc: 1,
amount: item.amount, amount: item.amount,
payeeMobile: item.payeeMobile,
payRemark: item.payRemark ? item.payRemark : this.batchForm.payRemark ? this.batchForm.payRemark : '', payRemark: item.payRemark ? item.payRemark : this.batchForm.payRemark ? this.batchForm.payRemark : '',
}) })
}) })
......
...@@ -60,9 +60,9 @@ ...@@ -60,9 +60,9 @@
:highlight-current-row="true" :highlight-selection-row="true" :stripe="true"> :highlight-current-row="true" :highlight-selection-row="true" :stripe="true">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="收款账户" align="center"> <el-table-column label="收款账户" align="center">
<el-table-column label="户名" align="center" prop="payeeAccName" /> <el-table-column label="户名" align="center" prop="payeeAccName" fixed/>
<el-table-column label="账户" align="center" prop="payeeAccNo" /> <el-table-column label="账户" align="center" prop="payeeAccNo" fixed/>
<el-table-column label="类型" align="center" prop="payeeAccType" > <el-table-column label="类型" align="center" prop="payeeAccType" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="手机号码" align="center" prop="payeeMobile" />
<el-table-column label="支付金额" align="center" prop="amount" /> <el-table-column label="支付金额" align="center" prop="amount" />
<el-table-column label="支付类型" align="center" prop="payTitle" /> <el-table-column label="支付类型" align="center" prop="payTitle" />
<el-table-column label="备注" align="center" prop="payRemark" /> <el-table-column label="备注" align="center" prop="payRemark" />
...@@ -139,6 +140,9 @@ ...@@ -139,6 +140,9 @@
<el-option label="对公账户" :value="2" /> <el-option label="对公账户" :value="2" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="手机号码" prop="payeeMobile">
<el-input v-model="form.payeeMobile" placeholder="请输入收款人手机号" />
</el-form-item>
<el-form-item label="金额" prop="amount"> <el-form-item label="金额" prop="amount">
<el-input-number style="width: 100%" v-model="form.amount" :precision="2" :step="0.1" placeholder="请输入支付金额" /> <el-input-number style="width: 100%" v-model="form.amount" :precision="2" :step="0.1" placeholder="请输入支付金额" />
</el-form-item> </el-form-item>
...@@ -351,6 +355,7 @@ export default { ...@@ -351,6 +355,7 @@ export default {
payeeAccType: 1, payeeAccType: 1,
isPrivateAcc: 1, isPrivateAcc: 1,
amount: item.amount, amount: item.amount,
payeeMobile: item.payeeMobile,
payRemark: item.payRemark ? item.payRemark : this.batchForm.payRemark ? this.batchForm.payRemark : '', payRemark: item.payRemark ? item.payRemark : this.batchForm.payRemark ? this.batchForm.payRemark : '',
}) })
}) })
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment