diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index f977afd7..9076e1c6 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -281,8 +281,6 @@
-
-
- {{
+ {{
props.row[item.prop] ? props.row[item.prop] : '/'
}}
@@ -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, '搜索结果');
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index 0891ab3c..544eb224 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/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: '配送车牌',