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
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. 109
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue

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

@ -177,23 +177,23 @@
v-if="slotProps.scope.row.driverSigning === '未完成'" v-if="slotProps.scope.row.driverSigning === '未完成'"
>图片上传 >图片上传
</el-text> </el-text>
<!-- <el-text--> <!-- <el-text-->
<!-- type="primary"--> <!-- type="primary"-->
<!-- text--> <!-- text-->
<!-- icon="el-icon-view"--> <!-- icon="el-icon-view"-->
<!-- @click="handleOne(slotProps.scope.row)"--> <!-- @click="handleOne(slotProps.scope.row)"-->
<!-- v-if="--> <!-- v-if="-->
<!-- slotProps.scope.row.loadingStatus !== '已装车' &&--> <!-- slotProps.scope.row.loadingStatus !== '已装车' &&-->
<!-- (slotProps.scope.row.signingStatus !== '已审核' ||--> <!-- (slotProps.scope.row.signingStatus !== '已审核' ||-->
<!-- slotProps.scope.row.driverSigning !== '已签收')--> <!-- slotProps.scope.row.driverSigning !== '已签收')-->
<!-- "--> <!-- "-->
<!-- >--> <!-- >-->
<!-- 一键装车--> <!-- 一键装车-->
<!-- </el-text>--> <!-- </el-text>-->
<!-- v-if="--> <!-- v-if="-->
<!-- slotProps.scope.row.signingStatus == '待审核' &&--> <!-- slotProps.scope.row.signingStatus == '待审核' &&-->
<!-- slotProps.scope.row.driverSigning == '已签收'--> <!-- slotProps.scope.row.driverSigning == '已签收'-->
<!-- "--> <!-- "-->
<el-text <el-text
type="primary" type="primary"
text text
@ -206,18 +206,18 @@
>复核签收 >复核签收
</el-text> </el-text>
<!-- <el-text--> <!-- <el-text-->
<!-- type="primary"--> <!-- type="primary"-->
<!-- text--> <!-- text-->
<!-- icon="el-icon-view"--> <!-- icon="el-icon-view"-->
<!-- @click="handleSignone(slotProps.scope.row)"--> <!-- @click="handleSignone(slotProps.scope.row)"-->
<!-- v-if="--> <!-- v-if="-->
<!-- slotProps.scope.row.signingStatus == '待审核' &&--> <!-- slotProps.scope.row.signingStatus == '待审核' &&-->
<!-- slotProps.scope.row.driverSigning == '未签收' &&--> <!-- slotProps.scope.row.driverSigning == '未签收' &&-->
<!-- Number(slotProps.scope.row.isHaveAbnormalPackage) === 1--> <!-- Number(slotProps.scope.row.isHaveAbnormalPackage) === 1-->
<!-- "--> <!-- "-->
<!-- >一键签收--> <!-- >一键签收-->
<!-- </el-text>--> <!-- </el-text>-->
</template> </template>
</tablecmt> </tablecmt>
</el-tab-pane> </el-tab-pane>
@ -596,7 +596,7 @@
</div> </div>
<div>------------------------------</div> --> <div>------------------------------</div> -->
<div class="TcFrom"> <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-form-item label="收货人姓名">
<el-input disabled v-model="TcForm.consignee" placeholder="暂无收货人姓名" /> <el-input disabled v-model="TcForm.consignee" placeholder="暂无收货人姓名" />
</el-form-item> </el-form-item>
@ -774,7 +774,12 @@ import {
} from '@/api/distribution/distributionDeliveryList'; } 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, deliveryPicture,recheck } from '@/api/distribution/distributionSignfor'; import {
update as updatesign,
getOneclickq,
deliveryPicture,
recheck,
} from '@/api/distribution/distributionSignfor';
import option from '@/option/basic/basicPdarecords'; 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';
@ -2145,7 +2150,7 @@ export default {
clientQuery: {}, clientQuery: {},
inventoryQuery: {}, inventoryQuery: {},
packageQuery: {}, packageQuery: {},
formCustomer: {}, formCustomer: { deliveryWay: '10' },
formCustomerRolus: { formCustomerRolus: {
consignee: [{ required: true, message: '请输入姓名', trigger: 'blur' }], consignee: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
isUrgent: [{ required: true, message: '请选择是否加急', trigger: 'change' }], isUrgent: [{ required: true, message: '请选择是否加急', trigger: 'change' }],
@ -3603,7 +3608,7 @@ export default {
this.formCustomer.deliveryAddress = row.deliveryAddress; this.formCustomer.deliveryAddress = row.deliveryAddress;
this.formCustomer.remarks = row.remarks; this.formCustomer.remarks = row.remarks;
this.formCustomer.otherFee = row.otherFee; this.formCustomer.otherFee = row.otherFee;
this.formCustomer.deliveryWay = row.deliveryWay; this.formCustomer.deliveryWay = row.deliveryWay || '10';
if (row.isUrgentName === '否' || row.isUrgentName === '1') { if (row.isUrgentName === '否' || row.isUrgentName === '1') {
this.formCustomer.isUrgent = '1'; this.formCustomer.isUrgent = '1';
} else { } else {
@ -4086,26 +4091,26 @@ export default {
}, },
// 复核签收确认弹窗 // 复核签收确认弹窗
submitForm() { submitForm() {
if(!this.DoorstepPhoto.length){ if (!this.DoorstepPhoto.length) {
ElMessage({ ElMessage({
message: '至少上传一张上门照片', message: '至少上传一张上门照片',
type: 'warning', type: 'warning',
}) });
return return;
} }
if(!this.StackingPhoto.length){ if (!this.StackingPhoto.length) {
ElMessage({ ElMessage({
message: '至少上传一张堆码照片', message: '至少上传一张堆码照片',
type: 'warning', type: 'warning',
}) });
return return;
} }
if(!this.SignForPhotos.length){ if (!this.SignForPhotos.length) {
ElMessage({ ElMessage({
message: '至少上传一张签收照片', message: '至少上传一张签收照片',
type: 'warning', type: 'warning',
}) });
return return;
} }
console.log(this.reservationId); console.log(this.reservationId);
console.log(this.CheckStore, '要处理的值'); console.log(this.CheckStore, '要处理的值');
@ -4159,8 +4164,8 @@ export default {
pushPhotoToRow(this.SignForPhotos, 'photo_5'); pushPhotoToRow(this.SignForPhotos, 'photo_5');
this.TCloading = true; //禁止确定 this.TCloading = true; //禁止确定
this.signBox = false; this.signBox = false;
if (this.signtitle ==='图片上传'){ if (this.signtitle === '图片上传') {
console.log('图片上传',row); console.log('图片上传', row);
deliveryPicture(row) deliveryPicture(row)
.then(res => { .then(res => {
this.checkloading = false; //关闭复核签收加载效果 this.checkloading = false; //关闭复核签收加载效果
@ -4180,8 +4185,7 @@ export default {
this.checkloading = false; //取消限制 this.checkloading = false; //取消限制
this.TCloading = false; //取消限制 this.TCloading = false; //取消限制
}); });
} else if (this.signtitle === '复核签收') {
}else if (this.signtitle ==='复核签收'){
recheck(row) recheck(row)
.then(res => { .then(res => {
this.checkloading = false; //关闭复核签收加载效果 this.checkloading = false; //关闭复核签收加载效果
@ -4193,7 +4197,6 @@ export default {
}); });
this.onLoad(); this.onLoad();
} else { } else {
ElMessage.error('操作失败'); ElMessage.error('操作失败');
} }
}) })
@ -4201,7 +4204,7 @@ export default {
this.TCloading = false; //取消限制 this.TCloading = false; //取消限制
this.checkloading = false; //取消限制 this.checkloading = false; //取消限制
}); });
}else { } else {
getOneclickq(row) getOneclickq(row)
.then(res => { .then(res => {
this.checkloading = false; //关闭复核签收加载效果 this.checkloading = false; //关闭复核签收加载效果
@ -4330,19 +4333,19 @@ export default {
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))
res => { .then(res => {
console.log(res); console.log(res);
this.loading = false; this.loading = false;
console.log('查看>>>>>包间>>', res.data.data.records); console.log('查看>>>>>包间>>', res.data.data.records);
if (res.data.data.records) { if (res.data.data.records) {
const data = 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.packdata = data;
// this.packpage.total = data.length; // this.packpage.total = data.length;
} }
} })
).catch(res=>{ .catch(res => {
this.loading = false; this.loading = false;
}); });
}, },

Write Preview
Loading…
Cancel
Save