Merge branch 'rongxin_dev' of http://116.255.223.226:3000/zhangzl/nsgk_mobile into rongxin_dev

src/api/onlineHome/bankAgriculture/paymentApproval.js

@@ -192,9 +192,9 @@ export function addCashdetail(data) {
 }
 
 // 查询转账账户详情详细
-export function getTransferProcess(id) {
+export function getTransferProcess(auditbatchNo) {
   return request({
-    url: '/yinnong/transfer/getProcessSchedule/' + id,
+    url: '/yinnong/transfer/getProcessScheduleInfoNew/' + auditbatchNo,
     method: 'get'
   })
 }
@@ -223,12 +223,12 @@ export function getQmyeFlow(id) {
   })
 }
 
-// 查询当前账期余额
+// 审批
 export function approval(data) {
   return request({
-    url: '/activiti/process/complete',
+    url: '/approval/audit/audit',
     method: 'post',
-    params:data
+    data:data
   })
 }
 

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue

@@ -132,7 +132,7 @@
           label-width="auto"
           maxlength="20"
           required
-          show-word-limit 
+          show-word-limit
           v-if="form.bankType == '6'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
@@ -146,7 +146,7 @@
           label-width="auto"
           maxlength="30"
           required
-          show-word-limit 
+          show-word-limit
           v-if="form.bankType != '5' && form.bankType != '6'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
@@ -646,7 +646,7 @@
         }
         // if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>0 && this.chargeItme != []){
         //   this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
-        // }else 
+        // }else
         if(this.form.bankType == '7' && this.chargeItme.length>0 && this.chargeItme != []){
           this.$notify({ type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！' });
         }else{
@@ -873,56 +873,29 @@
             this.$set(this.projectForm, "ynType", '1');
             if(this.form.capitalExpenditureType==2){
                 addProjectto(this.projectForm).then(res => {
-                  if(_this.form.approvalMode === '1'){
-                    customSubmit(this.form.id).then(res => {
-                      _this.$toast.success('提交成功');
-                      setTimeout(function(){
-                        _this.$router.push('/sunVillage_info/approvalList')
-                      },1500)
-                    })
-                  }else{
                     offlineCustomSubmit(this.form.id).then(res => {
                       _this.$toast.success('提交成功');
                       setTimeout(function(){
                         _this.$router.push('/sunVillage_info/approvalList')
                       },1500)
                     })
-                  }
                 })
             } else if(this.form.capitalExpenditureType==4){
               addInfoto(this.infoForm).then(res => {
-                if(_this.form.approvalMode === '1'){
-                  customSubmit(this.form.id).then(res => {
-                    _this.$toast.success('提交成功');
-                    setTimeout(function(){
-                      _this.$router.push('/sunVillage_info/approvalList')
-                    },1500)
-                  })
-                }else{
                   offlineCustomSubmit(this.form.id).then(res => {
                     _this.$toast.success('提交成功');
                     setTimeout(function(){
                       _this.$router.push('/sunVillage_info/approvalList')
                     },1500)
                   })
-                }
               })
             }else{
-              if(_this.form.approvalMode === '1'){
-                customSubmit(this.form.id).then(res => {
-                  _this.$toast.success('提交成功');
-                  setTimeout(function(){
-                    _this.$router.push('/sunVillage_info/approvalList')
-                  },1500)
-                })
-              }else{
                 offlineCustomSubmit(this.form.id).then(res => {
                   _this.$toast.success('提交成功');
                   setTimeout(function(){
                     _this.$router.push('/sunVillage_info/approvalList')
                   },1500)
                 })
-              }
             }
         })
       },

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd11.vue

@@ -264,7 +264,7 @@
 
 <script>
   import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto ,selectApprovalByTemplateId,
-    cashSubmit , offlineCashSubmit, getAccount ,getQmyeFlow,listInfo ,getInfoto ,addInfoto ,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+    cashSubmit , offlineCustomSubmit, getAccount ,getQmyeFlow,listInfo ,getInfoto ,addInfoto ,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
   import {
     addCash,
@@ -373,6 +373,7 @@
         status: "N",
       }
       listAccount1(queryParamsOld).then((response) => {
+        console.info(response)
         response.rows.map(res => {
           console.log(res)
           // res['accountName'] = this.$store.state.user.bookName
@@ -382,6 +383,7 @@
           res['bankAccountNumber'] = res.startDay
           res['payerFrom'] = '6'
           this.payerOptions.push(res)
+          console.info(this.payerOptions)
         })
       });
       this.getDictionaries();
@@ -701,57 +703,30 @@
                             _this.projectForm.outId = response.data.id
                             _this.$set(_this.projectForm, "ynType", '2');
                             addProjectto(_this.projectForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(response.data.id).then(res => {
+                                offlineCustomSubmit(response.data.id).then(res => {
                                   _this.$toast.success('提交成功');
                                   setTimeout(function(){
                                     history.go(-1)
                                   },2000)
                                 })
-                              }else{
-                                offlineCashSubmit(response.data.id).then(res => {
-                                  _this.$toast.success('提交成功');
-                                  setTimeout(function(){
-                                    history.go(-1)
-                                  },2000)
-                                })
-                              }
                             })
                           }else if(_this.form.capitalExpenditureType==4){
                             _this.infoForm.transferId = response.data.id
                             addInfoto(_this.infoForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(response.data.id).then(res => {
-                                  _this.$toast.success('提交成功');
-                                  setTimeout(function(){
-                                    history.go(-1)
-                                  },2000)
-                                })
-                              }else{
-                                offlineCashSubmit(response.data.id).then(res => {
+                                offlineCustomSubmit(response.data.id).then(res => {
                                   _this.$toast.success('提交成功');
                                   setTimeout(function(){
                                     history.go(-1)
                                   },2000)
                                 })
-                              }
                             })
                           }else{
-                            if(_this.form.approvalMode === '1'){
-                              cashSubmit(response.data.id).then(res => {
+                              offlineCustomSubmit(response.data.id).then(res => {
                                 _this.$toast.success('提交成功');
                                 setTimeout(function(){
                                   history.go(-1)
                                 },2000)
                               })
-                            }else{
-                              offlineCashSubmit(response.data.id).then(res => {
-                                _this.$toast.success('提交成功');
-                                setTimeout(function(){
-                                  history.go(-1)
-                                },2000)
-                              })
-                            }
                           }
                         }
                       })
@@ -800,8 +775,7 @@
                                       if(idx3 == (_this.uploadFiles3.length-1)){
                                         if(_this.form.capitalExpenditureType==2){
                                           addProjectto(_this.projectForm).then(res => {
-                                            if(_this.form.approvalMode === '1'){
-                                              cashSubmit(response.data.id).then(res => {
+                                            offlineCustomSubmit(response.data.id).then(res => {
                                                 _this.chargeItme.map((resD,b) => {
                                                   resD.cashId = response.data.id
                                                   addCashdetail(resD).then((a,rD) => {
@@ -814,40 +788,10 @@
                                                   })
                                                 })
                                               })
-                                            }else{
-                                              offlineCashSubmit(response.data.id).then(res => {
-                                                _this.chargeItme.map((resD,b) => {
-                                                  resD.cashId = response.data.id
-                                                  addCashdetail(resD).then((a,rD) => {
-                                                    if(b ==  (_this.chargeItme.length-1)){
-                                                      _this.$toast.success('提交成功');
-                                                      setTimeout(function(){
-                                                        history.go(-1)
-                                                      },2000)
-                                                    }
-                                                  })
-                                                })
-                                              })
-                                            }
                                           })
                                         } else if(_this.form.capitalExpenditureType==4){
                                           addInfoto(_this.infoForm).then(res => {
-                                            if(_this.form.approvalMode === '1'){
-                                              cashSubmit(response.data.id).then(res => {
-                                                _this.chargeItme.map((resD,b) => {
-                                                  resD.cashId = response.data.id
-                                                  addCashdetail(resD).then((a,rD) => {
-                                                    if(b ==  (_this.chargeItme.length-1)){
-                                                      _this.$toast.success('提交成功');
-                                                      setTimeout(function(){
-                                                        history.go(-1)
-                                                      },2000)
-                                                    }
-                                                  })
-                                                })
-                                              })
-                                            }else{
-                                              offlineCashSubmit(response.data.id).then(res => {
+                                              offlineCustomSubmit(response.data.id).then(res => {
                                                 _this.chargeItme.map((resD,b) => {
                                                   resD.cashId = response.data.id
                                                   addCashdetail(resD).then((a,rD) => {
@@ -860,25 +804,9 @@
                                                   })
                                                 })
                                               })
-                                            }
                                           })
                                         }else{
-                                          if(_this.form.approvalMode === '1'){
-                                            cashSubmit(response.data.id).then(res => {
-                                              _this.chargeItme.map((resD,b) => {
-                                                resD.cashId = response.data.id
-                                                addCashdetail(resD).then((a,rD) => {
-                                                  if(b ==  (_this.chargeItme.length-1)){
-                                                    _this.$toast.success('提交成功');
-                                                    setTimeout(function(){
-                                                      history.go(-1)
-                                                    },2000)
-                                                  }
-                                                })
-                                              })
-                                            })
-                                          }else{
-                                            offlineCashSubmit(response.data.id).then(res => {
+                                            offlineCustomSubmit(response.data.id).then(res => {
                                               _this.chargeItme.map((resD,b) => {
                                                 resD.cashId = response.data.id
                                                 addCashdetail(resD).then((a,rD) => {
@@ -891,7 +819,6 @@
                                                 })
                                               })
                                             })
-                                          }
                                         }
                                       }
                                     })
@@ -899,8 +826,7 @@
                                 }else{
                                   if(_this.form.capitalExpenditureType==2){
                                     addProjectto(_this.projectForm).then(res => {
-                                      if(_this.form.approvalMode === '1'){
-                                        cashSubmit(response.data.id).then(res => {
+                                        offlineCustomSubmit(response.data.id).then(res => {
                                           _this.chargeItme.map((resD,b) => {
                                             resD.cashId = response.data.id
                                             addCashdetail(resD).then((a,rD) => {
@@ -913,40 +839,10 @@
                                             })
                                           })
                                         })
-                                      }else{
-                                        offlineCashSubmit(response.data.id).then(res => {
-                                          _this.chargeItme.map((resD,b) => {
-                                            resD.cashId = response.data.id
-                                            addCashdetail(resD).then((a,rD) => {
-                                              if(b ==  (_this.chargeItme.length-1)){
-                                                _this.$toast.success('提交成功');
-                                                setTimeout(function(){
-                                                  history.go(-1)
-                                                },2000)
-                                              }
-                                            })
-                                          })
-                                        })
-                                      }
                                     })
                                   } else if(_this.form.capitalExpenditureType==4){
                                     addInfoto(_this.infoForm).then(res => {
-                                      if(_this.form.approvalMode === '1'){
-                                        cashSubmit(response.data.id).then(res => {
-                                          _this.chargeItme.map((resD,b) => {
-                                            resD.cashId = response.data.id
-                                            addCashdetail(resD).then((a,rD) => {
-                                              if(b ==  (_this.chargeItme.length-1)){
-                                                _this.$toast.success('提交成功');
-                                                setTimeout(function(){
-                                                  history.go(-1)
-                                                },2000)
-                                              }
-                                            })
-                                          })
-                                        })
-                                      }else{
-                                        offlineCashSubmit(response.data.id).then(res => {
+                                      offlineCustomSubmit(response.data.id).then(res => {
                                           _this.chargeItme.map((resD,b) => {
                                             resD.cashId = response.data.id
                                             addCashdetail(resD).then((a,rD) => {
@@ -959,25 +855,9 @@
                                             })
                                           })
                                         })
-                                      }
                                     })
                                   }else{
-                                    if(_this.form.approvalMode === '1'){
-                                      cashSubmit(response.data.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = response.data.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b ==  (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                    }else{
-                                      offlineCashSubmit(response.data.id).then(res => {
+                                    offlineCustomSubmit(response.data.id).then(res => {
                                         _this.chargeItme.map((resD,b) => {
                                           resD.cashId = response.data.id
                                           addCashdetail(resD).then((a,rD) => {
@@ -990,7 +870,6 @@
                                           })
                                         })
                                       })
-                                    }
                                   }
                                 }
                               }
@@ -1008,8 +887,7 @@
                               if(idx3 ==(_this.uploadFiles3.length-1)){
                                 if(_this.form.capitalExpenditureType==2){
                                   addProjectto(_this.projectForm).then(res => {
-                                    if(_this.form.approvalMode === '1'){
-                                      cashSubmit(response.data.id).then(res => {
+                                    offlineCustomSubmit(response.data.id).then(res => {
                                         _this.chargeItme.map((resD,b) => {
                                           resD.cashId = response.data.id
                                           addCashdetail(resD).then((a,rD) => {
@@ -1022,26 +900,10 @@
                                           })
                                         })
                                       })
-                                    }else{
-                                      offlineCashSubmit(response.data.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = response.data.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b ==  (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                    }
                                   })
                                 } else if(_this.form.capitalExpenditureType==4){
                                   addInfoto(_this.infoForm).then(res => {
-                                    if(_this.form.approvalMode === '1'){
-                                      cashSubmit(response.data.id).then(res => {
+                                    offlineCustomSubmit(response.data.id).then(res => {
                                         _this.chargeItme.map((resD,b) => {
                                           resD.cashId = response.data.id
                                           addCashdetail(resD).then((a,rD) => {
@@ -1054,39 +916,9 @@
                                           })
                                         })
                                       })
-                                    }else{
-                                      offlineCashSubmit(response.data.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = response.data.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b ==  (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                    }
                                   })
                                 }else{
-                                  if(_this.form.approvalMode === '1'){
-                                    cashSubmit(response.data.id).then(res => {
-                                      _this.chargeItme.map((resD,b) => {
-                                        resD.cashId = response.data.id
-                                        addCashdetail(resD).then((a,rD) => {
-                                          if(b ==  (_this.chargeItme.length-1)){
-                                            _this.$toast.success('提交成功');
-                                            setTimeout(function(){
-                                              history.go(-1)
-                                            },2000)
-                                          }
-                                        })
-                                      })
-                                    })
-                                  }else{
-                                    offlineCashSubmit(response.data.id).then(res => {
+                                    offlineCustomSubmit(response.data.id).then(res => {
                                       _this.chargeItme.map((resD,b) => {
                                         resD.cashId = response.data.id
                                         addCashdetail(resD).then((a,rD) => {
@@ -1099,7 +931,6 @@
                                         })
                                       })
                                     })
-                                  }
                                 }
                               }
                             })
@@ -1107,8 +938,7 @@
                         }else{
                           if(_this.form.capitalExpenditureType==2){
                             addProjectto(_this.projectForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(response.data.id).then(res => {
+                                offlineCustomSubmit(response.data.id).then(res => {
                                   _this.chargeItme.map((resD,b) => {
                                     resD.cashId = response.data.id
                                     addCashdetail(resD).then((a,rD) => {
@@ -1121,40 +951,11 @@
                                     })
                                   })
                                 })
-                              }else{
-                                offlineCashSubmit(response.data.id).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
-                                    resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
-                                        _this.$toast.success('提交成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
-                                      }
-                                    })
-                                  })
-                                })
-                              }
                             })
                           } else if(_this.form.capitalExpenditureType==4){
                             addInfoto(_this.infoForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(response.data.id).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
-                                    resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
-                                        _this.$toast.success('提交成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
-                                      }
-                                    })
-                                  })
-                                })
-                              }else{
-                                offlineCashSubmit(response.data.id).then(res => {
+
+                                offlineCustomSubmit(response.data.id).then(res => {
                                   _this.chargeItme.map((resD,b) => {
                                     resD.cashId = response.data.id
                                     addCashdetail(resD).then((a,rD) => {
@@ -1167,25 +968,9 @@
                                     })
                                   })
                                 })
-                              }
                             })
                           }else{
-                            if(_this.form.approvalMode === '1'){
-                              cashSubmit(response.data.id).then(res => {
-                                _this.chargeItme.map((resD,b) => {
-                                  resD.cashId = response.data.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b ==  (_this.chargeItme.length-1)){
-                                      _this.$toast.success('提交成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
-                                    }
-                                  })
-                                })
-                              })
-                            }else{
-                              offlineCashSubmit(response.data.id).then(res => {
+                            offlineCustomSubmit(response.data.id).then(res => {
                                 _this.chargeItme.map((resD,b) => {
                                   resD.cashId = response.data.id
                                   addCashdetail(resD).then((a,rD) => {
@@ -1198,7 +983,6 @@
                                   })
                                 })
                               })
-                            }
                           }
                         }
                       }
@@ -1226,22 +1010,7 @@
                               if(idx3 == (_this.uploadFiles3.length-1)){
                                 if(_this.form.capitalExpenditureType==2){
                                   addProjectto(_this.projectForm).then(res => {
-                                    if(_this.form.approvalMode === '1'){
-                                      cashSubmit(response.data.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = response.data.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b ==  (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                    }else{
-                                      offlineCashSubmit(response.data.id).then(res => {
+                                      offlineCustomSubmit(response.data.id).then(res => {
                                         _this.chargeItme.map((resD,b) => {
                                           resD.cashId = response.data.id
                                           addCashdetail(resD).then((a,rD) => {
@@ -1254,12 +1023,10 @@
                                           })
                                         })
                                       })
-                                    }
                                   })
                                 } else if(_this.form.capitalExpenditureType==4){
                                   addInfoto(_this.infoForm).then(res => {
-                                    if(_this.form.approvalMode === '1'){
-                                      cashSubmit(response.data.id).then(res => {
+                                      offlineCustomSubmit(response.data.id).then(res => {
                                         _this.chargeItme.map((resD,b) => {
                                           resD.cashId = response.data.id
                                           addCashdetail(resD).then((a,rD) => {
@@ -1272,39 +1039,9 @@
                                           })
                                         })
                                       })
-                                    }else{
-                                      offlineCashSubmit(response.data.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = response.data.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b ==  (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                    }
                                   })
                                 }else{
-                                  if(_this.form.approvalMode === '1'){
-                                    cashSubmit(response.data.id).then(res => {
-                                      _this.chargeItme.map((resD,b) => {
-                                        resD.cashId = response.data.id
-                                        addCashdetail(resD).then((a,rD) => {
-                                          if(b ==  (_this.chargeItme.length-1)){
-                                            _this.$toast.success('提交成功');
-                                            setTimeout(function(){
-                                              history.go(-1)
-                                            },2000)
-                                          }
-                                        })
-                                      })
-                                    })
-                                  }else{
-                                    offlineCashSubmit(response.data.id).then(res => {
+                                    offlineCustomSubmit(response.data.id).then(res => {
                                       _this.chargeItme.map((resD,b) => {
                                         resD.cashId = response.data.id
                                         addCashdetail(resD).then((a,rD) => {
@@ -1317,7 +1054,6 @@
                                         })
                                       })
                                     })
-                                  }
                                 }
                               }
                             })
@@ -1325,22 +1061,7 @@
                         }else{
                           if(_this.form.capitalExpenditureType==2){
                             addProjectto(_this.projectForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(response.data.id).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
-                                    resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
-                                        _this.$toast.success('提交成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
-                                      }
-                                    })
-                                  })
-                                })
-                              }else{
-                                offlineCashSubmit(response.data.id).then(res => {
+                                offlineCustomSubmit(response.data.id).then(res => {
                                   _this.chargeItme.map((resD,b) => {
                                     resD.cashId = response.data.id
                                     addCashdetail(resD).then((a,rD) => {
@@ -1353,12 +1074,10 @@
                                     })
                                   })
                                 })
-                              }
                             })
                           } else if(_this.form.capitalExpenditureType==4){
                             addInfoto(_this.infoForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(response.data.id).then(res => {
+                                offlineCustomSubmit(response.data.id).then(res => {
                                   _this.chargeItme.map((resD,b) => {
                                     resD.cashId = response.data.id
                                     addCashdetail(resD).then((a,rD) => {
@@ -1371,39 +1090,9 @@
                                     })
                                   })
                                 })
-                              }else{
-                                offlineCashSubmit(response.data.id).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
-                                    resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
-                                        _this.$toast.success('提交成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
-                                      }
-                                    })
-                                  })
-                                })
-                              }
                             })
                           }else{
-                            if(_this.form.approvalMode === '1'){
-                              cashSubmit(response.data.id).then(res => {
-                                _this.chargeItme.map((resD,b) => {
-                                  resD.cashId = response.data.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b ==  (_this.chargeItme.length-1)){
-                                      _this.$toast.success('提交成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
-                                    }
-                                  })
-                                })
-                              })
-                            }else{
-                              offlineCashSubmit(response.data.id).then(res => {
+                            offlineCustomSubmit(response.data.id).then(res => {
                                 _this.chargeItme.map((resD,b) => {
                                   resD.cashId = response.data.id
                                   addCashdetail(resD).then((a,rD) => {
@@ -1416,7 +1105,6 @@
                                   })
                                 })
                               })
-                            }
                           }
                         }
                       }
