From de32eaefeb995ce67a638ca82bc6760075af2eb5 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 20 十一月 2025 10:17:46 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/chaituosaoma/UnPackUnionBill.vue | 84 ++++++++++++++++++++++++++++-------------
1 files changed, 57 insertions(+), 27 deletions(-)
diff --git a/pages/chaituosaoma/form.vue b/pages/chaituosaoma/UnPackUnionBill.vue
similarity index 89%
copy from pages/chaituosaoma/form.vue
copy to pages/chaituosaoma/UnPackUnionBill.vue
index 71e5cac..8ce6446 100644
--- a/pages/chaituosaoma/form.vue
+++ b/pages/chaituosaoma/UnPackUnionBill.vue
@@ -4,7 +4,8 @@
<view class="form-item">
<view class="title">鎵樻潯鐮�</view>
<view class="right">
- <input type="text" :focus="HBarCodePackFocus" v-model="HBarCode_Pack" @confirm="GetMeesageByBarCode_Pack(HBarCode_Pack)" />
+ <input type="text" :focus="HBarCodePackFocus" v-model="HBarCode_Pack"
+ @confirm="GetMeesageByBarCode_Pack(HBarCode_Pack)" />
</view>
<view class="right-icon">
<uni-icons class="right-icon" type="scan"
@@ -30,9 +31,32 @@
</view>
<!-- 鎷嗙淇℃伅 -->
<view v-if="tabs == 0">
- <zb-table id="list-table" :fit="true" :style="{height: `${listTableHeight}px`}" :columns="columns" :data="listData"
+ <!-- <zb-table id="list-table" :fit="true" :style="{height: `${listTableHeight}px`}" :columns="columns" :data="listData"
:show-header="true" :border="true" :row-key="row => row.index" @toggleRowSelection="handleSelect"
- @toggleAllSelection="handleSelectAll" />
+ @toggleAllSelection="handleSelectAll" /> -->
+
+ <view class="item-wrapper">
+ <view v-for="(item, index) in listData" :key="index">
+ <uni-card :title="item['鐗╂枡鍚嶇О']" :extra="`鏉＄爜鏁伴噺: ${item['鏉＄爜涓暟']}`">
+ <view class="detail" v-if="item['鏉＄爜缂栧彿']">
+ <text>鏉＄爜缂栧彿锛�</text>{{item['鏉＄爜缂栧彿']}}
+ </view>
+ <view class="detail" v-if="item['鏁伴噺']">
+ <text>鏁伴噺锛�</text>{{item['鏁伴噺']}}
+ </view>
+ <view class="detail" v-if="item['鐗╂枡浠ｇ爜']">
+ <text>鐗╂枡浠ｇ爜锛�</text>{{item['鐗╂枡浠ｇ爜']}}
+ </view>
+ <view class="detail" v-if="item['鐗╂枡鍚嶇О']">
+ <text>鐗╂枡鍚嶇О锛�</text>{{item['鐗╂枡鍚嶇О']}}
+ </view>
+ <view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+ </view>
</view>
<!-- 鍗曟嵁淇℃伅 -->
<view v-if="tabs == 1">
@@ -80,7 +104,8 @@
</view>
</view>
<view class="bottom-btn" id="bottom-btn">
- <button :class="EnableSubmit?'btn-a':'btn-c'" :disabled="!EnableSubmit" size="mini" @tap="cmdSubmit">鎷嗘墭</button>
+ <button :class="EnableSubmit?'btn-a':'btn-c'" :disabled="!EnableSubmit" size="mini"
+ @tap="cmdSubmit">鎷嗘墭</button>
<view style="flex: 1;"></view>
<!-- <button class="btn-d" size="mini" @tap="cmdDelete">鍒犻櫎</button> -->
<button class="btn-c" size="mini" @tap="cmdExit">閫�鍑�</button>
@@ -118,8 +143,7 @@
HMaterNumber_Pack: "", //鎵樻潯鐮佸搴旂墿鏂欎唬鐮�
listOption: [],
listData: [],
- columns: [
- {
+ columns: [{
name: 'index',
label: '搴忓彿',
width: 60,
@@ -174,17 +198,17 @@
}
},
methods: {
- async HBarCodeFocusRefresh(){
- this.HBarCode = ''
- this.HBarCodeFocus = false
- await this.$nextTick()
- this.HBarCodeFocus = true
+ async HBarCodeFocusRefresh() {
+ this.HBarCode = ''
+ this.HBarCodeFocus = false
+ await this.$nextTick()
+ this.HBarCodeFocus = true
},
- async HBarCodePackFocusRefresh(){
- this.HBarCode_Pack = ''
- this.HBarCodePackFocus = false
- await this.$nextTick()
- this.HBarCodePackFocus = true
+ async HBarCodePackFocusRefresh() {
+ this.HBarCode_Pack = ''
+ this.HBarCodePackFocus = false
+ await this.$nextTick()
+ this.HBarCodePackFocus = true
},
toScanCode() {
MpaasScan.scanCode((scanCode) => {
@@ -473,28 +497,35 @@
"HMaker": this.hform.HMaker,
},
resFunction: (res) => {
- let {data, count, Message} = res.data
- if(count == 1){
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
uni.showModal({
title: '娓╅Θ鎻愮ず',
content: Message,
confirmText: "鏂板",
cancelText: '鍏抽棴',
- success: ({confirm,cancel}) => {
- if(confirm) {
+ success: ({
+ confirm,
+ cancel
+ }) => {
+ if (confirm) {
uni.redirectTo({
- url: "/pages/zutuosaoma/form"
+ url: "/pages/zutuosaoma/PackUnionBill"
})
}
-
- if(cancel) {
+
+ if (cancel) {
uni.navigateBack()
}
}
})
- }else {
+ } else {
uni.showToast({
- icon:'none',
+ icon: 'none',
title: Message
})
}
@@ -544,7 +575,7 @@
} else if (this.OperationType == 2) {
}
-
+
this.HBarCodePackFocusRefresh()
}
}
@@ -674,5 +705,4 @@
color: #fff;
}
}
-
</style>
\ No newline at end of file
--
Gitblit v1.9.1