Skip to content

F
factory_front
Commit c44bc308 by wuqian
Options

Merge branch 'dev'

parents 93e3e08e 357144a4
Showing with 44 additions and 20 deletions
src/views/podBillOrder/index.vue
...@@ -155,7 +155,16 @@ ...@@ -155,7 +155,16 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="工厂结算总价(￥)" label="总发货(件)"
header-align="center"
prop="num"
width="100"
align="center"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
label="结算总价(￥)"
header-align="center" header-align="center"
prop="product_total_amount" prop="product_total_amount"
width="130" width="130"
...@@ -222,15 +231,6 @@ ...@@ -222,15 +231,6 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="总发货(件)"
header-align="center"
prop="num"
width="100"
align="center"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
label="创建时间" label="创建时间"
prop="create_time" prop="create_time"
width="180" width="180"
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
> >
<el-table-column <el-table-column
type="selection" type="selection"
width="70" width="50"
header-align="center" header-align="center"
align="center" align="center"
/> />
...@@ -400,7 +400,7 @@ ...@@ -400,7 +400,7 @@
prop="user_mark" prop="user_mark"
header-align="center" header-align="center"
align="center" align="center"
min-width="160" min-width="80"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
...@@ -408,7 +408,15 @@ ...@@ -408,7 +408,15 @@
prop="factory_order_number" prop="factory_order_number"
header-align="center" header-align="center"
align="center" align="center"
min-width="160" min-width="130"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="baseSKU"
prop="base_sku"
header-align="center"
align="center"
min-width="150"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
...@@ -416,15 +424,31 @@ ...@@ -416,15 +424,31 @@
prop="shipment_num" prop="shipment_num"
header-align="center" header-align="center"
align="center" align="center"
min-width="120" min-width="100"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="工厂结算单价(￥)" label="结算单价(￥)"
prop="cost_price" prop="cost_price"
header-align="center" header-align="center"
align="center" align="center"
min-width="160" min-width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="工艺简称"
prop="process"
header-align="center"
align="center"
min-width="90"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="设计面数"
prop="face_count"
header-align="center"
align="center"
min-width="90"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
...@@ -432,15 +456,15 @@ ...@@ -432,15 +456,15 @@
prop="craft_price" prop="craft_price"
header-align="center" header-align="center"
align="center" align="center"
min-width="160" min-width="120"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="物流单价(￥)" label="物流价格(￥)"
prop="carriage_amount" prop="carriage_amount"
header-align="center" header-align="center"
align="center" align="center"
min-width="160" min-width="120"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
...@@ -772,7 +796,7 @@ ...@@ -772,7 +796,7 @@
{{ currentRow?.end_time }} {{ currentRow?.end_time }}
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
工厂结算总价(￥)： {{ currentRow?.product_total_amount }} 结算总价(￥)： {{ currentRow?.product_total_amount }}
</el-col> </el-col>
</el-row> </el-row>
<el-row style="margin: 10px 0"> <el-row style="margin: 10px 0">
......
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