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

商配配送编辑新增默认送货方式

dev-xx
qb 1 year ago
parent
9787a499cc
commit
ab55ed08f1
1 changed files with 135 additions and 132 deletions
Split View
  1. 267
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue

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

@ -177,47 +177,47 @@
v-if="slotProps.scope.row.driverSigning === '未完成'"
>图片上传
</el-text>
<!-- <el-text-->
<!-- type="primary"-->
<!-- text-->
<!-- icon="el-icon-view"-->
<!-- @click="handleOne(slotProps.scope.row)"-->
<!-- v-if="-->
<!-- slotProps.scope.row.loadingStatus !== '已装车' &&-->
<!-- (slotProps.scope.row.signingStatus !== '已审核' ||-->
<!-- slotProps.scope.row.driverSigning !== '已签收')-->
<!-- "-->
<!-- >-->
<!-- 一键装车-->
<!-- </el-text>-->
<!-- v-if="-->
<!-- slotProps.scope.row.signingStatus == '待审核' &&-->
<!-- slotProps.scope.row.driverSigning == '已签收'-->
<!-- "-->
<!-- <el-text-->
<!-- type="primary"-->
<!-- text-->
<!-- icon="el-icon-view"-->
<!-- @click="handleOne(slotProps.scope.row)"-->
<!-- v-if="-->
<!-- slotProps.scope.row.loadingStatus !== '已装车' &&-->
<!-- (slotProps.scope.row.signingStatus !== '已审核' ||-->
<!-- slotProps.scope.row.driverSigning !== '已签收')-->
<!-- "-->
<!-- >-->
<!-- 一键装车-->
<!-- </el-text>-->
<!-- v-if="-->
<!-- slotProps.scope.row.signingStatus == '待审核' &&-->
<!-- slotProps.scope.row.driverSigning == '已签收'-->
<!-- "-->
<el-text
type="primary"
text
icon="el-icon-view"
@click="handleSign(slotProps.scope.row)"
v-if="
slotProps.scope.row.signingStatus == '待审核' &&
slotProps.scope.row.driverSigning === '已完成'
"
v-if="
slotProps.scope.row.signingStatus == '待审核' &&
slotProps.scope.row.driverSigning === '已完成'
"
>复核签收
</el-text>
<!-- <el-text-->
<!-- type="primary"-->
<!-- text-->
<!-- icon="el-icon-view"-->
<!-- @click="handleSignone(slotProps.scope.row)"-->
<!-- v-if="-->
<!-- slotProps.scope.row.signingStatus == '待审核' &&-->
<!-- slotProps.scope.row.driverSigning == '未签收' &&-->
<!-- Number(slotProps.scope.row.isHaveAbnormalPackage) === 1-->
<!-- "-->
<!-- >一键签收-->
<!-- </el-text>-->
<!-- <el-text-->
<!-- type="primary"-->
<!-- text-->
<!-- icon="el-icon-view"-->
<!-- @click="handleSignone(slotProps.scope.row)"-->
<!-- v-if="-->
<!-- slotProps.scope.row.signingStatus == '待审核' &&-->
<!-- slotProps.scope.row.driverSigning == '未签收' &&-->
<!-- Number(slotProps.scope.row.isHaveAbnormalPackage) === 1-->
<!-- "-->
<!-- >一键签收-->
<!-- </el-text>-->
</template>
</tablecmt>
</el-tab-pane>
@ -253,20 +253,20 @@
</tablecmt>
<div class="avue-crud__pagination" style="width: 100%">
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="psizeChange"
@current-change="pcurrentChange"
:current-page="packpage.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="packpage.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="packpage.total"
>
</el-pagination>
</div>
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="psizeChange"
@current-change="pcurrentChange"
:current-page="packpage.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="packpage.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="packpage.total"
>
</el-pagination>
</div>
</el-tab-pane>
<el-tab-pane label="库 存 品 列 表" name="tab4">
@ -596,12 +596,12 @@
</div>
<div>------------------------------</div> -->
<div class="TcFrom">
<el-form v-if="signtitle ==='复核签收'" :model="TcForm" label-width="120px">
<el-form v-if="signtitle === '复核签收'" :model="TcForm" label-width="120px">
<el-form-item label="收货人姓名">
<el-input disabled v-model="TcForm.consignee" placeholder="暂无收货人姓名" />
</el-form-item>
<el-form-item label="收货人电话">
<el-form-item label="收货人电话">
<el-input disabled v-model="TcForm.deliveryPhone" placeholder="暂无收货人电话" />
</el-form-item>
@ -774,7 +774,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';
@ -2145,7 +2150,7 @@ export default {
clientQuery: {},
inventoryQuery: {},
packageQuery: {},
formCustomer: {},
formCustomer: { deliveryWay: '10' },
formCustomerRolus: {
consignee: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
isUrgent: [{ required: true, message: '请选择是否加急', trigger: 'change' }],
@ -3603,7 +3608,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 {
@ -3619,8 +3624,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)) {
@ -4086,26 +4091,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, '要处理的值');
@ -4159,66 +4164,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; //取消限制
});
}
// 本身图片处理结束
@ -4330,21 +4333,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) {

Write Preview
Loading…
Cancel
Save