费用详情筛选

src/api/V2/profitable/index.js

@@ -75,4 +75,7 @@ export const API_EDIT_CONTRACT ='/contractManagementInfo/editInfo'
 // 结算校验
 export const API_JUDGE_SETTLEMENT ='/contractManagementInfo/judgeSettlementConditions'
 // 油费列表
-export const API_FUELFILLINGINFO  ='/fuelFillingInfo/selectFillingPc'
+export const API_FUELFILLINGINFO  ='/fuelFillingInfo/selectFillingPc'
+
+// 费用下拉详情筛选
+export const API_GETXIALALIST  ='/expenseInfo/removeRepeatList'

src/model/profitable/index.js

@@ -40,6 +40,7 @@ import {
   API_EDIT_CONTRACT,
   API_JUDGE_SETTLEMENT,
   API_FUELFILLINGINFO,
+  API_GETXIALALIST
 } from '@/api/V2/profitable'
 //收支明细列表
 export const getInOutDetailed = appRx.get(API_GET_INOUTDETAILED, errorCatcher, errorHandle, filter)
@@ -118,4 +119,6 @@ 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 getfielfillinginfo= appRx.get(API_FUELFILLINGINFO, errorCatcher, errorHandle, filter)
+//费用下拉详情筛选
+export const getXialaList= appRx.get(API_GETXIALALIST, errorCatcher, errorHandle, filter)

src/views/profitable/expensemanagementdetails.vue

@@ -5,45 +5,81 @@
       <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-col :span="12" class="bg-right"></el-col>
+      <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-row style="margin-bottom: 10px">
+        <el-col :span="6">
           <!-- <el-button style="margin-left:10px" @click="typeChange('')" type="primary">导出</el-button> -->
+          <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="12">
+        <el-col :span="18">
           <div class="datascreen">
-            <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-input placeholder="可按费用名称、流向、经办人查找" class="input_css" v-model="searchKeyWord" clearable></el-input>
-            <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
+            <!-- <el-input placeholder="可按费用名称、流向、经办人查找" class="input_css" v-model="searchKeyWord" clearable></el-input> -->
+            <el-select v-model="costNo" multiple filterable allow-create default-first-option placeholder="按编号筛选" clearable @change="getList">
+              <el-option v-for="item in choiceObj" :key="item.id" :label="item.costNo" :value="item.costNo">
+              </el-option>
+            </el-select>
+            <el-select v-model="purpose" multiple filterable allow-create default-first-option placeholder="按用途筛选" clearable  @change="getList">
+              <el-option v-for="item in costChoice" :key="item.id" :label="item.name" :value="item.name">
+              </el-option>
+            </el-select>
+            <el-select v-model="flowTo" multiple filterable allow-create default-first-option placeholder="按流向筛选" clearable  @change="getList">
+              <el-option v-for="item in flowToList" :key="item.id" :label="item.flowTo" :value="item.flowTo">
+              </el-option>
+            </el-select>
+            
+            <el-select v-model="expenseName" multiple filterable allow-create default-first-option placeholder="按费用名称筛选" clearable  @change="getList">
+              <el-option v-for="item in costNameList" :key="item.id" :label="item.expenseName" :value="item.expenseName">
+              </el-option>
+            </el-select>
+            <el-select v-model="unallocatedAmount" multiple filterable allow-create default-first-option placeholder="按未分配金额筛选" clearable  @change="getList">
+              <el-option v-for="item in moneyList" :key="item.id" :label="item.unallocatedAmount" :value="item.unallocatedAmount">
+              </el-option>
+            </el-select>
+            <el-select v-model="agent" multiple filterable allow-create default-first-option placeholder="按经办人筛选" clearable  @change="getList">
+              <el-option v-for="item in personList" :key="item.id" :label="item.agent" :value="item.agent">
+              </el-option>
+            </el-select>
+            
+            <!-- <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他驻库人员，可选多人"  allow-create default-first-option @change="selectstaffOther" multiple filterable clearable>
+            <el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName" :value="item.staffMobilePhone" />
+          </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>
           </div>
         </el-col>
       </el-row>
