From 862183b42ae0b33852a1a3fafbe8e0e042b59e54 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Fri, 5 Jul 2024 17:50:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E9=A9=B3=E5=9B=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=9A=82=E5=81=9C=E4=BD=BF=E7=94=A8=EF=BC=8C=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E4=BB=AA=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/storagecost/index.js | 0 src/components/webCameraIMG/webCamera.vue | 36 ++- .../Warehouseinformationconfiguration.js | 190 +++++++++++ .../storagecost/Monthlyorderwarehousing.vue | 11 + .../storagecost/OrderTotalTransferDetails.vue | 11 + .../cost/storagecost/OrderTotalWarehouse.vue | 11 + .../storagecost/Transferwarehouseorders.vue | 11 + .../Transferwarehousestatistics.vue | 11 + .../cost/storagecost/WarehouseMonthly.vue | 11 + .../Warehouseinformationconfiguration.vue | 306 ++++++++++++++++++ .../storagecost/Warehouserentalmanagement.vue | 11 + .../distributionDeliveryListedt.vue | 5 + .../stockup/distributionStockupSelf.vue | 2 +- 13 files changed, 608 insertions(+), 8 deletions(-) create mode 100644 src/api/storagecost/index.js create mode 100644 src/option/storagecost/Warehouseinformationconfiguration.js create mode 100644 src/views/cost/storagecost/Monthlyorderwarehousing.vue create mode 100644 src/views/cost/storagecost/OrderTotalTransferDetails.vue create mode 100644 src/views/cost/storagecost/OrderTotalWarehouse.vue create mode 100644 src/views/cost/storagecost/Transferwarehouseorders.vue create mode 100644 src/views/cost/storagecost/Transferwarehousestatistics.vue create mode 100644 src/views/cost/storagecost/WarehouseMonthly.vue create mode 100644 src/views/cost/storagecost/Warehouseinformationconfiguration.vue create mode 100644 src/views/cost/storagecost/Warehouserentalmanagement.vue diff --git a/src/api/storagecost/index.js b/src/api/storagecost/index.js new file mode 100644 index 00000000..e69de29b diff --git a/src/components/webCameraIMG/webCamera.vue b/src/components/webCameraIMG/webCamera.vue index bca59d29..748fb872 100644 --- a/src/components/webCameraIMG/webCamera.vue +++ b/src/components/webCameraIMG/webCamera.vue @@ -74,6 +74,7 @@ const initialIndex = ref(0); // 初始显示的索引 const imagePreviewRefs = ref([]); let IMG_API_SERVER = reactive(true); //true表示线上环境，false表示开发环境 let IMG_Trimming_edge = ref(false); //图片裁边 +let rectifying = ref(0); //裁边 let IMG_startUp = ref(false); //摄像头是否启动 let IMG_API = ref('/api/blade-resource/oss/endpoint/put-file'); let zoom = ref(5); //图片缩放等级 @@ -89,7 +90,7 @@ const props = defineProps({ watch( () => props.IMGstate, - (newValue) => { + newValue => { if (newValue != IMGstate.value) { IMGstate.value = props.IMGstate; IMG_suoluetuList.value = []; //重置拍摄图片 @@ -160,9 +161,29 @@ const IsConnect = async () => { //(开启/关闭)图像裁边 const Opentrimming = () => { IMG_Trimming_edge.value = !IMG_Trimming_edge.value; - const message = IMG_Trimming_edge.value ? '图像裁边已开启' : '图像裁边已关闭'; - ElMessage({ message, type: 'success' }); - mylog(message); + if (IMG_Trimming_edge.value) { + rectifying.value = '1'; + } else { + rectifying.value = '0'; + } + let data = { + camidx: '0', // 摄像头索引，0：主头；1：副头 + open: rectifying.value, // 状态，0：关；1：开 + }; + request('http://127.0.0.1:38088/dvideo=cameradeskew', 'POST', data) + .then(response => { + const message = ''; + if (response.code !== '0') { + message = IMG_Trimming_edge.value ? '图像裁边已开启' : '图像裁边已关闭'; + ElMessage({ message, type: 'success' }); + mylog(message); + } else { + mylog(message); + } + }) + .catch(error => { + console.error('Error:', error); + }); }; // 开启摄像头 @@ -229,12 +250,13 @@ const Upload_Images = file => { const fileBlob = new Blob([file], { type: filetype }); const fileWithMetadata = new File([fileBlob], filename, { type: filetype }); formData.append('file', fileWithMetadata); - axios.post(IMG_API.value, formData) + axios + .post(IMG_API.value, formData) .then(res => { - if(res.data.code ===200){ + if (res.data.code === 200) { console.log(res, '图片上传成功'); ElMessage({ message: '图片上传成功', type: 'success' }); - $emit('upload-success', res);//图片地址传递出去 + $emit('upload-success', res); //图片地址传递出去 } }) .catch(error => { diff --git a/src/option/storagecost/Warehouseinformationconfiguration.js b/src/option/storagecost/Warehouseinformationconfiguration.js new file mode 100644 index 00000000..877ceacb --- /dev/null +++ b/src/option/storagecost/Warehouseinformationconfiguration.js @@ -0,0 +1,190 @@ +export const columnList = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'a', + label: '仓库名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '维护状态 ', + type: 3, + values: '', + width: '150', + checkarr: [ + { + label: '已维护', + value: '已维护', + }, + { + label: '未维护', + value: '未维护', + }, + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '仓库总面积（㎡）', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'aa', + label: '月租金(元/月)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '租赁合同开始时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '租赁合同结束时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '临时周转面积(㎡)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '库位数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '单库位面积(㎡)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '单库位面积(㎡)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '代作业入库费(元/件)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '代作业出库费(元/件)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '修改时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '修改人', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '200', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; diff --git a/src/views/cost/storagecost/Monthlyorderwarehousing.vue b/src/views/cost/storagecost/Monthlyorderwarehousing.vue new file mode 100644 index 00000000..ba58b627 --- /dev/null +++ b/src/views/cost/storagecost/Monthlyorderwarehousing.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/OrderTotalTransferDetails.vue b/src/views/cost/storagecost/OrderTotalTransferDetails.vue new file mode 100644 index 00000000..baac76e0 --- /dev/null +++ b/src/views/cost/storagecost/OrderTotalTransferDetails.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/OrderTotalWarehouse.vue b/src/views/cost/storagecost/OrderTotalWarehouse.vue new file mode 100644 index 00000000..6c0e8bf9 --- /dev/null +++ b/src/views/cost/storagecost/OrderTotalWarehouse.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/Transferwarehouseorders.vue b/src/views/cost/storagecost/Transferwarehouseorders.vue new file mode 100644 index 00000000..2ea14797 --- /dev/null +++ b/src/views/cost/storagecost/Transferwarehouseorders.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/Transferwarehousestatistics.vue b/src/views/cost/storagecost/Transferwarehousestatistics.vue new file mode 100644 index 00000000..a97aafc7 --- /dev/null +++ b/src/views/cost/storagecost/Transferwarehousestatistics.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/WarehouseMonthly.vue b/src/views/cost/storagecost/WarehouseMonthly.vue new file mode 100644 index 00000000..72ff2614 --- /dev/null +++ b/src/views/cost/storagecost/WarehouseMonthly.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/Warehouseinformationconfiguration.vue b/src/views/cost/storagecost/Warehouseinformationconfiguration.vue new file mode 100644 index 00000000..97dfbdd4 --- /dev/null +++ b/src/views/cost/storagecost/Warehouseinformationconfiguration.vue @@ -0,0 +1,306 @@ + + + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/Warehouserentalmanagement.vue b/src/views/cost/storagecost/Warehouserentalmanagement.vue new file mode 100644 index 00000000..1eb35523 --- /dev/null +++ b/src/views/cost/storagecost/Warehouserentalmanagement.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 25481450..dd3f8088 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -3955,6 +3955,11 @@ if($useStore.getters && $useStore.getters.permission){ }); }, RejectFn(row){ + ElMessage({ + message: '功能维护中', + type: 'warning', + }); + return console.log(row); this.RejectRow=row; this.dialogViReject=true; diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue index 433c66ea..f780514f 100644 --- a/src/views/distribution/stockup/distributionStockupSelf.vue +++ b/src/views/distribution/stockup/distributionStockupSelf.vue @@ -799,7 +799,7 @@ export default { if (!a) { this.num = '3'; this.dialogFormCustomer = true; - // this.getFork(); + this.getFork(); // this.getTeam(); } else { this.$message.warning('已指派，请勿重复指派！！！'); From ca43edf6443ce5cfa0a4d84c8491df0eb8b44830 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sat, 6 Jul 2024 08:48:37 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/print.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/print.js b/src/utils/print.js index 9892fea8..fd4c8a4a 100644 --- a/src/utils/print.js +++ b/src/utils/print.js @@ -53,8 +53,8 @@ const print = (nodeList, type = 'deliveryPrint') => { if (type === 'titlePrint') handleTitlePrint(LODOP, templateData); else handleDeliveryPrint(LODOP, templateData); // LODOP.NewPage() - // LODOP.PRINT(); //直接打印 - LODOP.PRINT_DESIGN(); + LODOP.PRINT(); //直接打印 + // LODOP.PRINT_DESIGN(); }); // LODOP.PREVIEW(); //预览(预览打印无脚标) }; From 8e03943d6031c2bbae3f180c28c9aa9d87e5c51f Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Sun, 7 Jul 2024 16:51:35 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=9B=B6=E6=8B=85=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverylist/distributionDeliveryListedt.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index dd3f8088..4ef118fb 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -4690,15 +4690,15 @@ if($useStore.getters && $useStore.getters.permission){ return; } let temp = {}; - temp= this.LessThantruckloadListData.every(item=>item.signingStatusName == '未签收') + temp= this.LessThantruckloadListData.every(item=>item.signingStatusName == '待签收') + console.log(temp,'temp'); if(!temp){ ElMessage({ - message: `要都满足条件为‘未签收’才可以批量签收`, + message: `签收状态要都满足条件为‘待签收’才可以批量签收`, type: 'warning', }); return; } - console.log(temp,'temp'); this.$confirm('是否进行批量签收？') .then(() => { this.loading = true; //开启加载 From 90bbaf8a637655f1a7a1ffa31ec7f99e8bf7455e Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 8 Jul 2024 10:32:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=88=90=E6=9C=AC=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Warehouseinformationconfiguration.js | 41 +++++++------------ .../Warehouseinformationconfiguration.vue | 5 +-- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/src/option/storagecost/Warehouseinformationconfiguration.js b/src/option/storagecost/Warehouseinformationconfiguration.js index 877ceacb..64c59ba2 100644 --- a/src/option/storagecost/Warehouseinformationconfiguration.js +++ b/src/option/storagecost/Warehouseinformationconfiguration.js @@ -1,13 +1,13 @@ export const columnList = [ { - prop: '', + prop: 'checkbox', label: '复选框', type: 0, width: 55, fixed: true, }, { - prop: '', + prop: 'xh', label: '序号', type: 12, values: '', @@ -15,7 +15,7 @@ export const columnList = [ fixed: true, }, { - prop: 'a', + prop: 'a1', label: '仓库名称', type: 2, values: '', @@ -26,7 +26,7 @@ export const columnList = [ head: false, }, { - prop: 'a', + prop: 'a2', label: '维护状态 ', type: 3, values: '', @@ -46,7 +46,7 @@ export const columnList = [ head: false, }, { - prop: 'a', + prop: 'a3', label: '仓库总面积（㎡）', type: 1, values: '', @@ -57,7 +57,7 @@ export const columnList = [ head: false, }, { - prop: 'aa', + prop: 'a4', label: '月租金(元/月)', type: 1, values: '', @@ -68,7 +68,7 @@ export const columnList = [ head: false, }, { - prop: 'a', + prop: 'a5', label: '租赁合同开始时间', type: 1, values: '', @@ -79,7 +79,7 @@ export const columnList = [ head: false, }, { - prop: 'a', + prop: 'a6', label: '租赁合同结束时间', type: 1, values: '', @@ -90,7 +90,7 @@ export const columnList = [ head: false, }, { - prop: 'a', + prop: 'a7', label: '临时周转面积(㎡)', type: 1, values: '', @@ -101,7 +101,7 @@ export const columnList = [ head: false, }, { - prop: 'a', + prop: 'a8', label: '库位数', type: 1, values: '', @@ -112,7 +112,7 @@ export const columnList = [ head: false, }, { - prop: 'a', + prop: 'a9', label: '单库位面积(㎡)', type: 1, values: '', @@ -123,18 +123,7 @@ export const columnList = [ head: false, }, { - prop: 'a', - label: '单库位面积(㎡)', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'a', + prop: 'a11', label: '代作业入库费(元/件)', type: 1, values: '', @@ -145,7 +134,7 @@ export const columnList = [ head: false, }, { - prop: 'a', + prop: 'a12', label: '代作业出库费(元/件)', type: 1, values: '', @@ -156,7 +145,7 @@ export const columnList = [ head: false, }, { - prop: 'a', + prop: 'a13', label: '修改时间', type: 1, values: '', @@ -167,7 +156,7 @@ export const columnList = [ head: false, }, { - prop: 'a', + prop: 'a14', label: '修改人', type: 1, values: '', diff --git a/src/views/cost/storagecost/Warehouseinformationconfiguration.vue b/src/views/cost/storagecost/Warehouseinformationconfiguration.vue index 97dfbdd4..bba3813b 100644 --- a/src/views/cost/storagecost/Warehouseinformationconfiguration.vue +++ b/src/views/cost/storagecost/Warehouseinformationconfiguration.vue @@ -19,9 +19,8 @@
- - 新 增 + 导入 + 导出
From e739d449d2b62bb2d5db9e1c281de66a68c87fbd Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 8 Jul 2024 13:36:31 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storagecost/Monthlyorderwarehousing.js | 245 ++++++++++++++ src/option/storagecost/OrderTotalWarehouse.js | 225 +++++++++++++ .../storagecost/Transferwarehouseorders.js | 205 ++++++++++++ .../Transferwarehousestatistics.js | 104 ++++++ src/option/storagecost/WarehouseMonthly.js | 269 +++++++++++++++ .../storagecost/Warehouserentalmanagement.js | 158 +++++++++ .../storagecost/Monthlyorderwarehousing.vue | 304 ++++++++++++++++- .../cost/storagecost/OrderTotalWarehouse.vue | 307 ++++++++++++++++- .../storagecost/Transferwarehouseorders.vue | 307 ++++++++++++++++- .../Transferwarehousestatistics.vue | 307 ++++++++++++++++- .../cost/storagecost/WarehouseMonthly.vue | 306 ++++++++++++++++- .../Warehouseinformationconfiguration.vue | 13 +- .../storagecost/Warehouserentalmanagement.vue | 308 +++++++++++++++++- .../distributionDeliveryListedt.vue | 2 +- 14 files changed, 3011 insertions(+), 49 deletions(-) create mode 100644 src/option/storagecost/Monthlyorderwarehousing.js create mode 100644 src/option/storagecost/OrderTotalWarehouse.js create mode 100644 src/option/storagecost/Transferwarehouseorders.js create mode 100644 src/option/storagecost/Transferwarehousestatistics.js create mode 100644 src/option/storagecost/WarehouseMonthly.js create mode 100644 src/option/storagecost/Warehouserentalmanagement.js diff --git a/src/option/storagecost/Monthlyorderwarehousing.js b/src/option/storagecost/Monthlyorderwarehousing.js new file mode 100644 index 00000000..691dea08 --- /dev/null +++ b/src/option/storagecost/Monthlyorderwarehousing.js @@ -0,0 +1,245 @@ +export const columnList = [ + { + prop: 'checkbox', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: 'xh', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'a1', + label: '目的仓', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a2', + label: '订单编号 ', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a3', + label: '运单编号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a4', + label: '收货单位', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a5', + label: '发货单位', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a6', + label: '运单类型', + type: 3, + values: '', + width: '150', + checkarr: [ + { + label: '市配', + value: '市配', + }, + { + label: '商配', + value: '商配', + }, + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a7', + label: '服务类型', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a8', + label: '总件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a9', + label: '已出库总件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a11', + label: '月出库件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a12', + label: '发站仓', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a13', + label: '月代入库仓件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a14', + label: '月代入库总成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a15', + label: '月代出库仓件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a16', + label: '月代出库成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a17', + label: '月代作业成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a17', + label: '月仓租成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a17', + label: '月仓储成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a18', + label: '成本结算时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, +// { +// prop: 'createUserName', +// label: '操作', +// type: 6, +// values: '', +// width: '200', +// checkarr: [], +// fixed: 'right', +// sortable: false, +// }, +]; diff --git a/src/option/storagecost/OrderTotalWarehouse.js b/src/option/storagecost/OrderTotalWarehouse.js new file mode 100644 index 00000000..81db5648 --- /dev/null +++ b/src/option/storagecost/OrderTotalWarehouse.js @@ -0,0 +1,225 @@ +export const columnList = [ + { + prop: 'checkbox', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: 'xh', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'a1', + label: '目的仓', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a2', + label: '订单编号 ', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a3', + label: '运单编号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a4', + label: '收货单位', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a5', + label: '发货单位', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a6', + label: '运单类型', + type: 3, + values: '', + width: '150', + checkarr: [ + { + label: '市配', + value: '市配', + }, + { + label: '商配', + value: '商配', + }, + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a7', + label: '服务类型', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a8', + label: '总件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a9', + label: '发站仓', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a11', + label: '代入库仓件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a12', + label: '代入库总成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a13', + label: '代出库仓件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a14', + label: '代出库总成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a15', + label: '代作业总成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a16', + label: '仓租成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a17', + label: '仓储总成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a17', + label: '结算时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + // { + // prop: 'createUserName', + // label: '操作', + // type: 6, + // values: '', + // width: '200', + // checkarr: [], + // fixed: 'right', + // sortable: false, + // }, + ]; + \ No newline at end of file diff --git a/src/option/storagecost/Transferwarehouseorders.js b/src/option/storagecost/Transferwarehouseorders.js new file mode 100644 index 00000000..7f24c5d8 --- /dev/null +++ b/src/option/storagecost/Transferwarehouseorders.js @@ -0,0 +1,205 @@ +export const columnList = [ + { + prop: 'checkbox', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: 'xh', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'a1', + label: '中转仓', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a2', + label: '订单编号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a3', + label: '运单号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a4', + label: '到站仓', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a5', + label: '发站仓', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a6', + label: '发货单位', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a7', + label: '收货单位', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a8', + label: '运单类型', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a9', + label: '服务类型', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a11', + label: '总件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a12', + label: '中转入库件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a13', + label: '中转入库收入', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a14', + label: '中转出库件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a15', + label: '中转出库收入', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a16', + label: '中转作业收入', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a17', + label: '中转作业结算时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + // { + // prop: 'createUserName', + // label: '操作', + // type: 6, + // values: '', + // width: '200', + // checkarr: [], + // fixed: 'right', + // sortable: false, + // }, + ]; + \ No newline at end of file diff --git a/src/option/storagecost/Transferwarehousestatistics.js b/src/option/storagecost/Transferwarehousestatistics.js new file mode 100644 index 00000000..c8e3a6fd --- /dev/null +++ b/src/option/storagecost/Transferwarehousestatistics.js @@ -0,0 +1,104 @@ +export const columnList = [ + { + prop: 'checkbox', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: 'xh', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'a1', + label: '中转仓', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a2', + label: '中转作业结算时间', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a3', + label: '月中转入库件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a4', + label: '月中转入库收入', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a5', + label: '月中转出库件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a6', + label: '月中转出库收入', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a7', + label: '月中转作业收入', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '200', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; diff --git a/src/option/storagecost/WarehouseMonthly.js b/src/option/storagecost/WarehouseMonthly.js new file mode 100644 index 00000000..320d6011 --- /dev/null +++ b/src/option/storagecost/WarehouseMonthly.js @@ -0,0 +1,269 @@ +export const columnList = [ + { + prop: 'checkbox', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: 'xh', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'a1', + label: '目的仓', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a2', + label: '成本结算时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a3', + label: '仓库总面积(㎡)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a4', + label: '仓库月租金', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a5', + label: '出库总件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a6', + label: '客户租用面积(㎡)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a7', + label: '客户月租金', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a8', + label: '租用出库件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a9', + label: '客户租用单件成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a11', + label: '客户租用总成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a12', + label: '临时周转面积', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a13', + label: '临时周转件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a14', + label: '临时周转单件成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a14', + label: '临时周转总成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a15', + label: '干仓配仓储面积(㎡)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a16', + label: '干仓配件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a17', + label: '干仓配单件成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a18', + label: '干仓配仓储总成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a19', + label: '代入库总成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a20', + label: '代出库总成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a21', + label: '代作业总成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a22', + label: '仓储总成本', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '200', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; diff --git a/src/option/storagecost/Warehouserentalmanagement.js b/src/option/storagecost/Warehouserentalmanagement.js new file mode 100644 index 00000000..246b9e58 --- /dev/null +++ b/src/option/storagecost/Warehouserentalmanagement.js @@ -0,0 +1,158 @@ +export const columnList = [ + { + prop: 'checkbox', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: 'xh', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'a1', + label: '客户名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a2', + label: '是否过期 ', + type: 3, + values: '', + width: '150', + checkarr: [ + { + label: '是', + value: '是', + }, + { + label: '否', + value: '否', + }, + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a3', + label: '租用仓库', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a4', + label: '租用类型', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a5', + label: '客户租用面积(㎡)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a6', + label: '客户租用库位数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a7', + label: '月租金(元/月)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a8', + label: '租赁合同开始时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a9', + label: '租赁合同结束时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a11', + label: '修改时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a12', + label: '修改人', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '200', + checkarr: [], + fixed: 'right', + sortable: false, + }, + ]; + \ No newline at end of file diff --git a/src/views/cost/storagecost/Monthlyorderwarehousing.vue b/src/views/cost/storagecost/Monthlyorderwarehousing.vue index ba58b627..7927a465 100644 --- a/src/views/cost/storagecost/Monthlyorderwarehousing.vue +++ b/src/views/cost/storagecost/Monthlyorderwarehousing.vue @@ -1,11 +1,303 @@ + + +
+ + + + + + + 搜 索 + 清 空 + + + + + + +
+ +
+ 导出 +
+ +
+ + + +
+
+ + + + + + + + + +} - \ No newline at end of file + // 页面初始化方法 + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/Transferwarehousestatistics.vue b/src/views/cost/storagecost/Transferwarehousestatistics.vue index a97aafc7..430c580b 100644 --- a/src/views/cost/storagecost/Transferwarehousestatistics.vue +++ b/src/views/cost/storagecost/Transferwarehousestatistics.vue @@ -1,11 +1,304 @@ + + +
+ + + + + + + 搜 索 + 清 空 + + + + + + +
+ +
+ 导入 + 导出 +
+ +
+ + + +
+
+ + + + + + + + + + + + +
+
+ + +
+ +
+ + + + + + +} - \ No newline at end of file + // 页面初始化方法 + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/WarehouseMonthly.vue b/src/views/cost/storagecost/WarehouseMonthly.vue index 72ff2614..0ca6fa76 100644 --- a/src/views/cost/storagecost/WarehouseMonthly.vue +++ b/src/views/cost/storagecost/WarehouseMonthly.vue @@ -1,11 +1,303 @@ + + +
+ + + + + + + 搜 索 + 清 空 + + + + + + +
+ +
+ 导出 +
+ +
+ + + +
+
+ + + + + + + + + + + + +
+
+ + +
+ +
+ + + + + + +} - \ No newline at end of file + // 页面初始化方法 + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/Warehouseinformationconfiguration.vue b/src/views/cost/storagecost/Warehouseinformationconfiguration.vue index bba3813b..17de6010 100644 --- a/src/views/cost/storagecost/Warehouseinformationconfiguration.vue +++ b/src/views/cost/storagecost/Warehouseinformationconfiguration.vue @@ -20,7 +20,7 @@
导入 - 导出 + 导出
@@ -267,13 +267,12 @@ }); }); } - // 页面初始化方法 +// 页面初始化 +const onLoad=()=>{ + +} - // $router.push({ - // path: '/', - // query: { - // }, - // }); + // 页面初始化方法 \ No newline at end of file + // 页面初始化方法 + + + + \ No newline at end of file diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 4ef118fb..fe89ea07 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -3959,7 +3959,7 @@ if($useStore.getters && $useStore.getters.permission){ message: '功能维护中', type: 'warning', }); - return + console.log(row); this.RejectRow=row; this.dialogViReject=true;