Commit 032ce625 authored by zhoutong's avatar zhoutong

合包可选,但必须出货完成了才能出仓

parent 928dfb9d
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item :label="$t('实际二程起飞时间')" prop="actSecondTime" v-show="this.$attrs.shipmentObj.bookAirInfo.voyage"> <el-form-item v-if="dtRealHeadTimeFlag" :label="$t('实际二程起飞时间')" prop="actSecondTime">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="airArrivalInfo.actSecondTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="airArrivalInfo.actSecondTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item :label="$t('预计到港时间')" prop="estTime"> <el-form-item :label="$t('预计到港时间')" prop="estTime">
...@@ -73,6 +73,7 @@ export default { ...@@ -73,6 +73,7 @@ export default {
inspectionTimeArrival: this.getDictDatas( inspectionTimeArrival: this.getDictDatas(
this.DICT_TYPE.BOX_INSPECTION_TIME_ARRIVAL this.DICT_TYPE.BOX_INSPECTION_TIME_ARRIVAL
)[0].value, )[0].value,
dtRealHeadTimeFlag: false
}; };
}, },
created() { created() {
...@@ -84,6 +85,9 @@ export default { ...@@ -84,6 +85,9 @@ export default {
"YYYY-MM-DD HH:mm:ss" "YYYY-MM-DD HH:mm:ss"
); );
this.airArrivalInfo = oldData; this.airArrivalInfo = oldData;
if(this.$attrs.shipmentObj['bookAirInfo'].voyage && this.$attrs.shipmentObj['bookAirInfo'].voyage == 2){
this.dtRealHeadTimeFlag = true
}
}, },
watch: { watch: {
// 实际二程起飞时间 // 实际二程起飞时间
......
...@@ -143,6 +143,12 @@ export default { ...@@ -143,6 +143,12 @@ export default {
this.$message.error(this.$t("没有此操作的权限")); this.$message.error(this.$t("没有此操作的权限"));
return; return;
} }
if(node.type == 'checkout'){
if(this.shipmentObj.airShipmentStatus != 175){
this.$message.error(this.$t("请先完成出货操作"));
return;
}
}
if (currIndex > this.currIndex) { if (currIndex > this.currIndex) {
console.log(currIndex,this.currIndex) console.log(currIndex,this.currIndex)
this.$message.error(this.errorMsg); this.$message.error(this.errorMsg);
......
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