From 8a2999d862d875971a074f07df814752f6ac1ae2 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 23 三月 2026 15:28:36 +0800
Subject: [PATCH] 异常反馈处理单 处理原因 改为必填项 首训末 检验单 保存的时候 如果表头选着不合格 表体检验项全是合格 进行提示 修复 工作联系单查询 点击 查看详情后，更新阅读状态 后 页面刷新不会变的问题
---
pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue | 50 +++
locale/zh-Hans.json | 61 ++++
utils/menuListApp.js | 8
pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue | 70 ++---
pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue | 17
pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue | 21 +
utils/common.js | 60 ++-
pages/caigouruku/POStockInBill.vue | 108 ++++---
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | 30 ++
manifest.json | 7
pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue | 2
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue | 30 ++
pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue | 6
pages/index/login.vue | 19
pages/shengchanlingliao/PPickingCheckBill.vue | 126 ++++-----
pages/shebeiyunxingzhuangtai/detail.vue | 104 ++++++-
pages/ZLGL/shoujianjianyan/firstCheckBill.vue | 33 ++
17 files changed, 494 insertions(+), 258 deletions(-)
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 39c651c..10713b5 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -12,7 +12,7 @@
"title": "閲囪喘閫�鏂欏崟"
},
"MoveStockBill_PDA": {
- "title": "鐩存帴璋冩嫧鍗�"
+ "title": "鐩存帴璋冩嫧鍗�"
},
"Kf_OtherOutBill_PDA": {
"title": "鍏朵粬鍑哄簱鍗�",
@@ -22,6 +22,63 @@
},
"SellOutBill_PDA": {
"title": "閿�鍞嚭搴撳崟"
+ },
+ "Kf_POStockInBill_PDA": {
+ "鐗╂枡浠ｇ爜": "鐗╂枡浠ｇ爜",
+ "婧愬崟鍗曞彿": "婧愬崟鍗曞彿",
+ "婧愬崟鏁伴噺": "婧愬崟鏁伴噺",
+ "鏁伴噺": "鏁伴噺",
+ "鏉＄爜涓暟": "鏉＄爜涓暟",
+ "瑙勬牸鍨嬪彿": "瑙勬牸鍨嬪彿",
+ "HSourceBillType0": "鏀舵枡閫氱煡鍗旲1103",
+ "HSourceBillType1": "閲囪喘璁㈠崟@1101",
+ "HSourceBillType2": "鎵嬪伐褰曞叆@-1"
+
+ },
+ "Gy": {
+ "HBarCode": "鏉＄爜",
+ "HBarCode_Placeholder": "璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜",
+ "HQty": "鏁伴噺",
+ "HQty_Placeholder": "璇疯緭鍏ユ暟閲�",
+ "HWHName": "浠撳簱",
+ "HWHName_Placeholder": "璇烽�夋嫨浠撳簱",
+ "HStockPlaceName": "浠撲綅",
+ "HStockPlaceName_Placeholder": "璇疯緭鍏�(鎴栨壂鎻�)浠撲綅",
+ "OperationDisabled": "涓嶅彲鎿嶄綔",
+ "SourceBillSelect": "閫夋嫨婧愬崟",
+ "TableHeaderInfo": "琛ㄥご淇℃伅",
+ "MaterInfo": "鐗╂枡淇℃伅",
+ "BarCodeInfo": "鏉＄爜淇℃伅",
+ "HMainSourceBillType": "婧愬崟淇℃伅",
+ "HMainSourceBillType_Placeholder": "璇烽�夋嫨婧愬崟绫诲瀷",
+ "HMainSourceBillNo": "婧愬崟鍗曞彿",
+ "HMainSourceBillNo_Placeholder": "璇疯緭鍏�(鎵弿)婧愬崟鍗曞彿",
+ "HDate": "鏃ユ湡",
+ "HDate_Placeholder": "璇烽�夋嫨鏃ユ湡",
+ "HMaker": "鍒跺崟浜�",
+ "HBillNo": "鍗曟嵁鍙�",
+ "HInterID": "鍗曟嵁ID",
+ "HKeeperName": "淇濈",
+ "HKeeperName_Placeholder": "璇烽�夋嫨淇濈鍛�",
+ "HSecManagerName": "楠屾敹",
+ "HSecManagerName_Placeholder": "璇烽�夋嫨楠屾敹鍛�",
+ "HDeptName": "閮ㄩ棬",
+ "HDeptName_Placeholder": "璇烽�夋嫨閮ㄩ棬",
+ "HSupName": "渚涘簲鍟�",
+ "HSupName_Placeholder": "璇烽�夋嫨渚涘簲鍟�",
+ "HStockOrgName": "缁勭粐",
+ "HBarCode_B": "鏉＄爜",
+ "HMaterName_B": "鐗╂枡",
+ "HMaterModel_B": "瑙勬牸",
+ "HBatchNo_B": "鎵规",
+ "HUnitName_B": "鍗曚綅",
+ "HQty_B": "鏁伴噺",
+ "HTMQty_B": "瀹归噺",
+ "HWHName_B": "浠撳簱",
+ "HSPName_B": "浠撲綅",
+ "submit": "鎻愪氦",
+ "addNew": "鏂板",
+ "goBack": "閫�鍑�"
}
-
+
}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 77888b6..f5a814b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "3.000",
- "versionCode" : 300,
+ "versionName" : "3.003",
+ "versionCode" : 303,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
@@ -182,5 +182,6 @@
"landscape-secondary",
//鑷劧鏂瑰悜
"default"
- ]
+ ],
+ "fallbackLocale" : "zh-Hans"
}
diff --git a/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue b/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue
index 857cdc1..2d2e20a 100644
--- a/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue
+++ b/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue
@@ -5,12 +5,11 @@
<view class="row-head">{{ item["鍒嗙粍鍚嶇О"] }}</view>
<uni-row :gutter="3" class="row-content">
<uni-col class="equal-height-col" :span="8" v-for="unit in item['鍙傛暟鍒楄〃']">
- <view style="font-size: 28rpx;">
- {{ unit.HTechParamName }}:{{unit.HResult}}
+ <view style="font-size: 28rpx; text-align: center; padding: 8rpx 0;">
+ {{ unit.HTechParamName }}: {{unit.HResult}}
</view>
</uni-col>
</uni-row>
-
</view>
</view>
</view>
@@ -23,20 +22,23 @@
import {
getUserInfo
} from '@/utils/auth';
+ import timerManager from '@/utils/timer';
export default {
data() {
return {
+ HTimerID: 'Sc_EquipTechParamQueryTimer',
HTechParams: []
};
},
methods: {
- async loadBillMain(HEquipID) {
+ async loadBillMain(HEquipID, showLoading=true) {
try {
let res = await CommonUtils.doRequest2Async({
url: "/Web/getSB_EquipTechParamBillListByEquipID",
data: {
HEquipID: HEquipID,
- }
+ },
+ showLoading: showLoading
})
let {
@@ -47,42 +49,6 @@
} = res.data
if (code == 1) {
- // Object.assign(this.hform, {
- // "HMaterID": data[0].HMaterID,
- // "HMaterNumber": data[0].浜у搧浠ｇ爜,
- // "HMaterName": data[0].浜у搧鍚嶇О,
- // "HMaterModel": data[0].瑙勬牸鍨嬪彿,
- // "HProcID": data[0].HProcID,
- // "HProcName": data[0].宸ュ簭鍚嶇О,
- // "HProcNo": data[0].宸ュ簭鍙�,
- // //"HGroupID": data[0].HGroupID == undefined ? 0 : data[0].HGroupID,
- // //"HGroupName": data[0].鐝粍,
- // "HDeptID": data[0].HDeptID == undefined ? 0 : data[0].HDeptID,
- // "HDeptName": data[0].鍔犲伐杞﹂棿,
-
- // "HSourceID": data[0].HSourceID,
- // "HSourceName": data[0].鐢熶骇璧勬簮,
-
- // "HEquipID": data[0].HEquipID,
- // "HEquipName": data[0].璁惧鍚嶇О,
-
- // "HICMOInterID": data[0].hicmointerid,
- // "HICMOEntryID": data[0].HICMOEntryID,
- // "HICMOBillNo": data[0].浠诲姟鍗曞彿,
-
- // "HProcExchInterID": data[0].hmainid,
- // "HProcExchEntryID": data[0].HEntryID,
- // "HProcExchBillNo": data[0].鍗曟嵁鍙�,
-
- // "HMainSourceInterID": data[0].hmainid,
- // "HMainSourceEntryID": data[0].HEntryID,
- // "HMainSourceBillNo": data[0].鍗曟嵁鍙�,
- // "HMainSourceBillType": data[0].鍗曟嵁绫诲瀷,
-
- // "HMouldName": data[0].妯″叿鍚嶇О,
- // "HMouldID": data[0].HMouldID
- // })
-
this.HTechParams = data
} else {
CommonUtils.showTips({
@@ -98,12 +64,26 @@
})
}
},
+
},
onLoad(e) {
let {
HEquipID
} = e
this.loadBillMain(HEquipID)
+ this.HEquipID = HEquipID
+ },
+ onShow() {
+ // 鍒濆鍖栧畾鏃跺櫒 瀹氭椂璁块棶璁惧宸ヨ壓鍙傛暟
+ timerManager.createTimer(this.HTimerID, () => {
+ this.loadBillMain(this.HEquipID, false)
+ }, 60000, 'interval')
+ },
+ beforeDestroy() {
+ timerManager.clearAllTimers()
+ },
+ onUnload() {
+ timerManager.clearAllTimers();
}
}
</script>
@@ -111,8 +91,10 @@
<style lang="scss">
.row-head {
border-radius: 10rpx 10rpx 0 0;
- background-color: rgb(229, 236, 243);
- padding: 0 12rpx;
+ background-color: rgb(0, 125, 255);
+ color: rgb(255, 255, 255);
+ font-weight: bold;
+ padding: 12rpx 16rpx;
font-family: "PingFang SC", "Microsoft YaHei", sans-serifs;
}
@@ -137,7 +119,7 @@
height: inherit;
padding: 1rpx;
justify-content: center;
- color: rgba(124, 124, 124, 1.0);
+ color: rgba(51, 51, 51, 1.0);
font-family: "PingFang SC", "Microsoft YaHei", sans-serifs;
}
</style>
\ No newline at end of file
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
index 66d1b06..afe7229 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
@@ -763,7 +763,7 @@
this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
this.hform.HSendMan = LoadData.鍙戦�佷汉
- this.hform.HReceiveMan = LoadData.鎸囨淳澶勭悊浜�
+ this.hform.HReceiveMan = getUserInfo()["HEmpName"] || LoadData.鎸囨淳澶勭悊浜�
this.hform.HCopyMan = LoadData.鎶勯��
this.hform.HLevel = LoadData.绱ф�ョ▼搴�
this.hform.HContext = LoadData.涓婚
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
index f9e341a..b5fa055 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
@@ -91,7 +91,7 @@
</view>
</view>
<view class="form-item">
- <view class="title">澶勭悊鍘熷洜:</view>
+ <view class="title"><text>*</text>澶勭悊鍘熷洜:</view>
<view class="right">
<uni-combox :candidates="arrayHBadReasonName" placeholder="璇烽�夋嫨澶勭悊鍘熷洜" v-model="hform.HBadReasonName"
@input="HBadReasonNameChange"></uni-combox>
@@ -756,7 +756,7 @@
this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
this.hform.HSendMan = LoadData.鍙戦�佷汉
- this.hform.HReceiveMan = LoadData.鎸囨淳澶勭悊浜�
+ this.hform.HReceiveMan = getUserInfo()["HEmpName"] || LoadData.鎸囨淳澶勭悊浜�
this.hform.HCopyMan = LoadData.鎶勯��
this.hform.HLevel = LoadData.绱ф�ョ▼搴�
this.hform.HContext = LoadData.涓婚
@@ -776,8 +776,8 @@
this.hform.HErrMsgBackBillNo = LoadData.鍗曟嵁鍙�
this.hform.HErrMsgBackInterID = LoadData.HInterID
this.hform.HErrMsgBackEntryID = LoadData.HEntryID
- this.hform.HHandleEmpID = LoadData.HHandleEmpID
- this.hform.HHandleEmpName = LoadData.鎸囨淳澶勭悊浜�
+ this.hform.HHandleEmpID = getUserInfo()["HEmpID"] || LoadData.HHandleEmpID
+ this.hform.HHandleEmpName = getUserInfo()["HEmpName"] || LoadData.鎸囨淳澶勭悊浜�
} else if (num == 2) {
// 寮傚父鍙嶉鎺ユ敹鍗�
this.hform.HDeptID = LoadData.HDeptID
@@ -931,7 +931,14 @@
title: '璇烽�夋嫨鎺ユ敹浜�',
icon: 'none'
})
- } else {
+ }
+ else if(!this.hform.HBadReasonName){
+ uni.showToast({
+ title: '璇烽�夋嫨澶勭悊鍘熷洜',
+ icon: 'none'
+ })
+ }
+ else {
uni.showLoading({
title: '璇风◢鍊�'
})
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
index f422f3d..a808501 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
@@ -696,7 +696,7 @@
this.hform.HErrMsgBackTypeID = LoadData.HErrMsgBackTypeID
this.hform.HErrMsgBackTypeName = LoadData.寮傚父绫诲瀷鍚嶇О
this.hform.HSendMan = LoadData.鍙戦�佷汉
- this.hform.HReceiveMan = LoadData.鎸囨淳澶勭悊浜�
+ this.hform.HReceiveMan = getUserInfo()["HEmpName"] || LoadData.鎸囨淳澶勭悊浜�
this.hform.HCopyMan = LoadData.鎶勯��
this.hform.HLevel = LoadData.绱ф�ョ▼搴�
this.hform.HContext = LoadData.涓婚
@@ -716,8 +716,8 @@
this.hform.HErrMsgBackBillNo = LoadData.鍗曟嵁鍙�
this.hform.HErrMsgBackInterID = LoadData.HInterID
this.hform.HErrMsgBackEntryID = LoadData.HEntryID
- this.hform.HSignEmpID = LoadData.HHandleEmpID
- this.hform.HSignEmpName = LoadData.鎸囨淳澶勭悊浜�
+ this.hform.HSignEmpID = getUserInfo()["HEmpID"] || LoadData.HHandleEmpID
+ this.hform.HSignEmpName = getUserInfo()["HEmpName"] || LoadData.鎸囨淳澶勭悊浜�
} else if (num == 2) {
// 寮傚父鍙嶉鎺ユ敹鍗�
this.hform.HDeptID = LoadData.HDeptID
diff --git a/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue b/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue
index 4038f1b..b2e8c08 100644
--- a/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue
@@ -412,6 +412,13 @@
this.tabs[0].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP.length
this.tabs[0].count = data.h_p_OA_ErrMsgBackSelfQuery_APP.length
}
+
+ if (data && data.h_p_OA_ErrMsgBackSelfQuery_APP_Role) {
+ // 鏇存柊寰呯鍒伴〉绛�
+ this.tabs[0].listData = data.h_p_OA_ErrMsgBackSelfQuery_APP_Role
+ this.tabs[0].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP_Role.length
+ this.tabs[0].count = data.h_p_OA_ErrMsgBackSelfQuery_APP_Role.length
+ }
if (data && data.h_p_OA_ErrMsgBackSelfQuery_APP1) {
// 鏇存柊寰呭鐞嗛〉绛�
@@ -419,13 +426,27 @@
this.tabs[1].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP1.length
this.tabs[1].count = data.h_p_OA_ErrMsgBackSelfQuery_APP1.length
}
+
+ if (data && data.h_p_OA_ErrMsgBackSelfQuery_APP_Role1) {
+ // 鏇存柊寰呭鐞嗛〉绛�
+ this.tabs[1].listData = data.h_p_OA_ErrMsgBackSelfQuery_APP_Role1
+ this.tabs[1].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP_Role1.length
+ this.tabs[1].count = data.h_p_OA_ErrMsgBackSelfQuery_APP_Role1.length
+ }
- if (data && data.h_p_OA_ErrMsgBackSelfQuery_APP2) {
+ if (data && data.h_p_OA_ErrMsgBackSelfQuery_APP_Role2) {
// 鏇存柊寰呴獙鏀堕〉绛�
- this.tabs[2].listData = data.h_p_OA_ErrMsgBackSelfQuery_APP2
- this.tabs[2].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP2.length
- this.tabs[2].count = data.h_p_OA_ErrMsgBackSelfQuery_APP2.length
+ this.tabs[2].listData = data.h_p_OA_ErrMsgBackSelfQuery_APP_Role2
+ this.tabs[2].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP_Role2.length
+ this.tabs[2].count = data.h_p_OA_ErrMsgBackSelfQuery_APP_Role2.length
}
+
+ if (data && data.h_p_OA_ErrMsgBackSelfQuery_APP2) {
+ // 鏇存柊寰呴獙鏀堕〉绛�
+ this.tabs[2].listData = data.h_p_OA_ErrMsgBackSelfQuery_APP2
+ this.tabs[2].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP2.length
+ this.tabs[2].count = data.h_p_OA_ErrMsgBackSelfQuery_APP2.length
+ }
if (data && data.h_p_OA_ErrMsgBackSelfQuery_APP3) {
// 鏇存柊鍏ㄩ儴鍗曟嵁椤电
@@ -433,6 +454,13 @@
this.tabs[3].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP3.length
this.tabs[3].count = data.h_p_OA_ErrMsgBackSelfQuery_APP3.length
}
+
+ if (data && data.h_p_OA_ErrMsgBackSelfQuery_APP_Role3) {
+ // 鏇存柊鍏ㄩ儴鍗曟嵁椤电
+ this.tabs[3].listData = data.h_p_OA_ErrMsgBackSelfQuery_APP_Role3
+ this.tabs[3].pageMeta.total = data.h_p_OA_ErrMsgBackSelfQuery_APP_Role3.length
+ this.tabs[3].count = data.h_p_OA_ErrMsgBackSelfQuery_APP_Role3.length
+ }
uni.stopPullDownRefresh()
}
@@ -498,13 +526,13 @@
return
}
const currentUser = getUserInfo()["Czymc"];
- if (item.鍙戦�佷汉 !== currentUser) {
- uni.showToast({
- title: '褰撳墠鍗曟嵁鍙戦�佷汉涓庣櫥褰曠敤鎴蜂笉涓�鑷达紝涓嶅厑璁镐笅鎺ㄩ獙鏀跺崟',
- icon: 'none'
- })
- return
- }
+ // if (item.鍙戦�佷汉 !== currentUser) {
+ // uni.showToast({
+ // title: '褰撳墠鍗曟嵁鍙戦�佷汉涓庣櫥褰曠敤鎴蜂笉涓�鑷达紝涓嶅厑璁镐笅鎺ㄩ獙鏀跺崟',
+ // icon: 'none'
+ // })
+ // return
+ // }
console.log('涓嬫帹楠屾敹鍗�:', item)
this.needRefresh = true // 璁剧疆鍒锋柊鏍囪
uni.navigateTo({
diff --git a/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
index 3389deb..a0ab0ac 100644
--- a/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
+++ b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
@@ -109,7 +109,7 @@
</template>
<template v-else>
<view class="over" v-if="!readCompelete">姝ｅ湪鑾峰彇鏁版嵁...</view>
- <view class="over" v-if="readCompelete">鏁版嵁宸茶瀹�...</view>
+ <view class="over" v-if="readCompelete">娌℃湁鏇村鏁版嵁...</view>
</template>
</view>
</template>
@@ -151,7 +151,7 @@
// 瑙﹀簳鍔犺浇
onReachBottom() {
this.page++;
- this.onSearchClickHandler()
+ this.switchTab(this.tabs)
},
methods: {
onDateRangePickerChangeHandler({
@@ -194,6 +194,7 @@
}
},
onSearchClickHandler() {
+ this.BillsDisplay = []
this.switchTab(this.tabs)
},
onResetClickHandler() {
@@ -202,7 +203,7 @@
this.enableCustomDateRange = false,
this.startDate = dayjs(new Date()).subtract(7, 'day').format('YYYY-MM-DD'),
this.endDate = dayjs(new Date()).format('YYYY-MM-DD'),
- this.getWorkLinkList()
+ this.onSearchClickHandler()
},
switchTab(tabIndex) {
if(tabIndex == this.tabs){
@@ -255,7 +256,15 @@
} = res.data
if (count == 1) {
console.log('data: ', data);
-
+ if(data.length == 0) {
+ // 褰撹幏鍙栫殑鏁版嵁闀垮害涓�0鏃讹紝琛ㄧず棰勫厛澧炲姞鐨勯〉鏁颁笉瀵癸紝闇�瑕佸噺鍘�
+ if(this.page > 1) {
+ this.page--
+ }
+ }
+ if(data.length == 0 || data.length <= this.size) {
+ this.readCompelete = true
+ }
this.BillsDisplay.push(...data)
@@ -316,7 +325,7 @@
Message
} = res.data
if (count == 1) {
- this.switchTab(this.tabs)
+ this.onSearchClickHandler()
} else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
@@ -338,7 +347,7 @@
}
},
onShow() {
- this.switchTab(0)
+ this.onSearchClickHandler()
}
}
</script>
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index 8af49b4..513acef 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -109,7 +109,7 @@
<view class="form-item">
<view class="left">鍒ゆ柇缁撹</view>
<view class="right none-border">
- <radio-group @changer="checkResultChange">
+ <radio-group @change.stop="checkResultChange">
<label>
<radio value="0" :checked="hform.HCheckerResult" /><text></text>
鍚堟牸
@@ -1460,8 +1460,12 @@
}
return "";
},
- checkResultChange(event) {
- console.log("event: ", event);
+ checkResultChange({detail: {value}}) {
+ if(value == 1) {
+ this.hform.HLastResult = false
+ }else {
+ this.hform.HLastResult = true
+ }
},
// 妫�楠岄」鐩柊澧炶
addCheckItem(resource) {
@@ -2024,6 +2028,26 @@
});
return false;
}
+
+ // 鍒ゆ柇 鏈�鍚庣粨鏋滀负涓嶅悎鏍肩殑鎯呭喌涓嬶紝妫�楠岄」鐩腑鏄惁鏈変笉鍚堟牸椤�
+ if(this.hform.HLastResult == 0 || this.hform.HLastResult == false){
+ let count = 0
+ for (let key in this.checkItems) {
+ if (this.checkItems.hasOwnProperty(key)) {
+ let element = this.checkItems[key];
+ if(element.HResult == 0){
+ count ++
+ }
+
+ }
+ }
+ if(count == 0) {
+ CommonUtils.showTips({
+ message: "鍒ゆ柇缁撹涓轰笉鍚堟牸锛屾楠岄」鐩腑涓嶅瓨鍦ㄤ笉鍚堟牸鍗曟嵁锛屾彁浜ゅけ璐ワ紒",
+ });
+ return false;
+ }
+ }
for (let key in this.checkItems) {
if (!this.checkItems[key].HQCCheckItemID) {
diff --git a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
index 914d70f..1b08db8 100644
--- a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -113,7 +113,7 @@
<view class="form-item">
<view class="left">鍒ゆ柇缁撹</view>
<view class="right none-border">
- <radio-group @changer="checkResultChange">
+ <radio-group @change.stop="checkResultChange">
<label>
<radio value="0" :checked="hform.HLastResult" /><text></text>
鍚堟牸
@@ -1430,8 +1430,12 @@
}
return "";
},
- checkResultChange(event) {
- console.log("event: ", event);
+ checkResultChange({detail: {value}}) {
+ if(value == 1) {
+ this.hform.HLastResult = false
+ }else {
+ this.hform.HLastResult = true
+ }
},
// 妫�楠岄」鐩柊澧炶
addCheckItem(resource) {
@@ -1978,6 +1982,26 @@
});
return false;
}
+
+ // 鍒ゆ柇 鏈�鍚庣粨鏋滀负涓嶅悎鏍肩殑鎯呭喌涓嬶紝妫�楠岄」鐩腑鏄惁鏈変笉鍚堟牸椤�
+ if(this.hform.HLastResult == 0 || this.hform.HLastResult == false){
+ let count = 0
+ for (let key in this.checkItems) {
+ if (this.checkItems.hasOwnProperty(key)) {
+ let element = this.checkItems[key];
+ if(element.HResult == 0){
+ count ++
+ }
+
+ }
+ }
+ if(count == 0) {
+ CommonUtils.showTips({
+ message: "鍒ゆ柇缁撹涓轰笉鍚堟牸锛屾楠岄」鐩腑涓嶅瓨鍦ㄤ笉鍚堟牸鍗曟嵁锛屾彁浜ゅけ璐ワ紒",
+ });
+ return false;
+ }
+ }
for (let key in this.checkItems) {
if (!this.checkItems[key].HQCCheckItemID) {
@@ -2027,6 +2051,9 @@
this.checkItems[key].HUnitID = 0;
}
}
+
+
+ return false
return true;
},
diff --git a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
index 8039c12..6c54b28 100644
--- a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -105,7 +105,7 @@
<view class="form-item">
<view class="left">鍒ゆ柇缁撹</view>
<view class="right none-border">
- <radio-group @changer="checkResultChange">
+ <radio-group @change.stop="checkResultChange">
<label>
<radio value="0" :checked="hform.HLastResult" /><text></text>
鍚堟牸
@@ -1137,8 +1137,12 @@
}
return "";
},
- checkResultChange(event) {
- console.log("event: ", event);
+ checkResultChange({detail: {value}}) {
+ if(value == 1) {
+ this.hform.HLastResult = false
+ }else {
+ this.hform.HLastResult = true
+ }
},
// 妫�楠岄」鐩柊澧炶
addCheckItem(resource) {
@@ -1679,6 +1683,26 @@
});
return false;
}
+
+ // 鍒ゆ柇 鏈�鍚庣粨鏋滀负涓嶅悎鏍肩殑鎯呭喌涓嬶紝妫�楠岄」鐩腑鏄惁鏈変笉鍚堟牸椤�
+ if(this.hform.HLastResult == 0 || this.hform.HLastResult == false){
+ let count = 0
+ for (let key in this.checkItems) {
+ if (this.checkItems.hasOwnProperty(key)) {
+ let element = this.checkItems[key];
+ if(element.HResult == 0){
+ count ++
+ }
+
+ }
+ }
+ if(count == 0) {
+ CommonUtils.showTips({
+ message: "鍒ゆ柇缁撹涓轰笉鍚堟牸锛屾楠岄」鐩腑涓嶅瓨鍦ㄤ笉鍚堟牸鍗曟嵁锛屾彁浜ゅけ璐ワ紒",
+ });
+ return false;
+ }
+ }
for (let key in this.checkItems) {
if (!this.checkItems[key].HQCCheckItemID) {
diff --git a/pages/caigouruku/POStockInBill.vue b/pages/caigouruku/POStockInBill.vue
index 17a731c..ee9a556 100644
--- a/pages/caigouruku/POStockInBill.vue
+++ b/pages/caigouruku/POStockInBill.vue
@@ -5,7 +5,7 @@
<!-- <view class="title">鏉＄爜:</view> -->
<view class="title">{{ $t(`Gy.HBarCode`) == "Gy.HBarCode"?"鏉＄爜": $t(`Gy.HBarCode`) }}:</view>
<view class="right" style="width: 380rpx;">
- <input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
+ <input :focus="barCodeFocus" v-model="hform.HBarCode" :placeholder="$t(`Gy.HBarCode_Placeholder`)"
@confirm="getCode(hform.HBarCode)" />
</view>
<uni-icons type="scan"
@@ -15,13 +15,13 @@
<view class="form-item">
<view class="title">{{ $t(`Gy.HQty`) == "Gy.HQty"?"鏁伴噺": $t(`Gy.HQty`) }}:</view>
<view class="right">
- <input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+ <input v-model="hform.HQty" :placeholder="$t(`Gy.HQty_Placeholder`)" />
</view>
</view>
<view class="form-item">
<view class="title">{{ $t(`Gy.HWHName`) == "Gy.HWHName"?"浠撳簱": $t(`Gy.HWHName`) }}:</view>
<view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨浠撳簱" v-model="hform.HWHName"
+ <uni-combox :candidates="arrayHWHName" :placeholder="$t(`Gy.HWHName_Placeholder`)" v-model="hform.HWHName"
@input="HWHNameChange"></uni-combox>
</view>
</view>
@@ -30,11 +30,11 @@
{{ $t(`Gy.HStockPlaceName`) == "Gy.HStockPlaceName"?"浠撲綅": $t(`Gy.HStockPlaceName`) }}:
</view>
<view class="right" v-show="true">
- <uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ <uni-combox :candidates="arrayHStockPlaceNameComputed" :placeholder="$t(`Gy.HStockPlaceName_Placeholder`)"
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
@confirm="HStockPlaceNameScan"></uni-combox>
</view>
- <view class="righton" v-show="false"><input v-model="hform.HStockPlaceName" placeholder="涓嶅彲鎿嶄綔"
+ <view class="righton" v-show="false"><input v-model="hform.HStockPlaceName" :placeholder="$t(`Gy.OperationDisabled`)"
:disabled="!showHStockPlaceName" /></view>
</view>
@@ -62,13 +62,13 @@
<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
@change="HMainSourceBillTypeChange">
<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
- placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ :placeholder="$t(`Gy.HMainSourceBillType_Placeholder`)" />
<view class="picker-overlay"></view>
</picker>
</view>
<view class="righton" v-show="!showHMainSourceBillType">
<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
- placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ :placeholder="$t(`HMainSourceBillType_Placeholder`)" />
</view>
</view>
<view class="form-item">
@@ -79,7 +79,7 @@
<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
<input :focus="HSourceBillNoFocus" type="text" name="HSourceBillNo"
- v-model="hform.HSourceBillNo" @confirm="onSourceBillBlurHandler" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ v-model="hform.HSourceBillNo" @confirm="onSourceBillBlurHandler" :placeholder="$t(`Gy.HMainSourceBillNo_Placeholder`)" />
</view>
<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
@@ -91,7 +91,7 @@
<view class="righton" v-show="!showHSourceBillNo">
- <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" :placeholder="$t(`Gy.HMainSourceBillNo_Placeholder`)" />
</view>
<!-- <view class="right" v-show="showHSourceBillNo">
<uni-combox ref="uniComboxSourceBill" :isFocus="HSourceBillNoFocus"
@@ -107,7 +107,7 @@
<view class="title">{{ $t(`Gy.HDate`) == "Gy.HDate"?"鏃ユ湡": $t(`Gy.HDate`) }}:</view>
<view class="right">
<picker mode="date" v-model="hform.HDate" @change="HDateChange">
- <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+ <input disabled v-model="hform.HDate" :placeholder="$t(`Gy.HDate_Placeholder`)" />
<view class="picker-overlay"></view>
</picker>
</view>
@@ -128,7 +128,7 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁ID:</view>
+ <view class="title">{{$t("Gy.HInterID")}}:</view>
<view class="righton">
<input name="HInterID" disabled v-model="hform.HInterID" />
</view>
@@ -137,28 +137,28 @@
<view v-if="tabs == 1">
<view class="form-item">
- <view class="title">淇濈:</view>
+ <view class="title">{{$t("Gy.HKeeperName")}}:</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
+ <uni-combox :candidates="arrayHEmpName" :placeholder="$t('Gy.HKeeperName_Placeholder')" v-model="hform.HKeeperName"
@input="HKeeperNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">楠屾敹:</view>
+ <view class="title">{{$t("Gy.HSecManagerName")}}:</view>
<view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
+ <uni-combox :candidates="arrayHEmpName" :placeholder="$t('Gy.HSecManagerName_Placeholder')" v-model="hform.HSecManagerName"
@input="HSecManagerNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">閮ㄩ棬:</view>
+ <view class="title">{{$t("Gy.HDeptName")}}:</view>
<view class="right">
- <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+ <uni-combox :candidates="arrayHDeptName" :placeholder="$t('Gy.HDeptName_Placeholder')" v-model="hform.HDeptName"
@input="HDeptNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">渚涘簲鍟�:</view>
+ <view class="title">{{$t("Gy.HSupName")}}:</view>
<!-- <view class="right" v-show="showHSupName">
<uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" v-model="hform.HSupName"
@input="HSupNameChange"></uni-combox>
@@ -168,7 +168,7 @@
</view>
</view>
<view class="form-item">
- <view class="title">缁勭粐:</view>
+ <view class="title">{{$t("Gy.HStockOrgName")}}:</view>
<view class="righton">
<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
</view>
@@ -180,39 +180,39 @@
<uni-card :title="item.鐗╂枡鍚嶇О" style="margin: 10px;" @tap="delMater(item, $event)">
<!-- 鐗╂枡浠ｇ爜浣滀负鍙偣鍑婚摼鎺� -->
<view class="card-header" @tap.stop="gotoInventoryQuery(item.鐗╂枡浠ｇ爜)">
- <text class="link-text">鐗╂枡浠ｇ爜锛歿{item.鐗╂枡浠ｇ爜}}</text>
+ <text class="link-text">{{$t(`${HModName}.鐗╂枡浠ｇ爜`)}}锛歿{item.鐗╂枡浠ｇ爜}}</text>
</view>
<view class="card-detail">
<view class="detail">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{$t(`${HModName}.婧愬崟鍗曞彿`)}}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail">
- <text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
+ <text>{{$t(`${HModName}.婧愬崟鏁伴噺`)}}锛�</text>{{item.婧愬崟鏁伴噺}}
</view>
<view class="detail">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{$t(`${HModName}.鏁伴噺`)}}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail">
- <text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
+ <text>{{$t(`${HModName}.鏉＄爜涓暟`)}}锛�</text>{{item.鏉＄爜涓暟}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{$t(`${HModName}.瑙勬牸鍨嬪彿`)}}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.杈呭姪灞炴��">
- <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+ <text>{{$t(`${HModName}.杈呭姪灞炴�)}}锛�</text>{{item.杈呭姪灞炴�}
</view>
<view class="detail" v-if="item.娆惧彿">
- <text>娆惧彿锛�</text>{{item.娆惧彿}}
+ <text>{{$t(`${HModName}.娆惧彿`)}}锛�</text>{{item.娆惧彿}}
</view>
<view class="detail" v-if="item.鍚堣鏁伴噺">
- <text>鍚堣鏁伴噺锛�</text>{{item.鍚堣鏁伴噺}}
+ <text>{{$t(`${HModName}.鍚堣鏁伴噺`)}}锛�</text>{{item.鍚堣鏁伴噺}}
</view>
<view class="detail" v-if="item.鍗曚环">
- <text>鍗曚环锛�</text>{{item.鍗曚环}}
+ <text>{{$t(`${HModName}.鍗曚环`)}}锛�</text>{{item.鍗曚环}}
</view>
<view class="detail" v-if="materMeta[0].HWHName && /鍏磋揪/.test(hform.HStockOrgName)">
- <text>浠撳簱锛�</text>{{materMeta[0].HWHName}}
+ <text>{{$t(`${HModName}.浠撳簱`)}}锛�</text>{{materMeta[0].HWHName}}
</view>
</view>
</uni-card>
@@ -222,55 +222,55 @@
<view v-if="tabs == 3">
<view class="form-item">
- <view class="title">鏉＄爜:</view>
+ <view class="title">{{$t("Gy.HBarCode_B")}}:</view>
<view class="righton">
<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鐗╂枡:</view>
+ <view class="title">{{$t("Gy.HMaterName_B")}}:</view>
<view class="righton">
<input disabled v-model="hform.HMaterName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">瑙勬牸:</view>
+ <view class="title">{{$t("Gy.HMaterModel_B")}}:</view>
<view class="righton">
<input disabled v-model="hform.HMaterModel_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鎵规:</view>
+ <view class="title">{{$t("Gy.HBatchNo_B")}}:</view>
<view class="righton">
<input disabled v-model="hform.HBatchNo_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曚綅:</view>
+ <view class="title">{{$t("Gy.HUnitName_B")}}:</view>
<view class="righton">
<input disabled v-model="hform.HUnitName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">鏁伴噺:</view>
+ <view class="title">{{$t("Gy.HQty_B")}}:</view>
<view class="righton">
<input disabled v-model="hform.HQty_B" />
</view>
</view>
<view class="form-item">
- <view class="title">瀹归噺:</view>
+ <view class="title">{{$t("Gy.HTMQty_B")}}:</view>
<view class="righton">
<input disabled v-model="hform.HTMQty_B" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撳簱:</view>
+ <view class="title">{{$t("Gy.HWHName_B")}}:</view>
<view class="righton">
<input disabled v-model="hform.HWHName_B" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撲綅:</view>
+ <view class="title">{{$t("Gy.HSPName_B")}}:</view>
<view class="righton">
<input disabled v-model="hform.HSPName_B" />
</view>
@@ -278,10 +278,10 @@
</view>
<view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-a" size="mini" @tap="submit">{{$t("Gy.submit")}}</button>
<view style="flex: 1;"></view>
- <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ <button class="btn-a" size="mini" @tap="addNew">{{$t("Gy.addNew")}}</button>
+ <button class="btn-c" size="mini" @tap="goBack">{{$t("Gy.goBack")}}</button>
</view>
</view>
<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
@@ -302,7 +302,9 @@
} from "@/utils/userRelationManager.js"
import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
-import { MpaasScan } from '../../utils/mpaasScan';
+ import {
+ MpaasScan
+ } from '../../utils/mpaasScan';
export default {
data() {
return {
@@ -752,6 +754,10 @@
} = res.data
if (count == 1) {
// console.log('data: ', data);
+ if(data.length == 0){
+ // 鏁版嵁搴撲腑娌℃湁閰嶇疆锛岄粯璁や娇鐢ㄦ湰鍦�
+ return
+ }
this.arrayHMainSourceBillType = []
this.arrayHMainSourceBillValue = []
Array.from(data).forEach(e => {
@@ -759,16 +765,20 @@
this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
})
- this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
- this.arrayHMainSourceBillValue.push('-1')
+ let trans = (this.$t(`${this.HModName}.HSourceBillType2`)).split("@")
+ console.log('trans: ',trans);
+ this.arrayHMainSourceBillType.push(trans[0])
+ this.arrayHMainSourceBillValue.push(trans[1])
this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
} else {
- uni.showToast({
- icon: 'none',
- title: Message
- })
+ // 鏁版嵁搴撲腑娌℃湁閰嶇疆锛屽垯浣跨敤鏈湴鐨勯厤缃�
+ for(let i = 0;i<this.HMainSourceBillType; i++) {
+ let transed = this.$t(`${this.HModName}.HSourceBillType${i}`).split("@")
+ this.arrayHMainSourceBillType.push(transed[0])
+ this.arrayHMainSourceBillValue.push(transed[1])
+ }
}
}
})
diff --git a/pages/index/login.vue b/pages/index/login.vue
index c01700e..b0f00b3 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -110,7 +110,7 @@
"鏉窞鍑礉濂堢壒": 'http://192.168.50.253:8080/API/',
"鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
- "闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.101:81/API/',
+ "闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.174:81/API/',
"闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.88.82:81/API/',
"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
"浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
@@ -133,6 +133,9 @@
"浣欏鍗庤繙": "http://192.168.3.248:82/HuaYuaAPI/",
//澶╂搸鑸ぉ
"澶╂搸鑸ぉ": "http://space-engine.com.cn:81/API/",
+ //娣诲悍绉戞妧
+ "娣诲悍绉戞妧": "http://61.164.219.166:12137/APPAPI/"
+
},
serverUrlName: uni.getStorageSync('serverUrlName'),
@@ -168,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/detail.vue b/pages/shebeiyunxingzhuangtai/detail.vue
index 41d7880..216eba4 100644
--- a/pages/shebeiyunxingzhuangtai/detail.vue
+++ b/pages/shebeiyunxingzhuangtai/detail.vue
@@ -4,7 +4,8 @@
<view class="graph"><l-echart ref="chartRef1" @finished="initHistogram1"></l-echart></view>
<view class="graph"><l-echart ref="chartRef2" @finished="initLineChart"></l-echart></view>
<view class="graph"><l-echart ref="chartRef3" @finished="initStatistics"></l-echart></view>
- <view class="graph"><l-echart ref="chartRef4" @finished="initHistogram4"></l-echart></view>
+ <view class="graph" style="display: none;"><l-echart ref="chartRef4" @finished="initHistogram4"></l-echart>
+ </view>
</view>
<view class="operation-zone" @click="doOperation">
@@ -30,12 +31,17 @@
getUserInfo
} from "@/utils/auth.js";
import * as echarts from "echarts"
+ import timerManager from "@/utils/timer";
+ import timer from "@/utils/timer";
export default {
data() {
return {
+ HTimerID: 'shebeiyunxingzhuangtai',
HEquipID: 0,
HICMOInterID: 0,
HICMOEntryID: 0,
+ HSourceID: 0,
+
userInfo: getUserInfo(),
organInfo: {
id: uni.getStorageSync("OrganizationID") || "",
@@ -83,31 +89,83 @@
// 榛樿鐨刼ption缁撴瀯
var option = {
title: {
- text: '杩戜竷澶╀骇鑳�', // 榛樿鏍囬涓虹┖
+ text: '杩戜竷澶╀骇鑳�',
left: 'center',
- top: '10%', // 璋冩暣鏍囬浣嶇疆锛屾斁鍒版渶涓婇潰
+ top: '8%',
textStyle: {
fontSize: 18,
color: '#ff0000'
}
},
grid: {
- top: '25%', // 璋冩暣grid鐨則op鍊硷紝缁欐爣棰樼暀鍑虹┖闂�
- bottom: '20%',
- left: '10%',
- right: '10%'
+ top: '25%',
+ bottom: '25%',
+ left: '15%',
+ right: '10%',
},
xAxis: {
type: 'category',
- data: [] // 榛樿x杞存暟鎹负绌�
+ data: [],
+ axisLabel: {
+ interval: 0,
+ rotate: 45,
+ fontSize: 12,
+ formatter: function(value) {
+ return value.length > 8 ? value.slice(0, 8) + '...' : value;
+ }
+ },
+ axisLine: {
+ show: true
+ },
+ axisTick: {
+ show: true
+ }
},
yAxis: {
- type: 'value'
+ type: 'value',
+ axisLabel: {
+ fontSize: 12,
+ margin: 15,
+ formatter: function(value) {
+ if (value < 1000) {
+ // 灏忎簬1000锛屾樉绀哄師濮嬫暟瀛楋紙鐧句綅鏁颁笉鍙橈級
+ return value;
+ } else if (value < 10000) {
+ // 1000-9999锛屾樉绀篨鍗冿紙淇濈暀1浣嶅皬鏁帮紝鍘绘帀鏈熬.0锛�
+ let thousand = (value / 1000).toFixed(1);
+ return thousand.replace('.0', '') + '鍗�';
+ } else {
+ // 澶т簬绛変簬10000锛屾樉绀篨涓囷紙淇濈暀1浣嶅皬鏁帮紝鍘绘帀鏈熬.0锛�
+ let tenThousand = (value / 10000).toFixed(1);
+ return tenThousand.replace('.0', '') + '涓�';
+ }
+ }
+ },
+ splitNumber: 6,
+ axisLine: {
+ show: true
+ },
+ axisTick: {
+ show: true
+ },
+ // 鍙�夛細寮哄埗Y杞村埢搴︿粠0寮�濮嬶紝閬垮厤鏁板�兼尋鍘�
+ min: 0
},
series: [{
- data: [], // 榛樿series鏁版嵁涓虹┖
- type: 'bar'
- }],
+ data: [],
+ type: 'bar',
+ label: {
+ show: true,
+ position: 'top',
+ fontSize: 12, // 缁熶竴鏍囩瀛椾綋
+ formatter: function(params) {
+ return echarts.format.addCommas(params.value);
+ }
+ },
+ itemStyle: {
+ color: '#15b1fa'
+ }
+ }]
};
// 濡傛灉鏈夋暟鎹紝鏇存柊option鐨勫唴瀹�
@@ -519,7 +577,7 @@
this.HEquipID
});
break;
- // 瀵艰埅鍒拌澶囧伐鑹哄弬鏁�
+ // 瀵艰埅鍒拌澶囧伐鑹哄弬鏁�
case "equipTechParam":
uni.navigateTo({
url: "/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery?HEquipID=" +
@@ -531,7 +589,7 @@
}
}
},
- async getDiagram(HDeptID, HSourceID,HEquipID) {
+ async getDiagram(HDeptID, HSourceID, HEquipID, showLoading = true) {
try {
let res = await CommonUtils.doRequest2Async({
url: "/Sc_HEquipStateDistribution/Get_EquipStateDistribution_FourReport",
@@ -542,7 +600,8 @@
"HEquipID": HEquipID
},
user: getUserInfo()["Czymc"],
- OrganizationID: this.organInfo.id
+ OrganizationID: this.organInfo.id,
+ showLoading
}
})
@@ -567,9 +626,24 @@
this.HEquipID = HEquipID
this.HICMOInterID = HICMOInterID
this.HICMOEntryID = HICMOEntryID
+ this.HDeptID = HDeptID;
+ this.HSourceID = HSourceID;
+ this.HEquipID = HEquipID;
await this.getDiagram(HDeptID, HSourceID, HEquipID)
+ timerManager.createTimer(this.HTimerID,
+ async () => {
+ await this.getDiagram(HDeptID, HSourceID, HEquipID, false)
+ },
+ 60000, 'interval'
+ )
},
+ beforeDestroy() {
+ timerManager.clearAllTimers()
+ },
+ onUnload() {
+ timerManager.clearAllTimers()
+ }
}
</script>
diff --git a/pages/shengchanlingliao/PPickingCheckBill.vue b/pages/shengchanlingliao/PPickingCheckBill.vue
index e860169..a4cad97 100644
--- a/pages/shengchanlingliao/PPickingCheckBill.vue
+++ b/pages/shengchanlingliao/PPickingCheckBill.vue
@@ -185,7 +185,7 @@
</view>
</view>
</view>
-
+
<view v-if="tabs == 4">
<FIFOListComponentVue :FIFOList="HFIFOList"></FIFOListComponentVue>
</view>
@@ -330,18 +330,42 @@
uni.$off('BillSelectComplete')
},
methods: {
+ // 閫氳繃鏉＄爜鏄庣粏涓殑鍐呭 鏇存柊鏈崟鎹潯鐮佹暟閲�
async changeQty() {
let HBarCodeOld = this.hform.HBarCode_B
let HQtyOld = this.hform.HQty_B
- this.hform.HBarCode = `*${this.hform.HBarCode_B}`
- // 鍏堝垹闄�
- await this.getCode(`*${this.hform.HBarCode_B}`)
- // 鍐嶅綍鍏�
- this.hform.HBarCode = HBarCodeOld
- this.hform.HQty = HQtyOld
- await this.getCode(this.hform.HBarCode_B)
- this.hform.HQty = ''
- this.hform.HBarCode = ''
+
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/WEBSController/set_UpdatePonderationBillMain_Temp_BarCode_Json',
+ data: {
+ HInterID: this.hform.HInterID,
+ HBillType: this.hform.HBillType,
+ HBarCode: HBarCodeOld,
+ HQty: HQtyOld
+ }
+ })
+
+ let {
+ Message,
+ count
+ } = res.data
+
+ if (count == 1) {
+ this.DisBillEntryList()
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鏇存柊鏉＄爜鏁伴噺澶辫触: ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鏇存柊鏉＄爜鏁伴噺澶辫触: ${err}`
+ })
+ }
+
},
// 鑾峰彇浠撲綅
async getStockPlaceRemote(HSPGroupID) {
@@ -354,7 +378,7 @@
Organization: uni.getStorageSync('Organization')
},
})
-
+
if (res.data.count == 1) {
this.HStockPlaceNameList = res.data.data
for (var i = 0; i < res.data.data.length; i++) {
@@ -366,7 +390,7 @@
icon: 'none'
})
}
-
+
} catch (err) {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
@@ -389,9 +413,9 @@
Organization: uni.getStorageSync('Organization')
},
})
-
+
if (res.data.count == 1) {
-
+
this.hform.HStockPlaceID = res.data.data[0].HMainID
this.hform.HStockPlaceName = res.data.data[0].浠撲綅鍚嶇О
this.hform.HWHID = res.data.data[0].HWHID
@@ -402,7 +426,7 @@
icon: 'none'
})
}
-
+
} catch (err) {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
@@ -569,51 +593,6 @@
icon: 'none'
})
}
- // uni.request({
- // url: this.serverUrl + '/WEBSController/get_BillBarCode_BillCheck_Json',
- // data: {
- // HBillNo: this.hform.HBillNo,
- // HBillType: this.hform.HBillType,
- // HMaker: this.hform.HMaker,
- // HStockOrgID: this.hform.HStockOrgID
- // },
- // success: (res) => {
- // if (res.data.count == 1) {
- // CommonUtils.playSound(1)
- // var data = res.data.data
- // console.log(data)
- // this.hform.HInterID = data.hInterIDField
- // this.hform.HBillNo = data.hBillNoField
- // this.showHBillNo = false
- // //鏉＄爜鏍稿鏍囪
- // if (data.hSourceBarCodeFlagField) {
- // this.hform.HSourceBarCodeCtl = "Y"
- // this.hform.chkHBarflag = true
- // this.hform.HBarflag = data
- // }
- // this.tabs = 2
- // this.DisBillEntryList();
- // this.refreshHBarCodeFocus()
- // } else {
- // CommonUtils.playSound(0)
- // this.refreshHBillNoFocus()
- // uni.showToast({
- // title: res.data.Message,
- // icon: 'none'
- // })
- // this.hform.HBillNo = ''
- // }
- // },
- // fail: (res) => {
- // console.log(res);
- // CommonUtils.playSound(0)
- // this.refreshHBillNoFocus()
- // uni.showToast({
- // title: '鎺ュ彛璇锋眰澶辫触',
- // icon: 'none'
- // })
- // },
- // });
},
//鍩虹浠撳簱璧勬枡
getHBaseList() {
@@ -681,14 +660,14 @@
// var name = e.split("(")
for (var i = 0; i < this.HWHNameList.length; i++) {
if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
- this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
- this.hform.HWHID = this.HWHNameList[i].HItemID
- this.HStockPlaceNameChange(null)
- this.showHStockPlaceName = false
- if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
- this.showHStockPlaceName = true
- this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"])
- }
+ this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+ this.hform.HWHID = this.HWHNameList[i].HItemID
+ this.HStockPlaceNameChange(null)
+ this.showHStockPlaceName = false
+ if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
+ this.showHStockPlaceName = true
+ this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"])
+ }
}
}
},
@@ -696,7 +675,7 @@
HStockPlaceNameChange(e) {
for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
- console.log('e: ',this.HStockPlaceNameList[i]);
+ console.log('e: ', this.HStockPlaceNameList[i]);
this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
}
@@ -714,8 +693,8 @@
if (!this.hform.HStockPlaceName) {
this.hform.HStockPlaceID = 0
}
-
- console.log('HBarCode: ',HBarCode);
+
+ console.log('HBarCode: ', HBarCode);
var sOldBarCode = HBarCode
var HDeleteFlag = sOldBarCode.substring(0, 1);
var sBarCode = sOldBarCode.slice(1);
@@ -921,10 +900,10 @@
})
}
- if(exit){
+ if (exit) {
return
}
-
+
if (!this.hform.HSourceBillNo) {
this.hform.HSupName = data.hSupNameField
this.hform.HSupID = data.hSupIDField
@@ -1554,6 +1533,7 @@
margin-top: 30rpx;
float: right;
}
+
.btn-a {
background-color: #3A78FF;
color: #fff;
diff --git a/utils/common.js b/utils/common.js
index 25f2f50..f52d462 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -340,18 +340,22 @@
})
})
}
- //娌℃湁娣诲姞閿佺殑寮傛鏌ヨ
+ //娌℃湁娣诲姞閿佺殑寮傛鏌ヨ
async doRequest2Async({
url,
data,
method,
+ showLoading = true,
}) {
return new Promise((resolve, reject) => {
// that = that || this;
let errorTip = null;
- uni.showLoading({
- title: '鍔犺浇涓�...'
- })
+ if (showLoading) {
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ })
+ }
+
uni.request({
method: method || "GET",
url: this.serverUrl + url,
@@ -363,7 +367,9 @@
reject(err)
},
complete: () => {
- uni.hideLoading()
+ if (showLoading) {
+ uni.hideLoading()
+ }
}
})
})
@@ -395,7 +401,7 @@
console.log('鎾斁鏆傚仠锛岄攢姣�');
innerAudioContext.destroy();
});
-
+
}
// playSound(e) {
// // 鍏ㄥ眬缁存姢涓�涓煶棰戝疄渚嬶紝闃叉缂撳瓨婧㈠嚭
@@ -459,28 +465,32 @@
return handler(key, match);
});
}
-
- fieldListFilterRole({FieldList, ExcludeKeys = [] ,RoleList = null}) {
- if(!RoleList) {
+
+ fieldListFilterRole({
+ FieldList,
+ ExcludeKeys = [],
+ RoleList = null
+ }) {
+ if (!RoleList) {
RoleList = [
/^[a-zA-Z]+$/,
/id$/i
]
}
- if(!Array.isArray(RoleList)){
+ if (!Array.isArray(RoleList)) {
return {
status: false,
data: null,
Message: "杩囨护瀛楁鍒楄〃澶辫触锛岃鍒欏繀椤绘槸鏁扮粍銆�"
}
}
-
+
let FieldListCache = Array(...FieldList)
-
+
RoleList.forEach(role => {
FieldListCache = FieldListCache.filter(elem => !role.test(elem.ColmCols))
})
-
+
FieldListCache = FieldListCache.filter(elem => !ExcludeKeys.includes(elem.ColmCols))
return {
status: true,
@@ -488,34 +498,34 @@
Message: ""
}
}
-
- emptyValueFilter(item, fieldList){
+
+ emptyValueFilter(item, fieldList) {
return fieldList.filter(e => {
return item[e.ColmCols]
})
}
-
- httpFormatWs(httpUrl=this.serverUrl) {
- if(httpUrl.indexOf("http://") === 0){
+
+ httpFormatWs(httpUrl = this.serverUrl) {
+ if (httpUrl.indexOf("http://") === 0) {
httpUrl = httpUrl.replace("http://", "")
httpUrl = httpUrl.substring(0, httpUrl.length - 1)
let BackSlashLast = httpUrl.lastIndexOf('/')
httpUrl = httpUrl.substring(0, BackSlashLast)
- httpUrl = "ws://" + httpUrl.split(":")[0]+":12345/ws"
- }else if(httpUrl.indexOf("https://") === 0) {
+ httpUrl = "ws://" + httpUrl.split(":")[0] + ":12345/ws"
+ } else if (httpUrl.indexOf("https://") === 0) {
httpUrl = httpUrl.replace("https://", "")
httpUrl = httpUrl.substring(0, httpUrl.length - 1)
let BackSlashLast = httpUrl.lastIndexOf('/')
httpUrl = httpUrl.substring(0, BackSlashLast)
- httpUrl = "wss://" + httpUrl.split(":")[0]+":12345/ws"
- }else{
+ httpUrl = "wss://" + httpUrl.split(":")[0] + ":12345/ws"
+ } else {
// 鎻愮ず浼犲叆杩炴帴閿欒
}
-
+
return httpUrl
}
-
-
+
+
}
export const CommonUtils = new commonUtils()
\ No newline at end of file
diff --git a/utils/menuListApp.js b/utils/menuListApp.js
index e176ca5..9973125 100644
--- a/utils/menuListApp.js
+++ b/utils/menuListApp.js
@@ -31,10 +31,10 @@
// })
resolve(data)
} else {
- uni.showToast({
- icon: 'none',
- Message: Message
- })
+ // uni.showToast({
+ // icon: 'none',
+ // Message: Message
+ // })
reject()
}
}
--
Gitblit v1.9.1