@@ -1434,22 +1122,7 @@
                       if(idx3 == (_this.uploadFiles3.length-1)){
                         if(_this.form.capitalExpenditureType==2){
                           addProjectto(_this.projectForm).then(res => {
-                            if(_this.form.approvalMode === '1'){
-                              cashSubmit(response.data.id).then(res => {
-                                _this.chargeItme.map((resD,b) => {
-                                  resD.cashId = response.data.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b ==  (_this.chargeItme.length-1)){
-                                      _this.$toast.success('提交成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
-                                    }
-                                  })
-                                })
-                              })
-                            }else{
-                              offlineCashSubmit(response.data.id).then(res => {
+                              offlineCustomSubmit(response.data.id).then(res => {
                                 _this.chargeItme.map((resD,b) => {
                                   resD.cashId = response.data.id
                                   addCashdetail(resD).then((a,rD) => {
@@ -1462,12 +1135,10 @@
                                   })
                                 })
                               })
-                            }
                           })
                         } else if(_this.form.capitalExpenditureType==4){
                           addInfoto(_this.infoForm).then(res => {
-                            if(_this.form.approvalMode === '1'){
-                              cashSubmit(response.data.id).then(res => {
+                            offlineCustomSubmit(response.data.id).then(res => {
                                 _this.chargeItme.map((resD,b) => {
                                   resD.cashId = response.data.id
                                   addCashdetail(resD).then((a,rD) => {
@@ -1480,39 +1151,9 @@
                                   })
                                 })
                               })
-                            }else{
-                              offlineCashSubmit(response.data.id).then(res => {
-                                _this.chargeItme.map((resD,b) => {
-                                  resD.cashId = response.data.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b ==  (_this.chargeItme.length-1)){
-                                      _this.$toast.success('提交成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
-                                    }
-                                  })
-                                })
-                              })
-                            }
                           })
                         }else{
-                          if(_this.form.approvalMode === '1'){
-                            cashSubmit(response.data.id).then(res => {
-                              _this.chargeItme.map((resD,b) => {
-                                resD.cashId = response.data.id
-                                addCashdetail(resD).then((a,rD) => {
-                                  if(b ==  (_this.chargeItme.length-1)){
-                                    _this.$toast.success('提交成功');
-                                    setTimeout(function(){
-                                      history.go(-1)
-                                    },2000)
-                                  }
-                                })
-                              })
-                            })
-                          }else{
-                            offlineCashSubmit(response.data.id).then(res => {
+                          offlineCustomSubmit(response.data.id).then(res => {
                               _this.chargeItme.map((resD,b) => {
                                 resD.cashId = response.data.id
                                 addCashdetail(resD).then((a,rD) => {
@@ -1525,7 +1166,6 @@
                                 })
                               })
                             })
-                          }
                         }
                       }
                     })
