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

@@ -110,6 +110,9 @@ public class TBorrowingApplyForController extends BaseController
     @PutMapping
     public int edit(@RequestBody TBorrowingApplyFor tBorrowingApplyFor)
     {
+        tBorrowingApplyFor.setApprovalTime(new Date());
+        SysUser user = tokenService.getLoginUser(ServletUtils.getRequest()).getUser();
+        tBorrowingApplyFor.setApprovedUserId(user.getUserId());
         if (tBorrowingApplyFor.getApprovalStatus()==3){
             //修改借支申请表状态
             tBorrowingApplyForService.updateTBorrowingApplyFor(tBorrowingApplyFor);
@@ -117,8 +120,6 @@ public class TBorrowingApplyForController extends BaseController
         }
         /**查询部门余额是否足够*/
         int isSufficient = tBorrowingApplyForService.selectTacc(tBorrowingApplyFor);
-        SysUser user = tokenService.getLoginUser(ServletUtils.getRequest()).getUser();
-        tBorrowingApplyFor.setApprovedUserId(user.getUserId());
         //0部门余额不足 1余额足够
         if (isSufficient!=0){
             tBorrowingApplyFor.setApprovalTime(new Date());

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

@@ -201,12 +201,12 @@
               </el-form-item>
 
 
-              <el-form-item   v-if="form.attachmentUrl !=null" label="附件" prop="attachmentUrl">
-              <div style="height: 60px;width: 100px;margin-top: 5px">
-                <img  @click="godown(form.attachmentUrl)" v-if="ispictrue(form.attachmentUrl)" style="width: 100%;height: 100%"/>
-                <img  @click="godown(form.attachmentUrl)" v-if="!ispictrue(form.attachmentUrl)" style="width: 100%;height: 100%"/>
-              </div>
-              </el-form-item>
+<!--              <el-form-item   v-if="form.attachmentUrl !=null" label="附件" prop="attachmentUrl">-->
+<!--              <div style="height: 60px;width: 100px;margin-top: 5px">-->
+<!--                <img  @click="godown(form.attachmentUrl)" v-if="ispictrue(form.attachmentUrl)" style="width: 100%;height: 100%"/>-->
+<!--                <img  @click="godown(form.attachmentUrl)" v-if="!ispictrue(form.attachmentUrl)" style="width: 100%;height: 100%"/>-->
+<!--              </div>-->
+<!--              </el-form-item>-->
 
               <el-form-item v-if="form.borrowing ==null" label="附件" prop="attachmentUrl">
                 <FileUpload
@@ -403,8 +403,8 @@
           <el-col :span="24">
             <el-form-item   v-if="form.attachmentUrl !=null" label="附件" prop="attachmentUrl">
               <div style="height: 60px;width: 100px;margin-top: 5px">
-                <img  @click="godown(form.attachmentUrl)" v-if="ispictrue(form.attachmentUrl)" style="width: 100%;height: 100%"/>
-                <img  @click="godown(form.attachmentUrl)" v-if="!ispictrue(form.attachmentUrl)" style="width: 100%;height: 100%"/>
+                <img  @click="godown(form.attachmentUrl)" v-if="ispictrue(form.attachmentUrl)" style="width: 100%;height: 100%" src="@/assets/images/wenjian.png"/>
+                <img  @click="godown(form.attachmentUrl)" v-if="!ispictrue(form.attachmentUrl)" style="width: 100%;height: 100%" src="@/assets/images/wenjian.png"/>
               </div>
             </el-form-item>
           </el-col>
@@ -446,6 +446,9 @@
           <el-col :span="8">
             <el-form-item label="申请时间">{{form.registrationDate}}</el-form-item>
           </el-col>
+          <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>
@@ -475,8 +478,8 @@
           <el-col :span="24">
             <el-form-item   v-if="form.attachmentUrl !=null" label="附件" prop="attachmentUrl">
               <div style="height: 60px;width: 100px;margin-top: 5px">
-                <img  @click="godown(form.attachmentUrl)" v-if="ispictrue(form.attachmentUrl)" style="width: 100%;height: 100%"/>
-                <img  @click="godown(form.attachmentUrl)" v-if="!ispictrue(form.attachmentUrl)" style="width: 100%;height: 100%"/>
+                <img  @click="godown(form.attachmentUrl)" v-if="ispictrue(form.attachmentUrl)" style="width: 100%;height: 100%" src="@/assets/images/wenjian.png"/>
+                <img  @click="godown(form.attachmentUrl)" v-if="!ispictrue(form.attachmentUrl)" style="width: 100%;height: 100%" src="@/assets/images/wenjian.png"/>
               </div>
             </el-form-item>
           </el-col>
@@ -673,6 +676,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.fileList = [];
       this.transactorList=[];
       this.reset();
       this.inser = true;