修改测试遇到的问题

.env.development

@@ -7,5 +7,5 @@ VUE_APP_BASE_API = '/api'
 ## 配置测试和本地开发时的 接口地址
 
 ##VUE_APP_URL = "http://127.0.0.1:4523/m1/4061550-0-default"
-VUE_APP_URL = "http://192.168.0.127:8113"
+VUE_APP_URL = "http://192.168.0.121:8113"
 ##VUE_APP_URL = "https://oms.yxtsoft.com"

src/api/goods/goods.js

@@ -78,6 +78,21 @@ export default {
     })
   },
 
+
+  // 确定导入商品
+  batchSave: function(params) {
+    return request({
+      url: '/oms/apiadmin/base/basegoodsspu/batchSave?orgPath=' + params.orgPath,
+      method: 'post',
+      data: params.data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+
+
   // 查询商品分页列表
   getGoodsListAllByOrg: function(params) {
     return request({

src/api/statistics/cusmoterSale.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+//  报表查询  客户销售
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/oms/v1/smssalesbill/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 选择商品
+  chooseProducts: function(params) {
+    return request({
+      url: '/oms/apiadmin/base/basegoodsspu/getGoodsForSales',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  fetchBySid: function(data) {
+    return request({
+      url: '/oms/v1/smssalesbill/fetchDetailsBySid/' + data,
+      method: 'get'
+    })
+  },
+  deleteBySids: function(data) {
+    return request({
+      url: '/oms/v1/smssalesbill/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  saveOrUpdate: function(data) {
+    return request({
+      url: '/oms/v1/smssalesbill/save',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  submit: function(data) {
+    return request({
+      url: '/oms/v1/smssalesbill/submit',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  }
+}

src/api/statistics/goodsPurchase.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+//  报表查询  商品采购
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/oms/v1/smssalesbill/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 选择商品
+  chooseProducts: function(params) {
+    return request({
+      url: '/oms/apiadmin/base/basegoodsspu/getGoodsForSales',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  fetchBySid: function(data) {
+    return request({
+      url: '/oms/v1/smssalesbill/fetchDetailsBySid/' + data,
+      method: 'get'
+    })
+  },
+  deleteBySids: function(data) {
+    return request({
+      url: '/oms/v1/smssalesbill/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  saveOrUpdate: function(data) {
+    return request({
+      url: '/oms/v1/smssalesbill/save',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  submit: function(data) {
+    return request({
+      url: '/oms/v1/smssalesbill/submit',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  }
+}

src/api/statistics/goodsSale.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+//  报表查询  商品销售
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/oms/v1/smssalesbill/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 选择商品
+  chooseProducts: function(params) {
+    return request({
+      url: '/oms/apiadmin/base/basegoodsspu/getGoodsForSales',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  fetchBySid: function(data) {
+    return request({
+      url: '/oms/v1/smssalesbill/fetchDetailsBySid/' + data,
+      method: 'get'
+    })
+  },
+  deleteBySids: function(data) {
+    return request({
+      url: '/oms/v1/smssalesbill/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  saveOrUpdate: function(data) {
+    return request({
+      url: '/oms/v1/smssalesbill/save',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  submit: function(data) {
+    return request({
+      url: '/oms/v1/smssalesbill/submit',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  }
+}

src/router/index.js

@@ -202,6 +202,44 @@ export const constantRoutes = [
       }
     }]
   },
+
+  {
+    path: '/statistics',
+    component: Layout,
+    redirect: '/statistics',
+    meta: {
+      title: '统计报表'
+    },
+    children: [{
+        path: '/cusmoterSale/cusmoterSale',
+        component: () => import('@/views/statistics/cusmoterSale/cusmoterSale'),
+        name: 'CusmoterSale',
+        meta: {
+          title: '客户销售统计',
+          noCache: true
+        }
+      },
+      {
+        path: '/goodsPurchase/goodsPurchase',
+        component: () => import('@/views/statistics/goodsPurchase/goodsPurchase'),
+        name: 'GoodsPurchase',
+        meta: {
+          title: '商品采购统计',
+          noCache: true
+        }
+      },
+      {
+        path: '/goodsSale/goodsSale',
+        component: () => import('@/views/statistics/goodsSale/goodsSale'),
+        name: 'GoodsSale',
+        meta: {
+          title: '商品销售统计',
+          noCache: true
+        }
+      },
+    ]
+  },
+
   {
     path: '/sales',
     component: Layout,

src/views/goods/goods/index.vue

@@ -118,7 +118,7 @@
       </el-card>
       <div slot="footer" class="dialog-footer" style="text-align: center">
         <el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
-        <el-button size="small" @click="dialogVisible = false">取消</el-button>
+        <el-button size="small" @click="dialogVisibleClose">取消</el-button>
       </div>
     </el-dialog>
 
@@ -154,11 +154,13 @@
         uploadSuccess: false,
         uploadResultMesssage: '',
         uploadData: {
-          sid: ''
+          sid: '',
+          orgPath: window.sessionStorage.getItem('orgSidPath')
         },
         headers: {
           token: window.sessionStorage.getItem('token')
         },
+        uploadInfo: [],
         viewState: 1, // 1、列表 2、添加 3、修改 4、查看
         isSearchShow: false,
         searchxianshitit: '显示查询条件',
@@ -273,6 +275,7 @@
         const _this = this
         _this.uploadResultMesssage = resp.msg
         _this.uploadSuccess = resp.success
+        _this.uploadInfo = resp.data
 
       },
       handleConfirm() {
@@ -284,8 +287,32 @@
           })
           return
         }
+
+        var params = {
+          orgPath: window.sessionStorage.getItem('orgSidPath'),
+          data: this.uploadInfo
+        }
+
+        req.batchSave(params).then((resp) => {
+          if (resp.success) {
             this.dialogVisible = false
             this.loadList()
+            this.$message({
+              showClose: true,
+              type: 'success',
+              message: '上传成功!'
+            })
+            return
+          }
+
+        }).catch(() => {})
+
+      },
+      dialogVisibleClose() {
+        this.uploadResultMesssage = ''
+        this.uploadSuccess = ''
+        this.fileList = []
+        this.dialogVisible = false
       },
       // 搜索条件效果
       clicksearchShow() {

src/views/purchase/purchaseOrder/purchaseOrderAdd.vue

@@ -20,7 +20,10 @@
           <div>基础信息</div>
         </div> -->
           <el-row class="first_row">
-
+            <el-col :span="8">
+              <div class="span-sty">单据编号</div>
+              <el-form-item><span class="addinputInfo">由系统自动生成</span></el-form-item>
+            </el-col>
             <el-col :span="8">
               <div class="span-sty">申请人</div>
               <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@@ -29,6 +32,10 @@
               <div class="span-sty">申请部门</div>
               <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
             </el-col>
+
+          </el-row>
+
+          <el-row>
             <el-col :span="8">
               <div class="span-sty">申请日期</div>
               <el-form-item>
@@ -36,18 +43,7 @@
                   value-format="yyyy-MM-dd" placeholder="选择日期">
                 </el-date-picker></el-form-item>
             </el-col>
-          </el-row>
 
-          <el-row>
-            <el-col :span="8">
-              <div class="span-sty"><span class="must">*</span> 供应商</div>
-              <el-form-item prop="supplierName"> <el-select v-model="formobj.supplierName" filterable clearable
-                  placeholder="请选择供应商" class="addinputw addinputInfo" @change="supplierNameSelect">
-                  <el-option v-for="(item,index ) in supplierList" :key="index" :label="item.supplierName"
-                    :value="item.sid">
-                  </el-option>
-                </el-select></el-form-item>
-            </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="must">*</span> 收货仓库</div>
               <el-form-item prop="wareHouseName">
@@ -72,7 +68,16 @@
           </el-row>
 
           <el-row>
-            <el-col :span="16">
+            <el-col :span="8">
+              <div class="span-sty"><span class="must">*</span> 供应商</div>
+              <el-form-item prop="supplierName"> <el-select v-model="formobj.supplierName" filterable clearable
+                  placeholder="请选择供应商" class="addinputw addinputInfo" @change="supplierNameSelect">
+                  <el-option v-for="(item,index ) in supplierList" :key="index" :label="item.supplierName"
+                    :value="item.sid">
+                  </el-option>
+                </el-select></el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty">银行账号</div>
               <el-form-item prop="bankAccount"> <el-input class="addinputw addinputInfo"
                   v-model="formobj.purchaseBillAmount.bankAccount" clearable placeholder=""
@@ -158,7 +163,7 @@
             </el-table-column>
             <el-table-column prop="unTaxPrice" label="未含税价" width="100" align="center" />
             <el-table-column prop="taxAmount" label="总税额" width="100" align="center" />
-            <el-table-column prop="unTaxTotalAmount" label="未含总税价" width="120" align="center" />
+            <el-table-column prop="unTaxTotalAmount" label="未含税总价" width="120" align="center" />
             <!-- <el-table-column prop="cycle" label="采购周期" width="120" align="center" /> -->
             <el-table-column label="采购周期" align="center" width="100">
               <template slot-scope="scope">

src/views/purchase/purchaseOrder/purchaseOrderInfo.vue

@@ -19,7 +19,10 @@
           <div>基础信息</div>
         </div> -->
           <el-row class="first_row">
-
+            <el-col :span="8">
+              <div class="span-sty">单据编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+            </el-col>
             <el-col :span="8">
               <div class="span-sty">制单人</div>
               <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@@ -28,18 +31,15 @@
               <div class="span-sty">制单部门</div>
               <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+
-              <div class="span-sty">制单日期</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
-            </el-col>
           </el-row>
 
           <el-row>
             <el-col :span="8">
-
+              <div class="span-sty">制单日期</div>
-              <div class="span-sty">供应商</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
-              <el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
             </el-col>
+
             <el-col :span="8">
               <div class="span-sty">收货仓库</div>
               <el-form-item><span class="addinputInfo">{{ formobj.wareHouseName }}</span></el-form-item>
@@ -51,7 +51,12 @@
           </el-row>
 
           <el-row>
-            <el-col :span="16">
+            <el-col :span="8">
+
+              <div class="span-sty">供应商</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty">银行账号</div>
               <el-form-item><span
                   class="addinputInfo">{{ formobj.purchaseBillAmount.bankAccount }}</span></el-form-item>
@@ -90,7 +95,7 @@
             <el-table-column prop="taxRate" label="税率" width="120" align="center" />
             <el-table-column prop="unTaxPrice" label="未含税价" width="120" align="center" />
             <el-table-column prop="taxAmount" label="总税额" width="120" align="center" />
-            <el-table-column prop="unTaxTotalAmount" label="未含总税价" width="120" align="center" />
+            <el-table-column prop="unTaxTotalAmount" label="未含税总价" width="120" align="center" />
             <el-table-column prop="cycle" label="采购周期" width="120" align="center" />
             <el-table-column prop="deliveryDate" label="预计到货日期" width="180" align="center" />
             <el-table-column prop="madeDate" label="生产日期" width="180" align="center" />

src/views/purchase/purchaseReview/purchaseOrderInfo.vue

@@ -19,7 +19,10 @@
           <div>基础信息</div>
         </div> -->
           <el-row class="first_row">
-
+            <el-col :span="8">
+              <div class="span-sty">单据编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+            </el-col>
             <el-col :span="8">
               <div class="span-sty">制单人</div>
               <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@@ -28,18 +31,15 @@
               <div class="span-sty">制单部门</div>
               <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+
-              <div class="span-sty">制单日期</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
-            </el-col>
           </el-row>
 
           <el-row>
             <el-col :span="8">
-
+              <div class="span-sty">制单日期</div>
-              <div class="span-sty">供应商</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
-              <el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
             </el-col>
+
             <el-col :span="8">
               <div class="span-sty">收货仓库</div>
               <el-form-item><span class="addinputInfo">{{ formobj.wareHouseName }}</span></el-form-item>
@@ -51,7 +51,12 @@
           </el-row>
 
           <el-row>
-            <el-col :span="16">
+            <el-col :span="8">
+
+              <div class="span-sty">供应商</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
               <div class="span-sty">银行账号</div>
               <el-form-item><span
                   class="addinputInfo">{{ formobj.purchaseBillAmount.bankAccount }}</span></el-form-item>

src/views/statistics/cusmoterSale/cusmoterSale.vue

@@ -0,0 +1,255 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="客户销售统计" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="下单日期">
+                <el-date-picker v-model="listQuery.params.startDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                  type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.endDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                  type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="客户编码">
+                <el-input v-model="listQuery.params.warehouseName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">客户销售列表</div>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
+            @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50" />
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+            <el-table-column prop="billNo" label="客户编码" align="center" />
+            <el-table-column prop="state" label="客户名称" align="center" />
+            <el-table-column prop="createTime" label="销售数量" align="center" />
+            <el-table-column prop="billTypeValue" label="销售金额" align="center" />
+            <el-table-column prop="shopName" label="运费" align="center" />
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit" />
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import ButtonBar from '@/components/ButtonBar'
+  import req from '@/api/statistics/cusmoterSale'
+
+  export default {
+    name: 'SalesOrder',
+    components: {
+      Pagination,
+      pageye,
+      ButtonBar,
+    },
+    data() {
+      return {
+        btndisabled: false,
+        btnList: [{
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }],
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+        tableKey: 0,
+        list: [],
+        sids: [], // 用于导出的时候保存已选择的SIDs
+        listLoading: false,
+        // 翻页
+        listQuery: {
+          current: 1,
+          size: 5,
+          total: 0,
+          params: {
+            startDate: '',
+            endDate: '',
+            cusmoterCode: '',
+            customerName: '',
+            useOrgSid: '',
+            createOrgSid: '',
+          }
+        }
+      }
+    },
+    created() {
+      // 初始化变量
+      this.getList()
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+        switch (btnKey) {
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'doDel':
+            this.doDel()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      // 信息条数 获取点击时当前的sid
+      handleSelectionChange(row) {
+        const aa = []
+        row.forEach(element => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+      },
+      // 表中序号
+      indexMethod(index) {
+        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      // 查询列表信息
+      getList() {
+        this.listLoading = true
+        this.listQuery.params.useOrgSid = window.sessionStorage.getItem('orgSid')
+        this.listQuery.params.createOrgSid = window.sessionStorage.getItem('orgSid')
+        req.listPage(this.listQuery).then(response => {
+          this.listLoading = false
+          if (response.success) {
+            this.list = response.data.records
+            this.listQuery.total = response.data.total
+          } else {
+            this.list = []
+            this.listQuery.total = 0
+          }
+        })
+      },
+      // 查询按钮
+      handleFilter() {
+        this.listQuery.current = 1
+        this.getList()
+      },
+      // 点击重置
+      handleReset() {
+        this.listQuery = {
+          current: 1,
+          size: 5,
+          total: 0,
+          params: {
+            startDate: '',
+            endDate: '',
+            customerCode: '',
+            customerName: '',
+            warehouseName: '',
+            useOrgSid: '',
+            createOrgSid: '',
+          }
+        }
+        this.getList()
+      },
+      toAdd() {
+        this.viewState = 2
+        this.$refs['divAdd'].showAdd()
+      },
+      toEdit(row) {
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit(row)
+      },
+      toInfo(row) {
+        this.viewState = 4
+        this.$refs['divInfo'].showInfo(row)
+      },
+      // 删除
+      doDel() {
+        if (this.sids.length === 0) {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '请选择至少一条记录进行删除操作'
+          })
+          return
+        }
+        const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          req.deleteBySids(this.sids).then((resp) => {
+            if (resp.success) {
+              this.$message({
+                type: 'success',
+                message: resp.msg,
+                showClose: true
+              })
+            }
+            this.getList()
+            loading.close()
+          }).catch(e => {
+            loading.close()
+          })
+        }).catch(() => {})
+      },
+      // 修改、编辑、详情返回列表页面
+      resetState() {
+        this.viewState = 1
+      },
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>

src/views/statistics/goodsPurchase/goodsPurchase.vue

@@ -0,0 +1,260 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="商品采购统计" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="下单日期">
+                <el-date-picker v-model="listQuery.params.startDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                  type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.endDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                  type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="客户编码">
+                <el-input v-model="listQuery.params.warehouseName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">商品采购列表</div>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
+            @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50" />
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+            <el-table-column prop="billNo" label="商品编码" align="center" />
+            <el-table-column prop="shopName" label="条码" align="center" />
+            <el-table-column prop="state" label="商品名称" align="center" />
+            <el-table-column prop="createTime" label="规格编码" align="center" />
+            <el-table-column prop="billTypeValue" label="规格型号" align="center" />
+            <el-table-column prop="shopName" label="商品分类" align="center" />
+            <el-table-column prop="shopName" label="品牌" align="center" />
+            <el-table-column prop="shopName" label="数量" align="center" />
+            <el-table-column prop="shopName" label="单价" align="center" />
+            <el-table-column prop="shopName" label="金额" align="center" />
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit" />
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import ButtonBar from '@/components/ButtonBar'
+  import req from '@/api/statistics/goodsPurchase'
+
+  export default {
+    name: 'SalesOrder',
+    components: {
+      Pagination,
+      pageye,
+      ButtonBar,
+    },
+    data() {
+      return {
+        btndisabled: false,
+        btnList: [{
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }],
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+        tableKey: 0,
+        list: [],
+        sids: [], // 用于导出的时候保存已选择的SIDs
+        listLoading: false,
+        // 翻页
+        listQuery: {
+          current: 1,
+          size: 5,
+          total: 0,
+          params: {
+            startDate: '',
+            endDate: '',
+            cusmoterCode: '',
+            customerName: '',
+            useOrgSid: '',
+            createOrgSid: '',
+          }
+        }
+      }
+    },
+    created() {
+      // 初始化变量
+      this.getList()
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+        switch (btnKey) {
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'doDel':
+            this.doDel()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      // 信息条数 获取点击时当前的sid
+      handleSelectionChange(row) {
+        const aa = []
+        row.forEach(element => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+      },
+      // 表中序号
+      indexMethod(index) {
+        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      // 查询列表信息
+      getList() {
+        this.listLoading = true
+        this.listQuery.params.useOrgSid = window.sessionStorage.getItem('orgSid')
+        this.listQuery.params.createOrgSid = window.sessionStorage.getItem('orgSid')
+        req.listPage(this.listQuery).then(response => {
+          this.listLoading = false
+          if (response.success) {
+            this.list = response.data.records
+            this.listQuery.total = response.data.total
+          } else {
+            this.list = []
+            this.listQuery.total = 0
+          }
+        })
+      },
+      // 查询按钮
+      handleFilter() {
+        this.listQuery.current = 1
+        this.getList()
+      },
+      // 点击重置
+      handleReset() {
+        this.listQuery = {
+          current: 1,
+          size: 5,
+          total: 0,
+          params: {
+            startDate: '',
+            endDate: '',
+            customerCode: '',
+            customerName: '',
+            warehouseName: '',
+            useOrgSid: '',
+            createOrgSid: '',
+          }
+        }
+        this.getList()
+      },
+      toAdd() {
+        this.viewState = 2
+        this.$refs['divAdd'].showAdd()
+      },
+      toEdit(row) {
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit(row)
+      },
+      toInfo(row) {
+        this.viewState = 4
+        this.$refs['divInfo'].showInfo(row)
+      },
+      // 删除
+      doDel() {
+        if (this.sids.length === 0) {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '请选择至少一条记录进行删除操作'
+          })
+          return
+        }
+        const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          req.deleteBySids(this.sids).then((resp) => {
+            if (resp.success) {
+              this.$message({
+                type: 'success',
+                message: resp.msg,
+                showClose: true
+              })
+            }
+            this.getList()
+            loading.close()
+          }).catch(e => {
+            loading.close()
+          })
+        }).catch(() => {})
+      },
+      // 修改、编辑、详情返回列表页面
+      resetState() {
+        this.viewState = 1
+      },
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>

src/views/statistics/goodsSale/goodsSale.vue

@@ -0,0 +1,264 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="商品销售统计" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="下单日期">
+                <el-date-picker v-model="listQuery.params.startDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                  type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.endDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                  type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="客户编码">
+                <el-input v-model="listQuery.params.warehouseName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">商品销售列表</div>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
+            @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50" />
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+            <el-table-column prop="billNo" label="商品编码" align="center" />
+            <el-table-column prop="state" label="商品名称" align="center" />
+            <el-table-column prop="createTime" label="规格编码" align="center" />
+            <el-table-column prop="billTypeValue" label="规格型号" align="center" />
+            <el-table-column prop="shopName" label="条码" align="center" />
+            <el-table-column prop="shopName" label="商品分类" align="center" />
+            <el-table-column prop="shopName" label="品牌" align="center" />
+            <el-table-column prop="shopName" label="数量" align="center" />
+            <el-table-column prop="shopName" label="平均单价" align="center" />
+            <el-table-column prop="shopName" label="金额" align="center" />
+            <el-table-column prop="shopName" label="成本单价" align="center" />
+            <el-table-column prop="shopName" label="成本" align="center" />
+            <el-table-column prop="shopName" label="毛利率" align="center" />
+            <el-table-column prop="shopName" label="毛利" align="center" />
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit" />
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import ButtonBar from '@/components/ButtonBar'
+  import req from '@/api/statistics/cusmoterSale'
+
+  export default {
+    name: 'SalesOrder',
+    components: {
+      Pagination,
+      pageye,
+      ButtonBar,
+    },
+    data() {
+      return {
+        btndisabled: false,
+        btnList: [{
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }],
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+        tableKey: 0,
+        list: [],
+        sids: [], // 用于导出的时候保存已选择的SIDs
+        listLoading: false,
+        // 翻页
+        listQuery: {
+          current: 1,
+          size: 5,
+          total: 0,
+          params: {
+            startDate: '',
+            endDate: '',
+            cusmoterCode: '',
+            customerName: '',
+            useOrgSid: '',
+            createOrgSid: '',
+          }
+        }
+      }
+    },
+    created() {
+      // 初始化变量
+      this.getList()
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+        switch (btnKey) {
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'doDel':
+            this.doDel()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      // 信息条数 获取点击时当前的sid
+      handleSelectionChange(row) {
+        const aa = []
+        row.forEach(element => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+      },
+      // 表中序号
+      indexMethod(index) {
+        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      // 查询列表信息
+      getList() {
+        this.listLoading = true
+        this.listQuery.params.useOrgSid = window.sessionStorage.getItem('orgSid')
+        this.listQuery.params.createOrgSid = window.sessionStorage.getItem('orgSid')
+        req.listPage(this.listQuery).then(response => {
+          this.listLoading = false
+          if (response.success) {
+            this.list = response.data.records
+            this.listQuery.total = response.data.total
+          } else {
+            this.list = []
+            this.listQuery.total = 0
+          }
+        })
+      },
+      // 查询按钮
+      handleFilter() {
+        this.listQuery.current = 1
+        this.getList()
+      },
+      // 点击重置
+      handleReset() {
+        this.listQuery = {
+          current: 1,
+          size: 5,
+          total: 0,
+          params: {
+            startDate: '',
+            endDate: '',
+            customerCode: '',
+            customerName: '',
+            warehouseName: '',
+            useOrgSid: '',
+            createOrgSid: '',
+          }
+        }
+        this.getList()
+      },
+      toAdd() {
+        this.viewState = 2
+        this.$refs['divAdd'].showAdd()
+      },
+      toEdit(row) {
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit(row)
+      },
+      toInfo(row) {
+        this.viewState = 4
+        this.$refs['divInfo'].showInfo(row)
+      },
+      // 删除
+      doDel() {
+        if (this.sids.length === 0) {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '请选择至少一条记录进行删除操作'
+          })
+          return
+        }
+        const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          req.deleteBySids(this.sids).then((resp) => {
+            if (resp.success) {
+              this.$message({
+                type: 'success',
+                message: resp.msg,
+                showClose: true
+              })
+            }
+            this.getList()
+            loading.close()
+          }).catch(e => {
+            loading.close()
+          })
+        }).catch(() => {})
+      },
+      // 修改、编辑、详情返回列表页面
+      resetState() {
+        this.viewState = 1
+      },
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>

vue.config.js

@@ -24,7 +24,7 @@ module.exports = {
    *在大多数情况下，请使用“/”！！！
    *详细信息：https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: process.env.NODE_ENV === 'production' ? '/oms/' : '/',
+  publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
   outputDir: 'oms-ui',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',
@@ -40,19 +40,20 @@ module.exports = {
     },
     proxy: {
       '/api': { // 匹配所有以 '/api'开头的请求路径
-        // target: 'http://192.168.1.109:8111',
+        // target: 'http://192.168.0.105:8113',
         target: process.env.VUE_APP_URL, // 代理目标的基础路径
-        //  target: 'http://jianguan.yyundong.com/shgfapi', // 代理目标的基础路径
+        // target: 'https://oms.yxtsoft.com/api', // 代理目标的基础路径
         changeOrigin: true, // 支持跨域
         pathRewrite: { // 重写路径: 去掉路径中开头的'/api'
           '^/api': ''
         }
       },
       '/upload': { // 匹配所有以 '/api'开头的请求路径
-        // target: 'http://120.46.131.15:8111',
+        // target: 'http://192.168.0.105:8113',
         target: process.env.VUE_APP_URL, // 代理目标的基础路径
+        // target: 'https://oms.yxtsoft.com/api', // 代理目标的基础路径
         changeOrigin: true, // 支持跨域
-        pathRewrite: { // 重写路径: 去掉路径中开头的'/api'
+        pathRewrite: { // 重写路径: 去掉路径中开头的'/api's
           '^/upload': ''
         }
       }