-      <el-row style='margin-bottom:10px;'>
+      <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>
-          <el-button style="margin-left:30px !important;" @click="costChange('')" :type="expensesPurpose == ''?'primary':''">全部费用</el-button>
-          <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="costChange(2)" :type="expensesPurpose == 2?'primary':''">运费</el-button>
+          <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>
+          <el-button style="margin-left: 30px !important" @click="costChange('')"
+            :type="expensesPurpose == '' ? 'primary' : ''">全部费用</el-button>
+          <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="costChange(2)" :type="expensesPurpose == 2 ? 'primary' : ''">运费</el-button>
         </el-col>
-        <el-col style='text-align:right;' :span="6">
+        <el-col style="text-align: right" :span="6">
           <el-badge v-if="approveStatus" is-dot class="item">
-            <el-button style="margin-left:10px" @click="oilcost()">油费</el-button>
+            <el-button style="margin-left: 10px" @click="oilcost()">油费</el-button>
           </el-badge>
-          <el-button v-else style="margin-left:10px" @click="oilcost()">油费</el-button>
-          <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-button v-else style="margin-left: 10px" @click="oilcost()">油费</el-button>
+          <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>
       </el-row>
       <div class="fromdata">
@@ -58,38 +94,38 @@
           </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>
+              <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="150px">
             <template slot-scope="scope">
-              <div v-if='scope.row.expensesPurpose==1'>合同费用
-                <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 v-if="scope.row.expensesPurpose == 1">
+                合同费用
+                <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-if='scope.row.expensesPurpose==3'>库点费用
-                <span v-if='scope.row.storageFeeFlag==1'>-仓储费</span>
+              <div v-else-if="scope.row.expensesPurpose == 3">
+                库点费用
+                <span v-if="scope.row.storageFeeFlag == 1">-仓储费</span>
                 <span v-else>-非粮款</span>
               </div>
-              <div v-else-if='scope.row.expensesPurpose==5'>经营性费用
-              </div>
-               <div v-else>{{scope.row.costType}}
-              </div>
+              <div v-else-if="scope.row.expensesPurpose == 5">经营性费用</div>
+              <div v-else>{{ scope.row.costType }}</div>
             </template>
           </el-table-column>
           <el-table-column prop="purpose" label="流向" width="200px">
             <template slot-scope="scope">
-              <div v-if='scope.row.expensesPurpose==1'>
+              <div v-if="scope.row.expensesPurpose == 1">
                 <span>{{ scope.row.contractNo }}</span>
               </div>
-              <div v-else-if='scope.row.expensesPurpose==3'>
-                <span>{{scope.row.warehouseName}}</span>
+              <div v-else-if="scope.row.expensesPurpose == 3">
+                <span>{{ scope.row.warehouseName }}</span>
               </div>
-              <div v-else-if='scope.row.expensesPurpose==5'>中天昊元
-              </div>
-              <div v-else-if='scope.row.expensesPurpose==2'>{{scope.row.contractNo}}
+              <div v-else-if="scope.row.expensesPurpose == 5">中天昊元</div>
+              <div v-else-if="scope.row.expensesPurpose == 2">
+                {{ scope.row.contractNo }}
               </div>
             </template>
           </el-table-column>
@@ -97,257 +133,432 @@
           <el-table-column prop="amountMoney" width="120" label="费用金额（元）"></el-table-column>
           <el-table-column prop="unallocatedAmount" width="100" 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>
+            <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="agent" label="经办人"></el-table-column>
           <el-table-column prop="createDate" label="发起日期" width="90"></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>
+              <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-column prop="address" label="操作" width="300">
             <template slot-scope="scope">
               <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' @click="shoukuanqueren(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
