java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

新增已签订单页面,修复地图，报表明细添加字段司机签收状态...

dev-xx
马远东 1 year ago
parent
ccadaf52f5
commit
b676d266c6
16 changed files with 958 additions and 1398 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/api/distribution/distributionStockArticle.js
  2. 11
      src/option/reportforms/DeliveryDetails.js
  3. 339
      src/option/warehouse/distributionStockArticle.js
  4. 10
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  5. 11
      src/views/distribution/deliverylist/distributionDeliveryListmar.vue
  6. 197
      src/views/distribution/reservation/atlas.vue
  7. 22
      src/views/reportforms/DeliveryCustomers.vue
  8. 43
      src/views/reportforms/DeliveryDetails.vue
  9. 23
      src/views/reportforms/DeliveryTrainNumber.vue
  10. 24
      src/views/reportforms/Inventory.vue
  11. 22
      src/views/reportforms/InventoryOutbound.vue
  12. 22
      src/views/reportforms/InventoryReceipt.vue
  13. 22
      src/views/reportforms/Selfpickupreport.vue
  14. 22
      src/views/reportforms/Selfpickuptask.vue
  15. 113
      src/views/reportforms/Stockordertable.vue
  16. 1466
      src/views/warehouse/warehousesignedorder/distributionStockArticle.vue

9
src/api/distribution/distributionStockArticle.js
Unescape View File

