前端

src/api/V2/profitable/index.js

@@ -67,4 +67,8 @@ export const API_EXPENSECOUNT ='/expenseInfo/api/expenseCount'
 // 采购账户信息
 export const API_PAYEEINFO ='/customerInfo/getPayeeInfo'
 // 收购账户信息
-export const API_BUYPAYEEINFO ='/identityAuthenticationInfo/getPayeeInfo'
+export const API_BUYPAYEEINFO ='/identityAuthenticationInfo/getPayeeInfo'
+// 获取关联合同
+export const API_RELATIONCONTRACT ='/contractManagementInfo/selectRelationContract'
+// 结算
+export const API_EDIT_CONTRACT ='/contractManagementInfo/editInfo'

src/api/V2/warehouse/index.js

@@ -127,3 +127,7 @@ export const API_GET_EXPENSE='/contractManagementInfo/getContractInfo'
 export const API_GET_WAREHOUSEPOSITIONINFO='/warehousePositionInfo/selectPositionList'
 //入库单折干
 export const API_DRYOUT='/warehousingOrder/dryOut'
+//入库单利率查看
+export const API_GET_ENABLEDINFO='/enabledInfo/getEnabledInfo'
+//入库单利率修改
+export const API_SET_ENABLEDINFO='/enabledInfo/api/setEnabledInfo'

src/lang/zh.js