@@ -1533,22 +1173,7 @@
                 }else{
                   if(this.form.capitalExpenditureType==2){
                     addProjectto(this.projectForm).then(res => {
-                      if(_this.form.approvalMode === '1'){
-                        cashSubmit(response.data.id).then(res => {
-                          _this.chargeItme.map((resD,b) => {
-                            resD.cashId = response.data.id
-                            addCashdetail(resD).then((a,rD) => {
-                              if(b ==  (_this.chargeItme.length-1)){
-                                _this.$toast.success('提交成功');
-                                setTimeout(function(){
-                                  history.go(-1)
-                                },2000)
-                              }
-                            })
-                          })
-                        })
-                      }else{
-                        offlineCashSubmit(response.data.id).then(res => {
+                        offlineCustomSubmit(response.data.id).then(res => {
                           _this.chargeItme.map((resD,b) => {
                             resD.cashId = response.data.id
                             addCashdetail(resD).then((a,rD) => {
@@ -1561,12 +1186,10 @@
                             })
                           })
                         })
-                      }
                     })
                   } else if(this.form.capitalExpenditureType==4){
                     addInfoto(this.infoForm).then(res => {
-                      if(_this.form.approvalMode === '1'){
-                        cashSubmit(response.data.id).then(res => {
+                        offlineCustomSubmit(response.data.id).then(res => {
                           _this.chargeItme.map((resD,b) => {
                             resD.cashId = response.data.id
                             addCashdetail(resD).then((a,rD) => {
@@ -1579,25 +1202,9 @@
                             })
                           })
                         })
-                      }else{
-                        offlineCashSubmit(response.data.id).then(res => {
-                          _this.chargeItme.map((resD,b) => {
-                            resD.cashId = response.data.id
-                            addCashdetail(resD).then((a,rD) => {
-                              if(b ==  (_this.chargeItme.length-1)){
-                                _this.$toast.success('提交成功');
-                                setTimeout(function(){
-                                  history.go(-1)
-                                },2000)
-                              }
-                            })
-                          })
-                        })
-                      }
                     })
                   }else{
-                    if(_this.form.approvalMode === '1'){
-                      cashSubmit(response.data.id).then(res => {
+                      offlineCustomSubmit(response.data.id).then(res => {
                         _this.chargeItme.map((resD,b) => {
                           resD.cashId = response.data.id
                           addCashdetail(resD).then((a,rD) => {
@@ -1610,21 +1217,6 @@
                           })
                         })
                       })
-                    }else{
-                      offlineCashSubmit(response.data.id).then(res => {
-                        _this.chargeItme.map((resD,b) => {
-                          resD.cashId = response.data.id
-                          addCashdetail(resD).then((a,rD) => {
-                            if(b ==  (_this.chargeItme.length-1)){
-                              _this.$toast.success('提交成功');
-                              setTimeout(function(){
-                                history.go(-1)
-                              },2000)
-                            }
-                          })
-                        })
-                      })
-                    }
                   }
                 }
               });

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalApproval.vue

@@ -239,7 +239,7 @@
         }
       },
       goFlow(){
-        window.location='approvalProcess?id='+this.$route.query.id;
+        window.location='approvalProcess?id='+this.$route.query.id+'&auditbatchNo='+this.$route.query.auditbatchNo;
       },
       getDictionaries(){
         getTransfer(this.$route.query.id).then((response) => {

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalApproval11.vue

@@ -354,13 +354,10 @@
       submitForm() {
         const data = {
           taskId: this.$route.query.taskId,
-          instanceId: this.form.instanceId,
-          variables: JSON.stringify({
-            comment: this.comment,
-            pass: this.pass,
-          }),
-        };
-        console.log(data);
+          auditbatchNo: this.$route.query.auditbatchNo,
+          comment: this.comment,
+          pass: this.pass,
+          };
         approval(data).then((response) => {
           if(response.code==200 && response.msg=="操作成功"){
             this.$toast.success("操作成功");

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue

@@ -207,7 +207,7 @@
         return name
       },
       goFlow(){
-        window.location='approvalProcess?id='+this.$route.query.id;
+        window.location='approvalProcess?id='+this.$route.query.id+'&auditbatchNo='+this.$route.query.auditbatchNo;
       },
       getDictionaries(){
         getTransfer(this.$route.query.id).then((response) => {

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue

@@ -194,7 +194,7 @@
         return name
       },
       goFlow(){
-        window.location='approvalProcess?id='+this.$route.query.id;
+        window.location='approvalProcess?id='+this.$route.query.id+'&auditbatchNo='+this.$route.query.auditbatchNo;
       },
       getDictionaries(){
         getCash(this.$route.query.id).then((response) => {

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList.vue

@@ -27,7 +27,7 @@
         finished-text="没有更多了"
         @load="getList">
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.payer" center :to="{name:'sunVillageApprovalDetail', query: {id:item.id}}">
+          <van-cell :title="item.payer" center :to="{name:'sunVillageApprovalDetail', query: {id:item.id,auditbatchNo:item.auditbatchNo}}">
             <template #icon>
               <van-icon name="../../../../../static/images/onlineHome/icon_yn1.png" size="30" color="#FF4646" style="margin-right: 10px;" />
             </template>
@@ -60,7 +60,7 @@
 </template>
 
 <script>
-import { listTransfer , customSubmit , delTransfer , updateTYinnongTransferFoStatus } from "@/api/onlineHome/bankAgriculture/paymentApproval";
+import { listTransfer , offlineCustomSubmit , delTransfer , updateTYinnongTransferFoStatus } from "@/api/onlineHome/bankAgriculture/paymentApproval";
 export default {
   name: "approvalList",
   data() {
@@ -142,7 +142,7 @@ export default {
         message: '您确认提交草稿？',
       })
       .then(() => {
-        customSubmit(id).then(res => {
+        offlineCustomSubmit(id).then(res => {
           this.$toast.success('提交成功');
           setTimeout(function(){
             history.go(0)

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList11.vue

@@ -28,7 +28,7 @@
         @load="getList"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'sunVillageApprovalDetail11', query: {id:item.id}}">
+          <van-cell :title="item.payer" :value="item.auditStatus" center :to="{name:'sunVillageApprovalDetail11', query: {id:item.id,auditbatchNo:item.auditbatchNo}}">
             <template #icon>
               <van-icon name="../../../../../static/images/onlineHome/icon_yn7.png" size="30" color="#539FFD" style="margin-right: 10px;" />
             </template>
@@ -59,7 +59,7 @@
 
 <script>
 import { listTransfer , customSubmit , delTransfer } from "@/api/onlineHome/bankAgriculture/paymentApproval";
-import {cashSubmit, delCash, listCash} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
+import {offlineCustomSubmit, delCash, listCash} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
 export default {
   name: "approvalList11",
   data() {
@@ -137,7 +137,7 @@ export default {
         message: '您确认提交草稿？',
       })
       .then(() => {
-        cashSubmit(id).then(res => {
+        offlineCustomSubmit(id).then(res => {
           this.$toast.success('提交成功');
           setTimeout(function(){
             history.go(0)

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue

@@ -127,7 +127,7 @@
           label-width="auto"
           maxlength="20"
           required
-          show-word-limit 
+          show-word-limit
           v-if="form.bankType == '6'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
@@ -141,7 +141,7 @@
           label-width="auto"
           maxlength="30"
           required
-          show-word-limit 
+          show-word-limit
           v-if="form.bankType != '5' && form.bankType != '6'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
@@ -592,7 +592,7 @@
         }
         // if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length==1){
         //   this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
-        // }else 
+        // }else
         if(this.form.bankType == '7' && this.chargeItme.length==1){
           this.$notify({ type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！' });
         }else{
@@ -822,56 +822,29 @@
           this.$set(this.projectForm, "ynType", '1');
           if(this.form.capitalExpenditureType==2){
             addProjectto(this.projectForm).then(res => {
-              if(this.form.approvalMode === '1'){
-                customSubmit(this.form.id).then(res => {
-                  this.$toast.success('提交成功');
-                  setTimeout(function(){
-                    _this.$router.push('/sunVillage_info/approvalList')
-                  },2000)
-                })
-              }else{
                 offlineCustomSubmit(this.form.id).then(res => {
                   this.$toast.success('提交成功');
                   setTimeout(function(){
                     _this.$router.push('/sunVillage_info/approvalList')
                   },2000)
                 })
-              }
             })
           }else if(this.form.capitalExpenditureType==4){
             addInfoto(this.infoForm).then(res => {
-              if(this.form.approvalMode === '1'){
-                customSubmit(this.form.id).then(res => {
-                  this.$toast.success('提交成功');
-                  setTimeout(function(){
-                    _this.$router.push('/sunVillage_info/approvalList')
-                  },2000)
-                })
-              }else{
                 offlineCustomSubmit(this.form.id).then(res => {
                   this.$toast.success('提交成功');
                   setTimeout(function(){
                     _this.$router.push('/sunVillage_info/approvalList')
                   },2000)
                 })
-              }
             })
           }else{
-            if(this.form.approvalMode === '1'){
-              customSubmit(this.form.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  _this.$router.push('/sunVillage_info/approvalList')
-                },2000)
-              })
-            }else{
               offlineCustomSubmit(this.form.id).then(res => {
                 this.$toast.success('提交成功');
                 setTimeout(function(){
                   _this.$router.push('/sunVillage_info/approvalList')
                 },2000)
               })
-            }
           }
         });
       },

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify11.vue

@@ -257,7 +257,7 @@
 
 <script>
   import { listAccount1 , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto
-    , cashSubmit , offlineCashSubmit, getQmyeFlow,listInfo ,getInfoto ,addInfoto,listTemplate,selectApprovalByTemplateId} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+    , offlineCustomSubmit , offlineCashSubmit, getQmyeFlow,listInfo ,getInfoto ,addInfoto,listTemplate,selectApprovalByTemplateId} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import {
     addCash, addCashdetail,
     attachmentList,
@@ -633,7 +633,7 @@
             total = (parseFloat(total) + parseFloat(money.incomeAmount)).toFixed(2)
           });
           this.$set(this.form, "expenditureAmount", total);
-          if(this.form.payerAccount<this.form.expenditureAmount){
+          if(parseInt(this.form.payerAccount)< parseInt(this.form.expenditureAmount)){
             this.$notify({ type: 'danger', message: '申请使用金额不能大于可用余额！' });
             return false;
           }else{
@@ -693,57 +693,30 @@
                             _this.projectForm.outId = _this.form.id
                             _this.$set(_this.projectForm, "ynType", '2');
                             addProjectto(_this.projectForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(_this.form.id).then(res => {
+                                offlineCustomSubmit(_this.form.id).then(res => {
                                   _this.$toast.success('提交成功');
                                   setTimeout(function(){
                                     history.go(-1)
                                   },2000)
                                 })
-                              }else{
-                                offlineCashSubmit(_this.form.id).then(res => {
-                                  _this.$toast.success('提交成功');
-                                  setTimeout(function(){
-                                    history.go(-1)
-                                  },2000)
-                                })
-                              }
                             })
                           }else if(_this.form.capitalExpenditureType==4){
                             _this.infoForm.transferId = _this.form.id
                             addInfoto(_this.infoForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(_this.form.id).then(res => {
-                                  _this.$toast.success('提交成功');
-                                  setTimeout(function(){
-                                    history.go(-1)
-                                  },2000)
-                                })
-                              }else{
-                                offlineCashSubmit(_this.form.id).then(res => {
+                              offlineCustomSubmit(_this.form.id).then(res => {
                                   _this.$toast.success('提交成功');
                                   setTimeout(function(){
                                     history.go(-1)
                                   },2000)
                                 })
-                              }
                             })
                           }else{
-                            if(_this.form.approvalMode === '1'){
-                              cashSubmit(_this.form.id).then(res => {
+                              offlineCustomSubmit(_this.form.id).then(res => {
                                 _this.$toast.success('提交成功');
                                 setTimeout(function(){
                                   history.go(-1)
                                 },2000)
                               })
-                            }else{
-                              offlineCashSubmit(_this.form.id).then(res => {
-                                _this.$toast.success('提交成功');
-                                setTimeout(function(){
-                                  history.go(-1)
-                                },2000)
-                              })
-                            }
                           }
                         }
                       })
@@ -787,8 +760,7 @@
                                       if(idx3 == (_this.uploadFiles3.length-1)){
                                         if(_this.form.capitalExpenditureType==2){
                                           addProjectto(_this.projectForm).then(res => {
-                                            if(_this.form.approvalMode === '1'){
-                                              cashSubmit(_this.form.id).then(res => {
+                                              offlineCustomSubmit(_this.form.id).then(res => {
                                                 _this.chargeItme.map((resD,b) => {
                                                   resD.cashId = _this.form.id
                                                   addCashdetail(resD).then((a,rD) => {
@@ -801,40 +773,10 @@
                                                   })
                                                 })
                                               })
-                                            }else{
-                                              offlineCashSubmit(_this.form.id).then(res => {
-                                                _this.chargeItme.map((resD,b) => {
-                                                  resD.cashId = _this.form.id
-                                                  addCashdetail(resD).then((a,rD) => {
-                                                    if(b == (_this.chargeItme.length-1)){
-                                                      _this.$toast.success('提交成功');
-                                                      setTimeout(function(){
-                                                        history.go(-1)
-                                                      },2000)
-                                                    }
-                                                  })
-                                                })
-                                              })
-                                            }
                                           })
                                         } else if(_this.form.capitalExpenditureType==4){
                                           addInfoto(_this.infoForm).then(res => {
-                                            if(_this.form.approvalMode === '1'){
-                                              cashSubmit(_this.form.id).then(res => {
-                                                _this.chargeItme.map((resD,b) => {
-                                                  resD.cashId = _this.form.id
-                                                  addCashdetail(resD).then((a,rD) => {
-                                                    if(b == (_this.chargeItme.length-1)){
-                                                      _this.$toast.success('提交成功');
-                                                      setTimeout(function(){
-                                                        history.go(-1)
-                                                      },2000)
-                                                    }
-                                                  })
-                                                })
-                                              })
-                                            }else{
-                                              offlineCashSubmit(_this.form.id).then(res => {
+                                              offlineCustomSubmit(_this.form.id).then(res => {
                                                 _this.chargeItme.map((resD,b) => {
                                                   resD.cashId = _this.form.id
                                                   addCashdetail(resD).then((a,rD) => {
@@ -847,25 +789,9 @@
                                                   })
                                                 })
                                               })
-                                            }
                                           })
                                         }else{
-                                          if(_this.form.approvalMode === '1'){
-                                            cashSubmit(_this.form.id).then(res => {
-                                              _this.chargeItme.map((resD,b) => {
-                                                resD.cashId = _this.form.id
-                                                addCashdetail(resD).then((a,rD) => {
-                                                  if(b == (_this.chargeItme.length-1)){
-                                                    _this.$toast.success('提交成功');
-                                                    setTimeout(function(){
-                                                      history.go(-1)
-                                                    },2000)
-                                                  }
-                                                })
-                                              })
-                                            })
-                                          }else{
-                                            offlineCashSubmit(_this.form.id).then(res => {
+                                            offlineCustomSubmit(_this.form.id).then(res => {
                                               _this.chargeItme.map((resD,b) => {
                                                 resD.cashId = _this.form.id
                                                 addCashdetail(resD).then((a,rD) => {
@@ -878,7 +804,6 @@
                                                 })
                                               })
                                             })
-                                          }
                                         }
                                       }
                                     })
@@ -886,8 +811,7 @@
                                 }else{
                                   if(_this.form.capitalExpenditureType==2){
                                     addProjectto(_this.projectForm).then(res => {
-                                      if(_this.form.approvalMode === '1'){
-                                        cashSubmit(_this.form.id).then(res => {
+                                        offlineCustomSubmit(_this.form.id).then(res => {
                                           _this.chargeItme.map((resD,b) => {
                                             resD.cashId = _this.form.id
                                             addCashdetail(resD).then((a,rD) => {
@@ -900,40 +824,10 @@
                                             })
                                           })
                                         })
-                                      }else{
-                                        offlineCashSubmit(_this.form.id).then(res => {
-                                          _this.chargeItme.map((resD,b) => {
-                                            resD.cashId = _this.form.id
-                                            addCashdetail(resD).then((a,rD) => {
-                                              if(b == (_this.chargeItme.length-1)){
-                                                _this.$toast.success('提交成功');
-                                                setTimeout(function(){
-                                                  history.go(-1)
-                                                },2000)
-                                              }
-                                            })
-                                          })
-                                        })
-                                      }
                                     })
                                   } else if(_this.form.capitalExpenditureType==4){
                                     addInfoto(_this.infoForm).then(res => {
-                                      if(_this.form.approvalMode === '1'){
-                                        cashSubmit(_this.form.id).then(res => {
-                                          _this.chargeItme.map((resD,b) => {
-                                            resD.cashId = _this.form.id
-                                            addCashdetail(resD).then((a,rD) => {
-                                              if(b == (_this.chargeItme.length-1)){
-                                                _this.$toast.success('提交成功');
-                                                setTimeout(function(){
-                                                  history.go(-1)
-                                                },2000)
-                                              }
-                                            })
-                                          })
-                                        })
-                                      }else{
-                                        offlineCashSubmit(_this.form.id).then(res => {
+                                        offlineCustomSubmit(_this.form.id).then(res => {
                                           _this.chargeItme.map((resD,b) => {
                                             resD.cashId = _this.form.id
                                             addCashdetail(resD).then((a,rD) => {
@@ -946,25 +840,9 @@
                                             })
                                           })
                                         })
-                                      }
                                     })
                                   }else{
-                                    if(_this.form.approvalMode === '1'){
-                                      cashSubmit(_this.form.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = _this.form.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b == (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                    }else{
-                                      offlineCashSubmit(_this.form.id).then(res => {
+                                      offlineCustomSubmit(_this.form.id).then(res => {
                                         _this.chargeItme.map((resD,b) => {
                                           resD.cashId = _this.form.id
                                           addCashdetail(resD).then((a,rD) => {
@@ -977,7 +855,6 @@
                                           })
                                         })
                                       })
-                                    }
                                   }
                                 }
                               }
@@ -995,8 +872,7 @@
                               if(idx3 ==(_this.uploadFiles3.length-1)){
                                 if(_this.form.capitalExpenditureType==2){
                                   addProjectto(_this.projectForm).then(res => {
-                                    if(_this.form.approvalMode === '1'){
-                                      cashSubmit(_this.form.id).then(res => {
+                                    offlineCustomSubmit(_this.form.id).then(res => {
                                         _this.chargeItme.map((resD,b) => {
                                           resD.cashId = _this.form.id
                                           addCashdetail(resD).then((a,rD) => {
@@ -1009,26 +885,10 @@
                                           })
                                         })
                                       })
-                                    }else{
-                                      offlineCashSubmit(_this.form.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = _this.form.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b == (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                    }
                                   })
                                 } else if(_this.form.capitalExpenditureType==4){
                                   addInfoto(_this.infoForm).then(res => {
-                                    if(_this.form.approvalMode === '1'){
-                                      cashSubmit(_this.form.id).then(res => {
+                                      offlineCustomSubmit(_this.form.id).then(res => {
                                         _this.chargeItme.map((resD,b) => {
                                           resD.cashId = _this.form.id
                                           addCashdetail(resD).then((a,rD) => {
@@ -1041,39 +901,9 @@
                                           })
                                         })
                                       })
-                                    }else{
-                                      offlineCashSubmit(_this.form.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = _this.form.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b == (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                    }
                                   })
                                 }else{
-                                  if(_this.form.approvalMode === '1'){
-                                    cashSubmit(_this.form.id).then(res => {
-                                      _this.chargeItme.map((resD,b) => {
-                                        resD.cashId = _this.form.id
-                                        addCashdetail(resD).then((a,rD) => {
-                                          if(b == (_this.chargeItme.length-1)){
-                                            _this.$toast.success('提交成功');
-                                            setTimeout(function(){
-                                              history.go(-1)
-                                            },2000)
-                                          }
-                                        })
-                                      })
-                                    })
-                                  }else{
-                                    offlineCashSubmit(_this.form.id).then(res => {
+                                    offlineCustomSubmit(_this.form.id).then(res => {
                                       _this.chargeItme.map((resD,b) => {
                                         resD.cashId = _this.form.id
                                         addCashdetail(resD).then((a,rD) => {
@@ -1086,7 +916,6 @@
                                         })
                                       })
                                     })
-                                  }
                                 }
                               }
                             })
@@ -1094,8 +923,7 @@
                         }else{
                           if(_this.form.capitalExpenditureType==2){
                             addProjectto(_this.projectForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(_this.form.id).then(res => {
+                                offlineCustomSubmit(_this.form.id).then(res => {
                                   _this.chargeItme.map((resD,b) => {
                                     resD.cashId = _this.form.id
                                     addCashdetail(resD).then((a,rD) => {
@@ -1108,26 +936,10 @@
                                     })
                                   })
                                 })
-                              }else{
-                                offlineCashSubmit(_this.form.id).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
-                                    resD.cashId = _this.form.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b == (_this.chargeItme.length-1)){
-                                        _this.$toast.success('提交成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
-                                      }
-                                    })
-                                  })
-                                })
-                              }
                             })
                           } else if(_this.form.capitalExpenditureType==4){
                             addInfoto(_this.infoForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(_this.form.id).then(res => {
+                                offlineCustomSubmit(_this.form.id).then(res => {
                                   _this.chargeItme.map((resD,b) => {
                                     resD.cashId = _this.form.id
                                     addCashdetail(resD).then((a,rD) => {
@@ -1140,25 +952,9 @@
                                     })
                                   })
                                 })
-                              }else{
-                                offlineCashSubmit(_this.form.id).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
-                                    resD.cashId = _this.form.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b == (_this.chargeItme.length-1)){
-                                        _this.$toast.success('提交成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
-                                      }
-                                    })
-                                  })
-                                })
-                              }
                             })
                           }else{
-                            if(_this.form.approvalMode === '1'){
-                              cashSubmit(_this.form.id).then(res => {
+                              offlineCustomSubmit(_this.form.id).then(res => {
                                 _this.chargeItme.map((resD,b) => {
                                   resD.cashId = _this.form.id
                                   addCashdetail(resD).then((a,rD) => {
@@ -1171,21 +967,6 @@
                                   })
                                 })
                               })
-                            }else{
-                              offlineCashSubmit(_this.form.id).then(res => {
-                                _this.chargeItme.map((resD,b) => {
-                                  resD.cashId = _this.form.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b == (_this.chargeItme.length-1)){
-                                      _this.$toast.success('提交成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
-                                    }
-                                  })
-                                })
-                              })
-                            }
                           }
                         }
                       }
@@ -1213,22 +994,7 @@
                               if(idx3 == (_this.uploadFiles3.length-1)){
                                 if(_this.form.capitalExpenditureType==2){
                                   addProjectto(_this.projectForm).then(res => {
-                                    if(_this.form.approvalMode === '1'){
-                                      cashSubmit(_this.form.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = _this.form.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b == (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                    }else{
-                                      offlineCashSubmit(_this.form.id).then(res => {
+                                    offlineCustomSubmit(_this.form.id).then(res => {
                                         _this.chargeItme.map((resD,b) => {
                                           resD.cashId = _this.form.id
                                           addCashdetail(resD).then((a,rD) => {
@@ -1241,12 +1007,10 @@
                                           })
                                         })
                                       })
-                                    }
                                   })
                                 } else if(_this.form.capitalExpenditureType==4){
                                   addInfoto(_this.infoForm).then(res => {
-                                    if(_this.form.approvalMode === '1'){
-                                      cashSubmit(_this.form.id).then(res => {
+                                      offlineCustomSubmit(_this.form.id).then(res => {
                                         _this.chargeItme.map((resD,b) => {
                                           resD.cashId = _this.form.id
                                           addCashdetail(resD).then((a,rD) => {
@@ -1259,39 +1023,9 @@
                                           })
                                         })
                                       })
-                                    }else{
-                                      offlineCashSubmit(_this.form.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = _this.form.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b == (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                    }
                                   })
                                 }else{
-                                  if(_this.form.approvalMode === '1'){
-                                    cashSubmit(_this.form.id).then(res => {
-                                      _this.chargeItme.map((resD,b) => {
-                                        resD.cashId = _this.form.id
-                                        addCashdetail(resD).then((a,rD) => {
-                                          if(b == (_this.chargeItme.length-1)){
-                                            _this.$toast.success('提交成功');
-                                            setTimeout(function(){
-                                              history.go(-1)
-                                            },2000)
-                                          }
-                                        })
-                                      })
-                                    })
-                                  }else{
-                                    offlineCashSubmit(_this.form.id).then(res => {
+                                    offlineCustomSubmit(_this.form.id).then(res => {
                                       _this.chargeItme.map((resD,b) => {
                                         resD.cashId = _this.form.id
                                         addCashdetail(resD).then((a,rD) => {
@@ -1304,7 +1038,6 @@
                                         })
                                       })
                                     })
-                                  }
                                 }
                               }
                             })
@@ -1312,22 +1045,7 @@
                         }else{
                           if(_this.form.capitalExpenditureType==2){
                             addProjectto(_this.projectForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(_this.form.id).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
-                                    resD.cashId = _this.form.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b == (_this.chargeItme.length-1)){
-                                        _this.$toast.success('提交成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
-                                      }
-                                    })
-                                  })
-                                })
-                              }else{
-                                offlineCashSubmit(_this.form.id).then(res => {
+                                offlineCustomSubmit(_this.form.id).then(res => {
                                   _this.chargeItme.map((resD,b) => {
                                     resD.cashId = _this.form.id
                                     addCashdetail(resD).then((a,rD) => {
@@ -1340,12 +1058,10 @@
                                     })
                                   })
                                 })
-                              }
                             })
                           } else if(_this.form.capitalExpenditureType==4){
                             addInfoto(_this.infoForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(_this.form.id).then(res => {
+                              offlineCustomSubmit(_this.form.id).then(res => {
                                   _this.chargeItme.map((resD,b) => {
                                     resD.cashId = _this.form.id
                                     addCashdetail(resD).then((a,rD) => {
@@ -1358,25 +1074,9 @@
                                     })
                                   })
                                 })
-                              }else{
-                                offlineCashSubmit(_this.form.id).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
-                                    resD.cashId = _this.form.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b == (_this.chargeItme.length-1)){
-                                        _this.$toast.success('提交成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
-                                      }
-                                    })
-                                  })
-                                })
-                              }
                             })
                           }else{
-                            if(_this.form.approvalMode === '1'){
-                              cashSubmit(_this.form.id).then(res => {
+                              offlineCustomSubmit(_this.form.id).then(res => {
                                 _this.chargeItme.map((resD,b) => {
                                   resD.cashId = _this.form.id
                                   addCashdetail(resD).then((a,rD) => {
@@ -1389,21 +1089,6 @@
                                   })
                                 })
                               })
-                            }else{
-                              offlineCashSubmit(_this.form.id).then(res => {
-                                _this.chargeItme.map((resD,b) => {
-                                  resD.cashId = _this.form.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b == (_this.chargeItme.length-1)){
-                                      _this.$toast.success('提交成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
-                                    }
-                                  })
-                                })
-                              })
-                            }
                           }
                         }
                       }
@@ -1421,22 +1106,7 @@
                       if(idx3 == (_this.uploadFiles3.length-1)){
                         if(_this.form.capitalExpenditureType==2){
                           addProjectto(_this.projectForm).then(res => {
-                            if(_this.form.approvalMode === '1'){
-                              cashSubmit(_this.form.id).then(res => {
-                                _this.chargeItme.map((resD,b) => {
-                                  resD.cashId = _this.form.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b == (_this.chargeItme.length-1)){
-                                      _this.$toast.success('提交成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
-                                    }
-                                  })
-                                })
-                              })
-                            }else{
-                              offlineCashSubmit(_this.form.id).then(res => {
+                              offlineCustomSubmit(_this.form.id).then(res => {
                                 _this.chargeItme.map((resD,b) => {
                                   resD.cashId = _this.form.id
                                   addCashdetail(resD).then((a,rD) => {
@@ -1449,12 +1119,10 @@
                                   })
                                 })
                               })
-                            }
                           })
                         } else if(_this.form.capitalExpenditureType==4){
                           addInfoto(_this.infoForm).then(res => {
-                            if(_this.form.approvalMode === '1'){
-                              cashSubmit(_this.form.id).then(res => {
+                              offlineCustomSubmit(_this.form.id).then(res => {
                                 _this.chargeItme.map((resD,b) => {
                                   resD.cashId = _this.form.id
                                   addCashdetail(resD).then((a,rD) => {
@@ -1467,39 +1135,9 @@
                                   })
                                 })
                               })
-                            }else{
-                              offlineCashSubmit(_this.form.id).then(res => {
-                                _this.chargeItme.map((resD,b) => {
-                                  resD.cashId = _this.form.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b == (_this.chargeItme.length-1)){
-                                      _this.$toast.success('提交成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
-                                    }
-                                  })
-                                })
-                              })
-                            }
                           })
                         }else{
-                          if(_this.form.approvalMode === '1'){
-                            cashSubmit(_this.form.id).then(res => {
-                              _this.chargeItme.map((resD,b) => {
-                                resD.cashId = _this.form.id
-                                addCashdetail(resD).then((a,rD) => {
-                                  if(b == (_this.chargeItme.length-1)){
-                                    _this.$toast.success('提交成功');
-                                    setTimeout(function(){
-                                      history.go(-1)
-                                    },2000)
-                                  }
-                                })
-                              })
-                            })
-                          }else{
-                            offlineCashSubmit(_this.form.id).then(res => {
+                          offlineCustomSubmit(_this.form.id).then(res => {
                               _this.chargeItme.map((resD,b) => {
                                 resD.cashId = _this.form.id
                                 addCashdetail(resD).then((a,rD) => {
@@ -1512,7 +1150,6 @@
                                 })
                               })
                             })
-                          }
                         }
                       }
                     })
@@ -1520,8 +1157,7 @@
                 }else{
                   if(this.form.capitalExpenditureType==2){
                     addProjectto(this.projectForm).then(res => {
-                      if(_this.form.approvalMode === '1'){
-                        cashSubmit(_this.form.id).then(res => {
+                        offlineCustomSubmit(_this.form.id).then(res => {
                           _this.chargeItme.map((resD,b) => {
                             resD.cashId = _this.form.id
                             addCashdetail(resD).then((a,rD) => {
@@ -1534,40 +1170,10 @@
                             })
                           })
                         })
-                      }else{
-                        offlineCashSubmit(_this.form.id).then(res => {
-                          _this.chargeItme.map((resD,b) => {
-                            resD.cashId = _this.form.id
-                            addCashdetail(resD).then((a,rD) => {
-                              if(b == (_this.chargeItme.length-1)){
-                                _this.$toast.success('提交成功');
-                                setTimeout(function(){
-                                  history.go(-1)
-                                },2000)
-                              }
-                            })
-                          })
-                        })
-                      }
                     })
                   } else if(this.form.capitalExpenditureType==4){
                     addInfoto(this.infoForm).then(res => {
-                      if(_this.form.approvalMode === '1'){
-                        cashSubmit(_this.form.id).then(res => {
-                          _this.chargeItme.map((resD,b) => {
-                            resD.cashId = _this.form.id
-                            addCashdetail(resD).then((a,rD) => {
-                              if(b == (_this.chargeItme.length-1)){
-                                _this.$toast.success('提交成功');
-                                setTimeout(function(){
-                                  history.go(-1)
-                                },2000)
-                              }
-                            })
-                          })
-                        })
-                      }else{
-                        offlineCashSubmit(_this.form.id).then(res => {
+                        offlineCustomSubmit(_this.form.id).then(res => {
                           _this.chargeItme.map((resD,b) => {
                             resD.cashId = _this.form.id
                             addCashdetail(resD).then((a,rD) => {
@@ -1580,11 +1186,9 @@
                             })
                           })
                         })
-                      }
                     })
                   }else{
-                    if(_this.form.approvalMode === '1'){
-                      cashSubmit(_this.form.id).then(res => {
+                      offlineCustomSubmit(_this.form.id).then(res => {
                         _this.chargeItme.map((resD,b) => {
                           resD.cashId = _this.form.id
                           addCashdetail(resD).then((a,rD) => {
@@ -1597,21 +1201,6 @@
                           })
                         })
                       })
-                    }else{
-                      offlineCashSubmit(_this.form.id).then(res => {
-                        _this.chargeItme.map((resD,b) => {
-                          resD.cashId = _this.form.id
-                          addCashdetail(resD).then((a,rD) => {
-                            if(b == (_this.chargeItme.length-1)){
-                              _this.$toast.success('提交成功');
-                              setTimeout(function(){
-                                history.go(-1)
-                              },2000)
-                            }
-                          })
-                        })
-                      })
-                    }
                   }
                 }
               });

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalProcess.vue

@@ -11,48 +11,49 @@
         </template>
       </van-nav-bar>
       <div class="main_box">
-        <van-row v-if="processList.待申请!=2">
+        <van-divider content-position="center"><h4>批次号：{{this.$route.query.auditbatchNo}}</h4></van-divider>
+        <van-row v-if="form.auditStatus== '0'">
           <van-col span="4" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
           <van-col span="20" class="textBlue">草稿</van-col>
         </van-row>
-        <van-row v-if="processList.待申请==2">
+        <van-row v-if="form.auditStatus != '0'">
           <van-col span="4" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
           <van-col span="20" class="textBlue">已申请
             <van-row>
-              <van-col span="8" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">{{processList.申请人}}</van-col>
-              <van-col span="16" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">{{processList.申请时间}}</van-col>
+              <van-col span="12" style="padding: 0;" class="textBlue" v-show="processList.auditStatus!='0'">{{form.applyUserName}}</van-col>
+              <van-col span="12" style="padding: 0;" class="textBlue" v-show="processList.auditStatus!='0'">{{form.applyDate}}</van-col>
             </van-row>
           </van-col>
         </van-row>
-        <van-row v-if="processList.status==2" v-for="(item1,index,i) in processList.审批事项" :key="i">
+        <van-row  v-for="(item1,index,i) in processList" :key="i">
           <van-col span="4" align="right">
-            <p class="icon_jian" v-show="item1.approverStatus==1"><van-icon name="minus" size="14" /></p>
-            <p class="icon_jian blue" v-show="item1.approverStatus==2"><van-icon name="success" size="14" /></p>
-            <p class="icon_jian red" v-show="item1.approverStatus==3"><van-icon name="cross" size="14" /></p>
+            <p class="icon_jian" v-show="item1.auditStatus=='1'"><van-icon name="minus" size="14" /></p>
+            <p class="icon_jian blue" v-show="item1.auditStatus=='3'"><van-icon name="success" size="14" /></p>
+            <p class="icon_jian red" v-show="item1.auditStatus=='2'"><van-icon name="cross" size="14" /></p>
           </van-col>
           <van-col span="20">
             <van-row>
-              <van-col span="8" style="padding: 0;">
-                <p v-show="item1.approverStatus == 1">{{item1.deptLabel}}</p>
-                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.deptLabel}}</p>
-                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.deptLabel}}</p>
+              <van-col span="12" style="padding: 0;">
+                <p v-show="item1.auditStatus == '1'">{{item1.nodeName}}</p>
+                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.nodeName}}</p>
+                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.nodeName}}</p>
               </van-col>
-              <van-col span="16" style="padding: 0;" >
-                <p v-show="item1.approverStatus == 1">{{item1.time}}</p>
-                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.time}}</p>
-                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.time}}</p>
+              <van-col span="12" style="padding: 0;" >
+                <p v-show="item1.auditStatus == '1'">{{item1.auditTime}}</p>
+                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditTime}}</p>
+                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditTime}}</p>
               </van-col>
             </van-row>
             <van-row>
-              <van-col span="16" style="padding: 0;" >
-                <p v-show="item1.approverStatus == 1">{{item1.assigneeName}}</p>
-                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.assigneeName}}</p>
-                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.assigneeName}}</p>
+              <van-col span="12" style="padding: 0;" >
+                <p v-show="item1.auditStatus == '1'">{{item1.auditBy}}</p>
+                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditBy}}</p>
+                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditBy}}</p>
               </van-col>
