From c3eb6c900630ba847c5bd55ff0b8657b8d1ed1ea Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 24 五月 2023 17:24:01 +0800
Subject: [PATCH] 1.新增补打生产条码功能(还没全实现)2.生产开报工页面末道工序打印入库条码
---
src/views/produceManager/workOrder.vue | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index c413e4e..051fe3c 100644
--- a/src/views/produceManager/workOrder.vue
+++ b/src/views/produceManager/workOrder.vue
@@ -445,10 +445,20 @@
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ簭" placement="top">
<i
+ v-if="tableDataDetail.length!==row.seq"
class="el-icon-printer"
:style="{color:$store.state.settings.theme}"
style="cursor: pointer;margin-right: 15px"
@click="supplementSmallClick(row)"
+ />
+ </el-tooltip>
+ <el-tooltip class="item" effect="dark" content="琛ユ墦鐢熶骇鍏ュ簱鏉$爜" placement="top">
+ <i
+ v-if="tableDataDetail.length===row.seq"
+ class=" el-icon-camera"
+ :style="{color:$store.state.settings.theme}"
+ style="cursor: pointer;margin-right: 15px"
+ @click="getProductInHouseLabCode(row.wo_code)"
/>
</el-tooltip>
</div>
@@ -750,7 +760,7 @@
<!-- <el-button v-waves v-if="operation==='add'" type="primary" @click="dialogVisibleConfirmPreview('add')">棰勮</el-button>-->
<el-button
- v-if="!submitBottonIsDisabled"
+ v-if="!submitButtonIsDisabled"
v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
@@ -759,7 +769,7 @@
>纭� 瀹�</el-button>
<el-button
- v-if="submitBottonIsDisabled"
+ v-if="submitButtonIsDisabled"
v-waves
type="primary"
disabled
@@ -1389,7 +1399,7 @@
</div>
<!-- 瑕佹墦鍗扮殑鍖哄煙 -->
<!-- <div id="printMe2" :style="{paddingLeft:'10px',paddingTop: '5px'}">-->
- <div id="printMe2" :style="printMe2StylePadding(printSize)">
+ <div v-if="!isLastPrint" id="printMe2" :style="printMe2StylePadding(printSize)">
<div
v-if="printSize===0"
style="display: flex;width: 280px;height: 160px;border: 1px solid #000;text-align: center;font-size: 10px;"
@@ -1635,6 +1645,11 @@
</div>
</div>
+
+ <div v-if="isLastPrint">
+ 123
+ </div>
+
</div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -1773,7 +1788,7 @@
ClosedMesOrder,
DeleteMesOrder, MesBadOrderSearch, JobCreationSonAddVison,
MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep, SelectRouteOrWkshop,
- SelectRouteStep, AddMesOrderCodeSearch
+ SelectRouteStep, AddMesOrderCodeSearch, ProductInHouseLabCode
} from '@/api/produceManager'
import { InventoryFileAssociationRoute, PartSelect, SaveInventoryFile } from '@/api/makeModel'
import { handleDatetime, handleDatetime2, validateCode } from '@/utils/global'
@@ -2020,7 +2035,9 @@
return time.getTime() < Date.now() - 8.64e7
}
},
- submitBottonIsDisabled: false
+ submitButtonIsDisabled: false,
+
+ isLastPrint: false// 鏄惁鏄湯閬撴墦鍗�
}
},
created() {
@@ -2158,7 +2175,7 @@
this.dialogForm.wkshopcode = ''
- this.submitBottonIsDisabled = false
+ this.submitButtonIsDisabled = false
},
// 宸ヨ壓璺嚎鍊兼敼鍙�
async routecodeChange(val) {
@@ -2171,7 +2188,7 @@
this.wkshopArr = res2
this.dialogForm.wkshopcode = ''
- this.submitBottonIsDisabled = false
+ this.submitButtonIsDisabled = false
},
// 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
wkshopcodeChange(val) {
@@ -2184,7 +2201,7 @@
// console.log(res, 1)
}).catch(err => {
// console.log(err, 2)
- this.submitBottonIsDisabled = true
+ this.submitButtonIsDisabled = true
})
},
@@ -2349,7 +2366,7 @@
this.bomIdArr = []
this.$refs.dialogForm.clearValidate()
- this.submitBottonIsDisabled = false
+ this.submitButtonIsDisabled = false
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
@@ -2596,6 +2613,15 @@
this.dialogVisible2 = true
console.log(this.qrForm, 1111)
},
+ // 琛ユ墦鐢熶骇鍏ュ簱鏉$爜
+ async getProductInHouseLabCode(ordercode) {
+ const res = await ProductInHouseLabCode({ ordercode })
+ console.log(res)
+ this.isLastPrint = true
+ // 鍋氫竴浜涙墦鍗板閫夌殑鎿嶄綔
+
+ this.dialogVisible2 = true
+ },
dialogVisible2Close() {
this.qrForm.qrvalue = ''
this.qrForm.startqty = ''
@@ -2606,6 +2632,7 @@
this.qrForm.operator = ''
this.qrForm.operatorTime = ''
// this.$refs.qrCodeDiv2 = ''
+ this.isLastPrint = false
},
// 鐢熸垚浜岀淮鐮� 宸ュ簭鏍囩浜岀淮鐮�
bindQRCode2(text) {
--
Gitblit v1.9.3