From 078b0f6a82ba277a48b82490954e2e8c785de599 Mon Sep 17 00:00:00 2001 From: 13208366016 <47278630@qq.com> Date: Fri, 3 Nov 2023 11:00:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/views/index.js | 8 +- src/views/distribution/signfor/devtmp.vue | 142 +++++++++++++++++++++- 2 files changed, 143 insertions(+), 7 deletions(-) diff --git a/src/router/views/index.js b/src/router/views/index.js index d34332c6..37973a15 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -1048,14 +1048,14 @@ export default [ ], }, { - path: '/distribution/signfor//devtmp', + path: '/distribution/signfor/devtmp', component: Layout, - redirect: '/distribution/signfor//devtmp', + redirect: '/distribution/signfor/devtmp', children: [ { - path: '/distribution/signfor//devtmp', + path: '/distribution/signfor/devtmp', name: '签收明细重构', - component: () => import('@/views/distribution/signfor//devtmp.vue'), + component: () => import('@/views/distribution/signfor/devtmp.vue'), }, ], }, diff --git a/src/views/distribution/signfor/devtmp.vue b/src/views/distribution/signfor/devtmp.vue index bd25875b..720655da 100644 --- a/src/views/distribution/signfor/devtmp.vue +++ b/src/views/distribution/signfor/devtmp.vue @@ -1,7 +1,143 @@ - + + + + .card-header { + font-size: 18px; + font-weight: 500; + } + :deep(.el-divider__text) { + font-size: 16px; + } + .Basic-information { + display: flex; + justify-content: flex-start; + margin-bottom: 50px; + flex-wrap: wrap; + } + .el-txt { + min-width: 280px; + margin-right: 3%; + display: flex; + align-items: center; + i { + margin-right: 5px; + } + .title-name { + font-weight: 500; + } + .el-cont { + font-weight: 400; + padding: 0 10px; + } + } +} + From c9a34b4b261b826e953f81a201605d799f7df324 Mon Sep 17 00:00:00 2001 From: 13208366016 <47278630@qq.com> Date: Sat, 4 Nov 2023 18:20:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=E9=97=AE=E9=A2=98=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=87=8D=E6=9E=84=E9=85=8D=E9=80=81=E5=88=97=E8=A1=A8=E8=AF=A6?= =?UTF-8?q?=E6=83=85=EF=BC=8C=E5=9C=B0=E5=9B=BE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/index/index.vue | 4 +- src/views/distribution/reservation/atlas.vue | 94 +- src/views/distribution/signfor/devtmp.vue | 1167 ++++++++++++++++- .../signfor/distributionSignfortreat.vue | 255 +++- .../turndelivery/deliveryDiscuss.vue | 28 +- 5 files changed, 1434 insertions(+), 114 deletions(-) diff --git a/src/page/index/index.vue b/src/page/index/index.vue index 39325644..95ddc035 100644 --- a/src/page/index/index.vue +++ b/src/page/index/index.vue @@ -16,9 +16,9 @@
- + - +
diff --git a/src/views/distribution/reservation/atlas.vue b/src/views/distribution/reservation/atlas.vue index 4b9fff68..ad35caab 100644 --- a/src/views/distribution/reservation/atlas.vue +++ b/src/views/distribution/reservation/atlas.vue @@ -6,25 +6,25 @@
- -
- - -
- + + + + + + + + + + + +
+ 确认(转配送) + 返 回 +
-
- 确认(转配送) - 返 回 -
@@ -33,7 +33,7 @@ import { useStore } from 'vuex'; import { getReservationAddr } from '@/api/distribution/distributionReservation'; import { getDictionaryBiz } from '@/api/system/dict'; -import { onMounted, reactive, toRefs, watchEffect } from 'vue'; +import { onMounted, reactive, toRefs, watchEffect, ref } from 'vue'; import { useRouter } from 'vue-router'; import { selectStockArticleAtlasInfo } from '@/api/distribution/distributionDeliveryList'; // import { getReservationAddr } from '@/api/distribution/distributionReservation'; @@ -55,6 +55,7 @@ let details = reactive({ drivingarrs: [], // datalist:[] }); +const DataInfo = ref([]); //表格信息 onMounted(() => { initmap(); }); @@ -63,13 +64,11 @@ watchEffect(() => { details.item = router.currentRoute.value.query.id; if (!details.item) return; getReservationAddr(details.item).then(res => { - // selectStockArticleAtlasInfo(details.item.id).then(res => { - console.log(res.data.data); + console.log(res, '获取到的参数+'); + DataInfo.value = res.data.data; + console.log(DataInfo, '接收参数'); + this.console.log(res.data.data); const data = res.data.data; - // details.lng = res.data.data[0].jingdu; - // details.lat = res.data.data[0].weidu; - // details.abbreviation=res?.data?.data[0]?.warehouseName - // console.log('res------------->', data); details.reservationData = data; details.mapLoc.remove(details.markersarr); details.drivingarrs.map(item => { @@ -93,16 +92,17 @@ function initmap() { }); } function checkgoto() { - let ids = [] - details.datalists.map(item=>{ - if(item.isck){ - ids.push(item.items.id) + let ids = []; + details.datalists.map(item => { + if (item.isck) { + ids.push(item.items.id); } - }) - if(ids.length==0){ - return + }); + if (ids.length == 0) { + return; } - let stids=ids.join(',') + let stids = ids.join(','); + // 跳转适配页面 router.push({ path: '/distribution/turndelivery/deliveryMarket', query: { @@ -186,7 +186,7 @@ function Driving(geocodess) { // console.log(result.routes[0]); item.time = formatSeconds(result.routes[0].time); item.distance = result.routes[0].distance / 1000; - item.isck=true + item.isck = true; // item.distance=result.routes[0].distance/1000 details.datalists.push(item); } else { @@ -225,6 +225,7 @@ const { datalists } = toRefs(details); } .mabxmp { display: flex; + height: 100%; align-items: flex-start; > .mapbox { width: 50%; @@ -249,4 +250,31 @@ const { datalists } = toRefs(details); box-sizing: border-box; width: 100%; } +:deep(.el-card) { + height: 100%; +} +.amap-container { + height: 100%; + margin-bottom: 10px; +} +:deep(.el-card__body) { + height: 100%; + .avue-crud { + height: 100%; + .mapbox { + height: 100%; + } + } +} +:deep(.cell) { + display: flex; + padding: 0; + align-items: center; + justify-content: center; +} +:deep(.el-table-column--selection) { + display: flex; + align-items: center; + justify-content: center; +} diff --git a/src/views/distribution/signfor/devtmp.vue b/src/views/distribution/signfor/devtmp.vue index 720655da..a7c31756 100644 --- a/src/views/distribution/signfor/devtmp.vue +++ b/src/views/distribution/signfor/devtmp.vue @@ -12,22 +12,34 @@ - 基本信息 + 基本信息
预约单号: - YYJM2023110200009 + + +
商场名称: - 荆门欧派衣橱 + + +
预约时间: - 2023-11-02 00:00:00 + + +
@@ -37,27 +49,43 @@
配送车次: - PSCCJM2023110200005 + + +
- - 配送司机姓名: - 郑少峰 + + 司机姓名: + + +
- 配送车辆牌照: - 鄂HG40Q9 + 车辆牌照: + + +
装车班组: - 周海强班组 + + +
卸车班组: - 周海强班组 + + +
@@ -65,41 +93,1093 @@ 收货人信息
- + 收货人姓名: - 张三丰 + + +
- + 收货人号码: - 13206596513 + + +
收货人地址: - 中国湖北省荆门市掇刀区,万达 + + +
是否加急: - 否 + + + +
+
+ + 客户备注: + + +
+
+ + 签收信息 +
- - 客户备注: - 周海强班组 - + + 签收类型: + + 签收 + 待签收 + +
+
+ + 定位打卡: + + +
+ +
+
+ 上门照 + + + + + + IMG + +
+ +
+ 堆码照 + + + + + + IMG + +
+ +
+ 易碎照 + + + + + + IMG + +
+ +
+ 家配照 + + + + + + IMG + +
+ +
+ 签收照 + + + + + + IMG + +
+
+ + 商品信息 + + + - + diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue index 22dd7c50..23d863a2 100644 --- a/src/views/distribution/signfor/distributionSignfortreat.vue +++ b/src/views/distribution/signfor/distributionSignfortreat.vue @@ -81,37 +81,38 @@ -
- -
+
+
  • - 司机待签收数：{{ statistics.driverNub }} + + 司机待签收数：{{ statistics.driverNub }}
  • - 文员待审核数：{{ statistics.clerkNub }} + + 文员待审核数：{{ statistics.clerkNub }}
