Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/api/V2/profitable/index.js

@@ -34,7 +34,7 @@ export const API_GET_EXPENSEINFO = '/expenseInfo/selectInfo'
 export const API_SET_EXPENSEINFO = '/expenseInfo/api/addInfo'
 // 获取仓库的入库单
 export const API_GET_SELECTWAREHOUSINGORDER ='/expenseInfo/selectWarehousingOrder'
-// 费用管理编辑、分配、完成、确认收款、确认分配
+// 费用管理编辑、分配、完成、确认收款、确认分配、确认保证金
 export const API_EDIT_EXPENSEINFO ='/expenseInfo/editInfo'
 // 费用管理查看
 export const API_LOOK_EXPENSEINFO ='/expenseInfo/ExpenseInfo'
@@ -78,4 +78,10 @@ export const API_JUDGE_SETTLEMENT ='/contractManagementInfo/judgeSettlementCondi
 export const API_FUELFILLINGINFO  ='/fuelFillingInfo/selectFillingPc'
 
 // 费用下拉详情筛选
-export const API_GETXIALALIST  ='/expenseInfo/removeRepeatList'
+export const API_GETXIALALIST  ='/expenseInfo/removeRepeatList'
+//保证金列表
+export const API_BOODINFO  ='/expenseInfo/selectBondInfo'
+//全部合同
+export const API_GET_CONTRACT  ='/contractManagementInfo/selectContractAll'
+//抵粮款
+export const API_SET_FOODALLOWANCE  ='/expenseInfo/api/foodAllowance'

src/components/balanceAlert.vue

