+
+
+
+ 当前签收单状态>>>>>>>>> {{ signfordata.signingStatusAll }}
+
+
+ 基本信息
+
+
+ 预约单号：{{ signfordata.reservationCode }}
+
+
+ 商场名称：{{ signfordata.mallName }}
+
+
+ 预约时间：{{ signfordata.reservationDate }}
+
+
+
+
+
+
+
+
+ 配送信息
+
+
+ 配送车次：{{ signfordata.trainNumber }}
+
+
+ 配送司机：{{ signfordata.driverName }}
+
+
+ 配送车辆：{{ signfordata.vehicleName }}
+
+
+ 装车班组：{{ signfordata.loadingTeamName }}
+
+
+ 卸车班组：{{ signfordata.unLoadingTeamName }}
+
+
+
+
+
+
+
+
+ 收货人信息
+
+
+ 收货人：{{ signfordata.consignee }}
+
+
+ 手机号码：{{ signfordata.deliveryPhone }}
+
+
+ 收货地址：{{ signfordata.deliveryAddress }}
+
+
+
+
+ 是否加急：{{ signfordata.isUrgent }}
+
+
+ 客户备注：{{ signfordata.remarks }}
+
+
+
+
+
+
+ {{ item.dictValue }}
+ 件数:
+
+
+ 公里:
+
+
+ 距离:
+
+
+ 人数:
+
+
+ 楼层:
+
+
+ 预计费用:
+
+
+
+
+
+
+
+
+
@@ -1621,7 +1638,7 @@ export default {
if (data.orderInfo) {
this.orderData = data.orderInfo;
}
- console.log("data111>>>>>>",data)
+ console.log('data111>>>>>>', data);
this.stepActive = this.stepsList.findIndex(item => item.title === data.signingStatusAll);
this.signfordata = data;
this.signfordata.address = 'aa';
@@ -1629,26 +1646,24 @@ export default {
// this.getListOrders(this.page)
this.getListPackage();
});
- // this.getListOrders(this.page)
+ // this.getListOrders(this.page)
- });
- this.getListPackage();
- let a = {
- signforId:id,
- addvalueId:1
+ this.getListPackage();
+ let a = {
+ signforId: id,
+ addvalueId: 1,
+ };
+ addvalueInfoList(a).then(res => {
+ console.log('res------------->', res.data.data);
+ const data = res.data.data;
+ if (data === null) {
+ this.addvalueData = [];
+ this.addvalueinfo = {};
+ } else {
+ this.addvalueinfo = data;
+ this.addvalueData = data.packageEntityList;
}
- addvalueInfoList(a).then(res=>{
- console.log("res------------->",res.data.data);
- const data = res.data.data;
- if (data === null){
- this.addvalueData = [];
- this.addvalueinfo = { };
-
- }else {
- this.addvalueinfo = data;
- this.addvalueData = data.packageEntityList;
- }
- })
+ });
this.loading = false;
},
From 89c488921b7e1c5a992c7a402c51d60950775b59 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Mon, 25 Sep 2023 10:27:48 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?=
=?UTF-8?q?=E5=A4=9A=E4=B8=AA=E8=A7=92=E8=89=B2=E4=B8=8D=E8=83=BD=E9=80=89?=
=?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../stockup/distributionStockup.vue | 42 ++++-------------
.../stockup/distributionStockupDiscuss.vue | 39 +++-------------
.../stockup/distributionStockupMarket.vue | 46 +++++--------------
.../stockup/distributionStockupSelf.vue | 39 +++-------------
4 files changed, 34 insertions(+), 132 deletions(-)
diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue
index a60ac896..797cb0a1 100644
--- a/src/views/distribution/stockup/distributionStockup.vue
+++ b/src/views/distribution/stockup/distributionStockup.vue
@@ -602,49 +602,25 @@ export default {
},
//查询叉车人员
async getFork(){
- let ides = '';
- let ide = { };
- let b = false;
await getListUser().then(res =>{ //查询当前人信息
- // console.log("res>>>",res.data.data);
- if(res.data.data.userName != 'admin'){
- b = true;
- }
- ides = res.data.data.tenantId;
- this.deptId = res.data.data.deptId;
- })
- await getPostList(ides).then(res =>{ // 查询角色
- // console.log("查询>>>>",res.data.data);
- res.data.data.forEach(i =>{
- if(i.postName == "叉车"){
- ide = i;
- }
- })
- })
- // console.log("ied>>>>>",ide);
- let params={
- // postId: ide.id, //岗位
- deptId: this.deptId, //部门
- // roleId: '', //角色
- }
- if(b){
- // console.log("进来了");
- params.postId = ide.id;//岗位
- }
- getListOwn(Object.assign(params, this.query)).then(res =>{ //查询人员
- // console.log(".............",res.data.data);
+ // console.log("查询当前人信息>>>",res.data.data);
let fo = [];
res.data.data.forEach( i =>{
let a ={
dictKey: i.id,
- dictValue: i.name
+ dictValue: i.realName
};
fo.push(a);
+ if(!this.deptId){
+ this.deptId =i.deptId;
+ }
});
this.forkliftData = fo;
+
+ this.deptId = res.data.data.deptId;
})
- await this.getStorageArea();
- await this.getTeam();
+ await this.getStorageArea();
+ await this.getTeam();
},
//查询班组
diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue
index ece38ec0..7581883d 100644
--- a/src/views/distribution/stockup/distributionStockupDiscuss.vue
+++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue
@@ -729,47 +729,22 @@ export default {
},
//查询叉车人员
async getFork(){
- let ides = '';
- let ide = { };
- let b = false;
await getListUser().then(res =>{ //查询当前人信息
- // console.log("res>>>",res.data.data);
- if(res.data.data.userName != 'admin'){
- b = true;
- }
- ides = res.data.data.tenantId;
- this.deptId = res.data.data.deptId;
- })
- await getPostList(ides).then(res =>{ // 查询角色
- // console.log("查询>>>>",res.data.data);
- res.data.data.forEach(i =>{
- if(i.postName == "叉车"){
- ide = i;
- }
- })
- })
- // console.log("ied>>>>>",ide);
- let params={
- // postId: ide.id, //岗位
- deptId: this.deptId, //部门
- // roleId: '', //角色
- }
- if(b){
- // console.log("进来了");
- params.postId = ide.id;//岗位
- }
- // console.log("查询人员信息",params);
- getListOwn(Object.assign(params, this.query)).then(res =>{ //查询人员
- // console.log(".............",res.data.data);
+ console.log("查询当前人信息>>>",res.data.data);
let fo = [];
res.data.data.forEach( i =>{
let a ={
dictKey: i.id,
- dictValue: i.name
+ dictValue: i.realName
};
fo.push(a);
+ if(!this.deptId){
+ this.deptId =i.deptId;
+ }
});
this.forkliftData = fo;
+
+ this.deptId = res.data.data.deptId;
})
await this.getStorageArea();
await this.getTeam();
diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue
index c5f8abeb..38bce22d 100644
--- a/src/views/distribution/stockup/distributionStockupMarket.vue
+++ b/src/views/distribution/stockup/distributionStockupMarket.vue
@@ -229,7 +229,6 @@
-