页面修改

src/api/foodManage/stockReport.js

@@ -25,4 +25,14 @@ export function stockExpireWarningPageApi(data) {
   })
 }
 
-
+//查询出入库明细
+export function stockInoutWarningPageApi(data) {
+  return request({
+    url: '/smart-canteen/api/v1/drpinventory/inout/warning',
+    method: 'get',
+    headers: {
+        //"merchant-id":"378915229716713472",
+    },
+    params:data
+  })
+}

src/views/foodManage/purchaseReport/procureOrderReport/index.vue

@@ -1,5 +1,7 @@
 <template>
   <div class="app-container">
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+        <el-tab-pane label="验收未完成" name="unFinish">
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
                 <el-form-item label="交货时间范围">
                     <el-date-picker
@@ -64,6 +66,74 @@
             :limit.sync="queryParams.pageSize"
             @pagination="getList"
             /> 
+        </el-tab-pane>
+        <el-tab-pane label="验收已完成" name="finish">
+            <el-form :model="queryParams2" ref="queryForm2" size="small" :inline="true" v-show="showSearch" label-width="100px">
+                <el-form-item label="交货时间范围">
+                    <el-date-picker
+                        v-model="dateRange2"
+                        type="datetimerange"
+                        align="right"
+                        unlink-panels
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
+                        format="yyyy-MM-dd HH:mm:ss" style="width: 400px"
+                        :default-time="['00:00:00', '23:59:59']"
+                        :picker-options="pickerOptions" >
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="采购订单名称" prop="orderTitle">
+                    <el-input v-model="queryParams2.orderTitle" placeholder="请输入采购订单名称" maxlength="20" clearable style="width: 100%"/>
+                </el-form-item> 
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery2">搜索</el-button>
+                    <el-button icon="el-icon-refresh" size="mini" @click="resetQuery2">重置</el-button>
+                </el-form-item>
+            </el-form>
+
+            <el-row :gutter="10" class="mb8"> 
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList2"></right-toolbar>
+            </el-row>
+
+            <el-table v-loading="loading" :data="tableListData2" height="800">
+                <el-table-column label="序号" align="center" width="80" type="index">
+                    <template slot-scope="scope">
+                    <span>{{(queryParams2.pageNum - 1) * queryParams2.pageSize + scope.$index + 1}}</span>
+                    </template>
+                </el-table-column> 
+                <el-table-column label="采购订单编号" align="center" prop="orderGoodsCode" :show-overflow-tooltip="true" /> 
+                <el-table-column label="采购订单名称" align="center" prop="orderTitle" :show-overflow-tooltip="true" />  
+                <el-table-column label="所属区域-食堂-档口" align="center" prop="" :show-overflow-tooltip="true" width="250">
+                    <template slot-scope="scope">
+                    <span>{{ scope.row.areaName }}-{{ scope.row.canteenName }}-{{ scope.row.stallName }}</span>
+                    </template>  
+                </el-table-column>
+                <el-table-column label="供应商名称" align="center" prop="supplierName" :show-overflow-tooltip="true" />  
+                <el-table-column label="订单总金额(元)" align="center" prop="orderAmount" :show-overflow-tooltip="true" width="120">
+                    <template slot-scope="scope">
+                    <span>{{ (scope.row.orderAmount/100).toFixed(2) }}</span>
+                    </template>  
+                </el-table-column>
+                <el-table-column label="货品总数量" align="center" prop="totalNum" :show-overflow-tooltip="true" width="140"/>
+                <el-table-column label="验收总数量" align="center" prop="totalQualifiedNum" :show-overflow-tooltip="true" width="140"/> 
+                <el-table-column label="未验收总数量" align="center" prop="" :show-overflow-tooltip="true" width="140">
+                    <template slot-scope="scope">
+                    <span>{{ (scope.row.totalNum-scope.row.totalQualifiedNum) }}</span>
+                    </template>  
+                </el-table-column>     
+                <el-table-column label="交货日期" align="center" prop="requestArrivalTime" :show-overflow-tooltip="true" width="140"/>     
+            </el-table>
+
+            <pagination
+            v-show="total2>0"
+            :total="total2"
+            :page.sync="queryParams2.pageNum"
+            :limit.sync="queryParams2.pageSize"
+            @pagination="getList2"
+            />  
+        </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
@@ -89,16 +159,26 @@ export default {
             total: 0,
             //表格数据
             tableListData: [], 
+             // 总条数
+            total2: 0,
+            //表格数据
+            tableListData2: [], 
             // 查询参数
             queryParams: {
                 pageNum: 1,
                 pageSize: 10, 
             },
+            // 查询参数
+            queryParams2: {
+                pageNum: 1,
+                pageSize: 10, 
+            },
             treeAreaOptions:[],//区域树
             canteenOptions:[],//食堂下拉选
             stallOptions:[],//档口下拉选
             supplierOptions:[],
             dateRange:this.defaultDateRange(),//区域树
+            dateRange2:this.defaultDateRange(),//区域树
             pickerOptions: {
                 shortcuts: [{
                     text: '最近一周',
@@ -126,6 +206,7 @@ export default {
                     }
                 }]
             },
+            activeName:"unFinish"
         };
     },
     created() {  
@@ -165,6 +246,59 @@ export default {
                 this.loading = false;
             });
         },   