- -
- -
- - - - -
- -
- - - + +
+ +
+ + + + +
+ +
+ + + +
-
- -
+ +
复 核 @@ -239,6 +243,7 @@ + @@ -248,6 +253,112 @@ 取消
+ ------------------------------------------------------------------------------- +
+ + + + + + + + + + + + + + + + 签收 + 待签收 + + + + + + + +
+ 上门照 + + + + + IMG + +
+ +
+ 堆码照 + + + + + IMG + +
+ +
+ 易碎照 + + + + + IMG + +
+ +
+ 家配照 + + + + + IMG + +
+ +
+ 签收照 + + + + + IMG + +
+
@@ -350,6 +461,20 @@ import dayjs from 'dayjs'; export default { data() { return { + dialogImageUrl: '', //图片放大地址 + dialogVisible: false, //图片状态 + TcForm: {}, //弹窗表单 + // 上门照 + DoorstepPhoto: [], + // 堆门照 + StackingPhoto: [], + // 易碎照 + FragilePhotos: [], + // 家配照 + HomePhotos: [], + // 签收照 + SignForPhotos: [], + columnList: [ // { // prop: '', @@ -1227,7 +1352,17 @@ export default { showdrawer(value) { this.drawerShow = value; }, + // 图片上传回调 + handleRemove(uploadFile, uploadFiles) { + console.log(uploadFile, uploadFiles); + console.log('执行了1回调'); + }, + handlePictureCardPreview(uploadFile) { + console.log(uploadFile); + console.log('执行了2回调'); + dialogVisible.value = true; + }, /** * 弹窗的勾选回调，用于更改头部数组 * 固定搭配，只需要更换 columnList @@ -1327,8 +1462,33 @@ export default { this.signform = row; this.signBox = true; getDetail(row.id).then(res => { - console.log("res"); + console.log(res, '点击复核的返回值'); this.form = res.data.data; + this.TcForm = res.data.data; + // 照片回显分类 + this.DoorstepPhoto = []; + this.StackingPhoto = []; + this.FragilePhotos = []; + this.HomePhotos = []; + this.SignForPhotos = []; + res.data.data.printVOList.forEach(item => { + if (item.type == 'photo_1') { + this.DoorstepPhoto.push({ name: item.name, url: item.urlRoute }); + } + if (item.type == 'photo_2') { + this.StackingPhoto.push({ name: item.name, url: item.urlRoute }); + } + + if (item.type == 'photo_3') { + this.FragilePhotos.push({ name: item.name, url: item.urlRoute }); + } + if (item.type == 'photo_4') { + this.HomePhotos.push({ name: item.name, url: item.urlRoute }); + } + if (item.type == 'photo_5') { + this.SignForPhotos.push({ name: item.name, url: item.urlRoute }); + } + }); }); // this.wid= row.id // this.getWrapdetails(this.wpage) @@ -1599,22 +1759,22 @@ export default { width: 258px; } } -.el-zy-top{ - display: flex; - width: 100%; - justify-content: space-between; - align-items: center; - .rows{ - width:50%; - } - .avue-crud__header{ - display: flex; +.el-zy-top { + display: flex; + width: 100%; + justify-content: space-between; + align-items: center; + .rows { + width: 50%; + } + .avue-crud__header { + display: flex; align-items: flex-end; - } + } } -.el-btn{ - :deep(.el-form-item__content){ - align-items: flex-end +.el-btn { + :deep(.el-form-item__content) { + align-items: flex-end; } } .order-info { @@ -1653,4 +1813,23 @@ export default { padding-left: 0; } } +.TcFrom { + :deep(.el-form) { + display: flex; + justify-content: space-between; + flex-wrap: wrap; + .el-form-item { + width: 46%; + } + } +} +.imgName { + span { + font-weight: bold; + font-size: 16px; + } + span::after { + content: ''; + } +} diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue index 8e5130ea..76c9b2ef 100644 --- a/src/views/distribution/turndelivery/deliveryDiscuss.vue +++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue @@ -487,7 +487,7 @@ { TabHeight.value = TabHeight.value.offsetHeight; //表格高度 console.log(TabHeight.value.offsetHeight, 'TabHeight.value.offsetHeight'); }; - // 动态获取DOM高度给表单防止页面出现滚动条 // 页面初始化完成数据回填 onMounted(() => { @@ -2827,7 +2825,7 @@ const SubmitCommercial = () => { .addlalogS { :deep(.el-dialog) { width: 81%; - height: 81%; + min-height: 70%; margin-top: 0; position: fixed; top: 50%;