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

修改包条码显示

dev-xx
qb 9 months ago
parent
5f980b5d0a
commit
be0b311818
7 changed files with 596 additions and 515 deletions
Split View
  1. 651
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  2. 151
      src/views/distribution/inventory/distributionStockArticleDetails.vue
  3. 2
      src/views/distribution/inventory/distrilbutionBillLadingList.vue
  4. 117
      src/views/distribution/inventory/distrilbutionBillLadingView.vue
  5. 47
      src/views/distribution/reservation/reservationDetails.vue
  6. 45
      src/views/distribution/stockup/distributionStockupDetails.vue
  7. 98
      src/views/warehouse/parcelList/distributionParcelList.vue

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

@ -128,8 +128,10 @@
<!-- </div>-->
<!-- </div>-->
<!-- </el-row>-->
<el-button style=" margin-bottom: 10px;" type="primary" icon="Position" @click="handleExport">导出</el-button>
<el-button style="margin-bottom: 10px" type="primary" icon="Position" @click="handleExport"
>导出</el-button
>
<el-tabs
v-model="activeTab"
@tab-click="handleTabClick"
@ -249,9 +251,7 @@
</el-tab-pane>
<el-tab-pane label="包 件 列 表" name="tab3">
<!-- 列表模块 -->
<el-button type="warning" plain @click="ViewQRcodes"
>批量查看二维码
</el-button>
<el-button type="warning" plain @click="ViewQRcodes">批量查看二维码 </el-button>
<tablecmt
class="tableNode"
:columnList="wrapoptioncolumn"
@ -485,7 +485,11 @@
<el-button @click="QRcodes" style="margin-bottom: 4px" type="primary"
>批量查看二维码</el-button
>
<el-button v-if="accessControl" @click="Batchpackages" style="margin-bottom: 4px" type="primary"
<el-button
v-if="accessControl"
@click="Batchpackages"
style="margin-bottom: 4px"
type="primary"
>批量签收</el-button
>
<el-button @click="PackBatchcancellation" style="margin-bottom: 4px" type="primary"
@ -508,10 +512,10 @@
>
<el-text
v-if="
(slotProps.scope.row.orderPackageStatus !== '70' ||
slotProps.scope.row.orderPackageStatusName !== '已签收') &&
(slotProps.scope.row.orderPackageLoadingStatusName !== '已装车' ||
slotProps.scope.row.orderPackageLoadingStatus !== '20')
(slotProps.scope.row.orderPackageStatus !== '70' ||
slotProps.scope.row.orderPackageStatusName !== '已签收') &&
(slotProps.scope.row.orderPackageLoadingStatusName !== '已装车' ||
slotProps.scope.row.orderPackageLoadingStatus !== '20')
"
size="small"
@click="cancelReservationPackage(slotProps.scope.row)"
@ -519,9 +523,9 @@
>
<el-text
v-if="
accessControl&& ( slotProps.scope.row.orderPackageStatus != '70' ||
slotProps.scope.row.orderPackageStatusName !== '已签收')
accessControl &&
(slotProps.scope.row.orderPackageStatus != '70' ||
slotProps.scope.row.orderPackageStatusName !== '已签收')
"
size="small"
@click="signingReservationPackage(slotProps.scope.row)"
@ -529,9 +533,9 @@
>
<el-text
v-if="
accessControl&& ( slotProps.scope.row.orderPackageStatus != '70' &&
slotProps.scope.row.orderPackageLoadingStatus == '20')
accessControl &&
slotProps.scope.row.orderPackageStatus != '70' &&
slotProps.scope.row.orderPackageLoadingStatus == '20'
"
size="small"
@click="retention(slotProps.scope.row)"
@ -557,7 +561,11 @@
</div>
</el-tab-pane>
<el-tab-pane label="库存品包件" name="reservationInventoryPackage">
<el-button v-if="accessControl" @click="Batchsigning" style="margin-bottom: 4px" type="primary"
<el-button
v-if="accessControl"
@click="Batchsigning"
style="margin-bottom: 4px"
type="primary"
>批量签收</el-button
>
<el-button @click="Batchcancellation" style="margin-bottom: 4px" type="primary"
@ -589,7 +597,9 @@
>
<el-text
v-if="
accessControl && (slotProps.scope.row.stockSignfoStatus == '10' || slotProps.scope.row.stockSignfoStatusName == '未签收')
accessControl &&
(slotProps.scope.row.stockSignfoStatus == '10' ||
slotProps.scope.row.stockSignfoStatusName == '未签收')
"
size="small"
@click="signingReservationInventoryPackage(slotProps.scope.row)"
@ -618,7 +628,11 @@
<!-- <el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>-->
<el-tab-pane label="零担列表" name="LessThantruckloadList">
<el-button v-if="accessControl" @click="LdBatchsigning" style="margin-bottom: 4px" type="primary"
<el-button
v-if="accessControl"
@click="LdBatchsigning"
style="margin-bottom: 4px"
type="primary"
>批量签收</el-button
>
<el-button @click="Ldcancellation" style="margin-bottom: 4px" type="primary"
@ -895,14 +909,17 @@
@click="auditing(slotProps.scope.row)"
>审 核</el-text
>
<el-text
v-if="slotProps.scope.row.isAbnormalSigning == '否' && slotProps.scope.row.auditingStatusName == '待审核'"
type="primary"
text
icon="el-icon-view"
@click="RejectFn(slotProps.scope.row)"
>驳回
</el-text>
<el-text
v-if="
slotProps.scope.row.isAbnormalSigning == '否' &&
slotProps.scope.row.auditingStatusName == '待审核'
"
type="primary"
text
icon="el-icon-view"
@click="RejectFn(slotProps.scope.row)"
>驳回
</el-text>
</template>
</template>
</tablecmt>
@ -912,16 +929,10 @@
</div>
</el-dialog>
<el-dialog
v-model="dialogViReject"
title="驳回"
width="500"
>
<div>
<span>请联系司机进行滞留扫描操作</span>
<!-- <el-select
<el-dialog v-model="dialogViReject" title="驳回" width="500">
<div>
<span>请联系司机进行滞留扫描操作</span>
<!-- <el-select
v-model="yesOrNo"
placeholder="请选择货物是否在库"
style="width: 240px"
@ -933,16 +944,14 @@
:value="item.value"
/>
</el-select> -->
</div>
<template #footer>
<div class="dialog-footer">
<el-button @click="dialogViReject = false">取消</el-button>
<el-button type="primary" @click="ViReject">
确定
</el-button>
</div>
</template>
</el-dialog>
<template #footer>
<div class="dialog-footer">
<el-button @click="dialogViReject = false">取消</el-button>
<el-button type="primary" @click="ViReject"> 确定 </el-button>
</div>
</template>
</el-dialog>
</basic-container>
</template>
@ -1007,20 +1016,19 @@ export default {
data() {
return {
ViRejectselect: [
{
value: true,
label: '是',
},
{
value: false,
label: '否',
},
],
dialogViReject:false,//驳回弹窗
RejectRow:{},//驳回点击当前单子
yesOrNo:false,
accessControl:'',
{
value: true,
label: '是',
},
{
value: false,
label: '否',
},
],
dialogViReject: false, //驳回弹窗
RejectRow: {}, //驳回点击当前单子
yesOrNo: false,
accessControl: '',
html: '',
reservationActiveName: 'reservationPackage',
checkloading: false, //复核签收加载
@ -1844,15 +1852,15 @@ export default {
head: false,
},
{
label: '物料名称',
prop: 'materialName',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
label: '物料名称',
prop: 'materialName',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'trainNumber',
label: '入库车次',
@ -3926,11 +3934,11 @@ export default {
this.setTableHeight();
},
created() {
const $useStore = useStore();
if($useStore.getters && $useStore.getters.permission){
this.accessControl = $useStore.getters.permission.Batch_signing;//批量签收权限
console.log(this.accessControl,'accessControl按钮权限');
}
const $useStore = useStore();
if ($useStore.getters && $useStore.getters.permission) {
this.accessControl = $useStore.getters.permission.Batch_signing; //批量签收权限
console.log(this.accessControl, 'accessControl按钮权限');
}
// this.onLoad();
// //查询字典
@ -3966,18 +3974,18 @@ if($useStore.getters && $useStore.getters.permission){
loadingAbnormalPackageListDetail(scope.signId)
.then(res => {
console.log(res, '异常审核查询');
res.data.data.forEach(res=>{
if(res.isAbnormalSigning==1){
res.isAbnormalSigning='否'
}else{
res.isAbnormalSigning='是'
res.data.data.forEach(res => {
if (res.isAbnormalSigning == 1) {
res.isAbnormalSigning = '否';
} else {
res.isAbnormalSigning = '是';
}
if(res.isAbnormalLoading==1){
res.isAbnormalLoading='否'
}else{
res.isAbnormalLoading='是'
if (res.isAbnormalLoading == 1) {
res.isAbnormalLoading = '否';
} else {
res.isAbnormalLoading = '是';
}
})
});
this.AbnormalReviewData = res.data.data;
})
.catch(res => {
@ -3987,25 +3995,25 @@ if($useStore.getters && $useStore.getters.permission){
this.AbnormalReviewloading = false; //关闭加载
});
},
RejectFn(row){
RejectFn(row) {
console.log(row);
this.RejectRow=row;
this.dialogViReject=true;
this.RejectRow = row;
this.dialogViReject = true;
},
// 确定驳回
ViReject(){
let data={
ids:this.RejectRow.id,
yesOrNo:this.yesOrNo,
}
this.AbnormalReviewloading =true; //开启加载
this.dialogViReject=false;
$_loadingAbnormalPackageListTurnDown(data).then(res=>{
if(res.data.code ==200){
console.log(res,'驳回成功返回值');
this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据
}
})
ViReject() {
let data = {
ids: this.RejectRow.id,
yesOrNo: this.yesOrNo,
};
this.AbnormalReviewloading = true; //开启加载
this.dialogViReject = false;
$_loadingAbnormalPackageListTurnDown(data).then(res => {
if (res.data.code == 200) {
console.log(res, '驳回成功返回值');
this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据
}
});
},
//审批异常装车包件
auditing(row) {
@ -4065,8 +4073,6 @@ if($useStore.getters && $useStore.getters.permission){
.finally(() => {
this.AbnormalReviewloading = false; //关闭加载
});
},
// 关闭异常审核
Abnormalshutdown() {
@ -4431,9 +4437,18 @@ if($useStore.getters && $useStore.getters.permission){
if (code !== 200) return;
// this.orderPackageCode = res.data
console.log(res.data);
this.html = this.getHtmls(data.dataList, data.templateHtml);
for (let i = 0; i < data.moldList.length; i++) {
const element = data.moldList[i];
this.html += element;
}
// const { code, data } = res.data;
// if (code !== 200) return;
// // this.orderPackageCode = res.data
// console.log(res.data);
// this.html = this.getHtmls(data.dataList, data.templateHtml);
this.isShowPrint = true;
} catch (error) {
@ -4443,18 +4458,18 @@ if($useStore.getters && $useStore.getters.permission){
}
},
// 批量查看二维码
async ViewQRcodes(){
if(!this.selectionList.length){
async ViewQRcodes() {
if (!this.selectionList.length) {
ElMessage({
message: `请勾选要查看二维码的数据`,
type: 'warning',
});
return
return;
}
try {
this.loadingObj.pageLoading = true;
let qr = {
ids: this.selectionList.map(res=>res.id).join(','),
ids: this.selectionList.map(res => res.id).join(','),
};
this.html = '';
const res = await showOrderPackgeCode(qr);
@ -4463,9 +4478,18 @@ if($useStore.getters && $useStore.getters.permission){
if (code !== 200) return;
// this.orderPackageCode = res.data
console.log(res.data);
this.html = this.getHtmls(data.dataList, data.templateHtml);
for (let i = 0; i < data.moldList.length; i++) {
const element = data.moldList[i];
this.html += element;
}
// const { code, data } = res.data;
// if (code !== 200) return;
// // this.orderPackageCode = res.data
// console.log(res.data);
// this.html = this.getHtmls(data.dataList, data.templateHtml);
this.isShowPrint = true;
} catch (error) {
@ -4503,40 +4527,32 @@ if($useStore.getters && $useStore.getters.permission){
}
},
cancelReservationPackage(row) {
ElMessageBox.confirm(
'是否确认取消?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
)
.then(() => {
console.log('row', row);
console.log('deliveryId', this.deliveryId);
console.log('reservationId', this.wid);
let data = {
deliveryId: this.deliveryId,
reservationId: this.wid,
type: 1,
packageIds: row.id,
};
this.loading=true
cancelReservationPackage(data).then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.msg);
this.getWrapdetails(this.page);
}
}).catch(()=>{
this.loading=false
ElMessageBox.confirm('是否确认取消?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
console.log('row', row);
console.log('deliveryId', this.deliveryId);
console.log('reservationId', this.wid);
let data = {
deliveryId: this.deliveryId,
reservationId: this.wid,
type: 1,
packageIds: row.id,
};
this.loading = true;
cancelReservationPackage(data)
.then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.msg);
this.getWrapdetails(this.page);
}
})
.catch(() => {
this.loading = false;
});
});
})
},
ViewingTrajectories(val) {
this.$router.push({
@ -4564,81 +4580,74 @@ if($useStore.getters && $useStore.getters.permission){
this.getReservationInventoryPackageListInfo(this.page);
}
})
.catch(res => { this.loading = false;})
.catch(res => {
this.loading = false;
});
})
.catch(() => {});
},
signingReservationPackage(row) {
ElMessageBox.confirm(
'是否确认签收?',
'提示',
{
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}
)
.then(() => {
this.loading=true
console.log('row', row);
console.log('wid', this.wid);
console.log('deliveryId', this.deliveryId);
let data = {
deliveryId: this.deliveryId,
reservationId: this.wid,
barcodes: row.orderPackageCode,
};
//包件签收
deliverySign(data).then(res => {
console.log('res>>>>>>>>>>>>>>>>>>>>>>>', res);
if (res.data.code === 200) {
this.$message.success(res.data.msg);
this.getWrapdetails(this.page);
}
}).catch(res=>{
this.loading=false
})
})
ElMessageBox.confirm('是否确认签收?', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
this.loading = true;
console.log('row', row);
console.log('wid', this.wid);
console.log('deliveryId', this.deliveryId);
let data = {
deliveryId: this.deliveryId,
reservationId: this.wid,
barcodes: row.orderPackageCode,
};
//包件签收
deliverySign(data)
.then(res => {
console.log('res>>>>>>>>>>>>>>>>>>>>>>>', res);
if (res.data.code === 200) {
this.$message.success(res.data.msg);
this.getWrapdetails(this.page);
}
})
.catch(res => {
this.loading = false;
});
});
},
// 滞留
retention(row){
ElMessageBox.confirm(
'是否确认滞留操作?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
)
.then(() => {
let data={
barcode:row.orderPackageCode,
deliveryId:this.deliverydata.id,
retentionType:'1',
}
this.loading=true
$_retentionScan(data).then(res=>{
console.log(res,'res');
if(res.data.code ==200){
ElMessage({
message: '滞留成功',
type: 'success',
})
this.getWrapdetails(this.wpage);
}
}).catch(()=>{
this.loading=false
retention(row) {
ElMessageBox.confirm('是否确认滞留操作?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
})
.catch(() => {})
.then(() => {
let data = {
barcode: row.orderPackageCode,
deliveryId: this.deliverydata.id,
retentionType: '1',
};
this.loading = true;
$_retentionScan(data)
.then(res => {
console.log(res, 'res');
if (res.data.code == 200) {
ElMessage({
message: '滞留成功',
type: 'success',
});
this.getWrapdetails(this.wpage);
}
})
.catch(() => {
this.loading = false;
});
})
.catch(() => {});
},
// 包件批量签收
Batchpackages(){
Batchpackages() {
if (!this.selectionList.length) {
ElMessage({
message: '请勾选需要批量签收的数据',
@ -4646,57 +4655,52 @@ if($useStore.getters && $useStore.getters.permission){
});
return;
}
const allSigned = this.selectionList.every(
item => item.orderPackageStatus == '70'
);
if(allSigned){
const allSigned = this.selectionList.every(item => item.orderPackageStatus == '70');
if (allSigned) {
ElMessage({
message: '勾选的数据都是已签收的',
type: 'warning',
});
return
}else{
let state=false
this.selectionList.forEach(item=>{
if(item.orderPackageStatus ==70){
return;
} else {
let state = false;
this.selectionList.forEach(item => {
if (item.orderPackageStatus == 70) {
ElMessage({
message: `${item.orderCode}已签收，请取消勾选！`,
type: 'warning',
});
state=true
});
state = true;
}
})
if(state){
return
});
if (state) {
return;
}
}
ElMessageBox.confirm(
'是否进行批量签收?',
'提示',
{
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}
)
.then(() => {
this.loading=true
let data = {
deliveryId: this.deliveryId,
reservationId: this.wid,
barcodes: this.selectionList.map(item => item.orderPackageCode).join(','),
};
//包件签收
deliverySign(data).then(res => {
console.log('res>>>>>>>>>>>>>>>>>>>>>>>', res);
if (res.data.code === 200) {
this.$message.success(res.data.msg);
this.getWrapdetails(this.page);
}
}).catch(res=>{
this.loading=false
})
})
ElMessageBox.confirm('是否进行批量签收?', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
this.loading = true;
let data = {
deliveryId: this.deliveryId,
reservationId: this.wid,
barcodes: this.selectionList.map(item => item.orderPackageCode).join(','),
};
//包件签收
deliverySign(data)
.then(res => {
console.log('res>>>>>>>>>>>>>>>>>>>>>>>', res);
if (res.data.code === 200) {
this.$message.success(res.data.msg);
this.getWrapdetails(this.page);
}
})
.catch(res => {
this.loading = false;
});
});
},
signingReservationInventoryPackage(row) {
console.log('row', row);
@ -4751,16 +4755,16 @@ if($useStore.getters && $useStore.getters.permission){
});
return;
}
let temp = {};
temp= this.LessThantruckloadListData.every(item=>item.signingStatusName == '待签收')
console.log(temp,'temp');
if(!temp){
ElMessage({
let temp = {};
temp = this.LessThantruckloadListData.every(item => item.signingStatusName == '待签收');
console.log(temp, 'temp');
if (!temp) {
ElMessage({
message: `签收状态要都满足条件为‘待签收’才可以批量签收`,
type: 'warning',
});
return;
}
}
this.$confirm('是否进行批量签收？')
.then(() => {
this.loading = true; //开启加载
@ -4840,8 +4844,8 @@ if($useStore.getters && $useStore.getters.permission){
.catch(() => {});
},
// 零担批量取消
Ldcancellation(){
if(!this.selectionList.length){
Ldcancellation() {
if (!this.selectionList.length) {
ElMessage({
message: '请勾选要批量取消的数据',
type: 'warning',
@ -4851,38 +4855,35 @@ if($useStore.getters && $useStore.getters.permission){
this.$confirm('是否进行批量计划取消？')
.then(() => {
let data={
reservationId:this.wid,
deliveryId:this.deliveryId,
zeroPackageIds:this.selectionList.map(item => item.id).join(','),
}
console.log(data,'发送的参数');
this.loading = true; //开启加载
$_cancelZeroPackage(data).then(res=>{
console.log(res,'返回成功');
if (res.data.code === 200) {
let data = {
reservationId: this.wid,
deliveryId: this.deliveryId,
zeroPackageIds: this.selectionList.map(item => item.id).join(','),
};
console.log(data, '发送的参数');
this.loading = true; //开启加载
$_cancelZeroPackage(data)
.then(res => {
console.log(res, '返回成功');
if (res.data.code === 200) {
this.$message.success(res.data.msg);
this.truckload(this.page);
this.selectionList = []; //清空选择
}
}).catch((res)=>{
console.log(res,'erro');
}).finally(()=>{
this.loading = false;
})
})
.catch(() => {
})
.catch(res => {
console.log(res, 'erro');
})
.finally(() => {
this.loading = false;
});
})
.catch(() => {});
},
// 批量签收
Batchsigning() {
console.log(this.selectionList, 'this.selectionList');
if(!this.selectionList.length){
if (!this.selectionList.length) {
ElMessage({
message: '请勾选需要签收的数据',
type: 'warning',
@ -4890,57 +4891,57 @@ if($useStore.getters && $useStore.getters.permission){
return;
}
this.$confirm('是否确认进行批量签收？')
.then(() => {
this.$confirm('是否确认进行批量签收？').then(() => {
let data = {
deliveryId: this.deliveryId,
reservationId: this.wid,
barcodes: this.selectionList.map(item => item.stockPackageCode).join(','),
};
this.loading = true;
deliveryId: this.deliveryId,
reservationId: this.wid,
barcodes: this.selectionList.map(item => item.stockPackageCode).join(','),
};
this.loading = true;
deliveryInventorySign(data)
.then(res => {
console.log('res>>>>>>>>>>>>>>>>>>>>>>>', res);
if (res.data.code === 200) {
this.$message.success(res.data.msg);
// this.getWrapdetails(this.page);
this.getReservationInventoryPackageListInfo(this.page);
}
this.selectionList = []; //清空选择
this.loading = false;
})
.catch(res => {
this.selectionList = []; //清空选择
this.loading = false;
});
})
.then(res => {
console.log('res>>>>>>>>>>>>>>>>>>>>>>>', res);
if (res.data.code === 200) {
this.$message.success(res.data.msg);
// this.getWrapdetails(this.page);
this.getReservationInventoryPackageListInfo(this.page);
}
this.selectionList = []; //清空选择
this.loading = false;
})
.catch(res => {
this.selectionList = []; //清空选择
this.loading = false;
});
});
},
// 包件批量查看二维码
async QRcodes(){
if(!this.selectionList.length){
async QRcodes() {
if (!this.selectionList.length) {
ElMessage({
message: `请勾选要查看二维码的数据`,
type: 'warning',
});
return
return;
}
try {
this.loading= true;
this.loading = true;
let qr = {
ids: this.selectionList.map(res=>res.id).join(','),
ids: this.selectionList.map(res => res.id).join(','),
};
this.html = '';
const res = await showOrderPackgeCode(qr);
const { code, data } = res.data;
this.loading = false;
if (code !== 200) return;
// this.orderPackageCode = res.data
console.log(res.data);
this.html = this.getHtmls(data.dataList, data.templateHtml);
for (let i = 0; i < data.moldList.length; i++) {
const element = data.moldList[i];
this.html += element;
}
this.isShowPrint = true;
} catch (error) {
@ -5110,14 +5111,14 @@ if($useStore.getters && $useStore.getters.permission){
// 复核签收确认弹窗
submitForm() {
// 取消上门照片规则
if(this.$route.query.state){
if (this.$route.query.state) {
if (!this.DoorstepPhoto.length) {
ElMessage({
message: '至少上传一张上门照片',
type: 'warning',
});
return;
}
ElMessage({
message: '至少上传一张上门照片',
type: 'warning',
});
return;
}
}
if (!this.StackingPhoto.length) {
@ -5407,7 +5408,7 @@ if($useStore.getters && $useStore.getters.permission){
this.view = true;
this.box = true;
this.wid = row.id;
this.reservationActiveName ='reservationPackage'
this.reservationActiveName = 'reservationPackage';
this.getWrapdetails(this.wpage);
await this.$nextTick();
@ -5741,10 +5742,10 @@ if($useStore.getters && $useStore.getters.permission){
this.loading = true; //开启加载
console.log(this.Routid, this.Routid, '存储的ID=====================WDWADAWD');
console.log('data>>>>>>>>', this.deliverydata);
if(this.deliverydata.retention){
if (this.deliverydata.retention) {
// 滞留跳转进来的
this.deliveryId = this.deliverydata.deliveryId; //存储ID
}else{
} else {
// 商配进来的
this.deliveryId = this.deliverydata.id; //存储ID
}

151
src/views/distribution/inventory/distributionStockArticleDetails.vue
Unescape View File

@ -136,42 +136,44 @@
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label==='物料维护状态'">
<el-tag :class="slotProps.scope.row.materialId ? 'green' : 'red'">{{ slotProps.scope.row.materialCodeMaintainStatus }}</el-tag>
<template v-if="slotProps.scope.column.label === '物料维护状态'">
<el-tag :class="slotProps.scope.row.materialId ? 'green' : 'red'">{{
slotProps.scope.row.materialCodeMaintainStatus
}}</el-tag>
</template>
<template v-else-if="slotProps.scope.column.label==='操作'">
<template v-else-if="slotProps.scope.column.label === '操作'">
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
<el-text
type="primary"
text
icon="el-icon-view"
@click="handleTrajectory(slotProps.scope.row)"
>查看轨迹</el-text
>
<el-text
type="primary"
text
icon="el-icon-view"
@click="handleQRCode(slotProps.scope.row)"
>查看二维码</el-text
>
<el-text
type="primary"
text
icon="el-icon-view"
v-if="!slotProps.scope.row.materialId"
@click="handleMaterial(slotProps.scope.row, '1')"
>补充物料信息</el-text
>
<el-text
type="primary"
text
icon="el-icon-view"
v-if="slotProps.scope.row.materialId"
@click="handleMaterial(slotProps.scope.row, '2')"
>修改物料信息</el-text
>
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
<el-text
type="primary"
text
icon="el-icon-view"
@click="handleTrajectory(slotProps.scope.row)"
>查看轨迹</el-text
>
<el-text
type="primary"
text
icon="el-icon-view"
@click="handleQRCode(slotProps.scope.row)"
>查看二维码</el-text
>
<el-text
type="primary"
text
icon="el-icon-view"
v-if="!slotProps.scope.row.materialId"
@click="handleMaterial(slotProps.scope.row, '1')"
>补充物料信息</el-text
>
<el-text
type="primary"
text
icon="el-icon-view"
v-if="slotProps.scope.row.materialId"
@click="handleMaterial(slotProps.scope.row, '2')"
>修改物料信息</el-text
>
</template>
</template>
</tablecmt>
@ -259,8 +261,12 @@
<el-input v-model="formMaterial.sku" placeholder="请输入SKU" />
</el-form-item>
<el-form-item label="规格">
<el-input v-model="formMaterial.packingSpecification" disabled placeholder="请输入规格" />
</el-form-item>
<el-input
v-model="formMaterial.packingSpecification"
disabled
placeholder="请输入规格"
/>
</el-form-item>
</el-form>
<!-- 表单按钮 -->
<template #footer>
@ -871,14 +877,14 @@ export default {
this.formMaterial.materialCode = a.productCode;
this.formMaterial.materialUnit = a.logpmUnit;
this.formMaterial.sku = a.sku;
this.formMaterial.packingSpecification=a.packingSpecification
this.formMaterial.packingSpecification = a.packingSpecification;
break;
case '2':
let b = this.optionsCode.find(i => i.id == row);
this.formMaterial.materialId = b.name;
this.formMaterial.materialUnit = b.logpmUnit;
this.formMaterial.sku = b.sku;
this.formMaterial.packingSpecification=b.packingSpecification
this.formMaterial.packingSpecification = b.packingSpecification;
break;
}
},
@ -1264,30 +1270,43 @@ export default {
this.materialBox = true;
console.log('_+_+_+_+_+_+_', index);
},
allhandleQRCode() {
console.log(this.selectionList);
if (this.selectionList.length == 0) {
this.$message.error({ message: '请先选择包件' });
return;
}
let checkcode = [];
this.selectionList.map(item => {
checkcode.push(item.id);
// checkcode.push(item.orderPackageCode)
});
// return
let qr = {
ids: checkcode.join(','),
// qrCodes: checkcode.join(','),
};
this.html = '';
showOrderPackgeCode(qr).then(res => {
// this.orderPackageCode = res.data
console.log(res.data);
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
async allhandleQRCode() {
try {
this.loadingObj.pageLoading = true;
console.log(this.selectionList);
if (this.selectionList.length == 0) {
this.$message.error({ message: '请先选择包件' });
return;
}
let checkcode = [];
this.selectionList.map(item => {
checkcode.push(item.id);
// checkcode.push(item.orderPackageCode)
});
// return
let qr = {
ids: checkcode.join(','),
// qrCodes: checkcode.join(','),
};
this.html = '';
const res = await showOrderPackgeCode(qr);
const { code, data } = res.data;
this.dialogVisible = true;
if (code !== 200) return;
for (let i = 0; i < data.moldList.length; i++) {
const element = data.moldList[i];
this.html += element;
}
this.dialogVisible = true;
} catch (error) {
console.log('error :>> ', error);
} finally {
this.loadingObj.pageLoading = false;
}
},
async handleQRCode(row) {
try {
@ -1299,7 +1318,11 @@ export default {
const res = await showOrderPackgeCode(qr);
const { code, data } = res.data;
if (code !== 200) return;
this.html = this.getHtmls(data.dataList, data.templateHtml);
// this.html = this.getHtmls(data.dataList, data.templateHtml);
for (let i = 0; i < data.moldList.length; i++) {
const element = data.moldList[i];
this.html += element;
}
this.dialogVisible = true;
await this.$nextTick();
@ -1431,9 +1454,9 @@ export default {
this.dataPare = data.records;
for (let i = 0; i < this.dataPare.length; i++) {
const item = this.dataPare[i];
item.materialCodeMaintainStatus = item.materialId ? '已维护' : '未维护'
item.materialCodeMaintainStatus = item.materialId ? '已维护' : '未维护';
}
// this.dataPare.some(i => {
// if (i.conditions == '1') {
// i.conditions = '定制品';

2
src/views/distribution/inventory/distrilbutionBillLadingList.vue
Unescape View File

@ -216,7 +216,7 @@
</el-dialog>
<!-- 打印模块 -->
<MyPrint v-model="isShow" :isShowExport="false" :html="html" width="70%" />
<MyPrint v-model="isShow" :isShowExport="true" :html="html" width="70%" />
</div>
</basic-container>
<edittablehead

117
src/views/distribution/inventory/distrilbutionBillLadingView.vue
Unescape View File

@ -20,7 +20,6 @@
</el-row>
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>收货单位：{{ data.consigneeUnit }} </span>
</el-col>
@ -33,20 +32,17 @@
</el-col>
</el-row>
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<!-- <span>{{deliverydata.loadingTeamType}} </span> -->
<span>计划件数： {{ data.planNum}} </span>
<span>计划件数： {{ data.planNum }} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>实提件数：{{ data.realNum }} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<!-- <span>{{deliverydata.loadingTeamType}} </span> -->
<span>签收人： {{ data.signforUserName || '暂无'}} </span>
<span>签收人： {{ data.signforUserName || '暂无' }} </span>
</el-col>
</el-row>
@ -57,10 +53,8 @@
</el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>审核时间：{{ data.examineTime || '暂无'}} </span>
<span>审核时间：{{ data.examineTime || '暂无' }} </span>
</el-col>
</el-row>
<el-divider>签收图片</el-divider>
@ -84,8 +78,10 @@
</div>
<el-divider>订单列表</el-divider>
<el-button style=" margin-bottom: 10px;" type="primary" icon="Position" @click="Listexport">导出</el-button>
<el-button style="margin-bottom: 10px" type="primary" icon="Position" @click="Listexport"
>导出</el-button
>
<el-tabs type="border-card" v-model="activeTab" @tab-click="handleTabClick">
<el-tab-pane label="订 单 列 表" name="tab2">
<!-- <el-button type="primary" icon="Position" @click="Orderexport">订单导出</el-button> -->
@ -124,7 +120,11 @@
<el-button type="warning" plain icon="el-icon-camera" @click="handleqr('')"
>批量查看二维码
</el-button>
<el-button type="warning" plain v-if="permission.Self_pickup_receipt" @click="Selfpickupreceipt"
<el-button
type="warning"
plain
v-if="permission.Self_pickup_receipt"
@click="Selfpickupreceipt"
><el-icon><EditPen /></el-icon>批量签收
</el-button>
<!-- 列表模块 -->
@ -1468,7 +1468,7 @@ export default {
},
methods: {
// 清单导出(全部导出)
Listexport(){
Listexport() {
let downloadUrl = `/logpm-distribution/distrilbutionBillLading/export-distributionBillLadingDetail?${
this.website.tokenHeader
}=${getToken()}`;
@ -1606,54 +1606,48 @@ export default {
this.onLoad(this.page);
},
// 自提包件签收
Selfpickupreceipt(){
if(!this.selectionList.length){
Selfpickupreceipt() {
if (!this.selectionList.length) {
ElMessage({
message: '请勾选要签收的数据',
type: 'warning',
})
return
}
console.log(this.selectionList,'this.selectionList');
ElMessageBox.confirm(
'是否确认操作自提批量签收?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
)
.then(() => {
this.loading=true
let data={
id:this.$route.query.id,
packageIds:this.selectionList.map(item=>item.id).join(',')
message: '请勾选要签收的数据',
type: 'warning',
});
return;
}
$_batchSign(data).then(res=>{
console.log(res,'自提签收成返回值');
if(res.data.code===200){
this.handlePackage(this.packpage)
ElMessage({
message:res.data.msg,
type: 'success',
})
}
}).catch(error=>{
console.log(error,'自提签收失败返回值');
}).finally(()=>{
this.loading=false
console.log(this.selectionList, 'this.selectionList');
ElMessageBox.confirm('是否确认操作自提批量签收?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
console.log(this.selectionList,'');
// handlePackage(this.packpage)
})
.catch(() => { })
},
.then(() => {
this.loading = true;
let data = {
id: this.$route.query.id,
packageIds: this.selectionList.map(item => item.id).join(','),
};
$_batchSign(data)
.then(res => {
console.log(res, '自提签收成返回值');
if (res.data.code === 200) {
this.handlePackage(this.packpage);
ElMessage({
message: res.data.msg,
type: 'success',
});
}
})
.catch(error => {
console.log(error, '自提签收失败返回值');
})
.finally(() => {
this.loading = false;
});
console.log(this.selectionList, '');
// handlePackage(this.packpage)
})
.catch(() => {});
},
// 查看二维码
async handleqr(val) {
@ -1685,7 +1679,12 @@ export default {
if (code !== 200) return;
console.log(res.data);
this.html = this.getHtmls(data.dataList, data.templateHtml);
// this.html = this.getHtmls(data.dataList, data.templateHtml);
for (let i = 0; i < data.moldList.length; i++) {
const element = data.moldList[i];
this.html += element;
}
this.dialogVisible = true;
await this.$nextTick();

47
src/views/distribution/reservation/reservationDetails.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<basic-container>
<basic-container v-loading="loadingObj.pageLoading">
<div class="avue-crud">
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="8" :sm="24">
@ -935,6 +935,9 @@ export default {
reservationId: '',
deliveryTypeData: [],
isaddvalue: false,
loadingObj: {
pageLoading: false,
},
};
},
watch: {
@ -1128,22 +1131,34 @@ export default {
})
.catch(_ => {});
},
handleQRCode(scope) {
const { row } = scope;
console.log('执行查看二维码');
this.materialQRCode = row;
console.log('---------------->', row);
let qr = {
ids: row.id,
};
this.html = '';
showOrderPackgeCode(qr).then(res => {
// this.orderPackageCode = res.data
console.log(res.data);
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
async handleQRCode(scope) {
try {
this.loadingObj.pageLoading = true;
this.dialogVisibleF = true;
const { row } = scope;
console.log('执行查看二维码');
this.materialQRCode = row;
console.log('---------------->', row);
let qr = {
ids: row.id,
};
this.html = '';
const res = await showOrderPackgeCode(qr);
const { code, data } = res.data;
if (code !== 200) return;
for (let i = 0; i < data.moldList.length; i++) {
const element = data.moldList[i];
this.html += element;
}
this.dialogVisibleF = true;
} catch (error) {
console.log('error :>> ', error);
} finally {
this.loadingObj.pageLoading = false;
}
},
printTemplate() {},
handleInventoryQRCode(scope) {

45
src/views/distribution/stockup/distributionStockupDetails.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<basic-container>
<basic-container v-loading="loadingObj.pageLoading">
<div class="avue-crud">
<el-row>
<el-tabs
@ -1089,6 +1089,9 @@ export default {
municipal: true, // 市
taker: true, // 自提
packageCodeList: [], // 自提
loadingObj: {
pageLoading: false,
},
};
},
mounted() {
@ -1299,23 +1302,33 @@ export default {
});
},
//查看包条码
handleQRCode(row) {
// this.title = '查看'
// this.view = true;
// this.box = true;
this.materialQRCode = row;
async handleQRCode(row) {
try {
this.loadingObj.pageLoading = true;
let qr = {
ids: row.id,
};
this.html = '';
showOrderPackgeCode(qr).then(res => {
// this.orderPackageCode = res.data
console.log(res.data);
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
this.materialQRCode = row;
this.dialogVisible = true;
let qr = {
ids: row.id,
};
this.html = '';
const res = await showOrderPackgeCode(qr);
const { code, data } = res.data;
if (code !== 200) return;
for (let i = 0; i < data.moldList.length; i++) {
const element = data.moldList[i];
this.html += element;
}
this.dialogVisible = true;
} catch (error) {
console.log('error :>> ', error);
} finally {
this.loadingObj.pageLoading = false;
}
},
// 查看轨迹
ViewingTrajectories(row) {

98
src/views/warehouse/parcelList/distributionParcelList.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<basic-container>
<basic-container v-loading="loadingObj.pageLoading">
<div class="avue-crud">
<div v-h5uShow="!search">
<!-- 查询模块 -->
@ -704,6 +704,9 @@ export default {
loadingTime: [],
/** 签收时间 */
signingTime: [],
loadingObj: {
pageLoading: true,
},
onLoad: debounce(async function (page, params = {}) {
this.loading = true;
try {
@ -753,43 +756,70 @@ export default {
},
methods: {
//批量查看二维码
batchHandQrCode() {
console.log(' this.selectionList--------->', this.selectionList);
if (this.selectionList.length <= 0) {
this.$message.warning('请选择包件');
return;
async batchHandQrCode() {
try {
this.loadingObj.pageLoading = true;
console.log(' this.selectionList--------->', this.selectionList);
if (this.selectionList.length <= 0) {
this.$message.warning('请选择包件');
return;
}
const idsArr = this.selectionList.map(item => {
return item.id;
});
let qr = {
ids: idsArr.join(','),
};
this.html = '';
const res = await showOrderPackgeCode(qr);
const { code, data } = res.data;
if (code !== 200) return;
for (let i = 0; i < data.moldList.length; i++) {
const element = data.moldList[i];
this.html += element;
}
this.dialogVisibleF = true;
} catch (error) {
console.log('error :>> ', error);
} finally {
this.loadingObj.pageLoading = false;
}
const data = this.selectionList.map(item => {
return item.id;
});
let qr = {
ids: data.join(','),
};
this.html = '';
showOrderPackgeCode(qr).then(res => {
// this.orderPackageCode = res.data
console.log(res.data);
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
this.dialogVisibleF = true;
},
//查看二维码
handleQRCode(scope) {
const { row } = scope;
console.log('执行查看二维码');
this.materialQRCode = row;
console.log('---------------->', row);
let qr = {
ids: row.id,
};
this.html = '';
showOrderPackgeCode(qr).then(res => {
// this.orderPackageCode = res.data
console.log(res.data);
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
async handleQRCode(scope) {
try {
this.loadingObj.pageLoading = true;
const { row } = scope;
console.log('执行查看二维码');
this.materialQRCode = row;
console.log('---------------->', row);
let qr = {
ids: row.id,
};
this.html = '';
const res = await showOrderPackgeCode(qr);
this.dialogVisibleF = true;
const { code, data } = res.data;
if (code !== 200) return;
for (let i = 0; i < data.moldList.length; i++) {
const element = data.moldList[i];
this.html += element;
}
this.dialogVisibleF = true;
} catch (error) {
console.log('error :>> ', error);
} finally {
this.loadingObj.pageLoading = false;
}
},
ViewingTrajectories(scope) {
console.log(scope, '执行查看轨迹');

Write Preview
Loading…
Cancel
Save