From ee1973b21f6324fbe2ef4c7348567f4f2df23fee Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 20 三月 2023 16:13:37 +0800
Subject: [PATCH] 1.工单工序打印二维码bug问题修复
---
src/views/scgl/gd.vue | 8 ++++++--
vue.config.js | 4 ++--
src/views/kb/cgdd.vue | 10 +++++-----
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/views/kb/cgdd.vue b/src/views/kb/cgdd.vue
index 05ac18e..d27cf49 100644
--- a/src/views/kb/cgdd.vue
+++ b/src/views/kb/cgdd.vue
@@ -170,11 +170,11 @@
Math.abs(parseFloat(row.warning))
}}
</div>
- <div v-else-if="row.warning===null||row.warning===''||row.warning===0">0</div>
- <div v-else-if="parseFloat(row.warning)>3">{{ row.warning }}</div>
- <div v-else-if="parseFloat(row.warning)>0&&parseFloat(row.warning)<=3" style="color:yellow;">
- {{ row.warning }}
- </div>
+ <div v-else-if="row.warning===null||row.warning===''||row.warning>=0">0</div>
+ <!-- <div v-else-if="parseFloat(row.warning)>3">{{ row.warning }}</div>-->
+ <!-- <div v-else-if="parseFloat(row.warning)>0&&parseFloat(row.warning)<=3" style="color:yellow;">-->
+ <!-- {{ row.warning }}-->
+ <!-- </div>-->
</template>
</el-table-column>
</el-table>
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 01824ab..cf65c54 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -325,7 +325,7 @@
<!-- @click="check(row)"-->
<!-- />-->
<i
- class="el-icon-tickets"
+ class="el-icon-printer"
style="cursor: pointer;color: #42b983;margin-right: 15px"
@click="handlePrint(row.wo_code)"
/>
@@ -419,7 +419,7 @@
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ簭" placement="top">
<i
- class="el-icon-tickets"
+ class="el-icon-printer"
style="cursor: pointer;color: #42b983;margin-right: 15px"
@click="supplementSmallClick(row)"
/>
@@ -2398,6 +2398,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 // 婊氬姩鏉′綅浜庢渶椤堕儴
})
}
})
diff --git a/vue.config.js b/vue.config.js
index c7a89a2..ee602b3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -50,8 +50,8 @@
},
proxy: {
[process.env.VUE_APP_BASE_API]: {
- target: 'http://121.196.36.24:8007', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴鏈嶅姟鍣�(瀵屽皵杈�)
- // target: 'http://192.168.16.246:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(瀵屽皵杈�)
+ // target: 'http://121.196.36.24:8007', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴鏈嶅姟鍣�(瀵屽皵杈�)
+ target: 'http://192.168.16.246:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(瀵屽皵杈�)
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
['^' + process.env.VUE_APP_BASE_API]: '/api/'
--
Gitblit v1.9.3