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

Merge branch 'pre-production'

master
pref_mail@163.com 1 year ago
parent
7e6dccd911 fb811a04dc
commit
1c612a1a51
7 changed files with 370 additions and 311 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
Unescape View File

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

2
src/views/aftersales/aftersalesWorkOrder.vue
Unescape View File

@ -678,7 +678,7 @@ const AppealStatusT = ref(false); //是否为申诉列表
const TabList = ref([ const TabList = ref([
{ name: 0, label: '全部', state: true }, { name: 0, label: '全部', state: true },
{ name: 3, 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: 1, label: '处理中', state: true },
{ name: 2, label: '处理完毕', state: true }, { name: 2, label: '处理完毕', state: true },
{ name: 6, label: '完结', state: true }, { name: 6, label: '完结', state: true },

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

@ -291,17 +291,8 @@
<el-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow"> <el-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow">
<div> <div>
<div v-html="html"></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> </div>
<span slot="footer" class="dialog-footer"> <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="printTemplate">打 印</el-button>
<el-button type="primary" @click="isShow = false">确 定</el-button> <el-button type="primary" @click="isShow = false">确 定</el-button>
<el-button @click="isShow = false">取 消</el-button> <el-button @click="isShow = false">取 消</el-button>
@ -517,7 +508,7 @@ export default {
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
hide:true, hide: true,
}, },
{ {
prop: 'kindName', prop: 'kindName',

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

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

66
src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
Unescape View File

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

4
src/views/waybill/WaybillOrderList.vue
Unescape View File

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

3
vite.config.js
Unescape View File

@ -23,6 +23,9 @@ export default ({ mode, command }) => {
// 新zyc // 新zyc
// target: 'http://192.168.6.116:8777', // target: 'http://192.168.6.116:8777',
// target: 'http://192.168.6.122: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', // target: 'http://192.168.10.57:13000',
// tjj // tjj
// sst // sst

Write Preview
Loading…
Cancel
Save