1

src/api/V2/profitable/index.js

@@ -115,4 +115,10 @@ export const API_IMPORT_FIXED ='/fixedAssetsInfo/api/importFixedAssets'
 //煤款列表
 export const API_GET_COALPARAGRAPH = '/coalPaymentInfo/selectCoalInfo'
 //煤款记录
-export const API_GET_COALPARAGRAPH_RECORD = '/expenseInfo/selectRequestRecordInfo'
+export const API_GET_COALPARAGRAPH_RECORD = '/expenseInfo/selectRequestRecordInfo'
+//备用金列表
+export const API_GET_PETTCASHLIST = '/expenseInfo/selectPettyCashInfo'
+//备用金账户列表
+export const API_GET_PETTACCOUNTLIST = '/pettyCashInfo/selectPettyAccountInfo'
+//备用金账户下拉列表
+export const API_GET_GETACCOUNTLIST = '/pettyCashInfo/getPettyAccountList'

src/lang/zh.js

@@ -548,8 +548,10 @@ export default {
     transformation: '折转',
     warehouseManagement:'全部仓库',
     dryWarehousing:'烘干入库',
-    addCar:"常用车辆",
-    dryRecord:"入库记录",
+    materialInOutWarehouse:'物料出入库',
+    materialInOutRecord:'物料出入库记录',
+    addCar:'常用车辆',
+    dryRecord:'入库记录',
 
     //客户管理
     customerList: '客户管理',
@@ -686,6 +688,8 @@ export default {
     storageCharge:'仓储费',
     earnestmoney:'保证金',
     oilcost:'油费',
+    pettyCash:'备用金',
+    pettyAccount:'备用金账户',
     coalCost:'煤费',
     inventoryCheck:'库存盘点',
     sparepartMa: '物料采购',
@@ -4932,8 +4936,8 @@ export default {
     transformation: '折转',
     warehouseManagement:'全部仓库',
     dryWarehousing:'烘干入库',
-    addCar:"常用车辆",
-    dryRecord:"入库记录",
+    addCar:'常用车辆',
+    dryRecord:'入库记录',
   },
   //贸易服务
   tradeServicesManagement: {

src/model/profitable/index.js

@@ -58,7 +58,10 @@ import {
   API_IMPORT_FIXED,
   API_POST_UPLOADIMAGE,
   API_GET_COALPARAGRAPH,
-  API_GET_COALPARAGRAPH_RECORD
+  API_GET_COALPARAGRAPH_RECORD,
+  API_GET_PETTCASHLIST,
+  API_GET_PETTACCOUNTLIST,
+  API_GET_GETACCOUNTLIST
 } from '@/api/V2/profitable'
 //收支明细列表
 export const getInOutDetailed = appRx.get(API_GET_INOUTDETAILED, errorCatcher, errorHandle, filter)
@@ -177,3 +180,9 @@ export const importFixed = appRx.post(API_IMPORT_FIXED, errorCatcher, errorHandl
 export const coalPayment = appRx.get(API_GET_COALPARAGRAPH, errorCatcher, errorHandle, filter)
 // 煤款记录
 export const coalPaymentRecord = appRx.get(API_GET_COALPARAGRAPH_RECORD, errorCatcher, errorHandle, filter)
+// 备用金列表
+export const pettCashList = appRx.get(API_GET_PETTCASHLIST, errorCatcher, errorHandle, filter)
+// 备用金账户列表
+export const pettAccountList = appRx.get(API_GET_PETTACCOUNTLIST, errorCatcher, errorHandle, filter)
+// 备用金账户下拉列表
+export const getAccountList = appRx.get(API_GET_GETACCOUNTLIST, errorCatcher, errorHandle, filter)

src/views/profitable/cashout.vue

@@ -20,6 +20,7 @@
               <ws-option label="合同费用" value="合同费用" style="color: #8890b1" />
               <ws-option label="库点费用" value="库点费用" style="color: #8890b1" />
               <ws-option label="经营性费用" value="经营性费用" style="color: #8890b1" />
+              <ws-option label="备用金" value="备用金" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.purpose == "合同费用"' label="类型" span="1" prop="type"
@@ -28,6 +29,7 @@
               <ws-option label="粮款" value="粮款" style="color: #8890b1" />
               <ws-option label="非粮款" value="非粮款" style="color: #8890b1" />
               <ws-option label="保证金" value="保证金" style="color: #8890b1" />
+              <ws-option label="利息" value="利息" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
 
@@ -82,6 +84,8 @@
           </el-form-item>
           <el-form-item label-width='100px' label="金额（元）" span="1" prop="contractNo" class="readonly">
             <el-input class='input50 input_css' placeholder="输入请款金额" v-model="deptBudgetList.amountMoney"></el-input>
+            <el-checkbox v-show="this.deptBudgetList.type != '利息'" v-model="selected">备用金支付</el-checkbox>
+            <el-checkbox v-show="this.deptBudgetList.type == '利息'" v-model="lixiSelected" disabled>无需付款</el-checkbox>
           </el-form-item>
           <el-form-item label-width='100px' label="备注" span="1" prop="settlementMethod">
             <el-input type="textarea" :rows="5" placeholder="选填，不超过50个字" v-model="deptBudgetList.remark">
@@ -110,10 +114,10 @@
           </el-form-item>
         </el-form>
         <div
-          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款" || deptBudgetList.purpose == "库点费用" && deptBudgetList.autoAssign == "不自动分配"'
+          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "利息" || deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款" || deptBudgetList.purpose == "库点费用" && deptBudgetList.autoAssign == "不自动分配"'
           class='expensetitle'>费用分配</div>
         <div
-          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款" || deptBudgetList.purpose == "库点费用" && deptBudgetList.autoAssign == "不自动分配"'
+          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "利息" || deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款" || deptBudgetList.purpose == "库点费用" && deptBudgetList.autoAssign == "不自动分配"'
           style='margin:0 auto 10px;width:90%;display: flex;'>
           <ws-select v-model="mode" placeholder="费用分配方式" @change="modeselect">
             <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"
@@ -158,7 +162,7 @@
           <span style="margin-top:5px;margin-left: 10px;" v-if='mode != "暂不分配"'>合计分配：{{ amount }}元</span>
         </div>
         <el-table ref="tableref"
-          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款" && mode != "暂不分配" || deptBudgetList.purpose == "库点费用" && mode != "暂不分配" && deptBudgetList.autoAssign == "不自动分配"'
+          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "利息" && mode != "暂不分配" || deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款" && mode != "暂不分配" || deptBudgetList.purpose == "库点费用" && mode != "暂不分配" && deptBudgetList.autoAssign == "不自动分配"'
           :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
           <el-table-column key="1" width="150" v-if='deptBudgetList.purpose == "合同费用"' prop="date" label="仓库名称"
             min-width="110">
@@ -253,6 +257,8 @@ export default {
   },
   data() {
     return {
+      selected:false,
+      lixiSelected:true,
       customerList: [],
       goodsSource: '',
       value2: '',
@@ -282,7 +288,7 @@ export default {
       warecontractList: [],
       dateRange: this.disabledDate(),
       feeDetailsDistributions: [{ receiptDocDate: '', inWarehouseWeight: 0, distributionMoney: 0, warehouseName: '', goodsName: '', goodsSource: '', index: 0 }],
-      deptBudgetList: { purpose: '合同费用', type: '粮款', flag: '否', autoAssign: "不自动分配", payee: '', accountNumber: '', bank: '', bankBranch: '', wareExpenseType: '杂费', },
+      deptBudgetList: { purpose: '合同费用', type: '粮款', flag: '否', payerHeader:'',noPaymentFlag:'',autoAssign: '不自动分配', payee: '', accountNumber: '',paymentIdentifi: '', bank: '', bankBranch: '', wareExpenseType: '杂费', },
       makeWordData: {},
       warehouseList: [],
       contractList: [],
@@ -323,6 +329,7 @@ export default {
     // this.makeWordData = this.getData(2)
     // this.initCharts()
     // this.getPassYearFormatDate()
+    this.deptBudgetList.payerHeader = localStorage.getItem('ws-pf_compName')
     this.getList()
   },
   computed: {
@@ -342,10 +349,10 @@ export default {
   },
   methods: {
     purposeChange(e) {
-      if (e == "库点费用") {
-        this.deptBudgetList.autoAssign = "不自动分配"
+      if (e == '库点费用') {
+        this.deptBudgetList.autoAssign = '不自动分配'
       } else {
-        this.deptBudgetList.autoAssign = ""
+        this.deptBudgetList.autoAssign = ''
       }
     },
     sourceChange(e) {
@@ -732,7 +739,7 @@ export default {
         })
         return
       }
-      if (this.deptBudgetList.purpose == '合同费用' && this.deptBudgetList.type == '非粮款' && this.mode != '暂不分配' || this.deptBudgetList.purpose == '库点费用' && this.deptBudgetList.autoAssign == '不自动分配' && this.mode != '暂不分配') {
+      if (this.deptBudgetList.purpose == '合同费用' && this.deptBudgetList.type == '利息' && this.mode != '暂不分配'|| this.deptBudgetList.purpose == '合同费用' && this.deptBudgetList.type == '非粮款' && this.mode != '暂不分配' || this.deptBudgetList.purpose == '库点费用' && this.deptBudgetList.autoAssign == '不自动分配' && this.mode != '暂不分配') {
         for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
           // if(!this.feeDetailsDistributions[i].goodsSource){
           //   this.$message({
@@ -799,7 +806,19 @@ export default {
       } else if (this.deptBudgetList.purpose == '经营性费用') {
         this.deptBudgetList.expensesPurpose = 5
         this.deptBudgetList.costNo = 'JYF' + this.getdate() + this.Num
+      }else if(this.deptBudgetList.purpose == '备用金'){
+        this.deptBudgetList.expensesPurpose = 7
+        this.deptBudgetList.costNo = 'BYJ' + this.getdate() + this.Num
+        this.$set(this.deptBudgetList,'wareExpenseType','')
+        this.$set(this.deptBudgetList,'type','')
+        this.$set(this.deptBudgetList,'flag','')
       }
+       //选中状态下,备用金支付标识为1
+       if(this.selected == true){
+          this.deptBudgetList.paymentIdentifi = 1
+        }else{
+          this.deptBudgetList.paymentIdentifi = 0
+        }
       if (this.deptBudgetList.expensesPurpose == 1) {
         if (this.deptBudgetList.type == '粮款') {
           this.deptBudgetList.costType = 1
@@ -813,6 +832,13 @@ export default {
           this.deptBudgetList.costType = 5
           this.deptBudgetList.expenseAllocationInfoList = []
         }
+        else if(this.deptBudgetList.type == '利息'){
+          this.deptBudgetList.noPaymentFlag = 1
+          this.deptBudgetList.costType = 7
+          if (this.mode != '暂不分配') {
+            this.deptBudgetList.expenseAllocationInfoList = this.feeDetailsDistributions
+          }
+        }
       }
       if (this.deptBudgetList.expensesPurpose == 1) {
         var data = []
@@ -910,13 +936,13 @@ export default {
           }
         }
       }
-      if (this.deptBudgetList.purpose == "库点费用") {
-        if (this.deptBudgetList.autoAssign == "不自动分配") {
+      if (this.deptBudgetList.purpose == '库点费用') {
+        if (this.deptBudgetList.autoAssign == '不自动分配') {
           this.deptBudgetList.autoAssign = 1
-        } else if (this.deptBudgetList.autoAssign == "仓储费自动分配") {
+        } else if (this.deptBudgetList.autoAssign == '仓储费自动分配') {
           this.deptBudgetList.autoAssign = 3
           this.deptBudgetList.expenseAllocationInfoList = []
-        } else if (this.deptBudgetList.autoAssign == "燃料费自动分配") {
+        } else if (this.deptBudgetList.autoAssign == '煤款自动分配') {
           if (!this.deptBudgetList.coalPrice) {
             this.$message({
               message: '燃料费单价不能为空!',
@@ -986,7 +1012,7 @@ export default {
                 })
               }
               this.mode = '全部分配'
-              this.deptBudgetList = { purpose: '合同费用', type: '粮款', flag: '否', payee: '', accountNumber: '', bank: '', bankBranch: '', wareExpenseType: '杂费', }
+              this.deptBudgetList = { purpose: '合同费用', type: '粮款', flag: '否', payee: '', noPaymentFlag:'',accountNumber: '',payerHeader:'',paymentIdentifi: '',  bank: '', bankBranch: '', wareExpenseType: '杂费', }
               this.feeDetailsDistributions = [{ receiptDocDate: '', inWarehouseWeight: 0, distributionMoney: 0, warehouseName: '', goodsName: '', goodsSource: '', index: 0 }]
               this.paymentScreenshot = []
               this.$refs.upload.clearFiles()

src/views/profitable/cashoutaduit.vue

@@ -27,6 +27,7 @@
               <ws-option label="粮款" value="1" style="color: #8890b1" />
               <ws-option label="非粮款" value="3" style="color: #8890b1" />
               <ws-option label="保证金" value="5" style="color: #8890b1" />
+              <ws-option label="利息" value="7" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
           <!-- <el-form-item label-width='100px' v-if='deptBudgetList.purpose == "库点费用"' label="仓储费" span="1"
@@ -65,6 +66,8 @@
           </el-form-item>
           <el-form-item label-width='100px' label="金额（元）" span="1" prop="contractNo" class="readonly">
             {{ deptBudgetList.amountMoney }}
+            <span v-if='deptBudgetList.paymentIdentifi==1' style="color:blue;margin-left: 10px;">备用金支付</span>
+            <span v-if='deptBudgetList.noPaymentFlag==1' style="color:blue;margin-left: 10px;">无需付款</span>
           </el-form-item>
           <el-form-item label-width='100px' label="备注" span="1" prop="settlementMethod">
             <el-input disabled type="textarea" :rows="5" placeholder="选填，不超过50个字" v-model="deptBudgetList.remark">
@@ -273,8 +276,8 @@ export default {
         date: 20
       }
       ], //货值
-      auditList: "",//审核附件
-      auditUrl: ""
+      auditList: '',//审核附件
+      auditUrl: ''
 
     }
   },
@@ -285,7 +288,7 @@ export default {
     cancelShow() {
       this.rejectshow = false
       this.auditList = [],//审核附件
-        this.auditUrl = ""
+        this.auditUrl = ''
     },
     auditUrlChange() {//审核附件
       this.$refs.upload
@@ -304,7 +307,7 @@ export default {
       if (!this.auditUrl) {
         this.auditUrl = data.appendixPath
       } else {
-        this.auditUrl = this.auditUrl + "," + data.appendixPath
+        this.auditUrl = this.auditUrl + ',' + data.appendixPath
       }
     },
     handleClose() {
@@ -333,7 +336,7 @@ export default {
             woekflowhandle({
               taskId: this.deptBudgetList.taskId,
               approved: false,
-              auditMind: this.textarea + "##" + this.auditUrl,
+              auditMind: this.textarea + '##' + this.auditUrl,
               needReapply: true,
             }).toPromise()
               .then((response) => {
@@ -353,7 +356,7 @@ export default {
             woekflowhandle({
               taskId: this.deptBudgetList.taskId,
               approved: true,
-              auditMind: this.textarea + "##" + this.auditUrl,
+              auditMind: this.textarea + '##' + this.auditUrl,
               needReapply: true,
             }).toPromise()
               .then((response) => {

src/views/profitable/cashoutaduitNQ.vue

@@ -20,12 +20,14 @@
             <span v-if='deptBudgetList.expensesPurpose == 2'>运费</span>
             <span v-if='deptBudgetList.expensesPurpose == 3'>库点费用</span>
             <span v-if='deptBudgetList.expensesPurpose == 5'>经营性费用</span>
+            <span v-if='deptBudgetList.expensesPurpose == 7'>备用金</span>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose == 1' label="类型" span="1"
             prop="costType">
             <span v-if='deptBudgetList.costType == 1'>粮款</span>
             <span v-if='deptBudgetList.costType == 3'>非粮款</span>
             <span v-if='deptBudgetList.costType == 5'>保证金</span>
+            <span v-if='deptBudgetList.costType == 7'>利息</span>
           </el-form-item>
           <!-- <el-form-item label-width='100px' v-if='deptBudgetList.purpose == "库点费用"' label="仓储费" span="1"
             prop="contractNo" class="readonly">
@@ -63,6 +65,8 @@
           </el-form-item>
           <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
             {{ deptBudgetList.amountMoney }}
+            <span v-if='deptBudgetList.paymentIdentifi==1' style="color:blue;margin-left: 10px;">备用金支付</span>
+            <span v-if='deptBudgetList.noPaymentFlag==1' style="color:blue;margin-left: 10px;">无需付款</span>
           </el-form-item>
           <el-form-item label-width='100px' label="备注" span="1" prop="settlementMethod">
             <el-input disabled type="textarea" :rows="5" placeholder="选填，不超过50个字" v-model="deptBudgetList.remark">
@@ -147,9 +151,9 @@
         </div>
         <!-- 经营性费用不分配 -->
         <div
-          v-if='deptBudgetList.expensesPurpose == 1 && deptBudgetList.costType == 3 || deptBudgetList.expensesPurpose == 3 && deptBudgetList.storageFeeFlag != 1 && deptBudgetList.autoAssign!=3 && deptBudgetList.autoAssign!=5'>
+          v-if='deptBudgetList.expensesPurpose == 1 && deptBudgetList.costType == 7 || deptBudgetList.expensesPurpose == 1 && deptBudgetList.costType == 3 || deptBudgetList.expensesPurpose == 3 && deptBudgetList.storageFeeFlag != 1 && deptBudgetList.autoAssign!=3 && deptBudgetList.autoAssign!=5'>
           <!-- <div v-if='deptBudgetList.expensesPurpose!=5'> -->
-          <div style="display:flex">
+            <div style="display:flex">
             <div style='margin:0 50px 10px;font-weight:bold'>费用分配</div>
             <div>可分配金额{{ deptBudgetList.unallocatedAmount }}元</div>
           </div>
@@ -185,7 +189,7 @@
         </div>
 
         <el-table ref="tableref"
-          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款" && mode != "暂不分配" || deptBudgetList.purpose == "库点费用" && mode != "暂不分配"&& deptBudgetList.storageFeeFlag != 1 && deptBudgetList.autoAssign!=3 && deptBudgetList.autoAssign!=5'
+          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "利息" && mode != "暂不分配" || deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款" && mode != "暂不分配" || deptBudgetList.purpose == "库点费用" && mode != "暂不分配"&& deptBudgetList.storageFeeFlag != 1 && deptBudgetList.autoAssign!=3 && deptBudgetList.autoAssign!=5'
           :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
           <el-table-column key="1" width="200" v-if='deptBudgetList.purpose == "合同费用"' prop="date" label="仓库名称"
             min-width="110">
@@ -349,8 +353,8 @@ export default {
         date: 20
       }
       ], //货值
-      auditList: "",//审核附件
-      auditUrl: ""
+      auditList: '',//审核附件
+      auditUrl: ''
     }
   },
   activated() {
@@ -376,7 +380,7 @@ export default {
     cancelShow() {
       this.rejectshow = false
       this.auditList = [],//审核附件
-        this.auditUrl = ""
+        this.auditUrl = ''
     },
     sourceChange(e) {
       if (e == '') {
@@ -516,7 +520,7 @@ export default {
       if (!this.auditUrl) {
         this.auditUrl = data.appendixPath
       } else {
-        this.auditUrl = this.auditUrl + "," + data.appendixPath
+        this.auditUrl = this.auditUrl + ',' + data.appendixPath
       }
     },
     modeselect(e) {
@@ -813,7 +817,7 @@ export default {
           woekflowhandle({
             taskId: this.deptBudgetList.taskId,
             approved: true,
-            auditMind: this.textarea + "##" + this.auditUrl,
+            auditMind: this.textarea + '##' + this.auditUrl,
             needReapply: true,
           }).toPromise()
             .then((response) => {
@@ -835,7 +839,7 @@ export default {
       woekflowhandle({
         taskId: this.deptBudgetList.taskId,
         approved: false,
-        auditMind: this.textarea + "##" + this.auditUrl,
+        auditMind: this.textarea + '##' + this.auditUrl,
         needReapply: true,
       }).toPromise()
         .then((response) => {

src/views/profitable/cashoutedit.vue

@@ -23,6 +23,8 @@
                 style="color: #8890b1" />
                 <ws-option label="经营性费用" value="经营性费用"
                 style="color: #8890b1" />
+                <ws-option label="备用金" value="备用金" 
+                style="color: #8890b1" />
             </ws-select>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="合同费用"' label="类型" span="1" prop="contractNo" class="readonly">
@@ -30,6 +32,7 @@
                 <ws-option label="粮款" value="粮款" style="color: #8890b1" />
                 <ws-option label="非粮款" value="非粮款" style="color: #8890b1" />
                 <ws-option label="保证金" value="保证金" style="color: #8890b1" />
+                <ws-option label="利息" value="利息" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="合同费用"' label="合同编号" span="1" prop="contractNo" class="readonly">
@@ -52,6 +55,8 @@
           </el-form-item>
           <el-form-item label-width='100px' label="金额（元）" span="1" prop="contractNo" class="readonly">
             <el-input class='input50 input_css' placeholder="输入请款金额" v-model="deptBudgetList.amountMoney"></el-input>
+            <el-checkbox v-show="this.deptBudgetList.type != '利息'" v-model="selected">备用金支付</el-checkbox>
+            <el-checkbox v-show="this.deptBudgetList.type == '利息'" v-model="lixiSelected" disabled>无需付款</el-checkbox>
           </el-form-item>
           <el-form-item label-width='100px' label="备注" span="1" prop="settlementMethod">
             <el-input
@@ -154,9 +159,11 @@
     },
     data() {
       return {
+        selected:false,
+        lixiSelected:true,
         value: [],
         profitList: [{
-          name: "玉米",
+          name: '玉米',
           count: 2000,
         }],
         mode:'全部分配',
@@ -168,7 +175,7 @@
         warecontractList:[],
         dateRange: this.disabledDate(),
         feeDetailsDistributions:[{receiptDocDate:'',inWarehouseWeight:0,distributionMoney:0,warehouseName:'',goodsName:'',goodsSource:'',index:0}],
-        deptBudgetList:{purpose:"合同费用",type:'粮款'},
+        deptBudgetList:{purpose:'合同费用',type:'粮款'},
         makeWordData: {},
         warehouseList:[],
         contractList:[],
@@ -252,9 +259,9 @@
       timeFun(unixtimestamp) {
         var unixtimestamp = new Date(unixtimestamp);
         var year = 1900 + unixtimestamp.getYear();
-        var month = "0" + (unixtimestamp.getMonth() + 1);
-        var date = "0" + unixtimestamp.getDate();
-        return year + "-" + month.substring(month.length - 2, month.length) + "-" +     date.substring(date.length - 2,date.length)      
+        var month = '0' + (unixtimestamp.getMonth() + 1);
+        var date = '0' + unixtimestamp.getDate();
+        return year + '-' + month.substring(month.length - 2, month.length) + '-' +     date.substring(date.length - 2,date.length)      
       },
       selectware(e,item){
         this.datelist=[]
@@ -346,6 +353,18 @@
         }else if(this.deptBudgetList.purpose=='经营性费用'){
           this.deptBudgetList.expensesPurpose=5
           //  this.deptBudgetList.costNo='JYF'+this.getdate()+this.MathRand()
+        }else if(this.deptBudgetList.purpose == '备用金'){
+        this.deptBudgetList.expensesPurpose = 7
+        // this.deptBudgetList.costNo = 'BYJ' + this.getdate() + this.Num
+        this.$set(this.deptBudgetList,'wareExpenseType','')
+        this.$set(this.deptBudgetList,'type','')
+        this.$set(this.deptBudgetList,'flag','')
+      }
+        //选中状态下,备用金支付标识为1
+       if(this.selected == true){
+          this.deptBudgetList.paymentIdentifi = 1
+        }else{
+          this.deptBudgetList.paymentIdentifi = 0
         }
         if(this.deptBudgetList.expensesPurpose==1){
           if(this.deptBudgetList.type=='粮款'){
@@ -354,6 +373,9 @@
             this.deptBudgetList.costType=3
           }else if(this.deptBudgetList.type=='保证金'){
             this.deptBudgetList.costType=5
+          }else if(this.deptBudgetList.type=='利息'){
+            this.deptBudgetList.costType=7
+            this.deptBudgetList.noPaymentFlag = 1
           }
         }
         this.deptBudgetList.expensesType=2
@@ -471,6 +493,11 @@
           }else if(response.costType==5){
             response.type='保证金'
           }
+          if(response.paymentIdentifi == 1){
+            this.selected = true
+          }else{
+            this.selected = false
+          }
           this.deptBudgetList=response
           this.dataList=[]
           if(response.addressUrl){

src/views/profitable/component/routers/route.js

@@ -416,8 +416,25 @@ const profitableRouter = {
         _title:'保证金'
         // module: 'procurement.sparepart.applDetail'
       },
+      
     // 油费
     },
+    // 备用金
+{
+  path: 'pettyCash',
+  component: () =>
+    import(/* webpackChunkName: "applDetail" */ '@/views/profitable/pettyCash'),
+  name: 'pettyCash',
+  meta: {
+    title: 'pettyCash',
+    shortcutEntrance: 'profitable',
+    module: 'lirunhesuan.feiyongguanli.view',
+    permissicon: [],
+    keepAlive: true,
+    _title:'备用金'
+    // module: 'procurement.sparepart.applDetail'
+  },
+},
     {
       path: 'coalCost',
       component: () =>
@@ -467,7 +484,22 @@ const profitableRouter = {
             // module: 'procurement.sparepart.applDetail'
           }
         },
-
+{
+  path: 'pettyAccount',
+  component: () =>
+    import(/* webpackChunkName: "applDetail" */ '@/views/profitable/pettyAccount'),
+  name: 'pettyAccount',
+  meta: {
+    title: 'pettyAccount',
+    shortcutEntrance: 'profitable',
+    module: 'lirunhesuan.feiyongguanli.view',
+    permissicon: [],
+    keepAlive: true,
+    _title:'备用金账户'
+    // module: 'procurement.sparepart.applDetail'
+  },
+  hidden:true,
+},
       // // 收支明细
       // {
       //   path: 'inOutDetailed',

src/views/profitable/expenseallot.vue

@@ -19,11 +19,13 @@
               <span v-if='deptBudgetList.expensesPurpose==2'>运费</span>
               <span v-if='deptBudgetList.expensesPurpose==3'>库点费用</span>
               <span v-if='deptBudgetList.expensesPurpose==5'>经营性费用</span>
+              <span v-if='deptBudgetList.expensesPurpose==7'>备用金</span>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose==1' label="类型" span="1" prop="costType">
               <span v-if='deptBudgetList.costType==1'>粮款</span>
               <span v-if='deptBudgetList.costType==3'>非粮款</span>
               <span v-if='deptBudgetList.costType==5'>保证金</span>
+              <span v-if='deptBudgetList.costType==7'>利息</span>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓储费" span="1" prop="contractNo" class="readonly">
             <span v-if='(deptBudgetList.storageFeeFlag==1)'>是</span>
@@ -46,6 +48,8 @@
           </el-form-item>
           <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
             {{deptBudgetList.amountMoney}}
+            <el-checkbox v-show="this.deptBudgetList.type != '利息'" v-model="selected">备用金支付</el-checkbox>
+            <el-checkbox v-show="this.deptBudgetList.type == '利息'" v-model="lixiSelected" disabled>无需付款</el-checkbox>
           </el-form-item>
           <el-form-item label-width='100px' label="备注" span="1" prop="settlementMethod">
             <el-input
@@ -244,6 +248,8 @@
     },
     data() {
       return {
+        selected:false,
+        lixiSelected:true,
         value: [],
         customerList: [],
         goodsSource: '',
@@ -772,6 +778,8 @@
             response.type='非粮款'
           }else if(response.costType==5){
             response.type='保证金'
+          }else if(response.costType==7){
+            response.type='利息'
           }
           this.deptBudgetList=response 
           // this.feeDetailsDistributions = this.deptBudgetList.expenseAllocationInfoList

src/views/profitable/expenseallotaduit.vue

@@ -22,6 +22,8 @@
                 style="color: #8890b1" />
                 <ws-option label="经营性费用" value="5"
                 style="color: #8890b1" />
+                <ws-option label="备用金" value="7"
+                style="color: #8890b1" />
             </ws-select>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose==1' label="类型" span="1" prop="contractNo" class="readonly">
@@ -29,6 +31,7 @@
                 <ws-option label="粮款" value="1" style="color: #8890b1" />
                 <ws-option label="非粮款" value="3" style="color: #8890b1" />
                 <ws-option label="保证金" value="5" style="color: #8890b1" />
+                <ws-option label="利息" value="7" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓储费" span="1" prop="contractNo" class="readonly">
@@ -52,6 +55,8 @@
           </el-form-item>
           <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
             {{deptBudgetList.amountMoney}}
+            <span v-if='deptBudgetList.paymentIdentifi==1' style="color:blue;margin-left: 10px;">备用金支付</span>
+            <span v-if='deptBudgetList.noPaymentFlag==1' style="color:blue;margin-left: 10px;">无需付款</span>
           </el-form-item>
           <el-form-item label-width='100px' label="备注" span="1" prop="settlementMethod">
             <el-input
@@ -139,7 +144,7 @@
             </el-table>
           </div>
         </div>
-        <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
+        <div v-if='(deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==7)||(deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3)||deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
           <div style='margin-bottom:20px;display:flex;justify-content: space-between;'>
             <div>费用分配</div><span>合计分配：{{amount}}元</span>  </div>
           <!-- <div> -->

src/views/profitable/expensemanagementdetails.vue

@@ -88,6 +88,7 @@
           <el-button @click="costChange(3)" :type="expensesPurpose == 3 ? 'primary' : ''">库点费用</el-button>
           <el-button @click="costChange(1)" :type="expensesPurpose == 1 ? 'primary' : ''">合同费用</el-button>
           <el-button @click="costChange(5)" :type="expensesPurpose == 5 ? 'primary' : ''">经营性费用</el-button>
+          <el-button @click="petty()" :type="expensesPurpose == 7 ? 'primary' : ''">备用金</el-button>
           <el-button @click="costChange(2)" :type="expensesPurpose == 2 ? 'primary' : ''">运费</el-button>
           <el-button @click="exportFile" type="primary">导出</el-button>
         </el-col>
@@ -128,6 +129,7 @@
                 <span v-if="scope.row.costType == 1">-粮款</span>
                 <span v-if="scope.row.costType == 3">-非粮款</span>
                 <span v-if="scope.row.costType == 5">-保证金</span>
+                <span v-if="scope.row.costType == 7">-利息</span>
               </div>
               <div v-else-if="scope.row.expensesPurpose == 3">
                 库点费用
@@ -176,8 +178,8 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column prop="creater" label="发起人"></el-table-column>
-          <el-table-column prop="createDate" label="发起日期" width="90"></el-table-column>
+          <el-table-column prop="creater" label="发起人" width="100"></el-table-column>
+          <el-table-column prop="createDate" label="发起日期" width="100"></el-table-column>
           <el-table-column prop="status" label="费用状态" width="100">
             <template slot-scope="scope">
               <span v-if="scope.row.approveStatus">{{
@@ -211,7 +213,7 @@
               " @click="accomplish(scope.row)" type="primary">完成</el-button>
               <el-button v-if="scope.row.approveStatus && scope.row.approveStatus != '发起人撤回'"
                 v-show="scope.row.showFlag" @click="withdraw(scope.row)" type="primary">撤回</el-button>
-              <el-button v-if="scope.row.status == '已驳回' || scope.row.approveStatus == '发起人撤回'" @click="edit(scope.row)"
+              <el-button v-if="(scope.row.status == '已驳回' && scope.row.expensesType != 1) || (scope.row.approveStatus == '发起人撤回' && scope.row.expensesType != 1)" @click="edit(scope.row)"
                 type="primary">编辑</el-button>
               <el-button v-if="
                 (!scope.row.distributionStatus &&
@@ -360,6 +362,7 @@ export default {
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
+      // pettyShowFlag:'',
       showFlag: false,
       size: 100,
       expensesPurpose: '',
@@ -491,6 +494,9 @@ export default {
     unallocatedAmountChange(e){
       this.getList()
     },
+    petty(){
+      this.$router.push({ name: 'pettyCash' })
+    },
     xiala() {
       //仓库筛选
     getwarehouse({
@@ -950,7 +956,6 @@ export default {
             }
           }
           this.tableData = response.records
-
           if (this.tableData.length > 0) {
             this.intotal =
               Number(this.tableData[0].inContractMoney) +

src/views/profitable/expensemanagentedit.vue

@@ -25,6 +25,8 @@
                 style="color: #8890b1" />
                 <ws-option label="经营性费用" value="5"
                 style="color: #8890b1" />
+                <ws-option label="备用金" value="7"
+                style="color: #8890b1" />
             </ws-select>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose==1' label="类型" span="1" prop="contractNo" class="readonly">
@@ -32,6 +34,7 @@
                 <ws-option label="粮款" value="1" style="color: #8890b1" />
                 <ws-option label="非粮款" value="3" style="color: #8890b1" />
                 <ws-option label="保证金" value="5" style="color: #8890b1" />
+                <ws-option label="利息" value="7" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓储费" span="1" prop="contractNo" class="readonly">
@@ -55,6 +58,8 @@
           </el-form-item>
           <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
             {{deptBudgetList.amountMoney}}
+            <el-checkbox v-show="deptBudgetList.costType != 7" v-model="selected">备用金支付</el-checkbox>
+            <el-checkbox v-show="deptBudgetList.costType == 7" v-model="lixiSelected" disabled>无需付款</el-checkbox>
           </el-form-item>
           <el-form-item label-width='100px' label="备注" span="1" prop="settlementMethod">
             <el-input
@@ -138,7 +143,7 @@
               </el-table-column>
               <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
               <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
-                  <template
+                <template
                     slot-scope="scope">
                     {{ scope.row.name }}
                     <span v-if="scope.row.fleetFlag==1">(队)</span>
@@ -147,11 +152,11 @@
             </el-table>
           </div>
         </div>
-        <div style="display:flex" v-if='(deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"&&deptBudgetList.storageFeeFlag==0||deptBudgetList.expensesPurpose==2&&deptBudgetList.storageFeeFlag==0)' class='expensetitle'>费用分配
+        <div style="display:flex" v-if='(deptBudgetList.purpose=="合同费用"&&deptBudgetList.costType==7||deptBudgetList.purpose=="合同费用"&&deptBudgetList.costType==3||deptBudgetList.purpose=="库点费用"&&deptBudgetList.storageFeeFlag==0||deptBudgetList.expensesPurpose==2&&deptBudgetList.storageFeeFlag==0)' class='expensetitle'>费用分配
           <div style="margin-left:15px">可分配金额{{deptBudgetList.unallocatedAmount}}元</div></div>
-        <div v-if='(deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"&&deptBudgetList.storageFeeFlag==0||deptBudgetList.expensesPurpose==2&&deptBudgetList.storageFeeFlag==0)' style='margin:0  auto 10px;width:90%;display: flex;'>
+        <div v-if='(deptBudgetList.purpose=="合同费用"&&deptBudgetList.costType==7||deptBudgetList.purpose=="合同费用"&&deptBudgetList.costType==3||deptBudgetList.purpose=="库点费用"&&deptBudgetList.storageFeeFlag==0||deptBudgetList.expensesPurpose==2&&deptBudgetList.storageFeeFlag==0)' style='margin:0  auto 10px;width:90%;display: flex;'>
           <ws-select v-model="mode" placeholder="费用分配方式" @change="modeselect">
-          <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"
+            <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
             
         </ws-select>
@@ -190,7 +195,7 @@
         </ws-select>
         <span style="margin-top:5px;margin-left: 10px" v-if='mode!="暂不分配"'>合计分配：{{amount}}元</span>  
         </div>
-        <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"||deptBudgetList.expensesPurpose==2&&mode!="暂不分配"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
+        <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.costType==7&&mode!="暂不分配"||deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"||deptBudgetList.expensesPurpose==2&&mode!="暂不分配"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
           <el-table-column key="1" width="150" v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="仓库名称" min-width="110">
             <template slot-scope="scope">
               <el-select v-model="scope.row.warehouseName" placeholder="选择仓库" @change="((value)=>{selectware(value, scope.$index)})">
@@ -284,6 +289,8 @@
     },
     data() {
       return {
+        selected:false,
+        lixiSelected:true,
         customerList: [],
         goodsSource: '',
         value2: '',
@@ -670,6 +677,17 @@ weight: 4000}]],
           this.deptBudgetList.expensesPurpose=3
         }else if(this.deptBudgetList.purpose=='经营性费用'){
           this.deptBudgetList.expensesPurpose=5
+        }else if(this.deptBudgetList.purpose == '备用金'){
+        this.deptBudgetList.expensesPurpose = 7
+        this.$set(this.deptBudgetList,'wareExpenseType','')
+        this.$set(this.deptBudgetList,'type','')
+        this.$set(this.deptBudgetList,'flag','')
+      }
+        //选中状态下,备用金支付标识为1
+       if(this.selected == true){
+          this.deptBudgetList.paymentIdentifi = 1
+        }else{
+          this.deptBudgetList.paymentIdentifi = 0
         }
         if(this.deptBudgetList.expensesPurpose==1){
           if(this.deptBudgetList.type=='粮款'){
@@ -681,6 +699,10 @@ weight: 4000}]],
           }else if(this.deptBudgetList.type=='保证金'){
             this.deptBudgetList.costType=5
             this.deptBudgetList.expenseAllocationInfoList=[]
+          }else if(this.deptBudgetList.type=='利息'){
+            this.deptBudgetList.costType=7
+            this.deptBudgetList.noPaymentFlag = 1
+            this.deptBudgetList.expenseAllocationInfoList=this.feeDetailsDistributions
           }
         }
         if(this.deptBudgetList.expensesPurpose==2 || this.deptBudgetList.expensesPurpose==3&&this.storageFeeFlag==0){

src/views/profitable/expensemanagentlook.vue

@@ -21,11 +21,13 @@
               <span v-if='deptBudgetList.expensesPurpose==2'>运费</span>
               <span v-if='deptBudgetList.expensesPurpose==3'>库点费用</span>
               <span v-if='deptBudgetList.expensesPurpose==5'>经营性费用</span>
+              <span v-if='deptBudgetList.expensesPurpose==7'>备用金</span>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose==1' label="类型" span="1" prop="costType">
               <span v-if='deptBudgetList.costType==1'>粮款</span>
               <span v-if='deptBudgetList.costType==3'>非粮款</span>
               <span v-if='deptBudgetList.costType==5'>保证金</span>
+              <span v-if='deptBudgetList.costType==7'>利息</span>
           </el-form-item>
           <!-- <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓储费" span="1" prop="contractNo" class="readonly">
             <span v-if='(deptBudgetList.storageFeeFlag==1)'>是</span>
@@ -59,6 +61,8 @@
           </el-form-item>
           <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
             {{deptBudgetList.amountMoney}}
+            <span v-if='deptBudgetList.paymentIdentifi==1' style="color:blue;margin-left: 10px;">备用金支付</span>
+            <span v-if='deptBudgetList.noPaymentFlag==1' style="color:blue;margin-left: 10px;">无需付款</span>
           </el-form-item>
           <el-form-item label-width='100px' label="备注" span="1" prop="settlementMethod">
             <el-input
@@ -155,7 +159,7 @@
         </div>
         
         
-        <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
+        <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==7 ||  deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
           <div style='margin-bottom:20px;'>费用分配</div>
           <!-- <div> -->
           <el-table :data="deptBudgetList.expenseAllocationInfoList">

src/views/profitable/payment.vue

@@ -10,7 +10,6 @@
         </el-button></el-col>
     </el-row>
     <div class="center">
-     
       <div  style='margin:0 auto 10px;width:90%;display:flex;'>
         <el-form class='left-form' label-position="left">
           <div style='margin:0 auto 10px;'>基本信息</div>
@@ -24,6 +23,8 @@
                 style="color: #8890b1" />
                 <ws-option label="经营性费用" value="5"
                 style="color: #8890b1" />
+                <ws-option label="备用金" value="7"
+                style="color: #8890b1" />
             </ws-select>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose==1' label="类型" span="1" prop="contractNo" class="readonly">
@@ -31,6 +32,7 @@
                 <ws-option label="粮款" value="1" style="color: #8890b1" />
                 <ws-option label="非粮款" value="3" style="color: #8890b1" />
                 <ws-option label="保证金" value="5" style="color: #8890b1" />
+                <ws-option label="利息" value="7" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouse" class="readonly">
@@ -48,6 +50,13 @@
           <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
             {{deptBudgetList.amountMoney}}
           </el-form-item>
+          <el-form-item label="备用金账户" label-width="110px" v-show="deptBudgetList.paymentIdentifi == 1">
+            <el-select v-model="deptBudgetList.pettyName"  filterable placeholder="选择备用金账户" clearable @change="accountChange"
+              class="options_css">
+              <el-option v-for="(item, index) in pettyList" :key="index" :label="item.userName" :value="item.userName" />
+            </el-select>
+            <span>余额: {{ pettAmountMoney }}  元</span>
+          </el-form-item>
           <el-form-item label-width='100px' label="备注" span="1" prop="settlementMethod">
             <el-input
             disabled
@@ -97,8 +106,7 @@
 </template>
 <script>
     import WsUpload from '@/components/WsUpload'
-  import {lookexenseinfo,expensepayment,getpayeeinfo} from '@/model/profitable/index'
-  import {woekflowhandle,} from '@/model/tasksport/index'
+  import {lookexenseinfo,expensepayment,getAccountList} from '@/model/profitable/index'
   export default {
     components: {
       WsUpload,
@@ -111,6 +119,8 @@
           name: '玉米',
           count: 2000,
         }],
+        pettyList:[],
+        accountList:[],
         size:99,
         compId:localStorage.getItem('ws-pf_compId'),
         rejectshow:false,
@@ -127,11 +137,13 @@
             date: 20
           }
         ], //货值
+        amountMoney1:'',
 
       }
     },
     activated() {
       this.getList()
+      this.xiala()
     },
      async created() {
       //获取快捷路口列表
@@ -148,33 +160,53 @@
       }
     },
     methods: {
+      accountChange(e) {
+        for (let i = 0; i < this.pettyList.length; i++) {
+          if (this.pettyList[i].userName == e) {
+            this.pettAmountMoney = this.pettyList[i].amountMoney
+          }
+        }
+      },
+      xiala() {
+        //备用金账户下拉列表
+        getAccountList({
+          compId: localStorage.getItem('ws-pf_compId'),
+        })
+          .toPromise()
+          .then((response) => {
+            this.pettyList = response
+            // for(let i= 0;i<response.length;i++){
+            //    this.accountList.push(this.pettyList[i].userName)
+            // }
+          })
+      },
       getList() {
         lookexenseinfo({
-         id:this.$route.query.id
-        })
-        .toPromise()
-        .then((response) => {
-          this.srcList=[]
-          this.paymentScreenshot=[]
-          this.deptBudgetList=response
-          // var arr=response.addressUrl.split(',')
-          // for (let i = 0; i < arr.length; i++) {
-          //   if(arr[i]!=''){
-          //     this.srcList.push({url:arr[i]})
-          //     this.paymentScreenshot.push(arr[i])
-          //   }
-          // }
-          // if(localStorage.getItem('ws-pf_roleName')=='出纳'){
-          //   if(this.deptBudgetList.expensesPurpose==1){
-          //     getpayeeinfo({compId:localStorage.getItem('ws-pf_compId'),contractNo:response.contractNo}).toPromise()
-          //     .then((response1) => {
-          //       this.payeeinfo=response1
-          //       console.log(this.payeeinfo)
-          //     })
-          //   }          
-          // }
+          id: this.$route.query.id
         })
-        
+          .toPromise()
+          .then((response) => {
+            this.srcList = []
+            this.paymentScreenshot = []
+            this.deptBudgetList = response
+            // var arr=response.addressUrl.split(',')
+            // for (let i = 0; i < arr.length; i++) {
+            //   if(arr[i]!=''){
+            //     this.srcList.push({url:arr[i]})
+            //     this.paymentScreenshot.push(arr[i])
+            //   }
+            // }
+            // if(localStorage.getItem('ws-pf_roleName')=='出纳'){
+            //   if(this.deptBudgetList.expensesPurpose==1){
+            //     getpayeeinfo({compId:localStorage.getItem('ws-pf_compId'),contractNo:response.contractNo}).toPromise()
+            //     .then((response1) => {
+            //       this.payeeinfo=response1
+            //       console.log(this.payeeinfo)
+            //     })
+            //   }          
+            // }
+          })
+
       },
       onChange() {
         this.$refs.upload
@@ -191,7 +223,13 @@
         this.$router.go(-1)
       },
       submit(){
-        // console.log(this.paymentScreenshot)
+        if(this.pettAmountMoney < this.deptBudgetList.amountMoney){
+          this.$message({
+              message: '所选账户备用金余额不足!',
+              type: 'warning',
+            })
+            return
+        }
         this.$confirm('确定提交付款信息？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -204,7 +242,13 @@
               message: '提交成功!',
               type: 'success',
             })
-            this.$router.go(-1)
+            if(this.deptBudgetList.expensesPurpose==7){
+              this.$router.push({
+                path: 'pettyCash'
+              })
+            }else{
+              this.$router.go(-1)
+            }
           }).catch((response) => {
             this.$message({
               message: '提交失败!',

src/views/profitable/pettyAccount.vue

@@ -0,0 +1,274 @@
+//备用金账户
+<template>
+  <div class="container">
+    <el-row class="row_top">
+      <el-col :span="12">
+        <h2 class="bg-left title">备用金账户</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()"><img width="6" height="10"
+            style="vertion-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
+        </el-button>
+      </el-col>
+    </el-row>
+    <div class="center">
+      <el-row style="margin-bottom: 10px;display: flex;">
+        <el-col :span="18">
+          <el-button style="margin-left: 10px" @click="typeChange('')" :type="searchType == '' ? 'primary' : ''">全部
+          </el-button>
+          <el-button @click="typeChange(1)" :type="searchType == 1 ? 'primary' : ''">有余额</el-button>
+          <el-button @click="typeChange(3)" :type="searchType == 3 ? 'primary' : ''">无余额</el-button>
+        </el-col>
+        <el-col :span="18">
+          <div class="datascreen">
+            <el-input style="width: 500px;" class="options_css" v-model="searchKeyWord" placeholder="可按员工姓名进行查找" clearable maxlength="500" type="input"
+           @keyup.enter.native="find()"></el-input>
+            <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px"
+                src="../../../public/img/sousuo.png" alt="" /></el-button>
+          </div>
+        </el-col>
+      </el-row>
+      <div class="fromdata">
+        <el-table :data="tableData" stripe style="width: 100%">
+          <el-table-column type="index" label="序号">
+            <template scope="scope">
+              <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+              <span v-else>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="userName" label="员工姓名">
+          </el-table-column>
+          <el-table-column prop="deptName" label="部门名称">
+          </el-table-column>
+          <el-table-column prop="amountMoney" label="账户余额(元)">
+          </el-table-column>
+          <el-table-column label="账单">
+            <template slot-scope="scope">
+              <span @click="billView(scope.row)" style="color:blue">查看</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        style="text-align: center" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal">
+      </el-pagination>
+
+      <el-dialog width='30%' :visible.sync="dialogVisible" title="账单">
+        <el-form ref="form" label-width="90px">
+          <div v-if="pettAccount.expenseInfoList">
+            <div v-for="item in pettAccount.expenseInfoList">
+              <div class="flex">
+                <div style="display: block;">
+                  <el-form-item>
+                    <span v-if="item.expensesType == 1">退款</span>
+                    <span v-else-if="item.expensesPurpose != 7 && item.expensesType == 2 ">付款</span>
+                    <span v-else-if="item.expensesType == 2">请款</span>
+                  </el-form-item>
+                  <el-form-item>
+                    {{item.costNo}}
+                  </el-form-item>
+                </div>
+                <div style="display:block">
+                  <el-form-item>
+                    {{item.amountMoney}}元
+                  </el-form-item>
+                  <el-form-item>
+                    {{item.createDate.split(" ")[0] }}
+                  </el-form-item>
+                </div>
+              </div>
+              <div style="border-bottom:1px solid #ccc;margin-bottom:18px;"></div>
+            </div>
+          </div>
+          <div style="margin-left:150px">
+            <el-form-item>
+              <el-button @click="dialogVisible=false">关闭</el-button>
+            </el-form-item>
+          </div>
+        </el-form>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+<script>
+import WsUpload from '@/components/WsUpload'
+import {
+    pettAccountList
+} from '@/model/profitable/index'
+export default {
+  components: {
+    WsUpload,
+  },
+  data() {
+    return {
+      value: '',
+      tableData: [],
+      tableData1: [],
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      showFlag: false,
+      size: 100,
+      expensesPurpose: '',
+      recordList: [],
+      dialogVisible: false,
+      toExamineType: '',
+      compId: localStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      searchType: '',
+      searchKeyWord: '',
+      pettAccount:{},
+      userName:'',
+      title: '附件',
+      title1: '',
+      outtotal: 0,
+      intotal: 0,
+      fujianshow: false,
+      statusdata: {},
+      appendixIdss: [],
+      appendixIdss1: '',
+      approveStatus: false,
+      currectdata: {},
+      choiceObj: [],
+    }
+  },
+  activated() {
+    this.getList()
+  },
+  methods: {
+    getList1() {
+      this.currentPage = 1
+      this.getList()
+    },
+    returnsales() {
+      this.$router.go(-1)
+    },
+    typeChange(num) {
+      this.searchType = num
+      this.getList()
+    },
+    getList() {
+      pettAccountList({
+        compId: localStorage.getItem('ws-pf_compId'),
+        searchKeyWord: this.searchKeyWord,
+        expenseName:this.expenseName,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchType: this.searchType,
+      })
+        .toPromise()
+        .then((response) => {
+          this.tableData = response.records
+          this.deptBudgetTotal = response.total
+        })
+    },
+    billView(row){
+        this.pettAccount = row
+        this.dialogVisible = true
+      },
+    find() {
+      this.currentPage = 1
+      this.getList()
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.container {
+  background: #e8ecf6;
+}
+
+.center {
+  margin: 0 auto;
+  background: #ffffff;
+  // height: calc(100vh - 13vh);
+  border-radius: 4px;
+  padding: 20px 0;
+
+  /deep/.el-table td,
+  /deep/.el-table th {
+    text-align: center;
+  }
+}
+
+.row_top {
+  background: #f6f7fc;
+  border-radius: 4px;
+  margin-bottom: 10px;
+
+  .bg-left {
+    padding-left: 30px;
+  }
+
+  .bg-right {
+    padding-right: 10px;
+    text-align: right;
+  }
+
+  .title {
+    position: relative;
+  }
+
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+}
+
+.datascreen {
+  display: flex;
+  justify-content: right;
+
+  .data_css {
+    width: 40%;
+  }
+
+  .input_css {
+    width: 50%;
+    margin: 0 10px;
+  }
+
+  .find {
+    margin-right: 10px;
+  }
+}
+
+.fromdata {
+  margin: 20px 0;
+  overflow-y: scroll;
+  height: 546px;
+}
+
+.top_info {
+  margin: 10px 0 0 10px;
+  min-width: 712px;
+
+  .info_css {
+    margin-right: 20px;
+  }
+}
+
+.bg-right {
+  padding-top: 15px;
+}
+
+.options_css {
+  margin: 0 5px;
+}
+</style>

src/views/profitable/pettyCash.vue

@@ -0,0 +1,424 @@
+//备用金
+<template>
+  <div class="container">
+    <el-row class="row_top">
+      <el-col :span="12">
+        <h2 class="bg-left title">备用金</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()"><img width="6" height="10"
+            style="vertion-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
+        </el-button>
+      </el-col>
+    </el-row>
+    <div class="center">
+      <el-row style="margin-bottom: 10px">
+        <el-col :span="6">
+          <el-date-picker value-format="yyyy-MM-dd" v-model="value" type="daterange" align="right" unlink-panels
+            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions"
+            class="data_css" @change="changeDate">
+          </el-date-picker>
+        </el-col>
+        <el-col :span="18">
+          <div class="datascreen">
+            <el-input style="width: 255px;" class="options_css" v-model="searchKeyWord" placeholder="可按编号进行查找" clearable maxlength="500" type="input"
+           @keyup.enter.native="find()"></el-input>
+            <el-select v-model="agent" multiple filterable allow-create default-first-option placeholder="按经办人筛选"
+              clearable @change="getList1" class="options_css">
+              <el-option v-for="item in personList" :key="item.id" :label="item.agent" :value="item.agent">
+              </el-option>
+            </el-select>
+            <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px"
+                src="../../../public/img/sousuo.png" alt="" /></el-button>
+            <el-button style="text-align: right;" type="primary" @click="pettyCash()">备用金账户</el-button>
+          </div>
+        </el-col>
+      </el-row>
+      <div class="fromdata">
+        <el-table :data="tableData" stripe style="width: 100%">
+          <el-table-column type="index" label="序号">
+            <template scope="scope">
+              <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+              <span v-else>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="costNo" label="编号" width="180px">
+          </el-table-column>
+          <el-table-column prop="feeType" label="类型">
+            <template slot-scope="scope">
+              <div v-if="scope.row.expensesType == 1">收入</div>
+              <div v-if="scope.row.expensesType == 2">支出</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="purpose" label="用途" width="100px">
+            <template slot-scope="scope">
+              <div v-if="scope.row.expensesPurpose == 7">备用金</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="purpose" label="流向" width="100px">
+            <template slot-scope="scope">
+              <div v-if="scope.row.expensesPurpose == 7 ">中天昊元</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="expenseName" label="费用名称"></el-table-column>
+          <el-table-column prop="amountMoney" width="120" label="费用金额（元）"></el-table-column>
+          <el-table-column prop="expenseRemarks" label="附件">
+            <template slot-scope="scope">
+              <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+                src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+              <span v-if="scope.row.addressUrlArray != null">
+                {{
+                  scope.row.addressUrlArray.length == 0
+                    ? ''
+                    : scope.row.addressUrlArray.length
+                }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="creater" label="发起人"></el-table-column>
+          <el-table-column prop="createDate" label="发起日期" width="150"></el-table-column>
+          <el-table-column prop="status" label="费用状态" width="100">
+            <template slot-scope="scope">
+              <span v-if="scope.row.approveStatus">{{
+                scope.row.approveStatus
+              }}</span><span v-else>{{ scope.row.status }}</span>
+              <i @click="handlerecord(scope.row)" class="el-icon-s-claim"></i>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        style="text-align: center" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal">
+      </el-pagination>
+    </div>
+    <el-dialog width="50%" :visible.sync="dialogVisible1" :title="title1">
+      <div style="padding: 20px" v-for="(item, index) in recordList" :style="{
+        'border-bottom':
+          index != recordList.length - 1 ? '1px solid #ccc' : 'none',
+      }" :key="index">
+        <div style="width: 100%; justify-content: space-between" class="flex">
+          <div style="width: 33.333%; text-align: left">
+            {{ item.operateUser }}
+          </div>
+          <div style="width: 33.333%; text-align: center">
+            {{
+              statusdata.expensesType != 1
+                ? item.approveResult == 1
+                  ? '通过'
+                  : item.approveResult == 0 ? '驳回' : item.dealMsg
+                : item.dealMsg
+            }}
+          </div>
+          <div style="width: 33.333%; text-align: right">
+            {{ item.operateDate }}
+          </div>
+        </div>
+        <div v-if="index < recordList.length - 1" style="width: 100%; text-align: left">
+          审核意见：{{item.verifyRemark?item.verifyRemark.split('##')[0]:""}}
+        </div>
+        <div v-else style="width: 100%; text-align: left">
+          审核意见：{{item.verifyRemark?item.verifyRemark.split('##')[0]:""}}
+        </div>
+      </div>
+    </el-dialog>
+    <WinseaContentModal v-model="fujianshow" :title="title" @on-cancel="handleClose">
+      <ws-upload ref="upload" @onChange="onChange1" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx"
+        :comp-id="compId" :appendix-ids="appendixIdss" :size-limit="size" />
+    </WinseaContentModal>
+  </div>
+</template>
+<script>
+import WsUpload from '@/components/WsUpload'
+import {
+  pettCashList,
+  getAuditRecord,
+  getXialaList,
+} from '@/model/profitable/index'
+export default {
+  components: {
+    WsUpload,
+  },
+  data() {
+    return {
+      value: '',
+      tableData: [],
+      tableData1: [],
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      showFlag: false,
+      size: 100,
+      expensesPurpose: '',
+      recordList: [],
+      dialogVisible: false,
+      toExamineType: '',
+      compId: localStorage.getItem('ws-pf_compId'),
+      dialogVisible1: false,
+      deptCircularPage: {},
+      searchType: '',
+      searchKeyWord: '',
+      expenseName: '',//费用名称
+      costNo: [],//编号
+      purpose: [],//用途
+      // flowTo: [],//流向
+      unallocatedAmount:'',//未分配金额(元)
+      agent: [],//经办人
+      startDate: '',
+      endDate: '',
+      title: '附件',
+      title1: '',
+      outtotal: 0,
+      intotal: 0,
+      fujianshow: false,
+      statusdata: {},
+      appendixIdss: [],
+      appendixIdss1: '',
+      approveStatus: false,
+      currectdata: {},
+      addressUrl: '',
+      personList: [],
+    }
+  },
+  activated() {
+    this.getPassYearFormatDate()
+    this.getList()
+    this.xiala()
+  },
+  methods: {
+    xiala() {
+      //经办人
+      getXialaList({
+        removeRepeatFlag: 4,
+      })
+        .toPromise()
+        .then((response) => {
+          this.personList = response
+        })
+
+    },
+    getList1() {
+      this.currentPage = 1
+      this.getList()
+    },
+    handlerecord(row) {
+      if (row.expensesType == 1) {
+        this.title1 = '收款审核记录'
+      } else {
+        this.title1 = '请款审核记录'
+      }
+      this.statusdata = row
+      getAuditRecord({ id: row.id, workflowId: row.workflowId })
+        .toPromise()
+        .then((response) => {
+          this.recordList = response
+          this.dialogVisible1 = true
+        })
+        .catch((response) => { })
+    },
+    returnsales() {
+      this.$router.go(-1)
+    },
+    handleClose() {
+      this.fujianshow = false
+    },
+    fujian(row) {
+      this.id = row.id
+
+      // if (row.addressUrl) {
+      this.appendixIdss = row.addressUrl
+      this.fujianshow = true
+      // } else {
+      //   this.$message({
+      //     message: '暂无附件查看!',
+      //     type: 'warning',
+      //   })
+      // }
+    },
+    pettyCash(){
+      this.$router.push({ name: 'pettyAccount' })
+    },
+    getPassYearFormatDate() {
+      if (!localStorage.getItem('startDate') && !localStorage.getItem('endDate')) {
+        var nowDate = new Date()
+        var _date = new Date()
+        nowDate.setTime(nowDate.getTime() - 24 * 60 * 60 * 1000 * 30)
+        var year = nowDate.getFullYear()
+        var year1 = _date.getFullYear()
+        var month = nowDate.getMonth() + 1
+        var month1 = _date.getMonth() + 1
+        var strDate = nowDate.getDate()
+        var strDate1 = _date.getDate()
+        if (month >= 1 && month <= 9) {
+          month = '0' + month
+        }
+        if (month1 >= 1 && month1 <= 9) {
+          month1 = '0' + month1
+        }
+
+        if (strDate >= 0 && strDate <= 9) {
+          strDate = '0' + strDate
+        }
+        if (strDate1 >= 0 && strDate1 <= 9) {
+          strDate1 = '0' + strDate1
+        }
+        this.startDate = year + '-' + month + '-' + strDate
+        this.endDate = year1 + '-' + month1 + '-' + strDate1
+      } else {
+        this.startDate = localStorage.getItem('startDate')
+        this.endDate = localStorage.getItem('endDate')
+      }
+      this.value = [this.startDate, this.endDate]
+    },
+    getList() {
+        pettCashList({
+        compId: localStorage.getItem('ws-pf_compId'),
+        startDate: localStorage.getItem('startDate'),
+        endDate: localStorage.getItem('endDate'),
+        searchKeyWord: this.searchKeyWord,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        agent: this.agent.length > 0 ? this.agent.toString() : '',
+      })
+        .toPromise()
+        .then((response) => {
+          if (response.records.length > 0) {
+            for (let i = 0; i < response.records.length; i++) {
+              if (response.records[i].addressUrl) {
+                response.records[i].addressUrlArray =
+                  response.records[i].addressUrl.split(',')
+              }
+              if (response.records[i].agent == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
+            }
+          }
+          this.tableData = response.records
+
+          if (this.tableData.length > 0) {
+            this.intotal =
+              Number(this.tableData[0].inContractMoney) +
+              Number(this.tableData[0].inWarehouseMoney) +
+              Number(this.tableData[0].inManageMoney)
+            this.outtotal =
+              Number(this.tableData[0].outContractMoney) +
+              Number(this.tableData[0].outWarehouseMoney) +
+              Number(this.tableData[0].outManageMoney)
+          }
+          this.deptBudgetTotal = response.total
+        })
+    },
+    changeDate() {
+      if (this.value) {
+        this.startDate = this.value[0]
+        this.endDate = this.value[1]
+        localStorage.setItem('startDate', this.startDate)
+        localStorage.setItem('endDate', this.endDate)
+      }
+      this.getList()
+    },
+    pickerOptions() { },
+    find() {
+      this.currentPage = 1
+      this.getList()
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.container {
+  background: #e8ecf6;
+}
+
+.center {
+  margin: 0 auto;
+  background: #ffffff;
+  // height: calc(100vh - 13vh);
+  border-radius: 4px;
+  padding: 20px 0;
+
+  /deep/.el-table td,
+  /deep/.el-table th {
+    text-align: center;
+  }
+}
+
+.row_top {
+  background: #f6f7fc;
+  border-radius: 4px;
+  margin-bottom: 10px;
+
+  .bg-left {
+    padding-left: 30px;
+  }
+
+  .bg-right {
+    padding-right: 10px;
+    text-align: right;
+  }
+
+  .title {
+    position: relative;
+  }
+
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+}
+
+.datascreen {
+  display: flex;
+
+  .data_css {
+    width: 40%;
+  }
+
+  .input_css {
+    width: 50%;
+    margin: 0 10px;
+  }
+
+  .find {
+    margin-right: 10px;
+  }
+}
+
+.fromdata {
+  margin: 20px 0;
+  overflow-y: scroll;
+  height: 546px;
+}
+
+.top_info {
+  margin: 10px 0 0 10px;
+  min-width: 712px;
+
+  .info_css {
+    margin-right: 20px;
+  }
+}
+
+.bg-right {
+  padding-top: 15px;
+}
+
+.options_css {
+  margin: 0 5px;
+}
+</style>

src/views/profitable/receipt.vue

@@ -20,6 +20,8 @@
                 style="color: #8890b1" />
                 <ws-option label="经营性费用" value="经营性费用"
                 style="color: #8890b1" />
+                <ws-option label="备用金" value="备用金"
+                style="color: #8890b1" />
             </ws-select>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="合同费用"' label="类型" span="1" prop="contractNo" class="readonly">
@@ -80,7 +82,7 @@
       return {
         value: [],
         profitList: [{
-          name: "玉米",
+          name: '玉米',
           count: 2000,
         }],
         mode:'全部分配',
@@ -204,6 +206,9 @@
         }else if(this.deptBudgetList.purpose=='经营性费用'){
           this.deptBudgetList.expensesPurpose=5
            this.deptBudgetList.costNo='JYF'+this.getdate()+this.MathRand()
+        }else if(this.deptBudgetList.purpose=='备用金'){
+          this.deptBudgetList.expensesPurpose=7
+           this.deptBudgetList.costNo='BYJ'+this.getdate()+this.MathRand()
         }
           if(this.deptBudgetList.type=='粮款'){
             this.deptBudgetList.costType=1
@@ -255,7 +260,7 @@
               message: '提交成功!',
               type: 'success',
             })
-            this.deptBudgetList={purpose:"合同费用",type:'粮款'}
+            this.deptBudgetList={purpose:'合同费用',type:'粮款'}
             this.paymentScreenshot=[]
             this.$refs.upload.clearFiles()
             this.$router.go(-1)

src/views/profitable/receiptaduit.vue

@@ -21,6 +21,8 @@
                 style="color: #8890b1" />
                 <ws-option label="经营性费用" value="5"
                 style="color: #8890b1" />
+                <ws-option label="备用金" value="7"
+                style="color: #8890b1" />
             </ws-select>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose==1' label="类型" span="1" prop="contractNo" class="readonly">
@@ -95,7 +97,7 @@
       return {
         value: [],
         profitList: [{
-          name: "玉米",
+          name: '玉米',
           count: 2000,
         }],
         size:9,
@@ -173,6 +175,7 @@
             type: 'warning'
           })
           .then(() => {
+            this.deptBudgetList.vesselId = 'tongzhi'
             this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
         this.deptBudgetList.flag=0
         this.$delete(this.deptBudgetList,'status')