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

起始标签为入仓数 + 1

parent 2956a4c9
...@@ -77,7 +77,8 @@ import lodop from '@/utils/lodop' ...@@ -77,7 +77,8 @@ import lodop from '@/utils/lodop'
export default { export default {
filters: {parseTime}, filters: {parseTime},
props:{ props:{
orderId: [String, Number] orderId: [String, Number],
warehouseInNum: Number
}, },
data(){ data(){
return { return {
...@@ -116,7 +117,9 @@ export default { ...@@ -116,7 +117,9 @@ export default {
loadData(){ loadData(){
printTag(this.orderId).then(res => { printTag(this.orderId).then(res => {
this.$set(this, 'tags', res.data) this.$set(this, 'tags', res.data)
this.form.start = res.data[0].num // this.form.start = res.data[0].num
// 起始标签为入仓数 + 1
this.form.start = this.warehouseInNum + 1
this.form.end = res.data[res.data.length-1].num this.form.end = res.data[res.data.length-1].num
}) })
}, },
......
...@@ -430,7 +430,7 @@ ...@@ -430,7 +430,7 @@
exclude(scope.row.status, [0]) && exclude(scope.row.status, [0]) &&
exclude(scope.row.abnormalState, [5,6,7,8]) exclude(scope.row.abnormalState, [5,6,7,8])
"> ">
<el-dropdown-item @click.native="printTagOrderId=scope.row.orderId" v-hasPermi="['ecw:order:print_tag']">{{$t('打印标签')}}</el-dropdown-item> <el-dropdown-item @click.native="printTag(scope.row)" v-hasPermi="['ecw:order:print_tag']">{{$t('打印标签')}}</el-dropdown-item>
</template> </template>
<!-- 打印入仓单 --> <!-- 打印入仓单 -->
...@@ -456,7 +456,7 @@ ...@@ -456,7 +456,7 @@
@pagination="getList" /> @pagination="getList" />
<special-needs :orderNo="orderNo" :show.sync="isShow" :currency="JSON.stringify(currencyList)" :order-id="orderId" @determine="getList" ></special-needs> <special-needs :orderNo="orderNo" :show.sync="isShow" :currency="JSON.stringify(currencyList)" :order-id="orderId" @determine="getList" ></special-needs>
<print-tag v-if="printTagOrderId !== null" :order-id="printTagOrderId" @close="printTagOrderId=null" /> <print-tag v-if="printTagOrderId !== null" :order-id="printTagOrderId" @close="printTagOrderId=null" :warehouse-in-num="printTagWarehouseInNum" />
<print-warehouse-receipt v-if="printWarehouseReceiptOrderId !== null" :order-id="printWarehouseReceiptOrderId" @close="printWarehouseReceiptOrderId=null" /> <print-warehouse-receipt v-if="printWarehouseReceiptOrderId !== null" :order-id="printWarehouseReceiptOrderId" @close="printWarehouseReceiptOrderId=null" />
<print-lading-bill v-if="printLadingBillOrderId !== null" :order-id="printLadingBillOrderId" @close="printLadingBillOrderId=null" /> <print-lading-bill v-if="printLadingBillOrderId !== null" :order-id="printLadingBillOrderId" @close="printLadingBillOrderId=null" />
<batch-pickup v-if="showBatchPickup" @close="onBatchClose" @success="onBatchClose"/> <batch-pickup v-if="showBatchPickup" @close="onBatchClose" @success="onBatchClose"/>
...@@ -567,6 +567,7 @@ export default { ...@@ -567,6 +567,7 @@ export default {
dateFilter: [], //筛选日期 dateFilter: [], //筛选日期
printTagOrderId: null, // 显示打印标签的订单ID printTagOrderId: null, // 显示打印标签的订单ID
printTagWarehouseInNum: 0, // 打印标签的订单入仓箱数
printWarehouseReceiptOrderId: null, // 打印入仓单的订单ID printWarehouseReceiptOrderId: null, // 打印入仓单的订单ID
printLadingBillOrderId: null, // 打印提单的订单ID printLadingBillOrderId: null, // 打印提单的订单ID
showBatchPickup: false, // 是否显示批量提货弹窗 showBatchPickup: false, // 是否显示批量提货弹窗
...@@ -881,6 +882,11 @@ export default { ...@@ -881,6 +882,11 @@ export default {
onBatchClose(){ onBatchClose(){
this.showBatchPickup = false this.showBatchPickup = false
this.handleQuery() this.handleQuery()
},
// 打印标签
printTag(order){
this.printTagOrderId=order.orderId
this.printTagWarehouseInNum = order.sumNum
} }
} }
}; };
......
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