Skip to content

J
jiedao-app-operator-master
Commit d71f81ef authored by dcy's avatar dcy
Browse files
Options

调拨到仓，挑拨出仓，

parent 97a3043f
Hide whitespace changes
Inline Side-by-side
Showing with 235 additions and 54 deletions
src/api/ecw/order.js
View file @ d71f81ef
...@@ -248,3 +248,40 @@ export function feeApplicationGet(params){ ...@@ -248,3 +248,40 @@ export function feeApplicationGet(params){
params params
}) })
} }
//获得调仓明细
export function orderWarehouseInGetAdjustInfo(params){
return request({
url:'order/order-warehouse-in/get-adjust-info',
method:'get',
params
})
}
export function warehouseAdjustSendOut(data){
return request({
url:'/order/order-warehouse-in/warehouse-adjust-send-out',
method:'put',
data
})
}
//获得订单仓库图片分页
export function orderWarehousePicturePage(params){
return request({
url:'/order/warehouse-picture/page',
method:'get',
params
})
}
export function warehouseAdjustPage(params){
return request({
url:'/order/warehouse-adjust/page',
method:'get',
params
})
}
export function warehouseAdjustArrived(data){
return request({
url:'/order/order-warehouse-in/warehouse-adjust-arrived',
method:'put',
data
})
}
src/views/ecw/order/cargoControlDetail.vue
View file @ d71f81ef
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input> <el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input>
</el-table-column> </el-table-column>
</el-table> </el-table>
<edit v-if="showEdit" @close="showEdit=false" /> <edit v-if="showEdit" @close="showEdit=false" />
</div> </div>
</template> </template>
...@@ -145,4 +145,4 @@ export default { ...@@ -145,4 +145,4 @@ export default {
margin-right:10px; margin-right:10px;
} }
} }
</style> </style>
\ No newline at end of file
src/views/ecw/order/transferWarehousing.vue
View file @ d71f81ef
<template> <template>
<div style="padding: 0 20px"> <div style="padding: 0 20px">
<h1>调拨出仓</h1> <h1>调拨出仓</h1>
<el-divider content-position="left"> <el-divider content-position="left">
订单信息 订单信息
</el-divider> </el-divider>
<ordeDetailsForm :details="{}"></ordeDetailsForm> <ordeDetailsForm :details="orderDetails"></ordeDetailsForm>
<el-divider content-position="left"> <el-divider content-position="left">
货物信息 货物信息
</el-divider> </el-divider>
<el-table> <el-table :data="orderDetails.orderItemVOList ? orderDetails.orderItemVOList : [] ">
<el-table-column label="序号"></el-table-column> <el-table-column type="index" label="序号"></el-table-column>
<el-table-column label="品名"></el-table-column> <el-table-column label="品名">
<el-table-column label="填单货物属性"></el-table-column> <template v-slot="{row}">
<el-table-column label="入库货物属性"></el-table-column> <div>{{ row.prodTitleZh }}</div>
<el-table-column label="最后操作时间"></el-table-column> <div>{{ row.prodTitleEn }}</div>
<el-table-column label="状态"></el-table-column> </template>
</el-table> </el-table-column>
<el-divider content-position="left"> <el-table-column label="填单货物属性">
调仓明细 <template v-slot="{row}">
</el-divider> <el-descriptions size="mini" :column="1">
<el-table> <el-descriptions-item label="品牌">{{ row.brand }}</el-descriptions-item>
<el-table-column label="调仓编号"></el-table-column> <el-descriptions-item label="箱数">{{ row.num }}</el-descriptions-item>
<el-table-column label="调出仓库"></el-table-column> <el-descriptions-item label="体积">{{ row.volume }}</el-descriptions-item>
<el-table-column label="调入仓库"></el-table-column> <el-descriptions-item label="重量">
<el-table-column label="申请人"></el-table-column> </el-descriptions-item>
<el-table-column label="申请时间"></el-table-column> </el-descriptions>
<el-table-column label="状态"></el-table-column> </template>
<el-table-column label="操作"></el-table-column> </el-table-column>
</el-table> <el-table-column label="入库货物属性">
<el-descriptions :column="4" border> <template v-slot="{row}">
<el-descriptions-item label="集运仓库">kooriookami</el-descriptions-item> <el-descriptions size="mini" :column="4">
<el-descriptions-item label="储位">18100000000</el-descriptions-item> <el-descriptions-item label="品牌">{{ row.brand }}</el-descriptions-item>
<el-descriptions-item label="调拨目标仓">苏州市</el-descriptions-item> <el-descriptions-item label="箱数"> {{ row.warehouseInInfoVO.cartonsNum }}</el-descriptions-item>
<el-descriptions-item label="物流公司"></el-descriptions-item> <el-descriptions-item label="体积">{{ row.warehouseInInfoVO.volume }}</el-descriptions-item>
<el-descriptions-item label="物流单号"> 1188 号</el-descriptions-item> <el-descriptions-item label="重量"> {{ row.warehouseInInfoVO.weight }}</el-descriptions-item>
<el-descriptions-item label="联系电话"> 1188 号</el-descriptions-item> </el-descriptions>
<el-descriptions-item label="出仓日期"> 1188 号</el-descriptions-item> </template>
<el-descriptions-item label="到仓日期"> 1188 号</el-descriptions-item> </el-table-column>
</el-descriptions> <el-table-column label="最后操作时间"></el-table-column>
<el-divider content-position="left"> <el-table-column label="状态">
出仓影像 <template v-slot="{row}">
</el-divider> <dict-tag :value="row.warehouseInInfoVO.diffType" :type="DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS"/>
<el-from> </template>
<el-form-item label="备注"></el-form-item> </el-table-column>
</el-from> </el-table>
<div> <el-divider content-position="left" v-if="type == 2">
<el-button>确认出仓</el-button> 调仓明细
<el-button>返回</el-button> </el-divider>
<el-table :data="warehouseList" v-if="type == 2">
<el-table-column label="调仓编号" prop="id"></el-table-column>
<el-table-column label="调出仓库" prop="warehouseOutId" ></el-table-column>
<el-table-column label="调入仓库" prop="warehouseInId"></el-table-column>
<el-table-column label="申请人"></el-table-column>
<el-table-column label="申请时间">
<template v-slot="{row}">
</template>
</el-table-column>
<el-table-column label="状态">
<template v-slot="{row}">
{{STATUS[row.status]}}
</template>
</el-table-column>
<el-table-column label="操作">
<template v-slot="{row}">
<el-button v-if="row.status === 4" type="text">
撤销
</el-button>
</template>
</el-table-column>
</el-table>
<el-descriptions style="margin-top: 20px" :column="4" border>
<el-descriptions-item label="集运仓库">{{ warehouseDetails.warehouseOutName }}</el-descriptions-item>
<el-descriptions-item label="储位">{{}}</el-descriptions-item>
<el-descriptions-item label="调拨目标仓">{{ warehouseDetails.warehouseInId }}</el-descriptions-item>
<el-descriptions-item label="物流公司">
<el-input v-model="params.logisticsCompany"></el-input>
</el-descriptions-item>
<el-descriptions-item label="物流单号">
<el-input v-model="params.logisticsNo"></el-input>
</el-descriptions-item>
<el-descriptions-item label="联系电话">
<el-input v-model="params.phone"></el-input>
</el-descriptions-item>
<el-descriptions-item label="出仓日期">
<el-date-picker
v-model="params.deliveryDate"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-descriptions-item>
<!-- <el-descriptions-item label="到仓日期">-->
<!-- <el-date-picker-->
<!-- v-model="params.deliveryDate"-->
<!-- type="date"-->
<!-- placeholder="选择日期">-->
<!-- </el-date-picker>-->
<!-- </el-descriptions-item>-->
</el-descriptions>
<el-divider content-position="left">
出仓影像
</el-divider>
<image-and-video-upload :fileSize="50" :isShowTip="true" v-model="params.urls" ></image-and-video-upload>
<el-form>
<el-form-item label="备注">
<el-input v-model="params.deliveryRemark" type="textarea"></el-input>
</el-form-item>
</el-form>
<div>
<el-button v-if="type === 1" @click="submit">确认出仓</el-button>
<el-button v-else @click="submit2">确认到仓</el-button>
<el-button @click="$router.back()">返回</el-button>
</div>
</div> </div>
</div>
</template> </template>
<script> <script>
import ordeDetailsForm from "@/views/ecw/order/components/ordeDetailsForm"; import ordeDetailsForm from "@/views/ecw/order/components/ordeDetailsForm";
import {
getOrder,
orderWarehouseInGetAdjustInfo,
orderWarehousePicturePage, warehouseAdjustArrived, warehouseAdjustPage,
warehouseAdjustSendOut
} from "@/api/ecw/order";
import Template from "@/views/cms/template";
import {DICT_TYPE} from '@/utils/dict';
import ImageAndVideoUpload from "@/components/ImageAndVideoUpload/index";
let STATUS = {1:'审核中', 2:'已通过', 3:'已拒绝', 4:'已出仓', 5:'已到仓'}
export default { export default {
name: "transferWarehousing", name: "transferWarehousing",
components:{ components: {
ordeDetailsForm ImageAndVideoUpload,
Template,
ordeDetailsForm,
},
props: {
orderId: [String, Number],
type: [String],
},
data() {
return {
STATUS,
orderDetails: {},
DICT_TYPE,
warehouseDetails: {},
warehouseList:[],
params: {
deliveryDate: "",
deliveryRemark: "",
id: undefined,
logisticsCompany: "",
logisticsNo: "",
phone: "",
urls: []
}
}
},
created() {
getOrder(this.orderId).then(r => {
if (r.code === 0) {
this.orderDetails = r.data;
}
})
if(this.type == 2){
warehouseAdjustPage({rows:100,orderId:this.orderId}).then(r => {
this.warehouseList = r.data.list
})
}
orderWarehouseInGetAdjustInfo({orderId: this.orderId, lang: 0}).then(r => {
this.warehouseDetails = r.data[0]
this.params.phone = this.warehouseDetails.phone;
this.params.logisticsNo = this.warehouseDetails.logisticsNo;
this.params.id = this.warehouseDetails.id;
this.params.deliveryDate = this.warehouseDetails.deliveryDate
orderWarehousePicturePage({rows:100,bizId:this.params.id,type:this.type == 1 ? 2 : 3 }).then(r => {
if(r.code === 0){
this.params.urls = r.data.list.map(e => e.url);
}
})
})
},
methods:{
submit(){
warehouseAdjustSendOut(this.params).then(
r => {
if(r.code === 0){
this.$message.success('调拨出仓成功');
this.$router.back();
}
}
)
},
submit2(){
warehouseAdjustArrived(this.params).then(r => {
{
if(r.code === 0){
this.$message.success('调到仓成功');
this.$router.back();
}
}
})
}
}, },
} }
</script> </script>
......
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