From d68b12df7d3122fce36c344a3a65773648a75acf Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 20 三月 2023 16:14:00 +0800
Subject: [PATCH] 1.工单工序打印二维码bug问题修复
---
src/views/scgl/gd.vue | 4 +
src/views/bbgl/bzgz.vue | 73 +++++++++++++-----------
src/views/bbgl/rygz.vue | 78 ++++++++++++++-----------
3 files changed, 86 insertions(+), 69 deletions(-)
diff --git a/src/views/bbgl/bzgz.vue b/src/views/bbgl/bzgz.vue
index f8c3d09..56b65b5 100644
--- a/src/views/bbgl/bzgz.vue
+++ b/src/views/bbgl/bzgz.vue
@@ -4,30 +4,30 @@
<div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button v-waves type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
- <div
- style="color: red;margin: 10px 5px 0 0;"
- >褰撳墠鎶ヨ〃鍙粺璁¤嚜鍒朵欢宸ュ簭
- </div>
- <!-- <div class="topRight" style="display: flex;align-items: center">-->
- <!-- <el-select-->
- <!-- v-model="form.rejectstepcode"-->
- <!-- style="width: 170px;"-->
- <!-- multiple-->
- <!-- placeholder="璇烽�夋嫨鍓旈櫎宸ュ簭"-->
- <!-- collapse-tags-->
- <!-- filterable-->
- <!-- clearable-->
- <!-- @change="getGroupSalaryReportSearch"-->
- <!-- >-->
- <!-- <el-option-->
- <!-- v-for="item in StepSelectArr"-->
- <!-- :key="item.stepcode"-->
- <!-- :label="item.stepname"-->
- <!-- :value="item.stepcode"-->
- <!-- />-->
- <!-- </el-select>-->
- <!-- </div>-->
+ <div class="topRight" style="display: flex;align-items: center">
+ <div
+ style="color: red;margin: 0px 10px 0 0;"
+ >褰撳墠鎶ヨ〃鍙粺璁¤嚜鍒朵欢宸ュ簭
+ </div>
+ <el-select
+ v-model="form.rejectstepcode"
+ style="width: 220px;"
+ multiple
+ placeholder="璇烽�夋嫨鍓旈櫎杞﹂棿"
+ collapse-tags
+ filterable
+ clearable
+ @change="getGroupSalaryReportSearch"
+ >
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </div>
</div>
@@ -41,19 +41,19 @@
>
<div class="elForm">
<el-form-item label="宸ュ崟缂栧彿" style="display: flex;">
- <el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px"/>
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
- <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px"/>
</el-form-item>
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
- <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
- <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style="display: flex;">
- <el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item v-show="isExpandForm" label="鐢熶骇鐝粍" style=" display: flex;">
<el-select v-model="form.groupcode" style="width: 200px" placeholder="璇烽�夋嫨">
@@ -66,7 +66,7 @@
</el-select>
</el-form-item>
<el-form-item v-show="isExpandForm" label="鎿嶄綔浜哄憳" style=" display: flex;">
- <el-input v-model="form.username" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.username" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item v-show="isExpandForm" label="鎶ュ伐鏃堕棿" style="display: flex;align-items: center">
<el-date-picker
@@ -502,6 +502,7 @@
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { StepSelect } from '@/api/zzmx'
+import { WorkShopSelect } from '@/api/sbgl'
export default {
name: 'Zzjg',
@@ -515,7 +516,7 @@
isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
- StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
+ WorkShopArr: [], // 鍓旈櫎鏁扮粍
form: {
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -589,14 +590,18 @@
this.getGroupSalaryReportSearch().then(res => {
if (res.code === '200') {
this.getMesOrderStepReportSelectUserGroup()
- this.getStepSelect()
+ this.getWorkShopSelect()
}
})
},
// 鑾峰彇宸ュ簭涓嬫媺鎺ュ彛
- async getStepSelect() {
- const { data: res } = await StepSelect()
- this.StepSelectArr = res
+ // async getStepSelect() {
+ // const { data: res } = await StepSelect()
+ // this.StepSelectArr = res
+ // },
+ async getWorkShopSelect() {
+ const { data: res } = await WorkShopSelect()
+ this.WorkShopArr = res
},
getSummaries(param) {
const { columns, data } = param
diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index 1575232..c687284 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -4,31 +4,32 @@
<div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button v-waves type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
- <div
- style="color: red;margin: 10px 5px 0 0;"
- >褰撳墠鎶ヨ〃鍙粺璁¤嚜鍒朵欢宸ュ簭
- </div>
- <!-- <div class="topRight" style="display: flex;align-items: center">-->
- <!-- <!– <div style="font-size: 14px;margin-right: 15px;color: #a7a7a7">鍓旈櫎宸ュ簭</div>–>-->
- <!-- <el-select-->
- <!-- v-model="form.rejectstepcode"-->
- <!-- style="width: 170px;"-->
- <!-- multiple-->
- <!-- placeholder="璇烽�夋嫨鍓旈櫎宸ュ簭"-->
- <!-- collapse-tags-->
- <!-- filterable-->
- <!-- clearable-->
- <!-- @change="getPeopleSalaryReportSearch"-->
- <!-- >-->
- <!-- <el-option-->
- <!-- v-for="item in StepSelectArr"-->
- <!-- :key="item.stepcode"-->
- <!-- :label="item.stepname"-->
- <!-- :value="item.stepcode"-->
- <!-- />-->
- <!-- </el-select>-->
- <!-- </div>-->
+ <div class="topRight" style="display: flex;align-items: center">
+ <div
+ style="color: red;margin: 0px 10px 0 0;"
+ >褰撳墠鎶ヨ〃鍙粺璁¤嚜鍒朵欢宸ュ簭
+ </div>
+
+ <!-- <div style="font-size: 14px;margin-right: 15px;color: #a7a7a7">鍓旈櫎宸ュ簭</div>-->
+ <el-select
+ v-model="form.rejectstepcode"
+ style="width: 220px;"
+ multiple
+ placeholder="璇烽�夋嫨鍓旈櫎杞﹂棿"
+ collapse-tags
+ filterable
+ clearable
+ @change="getPeopleSalaryReportSearch"
+ >
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </div>
</div>
<div class="bodyTopFormGroup">
@@ -41,19 +42,19 @@
>
<div class="elForm">
<el-form-item label="宸ュ崟缂栧彿" style="display: flex;">
- <el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px"/>
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
- <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px"/>
</el-form-item>
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
- <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
- <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
- <el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item v-show="isExpandForm" label="鐢熶骇鐝粍" style=" display: flex;">
<el-select v-model="form.groupcode" style="width: 200px" placeholder="璇烽�夋嫨">
@@ -66,7 +67,7 @@
</el-select>
</el-form-item>
<el-form-item v-show="isExpandForm" label="鎶ュ伐浜哄憳" style=" display: flex;">
- <el-input v-model="form.reportname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.reportname" style="width: 200px" placeholder="璇疯緭鍏�"/>
</el-form-item>
<el-form-item v-show="isExpandForm" label="鎶ュ伐鏃堕棿" style="display: flex;align-items: center">
<el-date-picker
@@ -475,6 +476,7 @@
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { StepSelect } from '@/api/zzmx'
+import { WorkShopSelect } from '@/api/sbgl'
export default {
name: 'Zzjg',
@@ -488,7 +490,8 @@
isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
- StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
+ // StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
+ WorkShopArr: [],//鍓旈櫎杞﹂棿鏁扮粍
form: {
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -562,14 +565,19 @@
this.getPeopleSalaryReportSearch().then(res => {
if (res.code === '200') {
this.getMesOrderStepReportSelectUserGroup()
- this.getStepSelect()
+ this.getWorkShopSelect()
}
})
},
// 鑾峰彇宸ュ簭涓嬫媺鎺ュ彛
- async getStepSelect() {
- const { data: res } = await StepSelect()
- this.StepSelectArr = res
+ // async getStepSelect() {
+ // const { data: res } = await StepSelect()
+ // this.StepSelectArr = res
+ // },
+ // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+ async getWorkShopSelect() {
+ const { data: res } = await WorkShopSelect()
+ this.WorkShopArr = res
},
getSummaries(param) {
const { columns, data } = param
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 35cf3a5..efa7f06 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -2577,6 +2577,10 @@
this.$nextTick(() => {
console.log(this.qrForm.qrvalue, 3333)
this.bindQRCode2(this.qrForm.qrvalue)
+ const div = document.getElementById('qrCode2')
+ // 杩欎箞澶氫唬鐮佸彧闇�瑕佽繖涓�鍙ュ疄鐜版垜浠墍闇�瑕佺殑鍔熻兘锛屽畾浣峝iv婊氬姩鏉′綅缃湪搴曢儴锛宻crollHeight璁＄畻鍑篸iv鐨勯珮搴︼紝鍐峴crollTop 璁剧疆婊氬姩鏉＄殑楂樺害涓哄灏�
+ div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
+ // div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
})
}
})
--
Gitblit v1.9.3