From 560b849873ab62589354f931378720ae4bf5383d Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Thu, 30 Mar 2023 17:11:02 +0800
Subject: [PATCH] =?UTF-8?q?2023-3-30=20=E9=85=8D=E9=80=81=E3=80=81?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E3=80=81=E8=AE=A2=E5=8D=95=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E3=80=81=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/query/distributionCentre.js       |  29 +++
 .../src/api/query/orderCommodity.js           |  29 +++
 supervise-customer-ui/src/api/query/orders.js |  29 +++
 .../src/api/query/outBound.js                 |   2 +-
 .../src/api/query/stockInfo.js                |  29 +++
 .../src/views/query/distributionCentre.vue    | 205 +++++++-----------
 .../src/views/query/orderCommodity.vue        | 190 ++++++----------
 .../src/views/query/orders.vue                | 194 +++++++----------
 .../src/views/query/stockInfo.vue             | 193 +++++++----------
 9 files changed, 421 insertions(+), 479 deletions(-)
 create mode 100644 supervise-customer-ui/src/api/query/distributionCentre.js
 create mode 100644 supervise-customer-ui/src/api/query/orderCommodity.js
 create mode 100644 supervise-customer-ui/src/api/query/orders.js
 create mode 100644 supervise-customer-ui/src/api/query/stockInfo.js

