diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue index db2d437c..dd64bb0b 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue @@ -6,6 +6,9 @@ + + + @@ -413,7 +416,16 @@ export default { fixed: false, sortable: true, }, - + { + prop: 'clineName', + label: '客户名称', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'kindName', label: '配送种类', diff --git a/src/views/distribution/reservation/atlas.vue b/src/views/distribution/reservation/atlas.vue index 332149d1..bd97f89d 100644 --- a/src/views/distribution/reservation/atlas.vue +++ b/src/views/distribution/reservation/atlas.vue @@ -90,11 +90,18 @@ watchEffect(() => { // }, 5000); }); function initmap() { - details.mapLoc = new AMap.Map('container', { + + AMap.plugin("AMap.Geocoder",function(){ + details.mapLoc = new AMap.Map('container', { viewMode: '2D', // 默认使用 2D 模式 zoom: 9, //初始化地图层级 center: [104.293242, 30.582939], //初始化地图中心点 }); + + }) + + + } function checkgoto() { let ids = []; diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue index 6492ae4c..020dab41 100644 --- a/src/views/distribution/reservation/reservationAddFrom.vue +++ b/src/views/distribution/reservation/reservationAddFrom.vue @@ -124,7 +124,7 @@ - 新 增 + 新 增 - 新 增 + 新 增 + + diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue index 36015aa8..8a0711fb 100644 --- a/src/views/distribution/stockup/distributionStockupMarket.vue +++ b/src/views/distribution/stockup/distributionStockupMarket.vue @@ -13,7 +13,8 @@ --> - +
+ + + + +
搜 索 @@ -340,6 +345,17 @@ export default { sortable: true, head: false, }, + { + prop: 'consignee', + label: '客户名称', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, { prop: 'stockupDate', label: '备货时间', @@ -1142,5 +1158,8 @@ export default { flex: 1; display: flex; align-items: flex-end; +} +.el-input-so{ + } diff --git a/vite.config.js b/vite.config.js index c695de61..1dd07766 100644 --- a/vite.config.js +++ b/vite.config.js @@ -18,9 +18,9 @@ export default ({ mode, command }) => { // lmy // target: 'http://192.168.10.123:8889', // cyz - target: 'http://192.168.10.75:8777', + // target: 'http://192.168.10.75:8777', // tjj - // target: 'http://192.168.10.29:13000', + target: 'http://192.168.10.29:13000', // sst // target: 'http://192.168.10.94:8888', // target: 'http://192.168.10.29:13000',