From ee78f156d7b680d7456f6a154ba473d571016a07 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Wed, 29 Mar 2023 18:06:51 +0800
Subject: [PATCH] =?UTF-8?q?2023-3-29=20=E9=94=80=E5=94=AE=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=20=E5=85=A5=E5=BA=93=E6=9F=A5=E8=AF=A2=E3=80=81?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/query/outBound.js                 |  29 +++
 supervise-customer-ui/src/api/query/sales.js  |  15 +-
 .../src/api/supervise/commodityFile.js        |   1 +
 .../src/router/modules/codemenu.js            |   2 +-
 supervise-customer-ui/src/utils/request.js    |  22 ++-
 .../src/views/query/inAndOutBound.vue         | 180 ++++++++----------
 .../src/views/query/sale.vue                  |  90 +++++----
 .../commodity/commodityManagementInfo.vue     |  14 +-
 8 files changed, 195 insertions(+), 158 deletions(-)
 create mode 100644 supervise-customer-ui/src/api/query/outBound.js

diff --git a/supervise-customer-ui/src/api/query/outBound.js b/supervise-customer-ui/src/api/query/outBound.js
new file mode 100644
index 00000000..dc950e2d
--- /dev/null
+++ b/supervise-customer-ui/src/api/query/outBound.js
@@ -0,0 +1,29 @@
+import request from '@/utils/request'
+// 供应商查询
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+        baseURL: '/api',
+      url: '/customer/v1/gdinstoragegd/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  exportExcel: function(params) {
+    return request({
+      baseURL: '/api',
+      url: '/customer/v1/gdinstoragegd/exportExcel',
+      method: 'post',
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+}
diff --git a/supervise-customer-ui/src/api/query/sales.js b/supervise-customer-ui/src/api/query/sales.js
index 20821e74..d4757ff3 100644
--- a/supervise-customer-ui/src/api/query/sales.js
+++ b/supervise-customer-ui/src/api/query/sales.js
@@ -14,4 +14,17 @@ export default {
       }
     })
   },
