From 291b1854bef3d37d1c8cd9b360cb2a2e777e2943 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 24 三月 2026 08:44:58 +0800
Subject: [PATCH] 调整 工作联系单 查询 调用接口 调整 设备状态查询 工艺参数页面入口 生产领料检验 新增 条码自增列 参数 调整修改数量调用接口
---
pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue | 11 +++++++----
pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai.vue | 15 +++++++++++++++
manifest.json | 4 ++--
pages/index/login.vue | 14 +++++++-------
pages/shengchanlingliao/PPickingCheckBill.vue | 5 +++++
5 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/manifest.json b/manifest.json
index f5a814b..d245f4c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "3.003",
- "versionCode" : 303,
+ "versionName" : "3.004",
+ "versionCode" : 304,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
index a0ab0ac..7dfca05 100644
--- a/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
+++ b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
@@ -237,12 +237,15 @@
this.sWhere +=
` and 鏃ユ湡 >= CONVERT(VARCHAR(10), '${this.startDate}', 23) and 鏃ユ湡 <= CONVERT(VARCHAR(10), '${this.endDate}', 23)`
try {
-
+ // TODO: 璋冩暣涓哄瓨鍌ㄨ繃绋嬪垎椤垫帴鍙�
let res = await CommonUtils.doRequest2Async({
- url: 'Sc_MESTransFerWorkBill/GetOA_WorkLinkBillList',
+ url: 'Sc_MESTransFerWorkBill/GetOA_WorkLinkBillListProcess',
data: {
- sWhere: this.sWhere,
- user: getUserInfo()["Czymc"],
+ // sWhere: this.sWhere,
+ beginDate: this.startDate,
+ endDate: this.endDate,
+ type: this.tabs + 1,
+ user: getUserInfo()["HEmpName"] || getUserInfo()["Czymc"],
page: this.page,
size: this.size
}
diff --git a/pages/index/login.vue b/pages/index/login.vue
index dc7e092..df74ed7 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/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai.vue b/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai.vue
index b9c29c0..199180f 100644
--- a/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai.vue
+++ b/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai.vue
@@ -37,6 +37,9 @@
<view class="detail" v-if="item['OEE']">
<text>OEE锛�</text>{{item['OEE']}}
</view>
+ <view class="detail">
+ <button class="btn-a" size="mini" @tap.stop="toTechparam(item)">宸ヨ壓鍙傛暟</button>
+ </view>
</view>
</view>
@@ -100,6 +103,11 @@
};
},
methods: {
+ toTechparam(item) {
+ uni.navigateTo({
+ url: `/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery?HEquipID=${item['璁惧id']}`
+ })
+ },
async DepartmentChange(e) {
let index = e.detail.value
this.selectedDepartment = this.departmentsTitles[index]
@@ -408,4 +416,11 @@
}
}
}
+
+ .btn-a {
+ background-color: #3A78FF;
+ color: #fff;
+ margin: 0;
+ padding: 0 8rpx;
+ }
</style>
\ No newline at end of file
diff --git a/pages/shengchanlingliao/PPickingCheckBill.vue b/pages/shengchanlingliao/PPickingCheckBill.vue
index a4cad97..20b2bb0 100644
--- a/pages/shengchanlingliao/PPickingCheckBill.vue
+++ b/pages/shengchanlingliao/PPickingCheckBill.vue
@@ -269,6 +269,7 @@
HTMQty_B: '',
HWHName_B: '',
HSPName_B: '',
+ HInterID_B: 0, // 鏉＄爜鑷鍒�
},
HFIFOList: [], // 鍏堣繘鍏堝嚭鍒楄〃缂撳瓨
@@ -341,6 +342,7 @@
data: {
HInterID: this.hform.HInterID,
HBillType: this.hform.HBillType,
+ HItemID: this.hform.HInterID_B, // 鏉＄爜鑷鍒�
HBarCode: HBarCodeOld,
HQty: HQtyOld
}
@@ -353,6 +355,7 @@
if (count == 1) {
this.DisBillEntryList()
+ this.tabs = 2
} else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
@@ -1116,6 +1119,7 @@
this.hform.HTMQty_B = ''
this.hform.HWHName_B = ''
this.hform.HSPName_B = ''
+ this.hform.HInterID_B = 0
} else {
this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
@@ -1126,6 +1130,7 @@
this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+ this.hform.HInterID_B = data.BarCodeDetailslist[0].HItemID
}
} else {
uni.showToast({
--
Gitblit v1.9.1