Commit e6b3abc8 authored by Smile's avatar Smile Committed by wux

feat:空运渠道设置免收泡重需求

parent 6185d54e
......@@ -4718,5 +4718,7 @@
"​被合并客户-非主客户": "Consolidated customer - Non-principal customer",
"注意事项": "Matters need attention",
"选择客户": "Select a customer",
"运输": "Transportation"
"运输": "Transportation",
"免泡重量": "免泡重量",
"请输入免泡重量": "请输入免泡重量"
}
......@@ -324,5 +324,7 @@
"特殊设置": "特殊设置",
"已卸柜/已到仓时间": "已卸柜/已到仓时间",
"动态": "动态",
"增值服务": "增值服务"
"增值服务": "增值服务",
"免泡重量": "免泡重量",
"请输入免泡重量": "请输入免泡重量"
}
......@@ -100,6 +100,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('免泡重量')" prop="sort">
<el-input v-model.number="form.bubbleExemptWeight" :placeholder="$t('请输入免泡重量')"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
......
......@@ -158,7 +158,7 @@
<div slot="footer" class="dialog-footer">
<div v-if="list.orderExceptionStatus!=2">
<div v-if="type=='order_heavy_cargo_exception'">
<el-button type="primary" @click="submit('general_cargo')">{{$t('设为普货')}}</el-button>
<el-button type="primary" v-hasPermi="['ecw:weight_deal:general_cargo']" @click="submit('general_cargo')">{{$t('设为普货')}}</el-button>
<el-button plain type="primary" @click="submit('process')">{{$t('设为已处理')}}</el-button>
</div>
<div v-else>
......@@ -167,8 +167,8 @@
-->
<!--<el-button type="primary" @click="submit('general_cargo')">{{$t('设为免泡')}}</el-button>-->
<el-button plain type="primary" @click="submit('process')">{{$t('设为全泡')}}</el-button>
<el-button plain type="primary" @click="submit('half_throw')">{{$t('设为半抛')}}</el-button>
<el-button plain type="primary" v-hasPermi="['ecw:weight_deal:process']" @click="submit('process')">{{$t('设为全泡')}}</el-button>
<el-button plain type="primary" v-hasPermi="['ecw:weight_deal:half_throw']" @click="submit('half_throw')">{{$t('设为半抛')}}</el-button>
</div>
</div>
......
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