From c1077a5ff53bc83bbf487c30bc93061c8cd93ca8 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 26 三月 2026 12:18:04 +0800
Subject: [PATCH] 首巡末 判断不合格问题修复 模具 设备 图表图例修改
---
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | 3 ++-
manifest.json | 4 ++--
pages/ZLGL/QualityReport/Sb_EquipMaintainBillReport.vue | 7 ++++++-
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue | 2 +-
pages/index/login.vue | 14 +++++++-------
pages/qitachukujiaoyan/qitachukujiaoyan.vue | 2 +-
pages/ZLGL/QualityReport/Sc_MouldMaintainBillMainReport.vue | 9 +++++++--
pages/ZLGL/shoujianjianyan/firstCheckBill.vue | 3 ++-
pages/ZLGL/QualityReport/Sb_EquipDotCheckBillReport.vue | 7 ++++++-
pages/ZLGL/QualityReport/Sc_MouldRepairWorkBillReport.vue | 9 +++++++--
10 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/manifest.json b/manifest.json
index c947c2b..769a39f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "3.005",
- "versionCode" : 305,
+ "versionName" : "3.006",
+ "versionCode" : 306,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/ZLGL/QualityReport/Sb_EquipDotCheckBillReport.vue b/pages/ZLGL/QualityReport/Sb_EquipDotCheckBillReport.vue
index 5d6de47..e5e4431 100644
--- a/pages/ZLGL/QualityReport/Sb_EquipDotCheckBillReport.vue
+++ b/pages/ZLGL/QualityReport/Sb_EquipDotCheckBillReport.vue
@@ -448,7 +448,12 @@
trigger: 'item'
},
legend: {
- top: 'bottom'
+ top: 'bottom',
+ itemWidth: 12, // 鍥句緥鍥炬爣瀹藉害锛堝彲閫夛紝璁╁竷灞�鏇寸揣鍑戯級
+ itemHeight: 12, // 鍥句緥鍥炬爣楂樺害锛堝彲閫夛級
+ textStyle: {
+ fontSize: 11 // 瀛椾綋澶у皬锛堝彲閫夛紝閬垮厤澶崰绌洪棿锛�
+ }
},
series: [{
name: '鐐规娆℃暟',
diff --git a/pages/ZLGL/QualityReport/Sb_EquipMaintainBillReport.vue b/pages/ZLGL/QualityReport/Sb_EquipMaintainBillReport.vue
index 151b064..c56ef2b 100644
--- a/pages/ZLGL/QualityReport/Sb_EquipMaintainBillReport.vue
+++ b/pages/ZLGL/QualityReport/Sb_EquipMaintainBillReport.vue
@@ -448,7 +448,12 @@
trigger: 'item'
},
legend: {
- top: 'bottom'
+ top: 'bottom',
+ itemWidth: 12, // 鍥句緥鍥炬爣瀹藉害锛堝彲閫夛紝璁╁竷灞�鏇寸揣鍑戯級
+ itemHeight: 12, // 鍥句緥鍥炬爣楂樺害锛堝彲閫夛級
+ textStyle: {
+ fontSize: 11 // 瀛椾綋澶у皬锛堝彲閫夛紝閬垮厤澶崰绌洪棿锛�
+ }
},
series: [{
name: '淇濆吇娆℃暟',
diff --git a/pages/ZLGL/QualityReport/Sc_MouldMaintainBillMainReport.vue b/pages/ZLGL/QualityReport/Sc_MouldMaintainBillMainReport.vue
index 4b9149a..1901cf9 100644
--- a/pages/ZLGL/QualityReport/Sc_MouldMaintainBillMainReport.vue
+++ b/pages/ZLGL/QualityReport/Sc_MouldMaintainBillMainReport.vue
@@ -108,7 +108,7 @@
condition: {
year: dayjs(new Date()).format("YYYY"),
month: dayjs(new Date()).format("M"),
- dimension: '鍣ㄥ叿'
+ dimension: '淇濆吇椤圭洰'
}
};
},
@@ -448,7 +448,12 @@
trigger: 'item'
},
legend: {
- top: 'bottom'
+ top: 'bottom',
+ itemWidth: 12, // 鍥句緥鍥炬爣瀹藉害锛堝彲閫夛紝璁╁竷灞�鏇寸揣鍑戯級
+ itemHeight: 12, // 鍥句緥鍥炬爣楂樺害锛堝彲閫夛級
+ textStyle: {
+ fontSize: 11 // 瀛椾綋澶у皬锛堝彲閫夛紝閬垮厤澶崰绌洪棿锛�
+ }
},
series: [{
name: '淇濆吇娆℃暟',
diff --git a/pages/ZLGL/QualityReport/Sc_MouldRepairWorkBillReport.vue b/pages/ZLGL/QualityReport/Sc_MouldRepairWorkBillReport.vue
index 0fac30d..fe01b73 100644
--- a/pages/ZLGL/QualityReport/Sc_MouldRepairWorkBillReport.vue
+++ b/pages/ZLGL/QualityReport/Sc_MouldRepairWorkBillReport.vue
@@ -108,7 +108,7 @@
condition: {
year: dayjs(new Date()).format("YYYY"),
month: dayjs(new Date()).format("M"),
- dimension: '鍣ㄥ叿'
+ dimension: '璐ｄ换浜�'
}
};
},
@@ -448,7 +448,12 @@
trigger: 'item'
},
legend: {
- top: 'bottom'
+ top: 'bottom',
+ itemWidth: 12, // 鍥句緥鍥炬爣瀹藉害锛堝彲閫夛紝璁╁竷灞�鏇寸揣鍑戯級
+ itemHeight: 12, // 鍥句緥鍥炬爣楂樺害锛堝彲閫夛級
+ textStyle: {
+ fontSize: 11 // 瀛椾綋澶у皬锛堝彲閫夛紝閬垮厤澶崰绌洪棿锛�
+ }
},
series: [{
name: '缁翠慨椤圭洰姣斾緥',
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index dc2149b..152282e 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -2022,6 +2022,7 @@
});
return false;
}
+ this.hform.HCheckQty = this.hform.HCheckQty || 0
if (this.hform.HCheckQty == 0) {
CommonUtils.showTips({
message: "妫�楠屾暟閲忎笉寰椾负0锛�",
@@ -2035,7 +2036,7 @@
for (let key in this.checkItems) {
if (this.checkItems.hasOwnProperty(key)) {
let element = this.checkItems[key];
- if(element.HResult == 0){
+ if(element.HResult == 2){
count ++
}
diff --git a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
index 091b304..235b2c0 100644
--- a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -1986,10 +1986,11 @@
// 鍒ゆ柇 鏈�鍚庣粨鏋滀负涓嶅悎鏍肩殑鎯呭喌涓嬶紝妫�楠岄」鐩腑鏄惁鏈変笉鍚堟牸椤�
if(this.hform.HLastResult == 0 || this.hform.HLastResult == false){
let count = 0
+ console.log('this.checkItems: ',this.checkItems);
for (let key in this.checkItems) {
if (this.checkItems.hasOwnProperty(key)) {
let element = this.checkItems[key];
- if(element.HResult == 0){
+ if(element.HResult == 2){
count ++
}
diff --git a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
index 6cc85c0..e1cd151 100644
--- a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -1690,7 +1690,7 @@
for (let key in this.checkItems) {
if (this.checkItems.hasOwnProperty(key)) {
let element = this.checkItems[key];
- if(element.HResult == 0){
+ if(element.HResult == 2){
count ++
}
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 0637367..ed44f07 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -171,13 +171,13 @@
methods: {
async ApplyLanguagePack(lang, forceUpdate = false) {
// // 璇诲彇璇█鍖呭苟鍔犺浇
- let {
- data,
- getRemoteFile
- } = await getLanguagePackJson(lang)
- if (getRemoteFile) {
- this.$i18n.setLocaleMessage(lang, data)
- }
+ // let {
+ // data,
+ // getRemoteFile
+ // } = await getLanguagePackJson(lang)
+ // if (getRemoteFile) {
+ // this.$i18n.setLocaleMessage(lang, data)
+ // }
this.$i18n.locale = lang
},
onLanguageChangeHandler(e) {
diff --git a/pages/qitachukujiaoyan/qitachukujiaoyan.vue b/pages/qitachukujiaoyan/qitachukujiaoyan.vue
index e393b5b..03af772 100644
--- a/pages/qitachukujiaoyan/qitachukujiaoyan.vue
+++ b/pages/qitachukujiaoyan/qitachukujiaoyan.vue
@@ -256,7 +256,7 @@
},
add(){
uni.navigateTo({
- url:'./detail?OperationType=1'
+ url:'./qitachukudanjiaoyan?OperationType=1'
})
},
//缂栬緫
--
Gitblit v1.9.1