cf_cloud/erp
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

yyw提交

Browse Source
This commit is contained in:
DESKTOP-8FGKA8Q\chunfen 2024-08-16 17:21:33 +08:00
parent 496aa21138
commit 5214fa853c
11 changed files with 738 additions and 467 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
resources/frontend/src/views/Login.vue
View File

@ -20,65 +20,65 @@
</template> </template>
<script> <script>
import axios from "axios"; import axios from 'axios'
import { getRoleInfo } from "@/api/role.js" import { getRoleInfo } from '@/api/role.js'
export default { export default {
data() { data() {
return { return {
loading: false, loading: false,
checked: false, //记住密码变量 checked: false, //记住密码变量
form: { form: {
//用户名和密码 //用户名和密码
name: "", name: '',
password: "", password: ''
}, }
}; }
}, },
mounted() { mounted() {
this.getCookie(); this.getCookie()
window.addEventListener('keydown', this.keyDown); window.addEventListener('keydown', this.keyDown)
}, },
methods: { methods: {
Login() { Login() {
// 判断记住密码复选框是否被勾选 勾选则调用配置cookie方法 // 判断记住密码复选框是否被勾选 勾选则调用配置cookie方法
if (this.checked === true) { if (this.checked === true) {
this.setCookie(this.form.name, this.form.password, true, 7); this.setCookie(this.form.name, this.form.password, true, 7)
} else { } else {
this.clearCookie(); this.clearCookie()
} }
//判断用户名和密码是否为空 //判断用户名和密码是否为空
if (this.form.name === "" || this.form.password === "") { if (this.form.name === "" || this.form.password === "") {
this.$message({ this.$message({
message: "账号或密码不能为空", message: "账号或密码不能为空",
type: "error", type: "error"
}); })
} else { } else {
this.loading = true this.loading = true
axios.post("/api/auth/login", this.form).then((res) => { axios.post("/api/auth/login", this.form).then((res) => {
let data = res.data; let data = res.data
if (data.error) { if (data.error) {
this.$message({ this.$message({
message: "账号或密码错误，请重新输入", message: "账号或密码错误，请重新输入",
type: "error", type: "error"
}); })
this.form.name = ""; this.form.name = ''
this.form.password = ""; this.form.password = ''
this.checked = false; this.checked = false
this.loading = false this.loading = false
} }
if(data.token) { if(data.token) {
localStorage.setItem("userName", this.form.name); localStorage.setItem("userName", this.form.name)
this.form = {}; this.form = {}
localStorage.setItem("token", data.token); localStorage.setItem("token", data.token)
getRoleInfo().then((res) => { getRoleInfo().then((res) => {
console.log(res.data.roles) console.log(res.data.roles)
if(res.data.roles && res.data.roles[0]) { if(res.data.roles && res.data.roles[0]) {
localStorage.setItem("roleName", res.data.roles[0].name) localStorage.setItem("roleName", res.data.roles[0].name)
this.$message({ this.$message({
message: "成功登录，欢迎来到后台管理系统", message: "成功登录，欢迎来到后台管理系统",
type: "success", type: "success"
}) })
this.$router.push("/GOODS_LIST") this.$router.push("/GOODS_LIST")
} }
@ -87,63 +87,60 @@ export default {
this.loading = false this.loading = false
}) })
} }
}); })
} }
}, },
// 设置cookie // 设置cookie
setCookie(c_name, c_pwd, c_state, exdays) { setCookie(c_name, c_pwd, c_state, exdays) {
const exdate = new Date(); const exdate = new Date()
exdate.setTime(exdate.getTime() + 24 * 60 * 60 * 1000 * exdays); // 保存的天数 exdate.setTime(exdate.getTime() + 24 * 60 * 60 * 1000 * exdays) // 保存的天数
window.document.cookie = window.document.cookie = "name" + "=" + c_name + ";path=/;expires=" + exdate.toGMTString()
"name" + "=" + c_name + ";path=/;expires=" + exdate.toGMTString(); window.document.cookie = "password" + "=" + c_pwd + ";path=/;expires=" + exdate.toGMTString()
window.document.cookie = window.document.cookie = "state" + "=" + c_state + ";path=/;expires=" + exdate.toGMTString()
"password" + "=" + c_pwd + ";path=/;expires=" + exdate.toGMTString();
window.document.cookie =
"state" + "=" + c_state + ";path=/;expires=" + exdate.toGMTString();
}, },
// 读取cookie // 读取cookie
getCookie() { getCookie() {
if (document.cookie.length > 0) { if (document.cookie.length > 0) {
const arr = document.cookie.split("; "); const arr = document.cookie.split("; ")
for (let i = 0; i < arr.length; i++) { for (let i = 0; i < arr.length; i++) {
const arr2 = arr[i].split("="); const arr2 = arr[i].split("=")
if (arr2[0] === "name") { if (arr2[0] === "name") {
this.form.name = arr2[1]; this.form.name = arr2[1]
} else if (arr2[0] === "password") { } else if (arr2[0] === "password") {
this.form.password = arr2[1]; this.form.password = arr2[1]
} else if (arr2[0] === "state") { } else if (arr2[0] === "state") {
this.checked = Boolean(arr2[1]); this.checked = Boolean(arr2[1])
} }
} }
} }
}, },
// 清除cookie // 清除cookie
clearCookie: function () { clearCookie: function () {
this.setCookie("", "", false, -1); this.setCookie("", "", false, -1)
}, },
keyDown(e) { keyDown(e) {
if (13 === e.keyCode) { if (13 === e.keyCode) {
this.Login(); this.Login()
} }
} }
}, },
destroyed() { destroyed() {
window.removeEventListener('keydown', this.keyDown, false); window.removeEventListener('keydown', this.keyDown, false)
}
} }
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.backimg { .backimg {
width: 100%; width: 100%;
height: 1080px; height: 1080px;
background-image: url("./../css/img/组 32.png"); background-image: url("./../css/img/组 32.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100%; background-size: 100%;
position: relative; position: relative;
} }
.sign { .sign {
width: 400px; width: 400px;
height: 500px; height: 500px;
position: absolute; position: absolute;
@ -205,5 +202,5 @@ export default {
.el-checkbox { .el-checkbox {
color: rgba(43, 83, 236); color: rgba(43, 83, 236);
} }
} }
</style> </style>

4
resources/frontend/src/views/dataCenter/gmvStatistics.vue
View File

@ -260,10 +260,10 @@ export default {
this.startTime = dayjs(this.getFirstDay(this.dayValue)).format('YYYY-MM-DD') this.startTime = dayjs(this.getFirstDay(this.dayValue)).format('YYYY-MM-DD')
} else if(this.time_type == 'seven') { } else if(this.time_type == 'seven') {
this.endTime = this.dayValue this.endTime = this.dayValue
this.startTime = dayjs().subtract(7, 'day').format('YYYY-MM-DD') this.startTime = dayjs(this.dayValue).subtract(7, 'day').format('YYYY-MM-DD')
} else if(this.time_type == 'thirty') { } else if(this.time_type == 'thirty') {
this.endTime = this.dayValue this.endTime = this.dayValue
this.startTime = dayjs().subtract(30, 'day').format('YYYY-MM-DD') this.startTime = dayjs(this.dayValue).subtract(30, 'day').format('YYYY-MM-DD')
} }
this.fetchData() this.fetchData()
}, },

263
resources/frontend/src/views/dataCenter/lossStatistics.vue
View File

@ -2,73 +2,287 @@
<div> <div>
<div class="cardBox"> <div class="cardBox">
<div class="searchBox"> <div class="searchBox">
<div class="row"> <div class="row" style="width: 100%;">
<span>时间：</span> <span>统计时间：</span>
<el-select v-model="time_type" style="width: 100px;margin-right: 5px;" @change="changeTimeType">
<el-option v-for="item in timeTypeList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
<el-date-picker <el-date-picker
v-model="timeValue" v-if="time_type == 'week' || time_type == 'seven' || time_type == 'thirty'"
v-model="dayValue"
:clearable="false"
type="date"
placeholder="选择日期"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
@change="changeDayTime">
</el-date-picker>
<el-date-picker
v-else-if="time_type == 'month'"
v-model="monthValue"
type="month"
:clearable="false"
format="yyyy-MM"
value-format="yyyy-MM"
placeholder="选择月"
@change="changeMonthTime">
</el-date-picker>
<el-date-picker
v-else-if="time_type == 'custom'"
v-model="customValue"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
end-placeholder="结束时间" end-placeholder="结束时间"
format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd"
style="width: 340px;"> :clearable="false"
style="width: 250px;"
@change="changeCustomTime">
</el-date-picker> </el-date-picker>
<el-time-picker
v-else-if="time_type == 'day'"
is-range
value-format="HH:mm:ss"
style="width: 200px;"
format="HH:mm:ss"
v-model="dayTimeList"
range-separator="至"
:clearable="false"
start-placeholder="开始时间"
end-placeholder="结束时间"
placeholder="选择时间范围"
@change="changeTimePicker">
</el-time-picker>
<div class="time">
<span>当前统计时间：</span>
<span v-if="startTime == endTime">{{ startTime }}</span>
<span v-else>{{ startTime }}~{{ endTime }}</span>
</div>
</div> </div>
<div class="row"> <div class="row">
<span>商品：</span> <span>规格：</span>
<el-input v-model="sku_id" clearable></el-input> <el-select v-model="sku_id" filterable remote reserve-keyword placeholder="请选择具体规格" :remote-method="remoteMethod"
:loading="remoteLoading">
<el-option v-for="it in skusList" :key="it.id" :label="it.title" :value="it.id"></el-option>
</el-select>
</div> </div>
<div class="row"> <div class="row">
<el-button type="primary" icon="el-icon-search" @click="handleSearch">筛选</el-button> <el-button type="primary" @click="handleSearch()" icon="el-icon-search">筛选</el-button>
</div> </div>
</div> </div>
</div> </div>
<el-card> <el-card>
<el-table v-loading="loading" border :data="lossList"> <div class="echartBox" id="myEchart"></div>
<el-table-column label="日期" prop="date"></el-table-column>
<el-table-column label="报损数" prop="total_num"></el-table-column>
<el-table-column label="报损金额" prop="total_loss_amount"></el-table-column>
</el-table>
</el-card> </el-card>
</div> </div>
</template> </template>
<script> <script>
import { getLossStatistics } from "@/api/dataCenter.js" import { getLossStatistics } from "@/api/dataCenter.js"
import { getGoodsFilter } from "@/api/goods.js"
import dayjs from 'dayjs'
import * as echarts from 'echarts'
export default { export default {
data() { data() {
return { return {
loading: false, loading: false,
timeValue: [], time_type: 'thirty',
lossList: [], timeTypeList: [
sku_id: '' { label: '自然周', value: 'week' },
{ label: '自然月', value: 'month' },
{ label: '近7天', value: 'seven' },
{ label: '近30天', value: 'thirty' },
{ label: '自定义', value: 'custom' }
],
dayValue: '',
monthValue: '',
customValue: [],
startTime: '',
endTime: '',
dateList: [],
totalNum: [],
totalAmount: [],
myChart: null,
dayTimeList: [],
sku_id: '',
skusList: [],
remoteLoading: false
} }
}, },
mounted() { mounted() {
this.fetchData() this.getInitList()
window.onresize = () => {
if(this.myChart) {
this.myChart.resize()
}
}
}, },
methods: { methods: {
getInitList() {
this.dayValue = this.endTime = dayjs().format('YYYY-MM-DD')
this.startTime = dayjs().subtract(30, 'day').format('YYYY-MM-DD')
this.fetchData()
},
changeTimeType() {
if(this.time_type == 'week') {
this.dayValue = this.endTime = dayjs().format('YYYY-MM-DD')
this.startTime = dayjs(this.getFirstDay(this.dayValue)).format('YYYY-MM-DD')
} else if(this.time_type == 'month') {
this.monthValue = dayjs().format('YYYY-MM')
this.startTime = this.monthValue + '-01'
this.endTime = this.monthValue + '-' + this.getDaysInMonth(this.monthValue)
} else if(this.time_type == 'seven') {
this.dayValue = this.endTime = dayjs().format('YYYY-MM-DD')
this.startTime = dayjs().subtract(7, 'day').format('YYYY-MM-DD')
} else if(this.time_type == 'thirty') {
this.dayValue = this.endTime = dayjs().format('YYYY-MM-DD')
this.startTime = dayjs().subtract(30, 'day').format('YYYY-MM-DD')
} else if(this.time_type == 'custom') {
this.startTime = this.endTime = dayjs().format('YYYY-MM-DD')
this.customValue = [this.startTime, this.startTime]
}
this.fetchData()
},
fetchData() { fetchData() {
this.loading = true this.loading = true
let params = { let params = {
start_time: this.timeValue ? this.timeValue[0] : '', start_time: this.startTime + ' 00:00:00',
end_day: this.timeValue ? this.timeValue[1] : '', end_time: this.endTime + ' 23:59:59',
sku_id: this.sku_id || 0 sku_id: this.sku_id || 0
} }
getLossStatistics(params).then((res) => { getLossStatistics(params).then((res) => {
this.lossList = res.data.data this.dateList = []
this.loading = false this.totalNum = []
this.totalAmount = []
res.data.data.forEach((it) => {
this.dateList.push(it.date)
this.totalNum.push(it.total_num)
this.totalAmount.push(it.total_loss_amount)
})
this.renderChart()
}).catch(() => { }).catch(() => {
this.loading = false this.loading = false
}) })
}, },
renderChart() {
this.myChart = echarts.init(document.getElementById('myEchart'))
this.myChart.setOption({
grid: {
left: '1%',
bottom: '2%',
containLabel: true
},
color: ['#3cd08f', '#f89f34'],
tooltip: {
trigger: 'axis'
},
legend: {
icon: 'rect',
left: 30,
data: ['报损数', '报损金额']
},
xAxis: {
type: 'category',
data: this.dateList
},
yAxis: {
type: 'value'
},
series: [
{
name: '报损数',
type: 'line',
smooth: true,
data: this.totalNum,
},
{
name: '报损金额',
type: 'line',
smooth: true,
data: this.totalAmount
}
]
})
this.loading = false
},
// 获取当前日期
getDayTime() {
let time = dayjs().format('YYYY-MM-DD')
return time
},
// 获取所在周的周一
getFirstDay(date) {
let day = new Date(date).getDay() || 7
return new Date(new Date(date).getFullYear(), new Date(date).getMonth(), new Date(date).getDate() + 1 - day)
},
getDaysInMonth(date) {
let year = date.split('-')[0] * 1
let month = date.split('-')[1] * 1
const startOfMonth = dayjs(new Date(year, month - 1, 1))
const endOfMonth = startOfMonth.endOf('month')
return endOfMonth.date()
},
changeDayTime() {
if(this.time_type == 'day') {
this.startTime = this.endTime = this.dayValue
} else if(this.time_type == 'week') {
this.endTime = this.dayValue
this.startTime = dayjs(this.getFirstDay(this.dayValue)).format('YYYY-MM-DD')
} else if(this.time_type == 'seven') {
this.endTime = this.dayValue
this.startTime = dayjs(this.dayValue).subtract(7, 'day').format('YYYY-MM-DD')
} else if(this.time_type == 'thirty') {
this.endTime = this.dayValue
this.startTime = dayjs(this.dayValue).subtract(30, 'day').format('YYYY-MM-DD')
}
this.fetchData()
},
changeMonthTime() {
this.startTime = this.monthValue + '-01'
this.endTime = this.monthValue + '-' + this.getDaysInMonth(this.monthValue)
this.fetchData()
},
changeCustomTime() {
this.startTime = this.customValue[0]
this.endTime = this.customValue[1]
this.fetchData()
},
changeTimePicker() {
let time = this.getDayTime()
this.startTime = time + ' ' + this.dayTimeList[0]
this.endTime = time + ' ' + this.dayTimeList[1]
this.fetchData()
},
handleSearch() { handleSearch() {
this.fetchData() this.fetchData()
},
remoteMethod(query) {
if(query) {
this.remoteLoading = true
getGoodsFilter(query).then((res) => {
this.skusList = res.data.data
this.remoteLoading = false
})
} else {
this.skusList = []
} }
} }
},
beforeDestroy() {
if (!this.myChart) {
return
}
this.myChart.dispose()
this.myChart = null
}
} }
</script> </script>
@ -91,5 +305,8 @@ export default {
font-size: 12px; font-size: 12px;
} }
} }
.echartBox{
width: 100%;
height: 480px;
}
</style> </style>

