|
@@ -24,22 +24,22 @@
|
|
<el-button type="primary" class="btn" @click="onclick">
|
|
<el-button type="primary" class="btn" @click="onclick">
|
|
<i class="el-icon-search"></i>查询
|
|
<i class="el-icon-search"></i>查询
|
|
</el-button>
|
|
</el-button>
|
|
- <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
|
|
|
|
|
|
+ <!-- <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
|
|
<el-button type="primary" @click="refresh">
|
|
<el-button type="primary" @click="refresh">
|
|
<i class="el-icon-refresh"></i>刷新
|
|
<i class="el-icon-refresh"></i>刷新
|
|
- </el-button>
|
|
|
|
|
|
+ </el-button> -->
|
|
</div>
|
|
</div>
|
|
<div class="table">
|
|
<div class="table">
|
|
<dilTable ref="excelDom" v-bind.sync="option" >
|
|
<dilTable ref="excelDom" v-bind.sync="option" >
|
|
<el-table-column fixed="right" label="照片游览" width="120">
|
|
<el-table-column fixed="right" label="照片游览" width="120">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<el-button @click="toPhotoClick(scope.row.orderNumber)" type="text" size="small" style="font-size: 6px">
|
|
<el-button @click="toPhotoClick(scope.row.orderNumber)" type="text" size="small" style="font-size: 6px">
|
|
- 抵达满货照片</el-button>
|
|
|
|
|
|
+ 签收照片</el-button>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</dilTable>
|
|
</dilTable>
|
|
</div>
|
|
</div>
|
|
- <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
|
|
|
|
|
|
+ <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
|
|
<div class="demo-image__preview">
|
|
<div class="demo-image__preview">
|
|
<el-image
|
|
<el-image
|
|
style=" height:731px;text-align:center"
|
|
style=" height:731px;text-align:center"
|
|
@@ -66,7 +66,7 @@ export default {
|
|
endTime: null,
|
|
endTime: null,
|
|
option: {
|
|
option: {
|
|
// 表格请求数据的地址
|
|
// 表格请求数据的地址
|
|
- requestUrl: "/api/v1/tms/getReceiptResult?apiId=470",
|
|
|
|
|
|
+ requestUrl: "/api/v1/otms/getReceiptResult?apiId=470",
|
|
},
|
|
},
|
|
};
|
|
};
|
|
},
|
|
},
|
|
@@ -75,17 +75,18 @@ export default {
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
toPhotoClick(orderNumber){
|
|
toPhotoClick(orderNumber){
|
|
- console.log(orderNumber)
|
|
|
|
this.axios
|
|
this.axios
|
|
- .post("/api/v1/tms/getReceivingPhotoByUrl?orderNumber="+orderNumber)
|
|
|
|
|
|
+ .post("/api/v1/otms/getReceivingPhotoByUrl?orderNumber="+orderNumber)
|
|
.then((res)=>{
|
|
.then((res)=>{
|
|
- console.log(res)
|
|
|
|
|
|
+ console.log(res.data)
|
|
|
|
+ this.isShow=true;
|
|
this.srcList=[];
|
|
this.srcList=[];
|
|
- this.src=res.data.data.resultSignedNotePhoto;
|
|
|
|
- this.isShow=true;
|
|
|
|
- this.srcList.push(res.data.data.resultSignedNotePhoto);
|
|
|
|
- this.srcList.push(res.data.data.resultEmptyContainerPhoto);
|
|
|
|
-
|
|
|
|
|
|
+ this.src=res.data.resultSignedNotePhoto;
|
|
|
|
+ this.srcList.push(res.data.resultSignedNotePhoto);
|
|
|
|
+ this.srcList.push(res.data.resultEmptyContainerPhoto);
|
|
|
|
+ if(res.data.resultReceiveNotePhoto!=null){
|
|
|
|
+ this.srcList.push(res.data.resultReceiveNotePhoto);
|
|
|
|
+ }
|
|
});
|
|
});
|
|
|
|
|
|
},
|
|
},
|