+        handleTabClick(){
+            if(this.activeName=='unFinish'){
+                this.queryParams={
+                    pageNum: 1,
+                    pageSize: 10,
+                    orderTitle: undefined,  
+                }
+                this.resetForm("queryForm");
+                this.handleQuery()
+            }
+            if(this.activeName=='finish'){
+                this.queryParams2={
+                    pageNum: 1,
+                    pageSize: 10,    
+                    orderTitle: undefined,  
+                }
+                this.resetForm("queryForm2");
+                this.handleQuery2()
+            }
+        },
+        /** 搜索按钮操作 */
+        handleQuery2() {
+            this.queryParams2.pageNum = 1;
+            this.getList2();
+        },
+        /** 重置按钮操作 */
+        resetQuery2() { 
+            this.dateRange2 = this.defaultDateRange()
+            this.resetForm("queryForm2");
+            this.handleQuery2();
+        },
+        /** 查询列表 */
+        getList2() {
+            this.loading = true;
+            let param = {
+                "pageNum": this.queryParams2.pageNum, 
+                "pageSize": this.queryParams2.pageSize,  
+                "orderTitle": this.queryParams2.orderTitle,    
+                "ifAllInspect":1
+            }
+            if(this.dateRange2&&this.dateRange2.length>0){
+                param.startDateTime=this.formatDateTime(this.dateRange2[0])
+                param.endDateTime=this.formatDateTime(this.dateRange2[1])
+            }else{
+                param.startDateTime=undefined;
+                param.endDateTime=undefined;
+            } 
+            purchaseOrderPageApi(param).then(response => {
+                this.tableListData2 = response.rows;
+                this.total2 = Number(response.total);
+                this.loading = false;
+            });
+        },
         defaultDateRange() {
           const end = new Date(new Date().toLocaleDateString());
           end.setTime(end.getTime() + 24 * 60 * 60 * 1000 -1);

src/views/foodManage/stockReport/inoutDetails/index.vue

@@ -136,7 +136,7 @@
 <script>  
 import { systemAreaTreeApi } from "@/api/base/stall";  
 import { drpWareHousePageApi } from "@/api/foodManage/stockManage";
-// import { supplierBindMaterialListApi } from "@/api/foodManage/supplierManage";
+import { stockInoutWarningPageApi } from "@/api/foodManage/stockReport";
 
 export default {
     name: "",
@@ -271,33 +271,23 @@ export default {
         /** 查询列表 */
         getList() {
             // this.loading = true;
-            // let param = {
+            let param = {
-            //     "pageNum": this.queryParams.pageNum, 
+                "pageNum": this.queryParams.pageNum, 
-            //     "pageSize": this.queryParams.pageSize,
+                "pageSize": this.queryParams.pageSize, 
-            //     "supplierName": this.queryParams.supplierName, 
+                "materialName": this.queryParams.materialName, 
-            //     "materialTypeIds": this.queryParams.materialTypeIds, 
+            }
-            // }
+            if(this.dateRange&&this.dateRange.length>0){
-            // if(this.dateRange&&this.dateRange.length>0){
+                param.startDateTime=this.formatDateTime(this.dateRange[0])
-            //     param.startDateTime=this.formatDateTime(this.dateRange[0])
+                param.endDateTime=this.formatDateTime(this.dateRange[1])
-            //     param.endDateTime=this.formatDateTime(this.dateRange[1])
+            }else{
-            // }else{
+                param.startDateTime=undefined;
-            //     param.startDateTime=undefined;
+                param.endDateTime=undefined;
-            //     param.endDateTime=undefined;
+            } 
-            // } 
+            stockInoutWarningPageApi(param).then(response => {
-            // supplierBindMaterialListApi(param).then(response => {
+                this.tableListData = response.rows; 
-            //     this.tableListData = response.rows;
+                this.total = Number(response.total);
-            //     this.tableListData.forEach(item=>{
-            //         let arr=[]
-            //         if(item.alternativeSuppliers&&item.alternativeSuppliers.length>0){
-            //             item.alternativeSuppliers.forEach(sub=>{
-            //                 arr.push(sub.supplierId)
-            //             })
-            //         }
-            //         this.$set(item,"supplierIdList",arr)
-            //     }) 
-            //     this.total = Number(response.total);
                 this.loading = false;
-            // });
+            });
         },  
         //-----出入库统计------
         /** 搜索按钮操作 */
@@ -316,13 +306,15 @@ export default {
             let param = {
                 "pageNum": this.queryParams2.pageNum, 
                 "pageSize": this.queryParams2.pageSize, 
-                "materialTypeIds": this.queryParams2.materialTypeIds, 
+                "areaId": this.queryParams2.areaId, 
+                "warehouseId": this.queryParams2.warehouseId, 
+                "materialName": this.queryParams2.materialName
             }
-            // supplierBindMaterialListApi(param).then(response => {
+            stockInoutWarningPageApi(param).then(response => {
-            //     this.tableListData2 = response.rows;
+                this.tableListData2 = response.rows;
-            //     this.total2 = Number(response.total);
+                this.total2 = Number(response.total);
                 this.loading = false;
-            // });
+            });
         }, 
         defaultDateRange() {
           const end = new Date(new Date().toLocaleDateString());

src/views/kitchen/index.vue

@@ -220,7 +220,22 @@ export default {
       }
     },
     getTopData(){ 
-      getHomePageInfoApi({}).then((response) => {
+      let param = {}
+      if(this.dateRange1&&this.dateRange1.length>0){
+        param.deviceStartTime = this.formatDate(this.dateRange1[0])
+        param.deviceEndTime = this.formatDate(this.dateRange1[1])
+      }else{
+        param.deviceStartTime = null
+        param.deviceEndTime = null
+      }
+      if(this.dateRange2&&this.dateRange2.length>0){
+        param.sampleStartTime = this.formatDate(this.dateRange2[0])
+        param.sampleEndTime = this.formatDate(this.dateRange2[1])
+      }else{
+        param.sampleStartTime = null
+        param.sampleEndTime = null
+      }
+      getHomePageInfoApi(param).then((response) => {
         this.informationData = response.data;
         this.topAreaOptions = [{
           "num": response.data.staffCount,
@@ -247,13 +262,10 @@ export default {
       }); 
     },
     changDate1(){ 
-      this.InitEChartsOne()
+      this.getTopData()
       this.myCharts1.resize();
     },
     InitEChartsOne() {
-      console.log(this.dateRange1)
-      console.log(this.formatDate(this.dateRange1[0]))
-      console.log(this.informationData.deviceStatus)
       var chartData=this.informationData.deviceStatus;
       var m2R2Data = []
       var sumNum = 0
@@ -393,11 +405,11 @@ export default {
       // }); 
     },
     changDate2(){
-      this.InitEChartsTwo()
+      this.getTopData()
       this.myCharts2.resize();
     },
     InitEChartsTwo() {
-      console.log(this.dateRange2)
+      // console.log(this.dateRange2)
       var chartData=this.informationData.sampleRetention;
       var m2R2Data = []
       var sumNum = 0