|
|
|
|
@ -288,7 +288,9 @@
|
|
|
|
|
<!-- </el-text>--> |
|
|
|
|
<!-- </template>--> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<el-text size="small" @click="handleInventoryQRCode(slotProps.scope.row)">查看二维码</el-text> |
|
|
|
|
<el-text size="small" @click="handleInventoryQRCode(slotProps.scope.row)" |
|
|
|
|
>查看二维码</el-text |
|
|
|
|
> |
|
|
|
|
</template> |
|
|
|
|
</tablecmt> |
|
|
|
|
</el-tab-pane> |
|
|
|
|
@ -418,16 +420,12 @@
|
|
|
|
|
:width="item.width" |
|
|
|
|
:key="index" |
|
|
|
|
> |
|
|
|
|
|
|
|
|
|
<!-- :align="center"--> |
|
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
|
|
<!-- <span>操作</span>--> |
|
|
|
|
<!-- <span>操作</span>--> |
|
|
|
|
</template> |
|
|
|
|
<el-table-column |
|
|
|
|
fixed="right" |
|
|
|
|
label="操作" |
|
|
|
|
width="100"> |
|
|
|
|
<el-table-column fixed="right" label="操作" width="100"> |
|
|
|
|
<template #default="scope"> |
|
|
|
|
<el-button size="small" @click="handleQRCode(scope.row)">查看二维码</el-button> |
|
|
|
|
</template> |
|
|
|
|
@ -457,7 +455,14 @@
|
|
|
|
|
<!-- </template>--> |
|
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
<el-dialog class="el_foot" :title="signtitle" v-model="signBox" width="45%" append-to-body :style="{height:windowHeight+'px',overflow:'scroll'}"> |
|
|
|
|
<el-dialog |
|
|
|
|
class="el_foot" |
|
|
|
|
:title="signtitle" |
|
|
|
|
v-model="signBox" |
|
|
|
|
width="45%" |
|
|
|
|
append-to-body |
|
|
|
|
:style="{ height: windowHeight + 'px', overflow: 'scroll' }" |
|
|
|
|
> |
|
|
|
|
<!-- <avue-form :option="signoption" v-model="signform" :data="signdata" ref="signform"> |
|
|
|
|
</avue-form> --> |
|
|
|
|
<!-- <div style="bottom: 7%; margin-left: 500px; width: 50%"> |
|
|
|
|
@ -633,7 +638,7 @@ import { getToken } from '@/utils/auth';
|
|
|
|
|
export default { |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
html:'', |
|
|
|
|
html: '', |
|
|
|
|
dialogImageUrl: '', //图片放大地址 |
|
|
|
|
dialogVisible: false, //图片状态 |
|
|
|
|
dialogImageUrlA: '', |
|
|
|
|
@ -662,7 +667,7 @@ export default {
|
|
|
|
|
// 签收照 |
|
|
|
|
SignForPhotos: [], |
|
|
|
|
reservationId: null, //当前行的ID |
|
|
|
|
windowHeight:null, |
|
|
|
|
windowHeight: null, |
|
|
|
|
columnList: [ |
|
|
|
|
{ |
|
|
|
|
prop: 'reservationCode', |
|
|
|
|
@ -1616,7 +1621,8 @@ export default {
|
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, { |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'orderCode', |
|
|
|
|
label: '订单自编码', |
|
|
|
|
type: 2, |
|
|
|
|
@ -2732,8 +2738,9 @@ export default {
|
|
|
|
|
mounted() { |
|
|
|
|
this.init(); |
|
|
|
|
this.onLoad(); |
|
|
|
|
this.windowHeight = window.innerHeight * 0.8; |
|
|
|
|
console.log(`浏览器窗口的高度为：${this.windowHeight}px`); |
|
|
|
|
|
|
|
|
|
this.windowHeight = window.innerHeight * 0.8; |
|
|
|
|
console.log(`浏览器窗口的高度为：${this.windowHeight}px`); |
|
|
|
|
}, |
|
|
|
|
created() { |
|
|
|
|
// //查询字典 |
|
|
|
|
@ -2875,20 +2882,19 @@ export default {
|
|
|
|
|
btnsc() {}, |
|
|
|
|
selectsc() {}, |
|
|
|
|
|
|
|
|
|
handleInventoryQRCode(row){ |
|
|
|
|
handleInventoryQRCode(row) { |
|
|
|
|
this.materialQRCode = row; |
|
|
|
|
console.log('row------------>',row); |
|
|
|
|
console.log('row------------>', row); |
|
|
|
|
// let qr = { |
|
|
|
|
// ids: row.id, |
|
|
|
|
// }; |
|
|
|
|
this.html = ''; |
|
|
|
|
showInventoryPackgeCode(row.reservationId,row.id).then(res => { |
|
|
|
|
showInventoryPackgeCode(row.reservationId, row.id).then(res => { |
|
|
|
|
// this.orderPackageCode = res.data |
|
|
|
|
console.log(res.data); |
|
|
|
|
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml); |
|
|
|
|
}); |
|
|
|
|
this.dialogVisibleF = true; |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
/** |
|
|
|
|
* 查看二维码 |
|
|
|
|
@ -3220,28 +3226,25 @@ export default {
|
|
|
|
|
console.log('签收>>>>>>>>>>', row); |
|
|
|
|
this.loading = true; |
|
|
|
|
this.$confirm('确认一键装车？') |
|
|
|
|
.then(_ => { |
|
|
|
|
|
|
|
|
|
let data = {}; |
|
|
|
|
data.reservationId = row.id; |
|
|
|
|
data.deliveryId = this.deliverydata.id; |
|
|
|
|
console.log('------------->data', data); |
|
|
|
|
getOneclick(data).then(res => { |
|
|
|
|
this.$message.success(res.data.msg); |
|
|
|
|
this.onLoad(); |
|
|
|
|
.then(_ => { |
|
|
|
|
let data = {}; |
|
|
|
|
data.reservationId = row.id; |
|
|
|
|
data.deliveryId = this.deliverydata.id; |
|
|
|
|
console.log('------------->data', data); |
|
|
|
|
getOneclick(data).then(res => { |
|
|
|
|
this.$message.success(res.data.msg); |
|
|
|
|
this.onLoad(); |
|
|
|
|
}); |
|
|
|
|
}) |
|
|
|
|
.catch(_ => {}) |
|
|
|
|
.finally(() => { |
|
|
|
|
this.loading = false; |
|
|
|
|
}); |
|
|
|
|
}) |
|
|
|
|
.catch(_ => {}) |
|
|
|
|
.finally(()=>{ |
|
|
|
|
this.loading = false; |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
//一键签收 |
|
|
|
|
handleSignone(row) { |
|
|
|
|
console.log('一键签收222>>>>>>>>>>', row); |
|
|
|
|
if (row.loadingStatus != '已装车'){ |
|
|
|
|
if (row.loadingStatus != '已装车') { |
|
|
|
|
ElMessage({ |
|
|
|
|
message: '请先进行装车', |
|
|
|
|
type: 'warning', |
|
|
|
|
@ -3465,7 +3468,7 @@ export default {
|
|
|
|
|
width: 100%; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
.el_foot{ |
|
|
|
|
.el_foot { |
|
|
|
|
overflow: scroll; |
|
|
|
|
} |
|
|
|
|
</style> |
|
|
|
|
|
