From 4c9b285ee7985e842c13e5828eb3d22f5f863daa Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sat, 25 Nov 2023 17:13:51 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=9B=BE=E7=89=87zip?= =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/distribution/distributionSignfor.js | 1 + .../signfor/distributionSignfor.vue | 97 +++++++++++++++++-- 2 files changed, 90 insertions(+), 8 deletions(-) diff --git a/src/api/distribution/distributionSignfor.js b/src/api/distribution/distributionSignfor.js index 2cbb6b70..b4dd09ec 100644 --- a/src/api/distribution/distributionSignfor.js +++ b/src/api/distribution/distributionSignfor.js @@ -66,6 +66,7 @@ export const handlePicture = ids => { params: { ids }, + responseType: 'blob', }) }; diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue index afa0d120..cd7dfd54 100644 --- a/src/views/distribution/signfor/distributionSignfor.vue +++ b/src/views/distribution/signfor/distributionSignfor.vue @@ -115,6 +115,7 @@ 导出 + 导出图片 @@ -215,9 +216,29 @@ + + + +
+ + +
+ + 取 消 + 确 定 + + + + + + >>>>>>>>>",this.selectionList); if (this.selectionList.length < 1){ this.$message({ @@ -729,16 +756,69 @@ export default { message: '请选择签收记录!', }); } - const idList= this.selectionList.map(item=>{ - return item.id - }) - console.log(idList); - const ids = idList.join(','); - console.log("ids>>>>>>>>>>>>",ids); - handlePicture(ids).then(res=>{ - console.log("res><>>>>>>>>>>>>>",res); + + const idList= this.selectionList.map(item=>{ + console.log('>>>>>>>>>',item); + return{id:item.id,reservationCode:item.reservationCode,client:item.consignee} }) + const _arr = []; + console.log(idList); + if (idList.length > 0){ + // this.fullscreenLoading = true; + // this.dialogVisible = true; + + idList.forEach(item=>{ + return _arr.push(handlePicture(item.id)); + }) + + + console.log('arr>>>>>>>>>>>>>>>>>>>>',_arr); + function delayedTimer() { + console.log('Delayed timer executed!'); + } + const timerId = setTimeout(delayedTimer, 500); + Promise.all(_arr).then((response)=>{ + + console.log('response>>>>>>>>>>>>>>>>>>>>>',response); + response.forEach((res, index) =>{ + console.log('res>>>>>>>>>>>>>>>>>>>>>',res.data); + if (res.data.size > 0){ + const _item = idList[index]; + const blob = new Blob([res.data], {type: 'application/zip'}); + let a = document.createElement("a"); + a.href = window.URL.createObjectURL(blob); + // a.href = 'http://192.168.10.25:2888/D:/Test'; + a.download = _item.client +'-'+_item.reservationCode +".zip"; + // a.download = 'aaa' + ".zip"; + a.style.display = "none"; + document.body.appendChild(a); + a.click(); // 模拟点击了a标签，会触发a标签的href的读取，浏览器就会自动下载了 + a.remove(); + } + }) + for (let i = 0; i < 100; i++) { + this.fileSize = i; + } + // this.dialogVisible = false; + setTimeout(() => { + clearTimeout(timerId); + console.log('延迟执行完成'); + this.fullscreenLoading = false; + + this.$notify({ + title: '提示', + message: ('i', { style: 'color: teal'}, '开始下载...') + }); + }, 3000); + }) + + + // 在 3 秒之后，自动清除定时器 + + } + + // row.signingStatus = '2'; // row = { ...row, ...this.query }; @@ -748,6 +828,7 @@ export default { // downloadXls(res.data, '签收数据.xlsx'); // }); }, + showdrawer(value) { this.drawerShow = value; }, From 1f47338162b4d74fafa0c5439b66553a79d7a1f8 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Sat, 25 Nov 2023 19:08:27 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E5=85=A8=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/distribution/TripartiteTransfer.js | 872 ++++++++++++++++++ src/styles/common.scss | 4 + src/utils/util.js | 51 +- .../artery/TripartiteTransfer.vue | 339 ++++++- .../distribution/artery/VehicleStowage.vue | 61 +- .../carry/distributionStockCarry.vue | 522 ++++++----- 6 files changed, 1571 insertions(+), 278 deletions(-) create mode 100644 src/option/distribution/TripartiteTransfer.js diff --git a/src/option/distribution/TripartiteTransfer.js b/src/option/distribution/TripartiteTransfer.js new file mode 100644 index 00000000..e4cd659b --- /dev/null +++ b/src/option/distribution/TripartiteTransfer.js @@ -0,0 +1,872 @@ +/** 三方中转列表 */ +export const columnList = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'billladingCode', + label: '中转批次号', + type: 13, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'carNumber', + label: '承运商', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: true, + sortable: true, + }, + { + prop: 'driverName', + label: '承运日期', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: true, + sortable: true, + }, + { + prop: 'driverPhone', + label: '付款方式', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'warehouseName', + label: '运费', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'lineNameTitle', + label: '代收贷款', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'nodeNub', + label: '承运单号', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'startTime', + label: '发站仓库', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'endTime', + label: '状态', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'planVolume', + label: '是否结算', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'billladingStatus', + label: '客户类型', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'chargeType', + label: '发车时间', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'totalFee', + label: '计划出库', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'remark', + label: '实际装车', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'carrierName', + label: '送货方式', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'waybillCount', + label: '经办人', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'totalNum', + label: '创建时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'totalWeight', + label: '结算金额', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'totalVolume', + label: '结算人', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'createUserName', + label: '签收时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '300', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; + +/** 装车详情列表 */ +export const detailsColumnList = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'orderCode', + label: '运单号', + type: 13, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '合同号', + type: 13, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'orderPackageCode', + label: '包条码', + type: 13, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'driverName', + label: '计划目的地', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'driverPhone', + label: '目的地', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'warehouseName', + label: '装卸状态', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'lineNameTitle', + label: '订单来源', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'nodeNub', + label: '装车仓库', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'startTime', + label: '扫码时间', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'endTime', + label: '装卸仓库', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'planVolume', + label: '卸车时间', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'billladingStatus', + label: '装车类型', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'chargeType', + label: '是否补录', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'totalFee', + label: '是否齐套', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'remark', + label: '托盘码', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'carrierName', + label: '一级品类', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'waybillCount', + label: '二级品类', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'totalNum', + label: '三级品类', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'totalWeight', + label: '物料名称', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'totalVolume', + label: '装车扫描人', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'createUserName', + label: '卸车人', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'totalWeight', + label: '同步状态', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, +]; + +/** 运单池列表 */ +export const oldColumnList = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'orderCode', + label: '开单日期', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderPackageCode', + label: '运单号', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'driverName', + label: '到站', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'driverPhone', + label: '目的网点', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'warehouseName', + label: '发货单位', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'lineNameTitle', + label: '收货单位', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'nodeNub', + label: '收货人', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'startTime', + label: '托盘码', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'endTime', + label: '品类名称', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'planVolume', + label: '件数', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'billladingStatus', + label: '在库数', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'chargeType', + label: '单价', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'totalFee', + label: '重量(kg)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'remark', + label: '体积', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'carrierName', + label: '运费', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'waybillCount', + label: '客户车次', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'totalNum', + label: '运单备注', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, +]; + +/** 调度池列表 */ +export const newColumnList = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'orderCode', + label: '开单日期', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderPackageCode', + label: '运单号', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'driverName', + label: '到站', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'driverPhone', + label: '目的网点', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'warehouseName', + label: '发货单位', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'lineNameTitle', + label: '收货单位', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'nodeNub', + label: '收货人', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'startTime', + label: '托盘码', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'endTime', + label: '品类名称', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'planVolume', + label: '件数', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'billladingStatus', + label: '在库数', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'chargeType', + label: '单价', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'totalFee', + label: '重量(kg)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'remark', + label: '体积', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'carrierName', + label: '运费', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'waybillCount', + label: '客户车次', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'totalNum', + label: '运单备注', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, +]; diff --git a/src/styles/common.scss b/src/styles/common.scss index ffbdfa16..3260ddc5 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -152,6 +152,10 @@ a { margin-top: 10px; } +.pointer { + cursor: pointer; +} + // ele样式覆盖 @import './element-ui.scss'; // 顶部右侧显示 diff --git a/src/utils/util.js b/src/utils/util.js index 6aa7f33e..4df593cf 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -277,13 +277,13 @@ export const openWindow = (url, title, w, h) => { const width = window.innerWidth ? window.innerWidth : document.documentElement.clientWidth - ? document.documentElement.clientWidth - : screen.width; + ? document.documentElement.clientWidth + : screen.width; const height = window.innerHeight ? window.innerHeight : document.documentElement.clientHeight - ? document.documentElement.clientHeight - : screen.height; + ? document.documentElement.clientHeight + : screen.height; const left = width / 2 - w / 2 + dualScreenLeft; const top = height / 2 - h / 2 + dualScreenTop; @@ -291,13 +291,13 @@ export const openWindow = (url, title, w, h) => { url, title, 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=yes, copyhistory=no, width=' + - w + - ', height=' + - h + - ', top=' + - top + - ', left=' + - left + w + + ', height=' + + h + + ', top=' + + top + + ', left=' + + left ); // Puts focus on the newWindow @@ -315,18 +315,18 @@ export const getScreen = isCollapse => { }; export const getHtmls = (arrs, htmldemo) => { - let html = '' + let html = ''; arrs.map(item => { let strhtml = JSON.parse(JSON.stringify(htmldemo)); for (let key in item) { let str = '\\$\\{' + key + '\\}'; - let reg=new RegExp(str,"g") + let reg = new RegExp(str, 'g'); strhtml = strhtml.replace(reg, item[key]); } html += strhtml; }); - return html -} + return html; +}; /** * 获取顶部地址栏地址 */ @@ -424,3 +424,24 @@ export const downloadXls = (fileArrayBuffer, filename) => { window.open(URL.createObjectURL(file)); } }; + +/** + * 设置元素节点高度 + * @param {node} node 元素 type: element || array + * @param {string} height 高度 (非必填) type: string + */ +export const setNodeHeight = (_node, _height) => { + // 判断是否传入的是数组 + const _type = Object.prototype.toString.call(_node); + console.log('_type :>> ', _type); + // 传入数组时 + if (_type === '[object Array]') { + console.log('333 :>> ', 333); + } + // 传入单一节点时 + else if (_type === '[object HTMLDivElement]') { + console.log('222 :>> ', 222); + if (_height) _node.style.height = _height; + console.log('_node :>> ', _node); + } +}; diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue index a5792d6f..cc4c7cee 100644 --- a/src/views/distribution/artery/TripartiteTransfer.vue +++ b/src/views/distribution/artery/TripartiteTransfer.vue @@ -78,7 +78,9 @@
- 新增中转 + 新增中转 + 装载清单 装载卸车清单(财务)
- + - + - 批量卸车 + 中转批量签收 搜 索 二维码 +
@@ -232,16 +239,195 @@ :total="trickleLoadingPage.total" > + + + + + +
+ + + + + + + + + + + + + + +
+
+ +
+ + +
+ +
+
运单池
+
+ +
+ + + + + + + + + + + + + 搜 索 + 重置 + +
+ +
+ +
+ +
+ + + +
+ + + 加入调度池 + + +
+ + + +
+ +
- - + + +
+
+ + +
+
调度池
+
+ +
+ + + + + + + + + + + + 搜 索 + 重置 + +
+ +
+ +
+ + + 移除调度池 + + + +
+ + + +
+
+ - 取 消 + +
+ +
- --> + + +
@@ -249,7 +435,7 @@ @setcolum="setnewcolum" @closce="showdrawer" :drawerShow="drawerShow" - :columnList="columnList" + :columnList="details.editColumnList" > @@ -261,7 +447,12 @@ import { mapGetters } from 'vuex'; /** 获取字典 */ import { getDictionaryBiz } from '@/api/system/dict'; import { downloadXls } from '@/utils/util'; -import { columnList, detailsColumnList } from '@/option/distribution/VehicleStowage'; +import { + columnList, + detailsColumnList, + oldColumnList, + newColumnList, +} from '@/option/distribution/TripartiteTransfer'; import { useRouter } from 'vue-router'; // 获取路由实例 @@ -306,9 +497,18 @@ const details = reactive({ stockupDate: [], /** 列表 */ columnList, + /** 装车明细表头信息 */ detailsColumnList, + /** 修改的列表信息 */ + editColumnList: [], + /** 运单池 */ + oldColumnList, + /** 调度池 */ + newColumnList, /** 列表数据 */ data: [{}], + newData: [], + oldData: [], /** 页面loading */ loadingObj: { /** 列表加载loading */ @@ -336,7 +536,7 @@ const details = reactive({ /** 装车详情 */ truckLoadingDetailVisited: false, /** 零担补录 */ - zeroAdditionalRecordingVisited: false, + transferVisited: false, }, /** 列表Dom节点 */ listNode: '', @@ -396,7 +596,18 @@ const searchReset = () => { }; /** 展开列表控件 */ -const showdrawer = (_flag?: boolean) => { +const showdrawer = (_flag?: boolean, _type?: string) => { + switch (_type) { + case 'truckLoadingDetail': + details.editColumnList = details.detailsColumnList; + break; + + default: + console.log('123 :>> ', 123); + details.editColumnList = details.columnList; + break; + // details. + } details.drawerShow = _flag; }; @@ -459,6 +670,44 @@ const selectionChange = (list: any) => { details.selectionList = list; }; +/** 表格表头输入框搜索 */ +const newInputsc = (index, row) => { + details.newQuery[row.prop] = index; + onLoad(details.page); +}; + +/** 表格表头时间选择 */ +const newTimesc = (index, row) => { + console.log(index, row); + if (!!index) { + index = dayjs(index).format('YYYY-MM-DD'); + } + details.newQuery[row.prop] = index; + if (!index) { + delete details.newQuery[row.prop]; + } + onLoad(details.page); +}; + +/** 表格表头输入框搜索 */ +const newBtnsc = () => {}; + +/** 表格表头下拉框选择 */ +const newSelectsc = (index, row) => { + details.newQuery[row.prop] = index; + if (!index) delete details.newQuery[row.prop]; + if (row.prop === 'certificateTypeName') { + details.newQuery['certificateType'] = index; + if (!index) delete details.newQuery['certificateType']; + } + onLoad(details.page); +}; + +/** 表格表头复选框选择 */ +const newSelectionChange = (list: any) => { + details.newSelectionList = list; +}; + /** 每页数量改变执行的回调 */ const sizeChange = (pageSize: number) => { details.page.pageSize = pageSize; @@ -475,13 +724,13 @@ const currentChange = () => {}; * */ const setnewcolum = (newarr, headarr, type) => { if (type == 1) { - details.columnList = newarr; + details.editColumnList = newarr; functions.setStorage(window.location.pathname + 'checkList', headarr); } else if (type == 2) { - details.columnList = newarr; + details.editColumnList = newarr; functions.setStorage(window.location.pathname + 'flexList', headarr); } else if (type == 3) { - details.columnList = newarr; + details.editColumnList = newarr; functions.setStorage(window.location.pathname + 'sortlist', headarr); } }; @@ -505,11 +754,59 @@ const handleShowTruckLoadingDetails = ({ row }) => { }); }; -/** 显示零担补录 */ +/** 跳转零担补录 */ const handleShowzeroAdditionalRecording = ({ row }) => { // 跳转到零担补录页面 $router.push('/distribution/artery/zeroAdditionalRecording'); }; + +/** 新增中转 */ +const addTransfer = async () => { + return null; +}; + +/** 修改中转 */ +const editTransfer = async () => { + return null; +}; + +/** 显示新增或修改中转弹窗 */ +const handleShowTransfer = async (_type: string) => { + switch (_type) { + // 新增 + case 'add': + await addTransfer(); + break; + + // 修改 + case 'edit': + await editTransfer(); + break; + + default: + break; + } + details.popUpShow.transferVisited = true; + + nextTick(() => { + // 获取弹窗内表格元素节点, 并设置高度 + const _nodeList = document.querySelectorAll('.transferPopUp .maboxhi'); + _nodeList.forEach(val => (val.style.height = '300px')); + }); +}; + +/** 添加运单 */ +const handleAddWaybill = () => { + // if (this.addInfo.oldSelectionList.length === 0) return this.$message.warning('最少选择一条运单'); + // this.addInfo.newData = [...this.addInfo.newData, ...this.addInfo.oldSelectionList]; + // this.addInfo.haveIds = this.addInfo.map(val => val.id); +}; +/** 移除运单 */ +const handleRemoveWaybill = () => { + // if (this.addInfo.newSelectionList.length === 0) return this.$message.warning('最少选择一条运单'); + // this.addInfo.newData = [...this.addInfo.newData, ...this.addInfo.oldSelectionList]; + // this.addInfo.haveIds = this.addInfo.map(val => val.id); +}; diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue index fe58f3b2..5105d357 100644 --- a/src/views/distribution/artery/VehicleStowage.vue +++ b/src/views/distribution/artery/VehicleStowage.vue @@ -169,8 +169,33 @@ width="80%" :before-close="beforeClose" append-to-body + :fullscreen="details.fullscreenObj.truckLoadingDetailPopUp" + :show-close="false" class="truckLoadingDetailPopUp" > +
@@ -260,7 +285,7 @@ import dayjs from 'dayjs'; import { mapGetters } from 'vuex'; /** 获取字典 */ import { getDictionaryBiz } from '@/api/system/dict'; -import { downloadXls } from '@/utils/util'; +import { downloadXls, setNodeHeight } from '@/utils/util'; import { columnList, detailsColumnList } from '@/option/distribution/VehicleStowage'; import { useRouter } from 'vue-router'; @@ -349,6 +374,11 @@ const details = reactive({ total: 0, }, }, + /** 全屏 */ + fullscreenObj: { + /** 装车明细 */ + truckLoadingDetailPopUp: false, + }, }); const { @@ -510,6 +540,31 @@ const handleShowzeroAdditionalRecording = ({ row }) => { // 跳转到零担补录页面 $router.push('/distribution/artery/zeroAdditionalRecording'); }; + +/** + * 是否开启床车明细全屏 + * @params(_type) 开启或关闭 + */ +const handleFullScrean = (_type: 'open' | 'close', _name: string) => { + const _node = document.querySelector('.truckLoadingDetailPopUp .maboxhi'); + + switch (_name) { + case 'truckLoadingDetailPopUp': + details.fullscreenObj.truckLoadingDetailPopUp = + !details.fullscreenObj.truckLoadingDetailPopUp; + + const _node = document.querySelector('.truckLoadingDetailPopUp .maboxhi'); + if (_type === 'close') { + setNodeHeight(_node, '500px'); + } else { + setNodeHeight(_node, '1000px'); + } + break; + + default: + break; + } +}; diff --git a/src/views/distribution/inventory/carry/distributionStockCarry.vue b/src/views/distribution/inventory/carry/distributionStockCarry.vue index 55c4d39d..780a17a2 100644 --- a/src/views/distribution/inventory/carry/distributionStockCarry.vue +++ b/src/views/distribution/inventory/carry/distributionStockCarry.vue @@ -1,7 +1,7 @@