47
resources/frontend/src/views/dataCenter/skuStatistics.vue
View File

@ -2,7 +2,7 @@
<div> <div>
<div class="cardBox"> <div class="cardBox">
<div class="searchBox"> <div class="searchBox">
<div class="row"> <div class="row" style="width: 100%;">
<span>统计时间：</span> <span>统计时间：</span>
<el-select v-model="time_type" style="width: 100px;margin-right: 5px;" @change="changeTimeType"> <el-select v-model="time_type" style="width: 100px;margin-right: 5px;" @change="changeTimeType">
<el-option v-for="item in timeTypeList" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in timeTypeList" :key="item.value" :label="item.label" :value="item.value">
@ -65,6 +65,16 @@
<span v-else>{{ startTime }}~{{ endTime }}</span> <span v-else>{{ startTime }}~{{ endTime }}</span>
</div> </div>
</div> </div>
<div class="row">
<span>规格：</span>
<el-select v-model="sku_id" filterable remote reserve-keyword placeholder="请选择具体规格" :remote-method="remoteMethod"
:loading="remoteLoading">
<el-option v-for="it in skusList" :key="it.id" :label="it.title" :value="it.id"></el-option>
</el-select>
</div>
<div class="row">
<el-button type="primary" @click="handleSearch()" icon="el-icon-search">筛选</el-button>
</div>
</div> </div>
</div> </div>
@ -74,8 +84,7 @@
</div> </div>
<el-table v-loading="loading" border :data="saleList"> <el-table v-loading="loading" border :data="saleList">
<el-table-column label="商品名称" prop="name"></el-table-column> <el-table-column label="商品名称" prop="name"></el-table-column>
<el-table-column label="sku规格" prop="title"></el-table-column> <el-table-column label="商品编码" prop="external_sku_id"></el-table-column>
<el-table-column label="规格编码" prop="external_sku_id"></el-table-column>
<el-table-column label="销量" prop="goods_total"></el-table-column> <el-table-column label="销量" prop="goods_total"></el-table-column>
<el-table-column label="销售额" prop="goods_total_amount"></el-table-column> <el-table-column label="销售额" prop="goods_total_amount"></el-table-column>
@ -106,6 +115,7 @@
<script> <script>
import { getSkuSalesCount } from "@/api/dataCenter.js" import { getSkuSalesCount } from "@/api/dataCenter.js"
import { getGoodsFilter } from "@/api/goods.js"
import dayjs from 'dayjs' import dayjs from 'dayjs'
export default { export default {
@ -142,7 +152,9 @@ export default {
autoWidth: true, autoWidth: true,
bookType: 'xlsx', bookType: 'xlsx',
dayTimeList: [], dayTimeList: [],
sku_id: '' sku_id: '',
skusList: [],
remoteLoading: false
} }
}, },
mounted() { mounted() {
@ -230,10 +242,10 @@ export default {
this.startTime = dayjs(this.getFirstDay(this.dayValue)).format('YYYY-MM-DD') this.startTime = dayjs(this.getFirstDay(this.dayValue)).format('YYYY-MM-DD')
} else if(this.time_type == 'seven') { } else if(this.time_type == 'seven') {
this.endTime = this.dayValue this.endTime = this.dayValue
this.startTime = dayjs().subtract(7, 'day').format('YYYY-MM-DD') this.startTime = dayjs(this.dayValue).subtract(7, 'day').format('YYYY-MM-DD')
} else if(this.time_type == 'thirty') { } else if(this.time_type == 'thirty') {
this.endTime = this.dayValue this.endTime = this.dayValue
this.startTime = dayjs().subtract(30, 'day').format('YYYY-MM-DD') this.startTime = dayjs(this.dayValue).subtract(30, 'day').format('YYYY-MM-DD')
} }
this.page = 1 this.page = 1
this.fetchData() this.fetchData()
@ -266,6 +278,10 @@ export default {
this.page = val this.page = val
this.fetchData() this.fetchData()
}, },
handleSearch() {
this.page = 1
this.fetchData()
},
handleExport() { handleExport() {
this.downloadLoading = true this.downloadLoading = true
let params = { let params = {
@ -285,11 +301,11 @@ export default {
return return
} }
import('@/util/Export2Excel').then(excel => { import('@/util/Export2Excel').then(excel => {
const tHeader = ['商品名称', 'sku规格', '规格编码', '销量', '销售额', '库存', '可售库存', '状态'] const tHeader = ['商品名称', '商品编码', '销量', '销售额', '库存', '可售库存', '状态']
const filterVal = ['name', 'title', 'external_sku_id', 'goods_total', 'goods_total_amount', 'stock', 'sale_stock', 'status'] const filterVal = ['name', 'external_sku_id', 'goods_total', 'goods_total_amount', 'stock', 'sale_stock', 'status']
if(this.time_type == 'day') { if(this.time_type == 'day') {
tHeader.splice(5, 0, '昨日销量', '3日内销量', '7日内销量', '已发货数', '未发货数') tHeader.splice(4, 0, '昨日销量', '3日内销量', '7日内销量', '已发货数', '未发货数')
filterVal.splice(5, 0, 'yesterday_avg_num', 'three_day_avg_num', 'seven_day_avg_num', 'shipping_num', 'unshipping_num') filterVal.splice(4, 0, 'yesterday_avg_num', 'three_day_avg_num', 'seven_day_avg_num', 'shipping_num', 'unshipping_num')
} }
const list = res.data.data.data const list = res.data.data.data
const data = this.formatJson(filterVal, list) const data = this.formatJson(filterVal, list)
@ -313,6 +329,17 @@ export default {
return jsonData.map(v => filterVal.map(j => { return jsonData.map(v => filterVal.map(j => {
return v[j] return v[j]
})) }))
},
remoteMethod(query) {
if(query) {
this.remoteLoading = true
getGoodsFilter(query).then((res) => {
this.skusList = res.data.data
this.remoteLoading = false
})
} else {
this.skusList = []
}
} }
} }
} }

35
resources/frontend/src/views/dataCenter/spuStatistics.vue
View File

@ -2,7 +2,7 @@
<div> <div>
<div class="cardBox"> <div class="cardBox">
<div class="searchBox"> <div class="searchBox">
<div class="row"> <div class="row" style="width: 100%;">
<span>统计时间：</span> <span>统计时间：</span>
<el-select v-model="time_type" style="width: 100px;margin-right: 5px;" @change="changeTimeType"> <el-select v-model="time_type" style="width: 100px;margin-right: 5px;" @change="changeTimeType">
<el-option v-for="item in timeTypeList" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in timeTypeList" :key="item.value" :label="item.label" :value="item.value">
@ -65,6 +65,16 @@
<span v-else>{{ startTime }}~{{ endTime }}</span> <span v-else>{{ startTime }}~{{ endTime }}</span>
</div> </div>
</div> </div>
<div class="row">
<span>规格：</span>
<el-select v-model="sku_id" filterable remote reserve-keyword placeholder="请选择具体规格" :remote-method="remoteMethod"
:loading="remoteLoading">
<el-option v-for="it in skusList" :key="it.id" :label="it.title" :value="it.id"></el-option>
</el-select>
</div>
<div class="row">
<el-button type="primary" @click="handleSearch()" icon="el-icon-search">筛选</el-button>
</div>
</div> </div>
</div> </div>
@ -89,6 +99,7 @@
<script> <script>
import { getSpuSalesCount } from "@/api/dataCenter.js" import { getSpuSalesCount } from "@/api/dataCenter.js"
import { getGoodsFilter } from "@/api/goods.js"
import dayjs from 'dayjs' import dayjs from 'dayjs'
export default { export default {
@ -122,7 +133,9 @@ export default {
autoWidth: true, autoWidth: true,
bookType: 'xlsx', bookType: 'xlsx',
dayTimeList: [], dayTimeList: [],
sku_id: '' sku_id: '',
skusList: [],
remoteLoading: false
} }
}, },
mounted() { mounted() {
@ -209,10 +222,10 @@ export default {
this.startTime = dayjs(this.getFirstDay(this.dayValue)).format('YYYY-MM-DD') this.startTime = dayjs(this.getFirstDay(this.dayValue)).format('YYYY-MM-DD')
} else if(this.time_type == 'seven') { } else if(this.time_type == 'seven') {
this.endTime = this.dayValue this.endTime = this.dayValue
this.startTime = dayjs().subtract(7, 'day').format('YYYY-MM-DD') this.startTime = dayjs(this.dayValue).subtract(7, 'day').format('YYYY-MM-DD')
} else if(this.time_type == 'thirty') { } else if(this.time_type == 'thirty') {
this.endTime = this.dayValue this.endTime = this.dayValue
this.startTime = dayjs().subtract(30, 'day').format('YYYY-MM-DD') this.startTime = dayjs(this.dayValue).subtract(30, 'day').format('YYYY-MM-DD')
} }
this.fetchData() this.fetchData()
}, },
@ -232,6 +245,9 @@ export default {
this.endTime = time + ' ' + this.dayTimeList[1] this.endTime = time + ' ' + this.dayTimeList[1]
this.fetchData() this.fetchData()
}, },
handleSearch() {
this.fetchData()
},
handleExport() { handleExport() {
if(!this.saleList.length) { if(!this.saleList.length) {
this.$message({ this.$message({
@ -268,6 +284,17 @@ export default {
return jsonData.map(v => filterVal.map(j => { return jsonData.map(v => filterVal.map(j => {
return v[j] return v[j]
})) }))
},
remoteMethod(query) {
if(query) {
this.remoteLoading = true
getGoodsFilter(query).then((res) => {
this.skusList = res.data.data
this.remoteLoading = false
})
} else {
this.skusList = []
}
} }
} }
} }

69
resources/frontend/src/views/goods/addgoods/addgoods.vue
View File

@ -1,9 +1,8 @@
<template> <template>
<div>
<el-card class="box-card"> <el-card class="box-card">
<!-- 新增商品进入显示 --> <!-- 新增商品进入显示 -->
<el-form ref="form" :inline="true" :model="form"> <el-form ref="form" :inline="true" :model="form">
<div> <!-- <div>
<el-form-item label="商品列表："> <el-form-item label="商品列表：">
<el-select v-model="lid" placeholder="选择商品" @change="onchange" filterable> <el-select v-model="lid" placeholder="选择商品" @change="onchange" filterable>
<el-option v-for="item in goodschoose" :key="item.id" :label="item.title" :value="item.id"> <el-option v-for="item in goodschoose" :key="item.id" :label="item.title" :value="item.id">
@ -21,19 +20,21 @@
<i v-else class="el-icon-plus avatar-uploader-icon"></i> <i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</div> </div> -->
<div> <div>
<el-form-item label="商品名称："> <!-- <el-form-item label="商品名称：">
<el-input placeholder="商品名称" v-model="form.title" :disabled="disabled"></el-input> <el-input placeholder="商品名称" v-model="form.title" :disabled="disabled"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="商品编码："> <el-form-item label="商品编码：">
<el-input placeholder="商品编码" v-model="form.goods_code" :disabled="disabled"></el-input> <el-input placeholder="商品编码" v-model="form.goods_code" :disabled="disabled"></el-input>
</el-form-item> </el-form-item> -->
<el-form-item label="商品种类："> <el-form-item label="商品品种：">
<treeselect <treeselect
:options="treeList" :options="treeList"
style="width: 200px;" style="width: 200px;"
:disable-branch-nodes="true" :disable-branch-nodes="true"
:show-count="true"
:normalizer="normalizer"
placeholder="请选择品种" placeholder="请选择品种"
v-model="form.type_id" /> v-model="form.type_id" />
</el-form-item> </el-form-item>
@ -50,8 +51,7 @@
<el-input placeholder="商品规格" v-model="item.title"></el-input> <el-input placeholder="商品规格" v-model="item.title"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="规格编码："> <el-form-item label="规格编码：">
<el-input v-model="item.sku_code" placeholder="商品编码"> <el-input v-model="item.sku_code" placeholder="商品编码"></el-input>
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="商品状态："> <el-form-item label="商品状态：">
<el-select v-model="item.reserve" placeholder="下架（默认）"> <el-select v-model="item.reserve" placeholder="下架（默认）">
@ -72,12 +72,12 @@
<el-input v-model="item.sale_stock" placeholder="在售库存"> <el-input v-model="item.sale_stock" placeholder="在售库存">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-button type="danger" @click="handleDelete(i)">删除</el-button> <el-button type="danger" @click="handleDelete(i)" icon="el-icon-delete">删除</el-button>
</div> </div>
</div> </div>
<el-form-item> <el-form-item>
<el-button type="success" @click="handleAdd()">增加规格</el-button> <el-button type="success" @click="handleAdd()" icon="el-icon-plus">增加规格</el-button>
</el-form-item> </el-form-item>
<div style="margin-top: 30px;"> <div style="margin-top: 30px;">
@ -88,16 +88,15 @@
</div> </div>
</el-form> </el-form>
</el-card> </el-card>
</div>
</template> </template>
<script> <script>
import { addGoods, goodsList, imgUpload } from '@/api/goods.js' import { addGoods, goodsList, imgUpload } from '@/api/goods.js'
import { goods_types, Brand_goods_types } from '@/api/rankingData.js' import { goods_types, Brand_goods_types } from '@/api/rankingData.js'
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default { export default {
components: { Treeselect }, components: { Treeselect },
data() { data() {
return { return {
@ -247,12 +246,18 @@ export default {
this.form = {}; this.form = {};
} }
}, },
normalizer(node) {
if ((!node.children || (node.children && node.children.length == 0)) && node.level == 1) {
node.isDisabled = true
}
return node
}
}, },
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.skuBox{ .skuBox{
border: 1px solid #e5e5e5; border: 1px solid #e5e5e5;
border-radius: 5px; border-radius: 5px;
padding: 15px 0; padding: 15px 0;
@ -264,41 +269,41 @@ export default {
font-size: 15px; font-size: 15px;
margin-bottom: 15px; margin-bottom: 15px;
} }
} }
.el-upload--picture-card { .el-upload--picture-card {
width: 50px; width: 50px;
height: 50px; height: 50px;
} }
.el-form-item { .el-form-item {
margin-left: 40px; margin-left: 40px;
} }
/* 分割 */ /* 分割 */
.avatar-uploader .el-upload { .avatar-uploader .el-upload {
border: 1px dashed #d9d9d9; border: 1px dashed #d9d9d9;
border-radius: 6px; border-radius: 6px;
cursor: pointer; cursor: pointer;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
.avatar-uploader .el-upload:hover { .avatar-uploader .el-upload:hover {
border-color: #409eff; border-color: #409eff;
} }
.avatar-uploader-icon { .avatar-uploader-icon {
font-size: 28px; font-size: 28px;
color: #8c939d; color: #8c939d;
width: 148px; width: 148px;
height: 148px; height: 148px;
line-height: 148px; line-height: 148px;
text-align: center; text-align: center;
} }
.avatar { .avatar {
width: 148px; width: 148px;
height: 148px; height: 148px;
display: block; display: block;
} }
</style> </style>

4
resources/frontend/src/views/goods/combination.vue
View File

@ -89,9 +89,7 @@
]"> ]">
<el-input v-model="dynamicValidateForm.title"></el-input> <el-input v-model="dynamicValidateForm.title"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="商品编码" prop="external_sku_id" :rules="[ <el-form-item label="商品编码" prop="external_sku_id">
{ required: true, message: '请输入商品编码', trigger: 'blur' },
]">
<el-input v-model="dynamicValidateForm.external_sku_id"></el-input> <el-input v-model="dynamicValidateForm.external_sku_id"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-for="(item, index) in dynamicValidateForm.combination_goods" :label="'子商品' + index" <el-form-item v-for="(item, index) in dynamicValidateForm.combination_goods" :label="'子商品' + index"

2
resources/frontend/src/views/goods/goods.vue
View File

@ -8,7 +8,7 @@
<el-input v-model="form.goods_title" placeholder="商品名称" clearable></el-input> <el-input v-model="form.goods_title" placeholder="商品名称" clearable></el-input>
</div> </div>
<div class="row"> <div class="row">
<span>商品种类：</span> <span>商品品种：</span>
<treeselect <treeselect
:options="treeList" :options="treeList"
style="width: 200px;" style="width: 200px;"

6
resources/frontend/src/views/supplyChain/dailyStock.vue
View File

@ -7,7 +7,7 @@
<el-input v-model="filter.title" clearable></el-input> <el-input v-model="filter.title" clearable></el-input>
</div> </div>
<div class="row"> <div class="row">
<span>规格编码：</span> <span>商品编码：</span>
<el-input v-model="filter.external_sku_id" clearable></el-input> <el-input v-model="filter.external_sku_id" clearable></el-input>
</div> </div>
<div class="row"> <div class="row">
@ -35,7 +35,7 @@
<el-table v-loading="loading" :data="supplierList" style="width: 100%" border> <el-table v-loading="loading" :data="supplierList" style="width: 100%" border>
<el-table-column prop="id" label="ID" width="80" align="center" /> <el-table-column prop="id" label="ID" width="80" align="center" />
<el-table-column prop="goods_sku.name" label="商品名称" /> <el-table-column prop="goods_sku.name" label="商品名称" />
<el-table-column prop="goods_sku.external_sku_id" label="规格编码" /> <el-table-column prop="goods_sku.external_sku_id" label="商品编码" />
<!-- <el-table-column prop="sku_id" label="skuID" /> --> <!-- <el-table-column prop="sku_id" label="skuID" /> -->
<el-table-column prop="day" label="日期" /> <el-table-column prop="day" label="日期" />
<el-table-column prop="inventory" label="盘点库存" /> <el-table-column prop="inventory" label="盘点库存" />
@ -58,7 +58,7 @@
<div v-for="(item, index) in inventoryOrders" :key="index" class="bgBox"> <div v-for="(item, index) in inventoryOrders" :key="index" class="bgBox">
<div class="close" @click="delItem(index)"><i class="el-icon-delete-solid"></i></div> <div class="close" @click="delItem(index)"><i class="el-icon-delete-solid"></i></div>
<el-form label-width="90px"> <el-form label-width="90px">
<el-form-item label="规格编码："> <el-form-item label="商品编码：">
<el-input v-model="item.external_sku_id" clearable></el-input> <el-input v-model="item.external_sku_id" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="盘点库存："> <el-form-item label="盘点库存：">

8
resources/frontend/src/views/supplyChain/lossRecord.vue
View File

@ -7,7 +7,7 @@
<el-input v-model="filter.title" clearable></el-input> <el-input v-model="filter.title" clearable></el-input>
</div> </div>
<div class="row"> <div class="row">
<span>规格编码：</span> <span>商品编码：</span>
<el-input v-model="filter.external_sku_id" clearable></el-input> <el-input v-model="filter.external_sku_id" clearable></el-input>
</div> </div>
<div class="row"> <div class="row">
@ -35,7 +35,7 @@
<el-table v-loading="loading" :data="supplierList" style="width: 100%" border> <el-table v-loading="loading" :data="supplierList" style="width: 100%" border>
<el-table-column prop="id" label="ID" width="80" align="center" /> <el-table-column prop="id" label="ID" width="80" align="center" />
<el-table-column prop="goods_sku.name" label="商品名称" /> <el-table-column prop="goods_sku.name" label="商品名称" />
<el-table-column prop="external_sku_id" label="规格编码" /> <el-table-column prop="external_sku_id" label="商品编码" />
<!-- <el-table-column prop="sku_id" label="skuID" /> --> <!-- <el-table-column prop="sku_id" label="skuID" /> -->
<el-table-column prop="num" label="数量" /> <el-table-column prop="num" label="数量" />
<el-table-column prop="cost" label="成本" /> <el-table-column prop="cost" label="成本" />
@ -74,7 +74,7 @@
<div v-for="(item, index) in lossOrders" :key="index" class="bgBox"> <div v-for="(item, index) in lossOrders" :key="index" class="bgBox">
<div class="close" @click="delItem(index)"><i class="el-icon-delete-solid"></i></div> <div class="close" @click="delItem(index)"><i class="el-icon-delete-solid"></i></div>
<el-form label-width="90px"> <el-form label-width="90px">
<el-form-item label="规格编码"> <el-form-item label="商品编码">
<el-input v-model="item.external_sku_id" clearable></el-input> <el-input v-model="item.external_sku_id" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="数量"> <el-form-item label="数量">
@ -100,7 +100,7 @@
<el-dialog title="编辑" :visible.sync="editDialog" width="500px"> <el-dialog title="编辑" :visible.sync="editDialog" width="500px">
<el-form label-width="90px"> <el-form label-width="90px">
<el-form-item label="规格编码"> <el-form-item label="商品编码">
<el-input v-model="curInfo.external_sku_id" clearable></el-input> <el-input v-model="curInfo.external_sku_id" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="数量"> <el-form-item label="数量">

8
resources/frontend/src/views/supplyChain/procureLog.vue
View File

@ -7,7 +7,7 @@
<el-input v-model="filter.title" clearable></el-input> <el-input v-model="filter.title" clearable></el-input>
</div> </div>
<div class="row"> <div class="row">
<span>规格编码：</span> <span>商品编码：</span>
<el-input v-model="filter.external_sku_id" clearable></el-input> <el-input v-model="filter.external_sku_id" clearable></el-input>
</div> </div>
<div class="row"> <div class="row">
@ -35,7 +35,7 @@
<el-table v-loading="loading" :data="procureList" style="width: 100%" border> <el-table v-loading="loading" :data="procureList" style="width: 100%" border>
<el-table-column prop="goods_sku.id" label="商品id" width="80" align="center" /> <el-table-column prop="goods_sku.id" label="商品id" width="80" align="center" />
<el-table-column prop="goods_sku.name" label="商品名称" /> <el-table-column prop="goods_sku.name" label="商品名称" />
<el-table-column prop="external_sku_id" label="规格编码" /> <el-table-column prop="external_sku_id" label="商品编码" />
<el-table-column prop="num" label="采购数量" /> <el-table-column prop="num" label="采购数量" />
<el-table-column prop="cost" label="采购成本" /> <el-table-column prop="cost" label="采购成本" />
<el-table-column prop="buyer_name" label="采购人名称" /> <el-table-column prop="buyer_name" label="采购人名称" />
@ -84,7 +84,7 @@
<div v-for="(item, index) in purchaseOrders" :key="index" class="bgBox"> <div v-for="(item, index) in purchaseOrders" :key="index" class="bgBox">
<div class="close" @click="delItem(index)"><i class="el-icon-delete-solid"></i></div> <div class="close" @click="delItem(index)"><i class="el-icon-delete-solid"></i></div>
<el-form label-width="90px"> <el-form label-width="90px">
<el-form-item label="规格编码"> <el-form-item label="商品编码">
<el-input v-model="item.external_sku_id" clearable></el-input> <el-input v-model="item.external_sku_id" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="数量"> <el-form-item label="数量">
@ -113,7 +113,7 @@
<el-dialog title="编辑" :visible.sync="editDialog" width="600px"> <el-dialog title="编辑" :visible.sync="editDialog" width="600px">
<el-form label-width="90px"> <el-form label-width="90px">
<el-form-item label="规格编码"> <el-form-item label="商品编码">
<el-input v-model="curInfo.external_sku_id" disabled></el-input> <el-input v-model="curInfo.external_sku_id" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="数量"> <el-form-item label="数量">