Browse Source

Merge branch 'dev' into pre-production

pre-production
pref_mail@163.com 1 year ago
parent
commit
fb811a04dc
  1. 13
      src/option/distribution/arteryDistrilbutionBillLadingList.js
  2. 2
      src/views/aftersales/aftersalesWorkOrder.vue
  3. 11
      src/views/distribution/deliverylist/distributionDeliveryListdis.vue
  4. 582
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  5. 66
      src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
  6. 4
      src/views/waybill/WaybillOrderList.vue
  7. 3
      vite.config.js

13
src/option/distribution/arteryDistrilbutionBillLadingList.js

@ -259,6 +259,17 @@ export const columnDetailList = [
sortable: true,
head: false,
},
{
prop: 'orderPackageCode',
label: '包件码',
type: 1,
values: '',
width: '180',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'driverName',
label: '提货司机',
@ -410,7 +421,7 @@ export const columnDetailList = [
sortable: true,
},
{
prop: '',
prop: 'createTime',
label: '提货扫码时间',
type: 1,
values: '',

2
src/views/aftersales/aftersalesWorkOrder.vue

@ -678,7 +678,7 @@ const AppealStatusT = ref(false); //是否为申诉列表
const TabList = ref([
{ name: 0, label: '全部', state: true },
{ name: 3, label: '待处理', state: true },
{ name: 8, label: '待回复', state: UserPermissions.value == '仓库客服' },
{ name: 8, label: '待回复', state: UserPermissions == '仓库客服' },
{ name: 1, label: '处理中', state: true },
{ name: 2, label: '处理完毕', state: true },
{ name: 6, label: '完结', state: true },

11
src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@ -291,17 +291,8 @@
<el-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow">
<div>
<div v-html="html"></div>
<!-- <div v-for="(item,index) in qrCodeObj">
<el-row>
<el-col :span="24" >
<el-image width="10" height="10" w-full :key="index" :src="item " alt="Preview Image"/>
</el-col>
</el-row>
</div> -->
</div>
<span slot="footer" class="dialog-footer">
<!-- <el-button type="primary" @click="ddd"> </el-button>-->
<el-button type="primary" @click="printTemplate"> </el-button>
<el-button type="primary" @click="isShow = false"> </el-button>
<el-button @click="isShow = false"> </el-button>
@ -517,7 +508,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
hide:true,
hide: true,
},
{
prop: 'kindName',

582
src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@ -129,7 +129,6 @@
<!-- </div>-->
<!-- </el-row>-->
<el-tabs
type="border-card"
v-model="activeTab"
@tab-click="handleTabClick"
v-loading="checkloading"
@ -155,6 +154,13 @@
@click="handleView(slotProps.scope.row)"
>查看
</el-text>
<el-text
type="primary"
text
icon="el-icon-view"
@click="handlePrint(slotProps.scope.row)"
>打印
</el-text>
<el-text
type="primary"
text
@ -168,9 +174,11 @@
text
icon="el-icon-view"
@click="handleOne(slotProps.scope.row)"
v-if="slotProps.scope.row.loadingStatus !== '已装车' &&
(slotProps.scope.row.signingStatus !== '已审核' ||
slotProps.scope.row.driverSigning !== '已签收') "
v-if="
slotProps.scope.row.loadingStatus !== '已装车' &&
(slotProps.scope.row.signingStatus !== '已审核' ||
slotProps.scope.row.driverSigning !== '已签收')
"
>
一键装车
</el-text>
@ -467,88 +475,97 @@
</el-table> -->
<!-- 客户包件 -->
<el-tabs v-model="reservationActiveName" @tab-click="reservationHandleClick">
<el-tabs v-model="reservationActiveName" @tab-click="reservationHandleClick">
<el-tab-pane label="客户包件" name="reservationPackage">
<el-button @click="Batchsigning" style="margin-bottom: 4px;" type="primary">批量签收</el-button>
<el-button @click="Batchcancellation" style="margin-bottom: 4px;" type="primary">批量计划取消</el-button>
<el-button @click="Batchsigning" style="margin-bottom: 4px" type="primary"
>批量签收</el-button
>
<el-button @click="Batchcancellation" style="margin-bottom: 4px" type="primary"
>批量计划取消</el-button
>
<tablecmt
:columnList="wrapoption.column"
:tableData="wrapdata"
:loading="loading"
@inputTxt="inputscReservationPackage"
@timeCheck="timescReservationPackage"
@selectCheck="selectscReservationPackage"
ref="wtableBox"
@selection="selectionChange"
:columnList="wrapoption.column"
:tableData="wrapdata"
:loading="loading"
@inputTxt="inputscReservationPackage"
@timeCheck="timescReservationPackage"
@selectCheck="selectscReservationPackage"
ref="wtableBox"
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<el-text size="small" @click="handleQRCode(slotProps.scope.row)">查看二维码</el-text>
<!-- slotProps.scope.row.orderPackageStatus !== '70' ||-->
<!-- slotProps.scope.row.orderPackageStatusName !== '已签收'||-->
<el-text size="small" @click="handleQRCode(slotProps.scope.row)"
>查看二维码</el-text
>
<el-text
v-if="
slotProps.scope.row.orderPackageLoadingStatus !== '20'||
slotProps.scope.row.orderPackageLoadingStatusName !== '已装车'
"
size="small"
@click="cancelReservationPackage(slotProps.scope.row)"
>计划取消</el-text
v-if="
slotProps.scope.row.orderPackageStatus !== '70' ||
slotProps.scope.row.orderPackageStatusName !== '已签收'
"
size="small"
@click="cancelReservationPackage(slotProps.scope.row)"
>计划取消</el-text
>
<el-text
v-if="
slotProps.scope.row.orderPackageStatus !== '70' ||
slotProps.scope.row.orderPackageStatusName !== '已签收'
"
size="small"
@click="signingReservationPackage(slotProps.scope.row)"
>PC签收</el-text
v-if="
slotProps.scope.row.orderPackageLoadingStatus === '10' ||
slotProps.scope.row.orderPackageLoadingStatusName === '待装车'
"
size="small"
@click="signingReservationPackage(slotProps.scope.row)"
>PC签收</el-text
>
</template>
</template>
</tablecmt>
</el-tab-pane>
<el-tab-pane label="库存品包件" name="reservationInventoryPackage">
<el-button @click="Batchsigning" style="margin-bottom: 4px;" type="primary">批量签收</el-button>
<el-button @click="Batchcancellation" style="margin-bottom: 4px;" type="primary">批量计划取消</el-button>
<el-button @click="Batchsigning" style="margin-bottom: 4px" type="primary"
>批量签收</el-button
>
<el-button @click="Batchcancellation" style="margin-bottom: 4px" type="primary"
>批量计划取消</el-button
>
<tablecmt
:columnList="wrapoption.reservationInventoryoptioncolumn"
:tableData="reservationInventoryPackageData"
:loading="loading"
@inputTxt="inputscReservationInventoryPackage"
@timeCheck="timescReservationInventoryPackage"
@selectCheck="selectscReservationInventoryPackage"
ref="wtableBox"
@selection="selectionChange"
:columnList="wrapoption.reservationInventoryoptioncolumn"
:tableData="reservationInventoryPackageData"
:loading="loading"
@inputTxt="inputscReservationInventoryPackage"
@timeCheck="timescReservationInventoryPackage"
@selectCheck="selectscReservationInventoryPackage"
ref="wtableBox"
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<el-text size="small" @click="handleQRCode(slotProps.scope.row)">查看二维码</el-text>
<el-text size="small" @click="handleQRCode(slotProps.scope.row)"
>查看二维码</el-text
>
<el-text
v-if="
slotProps.scope.row.stockSignfoStatus === '10' ||
slotProps.scope.row.orderPackageStatusName === '未签收'
"
size="small"
@click="cancelReservationInventoryPackage(slotProps.scope.row)"
>计划取消</el-text
v-if="
slotProps.scope.row.stockSignfoStatus === '10' ||
slotProps.scope.row.orderPackageStatusName === '未签收'
"
size="small"
@click="cancelReservationInventoryPackage(slotProps.scope.row)"
>计划取消</el-text
>
<el-text
v-if="
slotProps.scope.row.stockSignfoStatus == '10' ||
slotProps.scope.row.stockSignfoStatusName == '未签收'
"
size="small"
@click="signingReservationInventoryPackage(slotProps.scope.row)"
>PC签收</el-text
v-if="
slotProps.scope.row.stockSignfoStatus == '10' ||
slotProps.scope.row.stockSignfoStatusName == '未签收'
"
size="small"
@click="signingReservationInventoryPackage(slotProps.scope.row)"
>PC签收</el-text
>
</template>
</template>
</tablecmt>
</el-tab-pane>
<!-- <el-tab-pane label="角色管理" name="third">角色管理</el-tab-pane>-->
<!-- <el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>-->
<!-- <el-tab-pane label="角色管理" name="third">角色管理</el-tab-pane>-->
<!-- <el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>-->
</el-tabs>
<div class="avue-crud__pagination" style="width: 100%">
@ -734,25 +751,41 @@
</span>
</el-dialog>
</div>
<!-- 打印模块 -->
<el-dialog title="二维码" :visible.sync="isShowPrint" width="780px" v-model="isShowPrint">
<div>
<div v-html="html"></div>
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="printTemplate"> </el-button>
<el-button type="primary" @click="isShowPrint = false"> </el-button>
<el-button @click="isShowPrint = false"> </el-button>
</span>
</el-dialog>
</basic-container>
</template>
<script>
import {
getList,
getDetail,
add,
update,
remove,
getOneclick,
getorddetail,
getWrapdetail,
getpackdetail,
getinventorydetail,
getClientDetail,
$_getDetail,
$_isSignt, deliverySign, getReservationPackageList, deliveryInventorySign
} from '@/api/distribution/distributionDeliveryList';
import {
getList,
getDetail,
add,
update,
remove,
getOneclick,
getorddetail,
getWrapdetail,
getpackdetail,
getinventorydetail,
getClientDetail,
$_getDetail,
$_isSignt,
deliverySign,
getReservationPackageList,
deliveryInventorySign,
printBatch,
} from '@/api/distribution/distributionDeliveryList';
import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
import { showInventoryPackgeCode } from '@/api/distribution/distributionStockList';
import { update as updatesign, getOneclickq } from '@/api/distribution/distributionSignfor';
@ -760,7 +793,10 @@ import option from '@/option/basic/basicPdarecords';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
import dayjs from 'dayjs';
import { updateReservation,cancelReservationPackage } from '@/api/distribution/distributionReservation';
import {
updateReservation,
cancelReservationPackage,
} from '@/api/distribution/distributionReservation';
import { ElMessage, ElMessageBox } from 'element-plus';
import { getToken } from '@/utils/auth';
import { setNodeHeight } from '@/utils/util.js';
@ -768,7 +804,7 @@ export default {
data() {
return {
html: '',
reservationActiveName:'reservationPackage',
reservationActiveName: 'reservationPackage',
checkloading: false, //
dialogImageUrl: '', //
dialogVisible: false, //
@ -2166,7 +2202,6 @@ export default {
border: true,
selection: true,
column: [
{
label: '预约单号',
prop: 'reservationCode',
@ -2479,13 +2514,13 @@ export default {
//
inventoryQuery: {},
column: [
{
prop: '',
label: '复选框',
type: 0,
width: 55,
fixed: true,
},
{
prop: '',
label: '复选框',
type: 0,
width: 55,
fixed: true,
},
{
label: '序号',
prop: '',
@ -3207,7 +3242,6 @@ export default {
hide: true,
},
],
},
//
inventoryoption: {
@ -3452,12 +3486,16 @@ export default {
reservationInventoryPackageData: [],
//
packdata: [],
loading:false,
listloading:false,//
loading: false,
listloading: false, //
//
orddata: [],
//
inventorydata: [],
/** 是否显示打印模块 */
isShowPrint: false,
/** 打印的Html */
html: '',
};
},
watch: {
@ -3475,7 +3513,6 @@ export default {
},
mounted() {
this.init();
this.onLoad();
this.windowHeight = window.innerHeight * 0.8;
console.log(`浏览器窗口的高度为:${this.windowHeight}px`);
@ -3483,6 +3520,8 @@ export default {
this.setTableHeight();
},
created() {
this.onLoad();
// //
// this.queryDictionary();
},
@ -3610,7 +3649,7 @@ export default {
break;
case 'tab3':
//
this.loading=true
this.loading = true;
this.handlePackage(this.page);
console.log('ssss');
break;
@ -3735,7 +3774,16 @@ export default {
timesc() {},
btnsc() {},
selectsc() {},
/** 打印配送单 */
handlePrint(row) {
console.log('this.deliverydata.type :>> ', this.deliverydata.type);
const submitData = {
ids: row.id,
type: this.deliverydata.type,
};
printBatch(submitData);
},
/** 打印库存存品 */
handleInventoryQRCode(row) {
this.materialQRCode = row;
console.log('row------------>', row);
@ -3777,23 +3825,23 @@ export default {
console.log('deliveryId', this.deliveryId);
console.log('reservationId', this.wid);
let data = {
deliveryId:this.deliveryId,
reservationId:this.wid,
type:1,
packageIds:row.id
}
cancelReservationPackage(data).then(res=>{
if (res.data.code === 200){
deliveryId: this.deliveryId,
reservationId: this.wid,
type: 1,
packageIds: row.id,
};
cancelReservationPackage(data).then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.msg);
this.getWrapdetails(this.page);
}
})
});
},
cancelReservationInventoryPackage(row) {
console.log('row', row);
console.log('deliveryId', this.deliveryId);
console.log('reservationId', this.wid);
this.$message.warning("功能维护中...");
this.$message.warning('功能维护中...');
return;
// let data = {
// deliveryId:this.deliveryId,
@ -3810,41 +3858,41 @@ export default {
},
signingReservationPackage(row) {
console.log('row', row);
console.log('wid',this.wid);
console.log('deliveryId',this.deliveryId);
console.log('wid', this.wid);
console.log('deliveryId', this.deliveryId);
let data = {
deliveryId:this.deliveryId,
reservationId:this.wid,
barcodes:row.orderPackageCode
}
deliveryId: this.deliveryId,
reservationId: this.wid,
barcodes: row.orderPackageCode,
};
//
deliverySign(data).then(res=>{
console.log('res>>>>>>>>>>>>>>>>>>>>>>>',res);
if (res.data.code === 200){
deliverySign(data).then(res => {
console.log('res>>>>>>>>>>>>>>>>>>>>>>>', res);
if (res.data.code === 200) {
this.$message.success(res.data.msg);
this.getWrapdetails(this.page);
}
})
});
// this.$message.warning('...');
// return;
},
signingReservationInventoryPackage(row) {
console.log('row', row);
console.log('wid',this.wid);
console.log('deliveryId',this.deliveryId);
console.log('wid', this.wid);
console.log('deliveryId', this.deliveryId);
let data = {
deliveryId:this.deliveryId,
reservationId:this.wid,
barcodes:row.stockPackageCode
}
deliveryId: this.deliveryId,
reservationId: this.wid,
barcodes: row.stockPackageCode,
};
//
deliveryInventorySign(data).then(res=>{
console.log('res>>>>>>>>>>>>>>>>>>>>>>>',res);
if (res.data.code === 200){
deliveryInventorySign(data).then(res => {
console.log('res>>>>>>>>>>>>>>>>>>>>>>>', res);
if (res.data.code === 200) {
this.$message.success(res.data.msg);
this.getReservationInventoryPackageListInfo(this.page);
}
})
});
// this.$message.warning('...');
// return;
},
@ -3852,64 +3900,64 @@ export default {
reservationHandleClick(tab, event) {
console.log(tab, event);
let tabName = tab.paneName;
console.log("tabName",tabName);
console.log('tabName', tabName);
switch (tabName) {
case "reservationPackage":
case 'reservationPackage':
this.getWrapdetails(this.page);
break;
case "reservationInventoryPackage":
console.log("reservationInventoryPackage");
case 'reservationInventoryPackage':
console.log('reservationInventoryPackage');
this.getReservationInventoryPackageListInfo(this.page);
break;
}
},
//
Batchsigning(){
console.log(this.selectionList,'this.selectionList');
//
Batchsigning() {
console.log(this.selectionList, 'this.selectionList');
let data = {
deliveryId:this.deliveryId,
reservationId:this.wid,
barcodes:this.selectionList.map(item=>item.orderPackageCode).join(',')
}
this.loading=true,
deliverySign(data).then(res=>{
console.log('res>>>>>>>>>>>>>>>>>>>>>>>',res);
if (res.data.code === 200){
this.$message.success(res.data.msg);
this.getWrapdetails(this.page);
}
this.selectionList=[];//
this.loading=false;
}).catch(res=>{
this.selectionList=[];//
this.loading=false;
})
deliveryId: this.deliveryId,
reservationId: this.wid,
barcodes: this.selectionList.map(item => item.orderPackageCode).join(','),
};
(this.loading = true),
deliverySign(data)
.then(res => {
console.log('res>>>>>>>>>>>>>>>>>>>>>>>', res);
if (res.data.code === 200) {
this.$message.success(res.data.msg);
this.getWrapdetails(this.page);
}
this.selectionList = []; //
this.loading = false;
})
.catch(res => {
this.selectionList = []; //
this.loading = false;
});
},
//
Batchcancellation(){
Batchcancellation() {
let data = {
deliveryId:this.deliveryId,
reservationId:this.wid,
type:1,
packageIds:this.selectionList.map(item=>item.id).join(',')
}
this.loading=true;
cancelReservationPackage(data).then(res=>{
if (res.data.code === 200){
this.$message.success(res.data.msg);
this.getWrapdetails(this.page);
}
this.selectionList=[];//
this.loading=false;
}).catch(res=>{
this.selectionList=[];//
this.loading=false;
})
deliveryId: this.deliveryId,
reservationId: this.wid,
type: 1,
packageIds: this.selectionList.map(item => item.id).join(','),
};
this.loading = true;
cancelReservationPackage(data)
.then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.msg);
this.getWrapdetails(this.page);
}
this.selectionList = []; //
this.loading = false;
})
.catch(res => {
this.selectionList = []; //
this.loading = false;
});
},
/**
* 打印
@ -4159,34 +4207,31 @@ export default {
//
handleClient(page) {
let params = {};
this.listloading=true
this.listloading = true;
console.log();
params.deliveryId = this.deliverydata.id;
getClientDetail(
page.currentPage,
page.pageSize,
Object.assign(params, this.clientQuery)
).then(res => {
this.listloading=false
console.log('查看>>>>>订单>>', res.data.data);
if(res.data.data){
const data = res.data.data;
this.data = data.records;
this.ordpage.total = data.total;
}
}).catch(res=>{
this.listloading=false
});
getClientDetail(page.currentPage, page.pageSize, Object.assign(params, this.clientQuery))
.then(res => {
this.listloading = false;
console.log('查看>>>>>订单>>', res.data.data);
if (res.data.data) {
const data = res.data.data;
this.data = data.records;
this.ordpage.total = data.total;
}
})
.catch(res => {
this.listloading = false;
});
},
//
handleOrder(page) {
let params = {};
this.loading=true;
this.loading = true;
params.deliveryId = this.deliverydata.id;
getorddetail(page.currentPage, page.pageSize, Object.assign(params, this.orderQuery)).then(
res => {
this.loading=false,
console.log('查看>>>>>订单>>', res.data.data);
(this.loading = false), console.log('查看>>>>>订单>>', res.data.data);
const data = res.data.data;
this.orddata = data.records;
this.ordpage.total = data.total;
@ -4196,33 +4241,32 @@ export default {
//
handlePackage(page) {
let params = {};
this.loading=true
console.log(this.loading,'this.loading');
this.loading = true;
console.log(this.loading, 'this.loading');
params.deliveryId = this.deliverydata.id;
getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.packageQuery)).then(
res => {
this.loading=false
this.loading = false;
console.log('查看>>>>>包间>>', res.data.data);
if(res.data.data){
const data = res.data.data;
this.packdata = data;
this.packpage.total = data.total;
if (res.data.data) {
const data = res.data.data;
this.packdata = data;
this.packpage.total = data.total;
}
}
);
},
//
handleInventory(page) {
let params = {};
this.loading=true
this.loading = true;
params.deliveryId = this.deliverydata.id;
getinventorydetail(
page.currentPage,
page.pageSize,
Object.assign(params, this.inventoryQuery)
).then(res => {
this.loading=false
this.loading = false;
console.log('查看>>>>>库存>>', res.data.data);
const data = res.data.data;
this.inventorydata = data;
@ -4242,7 +4286,7 @@ export default {
});
},
async handleView(row) {
this.loading=true;//
this.loading = true; //
console.log('查看>>>>>>>>>>', row);
this.title = '客户包件';
this.view = true;
@ -4277,14 +4321,14 @@ export default {
}
},
//
//
checkFn(row) {
console.log('签收>>>>>>>>>>', row);
// this.title = '';
// this.view = true;
this.signform = row;
this.signBox = true;
$_getDetail({id:row.deliveryId}).then(res => {
$_getDetail({ id: row.deliveryId }).then(res => {
console.log(res, '点击复核的返回值');
this.form = res.data.data;
this.TcForm = res.data.data;
@ -4295,54 +4339,54 @@ export default {
this.HomePhotos = [];
this.SignForPhotos = [];
if (res.data.data.printVOList) {
// DoorstepPhoto
// StackingPhoto
// FragilePhotos
// HomePhotos
// SignForPhotos
this.DoorstepPhoto = [];
this.StackingPhoto = [];
this.FragilePhotos = [];
this.HomePhotos = [];
this.SignForPhotos = [];
res.data.data.printVOList.forEach(item => {
if (item.type == 'photo_1') {
this.DoorstepPhoto.push({ name: '', url: item.urlRoute });
}
if (item.type == 'photo_2') {
this.StackingPhoto.push({ name: '', url: item.urlRoute });
}
if (item.type == 'photo_3') {
this.FragilePhotos.push({ name: '', url: item.urlRoute });
}
if (item.type == 'photo_4') {
this.HomePhotos.push({ name: '', url: item.urlRoute });
}
if (item.type == 'photo_5') {
this.SignForPhotos.push({ name: '', url: item.urlRoute });
}
});
}
// DoorstepPhoto
// StackingPhoto
// FragilePhotos
// HomePhotos
// SignForPhotos
this.DoorstepPhoto = [];
this.StackingPhoto = [];
this.FragilePhotos = [];
this.HomePhotos = [];
this.SignForPhotos = [];
res.data.data.printVOList.forEach(item => {
if (item.type == 'photo_1') {
this.DoorstepPhoto.push({ name: '', url: item.urlRoute });
}
if (item.type == 'photo_2') {
this.StackingPhoto.push({ name: '', url: item.urlRoute });
}
if (item.type == 'photo_3') {
this.FragilePhotos.push({ name: '', url: item.urlRoute });
}
if (item.type == 'photo_4') {
this.HomePhotos.push({ name: '', url: item.urlRoute });
}
if (item.type == 'photo_5') {
this.SignForPhotos.push({ name: '', url: item.urlRoute });
}
});
}
console.log('签收>>>>>>>>>>', row);
console.log(row.signId, '复合签收');
this.signtitle = '复核签收';
// this.view = true;
this.signform = row;
this.signBox = true; //
// this.wid= row.id
// this.getWrapdetails(this.wpage)
console.log('签收>>>>>>>>>>', row);
console.log(row.signId, '复合签收');
this.signtitle = '复核签收';
// this.view = true;
this.signform = row;
this.signBox = true; //
// this.wid= row.id
// this.getWrapdetails(this.wpage)
});
},
handleSign(row) {
console.log(row,'row');
console.log(row, 'row');
this.reservationId = row.id;
let data={
signingId:row.signId,
}
$_isSignt(data).then(res=>{
console.log(res,'复核预请求');
let data = {
signingId: row.signId,
};
$_isSignt(data).then(res => {
console.log(res, '复核预请求');
if (res.data.msg == '存在异常包件') {
ElMessage({
message: res.data.msg,
@ -4351,7 +4395,6 @@ export default {
return;
}
if (res.data.msg == '此任务存在未完成包件,请确认') {
ElMessageBox.confirm(res.data.msg, '提示', {
confirmButtonText: '确定',
@ -4370,12 +4413,7 @@ export default {
if (res.data.msg == '直接进行复核操作') {
this.checkFn(row);
}
})
});
},
handleOne(row) {
console.log('签收>>>>>>>>>>', row);
@ -4398,12 +4436,12 @@ export default {
},
//
handleSignone(row) {
if(row.isHaveAbnormalPackage == 2){
if (row.isHaveAbnormalPackage == 2) {
ElMessage({
message: '存在异常,请先进行审核',
type: 'warning',
});
return
message: '存在异常,请先进行审核',
type: 'warning',
});
return;
}
//
this.DoorstepPhoto = [];
@ -4432,35 +4470,31 @@ export default {
getWrapdetails(page) {
let params = {};
params.reservationId = this.wid;
getWrapdetail(
page.currentPage,
page.pageSize,
Object.assign(params, this.wrapoption.query)
).then(res => {
console.log('查看>>>>>>>', res.data.data);
const data = res.data.data;
this.wrapdata = data.records;
this.wpage.total = data.total;
this.loading=false;//
}).catch(res=>{
this.loading=false;//
});
getWrapdetail(page.currentPage, page.pageSize, Object.assign(params, this.wrapoption.query))
.then(res => {
console.log('查看>>>>>>>', res.data.data);
const data = res.data.data;
this.wrapdata = data.records;
this.wpage.total = data.total;
this.loading = false; //
})
.catch(res => {
this.loading = false; //
});
},
getReservationInventoryPackageListInfo(page){
getReservationInventoryPackageListInfo(page) {
let params = {};
params.reservationId = this.wid;
getReservationPackageList(
page.currentPage,
page.pageSize,
Object.assign(params, this.wrapoption.inventoryQuery)
).then(res=>{
page.currentPage,
page.pageSize,
Object.assign(params, this.wrapoption.inventoryQuery)
).then(res => {
console.log('库存品包件>>>>>>>', res.data.data);
const data = res.data.data;
this.reservationInventoryPackageData = data.records;
this.loading=false;//
})
this.loading = false; //
});
},
handleDelete() {
if (this.selectionList.length === 0) {

66
src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue

@ -1,7 +1,7 @@
<template>
<basic-container>
<div class="avue-crud">
<el-tabs type="border-card" v-model="activeTab">
<el-tabs v-model="activeTab">
<el-tab-pane label="详 情 信 息" name="tab1">
<el-divider>提货基本信息</el-divider>
<el-row :gutter="24" class="rows">
@ -101,9 +101,8 @@
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '运单号'">
<el-text size="small" text @click="handleLike(slotProps.scope)">{{
// slotProps.scope.row.pickupBatch
123
<el-text size="small" text @click="handleGoWayBillDetail(slotProps.scope)">{{
slotProps.scope.row.waybillNo
}}</el-text>
</template>
<template v-if="slotProps.scope.column.label === '操作'">
@ -112,13 +111,6 @@
</template>
</tablecmt>
<el-row style="margin-top: 20px; font-size: 14px">
<div style="margin-right: 10px">选择数: 12</div>
<div style="margin-right: 10px">选择数: 12</div>
<div style="margin-right: 10px">选择数: 12</div>
<div style="margin-right: 10px">选择数: 12</div>
</el-row>
<div class="col">
<!-- 分页模块 -->
<el-pagination
@ -251,7 +243,10 @@
import { mapGetters } from 'vuex';
import dayjs from 'dayjs';
//
import { postBillladingDetail } from '@/api/distribution/arteryDistrilbutionBillLadingList';
import {
postBillladingDetail,
postFindChargeTypeList,
} from '@/api/distribution/arteryDistrilbutionBillLadingList';
import { ElMessage } from 'element-plus';
import { getToken } from '@/utils/auth';
export default {
@ -291,7 +286,7 @@ export default {
head: false,
},
{
prop: 'createTime',
prop: 'openOrderTime',
label: '开单日期',
type: 4,
values: '',
@ -346,7 +341,7 @@ export default {
isshowSummary: true,
},
{
prop: 'reservationNum',
prop: 'destination',
label: '到站',
type: 2,
values: '',
@ -356,7 +351,7 @@ export default {
sortable: true,
},
{
prop: 'reservationStockListNum',
prop: 'destinationWarehouseName',
label: '目的仓',
type: 3,
values: '',
@ -367,7 +362,7 @@ export default {
head: false,
},
{
prop: 'loadedNub',
prop: 'shipperName',
label: '发货人',
type: 2,
values: '',
@ -377,7 +372,7 @@ export default {
sortable: true,
},
{
prop: 'inventoryNub',
prop: 'consigneeName',
label: '收货人',
type: 2,
values: '',
@ -387,7 +382,7 @@ export default {
sortable: true,
},
{
prop: 'receivedQuantity',
prop: 'shipperMobile',
label: '发货手机',
type: 2,
values: '',
@ -397,7 +392,7 @@ export default {
sortable: true,
},
{
prop: 'remarks',
prop: 'consigneeMobile',
label: '收货电话',
type: 2,
values: '',
@ -407,7 +402,7 @@ export default {
sortable: true,
},
{
prop: 'isUrgentName',
prop: 'consigneeAddress',
label: '收货地址',
type: 2,
values: '',
@ -417,7 +412,7 @@ export default {
sortable: true,
},
{
prop: 'isUrgentName',
prop: 'remark',
label: '备注',
type: 1,
values: '',
@ -437,7 +432,7 @@ export default {
sortable: true,
},
{
prop: 'stockupStatusName',
prop: 'billladingFee',
label: '提货费用',
type: 2,
values: '',
@ -499,6 +494,8 @@ export default {
selectionList: [],
//
data: [],
/** 查询所有计费模式 */
chargeTypeList: [],
};
},
// watch: {
@ -521,7 +518,12 @@ export default {
// val.style.width = '45%';
});
},
created() {
async created() {
const res = await postFindChargeTypeList({});
const { code, data } = res.data;
this.chargeTypeList = data;
this.onLoad(this.page);
// //
// this.queryDictionary();
@ -624,6 +626,9 @@ export default {
if (code !== 200) return;
this.deliverydata = data;
this.deliverydata.chargeTypeName = this.chargeTypeList.find(
val => val.dictKey == data.chargeType
).dictValue;
this.data = data.waybillList;
} catch (error) {
console.log('error :>> ', error);
@ -632,6 +637,16 @@ export default {
}
},
/** 跳转到运单详情 */
handleGoWayBillDetail({ row }) {
if (row.waybillNo === '————') return this.$message.warning('暂无运单号');
this.$router.push({
path: '/distribution/inventory/BookingNote',
query: { name: `查看 -- 【${row.waybillNo}`, waybillNo: row.waybillNo },
});
},
/** 开启编辑弹窗 */
handleEdit({ row }) {
console.log('row :>> ', row);
@ -705,4 +720,9 @@ export default {
text-align: left;
}
}
:deep(.el-divider__text.is-center) {
font-size: 1.5rem;
color: var(--el-color-primary);
}
</style>

4
src/views/waybill/WaybillOrderList.vue

@ -123,9 +123,9 @@
<el-button type="text" @click="handleShowPackageOrderList(slotProps.scope)">
查看订单
</el-button>
<el-button type="text" @click="handleShowPackageOrderList(slotProps.scope)">
<!-- <el-button type="text" @click="handleShowPackageOrderList(slotProps.scope)">
零担标签
</el-button>
</el-button> -->
</template>
</template>
</tablecmt>

3
vite.config.js

@ -23,6 +23,9 @@ export default ({ mode, command }) => {
// 新zyc
// target: 'http://192.168.6.116:8777',
// target: 'http://192.168.6.122:8777',
// target: 'http://192.168.10.25:13000',
// target: 'http://192.168.10.25:2888',
target: 'http://192.168.6.163:9777',//CYZ
// target: 'http://192.168.10.57:13000',
// tjj
// sst

Loading…
Cancel
Save