Commit 2ec7f051 authored by zhoutong's avatar zhoutong

到仓功能优化

parent 0669a303
...@@ -19,6 +19,10 @@ ...@@ -19,6 +19,10 @@
{{$t('过机重量异常')}}: {{$t('过机放行-已找到重货订单')}}:<span v-for="order in strToArray(pageData.boxCustomsBackVO.overOrders)" :key="order">{{ getOrders(order) }}</span> {{$t('过机重量异常')}}: {{$t('过机放行-已找到重货订单')}}:<span v-for="order in strToArray(pageData.boxCustomsBackVO.overOrders)" :key="order">{{ getOrders(order) }}</span>
</p> </p>
</el-row> </el-row>
<el-row class="number-area">
<p class="label-font"><span style="color:red">*</span>{{$t('到仓时间')}}</p>
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="ulWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-row>
<el-row class="number-area"> <el-row class="number-area">
<p class="label-font">{{$t('自编号')}}</p> <p class="label-font">{{$t('自编号')}}</p>
<p class="label-font">{{selfNo}}</p> <p class="label-font">{{selfNo}}</p>
...@@ -127,12 +131,12 @@ ...@@ -127,12 +131,12 @@
<!-- 操作 --> <!-- 操作 -->
<div v-if="!isUnderReview"> <div v-if="!isUnderReview">
<el-button type="success" @click="onSubmit">{{$t('提交完成到仓审核')}}</el-button> <el-button type="success" @click="onSubmit">{{$t('提交完成到仓审核')}}</el-button>
<el-button plain type="primary" @click="$emit('closeStart')">{{$t('返回')}}</el-button> <el-button plain type="primary" @click="$emit('closeDialog')">{{$t('返回')}}</el-button>
</div> </div>
<div v-if="isUnderReview"> <div v-if="isUnderReview">
<el-button type="primary" @click="jumpReviewDetail">{{$t('到仓审核中')}}</el-button> <el-button type="primary" @click="jumpReviewDetail">{{$t('到仓审核中')}}</el-button>
<el-button plain type="primary" @click="canclAudit">{{$t('取消审核')}}</el-button> <el-button plain type="primary" @click="canclAudit">{{$t('取消审核')}}</el-button>
<el-button plain type="primary" @click="$emit('closeStart')">{{$t('返回')}}</el-button> <el-button plain type="primary" @click="$emit('closeDialog')">{{$t('返回')}}</el-button>
</div> </div>
</el-row> </el-row>
...@@ -193,7 +197,8 @@ export default { ...@@ -193,7 +197,8 @@ export default {
totalStatistics: {}, totalStatistics: {},
}, },
selectedUsers: [], selectedUsers: [],
sectionOrderList: [] sectionOrderList: [],
ulWarehouseTime: null
}; };
}, },
created() { created() {
...@@ -265,9 +270,14 @@ export default { ...@@ -265,9 +270,14 @@ export default {
this.$message.error(this.$t("请输入订单号")); this.$message.error(this.$t("请输入订单号"));
return; return;
} }
if (!this.ulWarehouseTime) {
this.$message.error(this.$t("请选择到仓时间"));
return;
}
batchUnload({ batchUnload({
orderNo: this.labelNo, orderNo: this.labelNo,
shipmentId: this.$attrs.shipmentObj.id, shipmentId: this.$attrs.shipmentObj.id,
unloadTime: this.ulWarehouseTime
}).then((res) => { }).then((res) => {
serviceMsg(res, this).then((res) => { serviceMsg(res, this).then((res) => {
this.labelNo = ""; this.labelNo = "";
...@@ -277,11 +287,15 @@ export default { ...@@ -277,11 +287,15 @@ export default {
}, },
/* 一键卸柜 */ /* 一键卸柜 */
modifyAllUnload() { modifyAllUnload() {
if (!this.ulWarehouseTime) {
this.$message.error(this.$t("请选择到仓时间"));
return;
}
this.$confirm(this.$t("确认到仓?"), this.$t("提示"), { this.$confirm(this.$t("确认到仓?"), this.$t("提示"), {
type: "warning", type: "warning",
}) })
.then((_) => { .then((_) => {
allUnload({ shipmentId: this.$attrs.shipmentObj.id }).then((res) => { allUnload({ shipmentId: this.$attrs.shipmentObj.id, unloadTime: this.ulWarehouseTime }).then((res) => {
serviceMsg(res, this).then((res) => { serviceMsg(res, this).then((res) => {
this.getLoadGoodsList(); this.getLoadGoodsList();
}); });
......
...@@ -42,7 +42,7 @@ import arrivalWidget from "./nodePage/arrival.vue"; ...@@ -42,7 +42,7 @@ import arrivalWidget from "./nodePage/arrival.vue";
import cusClearanceWidget from "./nodePage/cusClearance.vue"; import cusClearanceWidget from "./nodePage/cusClearance.vue";
import twoWayTakeoffWidget from "./nodePage/twoWayTakeoff.vue"; import twoWayTakeoffWidget from "./nodePage/twoWayTakeoff.vue";
import twoWayArrivalWidget from "./nodePage/twoWayArrival.vue"; import twoWayArrivalWidget from "./nodePage/twoWayArrival.vue";
import unloadingWidget from "./nodePage/unloading/index.vue"; import unloadingWidget from "./nodePage/unloading/startUnloading.vue";
import settlementWidget from "./nodePage/settlement.vue"; import settlementWidget from "./nodePage/settlement.vue";
import reviewWidget from "./nodePage/review.vue"; import reviewWidget from "./nodePage/review.vue";
import shipmentWidget from "./nodePage/shipment.vue"; import shipmentWidget from "./nodePage/shipment.vue";
...@@ -216,6 +216,7 @@ export default { ...@@ -216,6 +216,7 @@ export default {
break; break;
// 卸柜 // 卸柜
case "unloading": case "unloading":
this.$set(this.dialogConfig, "fullscreen", true);
// 卸柜反审 // 卸柜反审
const unStatus = this.shipmentObj[node.keyName]; const unStatus = this.shipmentObj[node.keyName];
if ([186].includes(unStatus)) { if ([186].includes(unStatus)) {
......
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