From 83e56c7bdc80df9e01e5d485b6c9052c18764bbd Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 06 二月 2026 21:08:55 +0800
Subject: [PATCH] 解决 err 未定义问题
---
pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue | 11
pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue | 2
pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue | 10
manifest.json | 4
pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue | 28 +-
pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue | 1
utils/i18n.js | 2
pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue | 407 +++++++++++++++++++++++----------------------
pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP.vue | 2
pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue | 16
pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue | 7
11 files changed, 245 insertions(+), 245 deletions(-)
diff --git a/manifest.json b/manifest.json
index 05904cd..1b806a0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.0.77",
- "versionCode" : 277,
+ "versionName" : "2.078",
+ "versionCode" : 278,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue b/pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue
index a39723d..c5aa745 100644
--- a/pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue
+++ b/pages/Kf_MoveStockBill_CusBar/Kf_MoveStockBill_CusBar_APP.vue
@@ -1716,7 +1716,7 @@
this.getBarCodeJson(sBarCode, sBarCodePrefix)
} else {
CommonUtils.playSound(0)
- console.log(err);
+
CommonUtils.showTips({
title: "娓╅Θ鎻愮ず",
message: '鎺ュ彛璇锋眰澶辫触: ' + Message
diff --git a/pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP.vue b/pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP.vue
index 5b3c657..27c2626 100644
--- a/pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP.vue
+++ b/pages/Kf_MoveStockStepOutBill_CusBar/Kf_MoveStockStepOutBill_CusBar_APP.vue
@@ -1524,7 +1524,6 @@
} catch (err) {
CommonUtils.playSound(0)
// this.refreshBarCodeState()
- console.log(err);
uni.showToast({
title: '鎺ュ彛璇锋眰澶辫触: ' + err,
icon: 'none'
@@ -1716,7 +1715,6 @@
this.getBarCodeJson(sBarCode, sBarCodePrefix)
} else {
CommonUtils.playSound(0)
- console.log(err);
CommonUtils.showTips({
title: "娓╅Θ鎻愮ず",
message: '鎺ュ彛璇锋眰澶辫触: ' + Message
diff --git a/pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue b/pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
index 0b1e419..9c360c8 100644
--- a/pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
+++ b/pages/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
@@ -1376,7 +1376,6 @@
this.getBarCodeJson(sBarCode, sBarCodePrefix)
} else {
CommonUtils.playSound(0)
- console.log(err);
CommonUtils.showTips({
title: "娓╅Θ鎻愮ず",
message: '鎺ュ彛璇锋眰澶辫触: ' + Message
diff --git a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
index dc27a85..835acfc 100644
--- a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
+++ b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
@@ -99,8 +99,8 @@
</zxz-uni-data-select>
</view>
<view class="form-item">
- <view class="title required">楠屾敹椤圭洰:</view>
- <zxz-uni-data-select required class="right" :localdata="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
+ <view class="title">楠屾敹椤圭洰:</view>
+ <zxz-uni-data-select class="right" :localdata="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
dataValue="hitemid" v-model="hform.HRepairCheckMainID">
</zxz-uni-data-select>
</view>
@@ -342,12 +342,12 @@
state: false
}
}
- if (this.hform.HRepairCheckMainID == 0) {
- return {
- Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
- state: false
- }
- }
+ // if (this.hform.HRepairCheckMainID == 0) {
+ // return {
+ // Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
+ // state: false
+ // }
+ // }
if (this.hform.HManagerID == 0) {
return {
Message: "璐熻矗浜轰笉寰椾负绌�!",
diff --git a/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue b/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
index 9d8ab35..cf31d0c 100644
--- a/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
+++ b/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
@@ -86,12 +86,6 @@
</view>
</view>
<view class="form-item">
- <view class="title">缁翠慨瑕佹眰:</view>
- <view class="right">
- <textarea v-model="hform.HExplanation" placeholder="璇疯緭鍏ョ淮淇姹�" />
- </view>
- </view>
- <view class="form-item">
<view class="title">鏃堕棿鍗曚綅:</view>
<zxz-uni-data-select class="right" :localdata="[
{key: '灏忔椂', value: '灏忔椂'},
@@ -119,7 +113,7 @@
</zxz-uni-data-select>
</view>
<view class="form-item">
- <view class="title required">缁翠慨椤圭洰:</view>
+ <view class="title">缁翠慨椤圭洰:</view>
<zxz-uni-data-select required class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
dataValue="hitemid" v-model="hform.HRepairID" filterable>
</zxz-uni-data-select>
@@ -146,6 +140,12 @@
<view class="title">璁惧鍨嬪彿:</view>
<view class="righton">
<input v-model="hform.HBarModel" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨瑕佹眰:</view>
+ <view class="right">
+ <textarea v-model="hform.HExplanation" placeholder="璇疯緭鍏ョ淮淇姹�" />
</view>
</view>
</view>
@@ -431,12 +431,12 @@
state: false
}
}
- if (this.hform.HRepairCheckMainID == 0) {
- return {
- Message: "缁翠慨椤圭洰涓嶅緱涓虹┖!",
- state: false
- }
- }
+ // if (this.hform.HRepairCheckMainID == 0) {
+ // return {
+ // Message: "缁翠慨椤圭洰涓嶅緱涓虹┖!",
+ // state: false
+ // }
+ // }
if (this.hform.HManagerID == 0) {
return {
Message: "璐熻矗浜轰笉寰椾负绌�!",
@@ -990,7 +990,7 @@
this.hform.HBarModel = data1.璁惧鍨嬪彿
this.hform.HBarSpec = data1.璁惧瑙勬牸
this.hform.HExplanation = data1.鏁呴殰鍘熷洜鎻忚堪
- this.hform.HRepairContent = data1.鏁呴殰鍘熷洜鎻忚堪
+ // this.hform.HRepairContent = data1.鏁呴殰鍘熷洜鎻忚堪
this.getSendWorkBill(HSendWorkID)
} else {
diff --git a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
index b153674..468dcc6 100644
--- a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
+++ b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
@@ -89,7 +89,7 @@
</zxz-uni-data-select>
</view>
<view class="form-item">
- <view class="title required">楠屾敹椤圭洰:</view>
+ <view class="title">楠屾敹椤圭洰:</view>
<zxz-uni-data-select required class="right" :localdata="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
dataValue="hitemid" v-model="hform.HRepairCheckID">
</zxz-uni-data-select>
@@ -569,7 +569,7 @@
try {
let sWhere= " where 1=1 "
if(this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�'){
- sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
+ // sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
}
let res = await CommonUtils.doRequest2Async({
url: '/PublicPageMethod/UserList',
@@ -722,6 +722,7 @@
let {data, count, Message} = res.data
if(count == 1) {
this.hform.HRepairCheckID = this.HRepairCheckList.find(item => data[0]["琛ㄤ綋缁翠慨椤圭洰"] == item["缁翠慨楠屾敹椤圭洰"])?.hitemid
+ this.HDetailList[0].HRepairCheckContent = data[0].缁翠慨鍐呭
}else {
CommonUtils.showTips({
title: "娓╅Θ鎻愮ず",
@@ -760,7 +761,7 @@
this.hform.HBarName = data[0].璁惧鍚嶇О
this.hform.HBarModel = data[0].璁惧瑙勬牸
this.hform.HBarSpec = data[0].璁惧瑙勬牸
- this.HDetailList[0].HRepairCheckContent = data[0].鏁呴殰鎻忚堪
+
this.hform.HMainSourceBillNo = data[0]["璁惧缁翠慨璁板綍鍗�"];
this.hform.HMainSourceInterID = data[0]["HEquipRepairCheckBillInterID"];
this.hform.HMainSourceEntryID = data[0]["HEquipRepairCheckBillEntryID"];
diff --git a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
index d38816b..c960191 100644
--- a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
+++ b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
@@ -113,8 +113,8 @@
</zxz-uni-data-select>
</view>
<view class="form-item">
- <view class="title required">缁翠慨椤圭洰:</view>
- <zxz-uni-data-select required class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
+ <view class="title">缁翠慨椤圭洰:</view>
+ <zxz-uni-data-select class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
dataValue="hitemid" v-model="hform.HRepairID">
</zxz-uni-data-select>
</view>
@@ -542,12 +542,6 @@
if (this.hform.HEmpID == 0) {
return {
Message: "缁翠慨浜轰笉寰椾负绌�!",
- state: false
- }
- }
- if (this.hform.HRepairID == 0) {
- return {
- Message: "缁翠慨椤圭洰涓嶅緱涓虹┖!",
state: false
}
}
diff --git a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
index f669451..adc8bb3 100644
--- a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
+++ b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
@@ -13,7 +13,7 @@
overflow: 'auto'
}">
- <!-- 鍘熷唴瀹逛繚鎸佷笉鍙� -->
+ <!-- 鍘熷唴瀹逛繚鎸佷笉鍙� -->
<view class="form-item">
<view class="title">鍣ㄥ叿鏉＄爜:</view>
<view :class="enableEdit?'right':'righton'">
@@ -40,45 +40,45 @@
</uni-datetime-picker>
</view>
</view>
- <!-- 鏂板婧愬崟绫诲瀷鍜屾晠闅滅櫥璁板崟閫夋嫨 -->
+ <!-- 鏂板婧愬崟绫诲瀷鍜屾晠闅滅櫥璁板崟閫夋嫨 -->
<view class="form-item">
- <view class="title">婧愬崟绫诲瀷</view>
- <view class="right" v-show="showHMainSourceBillType">
- <picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
+ <view class="title">婧愬崟绫诲瀷</view>
+ <view class="right" v-show="showHMainSourceBillType">
+ <picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
- <input disabled name="HMainSourceBillType" v-model="HMainSourceBillType"
- placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
- <view class="picker-overlay"></view>
- </picker>
+ <input disabled name="HMainSourceBillType" v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ <view class="picker-overlay"></view>
+ </picker>
</view>
- <view class="righton" v-show="!showHMainSourceBillType">
- <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
- placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
- </view>
- </view>
- <view class="form-item">
- <view class="title required">鏁呴殰鐧昏鍗�</view>
- <view class="right" v-show="hform.HMainSourceBillType != 1">
- <input type="text" name="HBarCode" v-model="hform.HMainSourceBillNo" />
- </view>
- <view class="icon-wrapper" v-show="hform.HMainSourceBillType != 1"
- :disabled="hform.HMainSourceBillType == -1">
- <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
- </view>
- <view class="righton" v-show="hform.HMainSourceBillType == 1">
- <input type="text" disabled name="HBarCode" v-model="hform.HMainSourceBillNo" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
- <view class="righton">
- <input disabled v-model="hform.HBillNo" />
+ <view class="righton" v-show="!showHMainSourceBillType">
+ <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁鏃ユ湡:</view>
- <view class="righton">
- <input disabled v-model="hform.HDate" />
+ <view class="title required">鏁呴殰鐧昏鍗�</view>
+ <view class="right" v-show="hform.HMainSourceBillType != 1">
+ <input type="text" name="HBarCode" v-model="hform.HMainSourceBillNo" />
+ </view>
+ <view class="icon-wrapper" v-show="hform.HMainSourceBillType != 1"
+ :disabled="hform.HMainSourceBillType == -1">
+ <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+ </view>
+ <view class="righton" v-show="hform.HMainSourceBillType == 1">
+ <input type="text" disabled name="HBarCode" v-model="hform.HMainSourceBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HDate" />
</view>
</view>
@@ -97,11 +97,17 @@
</zxz-uni-data-select>
</view>
<view class="form-item">
- <view class="title required">缁翠慨椤圭洰:</view>
- <zxz-uni-data-select required class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
- dataValue="hitemid" v-model="hform.HRepairID">
+ <view class="title">缁翠慨椤圭洰:</view>
+ <zxz-uni-data-select class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰" dataValue="hitemid"
+ v-model="hform.HRepairID">
</zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨鍐呭:</view>
+ <view class="right">
+ <textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ョ淮淇唴瀹�" />
+ </view>
</view>
<view class="form-item">
<view class="title required">涓荤:</view>
@@ -137,27 +143,27 @@
overflow: 'auto'
}">
<view class="form-item">
- <view class="title">鏃堕棿鍗曚綅:</view>
- <zxz-uni-data-select class="right" :localdata="[
+ <view class="title">鏃堕棿鍗曚綅:</view>
+ <zxz-uni-data-select class="right" :localdata="[
{key: '灏忔椂', value: '灏忔椂'},
{key: '澶�', value: '澶�'},
{key: '鏈�', value: '鏈�'},
]" dataKey="key" dataValue="value" v-model="hform.HCycleUnit">
- </zxz-uni-data-select>
- </view>
- <view class="form-item">
- <view class="title">璁″垝缁翠慨宸ユ椂:</view>
- <view class="right">
- <input type="number" v-model="hform.HPlanTimes" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瀹為檯缁翠慨宸ユ椂:</view>
- <view class="right">
- <input type="number" v-model="hform.HTimes" />
- </view>
- </view>
- <view class="form-item">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">璁″垝缁翠慨宸ユ椂:</view>
+ <view class="right">
+ <input type="number" v-model="hform.HPlanTimes" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹為檯缁翠慨宸ユ椂:</view>
+ <view class="right">
+ <input type="number" v-model="hform.HTimes" />
+ </view>
+ </view>
+ <view class="form-item">
<view class="title">渚涘簲鍟�:</view>
<view class="right">
<input v-model="hform.HSupIDName" placeholder="" />
@@ -193,12 +199,6 @@
<view class="title">缁翠慨璐圭敤:</view>
<view class="right">
<input type="number" v-model="HDetailList[0].HMoney" placeholder="" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">缁翠慨鍐呭:</view>
- <view class="right">
- <textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ョ淮淇唴瀹�" />
</view>
</view>
<view class="form-item">
@@ -270,7 +270,7 @@
</view>
</view>
</view>
- </template>
+ </template>
<!-- 鎿嶄綔鎸夐挳 -->
<view class="buttons" id="buttons">
@@ -280,10 +280,10 @@
<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
</view>
- <!-- 鏂板寮圭獥缁勪欢 -->
- <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType"
- :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
- </BillListPopupMouldConkBookBillVue>
+ <!-- 鏂板寮圭獥缁勪欢 -->
+ <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType"
+ :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
+ </BillListPopupMouldConkBookBillVue>
</view>
</template>
@@ -298,22 +298,22 @@
import {
getUserInfo
} from "../../../utils/auth";
- // 鏂板寮曞叆缁勪欢
- import BillListPopupMouldConkBookBillVue from '../../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
+ // 鏂板寮曞叆缁勪欢
+ import BillListPopupMouldConkBookBillVue from '../../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
export default {
// 鍣ㄥ叿缁翠慨娲惧伐鍗�
name: 'Sc_MouldRepairSendWorkBill',
- components: {
- BillListPopupMouldConkBookBillVue,
- },
+ components: {
+ BillListPopupMouldConkBookBillVue,
+ },
data() {
return {
tabs: 0,
- HMainSourceBillType: '妯″叿鏁呴殰鐧昏鍗�', // 鏂板
- showHMainSourceBillType: true, // 鏂板
- arrayHMainSourceBillType: ['妯″叿鏁呴殰鐧昏鍗�'], // 鏂板
- arrayHMainSourceBillTypeID: ['3815'], // 鏂板
+ HMainSourceBillType: '妯″叿鏁呴殰鐧昏鍗�', // 鏂板
+ showHMainSourceBillType: true, // 鏂板
+ arrayHMainSourceBillType: ['妯″叿鏁呴殰鐧昏鍗�'], // 鏂板
+ arrayHMainSourceBillTypeID: ['3815'], // 鏂板
btnTop: 0,
tabsBottom: 0,
HModName: "Sc_MouldRepairSendWorkBill",
@@ -328,7 +328,7 @@
HRepairList: [],
hform: {
- "HBillType":"3843",
+ "HBillType": "3843",
"HBarCode": "",
"HBillNo": "",
"HInterID": "0",
@@ -348,13 +348,13 @@
"HManagerName": getUserInfo().HSecManager,
"HManagerID": getUserInfo().HSecManagerID,
"HRepairBeginDate": dayjs(new Date()).format('YYYY-MM-DD'),
- "HMainSourceBillType": 3815, // 鏂板锛氶粯璁ゆā鍏锋晠闅滅櫥璁板崟
- "HMainSourceInterID": "0", // 鏂板
- "HMainSourceEntryID": "0", // 鏂板
+ "HMainSourceBillType": 3815, // 鏂板锛氶粯璁ゆā鍏锋晠闅滅櫥璁板崟
+ "HMainSourceInterID": "0", // 鏂板
+ "HMainSourceEntryID": "0", // 鏂板
"HPlanTimes": "0",
"HTimes": "0",
"HRepairEndDate": dayjs(new Date()).format('YYYY-MM-DD'),
- "HMainSourceBillNo": "", // 鏂板
+ "HMainSourceBillNo": "", // 鏂板
"HSupIDName": "",
"HSupID": "0",
"HRepairType": "鍐呴儴缁翠慨",
@@ -379,7 +379,7 @@
"HMouldName": "",
"HMouldSpec": "",
"HMouldModel": "",
- "HStockOrgID": uni.getStorageSync("OrganizationID") || "0" // 鏂板
+ "HStockOrgID": uni.getStorageSync("OrganizationID") || "0" // 鏂板
},
HDetailList: [{ // 鍚庣鎺ュ彛鎻愪氦闇�瑕� 鏄庣粏淇℃伅
"瀛愮淮淇」鐩�": "",
@@ -402,42 +402,42 @@
},
},
methods: {
- // 鏂板锛氶�夋嫨婧愬崟绫诲瀷
- HMainSourceBillTypeChange(e) {
- if (e.detail.value == -1 || e.detail.value == NaN) {
- this.HMainSourceBillType = '鎵嬪伐褰曞叆'
- this.hform.HMainSourceBillType = -1
- return
- }
- console.log(e.detail.value)
- console.log(e)
- this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
- this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[e.detail.value]
+ // 鏂板锛氶�夋嫨婧愬崟绫诲瀷
+ HMainSourceBillTypeChange(e) {
+ if (e.detail.value == -1 || e.detail.value == NaN) {
+ this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+ this.hform.HMainSourceBillType = -1
+ return
+ }
+ console.log(e.detail.value)
+ console.log(e)
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[e.detail.value]
- // 缂撳瓨褰撳墠椤甸潰閫夋嫨
- const pages = getCurrentPages()
- const currentPage = pages[pages.length - 1]
- uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
- HSourceBillTypeName: this.HMainSourceBillType,
- HSourceBillType: this.hform.HMainSourceBillType
- })
- },
+ // 缂撳瓨褰撳墠椤甸潰閫夋嫨
+ const pages = getCurrentPages()
+ const currentPage = pages[pages.length - 1]
+ uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+ HSourceBillTypeName: this.HMainSourceBillType,
+ HSourceBillType: this.hform.HMainSourceBillType
+ })
+ },
- // 鏂板锛氭樉绀哄崟鎹垪琛ㄥ脊绐�
- showBillList() {
- this.$refs.billList.showPopup()
- },
+ // 鏂板锛氭樉绀哄崟鎹垪琛ㄥ脊绐�
+ showBillList() {
+ this.$refs.billList.showPopup()
+ },
- // 鏂板锛氳鍙栫紦瀛�
- loadCache() {
- const pages = getCurrentPages()
- const currentPage = pages[pages.length - 1]
- let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
- if (HBillTypeCache) {
- this.HMainSourceBillType = HBillTypeCache.HSourceBillTypeName
- this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
- }
- },
+ // 鏂板锛氳鍙栫紦瀛�
+ loadCache() {
+ const pages = getCurrentPages()
+ const currentPage = pages[pages.length - 1]
+ let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
+ if (HBillTypeCache) {
+ this.HMainSourceBillType = HBillTypeCache.HSourceBillTypeName
+ this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
+ }
+ },
// 缁翠慨椤圭洰
async getRepairList() {
@@ -476,13 +476,13 @@
},
// 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
ValidCheck() {
- // 鏂板锛氭鏌ユ晠闅滅櫥璁板崟
- if (this.hform.HMainSourceBillType != 1 && !this.hform.HMainSourceBillNo) {
- return {
- Message: "鏁呴殰鐧昏鍗曚笉寰椾负绌�!",
- state: false
- }
- }
+ // 鏂板锛氭鏌ユ晠闅滅櫥璁板崟
+ if (this.hform.HMainSourceBillType != 1 && !this.hform.HMainSourceBillNo) {
+ return {
+ Message: "鏁呴殰鐧昏鍗曚笉寰椾负绌�!",
+ state: false
+ }
+ }
if (this.hform.HMouldID == 0) {
return {
@@ -498,19 +498,19 @@
}
if (this.hform.HEmpID == 0) {
return {
- Message: "缁翠慨浜轰笉寰椾负绌�!",
+ Message: "缁翠慨浜轰笉寰椾负绌�!",
state: false
}
}
- if (this.hform.HRepairID == 0) {
- return {
- Message: "缁翠慨椤圭洰涓嶅緱涓虹┖!",
- state: false
- }
- }
+ // if (this.hform.HRepairID == 0) {
+ // return {
+ // Message: "缁翠慨椤圭洰涓嶅緱涓虹┖!",
+ // state: false
+ // }
+ // }
if (this.hform.HManagerID == 0) {
return {
- Message: "涓荤涓嶅緱涓虹┖!",
+ Message: "涓荤涓嶅緱涓虹┖!",
state: false
}
}
@@ -583,8 +583,8 @@
// 鑾峰彇鑱屽憳鏁版嵁
async getEmpList() {
try {
- let sWhere= " where 1=1 "
- if(this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�'){
+ let sWhere = " where 1=1 "
+ if (this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�') {
sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
}
let res = await CommonUtils.doRequest2Async({
@@ -798,7 +798,7 @@
this.HDetailList[0].HRepairID = this.hform.HRepairID
let sSubStr = JSON.stringify(this.HDetailList);
let oprType = this.operationType
- if(oprType == 4) {
+ if (oprType == 4) {
// 涓嬫帹鐨勬搷浣滅被鍨嬩篃瑙嗕负鏂板
oprType = 1
}
@@ -828,7 +828,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- // url: './Sc_MouldRepairSendWorkBill?operationType=1'
+ // url: './Sc_MouldRepairSendWorkBill?operationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -854,18 +854,23 @@
},
async getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
// 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
- if(HSourceBillType == 3815) {
+ if (HSourceBillType == 3815) {
let res = await CommonUtils.doRequest2Async({
url: "/Sc_MouldConkBookBill/Sb_MouldConkBookBillListCheckDetai",
data: {
HID: HInterID
}
})
-
- let {data,code, count, Message} = res.data
- console.log('data: ',data);
- if(code == 1) {
- console.log('data: ',data.h_v_Sc_MouldConkBookBillList_Edit);
+
+ let {
+ data,
+ code,
+ count,
+ Message
+ } = res.data
+ console.log('data: ', data);
+ if (code == 1) {
+ console.log('data: ', data.h_v_Sc_MouldConkBookBillList_Edit);
let data1 = data.h_v_Sc_MouldConkBookBillList_Edit[0]
this.hform.HMainSourceBillType = HSourceBillType
this.HMainSourceBillType = '鍣ㄥ叿鏁呴殰鐧昏鍗�'
@@ -878,12 +883,10 @@
this.hform.HMouldName = data1.浜у搧妯″叿
this.hform.HMouldModel = data1.浜у搧妯″叿鍨嬪彿
this.hform.HMouldSpec = data1.浜у搧妯″叿瑙勬牸
- this.hform.HRepairContent = data1.鏁呴殰鍘熷洜
-
+
this.enableEdit = false
this.showHMainSourceBillType = false
- }
- else {
+ } else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
message: `鑾峰彇婧愬崟澶辫触: ${Message}`
@@ -910,7 +913,11 @@
} else if (this.operationType == 4) {
// 涓嬫帹
- let {HSourceBillType, HInterID, HBillNo} = e
+ let {
+ HSourceBillType,
+ HInterID,
+ HBillNo
+ } = e
// 涓嬫帹
// this.enableEdit = false;
// this.enableSourceBillEdit = false;
@@ -924,28 +931,28 @@
this.getEmpList()
this.getCheckProjList()
this.getRepairList()
- this.loadCache() // 鏂板锛氬姞杞界紦瀛�
+ this.loadCache() // 鏂板锛氬姞杞界紦瀛�
- // 鏂板锛氱洃鍚崟鎹�夋嫨瀹屾垚浜嬩欢
- uni.$on('BillSelectComplete', (e) => {
- console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
- this.hform.HMainSourceInterID = e.HInterID
- this.hform.HMainSourceBillNo = e.HBillNo
- this.hform.HMainSourceEntryID = e.HEntryID
- this.hform.HMouldID = e.HMouldID
- this.hform.HMouldName = e.HMouldName
- this.hform.HMouldSpec = e.HMouldSpec
- this.hform.HMouldModel = e.HMouldModel
- // 濡傛灉閫夋嫨鍗曟嵁鏃跺甫浜嗘潯鐮侊紝涔熻缃潯鐮�
- if (e.HBarCode) {
- this.hform.HBarCode = e.HBarCode
- }
- this.$refs.billList.exit()
- })
+ // 鏂板锛氱洃鍚崟鎹�夋嫨瀹屾垚浜嬩欢
+ uni.$on('BillSelectComplete', (e) => {
+ console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+ this.hform.HMainSourceInterID = e.HInterID
+ this.hform.HMainSourceBillNo = e.HBillNo
+ this.hform.HMainSourceEntryID = e.HEntryID
+ this.hform.HMouldID = e.HMouldID
+ this.hform.HMouldName = e.HMouldName
+ this.hform.HMouldSpec = e.HMouldSpec
+ this.hform.HMouldModel = e.HMouldModel
+ // 濡傛灉閫夋嫨鍗曟嵁鏃跺甫浜嗘潯鐮侊紝涔熻缃潯鐮�
+ if (e.HBarCode) {
+ this.hform.HBarCode = e.HBarCode
+ }
+ this.$refs.billList.exit()
+ })
},
- onUnload() {
- uni.$off('BillSelectComplete') // 鏂板锛氱Щ闄や簨浠剁洃鍚�
- },
+ onUnload() {
+ uni.$off('BillSelectComplete') // 鏂板锛氱Щ闄や簨浠剁洃鍚�
+ },
onReady() {
const query = uni.createSelectorQuery().in(this)
query.select("#buttons")
@@ -961,47 +968,47 @@
</script>
<style lang="scss" scoped>
- @import "@/pages/MJGL/style/MJBillStyle.scss";
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
- .picker-overlay {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- z-index: 1;
- }
+ .picker-overlay {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 1;
+ }
- .icon-wrapper {
- background-color: #3A78FF;
- width: 52rpx;
- height: 52rpx;
- border-radius: 100%;
- display: flex;
- justify-content: center;
- align-items: center;
+ .icon-wrapper {
+ background-color: #3A78FF;
+ width: 52rpx;
+ height: 52rpx;
+ border-radius: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
- .uni-icons {
- color: #fff !important;
- }
- }
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
- .icon-wrapper[disabled] {
- background-color: rgba(228, 228, 228, 1);
- pointer-events: none;
- touch-action: none;
- }
+ .icon-wrapper[disabled] {
+ background-color: rgba(228, 228, 228, 1);
+ pointer-events: none;
+ touch-action: none;
+ }
- .required {
- position: relative;
- }
+ .required {
+ position: relative;
+ }
- .required::after {
- content: "*";
- position: relative;
- color: red;
- left: 0;
- top: 0;
- font-size: inherit;
- }
+ .required::after {
+ content: "*";
+ position: relative;
+ color: red;
+ left: 0;
+ top: 0;
+ font-size: inherit;
+ }
</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue b/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
index 5304389..193f817 100644
--- a/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
+++ b/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
@@ -134,7 +134,7 @@
</view>
</view>
<view class="form-item">
- <view class="title required">缁翠慨椤圭洰</view>
+ <view class="title">缁翠慨椤圭洰</view>
<view class="right">
<uni-combox :candidates="RepairNameNameList" placeholder="璇烽�夋嫨缁翠慨椤圭洰" v-model="hform.HRepairName"
@input="RepairNameChange"></uni-combox>
@@ -1089,12 +1089,13 @@
} else if (!this.hform.HDeptName) {
message = '鏈～鍐欓儴闂�'
} else if (!this.hform.HEmpName) {
- message = '鏈～鍐欑淮淇汉浜�'
+ message = '鏈～鍐欑淮淇汉'
} else if (!this.hform.HManagerName) {
message = '鏈～鍐欒礋璐ｄ汉'
- } else if (!this.hform.HRepairName) {
- message = '鏈～鍐欑淮淇」鐩�'
- }
+ }
+ // else if (!this.hform.HRepairName) {
+ // message = '鏈～鍐欑淮淇」鐩�'
+ // }
if (!message) {
return true
diff --git a/utils/i18n.js b/utils/i18n.js
index 5ff2f8b..f6293fa 100644
--- a/utils/i18n.js
+++ b/utils/i18n.js
@@ -46,11 +46,11 @@
}
export function addMissingKeyToMap(key, HFieldCode) {
+ // 闃叉椤甸潰鍒濇鍔犺浇鏃讹紝浣跨敤鏈湴缈昏瘧妯″潡瀵艰嚧鐨� 鍋囩己澶辩幇璞�
if (enableCollectMissingKey) {
if (!MissingKeysMap[key]) {
MissingKeysMap[key] = new Set()
}
- // 闃叉椤甸潰鍒濇鍔犺浇鏃讹紝浣跨敤鏈湴缈昏瘧妯″潡瀵艰嚧鐨� 鍋囩己澶辩幇璞�
MissingKeysMap[key].add(HFieldCode)
if (!clockID) {
clockID = setTimeout(() => {
--
Gitblit v1.9.1