Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

public/static/printdry.html

@@ -214,9 +214,9 @@
                       <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'&&print_company_name!='黑龙江稷硕粮食购销有限公司'" class="col"></td>
                       <td v-else class="col">0</td>
                       <td class="col col-bgc">仓位号</td>
-                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'&&print_company_name!='黑龙江稷硕粮食购销有限公司'" class="col"></td>
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'&&print_company_name!='黑龙江稷硕粮食购销有限公司'" class="col">{{printData.binNumber}}</td>
                       <td v-else-if="print_company_name=='白城市鹏羽粮食贸易有限公司'" class="col">{{printData.binNumber}}</td>
-                      <td v-else-if="print_company_name=='黑龙江稷硕粮食购销有限公司'" class="col">7</td>
+                      <td v-else-if="print_company_name=='黑龙江稷硕粮食购销有限公司'" class="col">{{printData.binNumber}}</td>
                   </tr>
                   <tr class="row">
                       <td class="col col-bgc">毛重（公斤）</td>

src/views/profitable/expensemanagementdetails.vue

@@ -29,34 +29,45 @@
               <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="按费用名称筛选"
+            <!-- <el-select v-model="expenseName" multiple filterable allow-create default-first-option placeholder="按费用名称筛选"
               clearable @change="getList1" class="options_css">
               <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
+            </el-select> -->
+            <el-input style="width: 280px;" class="options_css" v-model="expenseName" placeholder="可按费用名称进行查找" clearable maxlength="500" type="input"
+           @keyup.enter.native="find()"></el-input>
+            <!-- <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;width:200px">
+            <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 +100,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 +143,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 +156,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>
@@ -332,7 +345,7 @@ import {
   getXialaList,
   sponsorWithdraw,
   exportFile,
-  getcostNo,
+  // getcostNo,
   editfujian
 } from '@/model/profitable/index'
 import {
@@ -366,11 +379,15 @@ export default {
       deptCircularPage: {},
       searchType: '',
       searchKeyWord: '',
+      expenseName: '',//费用名称
       costNo: [],//编号
       purpose: [],//用途
-      flowTo: [],//流向
-      expenseName: [],//费用名称
-      unallocatedAmount: [],//未分配金额(元)
+      // flowTo: [],//流向
+      flowTo: '',//流向
+      flowFlag:'',
+      // expenseName: [],//费用名称
+      // unallocatedAmount: [],//未分配金额(元)
+      unallocatedAmount:'',//未分配金额(元)
       agent: [],//经办人
       startDate: '',
       endDate: '',
@@ -471,6 +488,9 @@ export default {
           })
       })
     },
+    unallocatedAmountChange(e){
+      this.getList()
+    },
     xiala() {
       //仓库筛选
     getwarehouse({
@@ -480,51 +500,51 @@ export default {
         .then((response) => {
           this.warehousNameList = response
         })
-      //搜索框下拉数据
-      getcostNo({
-        compId: localStorage.getItem('ws-pf_compId'),
-        // currentPage: 1,
-        // pageSize: 9999,
-      })
-        .toPromise()
-        .then((response) => {
-          this.choiceObj = response
-        })
+      // //搜索框下拉数据
+      // getcostNo({
+      //   compId: localStorage.getItem('ws-pf_compId'),
+      //   // currentPage: 1,
+      //   // pageSize: 9999,
+      // })
+      //   .toPromise()
+      //   .then((response) => {
+      //     this.choiceObj = response
+      //   })
       //流向
-      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: 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: 2,
+      // })
+      //   .toPromise()
+      //   .then((response) => {
+      //     this.costNameList = response
+      //   })
+      // //未分配金额
+      // getXialaList({
+      //   removeRepeatFlag: 3,
+      // })
+      //   .toPromise()
+      //   .then((response) => {
+      //     this.moneyList = response
+      //   })
       //经办人
       getXialaList({
         removeRepeatFlag: 4,
@@ -887,7 +907,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'),
@@ -896,16 +922,19 @@ export default {
         startDate: localStorage.getItem('startDate'),
         endDate: localStorage.getItem('endDate'),
         searchKeyWord: this.searchKeyWord,
+        expenseName:this.expenseName,
         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() : '',
+        // 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,
       })