-              <van-col span="8" style="padding: 0;">
-                <p v-show="item1.approverStatus == 1">{{item1.comment}}</p>
-                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.comment}}</p>
-                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.comment}}</p>
+              <van-col span="12" style="padding: 0;">
+                <p v-show="item1.auditStatus == '1'">{{item1.auditRemark}}</p>
+                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditRemark}}</p>
+                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditRemark}}</p>
               </van-col>
             </van-row>
           </van-col>
@@ -108,13 +109,14 @@ export default {
   },
   methods: {
     //查询审批进程
-    getTransferProcess(id){
-      getTransferProcess(id).then(res => {
-        this.processList = res.data.processSchedule
-        this.processList.乡镇审批时间 = this.processList.乡镇审批时间?this.format(this.processList.乡镇审批时间, "yyyy-MM-dd HH:mm:ss"):""
-        this.processList.区县审批时间 = this.processList.区县审批时间?this.format(this.processList.区县审批时间, "yyyy-MM-dd HH:mm:ss"):""
-        this.processList.支付状态时间 = this.processList.支付状态时间?this.format(this.processList.支付状态时间, "yyyy-MM-dd HH:mm:ss"):""
-        this.processList.入账状态时间 = this.processList.入账状态时间?this.format(this.processList.入账状态时间, "yyyy-MM-dd HH:mm:ss"):""
+    getTransferProcess(auditbatchNo){
+      getTransferProcess(auditbatchNo).then(res => {
+        this.processList = res.data[auditbatchNo]
+        // console.info( this.processList);
+        // this.processList.乡镇审批时间 = this.processList.乡镇审批时间?this.format(this.processList.乡镇审批时间, "yyyy-MM-dd HH:mm:ss"):""
+        // this.processList.区县审批时间 = this.processList.区县审批时间?this.format(this.processList.区县审批时间, "yyyy-MM-dd HH:mm:ss"):""
+        // this.processList.支付状态时间 = this.processList.支付状态时间?this.format(this.processList.支付状态时间, "yyyy-MM-dd HH:mm:ss"):""
+        // this.processList.入账状态时间 = this.processList.入账状态时间?this.format(this.processList.入账状态时间, "yyyy-MM-dd HH:mm:ss"):""
       })
     },
     handleUpdate(id) {
@@ -122,7 +124,7 @@ export default {
         this.form = response.data;
         this.processList = {}
         if(this.form.auditStatus != 0){
-          this.getTransferProcess(this.$route.query.id);
+          this.getTransferProcess(this.$route.query.auditbatchNo);
         }
         if(this.form.approvalMode == 1){
           selectApprovalByTemplateId(this.form.approvalTemplateId).then(rs => {

src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue

@@ -127,7 +127,7 @@
           label-width="auto"
           maxlength="20"
           required
-          show-word-limit 
+          show-word-limit
           v-if="form.bankType == '6'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
@@ -141,7 +141,7 @@
           label-width="auto"
           maxlength="30"
           required
-          show-word-limit 
+          show-word-limit
           v-if="form.bankType != '5' && form.bankType != '6'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
@@ -372,7 +372,13 @@
         showpayer:false,
 
         buttonType:'a',
-
+        approval: {
+          taskId: null,
+          auditbatchNo: null,
+          type: null,
+          id: null,
+          comment: '',
+        },
         minDate: new Date(2000, 1, 1),
         maxDate: new Date(2050, 12, 31),
         currentDate: new Date(),
@@ -402,6 +408,7 @@
           bankPriority: "0",
           clientPriority: "0"
         },
+
         fileList1:[],
         fileList2:[],
         fileList3:[],
@@ -419,7 +426,6 @@
         projectFundTypeDictionaries:[],
         infoList:[],
         payerOptions:[],
-
         chargeItme:[],
         chargeItmeShow:[],
         templateList:[],
@@ -641,7 +647,7 @@
         }
         // if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>0 && this.chargeItme != []){
         //   this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
-        // }else 
+        // }else
         if(this.form.bankType == '7' && this.chargeItme.length>0 && this.chargeItme != []){
           this.$notify({ type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！' });
         }else{
@@ -867,57 +873,29 @@
           this.$set(this.projectForm, "ynType", '1');
           if(this.form.capitalExpenditureType==2){
             addProjectto(this.projectForm).then(res => {
-              if(this.form.approvalMode === '1'){
-                customSubmit(this.projectForm.outId).then(res => {
-                  this.$toast.success('提交成功');
-                  setTimeout(function(){
-                    _this.$router.push('/yinnong/approvalList')
-                  },1000)
-                })
-              }else{
-                offlineCustomSubmit(this.projectForm.outId).then(res => {
-                  this.$toast.success('提交成功');
-                  setTimeout(function(){
-                    _this.$router.push('/yinnong/approvalList')
-                  },1000)
-                })
-              }
-
-            })
-          }else if(this.form.capitalExpenditureType==4){
-            addInfoto(this.infoForm).then(res => {
-              if(this.form.approvalMode === '1'){
-                customSubmit(this.projectForm.outId).then(res => {
-                  this.$toast.success('提交成功');
-                  setTimeout(function(){
-                    _this.$router.push('/yinnong/approvalList')
-                  },1000)
-                })
-              }else{
-                offlineCustomSubmit(this.projectForm.outId).then(res => {
-                  this.$toast.success('提交成功');
-                  setTimeout(function(){
-                    _this.$router.push('/yinnong/approvalList')
-                  },1000)
-                })
-              }
-            })
-          }else{
-            if(this.form.approvalMode === '1'){
-              customSubmit(this.projectForm.outId).then(res => {
+              offlineCustomSubmit(this.projectForm.outId).then(res => {
                 this.$toast.success('提交成功');
                 setTimeout(function(){
                   _this.$router.push('/yinnong/approvalList')
                 },1000)
               })
-            }else{
+            })
+          }else if(this.form.capitalExpenditureType==4){
+            addInfoto(this.infoForm).then(res => {
               offlineCustomSubmit(this.projectForm.outId).then(res => {
                 this.$toast.success('提交成功');
                 setTimeout(function(){
                   _this.$router.push('/yinnong/approvalList')
-                },2000)
+                },1000)
               })
-            }
+            })
+          }else{
+            offlineCustomSubmit(this.projectForm.outId).then(res => {
+              this.$toast.success('提交成功');
+              setTimeout(function(){
+                _this.$router.push('/yinnong/approvalList')
+              },2000)
+            })
           }
         })
       },

src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue

@@ -257,7 +257,7 @@
 
 <script>
   import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto ,selectApprovalByTemplateId,
-    cashSubmit , offlineCashSubmit, getAccount ,getQmyeFlow,listInfo ,getInfoto ,addInfoto ,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+    offlineCustomSubmit , offlineCashSubmit, getAccount ,getQmyeFlow,listInfo ,getInfoto ,addInfoto ,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
   import {
     addCash,
@@ -365,9 +365,11 @@
         accountType: "101",
         status: "N",
       }
+      console.log(1111111111111111111111111)
       listAccount1(queryParamsOld).then((response) => {
+        console.log(response)
         response.rows.map(res => {
-          console.log(res)
+
           // res['accountName'] = this.$store.state.user.bookName
           // res['id'] = this.$store.state.user.loginBookId
           res['text'] = res.accountName+"余额："+res.balance
@@ -694,57 +696,30 @@
                             _this.projectForm.outId = response.data.id
                             _this.$set(_this.projectForm, "ynType", '2');
                             addProjectto(_this.projectForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(response.data.id).then(res => {
+                                offlineCustomSubmit(response.data.id).then(res => {
                                   _this.$toast.success('提交成功');
                                   setTimeout(function(){
                                     history.go(-1)
                                   },2000)
                                 })
-                              }else{
-                                offlineCashSubmit(response.data.id).then(res => {
-                                  _this.$toast.success('提交成功');
-                                  setTimeout(function(){
-                                    history.go(-1)
-                                  },2000)
-                                })
-                              }
                             })
                           }else if(_this.form.capitalExpenditureType==4){
                             _this.infoForm.transferId = response.data.id
                             addInfoto(_this.infoForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(response.data.id).then(res => {
-                                  _this.$toast.success('提交成功');
-                                  setTimeout(function(){
-                                    history.go(-1)
-                                  },2000)
-                                })
-                              }else{
-                                offlineCashSubmit(response.data.id).then(res => {
+                                offlineCustomSubmit(response.data.id).then(res => {
                                   _this.$toast.success('提交成功');
                                   setTimeout(function(){
                                     history.go(-1)
                                   },2000)
                                 })
-                              }
                             })
                           }else{
-                            if(_this.form.approvalMode === '1'){
-                              cashSubmit(response.data.id).then(res => {
+                              offlineCustomSubmit(response.data.id).then(res => {
                                 _this.$toast.success('提交成功');
                                 setTimeout(function(){
                                   history.go(-1)
                                 },2000)
                               })
-                            }else{
-                              offlineCashSubmit(response.data.id).then(res => {
-                                _this.$toast.success('提交成功');
-                                setTimeout(function(){
-                                  history.go(-1)
-                                },2000)
-                              })
-                            }
                           }
                         }
                       })
@@ -793,22 +768,7 @@
                                       if(idx3 == (_this.uploadFiles3.length-1)){
                                         if(_this.form.capitalExpenditureType==2){
                                           addProjectto(_this.projectForm).then(res => {
-                                            if(_this.form.approvalMode === '1'){
-                                              cashSubmit(response.data.id).then(res => {
-                                                _this.chargeItme.map((resD,b) => {
-                                                  resD.cashId = response.data.id
-                                                  addCashdetail(resD).then((a,rD) => {
-                                                    if(b ==  (_this.chargeItme.length-1)){
-                                                      _this.$toast.success('提交成功');
-                                                      setTimeout(function(){
-                                                        history.go(-1)
-                                                      },2000)
-                                                    }
-                                                  })
-                                                })
-                                              })
-                                            }else{
-                                              offlineCashSubmit(response.data.id).then(res => {
+                                              offlineCustomSubmit(response.data.id).then(res => {
                                                 _this.chargeItme.map((resD,b) => {
                                                   resD.cashId = response.data.id
                                                   addCashdetail(resD).then((a,rD) => {
@@ -821,12 +781,10 @@
                                                   })
                                                 })
                                               })
-                                            }
                                           })
                                         } else if(_this.form.capitalExpenditureType==4){
                                           addInfoto(_this.infoForm).then(res => {
-                                            if(_this.form.approvalMode === '1'){
-                                              cashSubmit(response.data.id).then(res => {
+                                              offlineCustomSubmit(response.data.id).then(res => {
                                                 _this.chargeItme.map((resD,b) => {
                                                   resD.cashId = response.data.id
                                                   addCashdetail(resD).then((a,rD) => {
@@ -839,39 +797,9 @@
                                                   })
                                                 })
                                               })
-                                            }else{
-                                              offlineCashSubmit(response.data.id).then(res => {
-                                                _this.chargeItme.map((resD,b) => {
-                                                  resD.cashId = response.data.id
-                                                  addCashdetail(resD).then((a,rD) => {
-                                                    if(b ==  (_this.chargeItme.length-1)){
-                                                      _this.$toast.success('提交成功');
-                                                      setTimeout(function(){
-                                                        history.go(-1)
-                                                      },2000)
-                                                    }
-                                                  })
-                                                })
-                                              })
-                                            }
                                           })
                                         }else{
-                                          if(_this.form.approvalMode === '1'){
-                                            cashSubmit(response.data.id).then(res => {
-                                              _this.chargeItme.map((resD,b) => {
-                                                resD.cashId = response.data.id
-                                                addCashdetail(resD).then((a,rD) => {
-                                                  if(b ==  (_this.chargeItme.length-1)){
-                                                    _this.$toast.success('提交成功');
-                                                    setTimeout(function(){
-                                                      history.go(-1)
-                                                    },2000)
-                                                  }
-                                                })
-                                              })
-                                            })
-                                          }else{
-                                            offlineCashSubmit(response.data.id).then(res => {
+                                            offlineCustomSubmit(response.data.id).then(res => {
                                               _this.chargeItme.map((resD,b) => {
                                                 resD.cashId = response.data.id
                                                 addCashdetail(resD).then((a,rD) => {
@@ -884,7 +812,6 @@
                                                 })
                                               })
                                             })
-                                          }
                                         }
                                       }
                                     })
@@ -892,22 +819,8 @@
                                 }else{
                                   if(_this.form.capitalExpenditureType==2){
                                     addProjectto(_this.projectForm).then(res => {
-                                      if(_this.form.approvalMode === '1'){
-                                        cashSubmit(response.data.id).then(res => {
-                                          _this.chargeItme.map((resD,b) => {
-                                            resD.cashId = response.data.id
-                                            addCashdetail(resD).then((a,rD) => {
-                                              if(b ==  (_this.chargeItme.length-1)){
-                                                _this.$toast.success('提交成功');
-                                                setTimeout(function(){
-                                                  history.go(-1)
-                                                },2000)
-                                              }
-                                            })
-                                          })
-                                        })
-                                      }else{
-                                        offlineCashSubmit(response.data.id).then(res => {
+
+                                        offlineCustomSubmit(response.data.id).then(res => {
                                           _this.chargeItme.map((resD,b) => {
                                             resD.cashId = response.data.id
                                             addCashdetail(resD).then((a,rD) => {
@@ -920,12 +833,10 @@
                                             })
                                           })
                                         })
-                                      }
                                     })
                                   } else if(_this.form.capitalExpenditureType==4){
                                     addInfoto(_this.infoForm).then(res => {
-                                      if(_this.form.approvalMode === '1'){
-                                        cashSubmit(response.data.id).then(res => {
+                                        offlineCustomSubmit(response.data.id).then(res => {
                                           _this.chargeItme.map((resD,b) => {
                                             resD.cashId = response.data.id
                                             addCashdetail(resD).then((a,rD) => {
@@ -938,39 +849,9 @@
                                             })
                                           })
                                         })
-                                      }else{
-                                        offlineCashSubmit(response.data.id).then(res => {
-                                          _this.chargeItme.map((resD,b) => {
-                                            resD.cashId = response.data.id
-                                            addCashdetail(resD).then((a,rD) => {
-                                              if(b ==  (_this.chargeItme.length-1)){
-                                                _this.$toast.success('提交成功');
-                                                setTimeout(function(){
-                                                  history.go(-1)
-                                                },2000)
-                                              }
-                                            })
-                                          })
-                                        })
-                                      }
                                     })
                                   }else{
-                                    if(_this.form.approvalMode === '1'){
-                                      cashSubmit(response.data.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = response.data.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b ==  (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                    }else{
-                                      offlineCashSubmit(response.data.id).then(res => {
+                                      offlineCustomSubmit(response.data.id).then(res => {
                                         _this.chargeItme.map((resD,b) => {
                                           resD.cashId = response.data.id
                                           addCashdetail(resD).then((a,rD) => {
@@ -983,7 +864,6 @@
                                           })
                                         })
                                       })
-                                    }
                                   }
                                 }
                               }
@@ -1001,8 +881,7 @@
                               if(idx3 ==(_this.uploadFiles3.length-1)){
                                 if(_this.form.capitalExpenditureType==2){
                                   addProjectto(_this.projectForm).then(res => {
-                                    if(_this.form.approvalMode === '1'){
-                                      cashSubmit(response.data.id).then(res => {
+                                      offlineCustomSubmit(response.data.id).then(res => {
                                         _this.chargeItme.map((resD,b) => {
                                           resD.cashId = response.data.id
                                           addCashdetail(resD).then((a,rD) => {
@@ -1015,26 +894,10 @@
                                           })
                                         })
                                       })
-                                    }else{
-                                      offlineCashSubmit(response.data.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = response.data.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b ==  (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                    }
                                   })
                                 } else if(_this.form.capitalExpenditureType==4){
                                   addInfoto(_this.infoForm).then(res => {
-                                    if(_this.form.approvalMode === '1'){
-                                      cashSubmit(response.data.id).then(res => {
+                                      offlineCustomSubmit(response.data.id).then(res => {
                                         _this.chargeItme.map((resD,b) => {
                                           resD.cashId = response.data.id
                                           addCashdetail(resD).then((a,rD) => {
@@ -1047,39 +910,9 @@
                                           })
                                         })
                                       })
-                                    }else{
-                                      offlineCashSubmit(response.data.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = response.data.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b ==  (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                    }
                                   })
                                 }else{
-                                  if(_this.form.approvalMode === '1'){
-                                    cashSubmit(response.data.id).then(res => {
-                                      _this.chargeItme.map((resD,b) => {
-                                        resD.cashId = response.data.id
-                                        addCashdetail(resD).then((a,rD) => {
-                                          if(b ==  (_this.chargeItme.length-1)){
-                                            _this.$toast.success('提交成功');
-                                            setTimeout(function(){
-                                              history.go(-1)
-                                            },2000)
-                                          }
-                                        })
-                                      })
-                                    })
-                                  }else{
-                                    offlineCashSubmit(response.data.id).then(res => {
+                                    offlineCustomSubmit(response.data.id).then(res => {
                                       _this.chargeItme.map((resD,b) => {
                                         resD.cashId = response.data.id
                                         addCashdetail(resD).then((a,rD) => {
@@ -1092,7 +925,6 @@
                                         })
                                       })
                                     })
-                                  }
                                 }
                               }
                             })
@@ -1100,8 +932,7 @@
                         }else{
                           if(_this.form.capitalExpenditureType==2){
                             addProjectto(_this.projectForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(response.data.id).then(res => {
+                                offlineCustomSubmit(response.data.id).then(res => {
                                   _this.chargeItme.map((resD,b) => {
                                     resD.cashId = response.data.id
                                     addCashdetail(resD).then((a,rD) => {
@@ -1114,26 +945,10 @@
                                     })
                                   })
                                 })
-                              }else{
-                                offlineCashSubmit(response.data.id).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
-                                    resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
-                                        _this.$toast.success('提交成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
-                                      }
-                                    })
-                                  })
-                                })
-                              }
                             })
                           } else if(_this.form.capitalExpenditureType==4){
                             addInfoto(_this.infoForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(response.data.id).then(res => {
+                                offlineCustomSubmit(response.data.id).then(res => {
                                   _this.chargeItme.map((resD,b) => {
                                     resD.cashId = response.data.id
                                     addCashdetail(resD).then((a,rD) => {
@@ -1146,39 +961,9 @@
                                     })
                                   })
                                 })
-                              }else{
-                                offlineCashSubmit(response.data.id).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
-                                    resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
-                                        _this.$toast.success('提交成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
-                                      }
-                                    })
-                                  })
-                                })
-                              }
                             })
                           }else{
-                            if(_this.form.approvalMode === '1'){
-                              cashSubmit(response.data.id).then(res => {
-                                _this.chargeItme.map((resD,b) => {
-                                  resD.cashId = response.data.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b ==  (_this.chargeItme.length-1)){
-                                      _this.$toast.success('提交成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
-                                    }
-                                  })
-                                })
-                              })
-                            }else{
-                              offlineCashSubmit(response.data.id).then(res => {
+                              offlineCustomSubmit(response.data.id).then(res => {
                                 _this.chargeItme.map((resD,b) => {
                                   resD.cashId = response.data.id
                                   addCashdetail(resD).then((a,rD) => {
@@ -1191,7 +976,6 @@
                                   })
                                 })
                               })
-                            }
                           }
                         }
                       }
@@ -1219,22 +1003,7 @@
                               if(idx3 == (_this.uploadFiles3.length-1)){
                                 if(_this.form.capitalExpenditureType==2){
                                   addProjectto(_this.projectForm).then(res => {
-                                    if(_this.form.approvalMode === '1'){
-                                      cashSubmit(response.data.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = response.data.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b ==  (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                    }else{
-                                      offlineCashSubmit(response.data.id).then(res => {
+                                      offlineCustomSubmit(response.data.id).then(res => {
                                         _this.chargeItme.map((resD,b) => {
                                           resD.cashId = response.data.id
                                           addCashdetail(resD).then((a,rD) => {
@@ -1247,26 +1016,10 @@
                                           })
                                         })
                                       })
-                                    }
                                   })
                                 } else if(_this.form.capitalExpenditureType==4){
                                   addInfoto(_this.infoForm).then(res => {
-                                    if(_this.form.approvalMode === '1'){
-                                      cashSubmit(response.data.id).then(res => {
-                                        _this.chargeItme.map((resD,b) => {
-                                          resD.cashId = response.data.id
-                                          addCashdetail(resD).then((a,rD) => {
-                                            if(b ==  (_this.chargeItme.length-1)){
-                                              _this.$toast.success('提交成功');
-                                              setTimeout(function(){
-                                                history.go(-1)
-                                              },2000)
-                                            }
-                                          })
-                                        })
-                                      })
-                                    }else{
-                                      offlineCashSubmit(response.data.id).then(res => {
+                                    offlineCustomSubmit(response.data.id).then(res => {
                                         _this.chargeItme.map((resD,b) => {
                                           resD.cashId = response.data.id
                                           addCashdetail(resD).then((a,rD) => {
@@ -1279,11 +1032,10 @@
                                           })
                                         })
                                       })
-                                    }
+
                                   })
                                 }else{
-                                  if(_this.form.approvalMode === '1'){
-                                    cashSubmit(response.data.id).then(res => {
+                                    offlineCustomSubmit(response.data.id).then(res => {
                                       _this.chargeItme.map((resD,b) => {
                                         resD.cashId = response.data.id
                                         addCashdetail(resD).then((a,rD) => {
@@ -1296,21 +1048,6 @@
                                         })
                                       })
                                     })
-                                  }else{
-                                    offlineCashSubmit(response.data.id).then(res => {
-                                      _this.chargeItme.map((resD,b) => {
-                                        resD.cashId = response.data.id
-                                        addCashdetail(resD).then((a,rD) => {
-                                          if(b ==  (_this.chargeItme.length-1)){
-                                            _this.$toast.success('提交成功');
-                                            setTimeout(function(){
-                                              history.go(-1)
-                                            },2000)
-                                          }
-                                        })
-                                      })
-                                    })
-                                  }
                                 }
                               }
                             })
@@ -1318,22 +1055,7 @@
                         }else{
                           if(_this.form.capitalExpenditureType==2){
                             addProjectto(_this.projectForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(response.data.id).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
-                                    resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
-                                        _this.$toast.success('提交成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
-                                      }
-                                    })
-                                  })
-                                })
-                              }else{
-                                offlineCashSubmit(response.data.id).then(res => {
+                                offlineCustomSubmit(response.data.id).then(res => {
                                   _this.chargeItme.map((resD,b) => {
                                     resD.cashId = response.data.id
                                     addCashdetail(resD).then((a,rD) => {
@@ -1346,12 +1068,10 @@
                                     })
                                   })
                                 })
-                              }
                             })
                           } else if(_this.form.capitalExpenditureType==4){
                             addInfoto(_this.infoForm).then(res => {
-                              if(_this.form.approvalMode === '1'){
-                                cashSubmit(response.data.id).then(res => {
+                                offlineCustomSubmit(response.data.id).then(res => {
                                   _this.chargeItme.map((resD,b) => {
                                     resD.cashId = response.data.id
                                     addCashdetail(resD).then((a,rD) => {
@@ -1364,25 +1084,9 @@
                                     })
                                   })
                                 })
-                              }else{
-                                offlineCashSubmit(response.data.id).then(res => {
-                                  _this.chargeItme.map((resD,b) => {
-                                    resD.cashId = response.data.id
-                                    addCashdetail(resD).then((a,rD) => {
-                                      if(b ==  (_this.chargeItme.length-1)){
-                                        _this.$toast.success('提交成功');
-                                        setTimeout(function(){
-                                          history.go(-1)
-                                        },2000)
-                                      }
-                                    })
-                                  })
-                                })
-                              }
                             })
                           }else{
-                            if(_this.form.approvalMode === '1'){
-                              cashSubmit(response.data.id).then(res => {
+                              offlineCustomSubmit(response.data.id).then(res => {
                                 _this.chargeItme.map((resD,b) => {
                                   resD.cashId = response.data.id
                                   addCashdetail(resD).then((a,rD) => {
@@ -1395,21 +1099,6 @@
                                   })
                                 })
                               })
-                            }else{
-                              offlineCashSubmit(response.data.id).then(res => {
-                                _this.chargeItme.map((resD,b) => {
-                                  resD.cashId = response.data.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b ==  (_this.chargeItme.length-1)){
-                                      _this.$toast.success('提交成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
-                                    }
-                                  })
-                                })
-                              })
-                            }
                           }
                         }
                       }
@@ -1427,22 +1116,7 @@
                       if(idx3 == (_this.uploadFiles3.length-1)){
                         if(_this.form.capitalExpenditureType==2){
                           addProjectto(_this.projectForm).then(res => {
-                            if(_this.form.approvalMode === '1'){
-                              cashSubmit(response.data.id).then(res => {
-                                _this.chargeItme.map((resD,b) => {
-                                  resD.cashId = response.data.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b ==  (_this.chargeItme.length-1)){
-                                      _this.$toast.success('提交成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
-                                    }
-                                  })
-                                })
-                              })
-                            }else{
-                              offlineCashSubmit(response.data.id).then(res => {
+                              offlineCustomSubmit(response.data.id).then(res => {
                                 _this.chargeItme.map((resD,b) => {
                                   resD.cashId = response.data.id
                                   addCashdetail(resD).then((a,rD) => {
@@ -1455,12 +1129,10 @@
                                   })
                                 })
                               })
-                            }
                           })
                         } else if(_this.form.capitalExpenditureType==4){
                           addInfoto(_this.infoForm).then(res => {
-                            if(_this.form.approvalMode === '1'){
-                              cashSubmit(response.data.id).then(res => {
+                              offlineCustomSubmit(response.data.id).then(res => {
                                 _this.chargeItme.map((resD,b) => {
                                   resD.cashId = response.data.id
                                   addCashdetail(resD).then((a,rD) => {
@@ -1473,39 +1145,9 @@
                                   })
                                 })
                               })
-                            }else{
-                              offlineCashSubmit(response.data.id).then(res => {
-                                _this.chargeItme.map((resD,b) => {
-                                  resD.cashId = response.data.id
-                                  addCashdetail(resD).then((a,rD) => {
-                                    if(b ==  (_this.chargeItme.length-1)){
-                                      _this.$toast.success('提交成功');
-                                      setTimeout(function(){
-                                        history.go(-1)
-                                      },2000)
-                                    }
-                                  })
-                                })
-                              })
-                            }
                           })
                         }else{
-                          if(_this.form.approvalMode === '1'){
-                            cashSubmit(response.data.id).then(res => {
-                              _this.chargeItme.map((resD,b) => {
-                                resD.cashId = response.data.id
-                                addCashdetail(resD).then((a,rD) => {
-                                  if(b ==  (_this.chargeItme.length-1)){
-                                    _this.$toast.success('提交成功');
-                                    setTimeout(function(){
-                                      history.go(-1)
-                                    },2000)
-                                  }
-                                })
-                              })
-                            })
-                          }else{
-                            offlineCashSubmit(response.data.id).then(res => {
+                            offlineCustomSubmit(response.data.id).then(res => {
                               _this.chargeItme.map((resD,b) => {
                                 resD.cashId = response.data.id
                                 addCashdetail(resD).then((a,rD) => {
@@ -1518,7 +1160,6 @@
                                 })
                               })
                             })
-                          }
                         }
                       }
                     })
@@ -1526,22 +1167,7 @@
                 }else{
                   if(this.form.capitalExpenditureType==2){
                     addProjectto(this.projectForm).then(res => {
-                      if(_this.form.approvalMode === '1'){
-                        cashSubmit(response.data.id).then(res => {
-                          _this.chargeItme.map((resD,b) => {
-                            resD.cashId = response.data.id
-                            addCashdetail(resD).then((a,rD) => {
-                              if(b ==  (_this.chargeItme.length-1)){
-                                _this.$toast.success('提交成功');
-                                setTimeout(function(){
-                                  history.go(-1)
-                                },2000)
-                              }
-                            })
-                          })
-                        })
-                      }else{
-                        offlineCashSubmit(response.data.id).then(res => {
+                        offlineCustomSubmit(response.data.id).then(res => {
                           _this.chargeItme.map((resD,b) => {
                             resD.cashId = response.data.id
                             addCashdetail(resD).then((a,rD) => {
@@ -1554,12 +1180,10 @@
                             })
                           })
                         })
-                      }
                     })
                   } else if(this.form.capitalExpenditureType==4){
                     addInfoto(this.infoForm).then(res => {
-                      if(_this.form.approvalMode === '1'){
-                        cashSubmit(response.data.id).then(res => {
+                        offlineCustomSubmit(response.data.id).then(res => {
                           _this.chargeItme.map((resD,b) => {
                             resD.cashId = response.data.id
                             addCashdetail(resD).then((a,rD) => {
@@ -1572,25 +1196,9 @@
                             })
                           })
                         })
-                      }else{
-                        offlineCashSubmit(response.data.id).then(res => {
-                          _this.chargeItme.map((resD,b) => {
-                            resD.cashId = response.data.id
-                            addCashdetail(resD).then((a,rD) => {
-                              if(b ==  (_this.chargeItme.length-1)){
-                                _this.$toast.success('提交成功');
-                                setTimeout(function(){
-                                  history.go(-1)
-                                },2000)
-                              }
-                            })
-                          })
-                        })
-                      }
                     })
                   }else{
-                    if(_this.form.approvalMode === '1'){
-                      cashSubmit(response.data.id).then(res => {
+                      offlineCustomSubmit(response.data.id).then(res => {
                         _this.chargeItme.map((resD,b) => {
                           resD.cashId = response.data.id
                           addCashdetail(resD).then((a,rD) => {
@@ -1603,21 +1211,6 @@
                           })
                         })
                       })
-                    }else{
-                      offlineCashSubmit(response.data.id).then(res => {
-                        _this.chargeItme.map((resD,b) => {
-                          resD.cashId = response.data.id
-                          addCashdetail(resD).then((a,rD) => {
-                            if(b ==  (_this.chargeItme.length-1)){
-                              _this.$toast.success('提交成功');
-                              setTimeout(function(){
-                                history.go(-1)
-                              },2000)
-                            }
-                          })
-                        })
-                      })
-                    }
                   }
                 }
               });

src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue

@@ -191,6 +191,13 @@
           contractionId:null,
           transferId:null
         },
+        approval: {
+          taskId: null,
+          auditbatchNo: null,
+          type: null,
+          id: null,
+          comment: '',
+        },
         projectFundType:'',
         fileList1:[],
         fileList2:[],
@@ -213,6 +220,7 @@
         }
         this.projectFundTypeDictionaries = response.data;
       });
+      this.approval.type = this.$route.query.type;
       this.getDictionaries();
       this.getFileList();
       this.getTemplateList();
@@ -252,13 +260,13 @@
       },
       backDone(){
         if(this.$route.query.type != 'done'){
-          this.$router.push({name:'yinnongDone',query: {activeName:'1'}})
+          this.$router.push({name:'yinnongDoneCompletedDoneNew',query: {activeName:'1'}})
         }else{
-          this.$router.push({name:'yinnongDone',query: {activeName:'2'}})
+          this.$router.push({name:'yinnongDoneCompletedDoneNew',query: {activeName:'2'}})
         }
       },
       goFlow(){
-        window.location='approvalProcess?id='+this.$route.query.id;
+        window.location='approvalProcess?id='+this.$route.query.id+'&auditbatchNo='+this.$route.query.auditbatchNo;
       },
       getDictionaries(){
         getTransfer(this.$route.query.id).then((response) => {
@@ -354,14 +362,13 @@
       },
       /** 提交按钮 */
       submitForm() {
+        console.info( this.$route.query.auditbatchNo)
         const data = {
           taskId: this.$route.query.taskId,
-          instanceId: this.form.instanceId,
-          variables: JSON.stringify({
-            comment: this.comment,
-            pass: this.pass,
-          }),
-        };
+          auditbatchNo: this.$route.query.auditbatchNo,
+          comment: this.comment,
+          pass: this.pass,
+          };
         approval(data).then((response) => {
           if(response.code==200 && response.msg=="操作成功"){
             this.$toast.success("操作成功");

src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval10.vue

@@ -232,7 +232,7 @@
         return name
       },
       goFlow(){
-        window.location='approvalProcess2?id='+this.$route.query.id;
+        window.location='approvalProcess2?id='+this.$route.query.id+'&auditbatchNo='+this.$route.query.auditbatchNo;
       },
       getDictionaries(){
         getCash(this.$route.query.id).then((response) => {

src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue

@@ -237,7 +237,7 @@
         return name
       },
       goFlow(){
-        window.location='approvalProcess2?id='+this.$route.query.id;
+        window.location='approvalProcess2?id='+this.$route.query.id+'&auditbatchNo='+this.$route.query.auditbatchNo;
       },
       getDictionaries(){
         getCash(this.$route.query.id).then((response) => {
@@ -354,11 +354,9 @@
       submitForm() {
         const data = {
           taskId: this.$route.query.taskId,
-          instanceId: this.form.instanceId,
-          variables: JSON.stringify({
-            comment: this.comment,
-            pass: this.pass,
-          }),
+          auditbatchNo: this.$route.query.auditbatchNo,
+          comment: this.comment,
+          pass: this.pass,
         };
         console.log(data);
         approval(data).then((response) => {

src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue

@@ -210,7 +210,7 @@
         return name
       },
       goFlow(){
-        window.location='approvalProcess?id='+this.$route.query.id;
+        window.location='approvalProcess?id='+this.$route.query.id+'&auditbatchNo='+this.$route.query.auditbatchNo;
       },
       getDictionaries(){
         getTransfer(this.$route.query.id).then((response) => {

src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue

@@ -21,7 +21,7 @@
         finished-text="没有更多了"
         @load="getList">
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.payerAccount" center :to="{name:'approvalDetail', query: {id:item.id}}">
+          <van-cell :title="item.payerAccount" center :to="{name:'approvalDetail', query: {id:item.id,auditbatchNo:item.auditbatchNo}}">
             <template #icon>
               <van-icon name="../../../../../static/images/onlineHome/icon_yn1.png" size="30" color="#FF4646" style="margin-right: 10px;" />
             </template>
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { listTransfer , customSubmit , delTransfer , updateTYinnongTransferFoStatus,transactionStatusQuery,reapply } from "@/api/onlineHome/bankAgriculture/paymentApproval";
+import { listTransfer , offlineCustomSubmit , delTransfer , updateTYinnongTransferFoStatus,transactionStatusQuery,reapply } from "@/api/onlineHome/bankAgriculture/paymentApproval";
 export default {
   name: "approvalList",
   data() {
@@ -180,7 +180,7 @@ export default {
         message: '您确认提交草稿？',
       })
       .then(() => {
-        customSubmit(id).then(res => {
+        offlineCustomSubmit(id).then(res => {
           this.$toast.success('提交成功');
           setTimeout(function(){
             history.go(0)

src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue

@@ -127,7 +127,7 @@
           label-width="auto"
           maxlength="20"
           required
-          show-word-limit 
+          show-word-limit
           v-if="form.bankType == '6'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
@@ -141,7 +141,7 @@
           label-width="auto"
           maxlength="30"
           required
-          show-word-limit 
+          show-word-limit
           v-if="form.bankType != '5' && form.bankType != '6'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
@@ -591,7 +591,7 @@
         }
         // if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length==1){
         //   this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
-        // }else 
+        // }else
         if(this.form.bankType == '7' && this.chargeItme.length==1){
           this.$notify({ type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！' });
         }else{
@@ -819,56 +819,29 @@
           this.$set(this.projectForm, "ynType", '1');
           if(this.form.capitalExpenditureType==2){
             addProjectto(this.projectForm).then(res => {
-              if(this.form.approvalMode === '1'){
-                customSubmit(this.form.id).then(res => {
-                  this.$toast.success('提交成功');
-                  setTimeout(function(){
-                    _this.$router.push('/yinnong/approvalList')
-                  },1000)
-                })
-              }else{
                 offlineCustomSubmit(this.form.id).then(res => {
                   this.$toast.success('提交成功');
                   setTimeout(function(){
                     _this.$router.push('/yinnong/approvalList')
                   },1000)
                 })
-              }
             })
           }else if(this.form.capitalExpenditureType==4){
             addInfoto(this.infoForm).then(res => {
-              if(this.form.approvalMode === '1'){
-                customSubmit(this.form.id).then(res => {
-                  this.$toast.success('提交成功');
-                  setTimeout(function(){
-                  _this.$router.push('/yinnong/approvalList')
-                },1000)
-                })
-              }else{
                 offlineCustomSubmit(this.form.id).then(res => {
                   this.$toast.success('提交成功');
                   setTimeout(function(){
                     _this.$router.push('/yinnong/approvalList')
                   },1000)
                 })
-              }
             })
           }else{
-            if(this.form.approvalMode === '1'){
-              customSubmit(this.form.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  _this.$router.push('/yinnong/approvalList')
-                },1000)
-              })
-            }else{
               offlineCustomSubmit(this.form.id).then(res => {
                 this.$toast.success('提交成功');
                 setTimeout(function(){
                   _this.$router.push('/yinnong/approvalList')
                 },1000)
               })
-            }
           }
         });
       },

src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue

@@ -11,48 +11,49 @@
         </template>
       </van-nav-bar>
       <div class="main_box">
-        <van-row v-if="processList.待申请!=2">
+        <van-divider content-position="center" v-if="this.$route.query.auditbatchNo != 'null'"><h4>批次号：{{this.$route.query.auditbatchNo}}</h4></van-divider>
+        <van-row v-if="form.auditStatus== '0'">
           <van-col span="4" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
           <van-col span="20" class="textBlue">草稿</van-col>
         </van-row>
-        <van-row v-if="processList.待申请==2">
+        <van-row v-if="form.auditStatus != '0'">
           <van-col span="4" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
           <van-col span="20" class="textBlue">已申请
             <van-row>
-              <van-col span="8" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">{{processList.申请人}}</van-col>
-              <van-col span="16" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">{{processList.申请时间}}</van-col>
+              <van-col span="12" style="padding: 0;" class="textBlue" v-show="processList.auditStatus!='0'">{{form.applyUserName}}</van-col>
+              <van-col span="12" style="padding: 0;" class="textBlue" v-show="processList.auditStatus!='0'">{{form.applyDate}}</van-col>
             </van-row>
           </van-col>
         </van-row>
         <van-row v-if="processList.status==2" v-for="(item1,index,i) in processList.审批事项" :key="i">
           <van-col span="4" align="right">
-            <p class="icon_jian" v-show="item1.approverStatus==1"><van-icon name="minus" size="14" /></p>
-            <p class="icon_jian blue" v-show="item1.approverStatus==2"><van-icon name="success" size="14" /></p>
-            <p class="icon_jian red" v-show="item1.approverStatus==3"><van-icon name="cross" size="14" /></p>
+            <p class="icon_jian" v-show="item1.auditStatus=='1'"><van-icon name="minus" size="14" /></p>
+            <p class="icon_jian blue" v-show="item1.auditStatus=='3'"><van-icon name="success" size="14" /></p>
+            <p class="icon_jian red" v-show="item1.auditStatus=='2'"><van-icon name="cross" size="14" /></p>
           </van-col>
           <van-col span="20">
             <van-row>
-              <van-col span="8" style="padding: 0;">
-                <p v-show="item1.approverStatus == 1">{{item1.deptLabel}}</p>
-                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.deptLabel}}</p>
-                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.deptLabel}}</p>
+              <van-col span="12" style="padding: 0;">
+                <p v-show="item1.auditStatus == '1'">{{item1.nodeName}}</p>
+                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.nodeName}}</p>
+                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.nodeName}}</p>
               </van-col>
-              <van-col span="16" style="padding: 0;" >
-                <p v-show="item1.approverStatus == 1">{{item1.time}}</p>
-                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.time}}</p>
-                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.time}}</p>
+              <van-col span="12" style="padding: 0;" >
+                <p v-show="item1.auditStatus == '1'">{{item1.auditTime}}</p>
+                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditTime}}</p>
+                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditTime}}</p>
               </van-col>
             </van-row>
             <van-row>
-              <van-col span="16" style="padding: 0;" >
-                <p v-show="item1.approverStatus == 1">{{item1.assigneeName}}</p>
-                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.assigneeName}}</p>
-                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.assigneeName}}</p>
+              <van-col span="12" style="padding: 0;" >
+                <p v-show="item1.auditStatus == '1'">{{item1.auditBy}}</p>
+                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditBy}}</p>
+                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditBy}}</p>
               </van-col>
-              <van-col span="8" style="padding: 0;">
-                <p v-show="item1.approverStatus == 1">{{item1.comment}}</p>
-                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.comment}}</p>
-                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.comment}}</p>
+              <van-col span="12" style="padding: 0;">
+                <p v-show="item1.auditStatus == '1'">{{item1.auditRemark}}</p>
+                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditRemark}}</p>
+                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditRemark}}</p>
               </van-col>
             </van-row>
           </van-col>
