Commit d1e448f7 authored by 332784038@qq.com's avatar 332784038@qq.com

添加订单详情中到仓详情页签

parent f1387b0a
...@@ -1052,6 +1052,14 @@ export function getOrderItemDeleted(orderId){ ...@@ -1052,6 +1052,14 @@ export function getOrderItemDeleted(orderId){
}) })
} }
//退仓品名列表
export function getOrderCheckInfo(orderId){
return request({
url: '/ecw/order/order-check-info/' + orderId,
method: 'get',
})
}
// 打包页面订单数据统计 // 打包页面订单数据统计
export function getPackStatistics(orderId){ export function getPackStatistics(orderId){
return request({ return request({
......
This diff is collapsed.
...@@ -323,6 +323,14 @@ ...@@ -323,6 +323,14 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('到仓详情')" name="seven">
<check-detail-prod :list="orderCheckInfoData"
:attr-list="attrList"
:currency-map="currencyMap"
:unit-map="unitMap"
:transport-id="order.transportId"
></check-detail-prod>
</el-tab-pane>
<!-- 这个地方v-hasPermi不生效,所以换checkPermi函数检查 --> <!-- 这个地方v-hasPermi不生效,所以换checkPermi函数检查 -->
<el-tab-pane :label="$t('操作日志')" name="five" v-if="checkPermi(['ecw:order:logs'])"> <el-tab-pane :label="$t('操作日志')" name="five" v-if="checkPermi(['ecw:order:logs'])">
<el-table :data="logs" v-loading="logsLoading"> <el-table :data="logs" v-loading="logsLoading">
...@@ -399,7 +407,7 @@ ...@@ -399,7 +407,7 @@
</template> </template>
<script> <script>
import {getOrder, operateLogPage,getOrderItemDeleted} from '@/api/ecw/order' import {getOrder, operateLogPage, getOrderItemDeleted, getOrderCheckInfo} from '@/api/ecw/order'
import { getDictDatas, DICT_TYPE, getDictData } from '@/utils/dict'; import { getDictDatas, DICT_TYPE, getDictData } from '@/utils/dict';
import PrintWarehouseReceipt from './components/PrintWarehouseReceipt' import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
import PrintLadingBill from './components/PrintLadingBill' import PrintLadingBill from './components/PrintLadingBill'
...@@ -423,11 +431,13 @@ import {getSupplier} from "@/api/ecw/supplier"; ...@@ -423,11 +431,13 @@ import {getSupplier} from "@/api/ecw/supplier";
import {getProductAttrList} from "@/api/ecw/productAttr"; import {getProductAttrList} from "@/api/ecw/productAttr";
import Decimal from 'decimal.js' import Decimal from 'decimal.js'
import DetailProd from '@/views/ecw/order/components/DetailProd.vue' import DetailProd from '@/views/ecw/order/components/DetailProd.vue'
import CheckDetailProd from '@/views/ecw/order/components/CheckDetailProd.vue'
export default { export default {
name: "detail", name: "detail",
components: { components: {
DetailProd, DetailProd,
CheckDetailProd,
ImageDisplay, ImageDisplay,
OperateLogDetail, OperateLogDetail,
PrintWarehouseReceipt, PrintLadingBill, PrintWarehouseReceipt, PrintLadingBill,
...@@ -483,6 +493,7 @@ export default { ...@@ -483,6 +493,7 @@ export default {
packAfterData:null,//显示打包历史详情 packAfterData:null,//显示打包历史详情
attrList: [], attrList: [],
orderItemDeletedData:[],//退仓品名 orderItemDeletedData:[],//退仓品名
orderCheckInfoData:[],//到仓详情
type:1 type:1
} }
}, },
...@@ -563,6 +574,7 @@ export default { ...@@ -563,6 +574,7 @@ export default {
this.getOrder(); this.getOrder();
this.getOfferNumber() this.getOfferNumber()
this.getOrderItemDeleted() this.getOrderItemDeleted()
this.getOrderCheckInfo()
} }
getCurrencyList().then(res => this.currencyList = res.data) getCurrencyList().then(res => this.currencyList = res.data)
...@@ -591,7 +603,7 @@ export default { ...@@ -591,7 +603,7 @@ export default {
this.showMore = !this.showMore; this.showMore = !this.showMore;
this.consigneeText = this.showMore? this.$t('隐藏') : this.$t('更多') this.consigneeText = this.showMore? this.$t('隐藏') : this.$t('更多')
}, },
/** 查询列表 */ /** 查询列表 */
getOrder() { getOrder() {
let that = this let that = this
...@@ -610,6 +622,13 @@ export default { ...@@ -610,6 +622,13 @@ export default {
that.orderItemDeletedData = response.data; that.orderItemDeletedData = response.data;
}); });
}, },
getOrderCheckInfo(){
let that = this
// 执行查询
getOrderCheckInfo(that.orderId).then(response => {
that.orderCheckInfoData = response.data;
});
},
/* loadBrands(){ /* loadBrands(){
let brandIds = [] let brandIds = []
this.form.orderItemVOList.forEach(item => { this.form.orderItemVOList.forEach(item => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment