Browse Source

复核添加判断

pre-production
马远东 1 year ago
parent
commit
666968f313
  1. 10
      src/api/distribution/distributionDeliveryList.js
  2. 81
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  3. 2
      src/views/distribution/signfor/distributionSignfortreat.vue

10
src/api/distribution/distributionDeliveryList.js

@ -284,4 +284,12 @@ export const $_judgmentOrderRemove = (params) => {
method: 'get', method: 'get',
params params
}) })
} }
export const $_isSignt = params => {
return request({
url: '/api/logpm-distribution/signfor/isSign',
method: 'get',
params,
});
};

81
src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@ -183,6 +183,7 @@
" "
>复核签收 >复核签收
</el-text> </el-text>
<el-text <el-text
type="primary" type="primary"
text text
@ -700,6 +701,7 @@ import {
getinventorydetail, getinventorydetail,
getClientDetail, getClientDetail,
$_getDetail, $_getDetail,
$_isSignt,
} 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';
@ -709,7 +711,7 @@ import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict'; import { getDictionaryBiz } from '@/api/system/dict';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { updateReservation } from '@/api/distribution/distributionReservation'; import { updateReservation } from '@/api/distribution/distributionReservation';
import { ElMessage } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus';
import { getToken } from '@/utils/auth'; import { getToken } from '@/utils/auth';
import { setNodeHeight } from '@/utils/util.js'; import { setNodeHeight } from '@/utils/util.js';
export default { export default {
@ -3692,16 +3694,25 @@ export default {
break; break;
} }
}, },
handleSign(row) {
console.log('签收>>>>>>>>>>', row);
console.log(row.signId, '复合签收');
this.reservationId = row.id;
$_getDetail({ id: row.signId }).then(res => {
console.log(res, '复合返回值');
if (res.data.data) {
this.CheckStore = res.data.data;
if (res.data.data.printVOList) { //
checkFn(row) {
console.log('签收>>>>>>>>>>', row);
// this.title = '';
// this.view = true;
this.signform = row;
this.signBox = true;
getDetail(row.id).then(res => {
console.log(res, '点击复核的返回值');
this.form = res.data.data;
this.TcForm = res.data.data;
//
this.DoorstepPhoto = [];
this.StackingPhoto = [];
this.FragilePhotos = [];
this.HomePhotos = [];
this.SignForPhotos = [];
if (res.data.data.printVOList) {
// DoorstepPhoto // DoorstepPhoto
// StackingPhoto // StackingPhoto
// FragilePhotos // FragilePhotos
@ -3730,16 +3741,58 @@ export default {
} }
}); });
} }
console.log(this.CheckStore, 'data');
console.log(res.data.data, 'res'); console.log('签收>>>>>>>>>>', row);
} console.log(row.signId, '复合签收');
});
this.signtitle = '复核签收'; this.signtitle = '复核签收';
// this.view = true; // this.view = true;
this.signform = row; this.signform = row;
this.signBox = true; // this.signBox = true; //
// this.wid= row.id // this.wid= row.id
// this.getWrapdetails(this.wpage) // this.getWrapdetails(this.wpage)
});
},
handleSign(row) {
this.reservationId = row.id;
let data={
signingId: row.id,
}
$_isSignt(data).then(res=>{
console.log(res,'复核预请求');
if (res.data.msg == '存在异常包件') {
ElMessage({
message: res.data.msg,
type: 'warning',
});
return;
}
if (res.data.msg == '此任务存在未完成包件,请确认') {
ElMessageBox.confirm(res.data.msg, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
this.checkFn(row);
})
.catch(() => {
console.log('取消');
});
return;
}
if (res.data.msg == '直接进行复核操作') {
this.checkFn(row);
}
})
}, },
handleOne(row) { handleOne(row) {
console.log('签收>>>>>>>>>>', row); console.log('签收>>>>>>>>>>', row);

2
src/views/distribution/signfor/distributionSignfortreat.vue

@ -2127,7 +2127,7 @@ export default {
this.HomePhotos = []; this.HomePhotos = [];
this.SignForPhotos = []; this.SignForPhotos = [];
if (res.data.data.printVOList.length) { if (res.data.data.printVOList.length) {
InfoData.printVOList.forEach(item => { res.data.data.printVOList.forEach(item => {
if (item.type == 'photo_1') { if (item.type == 'photo_1') {
this.DoorstepPhoto.push({ name: item.name, url: item.urlRoute }); this.DoorstepPhoto.push({ name: item.name, url: item.urlRoute });
} }

Loading…
Cancel
Save