@@ -110,11 +111,7 @@ export default {
     //查询审批进程
     getTransferProcess(id){
       getTransferProcess(id).then(res => {
-        this.processList = res.data.processSchedule
-        this.processList.乡镇审批时间 = this.processList.乡镇审批时间?this.format(this.processList.乡镇审批时间, "yyyy-MM-dd HH:mm:ss"):""
-        this.processList.区县审批时间 = this.processList.区县审批时间?this.format(this.processList.区县审批时间, "yyyy-MM-dd HH:mm:ss"):""
-        this.processList.支付状态时间 = this.processList.支付状态时间?this.format(this.processList.支付状态时间, "yyyy-MM-dd HH:mm:ss"):""
-        this.processList.入账状态时间 = this.processList.入账状态时间?this.format(this.processList.入账状态时间, "yyyy-MM-dd HH:mm:ss"):""
+        this.processList = res.data[auditbatchNo]
       })
     },
     handleUpdate(id) {

src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue

@@ -11,48 +11,49 @@
         </template>
       </van-nav-bar>
       <div class="main_box">
-        <van-row v-if="processList.待申请!=2">
+        <van-divider content-position="center"><h4>批次号：{{this.$route.query.auditbatchNo}}</h4></van-divider>
+        <van-row v-if="form.auditStatus== '0'">
           <van-col span="4" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
           <van-col span="20" class="textBlue">草稿</van-col>
         </van-row>
-        <van-row v-if="processList.待申请==2">
+        <van-row v-if="form.auditStatus != '0'">
           <van-col span="4" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
           <van-col span="20" class="textBlue">已申请
             <van-row>
-              <van-col span="8" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">{{processList.申请人}}</van-col>
-              <van-col span="16" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">{{processList.申请时间}}</van-col>
+              <van-col span="12" style="padding: 0;" class="textBlue" v-show="processList.auditStatus!='0'">{{form.applyUserName}}</van-col>
+              <van-col span="12" style="padding: 0;" class="textBlue" v-show="processList.auditStatus!='0'">{{form.applyDate}}</van-col>
             </van-row>
           </van-col>
         </van-row>
         <van-row v-if="processList.status==2" v-for="(item1,index,i) in processList.审批事项" :key="i">
           <van-col span="4" align="right">
-            <p class="icon_jian" v-show="item1.approverStatus==1"><van-icon name="minus" size="14" /></p>
-            <p class="icon_jian blue" v-show="item1.approverStatus==2"><van-icon name="success" size="14" /></p>
-            <p class="icon_jian red" v-show="item1.approverStatus==3"><van-icon name="cross" size="14" /></p>
+            <p class="icon_jian" v-show="item1.auditStatus=='1'"><van-icon name="minus" size="14" /></p>
+            <p class="icon_jian blue" v-show="item1.auditStatus=='3'"><van-icon name="success" size="14" /></p>
+            <p class="icon_jian red" v-show="item1.auditStatus=='2'"><van-icon name="cross" size="14" /></p>
           </van-col>
           <van-col span="20">
             <van-row>
-              <van-col span="8" style="padding: 0;">
-                <p v-show="item1.approverStatus == 1">{{item1.deptLabel}}</p>
-                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.deptLabel}}</p>
-                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.deptLabel}}</p>
+              <van-col span="12" style="padding: 0;">
+                <p v-show="item1.auditStatus == '1'">{{item1.nodeName}}</p>
+                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.nodeName}}</p>
+                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.nodeName}}</p>
               </van-col>
