Commit a5869312 authored by xiaoyan's avatar xiaoyan

fix: 修改补单

parent 606f373b
...@@ -278,6 +278,7 @@ export default { ...@@ -278,6 +278,7 @@ export default {
let params = { let params = {
secId: this.partData.id, secId: this.partData.id,
shipmentId: this.$attrs.shipmentObj.id, shipmentId: this.$attrs.shipmentObj.id,
isTally: this.$attrs.shipmentObj.isTally,
orderId: item.orderId, orderId: item.orderId,
}; };
if (type === "all") { if (type === "all") {
......
...@@ -132,7 +132,6 @@ ...@@ -132,7 +132,6 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')" align="center" width="160" class-name="small-padding fixed-width" fixed="right"> <el-table-column :label="$t('操作')" align="center" width="160" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="supplementClick('supplementOrder',$t('补单'))">{{$t('补单')}}</el-button>
<el-button :disabled="shipmentObj.approvaling" type="text" size="small" @click="tallyClick('single',scope.row)">{{$t('理货')}}</el-button> <el-button :disabled="shipmentObj.approvaling" type="text" size="small" @click="tallyClick('single',scope.row)">{{$t('理货')}}</el-button>
<el-button :disabled="shipmentObj.approvaling" type="text" size="small" @click="removeClick('single',scope.row)">{{$t('移出')}}</el-button> <el-button :disabled="shipmentObj.approvaling" type="text" size="small" @click="removeClick('single',scope.row)">{{$t('移出')}}</el-button>
<el-button type="text" size="small" @click="currentTurnExceptionOrder=scope.row">{{$t('转异')}}</el-button> <el-button type="text" size="small" @click="currentTurnExceptionOrder=scope.row">{{$t('转异')}}</el-button>
...@@ -143,6 +142,7 @@ ...@@ -143,6 +142,7 @@
</el-row> </el-row>
<el-row style="margin-top: 15px" class="operate-button"> <el-row style="margin-top: 15px" class="operate-button">
<el-button size="small" type="primary" @click="supplementClick('supplementOrder',$t('补单'))">{{$t('补单')}}</el-button>
<el-button :disabled="shipmentObj.approvaling" size="small" type="primary" @click="tallyFinish">{{$t('完成理货')}}</el-button> <el-button :disabled="shipmentObj.approvaling" size="small" type="primary" @click="tallyFinish">{{$t('完成理货')}}</el-button>
<el-button size="small" @click="cancel">{{$t('取消')}}</el-button> <el-button size="small" @click="cancel">{{$t('取消')}}</el-button>
</el-row> </el-row>
......
...@@ -303,6 +303,7 @@ export default { ...@@ -303,6 +303,7 @@ export default {
secId: this.partData.id, secId: this.partData.id,
shipmentId: this.$attrs.shipmentObj.id, shipmentId: this.$attrs.shipmentObj.id,
orderId: item.orderId, orderId: item.orderId,
isTally: this.$attrs.shipmentObj.isTally,
isCover: 1 isCover: 1
}; };
if (type === "all") { if (type === "all") {
......
...@@ -120,7 +120,6 @@ ...@@ -120,7 +120,6 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')" align="center" width="160" class-name="small-padding fixed-width" fixed="right"> <el-table-column :label="$t('操作')" align="center" width="160" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="supplementClick('supplementOrder',scope.row)">{{$t('补单')}}</el-button>
<el-button type="text" size="small" @click="tallyClick('single',scope.row)">{{$t('理货')}}</el-button> <el-button type="text" size="small" @click="tallyClick('single',scope.row)">{{$t('理货')}}</el-button>
<el-button type="text" size="small" @click="removeClick('single',scope.row)">{{$t('移出')}}</el-button> <el-button type="text" size="small" @click="removeClick('single',scope.row)">{{$t('移出')}}</el-button>
</template> </template>
...@@ -130,6 +129,7 @@ ...@@ -130,6 +129,7 @@
</el-row> </el-row>
<el-row style="margin-top: 15px" class="operate-button"> <el-row style="margin-top: 15px" class="operate-button">
<el-button type="small" size="primary" @click="supplementClick('supplementOrder')">{{$t('补单')}}</el-button>
<el-button size="small" type="primary" @click="tallyFinish">{{$t('完成理货')}}</el-button> <el-button size="small" type="primary" @click="tallyFinish">{{$t('完成理货')}}</el-button>
<el-button size="small" @click="cancel">{{$t('取消')}}</el-button> <el-button size="small" @click="cancel">{{$t('取消')}}</el-button>
</el-row> </el-row>
......
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