@ -11,6 +11,15 @@ export const getList = (current, size, params) => {
},
});
};
export const $_signforList = (params) => {
return request({
url: '/api/logpm-distribution/distributionStockArticle/signforList',
method: 'get',
params
});
};
export const getListStockArticleWhole = (current, size, params) => {
return request({
url: '/api/logpm-distribution/distributionStockArticle/listWhole',

11
src/option/reportforms/DeliveryDetails.js
Unescape View File

@ -334,6 +334,17 @@ export const columnList = [
sortable: true,
head: false,
},
{
prop: 'driverSigning',
label: '司机签收状态',
type: 3,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'unloadTime',
label: '装车时间',

339
src/option/warehouse/distributionStockArticle.js
Unescape View File

@ -0,0 +1,339 @@
export const columnList = [
{
prop: '',
label: '复选框',
type: 0,
width: 55,
fixed: true,
},
{
prop: '',
label: '序号',
type: 12,
values: '',
width: 55,
fixed: true,
},
{
prop: 'waybillNumber',
label: '运单号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'serviceNumber',
label: '服务号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'orderCode',
label: '订单自编号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'warehouseName',
label: '仓库',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'mallName',
label: '商场名称',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'brand',
label: '品牌',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'consigneePerson',
label: '运单收货人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'consigneeUnit',
label: '收货单位',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'deliveryListInfo',
label: '配送信息',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'vehicleName',
label: '配送车牌',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'driverName',
label: '配送司机信息',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'earliestWarehouseEntryTime',
label: '首次入库时间',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'warehouseEntryTime',
label: '最新入库时间',
type: 4,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'examineUserNames',
label: '审核人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'isCompleteSet',
label: '是否齐套',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'isZeroName',
label: '是否零担',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'orderStatusName',
label: '订单状态',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'orderReservationStatusName',
label: '预约状态',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'reservationInfo',
label: '预约信息',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signinTime',
label: '文员复核时间',
type: 4,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'deliveryNumber',
label: '出库数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'handQuantity',
label: '在库数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'reservationNumber',
label: '预约数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signForNumber',
label: '签收数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'stockUpNumber',
label: '备货数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'totalNumber',
label: '总数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'createTime',
label: '创建时间',
type: 4,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'createUserName',
label: '创建人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'createUserName',
// label: '操作',
// type: 6,
// values: '',
// width: '200',
// checkarr: [],
// fixed: 'right',
// sortable: false,
// },
]

10
src/views/distribution/deliverylist/distributionDeliveryListedt.vue
Unescape View File

@ -725,6 +725,7 @@
:on-success="ImgSuccessA"
:headers="headers"
multiple
drag
>
<el-icon><Plus /></el-icon>
</el-upload>
@ -744,6 +745,7 @@
:on-success="ImgSuccessB"
:headers="headers"
multiple
drag
>
<el-icon><Plus /></el-icon>
</el-upload>
@ -763,6 +765,7 @@
:on-success="ImgSuccessC"
:headers="headers"
multiple
drag
>
<el-icon><Plus /></el-icon>
</el-upload>
@ -782,6 +785,7 @@
:on-success="ImgSuccessD"
:headers="headers"
multiple
drag
>
<el-icon><Plus /></el-icon>
</el-upload>
@ -801,6 +805,7 @@
:on-success="ImgSuccessE"
:headers="headers"
multiple
drag
>
<el-icon><Plus /></el-icon>
</el-upload>
@ -5459,4 +5464,9 @@ PackBatchcancellation(){
height: 500px !important;
}
}
:deep(.el-upload-dragger){
display: flex;
align-items: center;
justify-content: center;
}
</style>

11
src/views/distribution/deliverylist/distributionDeliveryListmar.vue
Unescape View File

@ -322,7 +322,6 @@ export default {
prop: 'orderCode',
label: '订单自编号',
type: 2,
type: 2,
values: '',
width: '140',
checkarr: [],
@ -572,6 +571,16 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'orderCode',
label: '订单自编号',
type: 2,
values: '',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'kindName',
label: '配送种类',

197
src/views/distribution/reservation/atlas.vue
Unescape View File

@ -172,94 +172,161 @@ function checkgoto() {
// });
// }
// }
// async function init(data) {
// // 检查地图对象是否存在
// if (!details.mapLoc) {
// console.warn('No map object available.');
// return;
// }
// await details.mapLoc.clearMap(); // 清空地图
// details.markersarr = []; // 重置标记数组
// const geocoder = new AMap.Geocoder({});
// let geocodess = [];
// // 使用 Promise.all 来并发执行所有地址解析，以提高效率
// const geocodeResults = await Promise.all(data.map(item => geocodeItem(item, geocoder)));
// // 过滤掉未成功解析的结果
// geocodess = geocodeResults.filter(result => result !== null);
// // 如果有有效地理编码结果，设置中心点并处理标记
// if (geocodess.length > 0) {
// // 设置地图中心为第一个地址的位置
// const firstLocation = geocodess[0].pontion;
// details.mapLoc.setCenter([firstLocation.lng, firstLocation.lat]);
// // 处理所有有效的地理编码结果
// geocodess.forEach(({ pontion, content, items }) => {
// const marker = createMarker(pontion, items, details.mapLoc);
// details.markersarr.push(marker); // 将标记添加到数组中
// });
// // 替换这里的maker和Driving函数调用逻辑，如果它们是用来处理markers的
// maker(geocodess); // 假设这是设置标记的函数
// Driving(geocodess); // 假设这是根据地址驱动路径的函数
// }
// }
async function init(data) {
// 检查地图对象是否存在
if (!details.mapLoc) {
return; // 如果没有地图对象，则直接返回
console.warn('No map object available.');
Dtloading.value = false; // 如果地图对象不存在，立即停止加载
return;
}
await details.mapLoc.clearMap(); // 重置地图标记
let geocodess = [];
await details.mapLoc.clearMap(); // 清空地图
details.markersarr = []; // 重置标记数组
const geocoder = new AMap.Geocoder({});
details.markersarr = []; // 确保这是一个空数组
let geocodess = [];
// 使用 for...of 循环替代 map，因为需要异步操作
for (let item of data) {
if (!item.jingdu || !item.weidu) {
ElMessage.warning('地址有问题');
continue; // 如果经纬度有问题，跳过此次循环
}
// 使用 Promise.all 来并发执行所有地址解析，以提高效率
const geocodeResults = await Promise.all(data.map(item => geocodeItem(item, geocoder)));
const marker = new AMap.Marker({
map: details.mapLoc,
position: [item.jingdu, item.weidu],
icon: '//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png',
anchor: 'bottom-center',
offset: new AMap.Pixel(0, 0),
});
// 过滤掉未成功解析的结果
geocodess = geocodeResults.filter(result => result !== null);
if (geocodess.length > 0) {
const firstLocation = geocodess[0].pontion;
details.mapLoc.setCenter([firstLocation.lng, firstLocation.lat]);
await marker.setMap(details.mapLoc);
marker.setLabel({
offset: new AMap.Pixel(0,0), // 设置文本标注偏移量
content: `<div class='info'>${item.warehouseName}</div>`, // 设置文本标注内容
direction: 'top', // 设置文本标注方位
geocodess.forEach(({ pontion, content, items }) => {
const marker = createMarker(pontion, items, details.mapLoc);
details.markersarr.push(marker);
});
details.markersarr.push(marker); // 将标记添加到数组中
// 对 geocoder.getLocation 的调用现在是同步的，使用 await 等待回调结果
const result = await new Promise((resolve) => {
geocoder.getLocation(item.deliveryAddress, (status, response) => {
maker(geocodess); // 处理标记
await Driving(geocodess); // 处理驾车路线，确保此处 await 正确等待驾车路线完成
}
Dtloading.value = false; // 在所有操作完成后关闭加载效果
}
// 创建标记的函数
function createMarker(location, item, mapLoc) {
const marker = new AMap.Marker({
map: mapLoc,
position: [location.lng, location.lat],
icon: '//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png',
anchor: 'bottom-center',
offset: new AMap.Pixel(0, 0),
});
marker.setLabel({
offset: new AMap.Pixel(0, 0),
content: `<div class='info'>${item.warehouseName}</div>`,
direction: 'top',
});
return marker;
}
// 地址解析函数，返回解析结果或null
async function geocodeItem(item, geocoder) {
const address = item.deliveryAddress ? item.deliveryAddress : '北京市';
try {
const response = await new Promise((resolve, reject) => {
geocoder.getLocation(address, (status, response) => {
if (status === 'complete' && response.info === 'OK') {
resolve(response);
} else {
resolve(null); // 如果获取位置失败，则返回 null
console.log(response, '错误的地址已经切换默认地址');
// 使用默认地址
geocoder.getLocation('北京市', (defaultStatus, defaultResponse) => {
if (defaultStatus === 'complete' && defaultResponse.info === 'OK') {
resolve(defaultResponse); // 如果默认地址获取成功，则返回默认地址结果
} else {
resolve(null); // 如果默认地址也失败，则返回 null
}
});
}
});
});
if (result) {
details.mapLoc.setCenter([
result.geocodes[0].location.lng,
result.geocodes[0].location.lat,
]);
geocodess.push({
pontion: result.geocodes[0].location,
content: `${item.consignee}--${item.deliveryAddress}--${item.deliveryPhone}`,
items: item,
});
}
}
if (geocodess.length > 0) {
maker(geocodess);
Driving(geocodess);
}else{
Dtloading.value=false
return {
pontion: response.geocodes[0].location,
content: `${item.consignee}--${item.deliveryAddress}--${item.deliveryPhone}`,
items: item,
};
} catch (error) {
console.warn(`Geocode failed for address: ${address} with error:`, error);
return null;
}
}
//地图标点
async function maker (geocodess) {
await geocodess.map(item => {
function maker(geocodess) {
// 直接使用 forEach 代替 map，因为我们不需要返回一个新数组，仅仅是迭代并执行操作
geocodess.forEach(item => {
// 确保 item.pontion 存在
if (item.pontion) {
console.log(item, 'item=====');
var marker = new AMap.Marker({
const marker = new AMap.Marker({
map: details.mapLoc,
position: item.pontion,
position: [item.pontion.lng, item.pontion.lat],
icon: '//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png',
anchor: 'bottom-center',
offset: new AMap.Pixel(0, 0),
});
marker.setMap(details.mapLoc);
// 根据最新的AMap API文档，setMap方法在创建Marker时已经通过构造函数的map属性设置了地图对象，所以这里可以不需要再次调用
// marker.setMap(details.mapLoc);
marker.setLabel({
offset: new AMap.Pixel(0, -5), //设置文本标注偏移量
content: `<div class='info'>${item.content}</div>`, //设置文本标注内容
direction: 'top', //设置文本标注方位
offset: new AMap.Pixel(0, -5), // 设置文本标注偏移量
content: `<div class='info'>${item.content}</div>`, // 设置文本标注内容
direction: 'top', // 设置文本标注方位
});
details.markersarr.push(marker);
}
});
Dtloading.value=false
Dtloading.value = false; // 假设这是用于控制加载状态的变量
}
//地图公里数和时间计算
// 假设 seenIds 在适当的作用域中已经初始化
@ -297,18 +364,19 @@ function Driving(geocodess) {
);
details.drivingarrs.push(driving);
});
}
//将秒数转化为多少小时多少分
function formatSeconds(seconds) {
var hours = Math.floor(seconds / 3600);
var minutes = Math.floor((seconds % 3600) / 60);
var remainingSeconds = seconds % 60;
var result = '';
if (hours > 0) {
result += hours.toString().padStart(2, '0') + '小时';
}
result += minutes.toString().padStart(2, '0') + '分钟';
// 计算小时、分钟
const hours = Math.floor(seconds / 3600);
const minutes = Math.floor((seconds % 3600) / 60);
// 构建字符串
let result = hours > 0 ? `${hours.toString().padStart(2, '0')}小时` : "";
result += `${minutes.toString().padStart(2, '0')}分钟`;
return result;
}
function back() {
@ -318,11 +386,14 @@ function back() {
const { datalists } = toRefs(details);
const ListChange = val => {
Dtloading.value=true
setTimeout(()=>{
console.log(details.datalists, '最新的数据');
let data = details.datalists.filter(item => item.isck === true).map(item => item.items);
init(data);
Checkthebox.value = data;//统计当前勾选
console.log(details.datalists, '数据');
},0)
};

22
src/views/reportforms/DeliveryCustomers.vue
Unescape View File

@ -306,7 +306,7 @@ const DeliverygenericList = ref([
const inputsc = (index, row) => {
details.query[row.prop] = index;
processRowProperty(index, row, details);
getrain()
// getrain()
};
// 实例函数
@ -328,7 +328,7 @@ const DeliverygenericList = ref([
if (!index) {
delete details.query[row.prop];
}
getrain()
// getrain()
};
/** 表格表头输入框搜索 */
@ -338,7 +338,7 @@ const DeliverygenericList = ref([
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
processRowProperty(index, row, details);
getrain()
// getrain()
};
/** 表格表头复选框选择 */
const selectionChange = list => {
@ -391,7 +391,13 @@ const searchReset=()=>{
TopQuery.value = {};
TopQuery.value.warehouseNameRange=[]
queryCarn.value = {};
getrain(queryCarn.value)
details.query = {};
details.columnList.forEach(item => {
item.values = '';
});
details.page.total = 0
details.data = []
// getrain(queryCarn.value)
}
// 每页多少条
const sizeChange = val => {
@ -405,9 +411,9 @@ const searchReset=()=>{
};
// 刷新按钮
const searchChangeS = () => {
details.columnList.forEach(item => {
item.values = '';
});
// details.columnList.forEach(item => {
// item.values = '';
// });
details.search = false; //关闭搜索
getrain()
};
@ -478,7 +484,7 @@ const getrain=(val)=>{
details.loadingObj.list=false
})
}
getrain()
// getrain()
// 导出
const exportReport=()=>{
ElMessageBox.confirm('是否导出报表?', {

43
src/views/reportforms/DeliveryDetails.vue
Unescape View File

@ -196,6 +196,23 @@ const DeliverygenericList = ref([
value: '三方配送',
},
]); //配送类型
// 签收状态
const Signingstatus=ref(
[
{
label: '已签收',
value: '已签收',
},
{
label: '未签收',
value: '未签收',
},
]
)
const details = reactive({
/** 是否开启搜索 */
search: false,
@ -314,7 +331,7 @@ const showdrawer = _flag => {
const inputsc = (index, row) => {
details.query[row.prop] = index;
processRowProperty(index, row, details);
getrain();
// getrain();
};
/** 表格表头时间选择 */
@ -327,7 +344,7 @@ const timesc = (index, row) => {
if (!index) {
delete details.query[row.prop];
}
getrain();
// getrain();
};
/** 表格表头输入框搜索 */
@ -337,7 +354,7 @@ const btnsc = val => {
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
processRowProperty(index, row, details);
getrain();
// getrain();
};
/** 表格表头复选框选择 */
const selectionChange = list => {
@ -349,7 +366,13 @@ const searchReset=()=>{
TopQuery.value = {};
TopQuery.value.warehouseNameRange=[]
queryCarn.value = {};
getrain();
details.query = {};
details.columnList.forEach(item => {
item.values = '';
});
details.page.total = 0
details.data = []
// getrain();
}
// 网页顶部搜索按钮
const searchChange = () => {
@ -412,9 +435,9 @@ const currentChange = val => {
};
// 刷新按钮
const searchChangeS = () => {
details.columnList.forEach(item => {
item.values = '';
});
// details.columnList.forEach(item => {
// item.values = '';
// });
details.search = false; //关闭搜索
getrain();
};
@ -448,7 +471,9 @@ const onLoad = () => {
columnList.find(res => res.label == '配送种类').checkarr = DeliverygenericList.value;
columnList.find(res => res.label == '仓库').checkarr = [];
columnList.find(res => res.label == '仓库').checkarr = warehouseList.value;
columnList.find(res => res.label == '司机签收状态').checkarr = [];
columnList.find(res => res.label == '司机签收状态').checkarr = Signingstatus.value;
console.log(columnList, 'columnList');
// 获取仓库
@ -484,7 +509,7 @@ const getrain = (val) => {
details.loadingObj.list = false;
});
};
getrain();
// getrain();
// 导出
const exportReport = () => {
ElMessageBox.confirm('是否导出报表?', {

23
src/views/reportforms/DeliveryTrainNumber.vue
Unescape View File

@ -315,7 +315,7 @@ const showdrawer = _flag => {
const inputsc = (index, row) => {
details.query[row.prop] = index;
processRowProperty(index, row, details);
getrain();
// getrain();
};
/** 表格表头时间选择 */
@ -328,7 +328,7 @@ const timesc = (index, row) => {
if (!index) {
delete details.query[row.prop];
}
getrain();
// getrain();
};
/** 表格表头输入框搜索 */
@ -338,7 +338,7 @@ const btnsc = val => {
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
processRowProperty(index, row, details);
getrain();
// getrain();
};
/** 表格表头复选框选择 */
const selectionChange = list => {
@ -383,7 +383,13 @@ const searchReset=()=>{
TopQuery.value={}
TopQuery.value.warehouseNameRange=[]
queryCarn.value={}
getrain(queryCarn.value)
details.columnList.forEach(item => {
item.values = '';
});
details.query={},
details.page.total = 0;
details.data = [];
// getrain(queryCarn.value)
}
const Toptiem = val => {
if (!val) {
@ -405,9 +411,10 @@ const currentChange = val => {
};
// 刷新按钮
const searchChangeS = () => {
details.columnList.forEach(item => {
item.values = '';
});
// details.columnList.forEach(item => {
// item.values = '';
// });
// details.query={},
details.search = false; //关闭搜索
getrain();
};
@ -477,7 +484,7 @@ const getrain = (val) => {
details.loadingObj.list = false;
});
};
getrain();
// getrain();
// 导出
const exportReport = () => {

24
src/views/reportforms/Inventory.vue
Unescape View File

@ -306,7 +306,7 @@
const inputsc = (index, row) => {
details.query[row.prop] = index;
processRowProperty(index, row, details);
getrain();
// getrain();
};
/** 表格表头时间选择 */
@ -319,7 +319,7 @@
if (!index) {
delete details.query[row.prop];
}
getrain();
// getrain();
};
/** 表格表头输入框搜索 */
@ -400,12 +400,24 @@ const searchChange = () => {
};
// 刷新按钮
const searchChangeS = () => {
details.columnList.forEach(item => {
item.values = '';
});
// details.columnList.forEach(item => {
// item.values = '';
// });
details.search = false; //关闭搜索
getrain();
};
// 清空
const searchReset=()=>{
TopQuery.value={};
TopQuery.value.warehouseNameRange=[]
queryCarn.value={};
details.query = {};
details.columnList.forEach(item => {
item.values = '';
});
details.page.total = 0
details.data = []
}
// 顶部搜索
const searchHide = () => {
console.log(details);
@ -468,7 +480,7 @@ const searchChange = () => {
details.loadingObj.list = false;
});
};
getrain();
// getrain();
// 导出
const exportReport = () => {

22
src/views/reportforms/InventoryOutbound.vue
Unescape View File

@ -318,7 +318,7 @@
const inputsc = (index, row) => {
details.query[row.prop] = index;
processRowProperty(index, row, details);
getrain();
// getrain();
};
/** 表格表头时间选择 */
@ -331,7 +331,7 @@
if (!index) {
delete details.query[row.prop];
}
getrain();
// getrain();
};
/** 表格表头输入框搜索 */
@ -341,7 +341,7 @@
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
processRowProperty(index, row, details);
getrain()
// getrain()
};
/** 表格表头复选框选择 */
const selectionChange = list => {
@ -353,7 +353,13 @@
TopQuery.value={}
TopQuery.value.warehouseNameRange=[]
queryCarn.value={}
getrain(queryCarn.value)
details.query = {};
details.columnList.forEach(item => {
item.values = '';
});
details.page.total = 0
details.data = []
// getrain(queryCarn.value)
}
// 网页顶部搜索按钮
const searchChange = () => {
@ -427,9 +433,9 @@
};
// 刷新按钮
const searchChangeS = () => {
details.columnList.forEach(item => {
item.values = '';
});
// details.columnList.forEach(item => {
// item.values = '';
// });
details.search = false; //关闭搜索
getrain();
};
@ -495,7 +501,7 @@
details.loadingObj.list = false;
});
};
getrain();
// getrain();
// 导出
const exportReport = () => {

22
src/views/reportforms/InventoryReceipt.vue
Unescape View File

@ -320,7 +320,7 @@ const showdrawer = _flag => {
const inputsc = (index, row) => {
details.query[row.prop] = index;
processRowProperty(index, row, details);
getrain();
// getrain();
};
/** 表格表头时间选择 */
@ -333,7 +333,7 @@ const timesc = (index, row) => {
if (!index) {
delete details.query[row.prop];
}
getrain();
// getrain();
};
/** 表格表头输入框搜索 */
@ -343,7 +343,7 @@ const btnsc = val => {
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
processRowProperty(index, row, details);
getrain();
// getrain();
};
/** 表格表头复选框选择 */
const selectionChange = list => {
@ -355,7 +355,13 @@ const searchReset=()=>{
TopQuery.value={};
TopQuery.value.warehouseNameRange=[]
queryCarn.value={};
getrain();
details.query = {};
details.columnList.forEach(item => {
item.values = '';
});
details.page.total = 0
details.data = []
// getrain();
}
// 网页顶部搜索按钮
const searchChange = () => {
@ -431,9 +437,9 @@ const currentChange = val => {
};
// 刷新按钮
const searchChangeS = () => {
details.columnList.forEach(item => {
item.values = '';
});
// details.columnList.forEach(item => {
// item.values = '';
// });
details.search = false; //关闭搜索
getrain();
};
@ -500,7 +506,7 @@ const getrain = val => {
details.loadingObj.list = false;
});
};
getrain();
// getrain();
// 导出
const exportReport = () => {

22
src/views/reportforms/Selfpickupreport.vue
Unescape View File

@ -279,7 +279,7 @@
const inputsc = (index, row) => {
details.query[row.prop] = index;
processRowProperty(index, row, details);
getrain();
// getrain();
};
/** 表格表头时间选择 */
@ -292,7 +292,7 @@
if (!index) {
delete details.query[row.prop];
}
getrain();
// getrain();
};
/** 表格表头输入框搜索 */
@ -302,7 +302,7 @@
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
processRowProperty(index, row, details);
getrain();
// getrain();
};
/** 表格表头复选框选择 */
const selectionChange = list => {
@ -314,7 +314,13 @@
TopQuery.value = {};
TopQuery.value.warehouseNameRange=[]
queryCarn.value = {};
getrain();
details.query = {};
details.columnList.forEach(item => {
item.values = '';
});
details.page.total = 0
details.data = []
// getrain();
}
// 网页顶部搜索按钮
const searchChange = () => {
@ -369,9 +375,9 @@ const searchChange = () => {
};
// 刷新按钮
const searchChangeS = () => {
details.columnList.forEach(item => {
item.values = '';
});
// details.columnList.forEach(item => {
// item.values = '';
// });
details.search = false; //关闭搜索
getrain();
};
@ -436,7 +442,7 @@ const searchChange = () => {
details.loadingObj.list = false;
});
};
getrain();
// getrain();
// 导出
const exportReport = () => {

22
src/views/reportforms/Selfpickuptask.vue
Unescape View File

@ -313,7 +313,7 @@
const inputsc = (index, row) => {
details.query[row.prop] = index;
processRowProperty(index, row, details);
getrain();
// getrain();
};
/** 表格表头时间选择 */
@ -326,7 +326,7 @@
if (!index) {
delete details.query[row.prop];
}
getrain();
// getrain();
};
/** 表格表头输入框搜索 */
@ -336,7 +336,7 @@
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
processRowProperty(index, row, details);
getrain();
// getrain();
};
/** 表格表头复选框选择 */
const selectionChange = list => {
@ -348,7 +348,13 @@
TopQuery.value = {};
TopQuery.value.warehouseRange=[]
queryCarn.value = {};
getrain();
details.query = {};
details.columnList.forEach(item => {
item.values = '';
});
details.page.total = 0
details.data = []
// getrain();
}
// 网页顶部搜索按钮
const searchChange = () => {
@ -411,9 +417,9 @@
};
// 刷新按钮
const searchChangeS = () => {
details.columnList.forEach(item => {
item.values = '';
});
// details.columnList.forEach(item => {
// item.values = '';
// });
details.search = false; //关闭搜索
getrain();
};
@ -479,7 +485,7 @@
details.loadingObj.list = false;
});
};
getrain();
// getrain();
// 导出
const exportReport = () => {
ElMessageBox.confirm('是否导出报表?', {

113
src/views/reportforms/Stockordertable.vue
Unescape View File

@ -76,11 +76,11 @@
placeholder="多个运单收货人请用逗号隔开"
/>
</el-form-item>
</div>
</div>-->
<el-form-item class="el-btn">
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item> -->
</el-form-item>
</el-form>
</el-row>
@ -309,7 +309,7 @@
const inputsc = (index, row) => {
details.query[row.prop] = index;
processRowProperty(index, row, details);
getrain();
// getrain();
};
/** 表格表头时间选择 */
@ -322,7 +322,7 @@
if (!index) {
delete details.query[row.prop];
}
getrain();
// getrain();
};
/** 表格表头输入框搜索 */
@ -332,7 +332,7 @@
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
processRowProperty(index, row, details);
getrain();
// getrain();
};
/** 表格表头复选框选择 */
const selectionChange = list => {
@ -341,56 +341,61 @@
};
// 清空
const searchReset=()=>{
TopQuery.value = {};
TopQuery.value.warehouseRange=[]
queryCarn.value = {};
getrain();
TopQuery.value={};
TopQuery.value.warehouseNameRange=[]
queryCarn.value={};
details.query = {};
details.columnList.forEach(item => {
item.values = '';
});
details.page.total = 0
details.data = []
}
// 网页顶部搜索按钮
const searchChange = () => {
// 日期处理
if (TopQuery.value.time) {
queryCarn.value.startCreatedTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
queryCarn.value.endCreatedTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
}else{
delete queryCarn.value.startCreatedTime
delete queryCarn.value.endCreatedTime
}
// 仓库处理
if (TopQuery.value.warehouseRange.length) {
queryCarn.value.warehouseRange = TopQuery.value.warehouseRange.join(',');
}else{
delete queryCarn.value.warehouseRange;
}
// 收货单位
if(TopQuery.value.consigneeUnitRange){
queryCarn.value.consigneeUnitRange = TopQuery.value.consigneeUnitRange
}else{
delete queryCarn.value.consigneeUnitRange;
}
// 收货人
if(TopQuery.value.consigneeUserRange){
queryCarn.value.consigneeUserRange = TopQuery.value.consigneeUserRange
}else{
delete queryCarn.value.consigneeUserRange;
}
// if (TopQuery.value.time) {
// queryCarn.value.startCreatedTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
// queryCarn.value.endCreatedTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
// }else{
// delete queryCarn.value.startCreatedTime
// delete queryCarn.value.endCreatedTime
// }
// // 仓库处理
// if (TopQuery.value.warehouseRange.length) {
// queryCarn.value.warehouseRange = TopQuery.value.warehouseRange.join(',');
// }else{
// delete queryCarn.value.warehouseRange;
// }
// // 收货单位
// if(TopQuery.value.consigneeUnitRange){
// queryCarn.value.consigneeUnitRange = TopQuery.value.consigneeUnitRange
// }else{
// delete queryCarn.value.consigneeUnitRange;
// }
// // 收货人
// if(TopQuery.value.consigneeUserRange){
// queryCarn.value.consigneeUserRange = TopQuery.value.consigneeUserRange
// }else{
// delete queryCarn.value.consigneeUserRange;
// }
// 提货人
if(TopQuery.value.billUserRange){
queryCarn.value.billUserRange = TopQuery.value.billUserRange
}else{
delete queryCarn.value.billUserRange;
}
// 运单收货人
if(TopQuery.value.consigneeNameRange){
queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange
}else{
delete queryCarn.value.consigneeNameRange;
}
// 运单收货人
if(TopQuery.value.consigneeNameRange){
queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange
}
// // 提货人
// if(TopQuery.value.billUserRange){
// queryCarn.value.billUserRange = TopQuery.value.billUserRange
// }else{
// delete queryCarn.value.billUserRange;
// }
// // 运单收货人
// if(TopQuery.value.consigneeNameRange){
// queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange
// }else{
// delete queryCarn.value.consigneeNameRange;
// }
// // 运单收货人
// if(TopQuery.value.consigneeNameRange){
// queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange
// }
console.log(queryCarn.value, '顶部搜索触发');
getrain(queryCarn.value)
// details.search = false; //关闭搜索
@ -407,9 +412,9 @@
};
// 刷新按钮
const searchChangeS = () => {
details.columnList.forEach(item => {
item.values = '';
});
// details.columnList.forEach(item => {
// item.values = '';
// });
details.search = false; //关闭搜索
getrain();
};
@ -475,7 +480,7 @@
details.loadingObj.list = false;
});
};
getrain();
// getrain();
// 导出
const exportReport = () => {
ElMessageBox.confirm('是否导出报表?', {

1466
src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save