Commit 5c8bc031 authored by dragondean@qq.com's avatar dragondean@qq.com

拆单审核增加数量

parent 83a81d3a
...@@ -208,9 +208,9 @@ ...@@ -208,9 +208,9 @@
<el-form-item :label="$t('放入箱数')+':'"> <el-form-item :label="$t('放入箱数')+':'">
{{shopForm.putNum||0}} {{shopForm.putNum||0}}
</el-form-item> </el-form-item>
<el-form-item :label="$t('放入数量(个)')+':'" prop="putQuantity" v-show="isQuantity"> <!-- <el-form-item :label="$t('放入数量(个)')+':'" prop="putQuantity" v-show="isQuantity">
<el-input-number v-model="shopForm.putQuantity" controls-position="right" :min="0"></el-input-number> <el-input-number v-model="shopForm.putQuantity" controls-position="right" :min="0"></el-input-number>
</el-form-item> </el-form-item> -->
<el-form-item :label="$t('备注信息')+':'"> <el-form-item :label="$t('备注信息')+':'">
<el-input v-model="shopForm.remarks"></el-input> <el-input v-model="shopForm.remarks"></el-input>
</el-form-item> </el-form-item>
......
...@@ -32,28 +32,32 @@ ...@@ -32,28 +32,32 @@
<span>{{$t('发往')}}{{item.dstWarehouseName}}</span> <span>{{$t('发往')}}{{item.dstWarehouseName}}</span>
</div> </div>
<el-table :data="item.orderSplitItemBackVOList" :key="'items-' + item.orderNo"> <el-table :data="item.orderSplitItemBackVOList" :key="'items-' + item.orderNo">
<el-table-column :label="$t('序号')"> <el-table-column :label="$t('序号')">
<template slot-scope="scope">{{scope.$index+1}}</template> <template slot-scope="scope">{{scope.$index+1}}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('中文品名')"> <el-table-column :label="$t('中文品名')">
<template slot-scope="{row}">{{row.prodTitleZh}}</template> <template slot-scope="{row}">{{row.prodTitleZh}}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('英文品名')"> <el-table-column :label="$t('英文品名')">
<template slot-scope="{row}">{{row.prodTitleEn}}</template> <template slot-scope="{row}">{{row.prodTitleEn}}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('品牌')"> <el-table-column :label="$t('品牌')">
<template slot-scope="{row}"> <template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" /> <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('体积')"> <el-table-column :label="$t('体积')">
<template slot-scope="{row}">{{row.volume}}</template> <template slot-scope="{row}">{{row.volume}}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('重量')"> <el-table-column :label="$t('重量')">
<template slot-scope="{row}">{{row.weight}}kg</template> <template slot-scope="{row}">{{row.weight}}kg</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('箱数')"> <el-table-column :label="$t('箱数')">
<template slot-scope="{row}">{{row.num}}</template></el-table-column> <template slot-scope="{row}">{{row.num}}</template>
</el-table-column>
<el-table-column :label="$t('数量')">
<template slot-scope="{row}">{{row.quantity}}</template>
</el-table-column>
</el-table> </el-table>
</template> </template>
</div> </div>
......
...@@ -54,7 +54,10 @@ ...@@ -54,7 +54,10 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('箱数')"> <el-table-column :label="$t('箱数')">
<template slot-scope="{row}">{{row.num}}</template> <template slot-scope="{row}">{{row.num}}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('数量')">
<template slot-scope="{row}">{{row.quantity}}</template>
</el-table-column>
<el-table-column :label="$t('备注')"> <el-table-column :label="$t('备注')">
<template slot-scope="{row}">{{row.remark}}</template> <template slot-scope="{row}">{{row.remark}}</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