-              <van-col span="16" style="padding: 0;" >
-                <p v-show="item1.approverStatus == 1">{{item1.time}}</p>
-                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.time}}</p>
-                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.time}}</p>
+              <van-col span="12" style="padding: 0;" >
+                <p v-show="item1.auditStatus == '1'">{{item1.auditTime}}</p>
+                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditTime}}</p>
+                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditTime}}</p>
               </van-col>
             </van-row>
             <van-row>
-              <van-col span="16" style="padding: 0;" >
-                <p v-show="item1.approverStatus == 1">{{item1.assigneeName}}</p>
-                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.assigneeName}}</p>
-                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.assigneeName}}</p>
+              <van-col span="12" style="padding: 0;" >
+                <p v-show="item1.auditStatus == '1'">{{item1.auditBy}}</p>
+                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditBy}}</p>
+                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditBy}}</p>
               </van-col>
-              <van-col span="8" style="padding: 0;">
-                <p v-show="item1.approverStatus == 1">{{item1.comment}}</p>
-                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.comment}}</p>
-                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.comment}}</p>
+              <van-col span="12" style="padding: 0;">
+                <p v-show="item1.auditStatus == '1'">{{item1.auditRemark}}</p>
+                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditRemark}}</p>
+                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditRemark}}</p>
               </van-col>
             </van-row>
           </van-col>
