Commit a97c0a27 authored by dragondean@qq.com's avatar dragondean@qq.com

Merge branch 'fix' into dev

parents 50c22137 a62629e7
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
prop="summaryInfo.netReceiptsAdvanceFreightFeeGroup" prop="summaryInfo.netReceiptsAdvanceFreightFeeGroup"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
{{ row.summaryInfo.netReceiptsAdvanceFreightFee {{ row.summaryInfo.totalNetReceiptsAdvanceFreightFee
}}{{ row.summaryInfo.totalFreightFeeCurrency }} }}{{ row.summaryInfo.totalFreightFeeCurrency }}
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -131,7 +131,6 @@ ...@@ -131,7 +131,6 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="用户姓名" prop="userId"> <el-form-item label="用户姓名" prop="userId">
<user-selector <user-selector
manage
v-model="form.userId" v-model="form.userId"
clearable clearable
@change="handleQuery" @change="handleQuery"
...@@ -411,4 +410,3 @@ export default { ...@@ -411,4 +410,3 @@ export default {
}, },
}; };
</script> </script>
\ No newline at end of file
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