From 920675a9f1ccf311d32e6466ebde737dff765645 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 23 一月 2026 09:15:00 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/EmployeeRecords/EmployeeRecordsBill.vue | 186 ++++++++++++++--------------------------------
1 files changed, 58 insertions(+), 128 deletions(-)
diff --git a/pages/EmployeeRecords/EmployeeRecordsBill.vue b/pages/EmployeeRecords/EmployeeRecordsBill.vue
index e6f179a..cd8a79f 100644
--- a/pages/EmployeeRecords/EmployeeRecordsBill.vue
+++ b/pages/EmployeeRecords/EmployeeRecordsBill.vue
@@ -40,28 +40,28 @@
<view class="form-item">
<view class="title">鐝粍:</view>
<view class="right">
- <uni-combox :candidates="arrayHGroupName" placeholder="璇烽�夋嫨杞﹂棿" v-model="hform.HGroupName"
+ <uni-combox :candidates="arrayHGroupName" placeholder="璇烽�夋嫨鐝粍" v-model="hform.HGroupName"
@input="HGroupNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">鐝:</view>
<view class="right">
- <uni-combox :candidates="arrayHShiftsName" placeholder="璇烽�夋嫨杞﹂棿" v-model="hform.HShiftsName"
+ <uni-combox :candidates="arrayHShiftsName" placeholder="璇烽�夋嫨鐝" v-model="hform.HShiftsName"
@input="HShiftsNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">鐢熶骇璧勬簮:</view>
<view class="right">
- <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨杞﹂棿" v-model="hform.HSourceName"
+ <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
@input="HSourceNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">宸ュ簭:</view>
<view class="right">
- <uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨杞﹂棿" v-model="hform.HProcName"
+ <uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨宸ュ簭" v-model="hform.HProcName"
@input="HProcNameChange"></uni-combox>
</view>
</view>
@@ -344,14 +344,8 @@
}
],
selectedRows: [], // 瀛樺偍閫変腑鐨勬暟鎹�
- HModName: "Sc_PackUnionBill_Packing_PDA",
- ModRightName: "CE_PackUnionBill_Packing", //妯″潡鏉冮檺鍙傛暟
titleData: [], //涓嶉渶瑕佹樉绀虹殑瀛楁
- OperationType: 1, //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
- //钃濈墮鐩稿叧淇℃伅
- printInfo: "", //鎵撳嵃鍐呭
- maskShow: false, //钃濈墮鎵撳嵃鏈烘樉绀虹粦瀹�
- printListData: [], //
+ OperationType: 1, //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩�
//灞曠ず琛ㄥ崟
showResultTable: false, // 鎺у埗缁撴灉琛ㄦ牸鏄剧ず
resultTableData: [], // 缁撴灉琛ㄦ牸鏁版嵁
@@ -432,24 +426,7 @@
HMaterModel: '',
HRoles: [],
},
- roleOptions: [],
- // [{
- // value: '鐝粍闀�',
- // text: '鐝粍闀�'
- // },
- // {
- // value: '鐝憳',
- // text: '鐝憳'
- // },
- // {
- // value: '鏈轰慨宸�',
- // text: '鏈轰慨宸�'
- // },
- // {
- // value: '鎿嶄綔宸�',
- // text: '鎿嶄綔宸�'
- // }
- // ],
+ roleOptions: [],
// 鍒嗛〉妯″潡鍏冩暟鎹�
paginationMeta: {
@@ -784,106 +761,60 @@
},
GetMeesageByBarCode(HBarCode) {
- // 鑾峰彇寰呯粍鎵樻潯鐮佸搴旂殑鏁版嵁
- let sOldBarCode = this.HBarCode
- let HDeleteFlag = sOldBarCode.substring(0, 1)
- let sBarCode = sOldBarCode.slice(1)
- if (HDeleteFlag == '*') {
- if (!sBarCode) {
- return uni.showToast({
- icon: 'none',
- title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
- })
- } else {
- this.HBarCodeFocusRefresh()
- }
- CommonUtils.doRequest2({
- url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
- data: {
- "HInterID": this.hform.HInterID,
- "HBarCode": sBarCode,
- "HBillType": this.HBillType
- },
- resFunction: (res) => {
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- CommonUtils.playSound(1)
- //this.DisBillEntryList()
- } else {
- CommonUtils.playSound(0)
- uni.showToast({
- icon: 'none',
- title: Message
- })
- }
- }
- })
- } else {
- let sBarCode = this.HBarCode
- if (!sBarCode) {
- return uni.showToast({
- icon: 'none',
- title: '鏉＄爜涓嶈兘涓虹┖锛岃鎵弿鏉＄爜锛�',
- })
- }
- CommonUtils.doRequest2({
- url: '/Sc_EmployeeSignInNoteBillController/APP_Edit_json',
- data: {
- "HInterID": this.hform.HInterID,
- "HBarCode": sBarCode,
- },
-
- resFunction: (res) => {
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- CommonUtils.playSound(1)
- //let data=res.data
- console.log(sBarCode)
- console.log(res.data.data[0])
- console.log(res.data[1])
- debugger
- this.hform.HMouldID = data[0][0].妯″叿id
- console.log("idwei", data[0][0].妯″叿id)
- this.hform.HMouldNo = data[0][0].妯″叿缂栫爜
- this.hform.HMouldName = data[0][0].妯″叿鍚嶇О
- this.hform.HMouldState = data[0][0].妯″叿鐘舵��
- this.listData = []
- let tabledata = data[1][0]
- if (data[1].length > 0) {
- this.hform.HEquipID = tabledata.璁惧鍐呯爜
- this.hform.HEquipName = tabledata.璁惧鍚嶇О
- //
- //this.hform.HSourceID = tabledata.HSourceID
- this.hform.HMaterID = tabledata.HMaterID
- //this.hform.HProcID = tabledata.HSourceInterID
- for (let i = 0; i < data[1].length; i++) {
- this.listData.push(Object.assign(data[1][i], {
- index: i
- }))
- }
- }
-
-
- } else {
- CommonUtils.playSound(0)
- this.listData = []
- this.HBarCodeFocusRefresh()
- uni.showToast({
- icon: 'none',
- title: Message
- })
- }
- }
+ let sBarCode = this.HBarCode
+ if (!sBarCode) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鏉＄爜涓嶈兘涓虹┖锛岃鎵弿鏉＄爜锛�',
})
}
+ CommonUtils.doRequest2({
+ url: '/Sc_EmployeeSignInNoteBillController/APP_Edit_json',
+ data: {
+ "HInterID": this.hform.HInterID,
+ "HBarCode": sBarCode,
+ },
+
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ //let data=res.data
+ console.log(sBarCode)
+ console.log(res.data.data[0])
+ console.log(res.data[1])
+ this.hform.HMouldID = data[0][0].妯″叿id
+ this.hform.HMouldNo = data[0][0].妯″叿缂栫爜
+ this.hform.HMouldName = data[0][0].妯″叿鍚嶇О
+ this.hform.HMouldState = data[0][0].妯″叿鐘舵��
+ this.listData = []
+ let tabledata = data[1][0]
+ if (data[1].length > 0) {
+ this.hform.HEquipID = tabledata.璁惧鍐呯爜
+ this.hform.HEquipName = tabledata.璁惧鍚嶇О
+ this.hform.HMaterID = tabledata.HMaterID
+ for (let i = 0; i < data[1].length; i++) {
+ this.listData.push(Object.assign(data[1][i], {
+ index: i
+ }))
+ }
+ }
+
+
+ } else {
+ CommonUtils.playSound(0)
+ this.listData = []
+ this.HBarCodeFocusRefresh()
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
},
onRoleChange(e) {
console.log('閫変腑鐨勮鑹�:', this.hform.HRoles);
@@ -903,7 +834,6 @@
"HBillType": this.HBillType
},
resFunction: (d) => {
- console.log('d: ', d);
let {
count,
data,
--
Gitblit v1.9.1