Browse Source

Merge branch 'pre-production'

fix_bug_pro20231227
pref_mail@163.com 10 months ago
parent
commit
e0d3818831
  1. 83
      src/views/distribution/turndelivery/deliveryDiscuss.vue
  2. 80
      src/views/warehouse/parcelList/distributionParcelList.vue

83
src/views/distribution/turndelivery/deliveryDiscuss.vue

@ -281,8 +281,6 @@
</div>
</div>
<!-- 顶部结束 -->
<!-- 首页表格 -->
<div class="el-Cart">
<!-- 表格列开始 -->
<el-table
@ -322,7 +320,7 @@
align="center"
>
<template #default="props">
<span :class="props.row[item.prop] == 'state' ? '.static-class' : ''">{{
<span :id="props.row[item.prop]" :class="props.row[item.prop] == 'state' ? '.static-class' : ''">{{
props.row[item.prop] ? props.row[item.prop] : '/'
}}</span>
</template>
@ -876,80 +874,6 @@ const TCzj = ref(); //弹窗组件实例
const soInpuState = ref(false); //
const statisticsList = ref([]); //
const inputValue = ref('number'); //
// const details = reactive({
// /** */
// search: false,
// /** */
// query: {},
// /** */
// shortcuts: [
// {
// text: '',
// value: () => {
// const end = new Date();
// const start = new Date();
// start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
// return [start, end];
// },
// },
// {
// text: '',
// value: () => {
// const end = new Date();
// const start = new Date();
// start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
// return [start, end];
// },
// },
// {
// text: '',
// value: () => {
// const end = new Date();
// const start = new Date();
// start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
// return [start, end];
// },
// },
// ],
// /** */
// stockupDate: [],
// /** */
// columnList,
// /** */
// data: [{}],
// /** loading */
// loadingObj: {
// /** loading */
// list: false,
// packageListLoading: false,
// },
// /** */
// selectionList: [],
// /** */
// drawerShow: false,
// /** */
// page: {
// currentPage: 1,
// pageSize: 50,
// total: 0,
// },
// });
// const {
// search,
// query,
// shortcuts,
// stockupDate,
// data,
// loadingObj,
// selectionList,
// drawerShow,
// page,
// trickleLoadingPage,
// zeroAdditionalRecordingInfo,
// popUpShow,
// recorddata,
// } = toRefs(details);
const dataInfoID = ref(); //ID
//
//
@ -1964,6 +1888,9 @@ const soclear=()=>{
}
//
const SearchFu = () => {
return
document.getElementById(multifunctional.value).scrollIntoView()
return
console.log(soInpuState.value, '当前搜索状态');
if (!multifunctional.value && !dataInfoTemp.value.length) {
@ -2006,7 +1933,7 @@ const SearchFu = () => {
console.log(dataInfoTemp.value,'临时存储的值');
dataInfo.value = temp; //
soInpuState.value = false; //
}
// console.log(dataInfo.value, '');

80
src/views/warehouse/parcelList/distributionParcelList.vue

@ -369,29 +369,85 @@ export default {
fixed: false,
sortable: true,
},
{
label: '预约单编号',
prop: 'reservationCode',
display: false,
hide: true,
label: '预约单编号',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: '配送车次号',
prop: 'noteNumber',
display: false,
hide: true,
label: '配送车次号',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: '配送司机',
prop: 'driverName',
display: false,
hide: true,
label: '配送司机',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: '装车时间',
prop: 'scanTime',
display: false,
hide: true,
label: '装车时间',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'scanUser',
label: '实际装车人',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'signingTime',
label: '签收时间',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'signingUser',
label: '实际签收人',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
label: '配送车牌',

Loading…
Cancel
Save