@@ -608,12 +608,12 @@
------------------------------
-->
-
+
-
+
@@ -787,7 +787,12 @@ import {
} from '@/api/distribution/distributionDeliveryList';
import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
import { showInventoryPackgeCode } from '@/api/distribution/distributionStockList';
-import { update as updatesign, getOneclickq, deliveryPicture,recheck } from '@/api/distribution/distributionSignfor';
+import {
+ update as updatesign,
+ getOneclickq,
+ deliveryPicture,
+ recheck,
+} from '@/api/distribution/distributionSignfor';
import option from '@/option/basic/basicPdarecords';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
@@ -2158,7 +2163,7 @@ export default {
clientQuery: {},
inventoryQuery: {},
packageQuery: {},
- formCustomer: {},
+ formCustomer: { deliveryWay: '10' },
formCustomerRolus: {
consignee: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
isUrgent: [{ required: true, message: '请选择是否加急', trigger: 'change' }],
@@ -3616,7 +3621,7 @@ export default {
this.formCustomer.deliveryAddress = row.deliveryAddress;
this.formCustomer.remarks = row.remarks;
this.formCustomer.otherFee = row.otherFee;
- this.formCustomer.deliveryWay = row.deliveryWay;
+ this.formCustomer.deliveryWay = row.deliveryWay || '10';
if (row.isUrgentName === '否' || row.isUrgentName === '1') {
this.formCustomer.isUrgent = '1';
} else {
@@ -3632,8 +3637,8 @@ export default {
this.FragilePhotos = [];
this.HomePhotos = [];
this.SignForPhotos = [];
- this.signBox = true;
- this.reservationId = row.id;
+ this.signBox = true;
+ this.reservationId = row.id;
},
beforeOpen(done, type) {
if (['edit', 'view'].includes(type)) {
@@ -4099,26 +4104,26 @@ export default {
},
// 复核签收确认弹窗
submitForm() {
- if(!this.DoorstepPhoto.length){
+ if (!this.DoorstepPhoto.length) {
ElMessage({
- message: '至少上传一张上门照片',
- type: 'warning',
- })
- return
+ message: '至少上传一张上门照片',
+ type: 'warning',
+ });
+ return;
}
- if(!this.StackingPhoto.length){
+ if (!this.StackingPhoto.length) {
ElMessage({
- message: '至少上传一张堆码照片',
- type: 'warning',
- })
- return
+ message: '至少上传一张堆码照片',
+ type: 'warning',
+ });
+ return;
}
- if(!this.SignForPhotos.length){
+ if (!this.SignForPhotos.length) {
ElMessage({
- message: '至少上传一张签收照片',
- type: 'warning',
- })
- return
+ message: '至少上传一张签收照片',
+ type: 'warning',
+ });
+ return;
}
console.log(this.reservationId);
console.log(this.CheckStore, '要处理的值');
@@ -4172,66 +4177,64 @@ export default {
pushPhotoToRow(this.SignForPhotos, 'photo_5');
this.TCloading = true; //禁止确定
this.signBox = false;
- if (this.signtitle ==='图片上传'){
- console.log('图片上传',row);
+ if (this.signtitle === '图片上传') {
+ console.log('图片上传', row);
deliveryPicture(row)
- .then(res => {
- this.checkloading = false; //关闭复核签收加载效果
- if (res.data.code == 200) {
- this.TCloading = false; //取消限制
- ElMessage({
- message: '操作成功',
- type: 'success',
- });
- this.onLoad();
- } else {
+ .then(res => {
+ this.checkloading = false; //关闭复核签收加载效果
+ if (res.data.code == 200) {
+ this.TCloading = false; //取消限制
+ ElMessage({
+ message: '操作成功',
+ type: 'success',
+ });
+ this.onLoad();
+ } else {
+ this.checkloading = false; //取消限制
+ ElMessage.error('操作失败');
+ }
+ })
+ .catch(() => {
this.checkloading = false; //取消限制
- ElMessage.error('操作失败');
- }
- })
- .catch(() => {
- this.checkloading = false; //取消限制
- this.TCloading = false; //取消限制
- });
-
- }else if (this.signtitle ==='复核签收'){
+ this.TCloading = false; //取消限制
+ });
+ } else if (this.signtitle === '复核签收') {
recheck(row)
- .then(res => {
- this.checkloading = false; //关闭复核签收加载效果
- if (res.data.code == 200) {
- this.TCloading = false; //取消限制
- ElMessage({
- message: '操作成功',
- type: 'success',
- });
- this.onLoad();
- } else {
-
- ElMessage.error('操作失败');
- }
- })
- .catch(() => {
- this.TCloading = false; //取消限制
- this.checkloading = false; //取消限制
- });
- }else {
+ .then(res => {
+ this.checkloading = false; //关闭复核签收加载效果
+ if (res.data.code == 200) {
+ this.TCloading = false; //取消限制
+ ElMessage({
+ message: '操作成功',
+ type: 'success',
+ });
+ this.onLoad();
+ } else {
+ ElMessage.error('操作失败');
+ }
+ })
+ .catch(() => {
+ this.TCloading = false; //取消限制
+ this.checkloading = false; //取消限制
+ });
+ } else {
getOneclickq(row)
- .then(res => {
- this.checkloading = false; //关闭复核签收加载效果
- if (res.data.code == 200) {
- this.TCloading = false; //取消限制
- ElMessage({
- message: '操作成功',
- type: 'success',
- });
- this.onLoad();
- } else {
- ElMessage.error('操作失败');
- }
- })
- .catch(() => {
- this.TCloading = false; //取消限制
- });
+ .then(res => {
+ this.checkloading = false; //关闭复核签收加载效果
+ if (res.data.code == 200) {
+ this.TCloading = false; //取消限制
+ ElMessage({
+ message: '操作成功',
+ type: 'success',
+ });
+ this.onLoad();
+ } else {
+ ElMessage.error('操作失败');
+ }
+ })
+ .catch(() => {
+ this.TCloading = false; //取消限制
+ });
}
// 本身图片处理结束
@@ -4343,21 +4346,21 @@ export default {
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 => {
+ getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.packageQuery))
+ .then(res => {
console.log(res);
this.loading = false;
console.log('查看>>>>>包间>>', res.data.data.records);
if (res.data.data.records) {
const data = res.data.data.records;
- this.packpage.total= res.data.data.total
+ this.packpage.total = res.data.data.total;
this.packdata = data;
// this.packpage.total = data.length;
}
- }
- ).catch(res=>{
- this.loading = false;
- });
+ })
+ .catch(res => {
+ this.loading = false;
+ });
},
//库存列表
handleInventory(page) {
diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue
index 3100598e..dd3971e7 100644
--- a/src/views/waybill/TemporaryStorageList.vue
+++ b/src/views/waybill/TemporaryStorageList.vue
@@ -113,7 +113,7 @@