From 2cf4a63a3d1ee8f568dc8399d478790e6f197d9e Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 13 八月 2025 09:32:28 +0800
Subject: [PATCH] 委外出站发出接收，出站汇报测试完善
---
pages/weiwaigxOut/form.vue | 35 ++++++++++++-----
manifest.json | 4 +-
pages/weiwaigxIn/form.vue | 35 ++++++++++++++++-
pages/gongxuOut/form.vue | 4 +
pages/weiwaigxIn/table.vue | 16 +++++---
5 files changed, 72 insertions(+), 22 deletions(-)
diff --git a/manifest.json b/manifest.json
index 7ddda07..649ccb6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "1.0.49",
- "versionCode" : 149,
+ "versionName" : "1.0.51",
+ "versionCode" : 151,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/gongxuOut/form.vue b/pages/gongxuOut/form.vue
index 4e284de..912c374 100644
--- a/pages/gongxuOut/form.vue
+++ b/pages/gongxuOut/form.vue
@@ -14,7 +14,7 @@
<view class="title"><text>*</text>娴佹按鍙�:</view>
<view class="right" style="width: 380rpx;">
<input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�"
- @confirm="getHProcNoData(hform.HBarCode,hform.HProcNo)" />
+ @blur="getHProcNoData(hform.HBarCode,hform.HProcNo)" />
</view>
<uni-icons type="scan"
style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
@@ -661,6 +661,8 @@
if(detail.value[0]){
this.getNewHRelBeginDate()
this.hform.HRelEndTime = getDateTime.dateTimeStr('y-m-d h:i');
+ }else{
+ this.hform.HWorkTimes = 0;
}
},
//閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
diff --git a/pages/weiwaigxIn/form.vue b/pages/weiwaigxIn/form.vue
index f3ea476..5706239 100644
--- a/pages/weiwaigxIn/form.vue
+++ b/pages/weiwaigxIn/form.vue
@@ -4,16 +4,28 @@
<view class="form-item">
<view class="title"><text>*</text>鏉″舰鐮�:</view>
<view class="right" style="width: 380rpx;">
- <input v-model="hform.HBarCode" disabled placeholder="璇锋壂鎻忔潯鐮�"/>
+ <input v-model="hform.HBarCode" placeholder="璇锋壂鎻忔潯鐮�" @confirm="toInCode(e)"/>
</view>
<uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
</view>
<view class="form-item">
<view class="title"><text>*</text>娴佹按鍙�:</view>
<view class="right" style="width: 380rpx;">
- <input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�" @confirm="getHProcNoData(hform.HBarCode,hform.HProcNo)"/>
+ <input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�" @blur="getHProcNoData(hform.HBarCode,hform.HProcNo)"/>
</view>
<uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanProcNo"></uni-icons>
+ </view>
+ <view class="form-item">
+ <view class="title">宸ュ簭缂栫爜:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HProcNumber" placeholder="璇疯緭鍏ュ伐搴忕紪鐮�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏈彂鍑烘暟閲�:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HNotReportQty" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" />
+ </view>
</view>
<view class="form-item">
<view class="title"><text>*</text>鍙戝嚭鏁伴噺:</view>
@@ -324,6 +336,8 @@
HBillNo:'',
HBarCode:'',
HProcNo:'',
+ HProcNumber: '',
+ HNotReportQty: 0,
HQty:'',
HEmpName:'',
HEmpID:'',
@@ -460,6 +474,18 @@
this.getHBarCodeData(ret.resp_result)
}
})
+ },
+ toInCode(e) {
+ var str = this.hform.HBarCode
+ if (str.includes('@')) {
+ const parts = str.split('@');
+ this.hform.HBarCode = parts[0]
+ this.hform.HProcNo = parts[1]
+ this.getHBarCodeData(parts[0], 1)
+ // this.getHProcNoData(parts[0],parts[1])
+ } else {
+ this.getHBarCodeData(this.hform.HBarCode)
+ }
},
//鎵祦姘村彿
toScanProcNo(){
@@ -804,6 +830,8 @@
this.hform.HProcID= data.HProcID
this.hform.HCenterName= data.宸ヤ綔涓績
this.hform.HCenterID= data.HCenterID
+ this.hform.HNotReportQty = data['鏈彂鍑烘暟閲�']
+ this.hform.HProcNumber = data['宸ュ簭浠ｇ爜']
if(!this.hform.HSupName){
this.hform.HSupName= data.渚涘簲鍟�
this.hform.HSupID= data.HSupID
@@ -851,6 +879,9 @@
});
},
submit() {
+ //鍘婚櫎鍒嗗彿浠ュ厤鍚庣鍒嗚В鎶ラ敊
+ this.hform.HMaterName= this.hform.HMaterName.replace(/;/g, '');
+ this.hform.HMaterModel = this.hform.HMaterModel.replace(/;/g, '');
if(!this.hform.HBarCode){
uni.showToast({
title:'璇锋壂鎻忚澶囨潯褰㈢爜',
diff --git a/pages/weiwaigxIn/table.vue b/pages/weiwaigxIn/table.vue
index 44df963..0f8f436 100644
--- a/pages/weiwaigxIn/table.vue
+++ b/pages/weiwaigxIn/table.vue
@@ -171,7 +171,7 @@
<view class="op" v-if="operations == index">
<!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
<button class="op2" size="mini" plain @tap.stop="antiCheck(item)">鍙嶅鏍�</button> -->
- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
+ <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="false">缂栬緫</button>
<button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
@@ -195,7 +195,7 @@
arrayStatus:['鍏ㄩ儴','鏈鏍�','宸插鏍�','宸插叧闂�'],
hform:{
HStatus:'鍏ㄩ儴',
- HBeginDate:'',
+ HBeginDate:new Date().toISOString().split('T')[0],
HEndDate:'',
HICMOBillNo:'',
HBillNo:'',
@@ -236,6 +236,7 @@
return newList
},
getList(){
+ this.sWhere += ` and 鍒跺崟浜� like N'%${this.userInfo.Czymc}'`
// console.log(this.sWhere)
uni.showLoading({
title:'鍔犺浇涓�...'
@@ -307,11 +308,11 @@
this.sWhere += " and 鍏抽棴浜�<>''";
}
}
- if (this.hform.BenginHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+ if (this.hform.HBeginDate) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HBeginDate + "'";
}
- if (this.hform.EndHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
+ if (this.hform.HEndDate) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HEndDate + "'";
}
if (this.hform.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
@@ -428,6 +429,9 @@
width: 640rpx;
margin: 20rpx auto;
}
+ picker input{
+ pointer-events: none;
+ }
.other{
margin-top: 8rpx;
text-align: center;
diff --git a/pages/weiwaigxOut/form.vue b/pages/weiwaigxOut/form.vue
index 3861e51..e3b8ba4 100644
--- a/pages/weiwaigxOut/form.vue
+++ b/pages/weiwaigxOut/form.vue
@@ -14,11 +14,17 @@
<view class="title"><text>*</text>娴佹按鍙�:</view>
<view class="right" style="width: 380rpx;">
<input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�"
- @confirm="getHProcNoData(hform.HBarCode,hform.HProcNo)" />
+ @blur="getHProcNoData(hform.HBarCode,hform.HProcNo)" />
</view>
<uni-icons type="scan"
style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
size="20" @click="toScanProcNo"></uni-icons>
+ </view>
+ <view class="form-item">
+ <view class="title">宸ュ簭缂栫爜:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HProcNumber" placeholder="璇疯緭鍏ュ伐搴忕紪鐮�" />
+ </view>
</view>
<view class="form-item">
<view class="title">鏈姤宸ユ暟閲�:</view>
@@ -58,7 +64,7 @@
@input="HEmpNameChange"></uni-combox>
</view>
</view>
- <view class="form-item">
+ <!-- <view class="form-item">
<view class="title">宸ュ簭:</view>
<view class="right">
<uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨宸ュ簭" v-model="hform.HProcName"
@@ -71,7 +77,7 @@
<uni-combox :candidates="arrayHDept" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDept"
@input="HHDeptChange"></uni-combox>
</view>
- </view>
+ </view> -->
<view class="form-item">
<view class="title">閫佽揣鍗曞彿:</view>
<view class="right">
@@ -407,6 +413,7 @@
HNotReportQty: 0,
HQty: 0,
HPieceQty: 0,
+ HProcNumber: '',
HWasterQty: 0,
HEmpName: '',
HEmpID: 0,
@@ -494,8 +501,8 @@
this.getHProcList()
this.getHSupList()
this.getHEmpList()
- this.getHProcList()
- this.getHDeptList()
+ //this.getHProcList()
+ //this.getHDeptList()
this.getDefValByUser()
@@ -1014,6 +1021,7 @@
this.hform.HCenterName = data.宸ヤ綔涓績
this.hform.HCenterID = data.HCenterID
this.hform.HNotReportQty = data['鏈姤宸ユ暟閲�']
+ this.hform.HProcNumber = data['宸ュ簭浠ｇ爜']
if (!this.hform.HSupName) {
this.hform.HSupName = data.渚涘簲鍟�
this.hform.HSupID = data.HSupID
@@ -1068,6 +1076,9 @@
})
},
submit() {
+ //鍘婚櫎鍒嗗彿浠ュ厤鍚庣鍒嗚В鎶ラ敊
+ this.hform.HMaterName= this.hform.HMaterName.replace(/;/g, '');
+ this.hform.HMaterModel = this.hform.HMaterModel.replace(/;/g, '');
if (!this.hform.HBarCode) {
uni.showToast({
title: '璇锋壂鎻忚澶囨潯褰㈢爜',
@@ -1083,12 +1094,14 @@
title: '璇烽�夋嫨渚涘簲鍟�',
icon: 'none'
})
- }else if (!this.hform.HDeptID) {
- uni.showToast({
- title: '璇烽�夋嫨閮ㄩ棬',
- icon: 'none'
- })
- } else if (!this.hform.HEmpName) {
+ }
+ // else if (!this.hform.HDeptID) {
+ // uni.showToast({
+ // title: '璇烽�夋嫨閮ㄩ棬',
+ // icon: 'none'
+ // })
+ // }
+ else if (!this.hform.HEmpName) {
uni.showToast({
title: '璇烽�夋嫨鎿嶄綔鍛�',
icon: 'none'
--
Gitblit v1.9.1