diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index 6fd40110..33ce51b5 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -173,8 +173,10 @@
勾选合计: - {{ item.label + ':' }} - {{ item.value }} +
@@ -398,12 +400,15 @@ const tableRowClassName = ({ row, rowIndex }: { row: TableDataType; rowIndex: nu let emit = defineEmits(['inputTxt', 'timeCheck', 'selectCheck', 'selection', 'makeCargo']); let newcolumnList = ref([]); watchEffect(() => { - newcolumnList.value = []; - props.columnList.map(item => { + const _arr = []; + + props.columnList.forEach(item => { if (!item.head) { - newcolumnList.value.push(item); + _arr.push(item); } }); + + newcolumnList.value = _arr; }); onMounted(() => { /* if (props.checkselect) { @@ -597,32 +602,39 @@ function handleDelete(index: number, row: TableDataType) {} const getSummaries = (param: any) => { const _arr = []; const { columns, data } = param; + let newarr = []; let tji = 0; - columns.forEach((item, index) => { - if (item.type === 'selection') isHaveSelection.value = true; + let _flag1 = false; + let _flag2 = false; + + props.columnList.forEach((item, index) => { + if (item.type === 0) _flag1 = true; if (index == 0) { - newarr[index] = '总计'; + newarr[0] = '总计'; return; } tji = 0; - if (props.columnList[index]?.isshowSummary) { + console.log('item :>> ', item); + if (item?.isshowSummary && !item.head) { for (let ite of data) { - tji = computeNumber(tji, '+', Number(ite[props.columnList[index]?.prop] || 0)).result; + tji = computeNumber(tji, '+', Number(ite[item?.prop] || 0)).result; } - newarr[index] = tji; + newarr.push(tji); _arr.push({ - label: props.columnList[index]?.label, + label: item?.label, value: 0, - prop: props.columnList[index]?.prop, + prop: item?.prop, + head: item.head, }); - // shownm.value=true - } else { - newarr[index] = null; + _flag2 = true; + } else if (!item.head) { + newarr.push(null); } }); selectCount.value = _arr; - // console.log(columns) + isHaveSelection.value = _flag1; + shownm.value = _flag2; return newarr; }; /** 设置合并行和列 */ @@ -630,11 +642,12 @@ const arraySpanMethod = row => { if (props.arraySpanMethod) return props.arraySpanMethod(row); }; watchEffect(() => { - props.columnList.map(item => { - if (item.isshowSummary) { + for (const iterator of props.columnList) { + if (iterator.isshowSummary) { shownm.value = true; + break; } - }); + } }); // 复制文本内容 function copyContent(content: string) { diff --git a/src/option/distribution/arteryDistrilbutionBillLadingList.js b/src/option/distribution/arteryDistrilbutionBillLadingList.js index b21bff40..7b405909 100644 --- a/src/option/distribution/arteryDistrilbutionBillLadingList.js +++ b/src/option/distribution/arteryDistrilbutionBillLadingList.js @@ -445,7 +445,7 @@ export const columnDetailList = [ sortable: true, }, { - prop: '', + prop: 'warehouseName', label: '操作仓库', type: 2, values: '', diff --git a/src/views/basicdata/TripartiteMaterial/list.vue b/src/views/basicdata/TripartiteMaterial/list.vue index bb5affce..e5af5388 100644 --- a/src/views/basicdata/TripartiteMaterial/list.vue +++ b/src/views/basicdata/TripartiteMaterial/list.vue @@ -18,6 +18,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -31,6 +32,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -44,6 +46,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -372,7 +375,6 @@ const { search, query, shortcuts, stockupDate, data, loadingObj, selectionList, const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList'])); console.log('permission :>> ', permission); - /** 请求页面数据 */ const onLoad = debounce(async (params = {}) => { try { diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue index cfefff1e..f03e6fec 100644 --- a/src/views/distribution/artery/AddVehicleStowage.vue +++ b/src/views/distribution/artery/AddVehicleStowage.vue @@ -456,6 +456,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable @change="value => item.itemTimesc(value, { prop: 'createTimeArr' })" /> diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue index afa47b6b..32b72407 100644 --- a/src/views/distribution/artery/TripartiteTransfer.vue +++ b/src/views/distribution/artery/TripartiteTransfer.vue @@ -18,6 +18,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -31,6 +32,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -44,6 +46,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -56,6 +59,7 @@ range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" + value-format="YYYY-MM-DD" :shortcuts="shortcuts" clearable /> diff --git a/src/views/distribution/artery/TripartiteTransferDetails.vue b/src/views/distribution/artery/TripartiteTransferDetails.vue index 480b1ea0..fb6daaba 100644 --- a/src/views/distribution/artery/TripartiteTransferDetails.vue +++ b/src/views/distribution/artery/TripartiteTransferDetails.vue @@ -202,6 +202,7 @@ start-placeholder="开单日期" end-placeholder="开单日期" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue index a200ca36..437804f8 100644 --- a/src/views/distribution/artery/VehicleArrivalManagement.vue +++ b/src/views/distribution/artery/VehicleArrivalManagement.vue @@ -17,6 +17,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -29,6 +30,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -41,6 +43,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -53,6 +56,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue index cad65da2..7530aaec 100644 --- a/src/views/distribution/artery/VehicleStowage.vue +++ b/src/views/distribution/artery/VehicleStowage.vue @@ -18,6 +18,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -31,6 +32,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -44,6 +46,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> diff --git a/src/views/distribution/artery/VehicleStowageDetails.vue b/src/views/distribution/artery/VehicleStowageDetails.vue index 805cc282..26fc5a39 100644 --- a/src/views/distribution/artery/VehicleStowageDetails.vue +++ b/src/views/distribution/artery/VehicleStowageDetails.vue @@ -156,6 +156,7 @@ start-placeholder="开单日期" end-placeholder="开单日期" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> diff --git a/src/views/distribution/artery/abnormalList.vue b/src/views/distribution/artery/abnormalList.vue index 0242db22..031909b0 100644 --- a/src/views/distribution/artery/abnormalList.vue +++ b/src/views/distribution/artery/abnormalList.vue @@ -24,6 +24,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -37,6 +38,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -50,6 +52,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -63,6 +66,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> diff --git a/src/views/distribution/artery/addTripartiteTransfer.vue b/src/views/distribution/artery/addTripartiteTransfer.vue index cca0c444..b4b0466b 100644 --- a/src/views/distribution/artery/addTripartiteTransfer.vue +++ b/src/views/distribution/artery/addTripartiteTransfer.vue @@ -261,6 +261,7 @@ start-placeholder="开单日期" end-placeholder="开单日期" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -341,6 +342,7 @@ start-placeholder="开单日期" end-placeholder="开单日期" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> diff --git a/src/views/distribution/artery/directGoMarketDetails.vue b/src/views/distribution/artery/directGoMarketDetails.vue index b8ca6b51..5dc9e4be 100644 --- a/src/views/distribution/artery/directGoMarketDetails.vue +++ b/src/views/distribution/artery/directGoMarketDetails.vue @@ -14,6 +14,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -27,6 +28,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue index 288e5843..12cc7372 100644 --- a/src/views/distribution/artery/truckLoadingDetails.vue +++ b/src/views/distribution/artery/truckLoadingDetails.vue @@ -13,6 +13,7 @@ range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" + value-format="YYYY-MM-DD" :shortcuts="shortcuts" clearable /> @@ -26,6 +27,7 @@ range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" + value-format="YYYY-MM-DD" :shortcuts="shortcuts" clearable /> diff --git a/src/views/distribution/artery/zeroAdditionalRecording.vue b/src/views/distribution/artery/zeroAdditionalRecording.vue index 9b5092aa..6e41f83f 100644 --- a/src/views/distribution/artery/zeroAdditionalRecording.vue +++ b/src/views/distribution/artery/zeroAdditionalRecording.vue @@ -38,6 +38,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -129,6 +130,7 @@ end-placeholder="结束时间" :shortcuts="shortcuts" clearable + value-format="YYYY-MM-DD" @change="handleFilterData" /> diff --git a/src/views/distribution/signdetail/distributionSigndetailCopy.vue b/src/views/distribution/signdetail/distributionSigndetailCopy.vue index 74b98dc5..c0010945 100644 --- a/src/views/distribution/signdetail/distributionSigndetailCopy.vue +++ b/src/views/distribution/signdetail/distributionSigndetailCopy.vue @@ -67,6 +67,7 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" + value-format="YYYY-MM-DD" :picker-options="pickerOptions" > @@ -80,6 +81,7 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" + value-format="YYYY-MM-DD" :picker-options="pickerOptions" > @@ -93,6 +95,7 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" + value-format="YYYY-MM-DD" :picker-options="pickerOptions" > @@ -106,6 +109,7 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" + value-format="YYYY-MM-DD" :picker-options="pickerOptions" > diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue index 4ce1d881..bb3e20c1 100644 --- a/src/views/distribution/signfor/distributionSignfortreat.vue +++ b/src/views/distribution/signfor/distributionSignfortreat.vue @@ -43,6 +43,7 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" + value-format="YYYY-MM-DD" :picker-options="pickerOptions" > @@ -56,6 +57,7 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" + value-format="YYYY-MM-DD" :picker-options="pickerOptions" > diff --git a/src/views/mail/inventory/list.vue b/src/views/mail/inventory/list.vue index 50d46435..ee525f04 100644 --- a/src/views/mail/inventory/list.vue +++ b/src/views/mail/inventory/list.vue @@ -1000,7 +1000,13 @@ export default { this.query.serviceType = '2'; getStockListClient(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( res => { - const data = res.data.data; + const { code, data } = res.data; + this.loading = false; + this.page.total = 0; + this.data = []; + + if (code !== 200) return; + this.page.total = data.total; this.data = data.records; this.data.forEach(i => { @@ -1012,7 +1018,6 @@ export default { i.unpack = '是'; } }); - this.loading = false; this.selectionClear(); } ); diff --git a/src/views/waybill/FreezeOrder.vue b/src/views/waybill/FreezeOrder.vue index 35d3d4f7..5f70396b 100644 --- a/src/views/waybill/FreezeOrder.vue +++ b/src/views/waybill/FreezeOrder.vue @@ -15,6 +15,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -28,6 +29,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> diff --git a/src/views/waybill/ReceiptManagement.vue b/src/views/waybill/ReceiptManagement.vue index f713f15a..53b31df7 100644 --- a/src/views/waybill/ReceiptManagement.vue +++ b/src/views/waybill/ReceiptManagement.vue @@ -19,6 +19,7 @@ end-placeholder="结束时间" :shortcuts="shortcuts" clearable + value-format="YYYY-MM-DD" /> diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue index fbf4afea..266e8c7e 100644 --- a/src/views/waybill/TemporaryStorageList.vue +++ b/src/views/waybill/TemporaryStorageList.vue @@ -16,6 +16,7 @@ end-placeholder="结束时间" :shortcuts="shortcuts" clearable + value-format="YYYY-MM-DD" /> diff --git a/src/views/waybill/ZeroTagList.vue b/src/views/waybill/ZeroTagList.vue index 4f4d6470..d5061a1f 100644 --- a/src/views/waybill/ZeroTagList.vue +++ b/src/views/waybill/ZeroTagList.vue @@ -18,6 +18,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> @@ -31,6 +32,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> diff --git a/src/views/waybill/orderDetails.vue b/src/views/waybill/orderDetails.vue index a41446b1..6383243a 100644 --- a/src/views/waybill/orderDetails.vue +++ b/src/views/waybill/orderDetails.vue @@ -22,6 +22,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" + value-format="YYYY-MM-DD" clearable /> diff --git a/src/views/waybill/orderPackageListDetails.vue b/src/views/waybill/orderPackageListDetails.vue index e59d12f7..2496eba8 100644 --- a/src/views/waybill/orderPackageListDetails.vue +++ b/src/views/waybill/orderPackageListDetails.vue @@ -55,6 +55,7 @@ end-placeholder="结束时间" :shortcuts="shortcuts" clearable + value-format="YYYY-MM-DD" />