@@ -115,11 +116,7 @@ export default {
     //查询审批进程
     getTransferProcess1(id){
       getTransferProcess(id).then(res => {
-        this.processList = res.data.processSchedule
-        this.processList.乡镇审批时间 = this.processList.乡镇审批时间?this.format(this.processList.乡镇审批时间, "yyyy-MM-dd HH:mm:ss"):""
-        this.processList.区县审批时间 = this.processList.区县审批时间?this.format(this.processList.区县审批时间, "yyyy-MM-dd HH:mm:ss"):""
-        this.processList.支付状态时间 = this.processList.支付状态时间?this.format(this.processList.支付状态时间, "yyyy-MM-dd HH:mm:ss"):""
-        this.processList.入账状态时间 = this.processList.入账状态时间?this.format(this.processList.入账状态时间, "yyyy-MM-dd HH:mm:ss"):""
+        this.processList = res.data[auditbatchNo]
       })
     },
     handleUpdate(id) {

src/views/yinnong/doneCompleted/completedNew.vue

@@ -25,7 +25,7 @@
                   height="20"
                   width="20"
                   style="vertical-align: middle;margin-right: 10px"
-                  src="../../../../static/images/onlineHome/done.png"></van-image>{{item.auditName}}</h3>
+                  src="../../../../static/images/onlineHome/done.png"></van-image>{{item.systemType =='4'?selectDictLabel(transferTypeOptions, item.data.transferType):item.auditName}}</h3>
             </van-col>
           </van-row>
         </template>
@@ -67,6 +67,7 @@
       data(){
         return{
           taskList:[],
+          transferTypeOptions:[],
           loading:false,
           finished:false,
           activeName:this.$route.query.activeName?this.$route.query.activeName:'1',
@@ -82,6 +83,9 @@
         }
       },
       created() {
+        this.getDicts("transfer_type").then(response => {
+          this.transferTypeOptions = response.data;
+        });
         this.getDicts("activity_business_type").then((response) => {
           this.activityBusinessTypeOptions = response.data;
           if(this.$route.query.activeName){
@@ -115,13 +119,13 @@
               console.info(_this.taskList.length)
               if(response.rows.length>0&& _this.taskList.length<response.total){
                 response.rows.map(res => {
-                  if(res.tableName?res.tableName.indexOf('t_homeapply')>0:""){
-                    res.tableName = '来自农村宅基地管理系统'
-                  }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
-                    res.tableName = '来自银农直联审批管理系统'
-                  }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
-                    res.tableName = '来自银农直联审批管理系统'
-                  }
+                  // if(res.tableName?res.tableName.indexOf('t_homeapply')>0:""){
+                  //   res.tableName = '来自农村宅基地管理系统'
+                  // }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
+                  //   res.tableName = '来自银农直联审批管理系统'
+                  // }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
+                  //   res.tableName = '来自银农直联审批管理系统'
+                  // }
                   _this.loading = false;
                   if(this.activityBusinessTypeOptions){
                     _this.activityBusinessTypeOptions.map(t => {
@@ -144,6 +148,7 @@
         },
         goDetail(item){
           let type = item.tableName;
+          console.info(type)
           switch (type) {
             case 't_homeuse_zyyctc':
               this.$router.push({name:'sunVillageInfoPaidExitDetailNew',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"todo",electronicSignature:this.electronicSignature,nickName:this.nickName}})
@@ -161,25 +166,25 @@
               this.$router.push({name:'approvalForm',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
               break;
             case 'toReviewTransferProcess':
-            case 'yinnong_transfer':
-              if(item.formData.transferType == '10'){
-                this.$router.push({name:'approvalApproval10',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+            case 't_yinnong_transfer':
+              if(item.data.transferType == '10'){
+                this.$router.push({name:'approvalApproval10',query: {id:item.data.id,taskId:item.id,type:"todo"}})
                 break;
               }
-              if(item.formData.transferType == '11'){
-                this.$router.push({name:'approvalApproval11',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+              if(item.data.transferType == '11'){
+                this.$router.push({name:'approvalApproval11',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"todo"}})
                 break;
               }
-              if(item.formData.transferType == '12'){
-                this.$router.push({name:'approvalApproval12',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+              if(item.data.transferType == '12'){
+                this.$router.push({name:'approvalApproval12',query: {id:item.data.id,taskId:item.id,type:"todo"}})
                 break;
               }
-              if(item.formData.transferType != '10'&&item.formData.transferType != '11'&&item.formData.transferType != '12'){
-                this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+              if(item.data.transferType != '10'&&item.data.transferType != '11'&&item.data.transferType != '12'){
+                this.$router.push({name:'approvalApproval',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"todo"}})
                 break;
               }
             case 'yinnong_majorevent':
-              this.$router.push({name:'approvalApproval13',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+              this.$router.push({name:'approvalApproval13',query: {id:item.data.id,taskId:item.id,type:"todo"}})
                 break;
           }
         }

src/views/yinnong/doneCompleted/doneNew.vue

@@ -19,7 +19,7 @@ done.vue<template>
                   height="20"
                   width="20"
                   style="vertical-align: middle;margin-right: 10px"
-                  src="../../../../static/images/onlineHome/done.png"></van-image>{{item.auditName}}</h3>
+                  src="../../../../static/images/onlineHome/done.png"></van-image>{{item.systemType =='4'?selectDictLabel(transferTypeOptions, item.data.transferType):item.auditName}}</h3>
             </van-col>
           </van-row>
         </template>
@@ -59,6 +59,7 @@ done.vue<template>
       data(){
         return{
           taskList:[],
+          transferTypeOptions:[],
           activeName:this.$route.query.activeName?this.$route.query.activeName:'2',
           total:0,
           queryParams: {
@@ -70,6 +71,9 @@ done.vue<template>
         }
       },
       created() {
+        this.getDicts("transfer_type").then(response => {
+          this.transferTypeOptions = response.data;
+        });
         this.getDicts("activity_business_type").then((response) => {
           this.activityBusinessTypeOptions = response.data;
           if(this.$route.query.activeName){
@@ -96,13 +100,13 @@ done.vue<template>
           // this.$set(this.queryParams, "systemType", '4');
           A_myDoneList(this.queryParams).then((response) => {
             response.rows.map(res => {
-              if(res.tableName?res.tableName.indexOf('t_homeapply')>0:""){
-                res.tableName = '来自农村宅基地管理系统'
-              }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
-                res.tableName = '来自银农直联审批管理系统'
-              }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
-                res.tableName = '来自银农直联审批管理系统'
-              }
+              // if(res.tableName?res.tableName.indexOf('t_homeapply')>0:""){
+              //   res.tableName = '来自农村宅基地管理系统'
+              // }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
+              //   res.tableName = '来自银农直联审批管理系统'
+              // }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
+              //   res.tableName = '来自银农直联审批管理系统'
+              // }
               if(this.activityBusinessTypeOptions){
                 this.activityBusinessTypeOptions.map(t => {
                   if(t.dictValue == res.businessType){
@@ -123,10 +127,10 @@ done.vue<template>
               break;
             case 't_homeapply_ydjfys':
             case 't_homeapply_ydjfkg':
-              this.$router.push({name:'sunVillageInfoProposerLiteNew',query: {id:item.data.ydjfsqId,taskId:item.id,auditbatchNo:item.auditbatchN,type:"done"}})
+              this.$router.push({name:'sunVillageInfoProposerLiteNew',query: {id:item.data.ydjfsqId,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"done"}})
               break;
             case 't_homeapply_ydjfsq':
-              this.$router.push({name:'sunVillageInfoProposerLiteNew',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchN,type:"done"}})
+              this.$router.push({name:'sunVillageInfoProposerLiteNew',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"done"}})
               break;
             case 'baseApply':
             case 'landscope':
@@ -134,21 +138,21 @@ done.vue<template>
               this.$router.push({name:'approvalForm',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
               break;
             case 'toReviewTransferProcess':
-            case 'yinnong_transfer':
-              if(item.formData.transferType == '10'){
-                this.$router.push({name:'approvalApproval10',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+            case 't_yinnong_transfer':
+              if(item.data.transferType == '10'){
+                this.$router.push({name:'approvalApproval10',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"done"}})
                 break;
               }
-              if(item.formData.transferType == '11'){
-                this.$router.push({name:'approvalApproval11',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+              if(item.data.transferType == '11'){
+                this.$router.push({name:'approvalApproval11',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"done"}})
                 break;
               }
-              if(item.formData.transferType == '12'){
-                this.$router.push({name:'approvalApproval12',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+              if(item.data.transferType == '12'){
+                this.$router.push({name:'approvalApproval12',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"done"}})
                 break;
               }
-              if(item.formData.transferType != '10'&&item.formData.transferType != '11'&&item.formData.transferType != '12'){
-                this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+              if(item.data.transferType != '10'&&item.data.transferType != '11'&&item.data.transferType != '12'){
+                this.$router.push({name:'approvalApproval',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"done"}})
                 break;
               }
             case 'yinnong_majorevent':