-}
+
+  exportExcel: function(params) {
+    return request({
+      baseURL: '/api',
+      url: '/customer/v1/gdsales/exportExcel',
+      method: 'post',
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+}
\ No newline at end of file
diff --git a/supervise-customer-ui/src/api/supervise/commodityFile.js b/supervise-customer-ui/src/api/supervise/commodityFile.js
index 60d656be..5843a3a0 100644
--- a/supervise-customer-ui/src/api/supervise/commodityFile.js
+++ b/supervise-customer-ui/src/api/supervise/commodityFile.js
@@ -101,6 +101,7 @@ export default {
   //  商品档案  保存新增记录
   saveCommodity: function(params) {
     return request({
+       baseURL: '/api',
       url: '/customer/v1/productinformation/save',
       method: 'post',
       data: params,
diff --git a/supervise-customer-ui/src/router/modules/codemenu.js b/supervise-customer-ui/src/router/modules/codemenu.js
index c0a2ee56..e2a9743a 100644
--- a/supervise-customer-ui/src/router/modules/codemenu.js
+++ b/supervise-customer-ui/src/router/modules/codemenu.js
@@ -192,7 +192,7 @@ const codemenu = [{
     component: () => import('@/views/query/inAndOutBound.vue'),
     name: 'manufacturerPreference',
     meta: {
-      title: '出入库查询',
+      title: '入库查询',
       noCache: true
     }
   },{
diff --git a/supervise-customer-ui/src/utils/request.js b/supervise-customer-ui/src/utils/request.js
index 0e8707ac..0a274f5d 100644
--- a/supervise-customer-ui/src/utils/request.js
+++ b/supervise-customer-ui/src/utils/request.js
@@ -1,7 +1,13 @@
 import axios from 'axios'
-import { MessageBox, Message } from 'element-ui'
+import {
+  MessageBox,
+  Message
+} from 'element-ui'
 import store from '@/store'
-import { getToken, getStorage } from '@/utils/auth'
+import {
+  getToken,
+  getStorage
+} from '@/utils/auth'
 
 // create an axios instance
 const service = axios.create({
@@ -52,17 +58,19 @@ service.interceptors.response.use(
     const res = response.data
     const statusCode = response.status
 
+    console.log("response>>>", response)
     // if the custom code is not 20000, it is judged as an error.
     if (statusCode !== 200) {
       Message({
-        message: res.msg || response.message || 'Error',
+        message: res.msg || response.message || 'Error11111111111111111',
         type: 'error',
         showClose: true,
         duration: 5 * 1000
       })
 
       // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
-      if (statusCode === 401 || res.code === '5000' || res.code === 5000 || res.code === 50012 || res.code === 50014) {
+      if (statusCode === 401 || res.code === '5000' || res.code === 5000 || res.code === 50012 || res.code ===
+        50014) {
         // to re-login
         MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
           confirmButtonText: '重新登录',
@@ -77,9 +85,9 @@ service.interceptors.response.use(
       }
       return Promise.reject(new Error(res.message || 'Error'))
     } else {
-      if (!res.success) {
+      if (!res.success && res.success !== null && res.success !== undefined) {
         Message({
-          message: res.msg || 'Error',
+          message: res.msg || 'Error2222222222222222',
           type: 'error',
           showClose: true,
           duration: 5 * 1000
@@ -100,4 +108,4 @@ service.interceptors.response.use(
   }
 )
 
-export default service
+export default service
\ No newline at end of file
diff --git a/supervise-customer-ui/src/views/query/inAndOutBound.vue b/supervise-customer-ui/src/views/query/inAndOutBound.vue
index 4145e79c..fb6f2d25 100644
--- a/supervise-customer-ui/src/views/query/inAndOutBound.vue
+++ b/supervise-customer-ui/src/views/query/inAndOutBound.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">
@@ -11,27 +11,18 @@
             <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.colc2" 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.coli8" placeholder="" clearable />
                 </el-form-item>
                 <el-form-item label="起始日期">
-                  <el-date-picker v-model="queryParams.params.orderStartDate" type="date" clearable
+                  <el-date-picker v-model="queryParams.params.startTime" 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
+                  <el-date-picker v-model="queryParams.params.endTime" type="date" clearable
                     value-format="yyyy-MM-dd" placeholder="选择日期" />
                 </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>
               <div class="btn" style="text-align: center;">
                 <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
@@ -43,28 +34,27 @@
           <!-- 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="colc2" width="240" label="仓库/门店名称" align="center" />
+              <el-table-column prop="cold3"  width="200"label="收货时间" align="center" />
+              <el-table-column prop="coli8" label="商品名称" align="center" />
+              <el-table-column prop="coll11"  width="120" label="规格" align="center" />
+              <el-table-column prop="colm12"  width="120" label="类别编号" align="center" />
+              <el-table-column prop="coln13"   width="120"label="类别名称" align="center" />
+              <el-table-column prop="colr17"  width="120" label="数量" align="center" />
             </el-table>
           </div>
 
@@ -83,6 +73,7 @@
 </template>
 
 <script>
+  import req from '@/api/query/outBound'
   import ButtonBar from '@/components/ButtonBar'
   export default {
     components: {
@@ -95,56 +86,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: [{
+         btnList: [{
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'doBuild',
+          btnLabel: '导出'
+        }, {
           type: 'info',
           size: 'small',
           icon: 'cross',
@@ -156,34 +104,20 @@
           size: 10,
           total: 0,
           params: {
-            orderId: '',
-            supplierName: '',
-            auditStatus: '',
-            goodsStatus: '',
-            orderStartDate: '',
-            orderEndDate: '',
-            arrivalStartDate: '',
-            arrivalEndDate: '',
-            queryType: ''
+            colc2: '',
+            coli8: '',
+           startTime: '',
+           endTime: '',
           }
         },
-        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: {
       // 搜索条件效果
@@ -197,6 +131,9 @@
       },
       btnHandle(btnKey) {
         switch (btnKey) {
+          case 'doBuild':
+            this.doBuild()
+            break
           case 'doClose':
             this.doClose()
             break
@@ -237,19 +174,52 @@
           size: 10,
           total: 0,
           params: {
-            orderId: '',
-            supplierName: '',
-            auditStatus: '',
-            goodsStatus: '',
-            orderStartDate: '',
-            orderEndDate: '',
-            arrivalStartDate: '',
-            arrivalEndDate: '',
-            queryType: ''
+            colc2: '',
+             coli8: '',
+            startTime: '',
+            endTime: '',
           }
         }
         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/sale.vue b/supervise-customer-ui/src/views/query/sale.vue
index 4df5e5e6..3b17c6cf 100644
--- a/supervise-customer-ui/src/views/query/sale.vue
+++ b/supervise-customer-ui/src/views/query/sale.vue
@@ -16,15 +16,15 @@
                 <el-form-item label="商品名称">
                   <el-input v-model="queryParams.params.prodName" placeholder="" clearable />
                 </el-form-item>
-               <!-- <el-form-item label="销售渠道">
+                <!-- <el-form-item label="销售渠道">
                   <el-input v-model="queryParams.params.storeCode" placeholder="" clearable />
                 </el-form-item> -->
                 <el-form-item label="销售日期">
-                  <el-date-picker v-model="queryParams.params.startTime" type="date" clearable
-                    value-format="yyyy-MM-dd" placeholder="选择日期" />
+                  <el-date-picker v-model="queryParams.params.startTime" type="date" clearable value-format="yyyy-MM-dd"
+                    placeholder="选择日期" />
                   <span style="padding: 0 8px">至</span>
-                  <el-date-picker v-model="queryParams.params.endTime" type="date" clearable
-                    value-format="yyyy-MM-dd" placeholder="选择日期" />
+                  <el-date-picker v-model="queryParams.params.endTime" type="date" clearable value-format="yyyy-MM-dd"
+                    placeholder="选择日期" />
                 </el-form-item>
               </el-form>
               <div class="btn" style="text-align: center;">
@@ -51,12 +51,13 @@
           <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="orderType" width="120" label="订单类型" align="center" />
-              <el-table-column prop="prodCode" width="120" 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>
@@ -110,9 +111,9 @@
           params: {
             prodCode: '', // 商品编码
             prodName: '', // 商品名称
-            storeCode: '',// 销售渠道
-            brandCode: '',// 品牌代码
-            brandName: '',// 品牌名称
+            storeCode: '', // 销售渠道
+            brandCode: '', // 品牌代码
+            brandName: '', // 品牌名称
             startTime: '',
             endTime: '',
           }
@@ -181,39 +182,54 @@
           size: 10,
           total: 0,
           params: {
-           prodCode: '', // 商品编码
-           prodName: '', // 商品名称
-           storeCode: '',// 销售渠道
-           brandCode: '',// 品牌代码
-           brandName: '',// 品牌名称
-           startTime: '',
-           endTime: '',
+            prodCode: '', // 商品编码
+            prodName: '', // 商品名称
+            storeCode: '', // 销售渠道
+            brandCode: '', // 品牌代码
+            brandName: '', // 品牌名称
+            startTime: '',
+            endTime: '',
           }
         }
         this.loadList()
       },
       // 导出文件
-      exportExcel() {
-        //    axios({
-        //        method: 'get',
-        //        url: 'api/system/v1/systemlogs/exportLogExcel',
-        //        params: this.page,
-        //        responseType: 'blob',
-        //        headers:{'token': getStorage()}
-        //    }).then(response => {
-        //      let blob = new Blob([response.data], {type:"application/vnd.ms-excel"});
-        //      if (!!window.ActiveXObject || "ActiveXObject" in window) {
-        //           window.navigator.msSaveOrOpenBlob(blob, '日志');
-        //      } else {
-        //        let link = document.createElement('a');
-        //        link.href = window.URL.createObjectURL(blob);
-        //        link.download = "日志";
-        //        link.click();
-        //      }
-        //    }).catch((error) => {
+      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)
diff --git a/supervise-customer-ui/src/views/supervise/commodityFile/commodity/commodityManagementInfo.vue b/supervise-customer-ui/src/views/supervise/commodityFile/commodity/commodityManagementInfo.vue
index f6bedcf1..027cd1a5 100644
--- a/supervise-customer-ui/src/views/supervise/commodityFile/commodity/commodityManagementInfo.vue
+++ b/supervise-customer-ui/src/views/supervise/commodityFile/commodity/commodityManagementInfo.vue
@@ -47,18 +47,18 @@
             <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
 
             <el-table-column  prop="code"  label="商品代码" align="center" width="110"/>
-               <el-table-column   prop="name" label="商品名称" align="center" width="110">
+               <el-table-column   prop="name" label="商品名称" align="center">
               <!--   <template slot-scope="scope">
                 <span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.codeUnified }}</span>
               </template> -->
             </el-table-column>
-            <el-table-column prop="category" label="分类" align="center" />
+            <el-table-column prop="category" label="分类" width="110" align="center" />
             <el-table-column prop="brand" label="品牌" align="center" width="100" />
-            <el-table-column prop="newestPurchasePrice" label="进货单价" align="center" width="110" />
-            <el-table-column prop="description" label="规格" align="center" />
-            <el-table-column prop="unit" label="单位" align="center" />
-            <el-table-column prop="manufacturer" label="生成厂家" align="center" />
-            <el-table-column prop="secondCode" label="第二代码" align="center" />
+            <el-table-column prop="newestPurchasePrice" label="进货单价" align="center" width="100" />
+            <el-table-column prop="description" label="规格"  width="110"align="center" />
+            <el-table-column prop="unit" label="单位" align="center"  width="80" />
+            <el-table-column prop="manufacturer" label="生成厂家"   width="150"align="center" />
+            <el-table-column prop="secondCode" label="第二代码"  width="150"align="center" />
             <!-- <el-table-column prop="address" label="审核" align="center" /> -->
             <el-table-column label="操作" align="center" width="180">
               <template slot-scope="scope">