|
@@ -35,15 +35,15 @@
|
|
|
fixed
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
- label="申请订单编号"
|
|
|
- prop="orderNo"
|
|
|
- min-width="160"
|
|
|
+ label="商品名称"
|
|
|
+ prop="goodsName"
|
|
|
+ min-width="200"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
- label="物料名称"
|
|
|
- prop="materielName"
|
|
|
+ label="物料编码"
|
|
|
+ prop="materielCode"
|
|
|
min-width="130"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
@@ -65,7 +65,7 @@
|
|
|
<el-table-column
|
|
|
label="流水号范围"
|
|
|
prop="formatSerialNumberRange"
|
|
|
- min-width="120"
|
|
|
+ min-width="200"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
></el-table-column>
|
|
@@ -78,7 +78,7 @@
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
label="打印状态"
|
|
|
- prop="status"
|
|
|
+ prop="printStatusName"
|
|
|
min-width="100"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
@@ -91,10 +91,10 @@
|
|
|
>
|
|
|
<template v-slot="{ row }">
|
|
|
<div class="flex center layout-gap">
|
|
|
- <!-- 0=打印完成 1= 等待打印 2=正在打印 3=暂停 4=打印失败-->
|
|
|
- <edit-button :data="row" icon="el-icon-circle-close" :on-click="onCancelPrintBtnClick" :disabled="row.status === 0">取消</edit-button>
|
|
|
- <edit-button v-if="row.status === 3" :data="row" icon="el-icon-video-play" :on-click="onContinuePrintBtnClick">继续</edit-button>
|
|
|
- <edit-button v-else :disabled="row.status !== 2" :data="row" icon="el-icon-video-pause" :on-click="onPausePrintBtnClick">暂停</edit-button>
|
|
|
+ <!-- 1正在打印 2暂停状态 4报错状态 12打印头抬起 -1未知状态 1000打印完毕 1001排队中 -->
|
|
|
+ <edit-button :data="row" icon="el-icon-circle-close" :disabled="row.printStatus === 1000" :on-click="onCancelPrintBtnClick">取消</edit-button>
|
|
|
+ <edit-button v-if="row.printStatus === 2 || row.printStatus === 4 || row.printStatus === 12 || row.printStatus === -1" :data="row" icon="el-icon-video-play" :on-click="onContinuePrintBtnClick">继续</edit-button>
|
|
|
+ <edit-button v-else :disabled="row.printStatus === 1000" :data="row" icon="el-icon-video-pause" :on-click="onPausePrintBtnClick">暂停</edit-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -133,7 +133,7 @@ export default {
|
|
|
startTimer () {
|
|
|
this.timerId = setInterval(() => {
|
|
|
this.loadList()
|
|
|
- }, 10000)
|
|
|
+ }, 5000)
|
|
|
},
|
|
|
|
|
|
clearTimer () {
|
|
@@ -144,18 +144,42 @@ export default {
|
|
|
},
|
|
|
|
|
|
onCancelPrintBtnClick (data) {
|
|
|
- this.$$request(this.$$api.cancelPrint, data[this.$$Target.$$idProp]).then(data => {
|
|
|
- this.loadList()
|
|
|
+ this.$$request(this.$$api.cancelPrint, data[this.$$Target.$$idProp]).then((flag) => {
|
|
|
+ if (flag) {
|
|
|
+ this.$notify({
|
|
|
+ title: '成功',
|
|
|
+ message: '操作成功',
|
|
|
+ type: 'success',
|
|
|
+ position: 'bottom-right'
|
|
|
+ })
|
|
|
+ this.loadList()
|
|
|
+ }
|
|
|
}).catch(console.error).finally(() => {})
|
|
|
},
|
|
|
onPausePrintBtnClick (data) {
|
|
|
- this.$$request(this.$$api.pausePrint, data[this.$$Target.$$idProp]).then(data => {
|
|
|
- this.loadList()
|
|
|
+ this.$$request(this.$$api.pausePrint, data[this.$$Target.$$idProp]).then((flag) => {
|
|
|
+ if (flag) {
|
|
|
+ this.$notify({
|
|
|
+ title: '成功',
|
|
|
+ message: '操作成功',
|
|
|
+ type: 'success',
|
|
|
+ position: 'bottom-right'
|
|
|
+ })
|
|
|
+ this.loadList()
|
|
|
+ }
|
|
|
}).catch(console.error).finally(() => {})
|
|
|
},
|
|
|
onContinuePrintBtnClick (data) {
|
|
|
- this.$$request(this.$$api.continuePrint, data[this.$$Target.$$idProp]).then(data => {
|
|
|
- this.loadList()
|
|
|
+ this.$$request(this.$$api.continuePrint, data[this.$$Target.$$idProp]).then((flag) => {
|
|
|
+ if (flag) {
|
|
|
+ this.$notify({
|
|
|
+ title: '成功',
|
|
|
+ message: '操作成功',
|
|
|
+ type: 'success',
|
|
|
+ position: 'bottom-right'
|
|
|
+ })
|
|
|
+ this.loadList()
|
|
|
+ }
|
|
|
}).catch(console.error).finally(() => {})
|
|
|
}
|
|
|
}
|