diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..5111e03 Binary files /dev/null and b/dist.zip differ diff --git a/src/api/product.js b/src/api/product.js index c4cc128..6416be1 100644 --- a/src/api/product.js +++ b/src/api/product.js @@ -776,3 +776,20 @@ export function get_sort(params) { params }) } + +export function resetInventoryUse(data) { + return request({ + url: 'sale/manage/wares/resetInventoryUse', + method: 'post', + data + }) +} + +export function getOutOfStockProduct(params) { + return request({ + url: 'sale/manage/wares/list-no-sale', + method: 'get', + params + }) +} + diff --git a/src/api/wholeNetwork/index.js b/src/api/wholeNetwork/index.js new file mode 100644 index 0000000..27320c1 --- /dev/null +++ b/src/api/wholeNetwork/index.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function getSystemSourceList() { + return request({ + url: '/system//pub/enums/product-source', + method: 'get' + }) +} diff --git a/src/api/wholeNetwork/orderSync.js b/src/api/wholeNetwork/orderSync.js new file mode 100644 index 0000000..a2043c1 --- /dev/null +++ b/src/api/wholeNetwork/orderSync.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + +export function getOrderSyncFailList(params) { + return request({ + url: '/sale/manage/order-sync/list', + method: 'get', + params + }) +} + +export function updateOrderSyncStatus(data) { + return request({ + url: '/sale/manage/order-sync/updateStatus', + method: 'post', + data + }) +} diff --git a/src/api/wholeNetwork/productManage.js b/src/api/wholeNetwork/productManage.js new file mode 100644 index 0000000..90bd3c8 --- /dev/null +++ b/src/api/wholeNetwork/productManage.js @@ -0,0 +1,48 @@ +import request from '@/utils/request' + +export function getProductList(params) { + return request({ + url: '/sale/manage/all-product/list', + method: 'get', + params + }) +} + +export function addProductInfo(params) { + return request({ + url: '/sale/manage/all-product/save', + method: 'post', + data: params + }) +} + +export function updateProductInfo(params) { + return request({ + url: '/sale/manage/all-product/update', + method: 'post', + data: params + }) +} + +export function deleteProduct(id) { + return request({ + url: `/sale/manage/all-product/${id}`, + method: 'delete' + }) +} + +export function updateProductInventory(params) { + return request({ + url: '/sale/manage/all-product/change-inventory', + method: 'post', + data: params + }) +} + +export function getProductDetailsList(params) { + return request({ + url: '/sale/manage/all-product-detail/list', + method: 'get', + params + }) +} diff --git a/src/components/Delivery/unhandeled.vue b/src/components/Delivery/unhandeled.vue index 7fdbff6..a534b95 100644 --- a/src/components/Delivery/unhandeled.vue +++ b/src/components/Delivery/unhandeled.vue @@ -41,6 +41,13 @@ >订单抵扣 --> + - + { + const params = { + ...this.params, + pkWaresList: this.params.pkWaresList ? this.params.pkWaresList.split(',') : [], + mergeType: this.hdform.mergeType + } del - .deliverUnhandeldMerge( - Object.assign({}, this.params, { - mergeType: this.hdform.mergeType - }) - ) + .deliverUnhandeldMerge(params) .then((res) => { this.$message({ message: res.msg, diff --git a/src/router/index.js b/src/router/index.js index c122966..6e1bd93 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4084,6 +4084,28 @@ export const constantRoutes = [ } ] }, + { + path: '/whole-network', + name: 'WholeNetwork', + component: Layout, + meta: { title: '全网管理', icon: 'info', icon1: 'infoSel' }, + children: [ + + { + path: 'productManageSummary', + name: 'WholeNetworkProductManageSummary', + component: () => import('@/views/wholeNetwork/productManage/summary'), + meta: { title: '全网产品统计' } + }, + { + path: 'orderSyncFail', + name: 'WholeNetworkOrderSyncFail', + component: () => import('@/views/wholeNetwork/orderSyncFail/index'), + meta: { title: '同步失败订单' } + } + + ] + }, // { // path: 'external-link', // component: Layout, diff --git a/src/views/configManage/advertisementBanner/index.vue b/src/views/configManage/advertisementBanner/index.vue index 003383c..93fb026 100644 --- a/src/views/configManage/advertisementBanner/index.vue +++ b/src/views/configManage/advertisementBanner/index.vue @@ -9,7 +9,7 @@
- + + + + + + + @@ -35,7 +50,7 @@ - +
- {{ '搜索' }} + {{ '搜索' }} {{ '重置' }}
@@ -59,13 +74,13 @@
- {{'添加'}} + {{ '添加' }}
- + - + + - + { - this.yesnouploadsList = res.data - }) - }, + // 认证下拉选 getattestation() { getattestation().then((res) => { diff --git a/src/views/logistics/delivery/components/OutOfStockProductList.vue b/src/views/logistics/delivery/components/OutOfStockProductList.vue new file mode 100644 index 0000000..8445317 --- /dev/null +++ b/src/views/logistics/delivery/components/OutOfStockProductList.vue @@ -0,0 +1,243 @@ + + + + + diff --git a/src/views/logistics/delivery/index.vue b/src/views/logistics/delivery/index.vue index f075384..d9fef6d 100644 --- a/src/views/logistics/delivery/index.vue +++ b/src/views/logistics/delivery/index.vue @@ -6,7 +6,7 @@ :moren="moren" />
- + @@ -1286,14 +1206,16 @@ import nowdelivery from '@/components/Delivery/nowdelivery.vue' import * as del from '@/api/delivery.js' import { getvertexValue } from '@/api/member' import { getRouters } from '@/api/settle' -import { productList } from '@/api/product' +import OutOfStockProductList from './components/OutOfStockProductList.vue' + export default { name: 'Fhqd', components: { topBar, unhandeled, yihandeled, - nowdelivery + nowdelivery, + OutOfStockProductList }, data() { return { @@ -1309,7 +1231,7 @@ export default { dialogList: [], lsArr: [], tableData: [], - productLists: [], + productLists: '', systemAllList: [ { label: '是', @@ -1368,7 +1290,7 @@ export default { payTime: [], printTime: [], // 打印时间2 deliverTime: [], // 发货时间2 - productIdList: [], + pkWaresList: [], systemAll: 0 }, isActive: true, @@ -1385,7 +1307,8 @@ export default { menu2: false, menu3: false, menu4: false, - vertexList: [] // 隶属体系 + vertexList: [], // 隶属体系 + selectedProductList: [] } }, created() { @@ -1395,84 +1318,15 @@ export default { }, methods: { clearProduct() { - this.tableData = [] - this.lsArr = [] - this.queryParams.productIdList = [] - this.productLists = [] + this.selectedProductList = [] + this.queryParams.pkWaresList = [] + this.productLists = '' }, openDig() { - this.select = {} - productList(Object.assign({ isPutOn: 0 }, this.queryParams)).then( - (res) => { - res.rows.forEach((item) => { - item.quantity = 1 - item.pkProduct = item.pkProduct - item.isGift = 0 - }) - this.dialogList = res.rows - this.total = res.total - } - ) this.dialogVisible = true + this.select = {} }, - handleClose() { - this.dialogVisible = false - }, - getDataList() { - productList( - Object.assign({ isPutOn: 0 }, this.queryParams, this.select) - ).then((res) => { - res.rows.forEach((item) => { - item.quantity = 1 - item.pkProduct = item.pkProduct - item.isGift = 0 - }) - this.dialogList = res.rows - this.total = res.total - }) - }, - dialogChange(val) { - this.lsArr = val - }, - onSubmit() { - // this.tableData = [] - this.lsArr.forEach((item) => { - this.tableData.push(item) - }) - // this.tableData = this.clearArr(this.tableData) - this.dialogVisible = false - this.dialogList.forEach((row) => { - this.$refs.lessonTableRef.toggleRowSelection(row, false) - }) - // 判断重复 - const arr = this.tableData - let isTrue = false - for (var i = 0; i < arr.length; i++) { - // 首次遍历数组 - for (var j = i + 1; j < arr.length; j++) { - // 再次遍历数组 - if (arr[i].productCode == arr[j].productCode) { - if (arr[i].isGift == arr[j].isGift) { - isTrue = true - } - } - } - } - if (isTrue) { - this.$message.error('请勿选择重复的商品') - this.tableData = [] - this.lsArr = [] - this.queryParams.productIdList = [] - this.productLists = [] - return - } - this.queryParams.productIdList = [] - this.productLists = [] - this.tableData.forEach((item) => { - this.queryParams.productIdList.push(item.pkId) - this.productLists.push(item.productName) - }) - }, + tableRowClassName({ row, rowIndex }) { if (rowIndex % 2 == 1) { return 'warning-row' @@ -1614,17 +1468,23 @@ export default { }, // 重置 reChongzhi() { + this.selectedProductList = [] this.queryParams = { pageNum: 1, pageSize: 500, orderStatus: 1 } - this.productLists = [] + this.productLists = '' this.getSearch() }, // 展开折叠 changeActive() { this.isActive = !this.isActive + }, + handleSubmit(products) { + this.selectedProductList = [...products] + this.queryParams.pkWaresList = products.map((item) => item.pkId).join(',') + this.productLists = products.map((item) => item.waresName).join(',') } } } diff --git a/src/views/selfService/register/index.vue b/src/views/selfService/register/index.vue index b1fe0e0..50c4a45 100644 --- a/src/views/selfService/register/index.vue +++ b/src/views/selfService/register/index.vue @@ -6,180 +6,240 @@ -->