@@ -665,6 +665,7 @@ export default {
     purchasDetail: '采购详情',
     billDetail: '备件结算详情',
     warehousingOrder: '入库单',
+    storageCharge:'仓储费',
     inventoryCheck:'库存盘点',
     sparepartMa: '物料采购',
     applDetailMa: '物料申请详情',

src/model/profitable/index.js

@@ -35,7 +35,9 @@ import {
   API_DEL_ONE_ALLOCATIONINFO,
   API_EXPENSECOUNT,
   API_PAYEEINFO,
-  API_BUYPAYEEINFO
+  API_BUYPAYEEINFO,
+  API_RELATIONCONTRACT,
+  API_EDIT_CONTRACT
 } from '@/api/V2/profitable'
 //收支明细列表
 export const getInOutDetailed = appRx.get(API_GET_INOUTDETAILED, errorCatcher, errorHandle, filter)
@@ -107,3 +109,7 @@ export const getexpensecount= appRx.get(API_EXPENSECOUNT, errorCatcher, errorHan
 export const getpayeeinfo= appRx.get(API_PAYEEINFO, errorCatcher, errorHandle, filter)
 // 收购账户信息
 export const getbuypayeeinfo= appRx.get(API_BUYPAYEEINFO, errorCatcher, errorHandle, filter)
+// 获取关联合同
+export const getrelationcontract= appRx.get(API_RELATIONCONTRACT, errorCatcher, errorHandle, filter)
+//结算
+export const editcontract= appRx.post(API_EDIT_CONTRACT, errorCatcher, errorHandle, filter)

src/model/warehouse/index.js

@@ -61,7 +61,9 @@ import {
     API_WORKFLOWHANDLE,
     API_GET_EXPENSE,
     API_GET_WAREHOUSEPOSITIONINFO,
-    API_DRYOUT
+    API_DRYOUT,
+    API_GET_ENABLEDINFO,
+    API_SET_ENABLEDINFO
     // API_GET_EXPENSEINFO
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
@@ -189,4 +191,8 @@ export const getExpense = appRx.get(API_GET_EXPENSE,errorCatcher, errorHandle, f
 //入库单仓位
 export const getposition = appRx.get(API_GET_WAREHOUSEPOSITIONINFO,errorCatcher, errorHandle, filter)
 //入库单折干
-export const dryout = appRx.post(API_DRYOUT,errorCatcher, errorHandle, filter)
+export const dryout = appRx.post(API_DRYOUT,errorCatcher, errorHandle, filter)
+//入库单利率查看
+export const getenabledinfo = appRx.get(API_GET_ENABLEDINFO,errorCatcher, errorHandle, filter)
+//入库单利率修改
+export const setenabledinfo = appRx.post(API_SET_ENABLEDINFO,errorCatcher, errorHandle, filter)

src/views/contractManagement/acquisitionContract.vue

@@ -85,7 +85,7 @@
               style="color: #8890b1" />
           </el-select>
           <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
-            disabled
+            :disabled="scope.row.status=='已完成'"
             @change='selectstatuschange($event,scope.row)'
 
             :value="scope.row.status">

src/views/contractManagement/acquisitionContractAdd.vue

@@ -361,6 +361,7 @@ import { isUndefined } from 'xe-utils/methods'
         ChapterTwoList: [],
         agreementType: '',
         deptBudgetList: {
+          agreementType:'收购合同',
           deliverType: '2',
           sourceGoods:'',
           placeDelivery:'',
@@ -441,7 +442,7 @@ import { isUndefined } from 'xe-utils/methods'
     methods: {
       selectpriceType(e) {
         if (e == '随行就市') {
-          this.deptBudgetList.deliverType = '1'
+          // this.deptBudgetList.deliverType = '1'
         }
       },
       querySearch3(queryString, cb) {

src/views/contractManagement/purchaseContract.vue

@@ -85,7 +85,7 @@
               style="color: #8890b1" />
           </el-select>
           <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
-          disabled
+          :disabled="scope.row.status=='已完成'"
             @change='selectstatuschange($event,scope.row)'
 
             :value="scope.row.status">

src/views/contractManagement/purchaseContractAdd.vue

@@ -642,7 +642,7 @@ import { isUndefined } from 'xe-utils/methods'
       },
       selectpriceType(e) {
         if (e == '随行就市') {
-          this.deptBudgetList.deliverType = '1'
+          // this.deptBudgetList.deliverType = '1'
         }
       },
       feedbackLeaderChange(e){

src/views/contractManagement/salesContract.vue

@@ -88,7 +88,7 @@
           </el-select>
           <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
             @change='selectstatuschange($event,scope.row)'
-            disabled
+            :disabled="scope.row.status=='已完成'"
             :value="scope.row.status">
               <el-option label="执行中" value="执行中"
               style="color: #8890b1" />
@@ -441,6 +441,7 @@
               title: '失败',
               message: '修改失败，未上传双章合同附件',
             })
+            row.status=row.currectstatus
             return
           }
           console.log(row)

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -3294,9 +3294,9 @@ export default {
           } else {
             this.isSelectType = true
           }
-          if (this.outContractNo[i].priceType == '随行就市') {
-            this.disabled1 = !this.disabled1
-          }
+          // if (this.outContractNo[i].priceType == '随行就市') {
+          //   this.disabled1 = !this.disabled1
+          // }
 
           if (this.outContractNo[i].deliverType == '1') {
             this.carstatus = true

src/views/houseSelfCollect/paymentManagement.vue

@@ -27,10 +27,10 @@
         <ws-button type="primary" @click="screen(0)">待审核</ws-button>
         <ws-button type="primary"  @click="screen()">全部</ws-button>-->
         <ws-button :type="searchType == '' ? 'primary' : ''" @click="screen(-1)">全部</ws-button>
-        <ws-button :type="searchType == 1 ? 'primary' : ''" @click="screen(1)">待审核</ws-button>
+        <!-- <ws-button :type="searchType == 1 ? 'primary' : ''" @click="screen(1)">待审核</ws-button>
         <div v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">
           <ws-button :type="searchType == 7 ? 'primary' : ''" @click="screen(7)">待付款</ws-button>
-        </div>
+        </div> -->
         <ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)"
           v-hasPermission="`acquisitionManagement.acquisitionPay.add`">待结算</ws-button>
         <ws-button :type="invoicing === 0 ? 'primary' : ''" @click="screen(0)">未开票</ws-button>
@@ -68,14 +68,14 @@
         <ws-button type="primary" @click="screen(0)">待审核</ws-button>
         <ws-button type="primary"  @click="screen()">全部</ws-button>-->
 
-        <ws-button type="primary" @click="reject">驳回</ws-button>
-        <ws-button type="primary" @click="adopt">通过</ws-button>
+        <!-- <ws-button type="primary" @click="reject">驳回</ws-button>
+        <ws-button type="primary" @click="adopt">通过</ws-button> -->
         <ws-button type="primary" @click="invoicingClick"
           v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">开票</ws-button>
         <ws-button type="primary" @click="exportlist" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">导出
         </ws-button>
         <!-- <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button> -->
-        <ws-button type="primary" @click="payment" v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">付款
+        <!-- <ws-button type="primary" @click="payment" v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">付款 -->
         </ws-button>
         <!-- v-hasPermission="`acquisitionManagement.acquisitionPay.finace`" -->
         <ws-button type="primary" @click="selectPrint(1)"

src/views/profitable/cashout.vue

@@ -30,12 +30,12 @@
                 <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">
-            <ws-select v-model="deptBudgetList.type" placeholder="" class="typeselect" >
+          <!-- <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓储费" span="1" prop="contractNo" class="readonly">
+            <ws-select v-model="deptBudgetList.flag" placeholder="" class="typeselect" >
                 <ws-option label="否" value="否" style="color: #8890b1" />
                 <ws-option label="是" value="是" style="color: #8890b1" />
             </ws-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="合同费用"' label="合同编号" span="1" prop="contractNo" class="readonly">
             <el-select v-model="deptBudgetList.contractNo" filterable clearable placeholder="选择合同" class="typeselect" @change="selectcontract">
               <el-option v-for="item in contractList" :key="item.id" :label="item.contractNo" :value="item.contractNo"
@@ -72,8 +72,8 @@
           </el-upload> -->
         </el-form-item>
         </el-form>
-        <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"' class='expensetitle'>费用分配</div>
-        <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"' style='margin:0  auto 10px;width:90%;'>
+        <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"&&deptBudgetList.flag!="是"' class='expensetitle'>费用分配</div>
+        <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"&&deptBudgetList.flag!="是"' style='margin:0  auto 10px;width:90%;'>
             <ws-select v-model="mode" placeholder="费用分配方式" @change="modeselect">
           <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
@@ -99,7 +99,7 @@
         </ws-select>
         <span v-if='mode!="暂不分配"'>合计分配：{{amount}}元</span>  
         </div>
-        <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
+        <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"&&deptBudgetList.flag!="是"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
           <el-table-column 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)})">
@@ -184,7 +184,7 @@
         warecontractList:[],
         dateRange: this.disabledDate(),
         feeDetailsDistributions:[{receiptDocDate:'',inWarehouseWeight:0,distributionMoney:0,warehouseName:'',goodsName:'',goodsSource:'',index:0}],
-        deptBudgetList:{purpose:"合同费用",type:'粮款'},
+        deptBudgetList:{purpose:"合同费用",type:'粮款',flag:'否'},
         makeWordData: {},
         warehouseList:[],
         contractList:[],
@@ -464,7 +464,7 @@
       submit(){
         this.deptBudgetList.compId=localStorage.getItem('ws-pf_compId')
         this.deptBudgetList.agent=localStorage.getItem('ws-pf_staffName')
-        if(this.deptBudgetList.purpose=='合同费用'&&this.deptBudgetList.type=='非粮款'||this.deptBudgetList.purpose=='库点费用'){
+        if(this.deptBudgetList.purpose=='合同费用'&&this.deptBudgetList.type=='非粮款'||this.deptBudgetList.purpose=='库点费用'&&this.deptBudgetList.flag!="是"){
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             if(!this.feeDetailsDistributions[i].distributionMoney&&this.mode!="暂不分配"){
               this.$message({
@@ -500,7 +500,14 @@
           this.deptBudgetList.costNo='HTF'+this.getdate()+this.Num
         }else if(this.deptBudgetList.purpose=='库点费用'){
           this.deptBudgetList.expensesPurpose=3
-          this.deptBudgetList.expenseAllocationInfoList=this.feeDetailsDistributions
+          if(this.deptBudgetList.flag=='是'){
+            this.deptBudgetList.storageFeeFlag=1
+            this.deptBudgetList.expenseAllocationInfoList=[]
+          }else{
+            this.deptBudgetList.storageFeeFlag=0
+            this.deptBudgetList.expenseAllocationInfoList=this.feeDetailsDistributions
+          }
+          
            this.deptBudgetList.costNo='KDF'+this.getdate()+this.Num
         }else if(this.deptBudgetList.purpose=='经营性费用'){
           this.deptBudgetList.expensesPurpose=5
@@ -594,7 +601,7 @@
               return
         }
        
-        if(this.deptBudgetList.expensesPurpose==1&&this.deptBudgetList.costType==3&&this.mode=='全部分配'||this.deptBudgetList.expensesPurpose==3&&this.mode=='全部分配'){
+        if(this.deptBudgetList.expensesPurpose==1&&this.deptBudgetList.costType==3&&this.mode=='全部分配'||this.deptBudgetList.expensesPurpose==3&&this.mode=='全部分配'&&this.deptBudgetList.storageFeeFlag!=1){
           if(this.amount!=this.deptBudgetList.amountMoney){
             this.$message({
                 message: '请款金额与分配金额不相等!',
@@ -603,7 +610,7 @@
           return
           }
         }
-        if(this.deptBudgetList.expensesPurpose==1&&this.deptBudgetList.costType==3&&this.mode=='部分分配'||this.deptBudgetList.expensesPurpose==3&&this.mode=='部分分配'){
+        if(this.deptBudgetList.expensesPurpose==1&&this.deptBudgetList.costType==3&&this.mode=='部分分配'||this.deptBudgetList.expensesPurpose==3&&this.mode=='部分分配'&&this.deptBudgetList.storageFeeFlag!=1){
           if(this.amount>this.deptBudgetList.amountMoney){
             this.$message({
                 message: '分配金额不可超过请款金额!',

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

@@ -381,6 +381,23 @@ const profitableRouter = {
         // module: 'procurement.sparepart.applDetail'
       },
       hidden:true,
+    }, 
+     // 仓储费
+     {
+      path: 'storageCharge',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/storageCharge'),
+      name: 'storageCharge',
+      meta: {
+        title: 'storageCharge',
+        shortcutEntrance: 'profitable',
+        module: 'lirunhesuan.feiyongguanli.view',
+        permissicon: [],
+        keepAlive: true,
+        _title:'仓储费'
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
     }, 
       // // 收支明细
       // {

src/views/profitable/contractprofitsdetails.vue

@@ -94,8 +94,8 @@
           <el-table-column prop="address" label="操作" width="300">
             <template slot-scope="scope">
               <!-- <el-button @click="finalstatement(scope.row)" type="primary">结算单</el-button> -->
-              <el-button v-if="scope.row.status=='已结算'" @click="finalstatement(scope.row)" type="primary">结算单</el-button>
-              <el-button v-if="scope.row.status=='已完成'" @click="closeaccount(scope.row)" type="primary">结算</el-button>
+              <!-- <el-button v-if="scope.row.status=='已结算'" @click="finalstatement(scope.row)" type="primary">结算单</el-button>
+              <el-button v-if="scope.row.status=='已完成'" @click="closeaccount(scope.row)" type="primary">结算</el-button> -->
               <el-button @click="inventory(scope.row)" type="primary">库存</el-button>
               <el-button @click="cost(scope.row)" type="primary">费用</el-button>
             </template>

src/views/profitable/expensemanagementdetails.vue

@@ -32,6 +32,7 @@
           <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">支出</el-button>
         </el-col>
         <el-col style='text-align:right;' :span="6">
+          <!-- <el-button  style="margin-left:10px" @click="storageCharge()">仓储费</el-button> -->
           <el-button v-hasPermission="`lirunhesuan.feiyongguanli.add`" style="margin-left:10px" @click="cashout('')">请款</el-button>
           <el-button v-hasPermission="`lirunhesuan.feiyongguanli.shouk`" style="margin-right:10px" @click="receipt(1)" >收款</el-button>
         </el-col>
@@ -60,14 +61,10 @@
                 <span v-if='scope.row.costType==5'>-保证金</span>
               </div>
               <div v-else-if='scope.row.expensesPurpose==3'>库点费用
-                <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.storageFeeFlag==1'>-仓储费</span>
+                <span v-else>-非粮款</span>
               </div>
               <div v-else-if='scope.row.expensesPurpose==5'>经营性费用
-                <span v-if='scope.row.costType==1'>-粮款</span>
-                <span v-if='scope.row.costType==3'>-非粮款</span>
-                <span v-if='scope.row.costType==5'>-保证金</span>
               </div>
                <div v-else>{{scope.row.costType}}
               </div>
@@ -122,7 +119,7 @@
               <el-button  v-if='scope.row.status=="已驳回"' @click="edit(scope.row)" type="primary">编辑</el-button>
               <!-- <el-button v-if='scope.row.status=="已驳回"' @click="expenseedit(scope.row)" type="primary">编辑</el-button> -->
               <el-button v-if='!scope.row.distributionStatus&&scope.row.expensesPurpose==1&&scope.row.costType==3&&!scope.row.approveStatus&&scope.row.status=="已付款"
-              ||!scope.row.distributionStatus&&scope.row.expensesPurpose==3&&!scope.row.approveStatus&&scope.row.status=="已付款"||scope.row.expensesPurpose==2&&scope.row.status=="已付款"' @click="allot(scope.row)" type="primary">分配</el-button>
+              ||!scope.row.distributionStatus&&scope.row.expensesPurpose==3&&!scope.row.approveStatus&&scope.row.status=="已付款"&&scope.row.storageFeeFlag!=1||scope.row.expensesPurpose==2&&scope.row.status=="已付款"' @click="allot(scope.row)" type="primary">分配</el-button>
               <!-- <el-button v-if='scope.row.approveStatus=="已驳回"' @click="del(0,scope.row)" type="primary">删除</el-button> -->
               <el-button v-if='scope.row.status=="已驳回"' @click="del(0,scope.row)" type="danger">删除</el-button>
               <el-button v-if='scope.row.approveStatus=="待财务审核"||scope.row.approveStatus=="待决策人审核"||scope.row.approveStatus=="待内勤审核"' @click="aduit(scope.row)" type="primary">审核</el-button>
@@ -399,6 +396,9 @@
       cashout(){
         this.$router.push({name:'cashout'})
       },
+      storageCharge(){
+        this.$router.push({name:'storageCharge'})
+      },
       receipt(){
         this.$router.push({name:'receipt'})
       },

src/views/profitable/storageCharge.vue

@@ -0,0 +1,269 @@
+//库点库存
+<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="warehouseName" filterable clearable placeholder="" @change="selectwarehouse" :value="searchType">
+          <el-option v-for="item in warehouse" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
+            style="color: #8890b1" />
+        </el-select>
+        </el-col>
+        <el-col :span="12">
+          <div class="datascreen">
+          </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="warehouse" label="所属仓库"></el-table-column>
+          <el-table-column prop="locusWarehouse" label="所在仓库"></el-table-column>
+          <el-table-column prop="goodsName" label="货名"></el-table-column>
+          <el-table-column prop="inventory" 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>
+  </div>
+</template>
+<script>
+    import {
+    getinventoryinfo,
+    getwarehouse
+  } from '@/model/profitable/index'
+  export default {
+    components: {},
+    data() {
+      return {
+        value: "",
+        tableData: [],
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        deptCircularPage: {},
+        taskTypeList:[],
+        warehouse:[],
+        searchType:"",
+        searchKeyWord:"",
+        startDate:"",
+        endDate:"",
+        outtotal:0,
+        intotal:0,
+         foodExpenditure:0,
+        grainIncome:0,
+        expenseIncome:0,
+        expensesPay:0,
+        currentProfit:0,
+        warehouseName:'',
+      }
+    },
+    activated() {
+        //  this.getPassYearFormatDate()
+      this.warehouseName=this.$route.query.warehouseName
+      this.getList()
+    },
+    methods: {
+      typeChange(num){
+        this.searchType = num
+        this.getList()
+      },
+      returnsales(){
+        this.$router.go(-1)
+      },
+      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]
+        },
+        selectwarehouse(e){
+          this.warehouseName=e
+          this.getList()
+        },
+      getList() {
+        getwarehouse({ compId: localStorage.getItem('ws-pf_compId'),warehouseType:1}).toPromise()
+          .then(response => {
+            this.warehouse = response
+          
+          })
+         getinventoryinfo({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            warehouse:this.warehouseName,
+            pageSize:this.pageSize ,
+            inventoryType:3,
+          })
+          .toPromise()
+          .then(response => {
+            this.tableData = response.records
+             if(this.tableData){
+              this.foodExpenditure=0
+              this.grainIncome=0
+              this.expenseIncome=0
+              this.expensesPay=0
+              this.currentProfit=0
+              for (let i = 0; i < this.tableData.length; i++) {
+                if(this.tableData[i].foodExpenditure){
+                  this.foodExpenditure+=Number(this.tableData[i].foodExpenditure)
+                }
+                if(this.tableData[i].grainIncome){
+                  this.grainIncome+=Number(this.tableData[i].grainIncome)
+                }
+                if(this.tableData[i].expenseIncome){
+                  this.expenseIncome+=Number(this.tableData[i].expenseIncome)
+                }
+                if(this.tableData[i].expensesPay){
+                  this.expensesPay+=Number(this.tableData[i].expensesPay)
+                }
+                if(this.tableData[i].currentProfit){
+                  this.currentProfit+=Number(this.tableData[i].currentProfit)
+                }
+              }
+            }
+            
+           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;
+    }
+  }
+
+  .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/warehousenew/warehousingOrder.vue

@@ -34,6 +34,8 @@
         </ws-button>
         </el-col>
         <el-col style='text-align:right;' :span="12">
+          <!-- <ws-button v-hasPermission="
+            `warehouseManagement.warehousingOrder.yufu`" type="primary" @click="interestrate()" >{{interestratevalue.value}}利率</ws-button> -->
           <ws-button v-hasPermission="
             `warehouseManagement.warehousingOrder.yufu`" type="primary" @click="fieldrations()" >折干</ws-button>
            <ws-button v-hasPermission="
@@ -390,6 +392,12 @@
     <el-dialog width='30%' :visible.sync="remarkList" title="备注" top="20vh">
       <span>{{remark}}</span>
     </el-dialog>
+    <el-dialog width='50%' :visible.sync="interestrateshow" title="修改利率" top="20vh">
+        <el-input placeholder="" v-model="interestratevalue.value"></el-input>
+        <span slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="interestratesubmit">保存</el-button>
+        </span>
+    </el-dialog>
     <el-dialog width='50%' :visible.sync="accessoryTFs" title="附件" top="20vh">
       <div v-for="(item,index) in appendixIdss" :key="'fujian'+index" >
        <el-image 
@@ -432,7 +440,9 @@
   getExpense,
   workflowhandle,
   getposition,
-  dryout
+  dryout,
+  getenabledinfo,
+  setenabledinfo
 } from '@/model/warehouse/index'
   import {getpayeeinfo,getbuypayeeinfo} from '@/model/profitable/index'
   import {
@@ -467,6 +477,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
         //弹出框
         dialogViewSpareMoney: false,
         dialogApproveFormVisible: false,
+        interestrateshow:false,
         dataList:[],
         payeeinfo:{},
         options:[],
@@ -581,6 +592,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           },
         },
         customershow:false,
+        interestratevalue:'',
         accessoryTFs: false,
         remarkList: false,
         dialogTitle:'',
@@ -598,6 +610,16 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
       this.showType = this.isShow
     },
     methods: {
+      interestratesubmit(){
+        setenabledinfo({id:this.interestratevalue.id,value:this.interestratevalue.value}).toPromise()
+              .then((response) => {
+                this.$message({
+                  message: '修改利率成功',
+                  type: 'success'
+                });
+                this.interestrateshow=false
+              })
+      },
       warehousefocus(){
         getposition({baseId:this.fieldrationsList.baseId,flag:1}).toPromise()
               .then((response) => {
@@ -842,6 +864,9 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
         }
         
       },
+      interestrate(){
+        this.interestrateshow=true
+      },
       fieldrations(){
         let _this= this
         console.log(this.multipleSelection1)
@@ -1445,6 +1470,10 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
       getList() {
         this.startDate=this.value2[0]
         this.endDate=this.value2[1]
+        getenabledinfo({functionType:2}).toPromise()
+          .then((response) => {
+            this.interestratevalue=response
+          })
         getwarehousingorder({
             compId: localStorage.getItem('ws-pf_compId'),
             startDate:this.startDate,