From 07eba43f0a3f61192bf6ded1cd89a4b941d05459 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 29 七月 2025 09:49:06 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/gongxuIn/form.vue | 31 +++++++---
pages/weiwaigxOut/form.vue | 30 ++++++---
manifest.json | 4
pages/weiwaigxIn/form.vue | 36 ++++++++----
pages/gongxuOut/form.vue | 54 +++++++++++++----
5 files changed, 107 insertions(+), 48 deletions(-)
diff --git a/manifest.json b/manifest.json
index c9eefce..e60c2bc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "1.0.23",
- "versionCode" : 123,
+ "versionName" : "1.0.25",
+ "versionCode" : 125,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/gongxuIn/form.vue b/pages/gongxuIn/form.vue
index 44737b7..2ba6c79 100644
--- a/pages/gongxuIn/form.vue
+++ b/pages/gongxuIn/form.vue
@@ -924,9 +924,9 @@
console.log(1,res);
uni.hideLoading()
if(res.data.count == 1){
- let pages = getCurrentPages();
- let prePage = pages[pages.length - 2];
- prePage.$vm.getList()
+ // let pages = getCurrentPages();
+ // let prePage = pages[pages.length - 2];
+ // prePage.$vm.getList()
if(this.isEdit){
setTimeout(()=>{
uni.redirectTo({
@@ -934,15 +934,26 @@
})
},1000)
}else{
- setTimeout(()=>{
- uni.navigateBack()
- },1000)
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url:'/pages/gongxuIn/form?OperationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(()=>{
+ uni.navigateBack();
+ },50)
+ }
+ }
+ });
}
}
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
+
},
fail: (res) => {
console.log(res);
diff --git a/pages/gongxuOut/form.vue b/pages/gongxuOut/form.vue
index c30ac6f..4808f56 100644
--- a/pages/gongxuOut/form.vue
+++ b/pages/gongxuOut/form.vue
@@ -4,7 +4,7 @@
<view class="form-item">
<view class="title"><text>*</text>鏉″舰鐮�:</view>
<view class="right" style="width: 380rpx;">
- <input name="HBarCode" v-model="hform.HBarCode" disabled placeholder="璇锋壂鎻忔潯鐮�"/>
+ <input name="HBarCode" 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>
@@ -452,7 +452,7 @@
HProcNo:'',
HQty:'',
// HPieceQty:'',
- HWasterQty:'',
+ HWasterQty:0,
HSourceName:'',
HSourceID:0,
HCenterName:'',
@@ -567,6 +567,7 @@
// const str = "GXLX250603001-01@10";
uni.scanCode({
onlyFromCamera: true,
+ // autoZoom:false,
success: (res) => {
console.log('鏉＄爜鍐呭锛�' + res.result);
var str = res.result
@@ -575,13 +576,25 @@
this.hform.HBarCode = parts[0]
this.hform.HProcNo = parts[1]
this.getHBarCodeData(parts[0])
- this.getHProcNoData(parts[0],parts[1])
+ // this.getHProcNoData(parts[0],parts[1])
}else{
this.hform.HBarCode = res.result
this.getHBarCodeData(res.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])
+ // this.getHProcNoData(parts[0],parts[1])
+ }else{
+ this.getHBarCodeData(this.hform.HBarCode)
+ }
},
//鎵祦姘村彿
toScanProcNo(){
@@ -1041,7 +1054,7 @@
if(res.data.code == 1){
var data = res.data.data[0]
this.getHBarCodeData(data.HBarCode)
- this.getHProcNoData(data.HBarCode,data.HProcNo)
+ // this.getHProcNoData(data.HBarCode,data.HProcNo)
this.hform.HInterID= data.HInterID
this.hform.HBillNo= data.HBillNo
@@ -1141,6 +1154,8 @@
this.hform.HCenterName= data.宸ヤ綔涓績
this.hform.HCenterID= data.HCenterID
this.hform.NoOutboundHqty= (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+
+ this.getHProcNoData(this.hform.HBarCode,this.hform.HProcNo)
}else{
uni.showToast({
title:res.data.Message,
@@ -1268,9 +1283,10 @@
// this.baofei()
// }
// }
- let pages = getCurrentPages();
- let prePage = pages[pages.length - 2];
- prePage.$vm.getList()
+
+ // let pages = getCurrentPages();
+ // let prePage = pages[pages.length - 2];
+ // prePage.$vm.getList()
if(this.isEdit){
setTimeout(()=>{
uni.redirectTo({
@@ -1278,15 +1294,25 @@
})
},1000)
}else{
- setTimeout(()=>{
- uni.navigateBack()
- },1000)
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url:'/pages/gongxuOut/form?OperationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(()=>{
+ uni.navigateBack();
+ },50)
+ }
+ }
+ });
}
}
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
},
fail: (res) => {
console.log(res);
diff --git a/pages/weiwaigxIn/form.vue b/pages/weiwaigxIn/form.vue
index 215c274..79d87d0 100644
--- a/pages/weiwaigxIn/form.vue
+++ b/pages/weiwaigxIn/form.vue
@@ -414,7 +414,7 @@
this.hform.HBarCode = parts[0]
this.hform.HProcNo = parts[1]
this.getHBarCodeData(parts[0])
- this.getHProcNoData(parts[0],parts[1])
+ // this.getHProcNoData(parts[0],parts[1])
}else{
this.hform.HBarCode = res.result
this.getHBarCodeData(res.result)
@@ -632,7 +632,7 @@
if(res.data.code == 1){
var data = res.data.data[0]
this.getHBarCodeData(data.HBarCode)
- this.getHProcNoData(data.HBarCode,data.HProcNo)
+ // this.getHProcNoData(data.HBarCode,data.HProcNo)
this.hform.HInterID= data.HInterID
this.hform.HBillNo= data.HBillNo
@@ -676,6 +676,8 @@
// this.hform.HCloseDate= data.HCloseDate
this.hform.HDeleteMan= data.HDeleteMan
this.hform.HDeleteDate= data.HDeleteDate
+
+ this.getHProcNoData(this.hform.HBarCode,this.hform.HProcNo)
}else{
uni.showToast({
title:res.data.Message,
@@ -845,9 +847,9 @@
console.log(1,res);
uni.hideLoading()
if(res.data.count == 1){
- let pages = getCurrentPages();
- let prePage = pages[pages.length - 2];
- prePage.$vm.getList()
+ // let pages = getCurrentPages();
+ // let prePage = pages[pages.length - 2];
+ // prePage.$vm.getList()
if(this.isEdit){
setTimeout(()=>{
uni.redirectTo({
@@ -855,15 +857,25 @@
})
},1000)
}else{
- setTimeout(()=>{
- uni.navigateBack()
- },1000)
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url:'/pages/weiwaigxIn/form?OperationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(()=>{
+ uni.navigateBack();
+ },50)
+ }
+ }
+ });
}
}
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
},
fail: (res) => {
console.log(res);
diff --git a/pages/weiwaigxOut/form.vue b/pages/weiwaigxOut/form.vue
index 41b4f7a..96a808d 100644
--- a/pages/weiwaigxOut/form.vue
+++ b/pages/weiwaigxOut/form.vue
@@ -919,9 +919,9 @@
console.log(1,res);
uni.hideLoading()
if(res.data.count == 1){
- let pages = getCurrentPages();
- let prePage = pages[pages.length - 2];
- prePage.$vm.getList()
+ // let pages = getCurrentPages();
+ // let prePage = pages[pages.length - 2];
+ // prePage.$vm.getList()
if(this.isEdit){
setTimeout(()=>{
uni.redirectTo({
@@ -929,15 +929,25 @@
})
},1000)
}else{
- setTimeout(()=>{
- uni.navigateBack()
- },1000)
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url:'/pages/weiwaigxOut/form?OperationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(()=>{
+ uni.navigateBack();
+ },50)
+ }
+ }
+ });
}
}
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
},
fail: (res) => {
console.log(res);
--
Gitblit v1.9.1