Commit aaf52d9d authored by 吴卿华's avatar 吴卿华

借支申请修改

parent d4d2cb93
...@@ -132,7 +132,8 @@ public class TBorrowingApplyForController extends BaseController ...@@ -132,7 +132,8 @@ public class TBorrowingApplyForController extends BaseController
tCashOperate.setOperateType("2"); tCashOperate.setOperateType("2");
tCashOperate.setOperateAmount(tBorrowingApplyFor.getTotalFigures()); tCashOperate.setOperateAmount(tBorrowingApplyFor.getTotalFigures());
tCashOperate.setIsDel("0"); tCashOperate.setIsDel("0");
tCashOperate.setOperateType("2"); tCashOperate.setDocumentType("2");
tCashOperate.setRelationDoc(String.valueOf(tBorrowingApplyFor.getBorrowing()));
tCashOperate.setOperateTime(new Date()); tCashOperate.setOperateTime(new Date());
//增加资金操作记录 //增加资金操作记录
tCashOperateService.insertTCashOperate(tCashOperate); tCashOperateService.insertTCashOperate(tCashOperate);
......
...@@ -130,9 +130,9 @@ ...@@ -130,9 +130,9 @@
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!-- 借支申请 -->
<el-dialog :title="title" :visible.sync="inser" width="800px" destroy-on-close> <el-dialog :title="title" :visible.sync="inser" width="800px" :close-on-click-modal="false" destroy-on-close>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="费用名称" prop="feeName"> <el-form-item label="费用名称" prop="feeName">
...@@ -244,8 +244,8 @@ ...@@ -244,8 +244,8 @@
</el-dialog> </el-dialog>
<!-- 添加或修改借支申请对话框 --> <!-- 审批 -->
<el-dialog :title="title" :visible.sync="open" width="800px" destroy-on-close> <el-dialog :title="title" :visible.sync="open" width="800px" :close-on-click-modal="false" destroy-on-close>
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="100px">--> <!-- <el-form ref="form" :model="form" :rules="rules" label-width="100px">-->
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="12">--> <!-- <el-col :span="12">-->
...@@ -350,8 +350,8 @@ ...@@ -350,8 +350,8 @@
<!-- </el-form>--> <!-- </el-form>-->
<el-form label-width="100px" ref="form" :model="form"> <el-form label-width="80px" ref="form" :model="form">
<el-row> <el-row style="height: 15px">
<el-col :span="7"> <el-col :span="7">
<el-form-item label="费用名称">{{form.feeName}}</el-form-item> <el-form-item label="费用名称">{{form.feeName}}</el-form-item>
</el-col> </el-col>
...@@ -367,7 +367,7 @@ ...@@ -367,7 +367,7 @@
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<el-row> <el-row style="height: 15px">
<el-col :span="7"> <el-col :span="7">
<el-form-item label="借支部门">{{form.deptName}}</el-form-item> <el-form-item label="借支部门">{{form.deptName}}</el-form-item>
</el-col> </el-col>
...@@ -385,20 +385,20 @@ ...@@ -385,20 +385,20 @@
</el-col> </el-col>
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<el-row> <el-row >
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注">{{form.remark}}</el-form-item> <el-form-item label="备注">{{form.remark}}</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<el-row> <!-- <el-row>-->
<el-col :span="24"> <!-- <el-col :span="24">-->
<el-form-item label="审批人">{{form.approvedUserIdName}}</el-form-item> <!-- <el-form-item label="审批人">{{form.approvedUserIdName}}</el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
<el-divider></el-divider> <!-- <el-divider></el-divider>-->
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item v-if="form.attachmentUrl !=null" label="附件" prop="attachmentUrl"> <el-form-item v-if="form.attachmentUrl !=null" label="附件" prop="attachmentUrl">
...@@ -425,9 +425,9 @@ ...@@ -425,9 +425,9 @@
</el-dialog> </el-dialog>
<!-- 详情对话框 --> <!-- 详情对话框 -->
<el-dialog :title="title" :visible.sync="detail" width="800px" destroy-on-close> <el-dialog :title="title" :visible.sync="detail" width="800px" :close-on-click-modal="false" destroy-on-close>
<el-form label-width="100px" ref="form" :model="form"> <el-form label-width="100px" ref="form" :model="form">
<el-row> <el-row style="height: 15px">
<el-col :span="7"> <el-col :span="7">
<el-form-item label="费用名称">{{form.feeName}}</el-form-item> <el-form-item label="费用名称">{{form.feeName}}</el-form-item>
</el-col> </el-col>
...@@ -439,7 +439,7 @@ ...@@ -439,7 +439,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<el-row> <el-row style="height: 15px">
<el-col :span="7"> <el-col :span="7">
<el-form-item label="借支部门">{{form.deptName}}</el-form-item> <el-form-item label="借支部门">{{form.deptName}}</el-form-item>
</el-col> </el-col>
...@@ -449,16 +449,21 @@ ...@@ -449,16 +449,21 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="审批时间">{{form.approvalTime}}</el-form-item> <el-form-item label="审批时间">{{form.approvalTime}}</el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="小写合计">{{form.totalFigures}}</el-form-item>
</el-col>
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<el-row>
<el-col :span="24">
<el-row style="height: 15px">
<el-col :span="7">
<el-form-item label="小写合计">{{form.totalFigures}}</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用途说明">{{form.applicationDescription}}</el-form-item> <el-form-item label="用途说明">{{form.applicationDescription}}</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
...@@ -765,15 +770,19 @@ export default { ...@@ -765,15 +770,19 @@ export default {
// this.$alert('部门余额不足,审批拒绝', '提示', { // this.$alert('部门余额不足,审批拒绝', '提示', {
// confirmButtonText: '确定', // confirmButtonText: '确定',
// }) // })
this.msgSuccess("部门余额不足"); // this.msgSuccess("部门余额不足");
this.$message({
message: '部门余额不足',
type: 'warning'
});
}else{ }else{
// alert("审批成功") // alert("审批成功")
this.msgSuccess("审批成功"); this.msgSuccess("审批成功");
}
//
this.open = false; this.open = false;
this.getList(); this.getList();
}
}); });
} else { } else {
addFor(this.form).then(response => { addFor(this.form).then(response => {
...@@ -870,3 +879,4 @@ export default { ...@@ -870,3 +879,4 @@ export default {
background: #1890ff; background: #1890ff;
} }
</style> </style>
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