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

src/views/profitable/contractprofitsdetails.vue

@@ -19,7 +19,7 @@
             <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"></el-input>
+            <el-input placeholder="可按合同编号、买方名称、卖方名称查找" class="input_css" v-model="searchKeyWord"></el-input>
             <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>

src/views/profitable/warehousecost.vue

@@ -32,7 +32,7 @@
       </el-row>
       <el-row style='margin:0 0 10px 10px;'>
         <el-col :span="18">
-          支出粮款：{{foodExpenditure}}元   收入粮款：{{grainIncome}}元    费用收入：{{expenseIncome}}元    费用支出：{{expensesPay}}元    当期利润： {{currentProfit}}元 
+          支出粮款：{{foodExpenditure}}元   收入粮款：{{grainIncome}}元    其他支出：{{expensesPay}}元    其他收入：{{expenseIncome}}元    当期利润： {{currentProfit}}元 
         </el-col>
         <el-col :span="6">
         </el-col>
@@ -51,9 +51,9 @@
               <div v-if='scope.row.expensesType==2'>支出</div>
             </template>
           </el-table-column>
-          <el-table-column prop="expensesName" label="费用名称（元）"></el-table-column>
+          <el-table-column prop="expensesName" label="费用名称"></el-table-column>
           <el-table-column prop="warehouseName" label="所属库点"></el-table-column>
-          <el-table-column prop="expensesPrice" label="费用金额"></el-table-column>
+          <el-table-column prop="expensesPrice" label="费用金额（元）"></el-table-column>
           <el-table-column prop="personName" label="请款人/收款人"></el-table-column>
           <el-table-column prop="payDeadline" label="日期"></el-table-column>
         </el-table>
@@ -165,6 +165,7 @@
             compId: localStorage.getItem('ws-pf_compId'),
             startDate:this.startDate,
             endDate:this.endDate,
+            warehouseName:this.warehouseName,
             currentPage: this.currentPage,
             pageSize:this.pageSize ,
             costType:3

src/views/profitable/warehouseinventory.vue

@@ -46,7 +46,7 @@
 <script>
     import {
     getinventoryinfo,
-    getcontract
+    getwarehouse
   } from '@/model/profitable/index'
   export default {
     components: {},
@@ -75,6 +75,7 @@
     },
     activated() {
         //  this.getPassYearFormatDate()
+      this.warehouseName=this.$route.query.warehouseName
       this.getList()
     },
     methods: {
@@ -112,6 +113,10 @@
           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 => {
@@ -119,15 +124,11 @@
           
           })
          getinventoryinfo({
-            // warehouseType: 1,
             compId: localStorage.getItem('ws-pf_compId'),
-            // startDate:this.startDate,
-            // endDate:this.endDate,
-            searchKeyWord:this.searchKeyWord,
             currentPage: this.currentPage,
+            warehouseName:this.warehouseName,
             pageSize:this.pageSize ,
             inventoryType:3,
-            searchType:this.searchType
           })
           .toPromise()
           .then(response => {