Browse Source

修复干线部分bug

dev-xx
qb 11 months ago
parent
commit
8d66c218fe
  1. 53
      src/components/tablecmt/tablecmt.vue
  2. 2
      src/option/distribution/arteryDistrilbutionBillLadingList.js
  3. 4
      src/views/basicdata/TripartiteMaterial/list.vue
  4. 1
      src/views/distribution/artery/AddVehicleStowage.vue
  5. 4
      src/views/distribution/artery/TripartiteTransfer.vue
  6. 1
      src/views/distribution/artery/TripartiteTransferDetails.vue
  7. 4
      src/views/distribution/artery/VehicleArrivalManagement.vue
  8. 3
      src/views/distribution/artery/VehicleStowage.vue
  9. 1
      src/views/distribution/artery/VehicleStowageDetails.vue
  10. 4
      src/views/distribution/artery/abnormalList.vue
  11. 2
      src/views/distribution/artery/addTripartiteTransfer.vue
  12. 2
      src/views/distribution/artery/directGoMarketDetails.vue
  13. 2
      src/views/distribution/artery/truckLoadingDetails.vue
  14. 2
      src/views/distribution/artery/zeroAdditionalRecording.vue
  15. 4
      src/views/distribution/signdetail/distributionSigndetailCopy.vue
  16. 2
      src/views/distribution/signfor/distributionSignfortreat.vue
  17. 9
      src/views/mail/inventory/list.vue
  18. 2
      src/views/waybill/FreezeOrder.vue
  19. 1
      src/views/waybill/ReceiptManagement.vue
  20. 1
      src/views/waybill/TemporaryStorageList.vue
  21. 2
      src/views/waybill/ZeroTagList.vue
  22. 1
      src/views/waybill/orderDetails.vue
  23. 1
      src/views/waybill/orderPackageListDetails.vue

53
src/components/tablecmt/tablecmt.vue

@ -173,8 +173,10 @@
<div class="selection-total-row" v-show="shownm && isHaveSelection">
<span>勾选合计:</span>
<span v-for="item in selectCount" :key="item.label">
<span style="margin: 0 5px">{{ item.label + ':' }}</span>
<el-text type="success">{{ item.value }}</el-text>
<template v-if="!item.head">
<span style="margin: 0 5px">{{ item.label + ':' }}</span>
<el-text type="success">{{ item.value }}</el-text>
</template>
</span>
</div>
</div>
@ -398,12 +400,15 @@ const tableRowClassName = ({ row, rowIndex }: { row: TableDataType; rowIndex: nu
let emit = defineEmits(['inputTxt', 'timeCheck', 'selectCheck', 'selection', 'makeCargo']);
let newcolumnList = ref<TableColumnType[]>([]);
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) {

2
src/option/distribution/arteryDistrilbutionBillLadingList.js

@ -445,7 +445,7 @@ export const columnDetailList = [
sortable: true,
},
{
prop: '',
prop: 'warehouseName',
label: '操作仓库',
type: 2,
values: '',

4
src/views/basicdata/TripartiteMaterial/list.vue

@ -18,6 +18,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -31,6 +32,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -44,6 +46,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -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 {

1
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' })"
/>

4
src/views/distribution/artery/TripartiteTransfer.vue

@ -18,6 +18,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -31,6 +32,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -44,6 +46,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -56,6 +59,7 @@
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
value-format="YYYY-MM-DD"
:shortcuts="shortcuts"
clearable
/>

1
src/views/distribution/artery/TripartiteTransferDetails.vue

@ -202,6 +202,7 @@
start-placeholder="开单日期"
end-placeholder="开单日期"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>

4
src/views/distribution/artery/VehicleArrivalManagement.vue

@ -17,6 +17,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -29,6 +30,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -41,6 +43,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -53,6 +56,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>

3
src/views/distribution/artery/VehicleStowage.vue

@ -18,6 +18,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -31,6 +32,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -44,6 +46,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>

1
src/views/distribution/artery/VehicleStowageDetails.vue

@ -156,6 +156,7 @@
start-placeholder="开单日期"
end-placeholder="开单日期"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>

4
src/views/distribution/artery/abnormalList.vue

@ -24,6 +24,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -37,6 +38,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -50,6 +52,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -63,6 +66,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>

2
src/views/distribution/artery/addTripartiteTransfer.vue

@ -261,6 +261,7 @@
start-placeholder="开单日期"
end-placeholder="开单日期"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -341,6 +342,7 @@
start-placeholder="开单日期"
end-placeholder="开单日期"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>

2
src/views/distribution/artery/directGoMarketDetails.vue

@ -14,6 +14,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -27,6 +28,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>

2
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
/>

2
src/views/distribution/artery/zeroAdditionalRecording.vue

@ -38,6 +38,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -129,6 +130,7 @@
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
value-format="YYYY-MM-DD"
@change="handleFilterData"
/>
</el-form-item>

4
src/views/distribution/signdetail/distributionSigndetailCopy.vue

@ -67,6 +67,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
:picker-options="pickerOptions"
>
</el-date-picker>
@ -80,6 +81,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
:picker-options="pickerOptions"
>
</el-date-picker>
@ -93,6 +95,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
:picker-options="pickerOptions"
>
</el-date-picker>
@ -106,6 +109,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
:picker-options="pickerOptions"
>
</el-date-picker>

2
src/views/distribution/signfor/distributionSignfortreat.vue

@ -43,6 +43,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
:picker-options="pickerOptions"
>
</el-date-picker>
@ -56,6 +57,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
:picker-options="pickerOptions"
>
</el-date-picker>

9
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();
}
);

2
src/views/waybill/FreezeOrder.vue

@ -15,6 +15,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -28,6 +29,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>

1
src/views/waybill/ReceiptManagement.vue

@ -19,6 +19,7 @@
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
value-format="YYYY-MM-DD"
/>
</el-form-item>
<!-- 查询按钮 -->

1
src/views/waybill/TemporaryStorageList.vue

@ -16,6 +16,7 @@
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
value-format="YYYY-MM-DD"
/>
</el-form-item>
<!-- 查询按钮 -->

2
src/views/waybill/ZeroTagList.vue

@ -18,6 +18,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>
@ -31,6 +32,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>

1
src/views/waybill/orderDetails.vue

@ -22,6 +22,7 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
clearable
/>
</el-form-item>

1
src/views/waybill/orderPackageListDetails.vue

@ -55,6 +55,7 @@
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
value-format="YYYY-MM-DD"
/>
</el-form-item>

Loading…
Cancel
Save