From 96a8728645134ac212762daffc16ceceea710e0a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 07 八月 2025 09:03:45 +0800
Subject: [PATCH] 合并前保存
---
pages/weiwaigxOut/form.vue | 7 ++++++-
pages/gongxuIn/table.vue | 2 +-
pages/shengchanbuliaojiaoyan/form.vue | 5 +++--
pages/gongxuOut/table.vue | 2 +-
pages/gongxuOut/form.vue | 14 ++++++++++++--
pages/shengchanlingliao/form.vue | 19 +++++++++++--------
6 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/pages/gongxuIn/table.vue b/pages/gongxuIn/table.vue
index 67eb761..962f3be 100644
--- a/pages/gongxuIn/table.vue
+++ b/pages/gongxuIn/table.vue
@@ -273,7 +273,7 @@
url: this.serverUrl + '/Cj_StationInBill/get_Display',
data:{
sWhere: this.sWhere,
- user: uni.getStorageSync('HUserName'),
+ user: this.userInfo['Czymc'],
HBillSubType:'3790',
},
success: (res) => {
diff --git a/pages/gongxuOut/form.vue b/pages/gongxuOut/form.vue
index 4a5ff93..e9f36fa 100644
--- a/pages/gongxuOut/form.vue
+++ b/pages/gongxuOut/form.vue
@@ -180,6 +180,12 @@
<input v-model="hform.HPRDOrg" disabled />
</view>
</view>
+ <view class="form-item">
+ <view class="title">娆惧彿:</view>
+ <view class="righton">
+ <input v-model="hform.HStyleNumber" disabled />
+ </view>
+ </view>
<!--
@@ -585,6 +591,8 @@
// HCloseDate:'',
HDeleteMan: '',
HDeleteDate: '',
+
+ HStyleNumber: '', // 娆惧彿
eventType: 'Add',
}
@@ -1307,7 +1315,8 @@
this.hform.HCenterName = data.宸ヤ綔涓績
this.hform.HCenterID = data.HCenterID
this.hform.NoOutboundHqty = (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
-
+ this.hform.HStyleNumber = data['娆惧彿']
+
if (e) {
this.getHProcNoData(this.hform.HBarCode, this.hform.HProcNo)
}
@@ -1347,7 +1356,8 @@
this.hform.HNotReportQty = data['鏈姤宸ユ暟閲�']
this.hform.HProcNumber = data['宸ュ簭浠ｇ爜']
this.hform.HIsTimeFlag = data['鏄惁璁℃椂'] ? 1 : 0
- // this.hform.HQty = data.鍚堟牸鏁伴噺
+ this.hform.HStyleNumber = data['娆惧彿']
+ // this.hform.HQty = data.鍚堟牸鏁伴噺
if (data.棣栭亾宸ュ簭 == "鏄�") {
this.FirstEndHProcNo = 1
}
diff --git a/pages/gongxuOut/table.vue b/pages/gongxuOut/table.vue
index a077d99..e58f088 100644
--- a/pages/gongxuOut/table.vue
+++ b/pages/gongxuOut/table.vue
@@ -287,7 +287,7 @@
return newList
},
getList(){
- this.sWhere += ` and 鍒跺崟浜� like N'%${this.userInfo.Czymc}'`
+ // this.sWhere += ` and 鍒跺崟浜� like N'%${this.userInfo.Czymc}'`
uni.showLoading({
title:'鍔犺浇涓�...'
})
diff --git a/pages/shengchanbuliaojiaoyan/form.vue b/pages/shengchanbuliaojiaoyan/form.vue
index 5b3d0b1..e04cee5 100644
--- a/pages/shengchanbuliaojiaoyan/form.vue
+++ b/pages/shengchanbuliaojiaoyan/form.vue
@@ -226,7 +226,7 @@
HMaker: uni.getStorageSync('HUserName'),
HStockOrgName: uni.getStorageSync('Organization'),
HStockOrgID: uni.getStorageSync('OrganizationID'),
- HSourceBarCodeCtl: "N", //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
+ HSourceBarCodeCtl: "Y", //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
chkHBarflag: false,
HBarflag: 'Y',
@@ -762,7 +762,8 @@
title: '娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
icon: 'none'
})
- } else {
+ } else
+ {
uni.showLoading({
title: '璇风◢鍊�'
})
diff --git a/pages/shengchanlingliao/form.vue b/pages/shengchanlingliao/form.vue
index 4ee6a5c..deb06d8 100644
--- a/pages/shengchanlingliao/form.vue
+++ b/pages/shengchanlingliao/form.vue
@@ -687,24 +687,27 @@
title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
icon: 'none'
})
- } else if (!this.Materlist || this.Materlist.length == 0) {
+ }
+ else if (!this.Materlist || this.Materlist.length == 0) {
uni.showToast({
title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
icon: 'none'
})
- } else {
+ }
+ else {
var s = 0;
for (var i = 0; i < this.Materlist.length; i++) {
if (this.Materlist[i].鏁伴噺 > 0) {
s = 1;
}
}
- if (s == 0) {
- uni.showToast({
- title: '娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
- icon: 'none'
- })
- } else {
+ // if (s == 0) {
+ // uni.showToast({
+ // title: '娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+ // icon: 'none'
+ // })
+ // } else
+ {
uni.showLoading({
title: '璇风◢鍊�'
})
diff --git a/pages/weiwaigxOut/form.vue b/pages/weiwaigxOut/form.vue
index bc13113..4244e9d 100644
--- a/pages/weiwaigxOut/form.vue
+++ b/pages/weiwaigxOut/form.vue
@@ -66,7 +66,7 @@
</view>
</view>
<view class="form-item">
- <view class="title">閮ㄩ棬:</view>
+ <view class="title"><text>*</text>閮ㄩ棬:</view>
<view class="right">
<uni-combox :candidates="arrayHDept" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDept"
@input="HHDeptChange"></uni-combox>
@@ -1083,6 +1083,11 @@
title: '璇烽�夋嫨渚涘簲鍟�',
icon: 'none'
})
+ }else if (!this.hform.HDeptID) {
+ uni.showToast({
+ title: '璇烽�夋嫨閮ㄩ棬',
+ icon: 'none'
+ })
} else if (!this.hform.HEmpName) {
uni.showToast({
title: '璇烽�夋嫨鎿嶄綔鍛�',
--
Gitblit v1.9.1