diff --git a/src/views/commodity/list.vue b/src/views/commodity/list.vue index e0e7eff..2ecfccb 100644 --- a/src/views/commodity/list.vue +++ b/src/views/commodity/list.vue @@ -47,16 +47,18 @@ - - - - + + + @@ -333,7 +335,7 @@ export default { } function handleRemoveImg(res, ress) { - data.fileList = ress + data.fileList = [] } function handleUploadError(err) { @@ -348,7 +350,7 @@ export default { } function handleSuccess(res) { - data.fileList.push({url: res.data.link}) + data.fileList = [{url: res.data.link}] } function handleSkuDelete(index) { @@ -470,10 +472,10 @@ export default { } .imgBox{ display: flex; - flex-wrap: wrap; + align-items: center; .el-image{ - width: 60px; - height: 60px; + width: 70px; + height: 70px; border-radius: 4px; margin-right: 10px; } diff --git a/src/views/warehouse/io.vue b/src/views/warehouse/io.vue index 5ee5947..802ac24 100644 --- a/src/views/warehouse/io.vue +++ b/src/views/warehouse/io.vue @@ -1,25 +1,35 @@ @@ -59,7 +110,7 @@ import { onMounted, reactive, toRefs } from "vue" import { get, post } from "@/api/request" import { Search, Plus, Edit, ZoomIn, Delete } from '@element-plus/icons' -import { ElMessage, ElMessageBox } from 'element-plus' +import { ElMessage } from 'element-plus' export default { components: { @@ -67,6 +118,7 @@ export default { }, setup() { const data = reactive({ + target_type: '', goodsList: [], page: 1, pageSize: 10, @@ -77,7 +129,15 @@ export default { 'month': '月', 'year': '年', 'none': '长期' - } + }, + goods_title: '', + tempData: {}, + showOut: false, + warehouseList: [], + suppliersList: [], + skusList: [], + goodsSku: {}, + opa_loading: false }) function handleSearch() { @@ -90,6 +150,8 @@ export default { let params = { page: data.page, pageSize: data.pageSize, + goods_title: data.goods_title, + target_type: data.target_type, service_id: data.service_id, start_date: data.pickerTime ? data.pickerTime[0] : '', end_date: data.pickerTime ? data.pickerTime[1] : '' @@ -114,8 +176,58 @@ export default { fetchData() } + function addOut() { + data.goodsSku = {} + data.tempData = {num: 0} + data.showOut = true + } + + function commitOut() { + data.opa_loading = true + let params = { + ...data.tempData + } + post(`/api/goods-put-records`, params).then(() => { + fetchData() + ElMessage({ type: 'success', message: '新增成功' }) + data.showOut = false + data.opa_loading = false + }).catch((err) => { + data.opa_loading = false + }) + } + + function getWarehouseList() { + get(`/api/all/warehouses`).then((res) => { + data.warehouseList = res.data + }) + } + + function getSuppliersList() { + get(`/api/suppliers`, {pageSize: 1000}).then((res) => { + data.suppliersList = res.data + }) + } + + function getSkusList() { + get(`/api/all/goods-skus`).then((res) => { + data.skusList = res.data + }) + } + + function changeSku(e) { + data.tempData.goodsSkuId = '' + if(e) { + data.tempData.goodsSkuId = e.id + data.tempData.warehouse_id = e.warehouse_id + } + } + onMounted(() => { fetchData() + getWarehouseList() + getSuppliersList() + getSkusList() }) return { @@ -124,7 +236,12 @@ export default { handleCurrentChange, handleSizeChange, fetchData, - + addOut, + commitOut, + getWarehouseList, + getSuppliersList, + getSkusList, + changeSku } } }