diff --git a/index.html b/index.html index 2237763e..4d8ba549 100644 --- a/index.html +++ b/index.html @@ -23,6 +23,7 @@ + diff --git a/src/api/distribution/distributionDelivery.js b/src/api/distribution/distributionDelivery.js index f13baae4..9a2ef054 100644 --- a/src/api/distribution/distributionDelivery.js +++ b/src/api/distribution/distributionDelivery.js @@ -47,4 +47,16 @@ export const updateDelivery = (row) => { data: row }) } +/** + * 订单添加增值服务 + * @param row + * @returns {AxiosPromise} + */ +export const addIncrement = (row) => { + return request({ + url: '/api/logpm-distribution/delivery/addIncrement', + method: 'post', + data: row + }) +} diff --git a/src/api/distribution/distributionReservation.js b/src/api/distribution/distributionReservation.js index 594b2762..6d68e7f5 100644 --- a/src/api/distribution/distributionReservation.js +++ b/src/api/distribution/distributionReservation.js @@ -34,7 +34,7 @@ export const remove = (ids) => { export const add = (row) => { return request({ - url: '/api/logpm-distribution/reservation/submit', + url: '/api/logpm-distribution/reservation/save', method: 'post', data: row }) @@ -55,7 +55,20 @@ export const update = (row) => { */ export const confirms = (row) => { return request({ - url: '/api/logpm-distribution/reservation/addIds', + url: '/api/logpm-distribution/reservation/stockUpTask', + method: 'post', + data:row + }) +} + +/** + * 批量转备货 + * @param row + * @returns {AxiosPromise} + */ +export const addReservations = (row) => { + return request({ + url: '/api/logpm-distribution/reservation/confirmReservations', method: 'post', data:row }) diff --git a/src/api/distribution/distributionStockArticle.js b/src/api/distribution/distributionStockArticle.js index fb9daefa..516af27f 100644 --- a/src/api/distribution/distributionStockArticle.js +++ b/src/api/distribution/distributionStockArticle.js @@ -58,3 +58,16 @@ export const update = (row) => { }) } +/** + * 订单添加增值服务 + * @param row + * @returns {AxiosPromise} + */ +export const addIncrement = (row) => { + return request({ + url: '/api/logpm-distribution/distributionStockArticle/addIncrement', + method: 'post', + data: row + }) +} + diff --git a/src/main.js b/src/main.js index 4402e6e8..73dfcb8c 100644 --- a/src/main.js +++ b/src/main.js @@ -27,10 +27,15 @@ import dayjs from 'dayjs'; import 'styles/common.scss'; // 业务组件 import tenantPackage from './views/system/tenantpackage.vue'; -// import AvueMap from 'avue-plugin-map'; -// main.js -// import htmlToPdf from './utils/htmlToPdf' - +import AvueMap from 'vue-amap'; +// AvueMap.initAMapApiLoader({ +// //申请地址 https://lbs.amap.com/ 选择web端jsAPI +// key: '40448f21dfc7a531e9db4c405d955bea', +// // 插件集合，用到什么插件就使用什么插件 +// plugin: ['AMap.Autocomplete', 'AMap.PlaceSearch', 'AMap.Scale', 'AMap.OverView', 'AMap.ToolBar', 'AMap.MapType', 'AMap.PolyEditor', 'AMap.CircleEditor'], +// v: '1.4.4', // 高德sdk版本，最新的sdk已经出到了2.0 +// //官网解释：JSAPI 2.0 提供的开发接口与 1.4 版本达到 99%的兼容度，但是为了保证插件的稳定性我们还是选择1.4.4。 +// }) window.$crudCommon = crudCommon; window.axios = axios; @@ -50,8 +55,8 @@ app.config.globalProperties.website = website; app.config.globalProperties.getScreen = getScreen; app.use(error); app.use(i18n); -// app.use(AvueMap); -// app.use(htmlToPdf) +app.use(AvueMap); + app.use(store); app.use(router); diff --git a/src/option/basicdata/basicdataGoodsAllocation.js b/src/option/basicdata/basicdataGoodsAllocation.js index b10a13ee..153e5349 100644 --- a/src/option/basicdata/basicdataGoodsAllocation.js +++ b/src/option/basicdata/basicdataGoodsAllocation.js @@ -8,6 +8,7 @@ export default { index: true, viewBtn: true, selection: true, + addBtn:false, indexWidth:'150', indexLabel:"序号", dialogClickModal: false, @@ -208,7 +209,7 @@ export default { label: "启用状态", prop: "enableStatus", type: "select", - search: true, + search: false, labelWidth:'100', dicUrl: '/api/blade-system/dict-biz/dictionary?code=enable_status', props: { @@ -217,7 +218,9 @@ export default { }, addDisplay: false, align:'center', - + editDisplay: false, + viewDisplay: false, + hide: true, }, { label: "货位状态", @@ -232,7 +235,6 @@ export default { }, addDisplay: false, align:'center', - }, { label: "二维码", diff --git a/src/option/basicdata/basicdataTray.js b/src/option/basicdata/basicdataTray.js index ee9d6ef0..9f7badbc 100644 --- a/src/option/basicdata/basicdataTray.js +++ b/src/option/basicdata/basicdataTray.js @@ -119,12 +119,12 @@ export default { // prop: "reserve5", // type: "input", // }, - { - label: "托盘名称", - prop: "palletName", - type: "input", - labelWidth:'100', - }, + // { + // label: "托盘名称", + // prop: "palletName", + // type: "input", + // labelWidth:'100', + // }, { label: "仓 库", prop: "warehouseId", @@ -184,6 +184,16 @@ export default { viewDisplay: true, hide: false }, + { + label: "数量", + prop: "number", + type: "number", + labelWidth:'100', + addDisplay: true, + editDisplay: false, + viewDisplay: false, + hide: true + }, // { // label: "二维码", // prop: "qrCode", diff --git a/src/option/distribution/distributionDelivery.js b/src/option/distribution/distributionDelivery.js index 48625b03..f61a0455 100644 --- a/src/option/distribution/distributionDelivery.js +++ b/src/option/distribution/distributionDelivery.js @@ -59,13 +59,17 @@ export default { hide: true, }, { - label: "订单自编号", - prop: "orderId", + label: "预约编号", + prop: "reservationId", }, { label: "运单号", prop: "waybillId", }, + { + label: "订单自编号", + prop: "orderId", + }, { label: "商城编号", prop: "shoppingId", @@ -106,6 +110,18 @@ export default { label: "待收货款", prop: "replaceFee", }, + { + label: "预约状态", + prop: "reservationStatus", + }, + { + label: "订单来源", + prop: "orderSource", + }, + + + + // { // label: "预留1", // prop: "reserve1", diff --git a/src/option/distribution/distributionReservation.js b/src/option/distribution/distributionReservation.js index 9473bf85..8f25c4da 100644 --- a/src/option/distribution/distributionReservation.js +++ b/src/option/distribution/distributionReservation.js @@ -61,7 +61,7 @@ export default { { label: "订单自编号", prop: "orderId", - width:'120' + width:'173' }, { label: "收货人", @@ -77,7 +77,7 @@ export default { }, { label: "预约时间", - prop: "reservationData", + prop: "reservationDate", width:'150' }, { @@ -112,7 +112,7 @@ export default { }, { label: "预约信息状态", - prop: "resvervationStatus", + prop: "reservationStatus", width:'120' }, { diff --git a/src/option/distribution/distributionStockArticle.js b/src/option/distribution/distributionStockArticle.js index f4699450..afe857aa 100644 --- a/src/option/distribution/distributionStockArticle.js +++ b/src/option/distribution/distributionStockArticle.js @@ -154,6 +154,10 @@ export default { label: "顾客地址", prop: "customerAddress", }, + { + label: "增值服务", + prop: "fee", + }, // { // label: "类型;1 预约单 2库存单", // prop: "genre", diff --git a/src/router/views/index.js b/src/router/views/index.js index 44361b11..6b53f1e4 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -398,18 +398,31 @@ export default [ component: () => import('@/views/basic/property/basicPropertyform.vue'), }, ], - }, { + }, + { path: '/distribution/reservation/reservationFrom', component: Layout, - redirect: '/distribution/reservation', + redirect: '/distribution/reservation/reservationFrom', children: [ { path: '/distribution/reservation/reservationFrom', - name: 'name', + name: '添加预约', component: () => import('@/views/distribution/reservation/reservationFrom.vue'), }, ], }, + { + path: '/distribution/reservation/atlas', + component: Layout, + redirect: '/distribution/reservation/atlas', + children: [ + { + path: '/distribution/reservation/atlas', + name: '地图展示', + component: () => import('@/views/distribution/reservation/atlas.vue'), + }, + ], + }, { path: '/basic/property/basicrecordslist', component: Layout, diff --git a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue index 250990ae..02dd5fe4 100644 --- a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue +++ b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue @@ -139,7 +139,7 @@ - + { this.form = res.data.data; + console.log(this.form); }); }, handleView (row) { diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue index 0e246a1d..921eaa76 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue @@ -163,12 +163,7 @@ - - - - - - + - + + + + + + @@ -348,6 +348,8 @@ export default { { required: true, message: '请选择启用状态!', trigger: 'change' } ], }, + //货架状态控制 + idShowStatus:false, } }, created() { @@ -453,6 +455,7 @@ export default { this.box = true this.isShowgoodsArea=true; this.isShowQRCode = false; + this.idShowStatus = false; this.$refs['form'].resetFields(); }, @@ -461,6 +464,7 @@ export default { this.box = true this.isShowgoodsArea=false; this.isShowQRCode = false; + this.idShowStatus = true; getDetail(row.id).then(res => { console.log(">>>>>>>>>>>",row); res.data.data.goodsShelfStatus = res.data.data.goodsShelfStatus.toString(); diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue index f973216e..d15f1d4c 100644 --- a/src/views/distribution/reservation/reservation.vue +++ b/src/views/distribution/reservation/reservation.vue @@ -21,7 +21,9 @@
添加预约 - 批量确认 + 批量确认 + 批量转备货 + 批量转配送
@@ -94,7 +96,7 @@ - + @@ -155,9 +157,10 @@