From 28328db7ef0b0270e9e94b6a11b32cb5f9bdac88 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 06 二月 2026 13:44:07 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue | 116 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 66 insertions(+), 50 deletions(-)
diff --git a/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue b/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
index 5a747c3..ed139b6 100644
--- a/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
+++ b/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
@@ -14,18 +14,18 @@
@confirm="getHBarCodeData(hform.HBarCode)" />
</view>
<uni-icons type="scan"
- style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;flex-shrink: 0;"
- size="20" @click="toScanCode"></uni-icons>
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;flex-shrink: 0;"
+ size="20" @click="toScanCode"></uni-icons>
</view>
- <view class="form-item" @click="searchModule">
- <view class="title">鍣ㄥ叿</view>
- <view class="righton" style="width: 350rpx;">
- <input placeholder="璇烽�夋嫨鍣ㄥ叿" />
- </view>
- <uni-icons type="search"
- style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
- size="20" ></uni-icons>
- </view>
+ <view class="form-item" @click="searchModule">
+ <view class="title">鍣ㄥ叿</view>
+ <view class="righton" style="width: 350rpx;">
+ <input placeholder="璇烽�夋嫨鍣ㄥ叿" />
+ </view>
+ <uni-icons type="search"
+ style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+ size="20"></uni-icons>
+ </view>
<view class="form-item">
<view class="title">鏁呴殰鍙戠敓鏃ユ湡</view>
@@ -84,9 +84,9 @@
</view>
</view>
<view class="form-item">
- <view class="title required">璐熻矗浜�</view>
+ <view class="title required">楠屾敹浜�</view>
<view class="right">
- <uni-combox :candidates="EmpNameList" placeholder="璇烽�夋嫨璐熻矗浜�" v-model="hform.HManagerName"
+ <uni-combox :candidates="EmpNameList" placeholder="璇烽�夋嫨楠屾敹浜�" v-model="hform.HManagerName"
@input="ManagerChange"></uni-combox>
</view>
</view>
@@ -180,7 +180,9 @@
CommonUtils
} from '../../../utils/common';
import dayjs from 'dayjs';
- import { MpaasScan } from '../../../utils/mpaasScan';
+ import {
+ MpaasScan
+ } from '../../../utils/mpaasScan';
export default {
data() {
return {
@@ -190,7 +192,7 @@
serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
HModName: 'Kf_POStockInBackBill_PDA',
ModRightName: 'CE_POStockInBack',
- OperationType: 1,
+ operationType: 1,
HInterID_Temp: '',
showHStockPlaceName: false,
@@ -229,7 +231,7 @@
// 鎻愪氦鏁版嵁
hform: {
"HBarCode": "",
- "HConkBeginDate": dayjs(new Date()).format("YYYY-MM-DD hh:mm:ss"),
+ "HConkBeginDate": dayjs(new Date()).format("YYYY-MM-DD"),
"HConkTypeName": "",
"HConkTypeID": "0",
"HConkReasonName": "",
@@ -237,7 +239,7 @@
"HExplanation": "",
"HBillNo": "",
"HInterID": "0",
- "HDate": dayjs(new Date()).format("YYYY-MM-DD hh:mm:ss"),
+ "HDate": dayjs(new Date()).format("YYYY-MM-DD"),
"HDeptName": getUserInfo()["HDeptName"],
"HDeptID": getUserInfo()["HDeptID"],
"HEmpName": getUserInfo().HEmpName,
@@ -249,7 +251,7 @@
"HBarSpec": "",
"HBarModel": "",
"HMaker": getUserInfo()["Czymc"],
- "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD hh:mm:ss"),
+ "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD"),
"HUpDater": "",
"HUpDateDate": "",
"HChecker": "",
@@ -269,8 +271,8 @@
},
async onLoad(e) {
console.log(e, this.userInfo)
- this.OperationType = e.OperationType || 1
- if(operationType == 1) {
+ this.operationType = e.operationType || 1
+ if (this.operationType == 1) {
if (e.HInterID) {
this.HInterID_Temp = e.HInterID
this.RoadBillMain(e.HInterID)
@@ -280,31 +282,35 @@
this.HSourceBillNoFocus = true
this.refreshBarCodeState()
}
-
- }else if(operationType == 5) {
+
+ } else if (this.operationType == 5) {
// 鍗曟嵁涓嬫帹
- let {HSourceBillType, HInterID, HBillNo} = e
+ let {
+ HSourceBillType,
+ HInterID,
+ HBillNo,
+ } = e
this.getMaxNum()
this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
}
-
+
this.InitConkType()
this.InitConkReason()
this.InitDept()
this.InitEmp()
},
methods: {
- searchModule() {
- this.$refs['billListMould'].showPopup()
- },
- MouldBillHandler(mould) {
- if(!mould.enableMultiSourceBill){
- let val = mould.val[0]
- this.hform.HBarCode = val['鏉＄爜缂栧彿']
- this.getHBarCodeData(this.hform.HBarCode)
- }
- this.$refs['billListMould'].exit()
- },
+ searchModule() {
+ this.$refs['billListMould'].showPopup()
+ },
+ MouldBillHandler(mould) {
+ if (!mould.enableMultiSourceBill) {
+ let val = mould.val[0]
+ this.hform.HBarCode = val['鏉＄爜缂栧彿']
+ this.getHBarCodeData(this.hform.HBarCode)
+ }
+ this.$refs['billListMould'].exit()
+ },
// 鏁呴殰绫诲埆
async InitConkType() { // 鍒濆鍖栨晠闅滅被鍒�
try {
@@ -590,11 +596,11 @@
}
},
-
+
// 鏂板鍥炶皟
addNew() {
uni.redirectTo({
- url: '/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill?OperationType=1'
+ url: '/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill?operationType=1'
})
},
//鏂板
@@ -624,7 +630,7 @@
})
},
});
- },
+ },
checkBillValidate() {
let message = ''
@@ -636,7 +642,7 @@
message = '鏈～鍐欓儴闂�'
} else if (!this.hform.HEmpName) {
message = '鏈～鍐欏彂鐜颁汉'
- }
+ }
if (!message) {
return true
}
@@ -688,12 +694,12 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: '/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill?OperationType=1'
+ url: '/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill?operationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
setTimeout(() => {
- uni.navigateBack();
+ uni.navigateBack();
}, 50)
}
}
@@ -730,18 +736,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 = '鍣ㄥ叿鏁呴殰鐧昏鍗�'
@@ -754,15 +765,20 @@
this.hform.HMouldName = data1.浜у搧妯″叿
this.hform.HMouldModel = data1.浜у搧妯″叿鍨嬪彿
this.hform.HMouldSpec = data1.浜у搧妯″叿瑙勬牸
- }
- else {
+
+
+ } else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
message: `鑾峰彇婧愬崟澶辫触: ${Message}`
})
}
+
+
}
- }
+ },
+
+
}
}
</script>
--
Gitblit v1.9.1