From 9527cf1939ab802e83da8b608916b10efeaa22ae Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 19 三月 2026 17:04:58 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue | 1
pages.json | 6 +
pages/index/tab2.vue | 7 +
pages/index/login.vue | 2
pages/fenbushidiaochudan/table_out.vue | 4
pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue | 199 ++++++++++++++++++++++++++++++++++++++++++++-----
6 files changed, 196 insertions(+), 23 deletions(-)
diff --git a/pages.json b/pages.json
index 02aeffe..7a97314 100644
--- a/pages.json
+++ b/pages.json
@@ -1682,6 +1682,12 @@
"navigationBarTitleText": "璁惧灞ュ巻"
}
},
+ {
+ "path": "pages/fenbushidiaochudan/table_out",
+ "style": {
+ "navigationBarTitleText": "鍒嗘寮忚皟鍑哄崟缂撳瓨鍒楄〃"
+ }
+ },
{
"path": "pages/MJGL/Sc_EquipmentProcessList/Sc_EquipmentProcess",
"style": {
diff --git a/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue b/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue
index d30c1df..b0678a7 100644
--- a/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue
+++ b/pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast.vue
@@ -243,6 +243,7 @@
// 鑾峰彇SN鐮佸搴旂殑鏁版嵁
let sInterID = this.hform.HInterID
let sBillNo = this.hform.HBillNo
+ let HBillType = this.hform.HBillType
let sHBarCode = this.HBarCode
let sHBarCode_Pack = this.HBarCode_Pack
let sMaker = getUserInfo()["Czymc"]
diff --git a/pages/fenbushidiaochudan/table_out.vue b/pages/fenbushidiaochudan/table_out.vue
index 5b3e9a8..fa28f0c 100644
--- a/pages/fenbushidiaochudan/table_out.vue
+++ b/pages/fenbushidiaochudan/table_out.vue
@@ -276,7 +276,7 @@
},
add() {
uni.navigateTo({
- url: './form?OperationType=1'
+ url: './form_out?OperationType=1'
})
},
//缂栬緫
@@ -293,7 +293,7 @@
console.log(1, res);
if (res.data.count == 1) {
uni.navigateTo({
- url: './form?OperationType=2&HInterID=' + item.HInterID
+ url: './form_out?OperationType=2&HInterID=' + item.HInterID
})
} else {
uni.showToast({
diff --git a/pages/index/login.vue b/pages/index/login.vue
index d908d5b..c01700e 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -114,7 +114,7 @@
"闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.88.82:81/API/',
"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
"浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
- "鏉ㄦ潈閼湰鍦版祴璇�": 'http://192.168.0.36:8082/API/',
+ "鏉ㄦ潈閼湰鍦版祴璇�": 'http://172.20.10.5:8082/API/',
"鐜嬩华鏈湴娴嬭瘯": 'http://192.168.0.74:8080/API/',
// 灏忓崼鍐呭缃�
"鑻忓窞鍗櫤绉戞妧-澶栫綉": 'http://221.224.60.42:8082/API_WW/',
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 87cf561..683acc2 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -234,6 +234,13 @@
id: 24,
hidden: false,
},
+ {
+ img: '../../static/icon/icon16.png',
+ text: '鍒嗘寮忚皟鍑哄崟缂撳瓨',
+ url: '/pages/fenbushidiaochudan/table_out',
+ id: 88,
+ hidden: false,
+ },
{
img: '../../static/icon/icon9.png',
text: '宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�',
diff --git a/pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue b/pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue
index 589922a..47b9fe7 100644
--- a/pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue
+++ b/pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue
@@ -43,6 +43,11 @@
<view class="right">
<input v-model="hform.HProcExchBillNo" placeholder="璇疯緭鍏ュ伐搴忔祦杞崱鍙�" />
</view>
+ <view>
+ <uni-icons type="scan"
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;font-weight: 500;"
+ size="20" @click="toScanCode"></uni-icons>
+ </view>
</view>
<view class="form-item">
<view class="title">浜у搧浠ｇ爜:</view>
@@ -211,17 +216,37 @@
<button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
<!-- <button class="op2" size="mini" plain @tap.stop="antiCheck(item)">鍙嶅鏍�</button> -->
<button class="op1" size="mini" plain @tap.stop="firstCheck(item)" v-if="false">棣栨</button>
- <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="true">缂栬緫</button>
+ <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="hform.HStatus === '宸插鏍�'">缂栬緫</button>
<button class="op4" size="mini" plain @tap.stop="del(item)" v-if="false">鍒犻櫎</button>
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
+
</view>
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+ <!-- 瀹℃牳寮圭獥 -->
+ <view class="popup-mask" v-if="popupVisible" @tap="cancelCheck">
+ <view class="popup-content" @tap.stop>
+ <view class="popup-title">瀹℃牳纭</view>
+ <view class="popup-item">
+ <text class="popup-label">鏁伴噺锛�</text>
+ <input class="popup-input" type="number" v-model="popupForm.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+ </view>
+ <view class="popup-item">
+ <text class="popup-label">鍒跺崟浜猴細</text>
+ <input class="popup-input" v-model="popupForm.HUser" placeholder="璇疯緭鍏ュ埗鍗曚汉" />
+ </view>
+ <view class="popup-btns">
+ <button class="popup-btn cancel" @tap="cancelCheck">鍙栨秷</button>
+ <button class="popup-btn confirm" @tap="confirmCheck()">纭畾</button>
+ </view>
+ </view>
+ </view>
</view>
+
</template>
<script>
@@ -229,12 +254,18 @@
export default {
data() {
return {
+ popupVisible: false,
+ popupItem: null,
+ popupForm: {
+ HQty: '',
+ HUser: ''
+ },
userInfo:getUserInfo(),
serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
showmore:false,
arrayStatus:['鍏ㄩ儴','鏈鏍�','宸插鏍�','宸插叧闂�'],
hform:{
- HStatus:'鍏ㄩ儴',
+ HStatus:'鏈鏍�',
HBeginDate:new Date().toISOString().split('T')[0],
HEndDate:'',
HICMOBillNo:'',
@@ -275,9 +306,24 @@
let newList = list.slice(sindex,eindex)
return newList
},
+ async toScanCode() {
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ 'hideAlbum': true,
+ 'timeoutInterval':'10', //瓒呮椂鏃堕棿
+ 'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ },(ret) => {
+ console.log(ret.resp_result)
+ if (this.CommonUtils.isEmpty(ret.resp_result) === false) {
+ console.log('鏉＄爜鍐呭锛�' + ret.resp_result);
+ this.hform.HProcExchBillNo = ret.resp_result
+ this.search()
+ }
+ })
+ },
getList(){
- this.sWhere += ` and 鍒跺崟浜� like N'%${this.userInfo.Czymc}'`
- // console.log(this.sWhere)
+ this.sWhere += ` and 鍒跺崟浜� like '%${this.userInfo.Czymc}'`
+ console.log(this.sWhere)
uni.showLoading({
title:'鍔犺浇涓�...'
})
@@ -289,6 +335,7 @@
},
success: (res) => {
console.log(1,res);
+
if(res.data.count == 1){
this.listData = res.data.data
this.showList = this.getPage(this.page,this.listData)
@@ -349,12 +396,12 @@
this.sWhere += " and 鍏抽棴浜�<>''";
}
}
- if (this.hform.HBeginDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HBeginDate + "'";
- }
- if (this.hform.HEndDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HEndDate + "'";
- }
+ // if (this.hform.HBeginDate) {
+ // this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.HBeginDate + "'";
+ // }
+ // 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 + "%'";
}
@@ -459,15 +506,68 @@
}
});
},
- // //瀹℃牳
- // check(item){
- // console.log(item)
- // if (item.HBillStatus > 0) {
- // uni.showToast({
- // title:'鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒'
- // })
- // }
- // },
+ //瀹℃牳
+ check(item){
+ console.log(item)
+ if (item.HBillStatus > 0) {
+ // uni.showToast({
+ // title:'鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒'
+ // })
+ this.popupItem = item;
+ this.popupForm.HQty = 0;
+ this.popupForm.HUser = uni.getStorageSync('HUserName');
+ this.popupVisible = true;
+ }
+
+ },
+ confirmCheck(item) {
+ // if (!this.popupForm.HQty) {
+ // uni.showToast({ title: '璇疯緭鍏ユ暟閲�', icon: 'none' });
+ // return;
+ // }
+ // if (!this.popupForm.HUser) {
+ // uni.showToast({ title: '璇疯緭鍏ュ埗鍗曚汉', icon: 'none' });
+ // return;
+ // }
+ uni.request({
+ url: this.serverUrl + '/Cj_StationEntrustOutBill/setOtherProperty',
+ method: 'Get',
+ data: {
+ HInterID: this.popupItem.HInterID,
+ HQty: this.popupForm.HQty,
+ user: this.popupForm.HUser // 鍒跺崟浜�
+ },
+ success: (res) => {
+ console.log(1, res);
+ if (res.data.count == 1) {
+ this.popupVisible = false;
+ uni.showToast({
+ title: '瀹℃牳鎴愬姛',
+ icon: 'none'
+ });
+ this.search();
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ });
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ });
+ }
+ });
+ },
+ cancelCheck() {
+ this.popupVisible = false;
+ this.popupItem = null;
+ this.popupForm.HQty = '';
+ this.popupForm.HUser = '';
+ }
// //鍙嶅鏍�
// antiCheck(item){
@@ -608,5 +708,64 @@
}
}
}
-
+.popup-mask {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0,0,0,0.5);
+ z-index: 999;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+.popup-content {
+ width: 600rpx;
+ background-color: #fff;
+ border-radius: 20rpx;
+ padding: 30rpx;
+}
+.popup-title {
+ font-size: 36rpx;
+ font-weight: bold;
+ text-align: center;
+ margin-bottom: 30rpx;
+}
+.popup-item {
+ display: flex;
+ align-items: center;
+ margin-bottom: 20rpx;
+}
+.popup-label {
+ width: 140rpx;
+ font-size: 30rpx;
+}
+.popup-input {
+ flex: 1;
+ border: 1px solid #ccc;
+ border-radius: 10rpx;
+ padding: 10rpx 20rpx;
+ font-size: 30rpx;
+}
+.popup-btns {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 40rpx;
+}
+.popup-btn {
+ width: 200rpx;
+ height: 70rpx;
+ line-height: 70rpx;
+ text-align: center;
+ border-radius: 10rpx;
+ font-size: 30rpx;
+}
+.popup-btn.cancel {
+ background-color: #eee;
+}
+.popup-btn.confirm {
+ background-color: #3a78ff;
+ color: #fff;
+}
</style>
--
Gitblit v1.9.1