Merge branch 'master' of http://111.61.77.35:9999/gengdidi/precision-effect

precision-effect-admin/src/main/java/com/zehong/web/controller/transaction/TBorrowingApplyForController.java

@@ -132,7 +132,8 @@ public class TBorrowingApplyForController extends BaseController
             tCashOperate.setOperateType("2");
             tCashOperate.setOperateAmount(tBorrowingApplyFor.getTotalFigures());
             tCashOperate.setIsDel("0");
-            tCashOperate.setOperateType("2");
+            tCashOperate.setDocumentType("2");
+            tCashOperate.setRelationDoc(String.valueOf(tBorrowingApplyFor.getBorrowing()));
             tCashOperate.setOperateTime(new Date());
              //增加资金操作记录
             tCashOperateService.insertTCashOperate(tCashOperate);

precision-effect-system/src/main/java/com/zehong/system/domain/TCashOperate.java

@@ -10,7 +10,7 @@ import com.zehong.common.core.domain.BaseEntity;
 
 /**
  * 资金操作对象 t_cash_operate
- * 
+ *
  * @author zehong
  * @date 2023-06-06
  */
@@ -58,21 +58,21 @@ public class TCashOperate extends BaseEntity
 
     private String documentType;
 
-    public void setOperateId(Long operateId) 
+    public void setOperateId(Long operateId)
     {
         this.operateId = operateId;
     }
 
-    public Long getOperateId() 
+    public Long getOperateId()
     {
         return operateId;
     }
-    public void setOperateDeptId(Long operateDeptId) 
+    public void setOperateDeptId(Long operateDeptId)
     {
         this.operateDeptId = operateDeptId;
     }
 
-    public Long getOperateDeptId() 
+    public Long getOperateDeptId()
     {
         return operateDeptId;
     }
@@ -94,12 +94,12 @@ public class TCashOperate extends BaseEntity
     {
         return operateAmount;
     }
-    public void setRelationDoc(String relationDoc) 
+    public void setRelationDoc(String relationDoc)
     {
         this.relationDoc = relationDoc;
     }
 
-    public String getRelationDoc() 
+    public String getRelationDoc()
     {
         return relationDoc;
     }
@@ -112,12 +112,12 @@ public class TCashOperate extends BaseEntity
     {
         return operateTime;
     }
-    public void setIsDel(String isDel) 
+    public void setIsDel(String isDel)
     {
         this.isDel = isDel;
     }
 
-    public String getIsDel() 
+    public String getIsDel()
     {
         return isDel;
     }

precision-effect-web/src/views/for/index.vue

@@ -130,9 +130,9 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <el-dialog :title="title" :visible.sync="inser" width="800px"  destroy-on-close>
-            <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <!-- 借支申请 -->
+    <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="80px">
               <el-row>
                 <el-col :span="12">
               <el-form-item label="费用名称" prop="feeName">
@@ -244,8 +244,8 @@
 
     </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-row>-->
 <!--          <el-col :span="12">-->
@@ -350,8 +350,8 @@
 
 <!--      </el-form>-->
 
-      <el-form label-width="100px" ref="form" :model="form">
-        <el-row>
+      <el-form label-width="80px"  ref="form" :model="form">
+        <el-row style="height: 15px">
           <el-col :span="7">
             <el-form-item label="费用名称">{{form.feeName}}</el-form-item>
           </el-col>
@@ -367,7 +367,7 @@
 
         </el-row>
         <el-divider></el-divider>
-        <el-row>
+        <el-row style="height: 15px">
           <el-col :span="7">
             <el-form-item label="借支部门">{{form.deptName}}</el-form-item>
           </el-col>
@@ -385,20 +385,20 @@
           </el-col>
         </el-row>
         <el-divider></el-divider>
-        <el-row>
+        <el-row >
           <el-col :span="24">
             <el-form-item label="备注">{{form.remark}}</el-form-item>
           </el-col>
         </el-row>
         <el-divider></el-divider>
 
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="审批人">{{form.approvedUserIdName}}</el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="审批人">{{form.approvedUserIdName}}</el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
 
-        <el-divider></el-divider>
+<!--        <el-divider></el-divider>-->
         <el-row>
           <el-col :span="24">
             <el-form-item   v-if="form.attachmentUrl !=null" label="附件" prop="attachmentUrl">
@@ -425,9 +425,9 @@
     </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-row>
+        <el-row style="height: 15px">
           <el-col :span="7">
             <el-form-item label="费用名称">{{form.feeName}}</el-form-item>
           </el-col>
@@ -439,7 +439,7 @@
           </el-col>
         </el-row>
         <el-divider></el-divider>
-        <el-row>
+        <el-row style="height: 15px">
           <el-col :span="7">
             <el-form-item label="借支部门">{{form.deptName}}</el-form-item>
           </el-col>
@@ -449,16 +449,21 @@
           <el-col :span="8">
             <el-form-item label="审批时间">{{form.approvalTime}}</el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="小写合计">{{form.totalFigures}}</el-form-item>
-          </el-col>
         </el-row>
         <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-col>
+
         </el-row>
+
+
         <el-divider></el-divider>
         <el-row>
           <el-col :span="24">
@@ -765,15 +770,19 @@ export default {
                 // this.$alert('部门余额不足，审批拒绝', '提示', {
                 //   confirmButtonText: '确定',
                 // })
-                this.msgSuccess("部门余额不足");
+                // this.msgSuccess("部门余额不足");
+                this.$message({
+                  message: '部门余额不足',
+                  type: 'warning'
+                });
 
               }else{
                 // alert("审批成功")
                 this.msgSuccess("审批成功");
+                this.open = false;
+                this.getList();
               }
-              //
-              this.open = false;
-              this.getList();
+
             });
           } else {
             addFor(this.form).then(response => {
@@ -870,3 +879,4 @@ export default {
     background: #1890ff;
   }
 </style>
+