Browse Source

Merge remote-tracking branch 'origin/master'

master
wangpengfei 2 years ago
parent
commit
1ca087f327
  1. 2
      supervise-customer-ui/.env.development
  2. 17
      supervise-customer-ui/src/api/query/sales.js
  3. 17
      supervise-customer-ui/src/api/query/supplier.js
  4. 164
      supervise-customer-ui/src/views/query/sale.vue
  5. 80
      supervise-customer-ui/src/views/query/supplier.vue

2
supervise-customer-ui/.env.development

@ -6,4 +6,4 @@ VUE_APP_BASE_API = '/api/service'
## 配置测试和本地开发时的 接口地址
##VUE_APP_URL = "http://8.130.39.13:8112"
VUE_APP_URL = "http://192.168.3.9:8112"
VUE_APP_URL = "http://192.168.3.173:8112"

17
supervise-customer-ui/src/api/query/sales.js

@ -0,0 +1,17 @@
import request from '@/utils/request'
// 销售查询
export default {
// 查询分页列表
listPage: function(params) {
return request({
baseURL: '/api',
url: '/customer/v1/gdsales/listPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
}

17
supervise-customer-ui/src/api/query/supplier.js

@ -0,0 +1,17 @@
import request from '@/utils/request'
// 供应商查询
export default {
// 查询分页列表
listPage: function(params) {
return request({
baseURL: '/api',
url: '/customer/v1/supplierbankinfo/listPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
}

164
supervise-customer-ui/src/views/query/sale.vue

@ -10,11 +10,20 @@
</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.prodCode" placeholder="" clearable />
</el-form-item>
<el-form-item label="商品名称">
<el-input v-model="queryParams.params.prodName" placeholder="" clearable />
</el-form-item>
<!-- <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.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>
@ -28,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="orderType" width="120" 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="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="storeName" width="200" label="销售渠道" align="center" />
<el-table-column prop="dataDate" width="150" label="销售日期" align="center" />
</el-table>
</div>
@ -68,6 +77,7 @@
</template>
<script>
import req from '@/api/query/sales'
import ButtonBar from '@/components/ButtonBar'
export default {
components: {
@ -80,95 +90,41 @@
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',
btnKey: 'doClose',
btnLabel: '关闭'
}],
}, ],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
orderId: '',
supplierName: '',
auditStatus: '',
goodsStatus: '',
orderStartDate: '',
orderEndDate: '',
arrivalStartDate: '',
arrivalEndDate: '',
queryType: ''
prodCode: '', //
prodName: '', //
storeCode: '',//
brandCode: '',//
brandName: '',//
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: {
//
@ -182,6 +138,9 @@
},
btnHandle(btnKey) {
switch (btnKey) {
case 'doBuild':
this.doBuild()
break
case 'doClose':
this.doClose()
break
@ -222,19 +181,40 @@
size: 10,
total: 0,
params: {
orderId: '',
supplierName: '',
auditStatus: '',
goodsStatus: '',
orderStartDate: '',
orderEndDate: '',
arrivalStartDate: '',
arrivalEndDate: '',
queryType: ''
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) => {
// })
// }
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)

80
supervise-customer-ui/src/views/query/supplier.vue

@ -10,7 +10,7 @@
</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="queryParams" :model="queryParams" :inline="true" class="tab-header">
<el-form-item label="审核状态">
<!-- <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>
@ -18,11 +18,11 @@
</el-form-item>
<el-form-item label="供应商编号">
<el-input v-model="queryParams.params.orderId" placeholder="" clearable />
</el-form-item>
</el-form-item> -->
<el-form-item label="供应商名称">
<el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
<el-input v-model="queryParams.params.name" placeholder="" clearable />
</el-form-item>
<el-form-item label="联系人">
<!-- <el-form-item label="联系人">
<el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
</el-form-item>
<el-form-item label="法人">
@ -33,7 +33,7 @@
</el-form-item>
<el-form-item label="银行账号">
<el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
</el-form-item>
</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>
@ -45,28 +45,26 @@
<!-- 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%">
<!-- :row-style="{height: '50px'}"> -->
<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="codeUnified" width="150" label="供应商代码" align="center" />
<el-table-column prop="name" label="供应商名称" align="center" />
<el-table-column prop="contacts" width="180" label="联系人" align="center" />
<el-table-column prop="telephone" width="180" label="电话" align="center" />
<el-table-column prop="address" label="地址" align="center" />
</el-table>
</div>
@ -85,6 +83,7 @@
</template>
<script>
import req from '@/api/query/supplier'
import ButtonBar from '@/components/ButtonBar'
export default {
components: {
@ -158,34 +157,25 @@
size: 10,
total: 0,
params: {
orderId: '',
supplierName: '',
auditStatus: '',
goodsStatus: '',
orderStartDate: '',
orderEndDate: '',
arrivalStartDate: '',
arrivalEndDate: '',
queryType: ''
// orderId: '',
name: '',
// auditStatus: '',
// goodsStatus: '',
// orderStartDate: '',
// orderEndDate: '',
// arrivalStartDate: '',
// arrivalEndDate: '',
// queryType: ''
}
},
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: {
//
@ -239,15 +229,15 @@
size: 10,
total: 0,
params: {
orderId: '',
supplierName: '',
auditStatus: '',
goodsStatus: '',
orderStartDate: '',
orderEndDate: '',
arrivalStartDate: '',
arrivalEndDate: '',
queryType: ''
// orderId: '',
name: '',
// auditStatus: '',
// goodsStatus: '',
// orderStartDate: '',
// orderEndDate: '',
// arrivalStartDate: '',
// arrivalEndDate: '',
// queryType: ''
}
}
this.loadList()

Loading…
Cancel
Save