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

Merge remote-tracking branch 'origin/dev' into dev

fix_bug_pro20231227
caoyizhong 1 year ago
parent
ca08ff7f3a abbdcd512e
commit
4364a1b4d9
8 changed files with 4412 additions and 4050 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. 13
      src/api/distribution/distributionSignfor.js
  2. 2
      src/api/distribution/distrilbutionBillLading.js
  3. 24
      src/router/views/index.js
  4. 434
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  5. 1739
      src/views/distribution/signfor/devtmp.vue
  6. 1
      src/views/distribution/signfor/distributionSignfor.vue
  7. 3950
      src/views/distribution/signfor/distributionSignforedt.vue
  8. 2299
      src/views/distribution/signfor/distributionSignforedtTT.vue

13
src/api/distribution/distributionSignfor.js
Unescape View File

@ -203,3 +203,16 @@ export const addvalueInfoList = (row) => {
})
}
/**
* 签收增值服务弹窗
* @param params
* @returns {AxiosPromise}
*/
export const $_checkAddValuePackageList = params => {
return request({
url: '/api/logpm-distribution/signfor/checkAddValuePackageList',
method: 'get',
params,
});
};

2
src/api/distribution/distrilbutionBillLading.js
Unescape View File

@ -72,7 +72,7 @@ export const getListOwnNUm = params => {
//导出
export const getBillLadingExport = params => {
return request({
url: '/api/logpm-distribution/distrilbutionBillLading/listNum',
url: '/api/logpm-distribution/distrilbutionBillLading/export-distributionBillLadingVO',
method: 'get',
params: {
...params,

24
src/router/views/index.js
Unescape View File

@ -1047,18 +1047,18 @@ export default [
// },
// ],
// },
{
path: '/distribution/signfor/devtmp',
component: Layout,
redirect: '/distribution/signfor/devtmp',
children: [
{
path: '/distribution/signfor/devtmp',
name: '签收明细重构',
component: () => import('@/views/distribution/signfor/devtmp.vue'),
},
],
},
// {
// path: '/distribution/signfor/devtmp',
// component: Layout,
// redirect: '/distribution/signfor/devtmp',
// children: [
// {
// path: '/distribution/signfor/devtmp',
// name: '签收明细重构',
// component: () => import('@/views/distribution/signfor/devtmp.vue'),
// },
// ],
// },
// {
// path: 'basicdata/goodsShelf/basicdataGoodsShelfView',
// component: Layout,

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

@ -416,14 +416,134 @@
</el-dialog>
<el-dialog :title="signtitle" v-model="signBox" width="45%" append-to-body>
<avue-form :option="signoption" v-model="signform" :data="signdata" ref="signform">
</avue-form>
<div style="bottom: 7%; margin-left: 500px; width: 50%">
<!-- <avue-form :option="signoption" v-model="signform" :data="signdata" ref="signform">
</avue-form> -->
<!-- <div style="bottom: 7%; margin-left: 500px; width: 50%">
<div style="width: 100%">
<el-button @click="cancellation">取消</el-button>
<el-button type="primary" @click="submitForm">确定</el-button>
</div>
</div>
<div>------------------------------</div> -->
<div class="TcFrom">
<el-form :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-input disabled v-model="TcForm.deliveryPhone" placeholder="暂无收货人电话" />
</el-form-item>
<el-form-item label="收货人地址">
<el-input disabled v-model="TcForm.deliveryAddress" placeholder="暂无收货人地址" />
</el-form-item>
<el-form-item label="签收人类型">
<el-radio-group v-model="TcForm.signingType" class="ml-4">
<el-radio label="1" size="large">签收</el-radio>
<el-radio label="2" size="large">待签收</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="TcForm.clerkSignRemarks" placeholder="暂无备注" />
</el-form-item>
</el-form>
<div class="imgName">
<span>上门照</span>
<el-upload
v-model:file-list="DoorstepPhoto"
:action="doubledCount"
list-type="picture-card"
:on-preview="EnlargeTheTmageA"
:on-remove="handleRemove"
:on-success="ImgSuccessA"
:headers="headers"
>
<el-icon><Plus /></el-icon>
</el-upload>
<el-dialog v-model="dialogVisibleA">
<img w-full :src="dialogImageUrlA" alt="IMG" />
</el-dialog>
</div>
<div class="imgName">
<span>堆码照</span>
<el-upload
v-model:file-list="StackingPhoto"
:action="doubledCount"
list-type="picture-card"
:on-preview="EnlargeTheTmageB"
:on-remove="handleRemove"
:on-success="ImgSuccessB"
:headers="headers"
>
<el-icon><Plus /></el-icon>
</el-upload>
<el-dialog v-model="dialogVisibleB">
<img w-full :src="dialogImageUrlB" alt="IMG" />
</el-dialog>
</div>
<div class="imgName">
<span>易碎照</span>
<el-upload
v-model:file-list="FragilePhotos"
:action="doubledCount"
list-type="picture-card"
:on-preview="EnlargeTheTmageC"
:on-remove="handleRemove"
:on-success="ImgSuccessC"
:headers="headers"
>
<el-icon><Plus /></el-icon>
</el-upload>
<el-dialog v-model="dialogVisibleC">
<img w-full :src="dialogImageUrlC" alt="IMG" />
</el-dialog>
</div>
<div class="imgName">
<span>家配照</span>
<el-upload
v-model:file-list="HomePhotos"
:action="doubledCount"
list-type="picture-card"
:on-preview="EnlargeTheTmageD"
:on-remove="handleRemove"
:on-success="ImgSuccessD"
:headers="headers"
>
<el-icon><Plus /></el-icon>
</el-upload>
<el-dialog v-model="dialogVisibleD">
<img w-full :src="dialogImageUrlD" alt="IMG" />
</el-dialog>
</div>
<div class="imgName">
<span>签收照</span>
<el-upload
v-model:file-list="SignForPhotos"
:action="doubledCount"
list-type="picture-card"
:on-preview="EnlargeTheTmageE"
:on-remove="handleRemove"
:on-success="ImgSuccessE"
:headers="headers"
>
<el-icon><Plus /></el-icon>
</el-upload>
<el-dialog v-model="dialogVisibleE">
<img w-full :src="dialogImageUrlE" alt="IMG" />
</el-dialog>
</div>
<div class="tj-ttn">
<el-button type="primary" @click="submitForm" :disabled="TCloading">确定</el-button>
<el-button type="primary" @click="cancellation">取消</el-button>
</div>
</div>
</el-dialog>
</div>
</basic-container>
@ -448,10 +568,39 @@ import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
import dayjs from 'dayjs';
import { updateReservation } from '@/api/distribution/distributionReservation';
import { ElMessage } from 'element-plus';
import { getToken } from '@/utils/auth';
export default {
data() {
return {
dialogImageUrl: '', //图片放大地址
dialogVisible: false, //图片状态
dialogImageUrlA: '',
dialogImageUrlB: '',
dialogImageUrlC: '',
dialogImageUrlD: '',
dialogImageUrlE: '',
dialogVisibleA: false,
dialogVisibleB: false,
dialogVisibleC: false,
dialogVisibleD: false,
dialogVisibleE: false,
deliveryId: null,
Routid: null,
TCloading: false, //提交按钮
TcForm: {}, //弹窗表单
// 上门照
DoorstepPhoto: [],
// 堆门照
StackingPhoto: [],
// 易碎照
FragilePhotos: [],
// 家配照
HomePhotos: [],
// 签收照
SignForPhotos: [],
reservationId: null, //当前行的ID
columnList: [
{
prop: 'reservationCode',
@ -2460,9 +2609,18 @@ export default {
});
return ids.join(',');
},
// 图片上传接口
doubledCount() {
return '/api/blade-resource/oss/endpoint/put-file';
},
// 图片上传必须携带TOKEN
headers() {
return { 'Blade-Auth': 'Bearer ' + getToken() };
},
},
methods: {
callFordelivery(formName) {
console.log(formName, 'formName');
this.$refs[formName].validate(valid => {
if (valid) {
console.log('提交的数据》》》', this.formCustomer);
@ -2610,55 +2768,189 @@ export default {
}
});
},
// 图片上传回调
handleRemove(uploadFile, uploadFiles) {
console.log(uploadFile, uploadFiles);
console.log('执行了1回调');
},
handlePictureCardPreview(uploadFile) {
console.log(uploadFile);
console.log('执行了2回调');
dialogVisible.value = true;
},
// 通用的图片上传成功处理函数
// 上门照图片上传成功
ImgSuccessA(response, uploadFile) {
console.log(response, '触发了上门照');
console.log(this.DoorstepPhoto, '处理好的值');
},
// 堆门图片上传成功
ImgSuccessB(response, uploadFile) {
console.log(response, '触发了堆门照');
// this.StackingPhoto;
},
// 易碎图片上传成功
ImgSuccessC(response, uploadFile) {
console.log(response, '触发了易碎照');
// this.FragilePhotos;
},
// 家配图片上传成功
ImgSuccessD(response, uploadFile) {
console.log(response, '触发了家配照');
// this.HomePhotos;
},
// 签收图片上传成功
ImgSuccessE(response, uploadFile) {
console.log(response, '触发了签收照');
// this.SignForPhotos;
},
// 图片放大
EnlargeTheTmageA(uploadFile) {
this.dialogImageUrlA = uploadFile.url;
this.dialogVisibleA = true;
},
EnlargeTheTmageB(uploadFile) {
this.dialogImageUrlB = uploadFile.url;
this.dialogVisibleB = true;
},
EnlargeTheTmageC(uploadFile) {
this.dialogImageUrlC = uploadFile.url;
this.dialogVisibleC = true;
},
EnlargeTheTmageD(uploadFile) {
this.dialogImageUrlD = uploadFile.url;
this.dialogVisibleD = true;
},
EnlargeTheTmageE(uploadFile) {
this.dialogImageUrlE = uploadFile.url;
this.dialogVisibleE = true;
},
submitForm() {
console.log('--------------->this.signtitle', this.signtitle);
this.$refs.signform.validate(valid => {
if (valid) {
if (this.signtitle === '复核签收') {
let row = {};
console.log(
'this.signform.deliverySignPictures>>>>>>>>>',
this.signform.deliverySignPictures
);
row.id = this.signform.deliveryId;
row.deliverySignPictures = this.signform.deliverySignPictures;
row.clerkSignRemarks = this.signform.clerkSignRemarks;
row.signingTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
row.signingStatus = '2';
console.log('更新参数>>>>>>>>', row);
if (!!row.id) {
updatesign(row).then(
() => {
this.$message({
type: 'success',
message: '操作成功!',
});
this.onLoad();
},
error => {
console.log(error);
}
);
}
} else {
let data = {};
console.log('---------------->this.deliverydata', this.deliverydata);
console.log('---------------->this.signform', this.signform);
data.reservationId = this.signform.id;
data.deliveryId = this.deliverydata.id;
data.deliverySignPictures = this.signform.deliverySignPictures.join(',');
data.clerkSignRemarks = this.signform.clerkSignRemarks;
console.log('一键签收data>>>>>>>>>>', data);
getOneclickq(data).then(res => {
this.$message.success(res.data.msg);
this.onLoad();
});
}
// 清空签收表单的数据, 并关闭弹出框
this.signform = {};
this.signBox = false;
// console.log('--------------->this.signtitle', this.signtitle);
// console.log('--------------->this.signtitle', this.submitForm);
let row = {};
row.map = {
photo_1: [],
photo_2: [],
photo_3: [],
photo_4: [],
photo_5: [],
};
// 提交图片处理
//最后提交
row.reservationId = this.reservationId;
// row.clerkSignPictures = this.signform.clerkSignPictures;
row.clerkSignRemarks = this.TcForm.clerkSignRemarks; //备注
row.deliveryId = this.deliveryId;
// 本身图片处理开始
if (
this.DoorstepPhoto.length < 3 &&
this.StackingPhoto.length < 3 &&
this.SignForPhotos.length < 3
) {
ElMessage({
message: '图片参数不全',
type: 'warning',
});
return;
}
const pushPhotoToRow = (photoArray, photoType) => {
photoArray.forEach(item => {
row.map[photoType].push({
name: item.response.data.originalName,
reservationId: this.reservationId,
type: photoType,
urlRoute: item.response.data.link,
});
});
};
pushPhotoToRow(this.DoorstepPhoto, 'photo_1');
pushPhotoToRow(this.StackingPhoto, 'photo_2');
pushPhotoToRow(this.FragilePhotos, 'photo_3');
pushPhotoToRow(this.HomePhotos, 'photo_4');
pushPhotoToRow(this.SignForPhotos, 'photo_5');
console.log(row, '准备提交的参数');
this.TCloading = true; //禁止确定
this.signBox = false;
getOneclickq(row).then(res => {
if (res.data.code == 200) {
this.TCloading = false; //取消限制
ElMessage({
message: '操作成功',
type: 'success',
});
} else {
ElMessage.error('操作失败');
}
});
// 本身图片处理结束
// 上传图片处理开始
// {
// name: item.name,
// reservationId: reservationId,
// type: photoType,
// urlRoute: item.url,
// }
// console.log(row, '要提交的参数');
// getOneclickq(row).then(res => {
// console.log(res);
// });
// this.$refs.signform.validate(valid => {
// if (valid) {
// if (this.signtitle === '复核签收') {
// let row = {};
// console.log(
// 'this.signform.deliverySignPictures>>>>>>>>>',
// this.signform.deliverySignPictures
// );
// row.id = this.signform.deliveryId;
// row.deliverySignPictures = this.signform.deliverySignPictures;
// row.clerkSignRemarks = this.signform.clerkSignRemarks;
// row.signingTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
// row.signingStatus = '2';
// console.log('更新参数>>>>>>>>', row);
// if (!!row.id) {
// updatesign(row).then(
// () => {
// this.$message({
// type: 'success',
// message: '操作成功!',
// });
// this.onLoad();
// },
// error => {
// console.log(error);
// }
// );
// }
// } else {
// let data = {};
// console.log('---------------->this.deliverydata', this.deliverydata);
// console.log('---------------->this.signform', this.signform);
// data.reservationId = this.signform.id;
// data.deliveryId = this.deliverydata.id;
// data.deliverySignPictures = this.signform.deliverySignPictures.join(',');
// data.clerkSignRemarks = this.signform.clerkSignRemarks;
// console.log('一键签收data>>>>>>>>>>', data);
// getOneclickq(data).then(res => {
// this.$message.success(res.data.msg);
// this.onLoad();
// });
// }
// // 清空签收表单的数据, 并关闭弹出框
// this.signform = {};
// this.signBox = false;
// }
// });
},
//客户列表
handleCustom() {
@ -2671,6 +2963,7 @@ export default {
handleOrder(page) {
let params = {};
params.deliveryId = this.deliverydata.id;
getorddetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log('查看>>>>>订单>>', res.data.data);
const data = res.data.data;
@ -2726,6 +3019,7 @@ export default {
},
handleSign(row) {
console.log('签收>>>>>>>>>>', row);
this.signtitle = '复核签收';
// this.view = true;
this.signform = row;
@ -2735,13 +3029,15 @@ export default {
},
//一键签收
handleSignone(row) {
console.log('一键签收>>>>>>>>>>', row);
console.log('一键签收222>>>>>>>>>>', row);
this.reservationId = row.reservationId; //存储当前行的ID
this.signtitle = '一键签收';
this.signform = row;
this.TcForm = row;
this.signBox = true;
},
inventoryDetail(row) {
console.log('一键签收>>>>>>>>>>', row);
console.log('一键签收当前行参数>>>>>>>>>>', row);
},
handleOne(row) {
console.log('签收>>>>>>>>>>', row);
@ -2867,7 +3163,10 @@ export default {
//查询详情
const data = decodeURIComponent(this.$route.query.data);
this.deliverydata = JSON.parse(data);
console.log(this.Routid, this.Routid, '存储的ID=====================WDWADAWD');
console.log('data>>>>>>>>', this.deliverydata);
this.deliveryId = this.deliverydata.id; //存储ID
this.loading = true;
let id = this.deliverydata.id;
getDetail(id).then(res => {
@ -2932,3 +3231,34 @@ export default {
},
};
</script>
<style scoped lang="scss">
.TcFrom {
:deep(.el-form) {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
.el-form-item {
width: 46%;
}
}
}
.imgName {
span {
font-weight: bold;
font-size: 16px;
}
span::after {
content: '';
}
}
.tj-ttn {
display: flex;
justify-content: flex-end;
align-items: center;
}
:deep(.el-dialog__body) {
img {
width: 100%;
}
}
</style>

1739
src/views/distribution/signfor/devtmp.vue
View File

File diff suppressed because it is too large Load Diff

1
src/views/distribution/signfor/distributionSignfor.vue
Unescape View File

@ -644,6 +644,7 @@ export default {
path: '/distribution/signfor/distributionSignforedt',
query: {
id: row.id,
reservationId:row.reservationId,
name: '签收查看',
},
});

3950
src/views/distribution/signfor/distributionSignforedt.vue
View File

File diff suppressed because it is too large Load Diff

2299
src/views/distribution/signfor/distributionSignforedtTT.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save