1

src/views/profitable/expensemanagementdetails.vue

@@ -29,21 +29,25 @@
               <el-option v-for="item in warehousNameList" :key="item.id" :label="item.warehouseName"
                 :value="item.warehouseName"></el-option>
             </el-select>
-            <el-select v-model="costNo" multiple filterable allow-create default-first-option placeholder="按编号筛选"
+            <!-- <el-select v-model="costNo" multiple filterable allow-create default-first-option placeholder="按编号筛选"
               clearable @change="getList1" class="options_css">
               <el-option v-for="item in choiceObj" :key="item.id" :label="item.costNo" :value="item.costNo">
               </el-option>
-            </el-select>
+            </el-select> -->
+            <el-input style="width: 255px;" class="options_css" v-model="searchKeyWord" placeholder="可按编号进行查找" clearable maxlength="500" type="input"
+           @keyup.enter.native="find()"></el-input>
             <el-select v-model="purpose" multiple filterable allow-create default-first-option placeholder="按用途筛选"
               clearable @change="getList1" class="options_css">
               <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="按流向筛选"
+            <!-- <el-select v-model="flowTo" multiple filterable allow-create default-first-option placeholder="按流向筛选"
               clearable @change="getList1" class="options_css">
               <el-option v-for="item in flowToList" :key="item.id" :label="item.flowTo" :value="item.flowTo">
               </el-option>
-            </el-select>
+            </el-select> -->
+            <el-input style="width: 255px;" class="options_css" v-model="flowTo" placeholder="可按流向进行查找" clearable maxlength="500" type="input"
+           @keyup.enter.native="find()"></el-input>
 
             <el-select v-model="expenseName" multiple filterable allow-create default-first-option placeholder="按费用名称筛选"
               clearable @change="getList1" class="options_css">
@@ -51,12 +55,17 @@
                 :value="item.expenseName">
               </el-option>
             </el-select>
-            <el-select v-model="unallocatedAmount" multiple filterable allow-create default-first-option
+            <!-- <el-select v-model="unallocatedAmount" multiple filterable allow-create default-first-option
               placeholder="按未分配金额筛选" clearable @change="getList1" class="options_css">
               <el-option v-for="item in moneyList" :key="item.id" :label="item.unallocatedAmount"
                 :value="item.unallocatedAmount">
               </el-option>
-            </el-select>
+            </el-select> -->
+          <el-select v-model="unallocatedAmount" filterable placeholder="" @change="unallocatedAmountChange" 
+            style="margin: 0 10px">
+            <el-option key="全部金额" label="全部金额" value="" style="color: #8890b1" />
+            <el-option key="未分配金额大于0" label="未分配金额大于0" value="1" style="color: #8890b1" />
+          </el-select>
             <el-select v-model="agent" multiple filterable allow-create default-first-option placeholder="按经办人筛选"
               clearable @change="getList1" class="options_css">
               <el-option v-for="item in personList" :key="item.id" :label="item.agent" :value="item.agent">
@@ -89,7 +98,7 @@
           <el-button @click="costChange(2)" :type="expensesPurpose == 2 ? 'primary' : ''">运费</el-button>
           <el-button @click="exportFile" type="primary">导出</el-button>
         </el-col>
-        <el-col style="text-align: right" :span="6">
+        <el-col style="text-align: right;display: flex;" :span="6">
           <el-button @click="coalCost()">燃料费</el-button>
           <el-badge v-if="approveStatus" is-dot class="item">
             <el-button style="margin-left: 10px" @click="oilcost()">油费</el-button>
@@ -132,6 +141,8 @@
                 <span v-else>-非粮款</span>
               </div>
               <div v-else-if="scope.row.expensesPurpose == 5">经营性费用</div>
+              <div v-else-if="scope.row.expensesPurpose == 7">备用金</div>
+              
               <div v-else>{{ scope.row.costType }}</div>
             </template>
           </el-table-column>
@@ -143,7 +154,7 @@
               <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 == 5 || scope.row.expensesPurpose == 7 ">中天昊元</div>
               <div v-else-if="scope.row.expensesPurpose == 2">
                 {{ scope.row.contractNo }}
               </div>
@@ -368,9 +379,12 @@ export default {
       searchKeyWord: '',
       costNo: [],//编号
       purpose: [],//用途
-      flowTo: [],//流向
+      // flowTo: [],//流向
+      flowTo: '',//流向
+      flowFlag:'',
       expenseName: [],//费用名称
-      unallocatedAmount: [],//未分配金额(元)
+      // unallocatedAmount: [],//未分配金额(元)
+      unallocatedAmount:'',//未分配金额(元)
       agent: [],//经办人
       startDate: '',
       endDate: '',
@@ -471,6 +485,9 @@ export default {
           })
       })
     },
+    unallocatedAmountChange(e){
+      this.getList()
+    },
     xiala() {
       //仓库筛选
     getwarehouse({
@@ -887,7 +904,13 @@ export default {
       this.value = [this.startDate, this.endDate]
     },
     getList() {
-      this.getfielfillingList()
+      if(this.flowTo == '中天昊元'){
+        this.flowFlag = 1
+        this.flowTo = ''
+      }else{
+        this.flowFlag = ''
+      }
+      // this.getfielfillingList()
       getexenseinfo({
         // warehouseType: 1,
         compId: localStorage.getItem('ws-pf_compId'),
@@ -905,7 +928,9 @@ export default {
         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() : '',
+        flowTo: this.flowTo,
+        flowFlag:this.flowFlag,
+        unallocatedAmount:this.unallocatedAmount,
         warehouseName: this.warehouseName,
         toExamineType: this.toExamineType,
       })