+                " @click="shoukuanqueren(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='scope.row.expensesPurpose==1&&scope.row.status=="已收款"&&!scope.row.approveStatus||scope.row.expensesPurpose==1&&scope.row.status=="已付款"&&!scope.row.approveStatus||scope.row.expensesPurpose==2&&scope.row.status=="已付款"&&!scope.row.approveStatus' @click="accomplish(scope.row)" type="primary">完成</el-button>
-              <el-button  v-if='scope.row.status=="已驳回"' @click="edit(scope.row)" type="primary">编辑</el-button>
+              <el-button v-if="
+                (scope.row.expensesPurpose == 1 &&
+                  scope.row.status == '已收款' &&
+                  !scope.row.approveStatus) ||
+                (scope.row.expensesPurpose == 1 &&
+                  scope.row.status == '已付款' &&
+                  !scope.row.approveStatus) ||
+                (scope.row.expensesPurpose == 2 &&
+                  scope.row.status == '已付款' &&
+                  !scope.row.approveStatus)
+              " @click="accomplish(scope.row)" type="primary">完成</el-button>
+              <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.unallocatedAmount>0
-              ||!scope.row.distributionStatus&&scope.row.expensesPurpose==3&&!scope.row.approveStatus&&scope.row.status=="已付款"&&scope.row.storageFeeFlag!=1&&scope.row.unallocatedAmount>0
-              ||scope.row.expensesPurpose==2&&scope.row.status=="已付款"&&!scope.row.distributionStatus&&scope.row.unallocatedAmount>0' @click="allot(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.unallocatedAmount > 0) ||
+                (!scope.row.distributionStatus &&
+                  scope.row.expensesPurpose == 3 &&
+                  !scope.row.approveStatus &&
+                  scope.row.status == '已付款' &&
+                  scope.row.storageFeeFlag != 1 &&
+                  scope.row.unallocatedAmount > 0) ||
+                (scope.row.expensesPurpose == 2 &&
+                  scope.row.status == '已付款' &&
+                  !scope.row.distributionStatus &&
+                  scope.row.unallocatedAmount > 0)
+              " @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>
-              <el-button v-if='!scope.row.approveStatus&&scope.row.expensesType==2&&scope.row.status=="待付款"' @click="payment(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>
+              <el-button v-if="
+                !scope.row.approveStatus &&
+                scope.row.expensesType == 2 &&
+                scope.row.status == '待付款'
+              " @click="payment(scope.row)" type="primary">付款</el-button>
             </template>
           </el-table-column>
           <el-table-column prop="expenseRemarks" label="分配状态">
             <template slot-scope="scope">
-              <span>{{scope.row.distributionStatus}}</span>
-              <el-tooltip v-if='scope.row.rejectionReason&&scope.row.distributionStatus' class="item" effect="dark" :content="scope.row.rejectionReason" placement="top-start">
+              <span>{{ scope.row.distributionStatus }}</span>
+              <el-tooltip v-if="scope.row.rejectionReason && scope.row.distributionStatus" class="item" effect="dark"
+                :content="scope.row.rejectionReason" placement="top-start">
                 <i class="el-icon-question"></i>
               </el-tooltip>
             </template>
           </el-table-column>
           <el-table-column prop="address" label="分配相关" width="300">
             <template slot-scope="scope">
-              <el-button v-if='scope.row.expensesType==2&&scope.row.distributionStatus=="待确认"&&!scope.row.approveStatus&&scope.row.status!="已驳回"' @click="allotaduit(scope.row)" type="primary">确认</el-button>
-              <el-button v-if='scope.row.expensesType==2&&scope.row.distributionStatus=="已驳回"&&!scope.row.approveStatus' @click="expenseedit(scope.row)" type="primary">编辑</el-button>
-              <el-button v-if='scope.row.expensesType==2&&scope.row.distributionStatus=="已驳回"&&!scope.row.approveStatus' @click="del(1,scope.row)" type="danger">删除</el-button>
+              <el-button v-if="
+                scope.row.expensesType == 2 &&
+                scope.row.distributionStatus == '待确认' &&
+                !scope.row.approveStatus &&
+                scope.row.status != '已驳回'
+              " @click="allotaduit(scope.row)" type="primary">确认</el-button>
+              <el-button v-if="
+                scope.row.expensesType == 2 &&
+                scope.row.distributionStatus == '已驳回' &&
+                !scope.row.approveStatus
+              " @click="expenseedit(scope.row)" type="primary">编辑</el-button>
+              <el-button v-if="
+                scope.row.expensesType == 2 &&
+                scope.row.distributionStatus == '已驳回' &&
+                !scope.row.approveStatus
+              " @click="del(1, scope.row)" type="danger">删除</el-button>
             </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">
+        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')}"
->
-        <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;'>{{item.dealMsg!='请款'?item.approveResult==1?'通过':'驳回':item.dealMsg}}</div>
-          <div style='width:33.333%;text-align:right;'>{{item.operateDate}}</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',
+      }">
+        <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">
+            {{
+                item.dealMsg != '请款'
+                  ? item.approveResult == 1
+                    ? '通过'
+                    : '驳回'
+                  : 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 }}
+        </div>
+        <div v-else style="width: 100%; text-align: left">
+          审核意见：{{ item.verifyRemark }}
         </div>
