Commit d83161e9 authored by zhoutong's avatar zhoutong

修复一些bug

parent 394e7e14
...@@ -31,12 +31,18 @@ ...@@ -31,12 +31,18 @@
</el-form-item> </el-form-item>
<el-form-item v-if="dtRealHeadTimeFlag||airArrivalInfo.arriveType==1" :label="$t('实际二程起飞时间')" prop="actSecondTime"> <el-form-item v-if="dtRealHeadTimeFlag||airArrivalInfo.arriveType==1" :label="$t('实际二程起飞时间')" prop="actSecondTime">
<template slot="label" slot-scope="scope">
<span style="color: red;">*</span>{{$t('实际二程起飞时间')}}
</template>
<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">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="airArrivalInfo.estTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="airArrivalInfo.estTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item :label="$t('实际到港时间')" prop="actTime"> <el-form-item :label="$t('实际到港时间')" prop="actTime">
<template slot="label" slot-scope="scope">
<span style="color: red;">*</span>{{$t('实际到港时间')}}
</template>
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="airArrivalInfo.actTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="airArrivalInfo.actTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
......
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
<div> <div>
<el-form ref="cDocForm" :model="cDocObj" label-width="100px"> <el-form ref="cDocForm" :model="cDocObj" label-width="100px">
<el-form-item :label="$t('出单方式')"> <el-form-item :label="$t('出单方式')">
<el-select v-model="cDocObj.cdOutBillType" :placeholder="$t('请选择出单方式')"> {{method.find(item=>item.value = cDocObj.cdOutBillType).label}}
<el-option v-for="item in method" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item> </el-form-item>
<template v-if="cDocObj.cdOutBillType === '1'"> <template v-if="cDocObj.cdOutBillType === '1'">
...@@ -107,9 +105,7 @@ export default { ...@@ -107,9 +105,7 @@ export default {
cdOutBillType: cdOutBillType:
oldData.cdOutBillType === 0 ? undefined : oldData.cdOutBillType, oldData.cdOutBillType === 0 ? undefined : oldData.cdOutBillType,
}; };
if(!this.$attrs.shipmentObj.clearanceDocInfo){ this.$set(this.cDocObj,'cdOutBillType',2)
this.$set(this.cDocObj,'cdOutBillType',this.$attrs.shipmentObj.clearanceDocInfo?.cdOutBillType||undefined)
}
}, },
methods: { methods: {
/** 提交 */ /** 提交 */
......
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
<el-table-column :label="$t('包装类型')" align="center" prop=""> <el-table-column :label="$t('包装类型')" align="center" prop="">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-for="(unit,index) in scope.row.warehouseInInfoVO && scope.row.warehouseInInfoVO.units.split(',')" :key="index"> <span v-for="(unit,index) in scope.row.warehouseInInfoVO && scope.row.warehouseInInfoVO.units.split(',')" :key="index">
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" /><span v-if="index>0&&index<scope.row.warehouseInInfoVO.units.split(',').length-1">, </span> <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" /><span v-if="index<scope.row.warehouseInInfoVO.units.split(',').length-1">, </span>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
......
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