diff --git a/src/api/distribution/distributionSignfor.js b/src/api/distribution/distributionSignfor.js
index cc8904d0..a2039494 100644
--- a/src/api/distribution/distributionSignfor.js
+++ b/src/api/distribution/distributionSignfor.js
@@ -169,6 +169,14 @@ export const getOneclickq = (data) => {
data: data
})
}
+
+export const deliveryPicture = (data) => {
+ return request({
+ url: '/api/logpm-distribution/signfor/signforackPC',
+ method: 'post',
+ data: data
+ })
+}
export const update = (row) => {
return request({
url: '/api/logpm-distribution/signfor/update',
@@ -177,6 +185,14 @@ export const update = (row) => {
})
}
+export const recheck = (row) => {
+ return request({
+ url: '/api/logpm-distribution/signfor/update',
+ method: 'post',
+ data: row
+ })
+}
+
export const loadingAbnormalPackageListDetail = (signId) => {
return request({
url: '/api/logpm-distribution/signfor/loadingAbnormalPackageListDetail',
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 12ca0fb4..fa62ffcc 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -173,40 +173,51 @@
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 !== '已签收')
- "
- >
- 一键装车
+ @click="pictureUpload('4', slotProps.scope.row)"
+ 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="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>
@@ -584,12 +595,12 @@
</div>
<div>------------------------------</div> -->
<div class="TcFrom">
- <el-form :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>
@@ -762,7 +773,7 @@ import {
} from '@/api/distribution/distributionDeliveryList';
import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
import { showInventoryPackgeCode } from '@/api/distribution/distributionStockList';
-import { update as updatesign, getOneclickq } 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';
@@ -809,6 +820,7 @@ export default {
// 签收照
SignForPhotos: [],
reservationId: null, //当前行的ID
+ signId: null, //当前行签收Id
windowHeight: null,
CheckStore: null,
columnList: [
@@ -1061,7 +1073,7 @@ export default {
},
{
prop: 'driverSigning',
- label: '司机签收状态',
+ label: '配送状态',
type: 1,
values: '',
width: '150',
@@ -1070,6 +1082,16 @@ export default {
sortable: true,
head: false,
},
+ // {
+ // prop: 'signeeName',
+ // label: '签收人',
+ // type: 1,
+ // values: '',
+ // width: '180',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
{
prop: 'signingStatus',
label: '文员复核状态',
@@ -3588,6 +3610,19 @@ export default {
}
break;
}
+ },
+ pictureUpload(ind, row) {
+ this.signtitle = '图片上传';
+ this.DoorstepPhoto = [];
+ this.StackingPhoto = [];
+ this.FragilePhotos = [];
+ this.HomePhotos = [];
+ this.SignForPhotos = [];
+ this.signBox = true;
+ this.reservationId = row.id;
+
+
+
},
beforeOpen(done, type) {
if (['edit', 'view'].includes(type)) {
@@ -4071,6 +4106,7 @@ export default {
//最后提交
row.reservationId = this.reservationId;
+ row.id = this.signId;
// row.clerkSignPictures = this.signform.clerkSignPictures;
row.clerkSignRemarks = this.TcForm.clerkSignRemarks; //备注
row.deliveryId = this.deliveryId;
@@ -4104,8 +4140,10 @@ export default {
pushPhotoToRow(this.SignForPhotos, 'photo_5');
this.TCloading = true; //禁止确定
this.signBox = false;
- getOneclickq(row)
- .then(res => {
+ if (this.signtitle ==='图片上传'){
+ console.log('图片上传',row);
+ deliveryPicture(row)
+ .then(res => {
this.checkloading = false; //关闭复核签收加载效果
if (res.data.code == 200) {
this.TCloading = false; //取消限制
@@ -4115,12 +4153,55 @@ export default {
});
this.onLoad();
} else {
+ this.checkloading = false; //取消限制
ElMessage.error('操作失败');
}
})
- .catch(() => {
- this.TCloading = false; //取消限制
- });
+ .catch(() => {
+ this.checkloading = false; //取消限制
+ 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 {
+ 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; //取消限制
+ });
+ }
+
// 本身图片处理结束
// 上传图片处理开始
@@ -4368,6 +4449,7 @@ export default {
handleSign(row) {
console.log(row, 'row');
this.reservationId = row.id;
+ this.signId = row.signId;
let data = {
signingId: row.signId,
};