-        <div v-if='index<recordList.length-1' style='width:100%;text-align:left;'>审核意见：{{item.verifyRemark}}</div>
-        <div v-else style='width:100%;text-align:left;'>审核意见：{{item.verifyRemark}}</div>
       </div>
     </el-dialog>
-    <WinseaContentModal v-model="fujianshow" :title="title"
-      @on-cancel="handleClose">
-    <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 v-model="fujianshow" :title="title" @on-cancel="handleClose">
+      <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>
   </div>
 </template>
 <script>
-  import WsUpload from '@/components/WsUpload'
-  import {
-    getInOutDetailed,
-    getexenseinfo,
-    delexenseinfo,
-    delallocationinfo,editexenseinfo,getAuditRecord,
-    getfielfillinginfo 
-  } from '@/model/profitable/index'
-  export default {
-    components: {
-      WsUpload,
-    },
-    data() {
-      return {
-        value: '',
-        tableData: [],
-        tableData1:[],
-        deptBudgetTotal: 0,
+import WsUpload from '@/components/WsUpload'
+import {
+  getInOutDetailed,
+  getexenseinfo,
+  delexenseinfo,
+  delallocationinfo,
+  editexenseinfo,
+  getAuditRecord,
+  getfielfillinginfo,
+  getXialaList
+} from '@/model/profitable/index'
+export default {
+  components: {
+    WsUpload,
+  },
+  data() {
+    return {
+      value: '',
+      tableData: [],
+      tableData1: [],
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      size: 100,
+      expensesPurpose: '',
+      recordList: [],
+      compId: localStorage.getItem('ws-pf_compId'),
+      dialogVisible1: false,
+      deptCircularPage: {},
+      searchType: '',
+      searchKeyWord: '',
+      costNo: [],//编号
+      purpose:[],//用途
+      flowTo:[],//流向
+      expenseName:[],//费用名称
+      unallocatedAmount:[],//未分配金额(元)
+      agent:[],//经办人
+      startDate: '',
+      endDate: '',
+      title: '附件',
+      title1: '',
+      outtotal: 0,
+      intotal: 0,
+      fujianshow: false,
+      appendixIdss: [],
+      approveStatus: false,
+      choiceObj: [],
+      costChoice: [
+        {
+          name: "合同费用",
+          id: 1
+        },
+        {
+          name: "库点费用",
+          id: 2
+        }, 
+        {
+          name: "经营性费用",
+          id: 3
+        },
+        {
+          name: "运费",
+          id: 4
+        },
+        {
+          name: "其他",
+          id: 5
+        }
+      ],
+      flowToList:[],
+      costNameList:[],
+      moneyList:[],
+      personList:[]
+    }
+  },
+  activated() {
+    this.getPassYearFormatDate()
+    this.getList()
+    this.xiala()
+  },
+  methods: {
+    xiala(){
+       //搜索框下拉数据
+       getexenseinfo({
+        compId: localStorage.getItem('ws-pf_compId'),
+        startDate: this.startDate,
+        endDate: this.endDate,
+        searchKeyWord: "",
         currentPage: 1,
-        pageSize: 10,
-        size:100,
-        expensesPurpose:'',
-        recordList:[],
-        compId:localStorage.getItem('ws-pf_compId'),
-        dialogVisible1:false,
-        deptCircularPage: {},
-        searchType:'',
-        searchKeyWord:'',
-        startDate:'',
-        endDate:'',
-        title:'附件',
-        title1:'',
-        outtotal:0,
-        intotal:0,
-        fujianshow:false,
-        appendixIdss:[],
-        approveStatus:false,
+        pageSize: 9999,
+      })
+        .toPromise()
+        .then((response) => {
+          this.choiceObj = response.records
+        })
+         //流向
+         getXialaList({
+        removeRepeatFlag: 1,
+      })
+        .toPromise()
+        .then((response) => {
+          this.flowToList = response
+          for(let i = 0 ;i<this.flowToList.length;i++){
+            if(this.flowToList[i].expensesPurpose == 3){
+              this.flowToList[i].flowTo = this.flowToList[i].warehouseName
+            }else if(this.flowToList[i].expensesPurpose == 1){
+              this.flowToList[i].flowTo = this.flowToList[i].contractNo
+            }else if(this.flowToList[i].expensesPurpose == 5){
+              this.flowToList[i].flowTo = "中天昊元"
+            }else if(this.flowToList[i].expensesPurpose == 2){
+              this.flowToList[i].flowTo = this.flowToList[i].contractNo
+            }
+          }
+        })
+          //费用名称
+          getXialaList({
+        removeRepeatFlag: 2,
+      })
+        .toPromise()
+        .then((response) => {
+          this.costNameList = response
+        })
+          //未分配金额
+          getXialaList({
+        removeRepeatFlag: 3,
+      })
+        .toPromise()
+        .then((response) => {
+          this.moneyList = response
+        })
+           //经办人
+           getXialaList({
+        removeRepeatFlag: 4,
+      })
+        .toPromise()
+        .then((response) => {
+          this.personList = response
+        })
+
+    },
+    handlerecord(row) {
+      if (row.expensesType == 1) {
+        this.title1 = '收款审核记录'
+      } else {
+        this.title1 = '请款审核记录'
       }
+      getAuditRecord({ id: row.id, workflowId: row.workflowId })
+        .toPromise()
+        .then((response) => {
+          this.recordList = response
+          this.dialogVisible1 = true
+        })
+        .catch((response) => { })
     },
-    activated() {
-         this.getPassYearFormatDate()
-      this.getList()
+    returnsales() {
+      this.$router.go(-1)
     },
-    methods: {
-      handlerecord(row){
-        if(row.expensesType==1){
-          this.title1='收款审核记录'
-        }else{
-          this.title1='请款审核记录'
-        }
-        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{
+    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',
+        })
+      }
+    },
+    look(row) {
+      this.$router.push({
+        name: 'expensemanagentlook',
+        query: { id: row.id, expensesType: row.expensesType },
+      })
+    },
+    del(status, row) {
+      var title = ''
+      if (status == 1) {
+        title = '确定删除分配信息？'
+        if (
+          localStorage.getItem('ws-pf_roleName') != '销售内勤' &&
+          localStorage.getItem('ws-pf_roleName') != '采购内勤'
+        ) {
           this.$message({
-                message: '暂无附件查看!',
-                type: 'warning',
-              })
+            message: '暂无此权限!',
+            type: 'warning',
+          })
+          return
+        }
+      } else {
+        if (row.expensesType == 1) {
+          title = '确定删除收款信息？'
+        } else {
+          title = '确定删除请款信息？'
         }
-      },
-      look(row){
-        this.$router.push({name:'expensemanagentlook',query:{id:row.id,expensesType:row.expensesType}})
-      },
-      del(status,row){
-        var title=''
-          if(status==1){
-            title='确定删除分配信息？'
-            if(localStorage.getItem('ws-pf_roleName')!='销售内勤'&&localStorage.getItem('ws-pf_roleName')!='采购内勤'){
+      }
+      this.$confirm(title, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        if (status == 1) {
+          delallocationinfo({ id: row.id })
+            .toPromise()
+            .then((response) => {
               this.$message({
-                message: '暂无此权限!',
-                type: 'warning',
-              })
-              return
-            }
-          }else{
-            if(row.expensesType==1){
-              title='确定删除收款信息？'
-            }else{
-              title='确定删除请款信息？'
-            }
-            
-          }
-           this.$confirm(title, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          })
-          .then(() => {
-            if(status==1){
-              delallocationinfo({id:row.id}).toPromise()
-              .then(response => {
-                this.$message({
                 message: '删除成功',
                 type: 'success',
               })
-                this.getList()
-              }).catch(response => {
-                this.$message({
+              this.getList()
+            })
+            .catch((response) => {
+              this.$message({
                 message: '删除失败',
                 type: 'warning',
               })
-              })
-            }else{
-              delexenseinfo({id:row.id}).toPromise()
-              .then(response => {
-                this.$message({
+            })
+        } else {
+          delexenseinfo({ id: row.id })
+            .toPromise()
+            .then((response) => {
+              this.$message({
                 message: '删除成功',
                 type: 'success',
               })
-                this.getList()
-              }).catch(response => {
-                this.$message({
+              this.getList()
+            })
+            .catch((response) => {
+              this.$message({
                 message: '删除失败',
                 type: 'warning',
               })
-              })
-            }
-          })
-      },
-      getfielfillingList() {
-        getfielfillinginfo({
-            // warehouseType: 1,
-            compId: localStorage.getItem('ws-pf_compId'),
-            currentPage: 1,
-            pageSize:10 ,
-            // searchType:this.searchType
-          })
-          .toPromise()
-          .then(response => {
-            this.tableData1 = response.records
-            var arr=this.tableData1.filter((item)=>{return item.approveStatus})
-            if(arr.length>0){
-              this.approveStatus=true
-            }else{
-              this.approveStatus=false
-            }
-          })
-      },
-      accomplish(row){
-        var title1=''
-        if(row.unallocatedAmount>0){
-          title1='尚有未分配的金额，是否确认不在分配？'
-        }else{
-          title1='确定将费用状态修改为已完成？'
+            })
         }
-          this.$confirm(title1, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+      })
+    },
+    getfielfillingList() {
+      getfielfillinginfo({
+        // warehouseType: 1,
+        compId: localStorage.getItem('ws-pf_compId'),
+        currentPage: 1,
+        pageSize: 10,
+        // searchType:this.searchType
+      })
+        .toPromise()
+        .then((response) => {
+          this.tableData1 = response.records
+          var arr = this.tableData1.filter((item) => {
+            return item.approveStatus
           })
-          .then(() => {
-            row.flag=1
-            editexenseinfo(row).toPromise()
-          .then(response => {
+          if (arr.length > 0) {
+            this.approveStatus = true
+          } else {
+            this.approveStatus = false
+          }
+        })
+    },
+    accomplish(row) {
+      var title1 = ''
+      if (row.unallocatedAmount > 0) {
+        title1 = '尚有未分配的金额，是否确认不在分配？'
+      } else {
+        title1 = '确定将费用状态修改为已完成？'
+      }
+      this.$confirm(title1, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        row.flag = 1
+        editexenseinfo(row)
+          .toPromise()
+          .then((response) => {
             this.$message({
               message: '提交成功!',
               type: 'success',
@@ -355,264 +566,297 @@
             this.getList()
             // this.$router.go(-1)
           })
+      })
+    },
+    typeChange(num) {
+      this.searchType = num
+      this.getList()
+    },
+    costChange(num) {
+      this.expensesPurpose = num
+      this.getList()
+    },
+    edit(row) {
+      this.$router.push({ name: 'cashoutedit', query: { id: row.id } })
+    },
+    oilcost() {
+      this.$router.push({ name: 'oilcost' })
+    },
+    expenseedit(row) {
+      if (
+        localStorage.getItem('ws-pf_roleName') == '销售内勤' ||
+        localStorage.getItem('ws-pf_roleName') == '采购内勤'
+      ) {
+        localStorage.setItem(
+          'expensebh',
+          JSON.stringify(row.expenseAllocationInfoListBH)
+        )
+        this.$router.push({
+          name: 'expensemanagentedit',
+          query: { id: row.id },
+        })
+      } else {
+        this.$message({
+          message: '暂无此权限!',
+          type: 'warning',
+        })
+      }
+    },
+    shoukuanqueren(row) {
+      if (localStorage.getItem('ws-pf_roleName') == '出纳') {
+        this.$router.push({ name: 'receiptaduit', query: { id: row.id } })
+      } else {
+        this.$message({
+          message: '暂无此权限!',
+          type: 'warning',
+        })
+      }
+    },
+    aduit(row) {
+      if (row.taskId) {
+        if (row.approveStatus == '待内勤审核') {
+          this.$router.push({
+            name: 'cashoutaduitNQ',
+            query: { id: row.id, taskId: row.taskId },
           })
-      },
-      typeChange(num){
-        this.searchType = num
-        this.getList()
-      },
-      costChange(num){
-        this.expensesPurpose = num
-        this.getList()
-      },
-      edit(row){
-        this.$router.push({name:'cashoutedit',query:{id:row.id}})
-      },
-      oilcost(){
-        this.$router.push({name:'oilcost'})
-      },
-      expenseedit(row){
-         if(localStorage.getItem('ws-pf_roleName')=='销售内勤'||localStorage.getItem('ws-pf_roleName')=='采购内勤'){
-          localStorage.setItem('expensebh',JSON.stringify(row.expenseAllocationInfoListBH))
-          this.$router.push({name:'expensemanagentedit',query:{id:row.id}})
-        }else{
-          this.$message({
-            message: '暂无此权限!',
-            type: 'warning',
-          })
-        }
-      },
-      shoukuanqueren(row){
-        if(localStorage.getItem('ws-pf_roleName')=='出纳'){
-          this.$router.push({name:'receiptaduit',query:{id:row.id}})
-        }else{
-          this.$message({
-            message: '暂无此权限!',
-            type: 'warning',
-          })
-        }
-        
-      },
-      aduit(row){
-        if(row.taskId){
-          if(row.approveStatus=='待内勤审核'){
-            this.$router.push({name:'cashoutaduitNQ',query:{id:row.id,taskId:row.taskId}})
-          }else{
-            this.$router.push({name:'cashoutaduit',query:{id:row.id,taskId:row.taskId}})
-          }
-        }else{
-          this.$message({
-            message: '暂无此权限!',
-            type: 'warning',
-          })
-        }
-      },
-      allotaduit(row){
-        if(localStorage.getItem('ws-pf_roleName')=='单证中心主任'){
-          localStorage.setItem('expenseqr',JSON.stringify(row.expenseAllocationInfoList))
-          this.$router.push({name:'expenseallotaduit',query:{id:row.id}})
-        }else{
-          this.$message({
-            message: '暂无此权限!',
-            type: 'warning',
-          })
-        }
-      },
-      payment(row){
-        if(localStorage.getItem('ws-pf_roleName')=='出纳'){
-          this.$router.push({name:'payment',query:{id:row.id}})
-        }else{
-          this.$message({
-            message: '暂无此权限!',
-            type: 'warning',
-          })
-        }
-        
-      },
-      allot(row){
-        if(localStorage.getItem('ws-pf_roleName')=='销售内勤'||localStorage.getItem('ws-pf_roleName')=='采购内勤'){
-          this.$router.push({name:'expenseallot',query:{id:row.id}})
-        }else{
-          this.$message({
-            message: '暂无此权限!',
-            type: 'warning',
+        } else {
+          this.$router.push({
+            name: 'cashoutaduit',
+            query: { id: row.id, taskId: row.taskId },
           })
         }
-      },
-      cashout(){
-        this.$router.push({name:'cashout'})
-      },
-      storageCharge(){
-        this.$router.push({name:'storageCharge'})
-      },
-      receipt(){
-        this.$router.push({name:'receipt'})
-      },
-      // inventory(){
-      //   this.$router.push({name:'contractinventory'})
-      // },
-      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]
-        },
-      getList() {
-        this.getfielfillingList()
-         getexenseinfo({
-            // warehouseType: 1,
-            compId: localStorage.getItem('ws-pf_compId'),
-            startDate:this.startDate,
-            endDate:this.endDate,
-            searchKeyWord:this.searchKeyWord,
-            currentPage: this.currentPage,
-            pageSize:this.pageSize ,
-            searchType:this.searchType,
-            expensesPurpose:this.expensesPurpose
-          })
-          .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(',')
-                }
-                
+      } else {
+        this.$message({
+          message: '暂无此权限!',
+          type: 'warning',
+        })
+      }
+    },
+    allotaduit(row) {
+      if (localStorage.getItem('ws-pf_roleName') == '单证中心主任') {
+        localStorage.setItem(
+          'expenseqr',
+          JSON.stringify(row.expenseAllocationInfoList)
+        )
+        this.$router.push({ name: 'expenseallotaduit', query: { id: row.id } })
+      } else {
+        this.$message({
+          message: '暂无此权限!',
+          type: 'warning',
+        })
+      }
+    },
+    payment(row) {
+      if (localStorage.getItem('ws-pf_roleName') == '出纳') {
+        this.$router.push({ name: 'payment', query: { id: row.id } })
+      } else {
+        this.$message({
+          message: '暂无此权限!',
+          type: 'warning',
+        })
+      }
+    },
+    allot(row) {
+      if (
+        localStorage.getItem('ws-pf_roleName') == '销售内勤' ||
+        localStorage.getItem('ws-pf_roleName') == '采购内勤'
+      ) {
+        this.$router.push({ name: 'expenseallot', query: { id: row.id } })
+      } else {
+        this.$message({
+          message: '暂无此权限!',
+          type: 'warning',
+        })
+      }
+    },
+    cashout() {
+      this.$router.push({ name: 'cashout' })
+    },
+    storageCharge() {
+      this.$router.push({ name: 'storageCharge' })
+    },
+    receipt() {
+      this.$router.push({ name: 'receipt' })
+    },
+    // inventory(){
+    //   this.$router.push({name:'contractinventory'})
+    // },
+    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]
+    },
+    getList() {
+      this.getfielfillingList()
+      getexenseinfo({
+        // warehouseType: 1,
+        compId: localStorage.getItem('ws-pf_compId'),
+        startDate: this.startDate,
+        endDate: this.endDate,
+        searchKeyWord: this.searchKeyWord,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchType: this.searchType,
+        expensesPurpose: this.expensesPurpose,
+        costNo:this.costNo.length>0?this.costNo.toString():"",
+        purpose:this.purpose.length>0?this.purpose.toString():"",
+        expenseName:this.expenseName.length>0?this.expenseName.toString():"",
+        unallocatedNumber:this.unallocatedAmount.length>0?this.unallocatedAmount.toString():"",
+        agent:this.agent.length>0?this.agent.toString():"",
+        flowTo:this.flowTo.length>0?this.flowTo.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(',')
               }
             }
-            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]
-        }
-        this.getList()
-      },
-      pickerOptions() {},
-      find() {
-        this.getList()
+          }
+          this.tableData = response.records
 
-      },
-      handleSizeChange(val) {
-        console.log(`每页 ${val} 条`)
-        this.pageSize = val
-        this.getList()
-      },
-      handleCurrentChange(val) {
-        this.currentPage = val
-        console.log(`当前页: ${val}`)
-        this.getList()
-      },
+          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]
+      }
+      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;
-  }
+.container {
+  background: #e8ecf6;
+}
 
-  .center {
-    margin: 0 auto;
-    background: #ffffff;
-    // height: calc(100vh - 13vh);
-    border-radius: 4px;
-    padding: 20px 0;
+.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;
-    }
+  /deep/.el-table td,
+  /deep/.el-table th {
+    text-align: center;
   }
+}
 
-  .row_top {
-    background: #F6F7FC;
-    border-radius: 4px;
-    margin-bottom: 10px;
+.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;
-    }
+  .bg-left {
+    padding-left: 30px;
+  }
 
-    .title::before {
-      content: '';
-      display: inline-block;
-      width: 5px;
-      height: 30px;
-      background: #5473e8;
-      position: absolute;
-      left: 0;
-    }
+  .bg-right {
+    padding-right: 10px;
+    text-align: right;
   }
 
-  .datascreen {
-    display: flex;
+  .title {
+    position: relative;
+  }
 
-    .data_css {
-      width: 40%;
-    }
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+}
 
-    .input_css {
-      width: 50%;
-      margin: 0 10px;
-    }
+.datascreen {
+  display: flex;
 
-    .find {
-      margin-right: 10px;
-    }
+  .data_css {
+    width: 40%;
   }
 
-  .fromdata {
-    margin: 20px 0;
-    overflow-y: scroll;
-    height: 546px;
+  .input_css {
+    width: 50%;
+    margin: 0 10px;
   }
-  .top_info{
-    margin: 10px 0 0 10px;
-    min-width: 712px;
-    .info_css{
-      margin-right: 20px;
-    }
+
+  .find {
+    margin-right: 10px;
   }
-  .bg-right{
-    padding-top:15px;
+}
+
+.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/statisticalReport/autoSettlementList.vue

@@ -1257,7 +1257,10 @@ export default {
       if (this.modification.length == 0) {
         this.$message.warning('请选择要通过的条目')
       } else {
+        var contract = that.modification[0].contractNo
+        
         for (let i = 0; i < this.modification.length; i++) {
+        
           if(this.modification[i].status=='待请款'&&this.modification[i].approveStatus||this.modification[i].status!='待请款'&&this.modification[i].status!='已驳回'){
             this.$message.warning('请选择待请款的条目')
             return
@@ -1266,6 +1269,10 @@ export default {
             this.$message.warning('请选择已卸车的车辆')
             return
           }
+          if(that.modification[i].contractNo != contract){
+            this.$message.warning('请选择相同的合同条目进行请款！')
+            return
+          }
         }
         
         this.$confirm(`是否确定请款？`, {
@@ -1290,10 +1297,10 @@ export default {
       }
     },
     handleSelectionChange(val) {
+      this.modification = val
       if (val.length !== 0) {
         this.totalNumer = this.countTotal(val, 'shipped')
       }
-      this.modification = val
     },
     handlestatus(status) {
       this.searchType = status