diff --git a/supervise-customer-ui/src/api/query/distributionCentre.js b/supervise-customer-ui/src/api/query/distributionCentre.js
new file mode 100644
index 00000000..1ff21b34
--- /dev/null
+++ b/supervise-customer-ui/src/api/query/distributionCentre.js
@@ -0,0 +1,29 @@
+import request from '@/utils/request'
+// 配送批发查询
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+        baseURL: '/api',
+      url: '/customer/v1/gdwholesalegd/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  exportExcel: function(params) {
+    return request({
+      baseURL: '/api',
+      url: '/customer/v1/gdwholesalegd/exportExcel',
+      method: 'post',
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+}
diff --git a/supervise-customer-ui/src/api/query/orderCommodity.js b/supervise-customer-ui/src/api/query/orderCommodity.js
new file mode 100644
index 00000000..6b811983
--- /dev/null
+++ b/supervise-customer-ui/src/api/query/orderCommodity.js
@@ -0,0 +1,29 @@
+import request from '@/utils/request'
+// 订单商品查询
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+        baseURL: '/api',
+      url: '/customer/v1/purchaserequisitionpro/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  exportExcel: function(params) {
+    return request({
+      baseURL: '/api',
+      url: '/customer/v1/purchaserequisitionpro/exportExcel',
+      method: 'post',
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+}
diff --git a/supervise-customer-ui/src/api/query/orders.js b/supervise-customer-ui/src/api/query/orders.js
new file mode 100644
index 00000000..2066f0ba
--- /dev/null
+++ b/supervise-customer-ui/src/api/query/orders.js
@@ -0,0 +1,29 @@
+import request from '@/utils/request'
+// 订单查询
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+        baseURL: '/api',
+      url: '/customer/v1/purchaserequisition/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  exportExcel: function(params) {
+    return request({
+      baseURL: '/api',
+      url: '/customer/v1/purchaserequisition/exportExcel',
+      method: 'post',
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+}
diff --git a/supervise-customer-ui/src/api/query/outBound.js b/supervise-customer-ui/src/api/query/outBound.js
index dc950e2d..b2fd5d86 100644
--- a/supervise-customer-ui/src/api/query/outBound.js
+++ b/supervise-customer-ui/src/api/query/outBound.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-// 供应商查询
+// 入库查询
 export default {
 
   // 查询分页列表
diff --git a/supervise-customer-ui/src/api/query/stockInfo.js b/supervise-customer-ui/src/api/query/stockInfo.js
new file mode 100644
index 00000000..4c5753ea
--- /dev/null
+++ b/supervise-customer-ui/src/api/query/stockInfo.js
@@ -0,0 +1,29 @@
+import request from '@/utils/request'
+// 库存查询
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+        baseURL: '/api',
+      url: '/customer/v1/gdinventoryok/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  exportExcel: function(params) {
+    return request({
+      baseURL: '/api',
+      url: '/customer/v1/gdinventoryok/exportExcel',
+      method: 'post',
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+}
diff --git a/supervise-customer-ui/src/views/query/distributionCentre.vue b/supervise-customer-ui/src/views/query/distributionCentre.vue
index 8cb92805..13c8cd8a 100644
--- a/supervise-customer-ui/src/views/query/distributionCentre.vue
+++ b/supervise-customer-ui/src/views/query/distributionCentre.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div style="margin-left:16px;">
       <div v-show="viewState == 1">
-        <button-bar ref="btnbar" view-title="配送中心查询" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+        <button-bar ref="btnbar" view-title="配送中心批发查询" :btndisabled="btndisabled" @btnhandle="btnHandle" />
         <div class="main-content">
           <div class="searchcon">
             <el-button size="small" class="searchbtn" @click="clicksearchShow">
@@ -10,44 +10,18 @@
             </el-button>
             <div v-show="isSearchShow" class="search">
               <el-form ref="queryParams" :model="queryParams" :inline="true" class="tab-header">
-                <el-form-item label="订单编号">
-                  <el-input v-model="queryParams.params.orderId" placeholder="" clearable />
+                <el-form-item label="商品编码">
+                  <el-input v-model="queryParams.params.prodCode" placeholder="" clearable />
                 </el-form-item>
-                <el-form-item label="供应商名称">
-                  <el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
+                <el-form-item label="商品名称">
+                  <el-input v-model="queryParams.params.prodName" placeholder="" clearable />
                 </el-form-item>
-                <el-form-item label="审核状态">
-                  <el-select v-model="queryParams.params.auditStatus" filterable placeholder="请选择" clearable>
-                    <el-option v-for="item in audit_list" :key="item.dictKey" :label="item.dictValue"
-                      :value="item.dictKey"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="货物状态">
-                  <el-select v-model="queryParams.params.goodsStatus" filterable placeholder="请选择" clearable>
-                    <el-option v-for="item in goods_list" :key="item.dictKey" :label="item.dictValue"
-                      :value="item.dictKey"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="订单日期">
-                  <el-date-picker v-model="queryParams.params.orderStartDate" type="date" clearable
-                    value-format="yyyy-MM-dd" placeholder="选择日期" />
-                  <span style="padding: 0 8px">至</span>
-                  <el-date-picker v-model="queryParams.params.orderEndDate" type="date" clearable
-                    value-format="yyyy-MM-dd" placeholder="选择日期" />
-                </el-form-item>
-                <el-form-item label="到货日期">
-                  <el-date-picker v-model="queryParams.params.arrivalStartDate" type="date" clearable
-                    value-format="yyyy-MM-dd" placeholder="选择日期" />
+                <el-form-item label="销售日期">
+                  <el-date-picker v-model="queryParams.params.startDate" type="date" clearable value-format="yyyy-MM-dd"
+                    placeholder="选择日期" />
                   <span style="padding: 0 8px">至</span>
-                  <el-date-picker v-model="queryParams.params.arrivalEndDate" type="date" clearable
-                    value-format="yyyy-MM-dd" placeholder="选择日期" />
-                </el-form-item>
-                <el-form-item label="查询方式">
-                  <el-select v-model="queryParams.queryType" filterable placeholder="全部" clearable>
-                    <el-option v-for="item in query_list" :key="item.dictKey" :label="item.dictValue"
-                      :value="item.dictKey">
-                    </el-option>
-                  </el-select>
+                  <el-date-picker v-model="queryParams.params.endDate" type="date" clearable value-format="yyyy-MM-dd"
+                    placeholder="选择日期" />
                 </el-form-item>
               </el-form>
               <div class="btn" style="text-align: center;">
@@ -60,28 +34,29 @@
           <!-- Start 项目列表头部 -->
           <div class="listtop"
             style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
-            <div class="tit">订单明细表</div>
-            <div>
+            <div class="tit">配送中心批发列表</div>
+            <!-- <div>
 
               <span style="padding-right: 20px">商品种类数量：{{pages.num}}个</span>
               <span style="padding-right: 20px">订单金额合计：{{pages.totalPrice}}元</span>
               <span style="padding-right: 20px">到货货值合计：{{pages.arrivalPrice}}元</span>
               <span style="padding-right: 20px">在途货值合计：{{pages.inTransitPrice}}元</span>
 
-            </div>
+            </div> -->
           </div>
 
           <div style="margin-top: 30px;">
             <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
               <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
-              <el-table-column prop="goodsStatus" label="货物状态" align="center" />
-              <el-table-column prop="orderId" label="订单编号" align="center" />
-              <el-table-column prop="supplierName" label="供应商名称" align="center" />
-              <el-table-column prop="orderPrice" label="订单金额" align="center" />
-              <el-table-column prop="arrivalPrice" label="到货货值" align="center" />
-              <el-table-column prop="inTransitPrice" label="在途货值" align="center" />
-              <el-table-column prop="orderDate" label="订单日期" align="center" />
-              <el-table-column prop="arrivalDate" label="到货日期" align="center" />
+              <el-table-column prop="orderType" width="100" label="订单类型" align="center" />
+              <el-table-column prop="prodCode" width="140" label="商品编码" align="center" />
+              <el-table-column prop="prodName" label="商品名称" align="center" />
+              <el-table-column prop="brandCode" width="100" label="品牌代码" align="center" />
+              <el-table-column prop="brandName" width="180" label="品牌名称" align="center" />
+              <el-table-column prop="saleNum" width="100" label="销售数量" align="center" />
+              <el-table-column prop="total" width="100" label="销售总价" align="center" />
+              <el-table-column prop="storeName" width="200" label="销售渠道" align="center" />
+              <el-table-column prop="dataDate" width="150" label="销售日期" align="center" />
             </el-table>
           </div>
 
@@ -100,6 +75,7 @@
 </template>
 
 <script>
+  import req from '@/api/query/distributionCentre'
   import ButtonBar from '@/components/ButtonBar'
   export default {
     components: {
@@ -112,56 +88,13 @@
         isSearchShow: false,
         searchxianshitit: '显示查询条件',
         tableLoading: false,
-        pages: {
-          num: 2,
-          totalPrice: 123546516,
-          arrivalPrice: 2,
-          inTransitPrice: 1985616
-        },
-        audit_list: [{
-            dictKey: 0,
-            dictValue: '全部'
-          },
-          {
-            dictKey: 1,
-            dictValue: '待审核'
-          },
-          {
-            dictKey: 2,
-            dictValue: '通过'
-          },
-          {
-            dictKey: 3,
-            dictValue: '拒绝'
-          }
-        ],
-        goods_list: [{
-            dictKey: 0,
-            dictValue: '全部'
-          },
-          {
-            dictKey: 1,
-            dictValue: '在途'
-          },
-          {
-            dictKey: 2,
-            dictValue: '到货'
-          }
-        ],
-        query_list: [{
-            dictKey: 0,
-            dictValue: '全部'
-          },
-          {
-            dictKey: 1,
-            dictValue: '按供应商'
-          },
-          {
-            dictKey: 2,
-            dictValue: '按订单'
-          }
-        ],
         btnList: [{
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'doBuild',
+          btnLabel: '导出'
+        }, {
           type: 'info',
           size: 'small',
           icon: 'cross',
@@ -173,34 +106,20 @@
           size: 10,
           total: 0,
           params: {
-            orderId: '',
-            supplierName: '',
-            auditStatus: '',
-            goodsStatus: '',
-            orderStartDate: '',
-            orderEndDate: '',
-            arrivalStartDate: '',
-            arrivalEndDate: '',
-            queryType: ''
+            prodCode: '',
+            prodName: '',
+            startDate: '',
+            endDate: ''
           }
         },
-        dataList: [{
-          goodsStatus: '全部',
-          orderId: 'S4ZR02111003',
-          supplierName: '[6143301]石家庄舶来品商贸有限公司',
-          orderPrice: '120130',
-          arrivalPrice: '0',
-          inTransitPrice: '120130',
-          orderDate: '2022-11-26',
-          arrivalDate: '2022-11-26',
-        }, ]
+        dataList: []
       }
     },
     mounted() {
       this.$refs['btnbar'].setButtonList(this.btnList)
     },
     created() {
-      // this.loadList()
+      this.loadList()
     },
     methods: {
       // 搜索条件效果
@@ -214,6 +133,9 @@
       },
       btnHandle(btnKey) {
         switch (btnKey) {
+          case 'doBuild':
+            this.doBuild()
+            break
           case 'doClose':
             this.doClose()
             break
@@ -254,19 +176,52 @@
           size: 10,
           total: 0,
           params: {
-            orderId: '',
-            supplierName: '',
-            auditStatus: '',
-            goodsStatus: '',
-            orderStartDate: '',
-            orderEndDate: '',
-            arrivalStartDate: '',
-            arrivalEndDate: '',
-            queryType: ''
+            prodCode: '',
+            prodName: '',
+            startDate: '',
+            endDate: ''
           }
         }
         this.loadList()
       },
+      // 导出文件
+      doBuild() {
+
+        if (this.dataList.length == 0) {
+          this.$message({
+            message: '暂无数据可导出！',
+            type: 'warning',
+            duration: 1000
+          });
+          return
+        }
+
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
+        req.exportExcel(this.queryParams).then((resp) => {
+          loading.close()
+          const blob = new Blob([resp], {
+            type: 'application/vnd.ms-excel;charset=UTF-8'
+          })
+          const fileName = '配送中心批发列表' + '.xls'
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.style.display = 'nonde'
+          elink.href = URL.createObjectURL(blob)
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href)
+          document.body.removeChild(elink)
+        }).catch(() => {
+          loading.close()
+        })
+
+      },
       doClose() {
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)
diff --git a/supervise-customer-ui/src/views/query/orderCommodity.vue b/supervise-customer-ui/src/views/query/orderCommodity.vue
index cc1247f2..977cb40b 100644
--- a/supervise-customer-ui/src/views/query/orderCommodity.vue
+++ b/supervise-customer-ui/src/views/query/orderCommodity.vue
@@ -10,35 +10,14 @@
             </el-button>
             <div v-show="isSearchShow" class="search">
               <el-form ref="queryParams" :model="queryParams" :inline="true" class="tab-header">
+                <el-form-item label="订单编号">
+                  <el-input v-model="queryParams.params.code" placeholder="" clearable />
+                </el-form-item>
                 <el-form-item label="商品名称">
-                  <el-input v-model="queryParams.params.orderId" placeholder="" clearable />
+                  <el-input v-model="queryParams.params.proName" placeholder="" clearable />
                 </el-form-item>
                 <el-form-item label="商品编码">
-                  <el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
-                </el-form-item>
-                <el-form-item label="商品条码">
-                  <el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
-                </el-form-item>
-                <el-form-item label="仓店名称">
-                  <el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
-                </el-form-item>
-                <el-form-item label="类别名称">
-                  <el-select v-model="queryParams.params.auditStatus" filterable placeholder="请选择" clearable>
-                    <el-option v-for="item in audit_list" :key="item.dictKey" :label="item.dictValue"
-                      :value="item.dictKey"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="一级类别">
-                  <el-select v-model="queryParams.params.goodsStatus" filterable placeholder="请选择" clearable>
-                    <el-option v-for="item in goods_list" :key="item.dictKey" :label="item.dictValue"
-                      :value="item.dictKey"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="二级类别">
-                  <el-select v-model="queryParams.params.goodsStatus" filterable placeholder="请选择" clearable>
-                    <el-option v-for="item in goods_list" :key="item.dictKey" :label="item.dictValue"
-                      :value="item.dictKey"></el-option>
-                  </el-select>
+                  <el-input v-model="queryParams.params.proCode" placeholder="" clearable />
                 </el-form-item>
               </el-form>
               <div class="btn" style="text-align: center;">
@@ -51,28 +30,19 @@
           <!-- Start 项目列表头部 -->
           <div class="listtop"
             style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
-            <div class="tit">订单明细表</div>
-            <div>
-
-              <span style="padding-right: 20px">商品种类数量：{{pages.num}}个</span>
-              <span style="padding-right: 20px">订单金额合计：{{pages.totalPrice}}元</span>
-              <span style="padding-right: 20px">到货货值合计：{{pages.arrivalPrice}}元</span>
-              <span style="padding-right: 20px">在途货值合计：{{pages.inTransitPrice}}元</span>
-
-            </div>
+            <div class="tit">订单商品明细表</div>
           </div>
 
           <div style="margin-top: 30px;">
             <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
               <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
-              <el-table-column prop="goodsStatus" label="货物状态" align="center" />
-              <el-table-column prop="orderId" label="订单编号" align="center" />
-              <el-table-column prop="supplierName" label="供应商名称" align="center" />
-              <el-table-column prop="orderPrice" label="订单金额" align="center" />
-              <el-table-column prop="arrivalPrice" label="到货货值" align="center" />
-              <el-table-column prop="inTransitPrice" label="在途货值" align="center" />
-              <el-table-column prop="orderDate" label="订单日期" align="center" />
-              <el-table-column prop="arrivalDate" label="到货日期" align="center" />
+              <el-table-column prop="code" width="180"  label="订单编号" align="center" />
+              <el-table-column prop="proCode" width="150" label="商品编码" align="center" />
+              <el-table-column prop="proName"   label="商品名称" align="center" />
+              <el-table-column prop="categoryKey"  width="120"  label="类别编码" align="center" />
+              <el-table-column prop="category" width="180"  label="分类名称" align="center" />
+              <el-table-column prop="number" width="100"  label="商品数量" align="center" />
+              <el-table-column prop="totalPrice" width="120"  label="商品货值" align="center" />
             </el-table>
           </div>
 
@@ -91,6 +61,7 @@
 </template>
 
 <script>
+  import req from '@/api/query/orderCommodity'
   import ButtonBar from '@/components/ButtonBar'
   export default {
     components: {
@@ -103,56 +74,13 @@
         isSearchShow: false,
         searchxianshitit: '显示查询条件',
         tableLoading: false,
-        pages: {
-          num: 2,
-          totalPrice: 123546516,
-          arrivalPrice: 2,
-          inTransitPrice: 1985616
-        },
-        audit_list: [{
-            dictKey: 0,
-            dictValue: '全部'
-          },
-          {
-            dictKey: 1,
-            dictValue: '待审核'
-          },
-          {
-            dictKey: 2,
-            dictValue: '通过'
-          },
-          {
-            dictKey: 3,
-            dictValue: '拒绝'
-          }
-        ],
-        goods_list: [{
-            dictKey: 0,
-            dictValue: '全部'
-          },
-          {
-            dictKey: 1,
-            dictValue: '在途'
-          },
-          {
-            dictKey: 2,
-            dictValue: '到货'
-          }
-        ],
-        query_list: [{
-            dictKey: 0,
-            dictValue: '全部'
-          },
-          {
-            dictKey: 1,
-            dictValue: '按供应商'
-          },
-          {
-            dictKey: 2,
-            dictValue: '按订单'
-          }
-        ],
         btnList: [{
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'doBuild',
+          btnLabel: '导出'
+        }, {
           type: 'info',
           size: 'small',
           icon: 'cross',
@@ -164,34 +92,19 @@
           size: 10,
           total: 0,
           params: {
-            orderId: '',
-            supplierName: '',
-            auditStatus: '',
-            goodsStatus: '',
-            orderStartDate: '',
-            orderEndDate: '',
-            arrivalStartDate: '',
-            arrivalEndDate: '',
-            queryType: ''
+            code: '',
+            proName: '',
+            proCode: "",
           }
         },
-        dataList: [{
-          goodsStatus: '全部',
-          orderId: 'S4ZR02111003',
-          supplierName: '[6143301]石家庄舶来品商贸有限公司',
-          orderPrice: '120130',
-          arrivalPrice: '0',
-          inTransitPrice: '120130',
-          orderDate: '2022-11-26',
-          arrivalDate: '2022-11-26',
-        }, ]
+        dataList: []
       }
     },
     mounted() {
       this.$refs['btnbar'].setButtonList(this.btnList)
     },
     created() {
-      // this.loadList()
+      this.loadList()
     },
     methods: {
       // 搜索条件效果
@@ -205,6 +118,9 @@
       },
       btnHandle(btnKey) {
         switch (btnKey) {
+          case 'doBuild':
+            this.doBuild()
+            break
           case 'doClose':
             this.doClose()
             break
@@ -245,19 +161,51 @@
           size: 10,
           total: 0,
           params: {
-            orderId: '',
-            supplierName: '',
-            auditStatus: '',
-            goodsStatus: '',
-            orderStartDate: '',
-            orderEndDate: '',
-            arrivalStartDate: '',
-            arrivalEndDate: '',
-            queryType: ''
+          code: '',
+          proName: '',
+          proCode: "",
           }
         }
         this.loadList()
       },
+      // 导出文件
+      doBuild() {
+
+        if (this.dataList.length == 0) {
+          this.$message({
+            message: '暂无数据可导出！',
+            type: 'warning',
+            duration: 1000
+          });
+          return
+        }
+
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
+        req.exportExcel(this.queryParams).then((resp) => {
+          loading.close()
+          const blob = new Blob([resp], {
+            type: 'application/vnd.ms-excel;charset=UTF-8'
+          })
+          const fileName = '订单商品列表' + '.xls'
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.style.display = 'nonde'
+          elink.href = URL.createObjectURL(blob)
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href)
+          document.body.removeChild(elink)
+        }).catch(() => {
+          loading.close()
+        })
+
+      },
       doClose() {
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)
diff --git a/supervise-customer-ui/src/views/query/orders.vue b/supervise-customer-ui/src/views/query/orders.vue
index 2b20c727..7f6abed2 100644
--- a/supervise-customer-ui/src/views/query/orders.vue
+++ b/supervise-customer-ui/src/views/query/orders.vue
@@ -11,43 +11,21 @@
             <div v-show="isSearchShow" class="search">
               <el-form ref="queryParams" :model="queryParams" :inline="true" class="tab-header">
                 <el-form-item label="订单编号">
-                  <el-input v-model="queryParams.params.orderId" placeholder="" clearable />
+                  <el-input v-model="queryParams.params.code" placeholder="" clearable />
                 </el-form-item>
                 <el-form-item label="供应商名称">
                   <el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
                 </el-form-item>
-                <el-form-item label="审核状态">
-                  <el-select v-model="queryParams.params.auditStatus" filterable placeholder="请选择" clearable>
-                    <el-option v-for="item in audit_list" :key="item.dictKey" :label="item.dictValue"
-                      :value="item.dictKey"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="货物状态">
-                  <el-select v-model="queryParams.params.goodsStatus" filterable placeholder="请选择" clearable>
-                    <el-option v-for="item in goods_list" :key="item.dictKey" :label="item.dictValue"
-                      :value="item.dictKey"></el-option>
-                  </el-select>
+                <el-form-item label="供应商编号">
+                  <el-input v-model="queryParams.params.supplierOnlyCode" placeholder="" clearable />
                 </el-form-item>
                 <el-form-item label="订单日期">
-                  <el-date-picker v-model="queryParams.params.orderStartDate" type="date" clearable
-                    value-format="yyyy-MM-dd" placeholder="选择日期" />
-                  <span style="padding: 0 8px">至</span>
-                  <el-date-picker v-model="queryParams.params.orderEndDate" type="date" clearable
-                    value-format="yyyy-MM-dd" placeholder="选择日期" />
-                </el-form-item>
-                <el-form-item label="到货日期">
-                  <el-date-picker v-model="queryParams.params.arrivalStartDate" type="date" clearable
-                    value-format="yyyy-MM-dd" placeholder="选择日期" />
+                  <el-date-picker v-model="queryParams.params.startDate" type="date" clearable value-format="yyyy-MM-dd"
+                    placeholder="选择日期" />
                   <span style="padding: 0 8px">至</span>
-                  <el-date-picker v-model="queryParams.params.arrivalEndDate" type="date" clearable
-                    value-format="yyyy-MM-dd" placeholder="选择日期" />
+                  <el-date-picker v-model="queryParams.params.endDate" type="date" clearable value-format="yyyy-MM-dd"
+                    placeholder="选择日期" />
                 </el-form-item>
-                <el-form-item label="查询方式">
-                  <el-select v-model="queryParams.queryType" filterable placeholder="全部" clearable>
-                    <el-option v-for="item in query_list" :key="item.dictKey" :label="item.dictValue"
-                      :value="item.dictKey">
-                    </el-option>
-                  </el-select>
                 </el-form-item>
               </el-form>
               <div class="btn" style="text-align: center;">
@@ -61,27 +39,18 @@
           <div class="listtop"
             style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
             <div class="tit">订单明细表</div>
-            <div>
-
-              <span style="padding-right: 20px">商品种类数量：{{pages.num}}个</span>
-              <span style="padding-right: 20px">订单金额合计：{{pages.totalPrice}}元</span>
-              <span style="padding-right: 20px">到货货值合计：{{pages.arrivalPrice}}元</span>
-              <span style="padding-right: 20px">在途货值合计：{{pages.inTransitPrice}}元</span>
-
-            </div>
           </div>
 
           <div style="margin-top: 30px;">
             <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
               <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
-              <el-table-column prop="goodsStatus" label="货物状态" align="center" />
-              <el-table-column prop="orderId" label="订单编号" align="center" />
+              <el-table-column prop="code" width="200" label="订单编号" align="center" />
               <el-table-column prop="supplierName" label="供应商名称" align="center" />
-              <el-table-column prop="orderPrice" label="订单金额" align="center" />
-              <el-table-column prop="arrivalPrice" label="到货货值" align="center" />
-              <el-table-column prop="inTransitPrice" label="在途货值" align="center" />
-              <el-table-column prop="orderDate" label="订单日期" align="center" />
-              <el-table-column prop="arrivalDate" label="到货日期" align="center" />
+              <el-table-column prop="supplierOnlyCode" width="120" label="唯一编码" align="center" />
+              <el-table-column prop="supplierCode" width="120" label="第二代码" align="center" />
+              <el-table-column prop="createTime" width="200" label="订单日期" align="center" />
+              <el-table-column prop="purchaseDate" width="200" label="采购日期" align="center" />
+              <el-table-column prop="arrivalDate" width="150" label="到货日期" align="center" />
             </el-table>
           </div>
 
@@ -100,6 +69,7 @@
 </template>
 
 <script>
+  import req from '@/api/query/orders'
   import ButtonBar from '@/components/ButtonBar'
   export default {
     components: {
@@ -112,56 +82,14 @@
         isSearchShow: false,
         searchxianshitit: '显示查询条件',
         tableLoading: false,
-        pages: {
-          num: 2,
-          totalPrice: 123546516,
-          arrivalPrice: 2,
-          inTransitPrice: 1985616
-        },
-        audit_list: [{
-            dictKey: 0,
-            dictValue: '全部'
-          },
-          {
-            dictKey: 1,
-            dictValue: '待审核'
-          },
-          {
-            dictKey: 2,
-            dictValue: '通过'
-          },
-          {
-            dictKey: 3,
-            dictValue: '拒绝'
-          }
-        ],
-        goods_list: [{
-            dictKey: 0,
-            dictValue: '全部'
-          },
-          {
-            dictKey: 1,
-            dictValue: '在途'
-          },
-          {
-            dictKey: 2,
-            dictValue: '到货'
-          }
-        ],
-        query_list: [{
-            dictKey: 0,
-            dictValue: '全部'
-          },
-          {
-            dictKey: 1,
-            dictValue: '按供应商'
-          },
-          {
-            dictKey: 2,
-            dictValue: '按订单'
-          }
-        ],
+
         btnList: [{
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'doBuild',
+          btnLabel: '导出'
+        }, {
           type: 'info',
           size: 'small',
           icon: 'cross',
@@ -173,34 +101,21 @@
           size: 10,
           total: 0,
           params: {
-            orderId: '',
+            code: '',
             supplierName: '',
-            auditStatus: '',
-            goodsStatus: '',
-            orderStartDate: '',
-            orderEndDate: '',
-            arrivalStartDate: '',
-            arrivalEndDate: '',
-            queryType: ''
+            supplierOnlyCode: "",
+            startDate: '',
+            endDate: '',
           }
         },
-        dataList: [{
-          goodsStatus: '全部',
-          orderId: 'S4ZR02111003',
-          supplierName: '[6143301]石家庄舶来品商贸有限公司',
-          orderPrice: '120130',
-          arrivalPrice: '0',
-          inTransitPrice: '120130',
-          orderDate: '2022-11-26',
-          arrivalDate: '2022-11-26',
-        }, ]
+        dataList: []
       }
     },
     mounted() {
       this.$refs['btnbar'].setButtonList(this.btnList)
     },
     created() {
-      // this.loadList()
+      this.loadList()
     },
     methods: {
       // 搜索条件效果
@@ -214,6 +129,9 @@
       },
       btnHandle(btnKey) {
         switch (btnKey) {
+          case 'doBuild':
+            this.doBuild()
+            break
           case 'doClose':
             this.doClose()
             break
@@ -254,19 +172,53 @@
           size: 10,
           total: 0,
           params: {
-            orderId: '',
-            supplierName: '',
-            auditStatus: '',
-            goodsStatus: '',
-            orderStartDate: '',
-            orderEndDate: '',
-            arrivalStartDate: '',
-            arrivalEndDate: '',
-            queryType: ''
+           code: '',
+           supplierName: '',
+           supplierOnlyCode: "",
+           startDate: '',
+           endDate: '',
           }
         }
         this.loadList()
       },
+      // 导出文件
+      doBuild() {
+
+        if (this.dataList.length == 0) {
+          this.$message({
+            message: '暂无数据可导出！',
+            type: 'warning',
+            duration: 1000
+          });
+          return
+        }
+
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
+        req.exportExcel(this.queryParams).then((resp) => {
+          loading.close()
+          const blob = new Blob([resp], {
+            type: 'application/vnd.ms-excel;charset=UTF-8'
+          })
+          const fileName = '库存明细列表' + '.xls'
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.style.display = 'nonde'
+          elink.href = URL.createObjectURL(blob)
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href)
+          document.body.removeChild(elink)
+        }).catch(() => {
+          loading.close()
+        })
+
+      },
       doClose() {
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)
diff --git a/supervise-customer-ui/src/views/query/stockInfo.vue b/supervise-customer-ui/src/views/query/stockInfo.vue
index 50322726..d67565c0 100644
--- a/supervise-customer-ui/src/views/query/stockInfo.vue
+++ b/supervise-customer-ui/src/views/query/stockInfo.vue
@@ -11,32 +11,20 @@
             <div v-show="isSearchShow" class="search">
               <el-form ref="queryParams" :model="queryParams" :inline="true" class="tab-header">
                 <el-form-item label="仓库/门店">
-                  <el-input v-model="queryParams.params.orderId" placeholder="" clearable />
-                </el-form-item>
-                <el-form-item label="单据类型">
-                  <el-select v-model="queryParams.params.auditStatus" filterable placeholder="请选择" clearable>
-                    <el-option v-for="item in audit_list" :key="item.dictKey" :label="item.dictValue"
-                      :value="item.dictKey"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="起始日期">
-                  <el-date-picker v-model="queryParams.params.orderStartDate" type="date" clearable
-                    value-format="yyyy-MM-dd" placeholder="选择日期" />
-                  <span style="padding: 0 8px">至</span>
-                  <el-date-picker v-model="queryParams.params.orderEndDate" type="date" clearable
-                    value-format="yyyy-MM-dd" placeholder="选择日期" />
+                  <el-input v-model="queryParams.params.warehouseName" placeholder="" clearable />
                 </el-form-item>
                 <el-form-item label="商品名称">
-                  <el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
+                  <el-input v-model="queryParams.params.prodName" placeholder="" clearable />
                 </el-form-item>
                 <el-form-item label="商品编码">
-                  <el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
+                  <el-input v-model="queryParams.params.prodCode" placeholder="" clearable />
                 </el-form-item>
-                <el-form-item label="商品类别">
-                  <el-select v-model="queryParams.params.goodsStatus" filterable placeholder="请选择" clearable>
-                    <el-option v-for="item in goods_list" :key="item.dictKey" :label="item.dictValue"
-                      :value="item.dictKey"></el-option>
-                  </el-select>
+                <el-form-item label="数据日期">
+                  <el-date-picker v-model="queryParams.params.startDate" type="date" clearable
+                    value-format="yyyy-MM-dd" placeholder="选择日期" />
+                  <span style="padding: 0 8px">至</span>
+                  <el-date-picker v-model="queryParams.params.endDate" type="date" clearable
+                    value-format="yyyy-MM-dd" placeholder="选择日期" />
                 </el-form-item>
               </el-form>
               <div class="btn" style="text-align: center;">
@@ -49,28 +37,28 @@
           <!-- Start 项目列表头部 -->
           <div class="listtop"
             style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
-            <div class="tit">订单明细表</div>
-            <div>
+            <div class="tit">库存明细表</div>
+           <!-- <div>
 
               <span style="padding-right: 20px">商品种类数量：{{pages.num}}个</span>
               <span style="padding-right: 20px">订单金额合计：{{pages.totalPrice}}元</span>
               <span style="padding-right: 20px">到货货值合计：{{pages.arrivalPrice}}元</span>
               <span style="padding-right: 20px">在途货值合计：{{pages.inTransitPrice}}元</span>
 
-            </div>
+            </div> -->
           </div>
 
           <div style="margin-top: 30px;">
             <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
               <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
-              <el-table-column prop="goodsStatus" label="货物状态" align="center" />
-              <el-table-column prop="orderId" label="订单编号" align="center" />
-              <el-table-column prop="supplierName" label="供应商名称" align="center" />
-              <el-table-column prop="orderPrice" label="订单金额" align="center" />
-              <el-table-column prop="arrivalPrice" label="到货货值" align="center" />
-              <el-table-column prop="inTransitPrice" label="在途货值" align="center" />
-              <el-table-column prop="orderDate" label="订单日期" align="center" />
-              <el-table-column prop="arrivalDate" label="到货日期" align="center" />
+              <el-table-column prop="warehouseCode" width="100"  label="仓库编号" align="center" />
+              <el-table-column prop="warehouseName" width="150" label="仓库名称" align="center" />
+              <el-table-column prop="prodCode" width="120"  label="商品编码" align="center" />
+              <el-table-column prop="prodName" label="商品名称" align="center" />
+              <el-table-column prop="prodNum" width="100"  label="商品数量" align="center" />
+              <el-table-column prop="prodValue" width="100" label="商品货值" align="center" />
+              <el-table-column prop="suppliderName" label="供应商" align="center" />
+              <el-table-column prop="dataDate" width="150" label="数据日期" align="center" />
             </el-table>
           </div>
 
@@ -89,6 +77,7 @@
 </template>
 
 <script>
+   import req from '@/api/query/stockInfo'
   import ButtonBar from '@/components/ButtonBar'
   export default {
     components: {
@@ -101,56 +90,14 @@
         isSearchShow: false,
         searchxianshitit: '显示查询条件',
         tableLoading: false,
-        pages: {
-          num: 2,
-          totalPrice: 123546516,
-          arrivalPrice: 2,
-          inTransitPrice: 1985616
-        },
-        audit_list: [{
-            dictKey: 0,
-            dictValue: '全部'
-          },
-          {
-            dictKey: 1,
-            dictValue: '待审核'
-          },
-          {
-            dictKey: 2,
-            dictValue: '通过'
-          },
-          {
-            dictKey: 3,
-            dictValue: '拒绝'
-          }
-        ],
-        goods_list: [{
-            dictKey: 0,
-            dictValue: '全部'
-          },
-          {
-            dictKey: 1,
-            dictValue: '在途'
-          },
-          {
-            dictKey: 2,
-            dictValue: '到货'
-          }
-        ],
-        query_list: [{
-            dictKey: 0,
-            dictValue: '全部'
-          },
-          {
-            dictKey: 1,
-            dictValue: '按供应商'
-          },
-          {
-            dictKey: 2,
-            dictValue: '按订单'
-          }
-        ],
-        btnList: [{
+     btnList: [
+       {
+         type: 'success',
+         size: 'small',
+         icon: 'export',
+         btnKey: 'doBuild',
+         btnLabel: '导出'
+       },{
           type: 'info',
           size: 'small',
           icon: 'cross',
@@ -162,34 +109,21 @@
           size: 10,
           total: 0,
           params: {
-            orderId: '',
-            supplierName: '',
-            auditStatus: '',
-            goodsStatus: '',
-            orderStartDate: '',
-            orderEndDate: '',
-            arrivalStartDate: '',
-            arrivalEndDate: '',
-            queryType: ''
+            warehouseName: '',
+            prodName: '',
+            prodCode: '',
+            startDate: '',
+            endDate: '',
           }
         },
-        dataList: [{
-          goodsStatus: '全部',
-          orderId: 'S4ZR02111003',
-          supplierName: '[6143301]石家庄舶来品商贸有限公司',
-          orderPrice: '120130',
-          arrivalPrice: '0',
-          inTransitPrice: '120130',
-          orderDate: '2022-11-26',
-          arrivalDate: '2022-11-26',
-        }, ]
+        dataList: []
       }
     },
     mounted() {
       this.$refs['btnbar'].setButtonList(this.btnList)
     },
     created() {
-      // this.loadList()
+      this.loadList()
     },
     methods: {
       // 搜索条件效果
@@ -203,6 +137,9 @@
       },
       btnHandle(btnKey) {
         switch (btnKey) {
+          case 'doBuild':
+            this.doBuild()
+            break
           case 'doClose':
             this.doClose()
             break
@@ -243,19 +180,53 @@
           size: 10,
           total: 0,
           params: {
-            orderId: '',
-            supplierName: '',
-            auditStatus: '',
-            goodsStatus: '',
-            orderStartDate: '',
-            orderEndDate: '',
-            arrivalStartDate: '',
-            arrivalEndDate: '',
-            queryType: ''
+            warehouseName: '',
+            prodName: '',
+            prodCode: '',
+            startDate: '',
+            endDate: '',
           }
         }
         this.loadList()
       },
+      // 导出文件
+      doBuild() {
+
+        if (this.dataList.length == 0) {
+          this.$message({
+            message: '暂无数据可导出！',
+            type: 'warning',
+            duration: 1000
+          });
+          return
+        }
+
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
+        req.exportExcel(this.queryParams).then((resp) => {
+          loading.close()
+          const blob = new Blob([resp], {
+            type: 'application/vnd.ms-excel;charset=UTF-8'
+          })
+          const fileName = '库存明细列表' + '.xls'
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.style.display = 'nonde'
+          elink.href = URL.createObjectURL(blob)
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href)
+          document.body.removeChild(elink)
+        }).catch(() => {
+          loading.close()
+        })
+
+      },
       doClose() {
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)