@@ -56,7 +56,9 @@ export default {
           const port = await navigator.serial.requestPort()
           if (
             this.deptBudgetList.warehouseName == '白城内陆港' ||
-            this.deptBudgetList.warehouseName == '肇东金信库'
+            this.deptBudgetList.warehouseName == '肇东金信库'||
+            this.deptBudgetList.warehouseName == '洮南胡力吐粮食储备库'||
+            this.deptBudgetList.warehouseName == '洮南向阳乡金昊'
           ) {
             this.param = 1200
           } else if (this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库') {
@@ -124,7 +126,9 @@ export default {
             console.log('valuezzz:', zzz)
           } else if (
             this.deptBudgetList.warehouseName == '白城内陆港' ||
-            this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库'
+            this.deptBudgetList.warehouseName == '洮南胡力吐粮食储备库' ||
+            this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库'||
+            this.deptBudgetList.warehouseName == '洮南向阳乡金昊'
           ) {
             console.log('value:', value)
             var start = new Date().getTime()
@@ -154,6 +158,8 @@ export default {
               this.deptBudgetList.warehouseName == '哈尔滨依兰库' ||
               this.deptBudgetList.warehouseName == '龙江金信库' ||
               this.deptBudgetList.warehouseName == '白城内陆港' ||
+              this.deptBudgetList.warehouseName == '洮南胡力吐粮食储备库' ||
+              this.deptBudgetList.warehouseName == '洮南向阳乡金昊' ||
               this.deptBudgetList.warehouseName == '甘南林峰库' ||
               this.deptBudgetList.warehouseName == '肇东金信库' ||
               this.deptBudgetList.warehouseName == '呼兰大金仓'||

src/lang/zh.js

@@ -667,6 +667,7 @@ export default {
     billDetail: '备件结算详情',
     warehousingOrder: '入库单',
     storageCharge:'仓储费',
+    earnestmoney:'保证金',
     oilcost:'油费',
     inventoryCheck:'库存盘点',
     sparepartMa: '物料采购',

src/model/profitable/index.js

@@ -40,7 +40,10 @@ import {
   API_EDIT_CONTRACT,
   API_JUDGE_SETTLEMENT,
   API_FUELFILLINGINFO,
-  API_GETXIALALIST
+  API_GETXIALALIST,
+  API_BOODINFO,
+  API_GET_CONTRACT,
+  API_SET_FOODALLOWANCE
 } from '@/api/V2/profitable'
 //收支明细列表
 export const getInOutDetailed = appRx.get(API_GET_INOUTDETAILED, errorCatcher, errorHandle, filter)
@@ -120,5 +123,9 @@ export const editcontract= appRx.post(API_EDIT_CONTRACT, errorCatcher, errorHand
 export const judgesettlement= appRx.post(API_JUDGE_SETTLEMENT, errorCatcher, errorHandle, filter)
 // 油费列表
 export const getfielfillinginfo= appRx.get(API_FUELFILLINGINFO, errorCatcher, errorHandle, filter)
-//费用下拉详情筛选
-export const getXialaList= appRx.get(API_GETXIALALIST, errorCatcher, errorHandle, filter)
+//保证金列表
+export const getboodinfo= appRx.get(API_BOODINFO, errorCatcher, errorHandle, filter)
+
+export const getcontractno= appRx.get(API_GET_CONTRACT, errorCatcher, errorHandle, filter)
+//抵粮款
+export const setfoodallowance= appRx.post(API_SET_FOODALLOWANCE, errorCatcher, errorHandle, filter)

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

@@ -1,35 +1,35 @@
-import Layout from '@/layout/index';
+// import Layout from '@/layout/index';
 
-const financialManagementRouter = {
-  path: '/financialManagement',
-  component: Layout,
-  redirect: '/financialManagement',
-  name: 'financialManagement',
-  alwaysShow: true, // will always show the root menu
-  meta: {
-    title: 'financialManagement',
-    module: 'financial.collection',
-    icon: '-caiwuguanli'
-  },
-  children: [
-      // 收款管理
-    {
-      path: 'collectionManagementList',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/financialManagement/collectionManagementList'),
-      name: 'collectionManagementList',
-      meta: {
-        title: 'collectionManagementList',
-        shortcutEntrance: 'financialManagement',
-        module: 'financial.collectionInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'收款管理'
-        // module: 'procurement.sparepart.applDetail'
-      }
-    },
-  ],
+// const financialManagementRouter = {
+//   path: '/financialManagement',
+//   component: Layout,
+//   redirect: '/financialManagement',
+//   name: 'financialManagement',
+//   alwaysShow: true, // will always show the root menu
+//   meta: {
+//     title: 'financialManagement',
+//     module: 'financial.collection',
+//     icon: '-caiwuguanli'
+//   },
+//   children: [
+//       // 收款管理
+//     {
+//       path: 'collectionManagementList',
+//       component: () =>
+//         import(/* webpackChunkName: "applDetail" */ '@/views/financialManagement/collectionManagementList'),
+//       name: 'collectionManagementList',
+//       meta: {
+//         title: 'collectionManagementList',
+//         shortcutEntrance: 'financialManagement',
+//         module: 'financial.collectionInfo',
+//         permissicon: [],
+//         keepAlive: true,
+//         _title:'收款管理'
+//         // module: 'procurement.sparepart.applDetail'
+//       }
+//     },
+//   ],
 
-};
+// };
 
-export default financialManagementRouter;
+// export default financialManagementRouter;

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -675,12 +675,12 @@ export default {
     // 增加分界
     add(item, item1, index) {
       // let _data = this.detailList;
-      if (item.index > 2) {
-        this.$message({
-          message: '最多插入3个分界值',
-          type: 'warning',
-        })
-      } else {
+      // if (item.index > 2) {
+      //   this.$message({
+      //     message: '最多插入3个分界值',
+      //     type: 'warning',
+      //   })
+      // } else {
         item.index++
         item.detailList.splice(index + 1, 0, {
           name: '分界',
@@ -694,7 +694,7 @@ export default {
           type: 4,
         })
         this.makeSpliceIndex(item, item1, index)
-      }
+      // }
     },
     // 减少分界
     reduce(item, item1, index) {

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -434,6 +434,26 @@
                     v-model="deptBudgetList.reImperfectGrain" type="number" @mousewheel.native.prevent
                     placeholder="请输入不完善粒占比" maxlength="40" size="small" />
                 </ws-form-item>
+                <!-- <ws-form-item v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3" label="水分增价（元/公斤）" span="1" prop="imperfectGrain">
+                  <ws-input v-if='statusTypetext != "复检"'
+                    v-model="deptBudgetList.waterPriceIncrease" type="number" @input="deductionchange"
+                    placeholder="请输入水分增价" maxlength="40" size="small" />
+                </ws-form-item>
+                <ws-form-item v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3" label="水分扣价（元/公斤）" span="1" prop="imperfectGrain">
+                  <ws-input v-if='statusTypetext != "复检"'
+                    v-model="deptBudgetList.waterPriceDeduction" type="number" @input="deductionchange"
+                    placeholder="请输入水分扣价" maxlength="40" size="small" />
+                </ws-form-item>
+                <ws-form-item v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3" label="质量增价（元/公斤）" span="1" prop="imperfectGrain">
+                  <ws-input v-if='statusTypetext != "复检"'
+                    v-model="deptBudgetList.qualityPriceIncrease" type="number" @input="deductionchange"
+                    placeholder="请输入质量增价" maxlength="40" size="small" />
+                </ws-form-item>
+                <ws-form-item v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3" label="质量扣价（元/公斤）" span="1" prop="imperfectGrain">
+                  <ws-input v-if='statusTypetext != "复检"'
+                    v-model="deptBudgetList.qualityPriceDeduction" type="number" @input="deductionchange"
+                    placeholder="请输入质量扣价" maxlength="40" size="small" />
+                </ws-form-item> -->
               </ws-info-table>
               <ws-info-table v-if="zjJurisdiction&&statusTypetext == '初检'||statusTypetext != '初检'">
                 <ws-form-item label="净重单价（元/公斤）" span="1" prop="tidalGrainPrice"
@@ -649,6 +669,10 @@ export default {
         reJiaorenli: '',
         bulkDensity: '',
         reBulkDensity: '',
+        waterPriceIncrease:0,
+        waterPriceDeduction:0,
+        qualityPriceIncrease:0,
+        qualityPriceDeduction:0,
         reMemo: '',
         storageTagNo: '',
         mildewGrain: '',
@@ -784,6 +808,11 @@ export default {
     }
   },
   methods: {
+    deductionchange(){
+      if(this.deptBudgetList.tidalGrainPrice&&this.deptBudgetList.waterPriceIncreas&&this.deptBudgetList.waterPriceDeduction&&this.deptBudgetList.qualityPriceIncrease&&this.deptBudgetList.qualityPriceDeduction){
+        this.deptBudgetList.tidalGrainPrice=this.deptBudgetList.tidalGrainPrice-this.deptBudgetList.waterPriceIncrease-this.deptBudgetList.waterPriceDeduction-this.deptBudgetList.qualityPriceIncrease-this.deptBudgetList.qualityPriceDeduction
+      }
+    },
     shipInfoChange(e){
         for (let i = 0; i < this.shipInfoList.length; i++) {
           if(this.shipInfoList[i].shipName==this.deptBudgetList.shipName){
@@ -1264,6 +1293,10 @@ export default {
                   addressUrl: '',
                   tidalGrainPrice: 0,
                   buckleWeightRatio: 0,
+                  waterPriceIncrease:0,
+                  waterPriceDeduction:0,
+                  qualityPriceIncrease:0,
+                  qualityPriceDeduction:0,
                   natureOfGrainPurchase: '贸易粮',
                   buckleMiscellaneous: 0,
                   paramType: 1,
@@ -1449,6 +1482,10 @@ export default {
         buckleWeightRatio: 0,
         natureOfGrainPurchase: '贸易粮',
         buckleMiscellaneous: 0,
+        waterPriceIncrease:0,
+        waterPriceDeduction:0,
+        qualityPriceIncrease:0,
+        qualityPriceDeduction:0,
         paramType: 1,
         warehouseInOutDetail: {
           grade: '',
@@ -1978,6 +2015,10 @@ export default {
                       natureOfGrainPurchase: '贸易粮',
                       buckleMiscellaneous: 0,
                       paramType: 1,
+                      waterPriceIncrease:0,
+                      waterPriceDeduction:0,
+                      qualityPriceIncrease:0,
+                      qualityPriceDeduction:0,
                       warehouseInOutDetail: {
                         grade: '',
                         reGrade: '',
@@ -2061,6 +2102,10 @@ export default {
                       natureOfGrainPurchase: '贸易粮',
                       buckleMiscellaneous: 0,
                       paramType: 1,
+                      waterPriceIncrease:0,
+                      waterPriceDeduction:0,
+                      qualityPriceIncrease:0,
+                      qualityPriceDeduction:0,
                       warehouseInOutDetail: {
                         grade: '',
                         reGrade: '',
@@ -2690,6 +2735,36 @@ export default {
 
 
       }
+      // if (this.serviceManagementType==3&&this.zjJurisdiction&&this.statusTypetext=='初检') {
+      //   if (this.deptBudgetList.waterPriceIncrease>10||this.deptBudgetList.waterPriceIncrease<0) {
+      //     this.$message({
+      //       message: '水分增价输入错误',
+      //       type: 'warning',
+      //     })
+      //     return
+      //   }
+      //   if (this.deptBudgetList.waterPriceDeduction>10||this.deptBudgetList.waterPriceDeduction<0) {
+      //     this.$message({
+      //       message: '水分扣价输入错误',
+      //       type: 'warning',
+      //     })
+      //     return
+      //   }
+      //   if (this.deptBudgetList.qualityPriceIncrease>10||this.deptBudgetList.qualityPriceIncrease<0) {
+      //     this.$message({
+      //       message: '质量增价输入错误',
+      //       type: 'warning',
+      //     })
+      //     return
+      //   }
+      //   if (this.deptBudgetList.qualityPriceDeduction>10||this.deptBudgetList.qualityPriceDeduction<0) {
+      //     this.$message({
+      //       message: '质量扣价输入错误',
+      //       type: 'warning',
+      //     })
+      //     return
+      //   }
+      // }
        if (this.serviceManagementType==3&&this.qyJurisdiction&&this.statusTypetext=='初检'
       ||this.serviceManagementType==3&&this.statusTypetext!='初检'
       ||this.serviceManagementType==1) {
@@ -2915,6 +2990,10 @@ export default {
                           cost: '',
                           addressUrl: '',
                           tidalGrainPrice: 0,
+                          waterPriceIncrease:0,
+                          waterPriceDeduction:0,
+                          qualityPriceIncrease:0,
+                          qualityPriceDeduction:0,
                           buckleWeightRatio: 0,
                           natureOfGrainPurchase: '贸易粮',
                           buckleMiscellaneous: 0,
@@ -3366,6 +3445,10 @@ export default {
                           addressUrl: '',
                           tidalGrainPrice: 0,
                           buckleWeightRatio: 0,
+                          waterPriceIncrease:0,
+                          waterPriceDeduction:0,
+                          qualityPriceIncrease:0,
+                          qualityPriceDeduction:0,
                           natureOfGrainPurchase: '贸易粮',
                           buckleMiscellaneous: 0,
                           paramType: 1,
@@ -3646,6 +3729,10 @@ export default {
             addressUrl: '',
             tidalGrainPrice: 0,
             buckleWeightRatio: 0,
+            waterPriceIncrease:0,
+            waterPriceDeduction:0,
+            qualityPriceIncrease:0,
+            qualityPriceDeduction:0,
             natureOfGrainPurchase: '贸易粮',
             buckleMiscellaneous: 0,
             paramType: 1,

src/views/profitable/cashout.vue

@@ -206,7 +206,7 @@
         warecontractList:[],
         dateRange: this.disabledDate(),
         feeDetailsDistributions:[{receiptDocDate:'',inWarehouseWeight:0,distributionMoney:0,warehouseName:'',goodsName:'',goodsSource:'',index:0}],
-        deptBudgetList:{purpose:"合同费用",type:'粮款',flag:'否'},
+        deptBudgetList:{purpose:"合同费用",type:'粮款',flag:'否',payee:'',accountNumber:'',bank:'',bankBranch:''},
         makeWordData: {},
         warehouseList:[],
         contractList:[],

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

@@ -400,6 +400,23 @@ const profitableRouter = {
       hidden:true,
     // 油费
     },
+    // 保证金
+    // {
+    //   path: 'earnestmoney',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/earnestmoney'),
+    //   name: 'earnestmoney',
+    //   meta: {
+    //     title: 'earnestmoney',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'lirunhesuan.feiyongguanli.view',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'保证金'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    // // 油费
+    // },
     {
       path: 'oilcost',
       component: () =>

src/views/profitable/earnestmoney.vue

@@ -0,0 +1,431 @@
+//保证金
+<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="12">
+         <el-select v-model="contractNo" filterable clearable placeholder="选择合同" @change="selectcontractNo" >
+          <el-option  key="0" label="全部合同" value=""
+            style="color: #8890b1" />
+          <el-option v-for="item in contractNoList" :key="item.contractNo" :label="item.contractNo" :value="item.contractNo"
+            style="color: #8890b1" />
+        </el-select>
+        <el-select v-model="contractType" filterable clearable placeholder="选择类型" @change="selecttype" :value="searchType">
+          <el-option  key="type0" label="全部类型" value=""
+            style="color: #8890b1" />
+            <el-option  key="1" label="采购合同" value="1"
+            style="color: #8890b1" />
+            <el-option  key="2" label="销售合同" value="2"
+            style="color: #8890b1" />
+            <el-option  key="3" label="收购合同" value="3"
+            style="color: #8890b1" />
+            <el-option  key="4" label="代收合同" value="4"
+            style="color: #8890b1" />
+            <el-option  key="5" label="代储合同" value="5"
+            style="color: #8890b1" />
+        </el-select>
+        <el-input v-model="searchKeyWord" placeholder="可按照客户名称进行查找" clearable  maxlength="100" type="input"
+          class="findValue" @keyup.enter.native="find()"></el-input>
+        <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -8px;
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
+        </el-col>
+        <el-col :span="12">
+          
+        </el-col>
+      </el-row>
+      <el-row style="margin-bottom: 10px">
+        <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(2)" :type="searchType == 2 ? 'primary' : ''">支出</el-button>
+          <span>合计：{{money}}</span>
+          <el-button v-if="currectcontract.contractType==2" @click="payliangkuan()" type='primary'>抵粮款</el-button>
+        </el-col>
+        <el-col style="text-align: right" :span="6">
+
+        </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="contractNo" label="合同编号"></el-table-column>
+          <el-table-column prop="contractType" label="合同类型">
+            <template scope="scope">
+              <span v-if="scope.row.contractType==1">采购</span>
+              <span v-if="scope.row.contractType==2">销售</span>
+              <span v-if="scope.row.contractType==3">收购</span>
+              <span v-if="scope.row.contractType==4">代收</span>
+              <span v-if="scope.row.contractType==5">代储</span>
+  
+            </template>
+          </el-table-column>
+          <el-table-column prop="customer" label="客户"></el-table-column>
+          <el-table-column prop="money" label="收支类型">
+            <template slot-scope="scope">
+              <span v-if="scope.row.expensesType == 1">收入</span>
+              <span v-if="scope.row.expensesType == 2">支出</span>
+              <span v-if="scope.row.epenseName=='保证金抵粮款'">(抵)</span>
+              <span v-if="scope.row.epenseName=='保证金分配'">(分)</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="amountMoney" label="金额（元）"></el-table-column>
+          <el-table-column prop="agent" label="经办人"></el-table-column>
+          <el-table-column prop="createDate" label="收支时间"></el-table-column>
+        </el-table>
+      </div>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        style="text-align:center" :page-size="deptCircularPage.pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+      </el-pagination>
+    </div>
+    <el-dialog width='50%' :visible.sync="interestrateshow" title="保证金抵粮款" top="20vh">
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item label="合同编号">
+          <el-input disabled v-model="form.contractNo"></el-input>
+        </el-form-item>
+        <el-form-item label="可用金额（元）">
+          <el-input disabled v-model="form.money"></el-input>
+        </el-form-item>
+        <el-form-item label="抵粮款金额（元）">
+          <el-input placeholder="输入抵粮款金额" v-model="form.amountMoney"></el-input>
+        </el-form-item>
+      </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="interestrateshow=false">取消</el-button>
+          <el-button type="primary" @click="submit">确定</el-button>
+        </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+    import {
+    getboodinfo,
+    getwarehouse,
+    getcontractno,setfoodallowance
+  } from '@/model/profitable/index'
+  import {
+    getenabledinfo,
+  setenabledinfo
+} from '@/model/warehouse/index'
+
+  export default {
+    components: {},
+    data() {
+      return {
+        value: "",
+        tableData: [],
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        money:0,
+        form:{},
+        deptCircularPage: {},
+        taskTypeList:[],
+        warehouse:[],
+        interestrateshow:false,
+        searchType:"",
+        contractType:'',
+        searchKeyWord:"",
+        startDate:"",
+        endDate:"",
+        outtotal:0,
+        intotal:0,
+         foodExpenditure:0,
+        grainIncome:0,
+        expenseIncome:0,
+        expensesPay:0,
+        contractNo:'',
+        currentProfit:0,
+        warehouseName:'全部仓库',
+        allotmentofMoney:{},
+        contractNoList:[],
+        currectcontract:{}
+      }
+    },
+    activated() {
+      getcontractno({
+            // agreementType: '',
+            // goodsType: 1
+          })
+          .toPromise()
+          .then((response) => {
+            this.contractNoList = response
+          })
+          getboodinfo({
+            // warehouseType: 1,
+            compId: localStorage.getItem('ws-pf_compId'),
+            searchKeyWord:'',
+            currentPage: 1,
+            contractNo:'',
+            pageSize:10000 ,
+            contractType:'',
+            searchType:''
+          })
+          .toPromise()
+          .then(response => {
+            if(response.records.length>0){
+              var shouru=0
+              var zhichu=0
+              for (let i = 0; i < response.records.length; i++) {
+                if(response.records[i].expensesType==1){
+                  shouru+=response.records[i].amountMoney
+                }
+                if(response.records[i].expensesType==2){
+                  zhichu+=response.records[i].amountMoney
+                }
+                
+              }
+              this.money=shouru-zhichu
+            }
+          })
+        //  this.getPassYearFormatDate()
+      this.getList()
+    },
+    methods: {
+      payliangkuan(){
+        if(this.money<0){
+          this.$message({
+            message: '保证金余额不足！',
+            type: 'warning'
+          });
+          return
+        }
+        this.form.contractNo=this.contractNo
+        this.form.money=this.money
+        this.interestrateshow=true
+      },
+      typeChange(num){
+        this.searchType = num
+        this.getList()
+      },
+      returnsales(){
+        this.$router.go(-1)
+      },
+      submit(){
+        if(!this.form.amountMoney){
+          this.$message({
+            message: '抵粮款金额不能为空',
+            type: 'warning'
+          });
+          return
+        }
+        if(this.form.amountMoney>this.form.money||this.form.amountMoney<0||String(this.form.amountMoney).indeOf('.')!= -1 &&
+            String(this.deptBudgetList.weight).length -
+            (String(this.deptBudgetList.weight).indexOf('.') + 1) >
+            2){
+          this.$message({
+            message: '抵粮款金额输入错误',
+            type: 'warning'
+          });
+          return
+        }
+        this.$confirm('确定提交保证金变更信息', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+        setfoodallowance({amountMoney:this.form.amountMoney,contractNo:this.contractNo,}).toPromise()
+              .then((response) => {
+                this.$message({
+                  message: '提交成功，可在费用详情页面查看审核状态',
+                  type: 'success'
+                });
+                this.interestrateshow=false
+              })
+            })
+      },
+      getPassYearFormatDate () {
+          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
+          this.value=[this.startDate,this.endDate]
+        },
+        selecttype(e){
+          // if(e=='全部仓库'){
+          //   this.warehouseName=''
+          // }else{
+          //   this.warehouseName=e
+          // }
+          this.getList()
+        },
+        selectcontractNo(e){
+          for (let i = 0; i < this.contractNoList.length; i++) {
+            if(this.contractNoList[i].contractNo==e){
+              this.currectcontract=this.contractNoList[i]
+            }
+            
+          }
+          // if(e=='全部仓库'){
+          //   this.warehouseName=''
+          // }else{
+          //   this.warehouseName=e
+          // }
+          this.getList()
+        },
+      getList() {
+          getboodinfo({
+            // warehouseType: 1,
+            compId: localStorage.getItem('ws-pf_compId'),
+            searchKeyWord:this.searchKeyWord,
+            currentPage: this.currentPage,
+            contractNo:this.contractNo,
+            pageSize:this.pageSize ,
+            contractType:this.contractType,
+            searchType:this.searchType
+          })
+          .toPromise()
+          .then(response => {
+            this.tableData = response.records
+             
+            
+           this.deptBudgetTotal = response.total
+          })
+      },
+      changeDate(){
+        if(this.value){
+          this.startDate = this.value[0]
+          this.endDate = this.value[1]
+        }
+        this.getList()
+      },
+      pickerOptions() {},
+      find() {
+        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;
+    }
+  }
+.findValue{
+  width:200px;
+}
+  .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;
+  }
+
+</style>

src/views/profitable/expensemanagementdetails.vue

@@ -160,8 +160,11 @@
               <el-button @click="look(scope.row)" type="primary">查看</el-button>
               <div v-hasPermission="`lirunhesuan.feiyongguanli.queshou`" style="display: inline-block">
                 <el-button v-if="
-                  scope.row.status == '待确认' && scope.row.expensesType == 1
+                  scope.row.status == '待确认' && scope.row.expensesType == 1&&scope.row.costType!=5
                 " @click="shoukuanqueren(scope.row)" type="primary">确认</el-button>
+                <el-button v-if="
+                  scope.row.status == '待确认' && scope.row.expensesType == 1&&scope.row.costType==5
+                " @click="shoukuanqueren1(scope.row)" type="primary">确认</el-button>
               </div>
               <!-- <el-button v-if='scope.row.approveStatus=="待确认"' @click="accomplish(scope.row)" type="primary">完成</el-button> -->
               <el-button v-if="
@@ -271,6 +274,21 @@
       <ws-upload :editable="false" ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx"
         :comp-id="compId" :appendix-ids="appendixIdss" :size-limit="size" />
     </WinseaContentModal>
+    <el-dialog
+  title="确认保证金抵粮款信息"
+  :visible.sync="dialogVisible"
+  width="30%"
+  :before-close="handleClose">
+  <div>
+    <ws-upload ref="upload1" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx"
+    @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss1" :size-limit="size" />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="querenbazheng">确 定</el-button>
+    </span> 
+  </div>
+ 
+</el-dialog>
   </div>
 </template>
 <script>
@@ -300,6 +318,7 @@ export default {
       size: 100,
       expensesPurpose: '',
       recordList: [],
+      dialogVisible:false,
       compId: localStorage.getItem('ws-pf_compId'),
       dialogVisible1: false,
       deptCircularPage: {},
@@ -319,7 +338,9 @@ export default {
       intotal: 0,
       fujianshow: false,
       appendixIdss: [],
+      appendixIdss1: [],
       approveStatus: false,
+      currectdata:{},
       choiceObj: [],
       costChoice: [
         {
@@ -343,6 +364,7 @@ export default {
           id: 5
         }
       ],
+      addressUrl:'',
       flowToList:[],
       costNameList:[],
       moneyList:[],
@@ -356,6 +378,7 @@ export default {
   },
   methods: {
     xiala(){
+      
        //搜索框下拉数据
        getexenseinfo({
         compId: localStorage.getItem('ws-pf_compId'),
@@ -414,6 +437,34 @@ export default {
         })
 
     },
+    querenbazheng(){
+    if(this.addressUrl){
+      this.currectdata.addressUrl=this.currectdata.addressUrl+','+this.addressUrl
+    }
+    this.currectdata.flag=7
+  console.log(this.addressUrl,this.currectdata)
+    editexenseinfo(this.currectdata)
+      .toPromise()
+      .then((response) => {
+        this.$message({
+          message: '提交成功!',
+          type: 'success',
+        })
+        this.getList()
+        // this.$router.go(-1)
+      })
+    },
+    onChange() {
+        this.$refs.upload1
+          .handleSaveBill()
+          .then(async response => {
+            this.addressUrl = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload1.clearFiles()
+          })
+      },
     handlerecord(row) {
       if (row.expensesType == 1) {
         this.title1 = '收款审核记录'
@@ -604,6 +655,10 @@ export default {
         })
       }
     },
+    shoukuanqueren1(row){
+      this.currectdata=row
+      this.dialogVisible=true
+    },
     aduit(row) {
       if (row.taskId) {
         if (row.approveStatus == '待内勤审核') {

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -34,9 +34,6 @@
             <el-col :span="8">
               <el-form-item label="发货地址" span="1" prop="netWeight">
                 <el-input type="text" class="row-item" v-model="fhaddress" disabled></el-input>
-                <!--  {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
-               }}{{ deptBudgetList.sendArea
-               }}{{ deptBudgetList.sendDetailedAddress }} -->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -178,7 +175,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="车牌号：" span="1" prop="carNo" label-width="125px">
-                  <el-select :disabled="item.id" v-model="item.carNo" placeholder="请选择车牌号"
+                  <el-select :disabled="item.id?true:false" v-model="item.carNo" placeholder="请选择车牌号"
                     filterable clearable @clear="clear" class="row-item" @change="
                                (val) => {
                                  carNochange(val, item.tranCarIndex)
@@ -516,7 +513,7 @@
           } else {
             var tmp1 = 'C00'
             this.deptBudgetList.count++
-            if (this.deptBudgetList.tranCarInfoList.length < 10) {
+            if (this.deptBudgetList.tranCarInfoList.length + 1 < 10) {
               this.deptBudgetList.tranCarInfoList.push({
                 driverName: '',
                 driverPhone: '',
@@ -535,7 +532,7 @@
                 tranCarNo: 'C00' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if (this.deptBudgetList.tranCarInfoList.length < 100 && this.deptBudgetList.tranCarInfoList.length >=
+            } else if (this.deptBudgetList.tranCarInfoList.length+ 1 < 100 && this.deptBudgetList.tranCarInfoList.length + 1>=
               10) {
               tmp1 = 'C0'
               this.deptBudgetList.count++
@@ -557,7 +554,7 @@
                 tranCarNo: 'C0' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if (this.deptBudgetList.tranCarInfoList.length < 1000 && this.deptBudgetList.tranCarInfoList.length >=
+            } else if (this.deptBudgetList.tranCarInfoList.length < 1000 && this.deptBudgetList.tranCarInfoList.length+ 1 >=
               100) {
               tmp1 = 'C'
               this.deptBudgetList.count++
@@ -590,7 +587,7 @@
           } else {
             var tmp1 = 'C00'
             this.deptBudgetList.count++
-            if (this.deptBudgetList.tranCarInfoList.length < 10) {
+            if (this.deptBudgetList.tranCarInfoList.length + 1 < 10) {
               this.deptBudgetList.tranCarInfoList.push({
                 driverName: '',
                 driverPhone: '',
@@ -609,7 +606,7 @@
                 tranCarNo: 'C00' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if (this.deptBudgetList.tranCarInfoList.length < 100 && this.deptBudgetList.tranCarInfoList.length >=
+            } else if (this.deptBudgetList.tranCarInfoList.length < 100 && this.deptBudgetList.tranCarInfoList.length+ 1 >=
               10) {
               tmp1 = 'C0'
               this.deptBudgetList.count++
@@ -631,7 +628,7 @@
                 tranCarNo: 'C0' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if (this.deptBudgetList.tranCarInfoList.length < 1000 && this.deptBudgetList.tranCarInfoList.length >=
+            } else if (this.deptBudgetList.tranCarInfoList.length < 1000 && this.deptBudgetList.tranCarInfoList.length+ 1 >=
               100) {
               tmp1 = 'C'
               this.deptBudgetList.count++