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

Merge branch 'dev' into pre-production

pre-production
pref_mail@163.com 1 year ago
parent
b4729437c2 ec078d5b65
commit
9324c44ae2
4 changed files with 372 additions and 171 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/config/website.js
  2. 235
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  3. 4
      src/views/aftersales/aftersalesWorkOrderend.vue
  4. 122
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue

2
src/config/website.js
Unescape View File

@ -5,7 +5,7 @@ export default {
title: '货无忧物流信息平台',
logo: 'S',
key: 'TWMS', //配置主键,目前用于存储
indexTitle: '货无忧 Admin',
indexTitle: '货无忧',
clientId: 'saber', // 客户端id
clientSecret: 'saber_secret', // 客户端密钥
tenantMode: true, // 是否开启租户模式

235
src/views/aftersales/aftersalesWorkOrderInfo.vue
View File

File diff suppressed because it is too large Load Diff

4
src/views/aftersales/aftersalesWorkOrderend.vue
Unescape View File

@ -120,7 +120,7 @@
:disabled="$route.query.index == '0'"
</el-form-item> -->
<el-form-item label="调查经过">
<!-- <el-form-item label="调查经过">
<el-input
disabled
v-model="endFrom.investigationProcess"
@ -129,7 +129,7 @@
:rows="2"
type="textarea"
/>
</el-form-item>
</el-form-item> -->
<el-tabs type="border-card" class="PackageInformation">
<el-tab-pane label="包件信息">

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

@ -161,6 +161,18 @@
@click="handlePrint(slotProps.scope.row)"
>打印
</el-text>
<el-text
type="primary"
text
icon="el-icon-view"
@click="viewAbnormalLoading(slotProps.scope.row)"
v-if="slotProps.scope.row.isHaveAbnormalPackage == '2'"
>异常审核
</el-text>
<el-text
type="primary"
text
@ -177,23 +189,23 @@
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
@ -206,18 +218,18 @@
>复核签收
</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>
@ -596,7 +608,7 @@
</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>
@ -749,6 +761,7 @@
<el-button @click="isShowPrint = false">取 消</el-button>
</span>
</el-dialog>
</basic-container>
</template>
@ -774,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';
@ -2145,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' }],
@ -3603,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 {
@ -4086,26 +4104,26 @@ export default {
},
// 复核签收确认弹窗
submitForm() {
if(!this.DoorstepPhoto.length){
if (!this.DoorstepPhoto.length) {
ElMessage({
message: '至少上传一张上门照片',
type: 'warning',
})
return
});
return;
}
if(!this.StackingPhoto.length){
if (!this.StackingPhoto.length) {
ElMessage({
message: '至少上传一张堆码照片',
type: 'warning',
})
return
});
return;
}
if(!this.SignForPhotos.length){
if (!this.SignForPhotos.length) {
ElMessage({
message: '至少上传一张签收照片',
type: 'warning',
})
return
});
return;
}
console.log(this.reservationId);
console.log(this.CheckStore, '要处理的值');
@ -4159,8 +4177,8 @@ 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; //关闭复核签收加载效果
@ -4180,8 +4198,7 @@ export default {
this.checkloading = false; //取消限制
this.TCloading = false; //取消限制
});
}else if (this.signtitle ==='复核签收'){
} else if (this.signtitle === '复核签收') {
recheck(row)
.then(res => {
this.checkloading = false; //关闭复核签收加载效果
@ -4193,7 +4210,6 @@ export default {
});
this.onLoad();
} else {
ElMessage.error('操作失败');
}
})
@ -4201,7 +4217,7 @@ export default {
this.TCloading = false; //取消限制
this.checkloading = false; //取消限制
});
}else {
} else {
getOneclickq(row)
.then(res => {
this.checkloading = false; //关闭复核签收加载效果
@ -4330,19 +4346,19 @@ 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=>{
})
.catch(res => {
this.loading = false;
});
},

Write Preview
Loading…
Cancel
Save