Commit 1270eb96 authored by zhoutong's avatar zhoutong

出货提单的一些bug

parent 0d949c2c
...@@ -107,7 +107,9 @@ export default { ...@@ -107,7 +107,9 @@ export default {
cdOutBillType: cdOutBillType:
oldData.cdOutBillType === 0 ? undefined : oldData.cdOutBillType, oldData.cdOutBillType === 0 ? undefined : oldData.cdOutBillType,
}; };
this.$set(this.cDocObj,'cdOutBillType',String(this.$attrs.shipmentObj.ladingBillInfo?.issueType)||undefined) if(!this.$attrs.shipmentObj.clearanceDocInfo){
this.$set(this.cDocObj,'cdOutBillType',String(this.$attrs.shipmentObj.ladingBillInfo?.issueType)||undefined)
}
}, },
methods: { methods: {
/** 提交 */ /** 提交 */
......
<template> <template>
<el-select filterable :value="value === 0 ? undefined : value" @change="change" v-bind="$attrs" clearable> <el-select filterable :value="company === 0 ? undefined : company" @change="change" v-bind="$attrs" clearable>
<el-option v-for="user in getUser" :key="user.id" :value="user.id" :label="$l(user, 'company')"></el-option> <el-option v-for="user in getUser" :key="user.id" :value="user.id" :label="$l(user, 'company')"></el-option>
</el-select> </el-select>
</template> </template>
...@@ -24,8 +24,28 @@ export default { ...@@ -24,8 +24,28 @@ export default {
}, },
computed: { computed: {
getUser() { getUser() {
this.allUsers.forEach(element => {
if(!element.companyEn) {
element.companyEn = element.companyZh
}
});
return this.allUsers; return this.allUsers;
}, },
company: {
get() {
return this.value
},
set(val) {
this.$emit("change", val);
}
}
},
created() {
this.company = this.value
let com = this.getUser.findIndex(item=>item.id==this.company)
if(com == -1){
this.company = 0
}
}, },
methods: { methods: {
change(val) { change(val) {
......
...@@ -34,7 +34,10 @@ ...@@ -34,7 +34,10 @@
{{scope.row.orderNo}} {{scope.row.orderNo}}
</div> </div>
<div style="color:blue;fontWeight:bold;"> <div style="color:blue;fontWeight:bold;">
{{ scope.row.isExternalWarehouse === 1 ? '(外部仓)' : ''}} {{ scope.row.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}}
</div>
<div style="color:red;fontWeight:bold;">
{{ scope.row.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
</div> </div>
</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