From 3f386968d4b5cbb002ad93483f86a5443159e18a Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期六, 08 二月 2025 09:54:32 +0800
Subject: [PATCH] 1.递交
---
src/views/produce/stepReport.vue | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 204 insertions(+), 10 deletions(-)
diff --git a/src/views/produce/stepReport.vue b/src/views/produce/stepReport.vue
index b48169f..c21a597 100644
--- a/src/views/produce/stepReport.vue
+++ b/src/views/produce/stepReport.vue
@@ -339,6 +339,7 @@
</div>
+ <!-- 寮�鎶ュ伐銆佸鍗忋�佷笉鑹鐞�-->
<el-dialog
v-el-drag-dialog
:title="dialogTitle"
@@ -669,6 +670,12 @@
align="center"
/>
<el-table-column
+ prop="eqp_name"
+ label="璁惧/渚涘簲鍟�"
+ show-tooltip-when-overflow
+ align="center"
+ />
+ <el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
show-tooltip-when-overflow
@@ -792,6 +799,84 @@
</span>
</el-dialog>
+ <!-- 娴佽浆灏忔爣绛炬墦鍗�-->
+ <!--鎵撳嵃棰勮椤甸潰 灏忔爣绛�-->
+ <el-dialog
+ v-el-drag-dialog
+ title="棰勮"
+ :visible.sync="dialogVisible2"
+ width="1140"
+ top="10vh"
+ :close-on-click-modal="false"
+ @close="dialogVisible2Close"
+ >
+ <!-- 瑕佹墦鍗扮殑鍖哄煙 -->
+ <div id="printMe2" style="padding: 30px;">
+ <div
+ style="display: flex;width: 280px;height: 150px;border: 1px solid #000;text-align: center;font-size: 10px;"
+ >
+
+ <div style="width: 90px;display: flex;flex-direction: column;border-right: 1px solid #000">
+ <div
+ style="display: flex;height: 90px;border-bottom:1px solid #000;
+ justify-content: center;align-items: center;position: relative"
+ >
+ <div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
+ </div>
+ <div
+ style="display: flex;height: 30px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
+ >
+ <div style="margin-left: 5px;width: 28px">鏁伴噺:</div>
+ {{ qrForm.startqty }}
+ </div>
+ <div style="display: flex;height: 30px;justify-content: flex-start;align-items: center">
+ <div style="margin-left: 5px;width: 42px">澶勭悊浜�:</div>
+ {{ qrForm.operator }}
+ </div>
+ </div>
+
+ <div style="width:190px;display: flex;flex-direction: column">
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="width: 60px;margin-left: 5px;">宸ュ崟缂栧彿:</div>
+ <div>{{ qrForm.wo_code }}</div>
+ </div>
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center ;text-align: left"
+ >
+ <div style="width: 60px;margin-left: 5px;">浜у搧缂栫爜:</div>
+ <div>{{ qrForm.partcode }}</div>
+ </div>
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="width:60px;margin-left: 5px;">浜у搧鍚嶇О:</div>
+ <div>{{ qrForm.partname }}</div>
+ </div>
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="width:60px;margin-left: 5px;">{{ qrForm.nextstepname?'涓嬮亾宸ュ簭':'浜у搧瑙勬牸' }}:</div>
+ <div>{{ qrForm.nextstepname?qrForm.nextstepname:qrForm.partspec?qrForm.partspec:'/' }}</div>
+ </div>
+ <div style="display: flex;height: 20%;justify-content: flex-start;align-items: center;text-align: left">
+ <div style="width: 60px;margin-left: 5px;">澶勭悊鏃堕棿:</div>
+ <div>{{ qrForm.operatorTime }}</div>
+ </div>
+
+ </div>
+
+ </div>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button v-waves @click="dialogVisible2 = false">鍙� 娑�</el-button>
+ <el-button v-waves v-print="printObj2" type="primary">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
</div>
</template>
@@ -803,7 +888,7 @@
import {
EditOrderNgStepSeave,
MesOrderNgStepSearch,
- MesOrderNgSubStepSearch,
+ MesOrderNgSubStepSearch, MesOrderStepDeviceCusstomer,
MesOrderStepSearch, MesOrderStepStart,
MesOrderWxStepSearch, SavaMesOrderStepIn, SavaMesOrderStepOut, SavaMesOrderStepReport
} from '@/api/WorkOrder'
@@ -818,7 +903,8 @@
import { nanoid } from 'nanoid'
import { LabelBarCode } from '@/api/systemSetting'
import { getCookie } from '@/utils/auth'
-
+import { handleDatetime2 } from '@/utils/global'
+import QRCode from 'qrcodejs2'
export default {
name: 'SCKBG',
components: {
@@ -936,8 +1022,41 @@
defectTableData: [],
badTableData: [],
- workOrderCurrentValue: ''
+ workOrderCurrentValue: '',
+ dialogVisible2: false, //
+ qrForm: { // 鎵撳嵃鍐呭
+ qrvalue: '',
+ startqty: '',
+ wo_code: '',
+ partcode: '',
+ partname: '',
+ partspec: '',
+ nextstepname: '',
+ operator: '', // 鎿嶄綔浜�
+ operatorTime: ''// 鎿嶄綔鏃堕棿
+ },
+ printObj2: {
+ id: 'printMe2',
+ popTitle: '鎵撳嵃妯℃澘',
+ preview: false,
+ extraHead: '<meta http-equiv="Content-Language" content="zh-cn"/>',
+ closeCallback(vue) { // 鍏抽棴鎵撳嵃鐨勫洖璋冧簨浠讹紙鏃犳硶纭畾鐐瑰嚮鐨勬槸纭杩樻槸鍙栨秷锛�
+ console.log('11212', vue)
+ // vue.dialogVisible = false
+ vue.dialogVisible2 = false
+ vue.dialogVisible = false
+ },
+ beforeOpenCallback(vue) {
+ vue.printLoading = true
+ console.log('鎵撳紑涔嬪墠')
+ },
+ openCallback(vue) {
+ vue.printLoading = false
+ console.log('鎵ц浜嗘墦鍗�')
+ }
+ },
+ xx: ''
}
},
created() {
@@ -952,6 +1071,7 @@
this.getAllSelectArr()
},
methods: {
+
async getAllSelectArr() {
const { data: res1 } = await GroupsPermissions()// 鐝粍
this.usergroupArr = res1
@@ -962,11 +1082,11 @@
const { data: res3 } = await DefectPermissions() // 缂洪櫡
this.defectArr = res3
- const { data: res4 } = await EqpPermissions() // 璁惧
- this.eqpArr = res4
-
- const { data: res5 } = await CustomerPermissions() // 寰�鏉ュ崟浣�
- this.wxArr = res5
+ // const { data: res4 } = await EqpPermissions() // 璁惧
+ // this.eqpArr = res4
+ //
+ // const { data: res5 } = await CustomerPermissions() // 寰�鏉ュ崟浣�
+ // this.wxArr = res5
const { data: res6 } = await PrentOrganizationNoCompany()// 鏃犲叕鍙哥殑缁勭粐涓嬫媺
this.wkshopcodeArr = res6
@@ -1123,6 +1243,18 @@
},
// 鐢熶骇寮�鎶ュ伐锛氭姤宸�/澶栧崗(鍙戞枡/鏀舵枡)鏃舵潯浠跺垽鏂強鏁版嵁杩斿洖鎺ュ彛
async getMesOrderStepStart(OperType, SelectType, wocode, stepcode) {
+ const data2 = {
+ OperType, wocode, stepcode
+ }
+
+ const { data: res2 } = await MesOrderStepDeviceCusstomer(data2)
+ if (OperType === 'ZZ') {
+ this.eqpArr = res2
+ }
+ if (OperType === 'WX') {
+ this.wxArr = res2
+ }
+
const data = {
OperType, SelectType, wocode, stepcode
}
@@ -1252,12 +1384,23 @@
badqty: i.badqty
})
})
+
+ // let stepprice = null
+ //
+ // if (this.activeName === '鐢熶骇鍒楄〃') {
+ // stepprice = this.eqpArr.find(i => i.code === this.dialogForm.eqpcode) ? this.eqpArr.find(i => i.code === this.dialogForm.eqpcode).eqpprice : this.dialogForm.stepprice
+ // }
+ //
+ // if (this.activeName === '澶栧崗鍙戞枡' || this.activeName === '澶栧崗鏀舵枡') {
+ // stepprice = this.wxArr.find(i => i.code === this.dialogForm.wxcode) ? this.wxArr.find(i => i.code === this.dialogForm.wxcode).eqpprice : this.dialogForm.stepprice
+ // }
+
const data = {
mesordercode: this.dialogForm.wo_code,
partcode: this.dialogForm.partnumber,
stepseq: this.dialogForm.seq,
stepcode: this.dialogForm.stepcode,
- stepprice: this.dialogForm.stepprice,
+ stepprice: this.eqpArr.find(i => i.code === this.dialogForm.eqpcode) ? this.eqpArr.find(i => i.code === this.dialogForm.eqpcode).eqpprice : this.dialogForm.stepprice,
eqpcode: this.dialogForm.eqpcode,
inbarcode,
reckway: this.dialogForm.reckway,
@@ -1284,6 +1427,12 @@
await this.tabClick()
this.$store.state.app.buttonIsDisabled = false
this.dialogVisible = false
+
+ // 鑷埗鎶ュ伐鎵撳嵃鏍囩鍙ｅ瓙宸插紑濂�
+ // if (JSON.parse(localStorage.getItem('mesSetting')).every) {
+ // this.dialogVisible2 = true
+ // this.ZZprint2(localStorage.getItem('username'))
+ // }
} else {
this.$store.state.app.buttonIsDisabled = false
this.$notify.error('鎶ュ伐澶辫触锛�')
@@ -1369,7 +1518,7 @@
partcode: this.dialogForm.partnumber,
stepseq: this.dialogForm.seq,
stepcode: this.dialogForm.stepcode,
-
+ stepprice: this.wxArr.find(i => i.code === this.dialogForm.wxcode) ? this.wxArr.find(i => i.code === this.dialogForm.wxcode).eqpprice : this.dialogForm.stepprice,
wxcode: this.dialogForm.wxcode,
inbarcode,
inuser: this.dialogForm.inuser,
@@ -1419,6 +1568,51 @@
}
})
},
+
+ dialogVisible2Close() {
+ this.qrForm.qrvalue = ''
+ this.qrForm.startqty = ''
+ this.qrForm.wo_code = ''
+ this.qrForm.partcode = ''
+ this.qrForm.partname = ''
+ this.qrForm.partspec = ''
+ this.qrForm.nextstepname = ''
+ this.qrForm.operator = ''
+ this.qrForm.operatorTime = ''
+ // this.$refs.qrCodeDiv2 = ''
+ },
+
+ ZZprint2(username) {
+ if (this.dialogForm.nextstepcode !== '') {
+ this.qrForm.qrvalue = this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode
+ } else {
+ this.qrForm.qrvalue = this.dialogForm.inbarcode
+ }
+
+ this.qrForm.startqty = this.dialogForm.startqty
+ this.qrForm.wo_code = this.dialogForm.wo_code
+ this.qrForm.partcode = this.dialogForm.partnumber
+ this.qrForm.partname = this.dialogForm.partname
+ this.qrForm.nextstepname = this.dialogForm.nextstepname
+ this.qrForm.operator = username
+ this.qrForm.operatorTime = handleDatetime2(new Date())
+ this.$nextTick(() => {
+ this.bindQRCode(this.qrForm.qrvalue)
+ })
+ },
+ // 鐢熸垚浜岀淮鐮�
+ bindQRCode(text) {
+ new QRCode(this.$refs.qrCodeDiv2, {
+ text: text,
+ // width: 50,
+ width: 60,
+ // height: 50,
+ height: 60,
+ colorDark: '#000', // 浜岀淮鐮侀鑹�
+ colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
+ correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
+ })
+ },
// 缂洪櫡鏂板
addDefect() {
if (this.defectTableData.find(i => i.code.length === 0)) {
--
Gitblit v1.9.3