Commit 7668b8fb authored by dragondean@qq.com's avatar dragondean@qq.com

完善订单编辑翻译

parent 6c33ac08
<template> <template>
<div class="dict-selector"> <div class="dict-selector">
<el-select v-if="formType == 'select'" v-model="valueSync" :placeholder="placeholder" :clearable="clearable" :multiple="multiple" :disabled="disabled" @change="val => $emit('change', val)"> <el-select v-if="formType == 'select'" v-model="valueSync" :placeholder="placeholder || $t('请选择')" :clearable="clearable" :multiple="multiple" :disabled="disabled" @change="val => $emit('change', val)">
<el-option v-for="dict in formattedList" <el-option v-for="dict in formattedList"
:key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/> :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
</el-select> </el-select>
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
props:{ props:{
placeholder: { placeholder: {
type: String, type: String,
default: '请选择' default: null
}, },
type: String, type: String,
value: [String, Number, Array, Boolean], value: [String, Number, Array, Boolean],
......
<template> <template>
<el-select v-model="valueSync" :multiple="multiple" :disabled="disabled" :filterable="filterable"> <el-select v-model="valueSync" :multiple="multiple" :disabled="disabled" :filterable="filterable" :placeholder="$t('请选择')">
<el-option v-for="item in optionsFormated" :key="item.key" :label="item.label" :value="item.value" /> <el-option v-for="item in optionsFormated" :key="item.key" :label="item.label" :value="item.value" />
</el-select> </el-select>
</template> </template>
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<el-row> <el-row>
<el-col class="totle-info"> <el-col class="totle-info">
<div>总计:{{getSumData}}</div> <div>{{$t('总计')}}:{{getSumData}}</div>
<div>容量:{{calcCapacity}}</div> <div>容量:{{calcCapacity}}</div>
</el-col> </el-col>
</el-row> </el-row>
......
...@@ -278,10 +278,10 @@ ...@@ -278,10 +278,10 @@
<el-card class="mt-10"> <el-card class="mt-10">
<div class="card-title" slot="header">{{$t('通用')}}</div> <div class="card-title" slot="header">{{$t('通用')}}</div>
<div class="form-section"> <div class="form-section">
<el-form-item label="唛头" prop="marks" > <el-form-item :label="$t('唛头')" prop="marks" >
<el-input v-model="form.marks" ></el-input> <el-input v-model="form.marks" ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="是否控货" prop="isCargoControl" class="ml-20"> <el-form-item :label="$t('是否控货')" prop="isCargoControl" class="ml-20">
<dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.isCargoControl" form-type="radio"/> <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.isCargoControl" form-type="radio"/>
</el-form-item> </el-form-item>
</div> </div>
...@@ -574,7 +574,20 @@ export default { ...@@ -574,7 +574,20 @@ export default {
}, },
ccIdArr: [], ccIdArr: [],
// 表单校验 // 表单校验
rules: { labelStyle: 'width:120px',
showBatchImportDialog: false, // 显示批量导入弹窗
importList:[],
exportLoading: false, // 装下单模板下载状态
contactChooseType: null, // 联系人选择对象consignor(发货人) 或者 consignee(收货人)
quickCreateType: null, // 快速新建客户类型,1发货人,2收货人
showWorkFlow: false, // 是否显示工作流表单
calculating: false, // 是否正在计算费用,防止频繁重新请求
initing: true, // 初始化中
};
},
computed:{
rules(){
return {
marks: [ marks: [
{required: true, message: this.$t('请填写唛头')}, {required: true, message: this.$t('请填写唛头')},
{ {
...@@ -603,19 +616,8 @@ export default { ...@@ -603,19 +616,8 @@ export default {
customsType : [{required: true, message: this.$t('请选择单证报关')}], customsType : [{required: true, message: this.$t('请选择单证报关')}],
warehouseType : [{required: true, message: this.$t('请选择入仓类型')}], warehouseType : [{required: true, message: this.$t('请选择入仓类型')}],
harvestMethod : [{required: true, message: this.$t('请选择收货方式')}] harvestMethod : [{required: true, message: this.$t('请选择收货方式')}]
}
}, },
labelStyle: 'width:120px',
showBatchImportDialog: false, // 显示批量导入弹窗
importList:[],
exportLoading: false, // 装下单模板下载状态
contactChooseType: null, // 联系人选择对象consignor(发货人) 或者 consignee(收货人)
quickCreateType: null, // 快速新建客户类型,1发货人,2收货人
showWorkFlow: false, // 是否显示工作流表单
calculating: false, // 是否正在计算费用,防止频繁重新请求
initing: true, // 初始化中
};
},
computed:{
// 是否已完成入仓 // 是否已完成入仓
inWarehouse(){ inWarehouse(){
return !!this.form.inWarehouseState && this.form.inWarehouseState > 201 return !!this.form.inWarehouseState && this.form.inWarehouseState > 201
......
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