From 64aba338beb7018c8264cfcf1b7b6c9b2abc9987 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 23 十月 2025 10:41:09 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/shangmudan/table.vue | 73 +++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/pages/MJGL/shangmudan/table.vue b/pages/MJGL/shangmudan/table.vue
index 8d153c9..6997398 100644
--- a/pages/MJGL/shangmudan/table.vue
+++ b/pages/MJGL/shangmudan/table.vue
@@ -5,6 +5,7 @@
<view class="title">鐘舵��:</view>
<view class="right">
<picker :range="arrayStatus" :value="hform.HStatus" @change="HStatusChange">
+ <view class="picker-overlay"></view>
<input name="HStatus" disabled :value="hform.HStatus" placeholder="璇烽�夋嫨鐘舵��" />
</picker>
</view>
@@ -13,6 +14,7 @@
<view class="title">寮�濮嬫椂闂�:</view>
<view class="right">
<picker mode="date" :value="hform.HBeginDate" @change="HBeginDateChange">
+ <view class="picker-overlay"></view>
<input name="HBeginDate" disabled :value="hform.HBeginDate" placeholder="璇烽�夋嫨" />
</picker>
</view>
@@ -21,6 +23,7 @@
<view class="title">缁撴潫鏃堕棿:</view>
<view class="right">
<picker mode="date" :value="hform.HEndDate" @change="HEndDateChange">
+ <view class="picker-overlay"></view>
<input name="HEndDate" disabled :value="hform.HEndDate" placeholder="璇烽�夋嫨" />
</picker>
</view>
@@ -234,8 +237,8 @@
arrayStatus: ['鍏ㄩ儴', '鏈鏍�', '宸插鏍�', '宸插叧闂�'],
hform: {
HStatus: '鍏ㄩ儴',
- HBeginDate: '',
- HEndDate: '',
+ HBeginDate: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString().split('T')[0],
+ HEndDate: new Date().toISOString().split('T')[0],
HICMOBillNo: '',
HBillNo: '',
HProcExchBillNo: '',
@@ -265,6 +268,36 @@
}, 1000);
},
methods: {
+ SearchWhere() { //杩囨护鏉′欢
+ this.sWhere = ''; // 鍏堟竻绌烘潯浠�
+ if (this.hform.HStatus) {
+ if (this.hform.HStatus == '鍏ㄩ儴') {
+ this.sWhere += "";
+ } else if (this.hform.HStatus == '鏈鏍�') {
+ this.sWhere += " and 瀹℃牳浜�=''";
+ } else if (this.hform.HStatus == '宸插鏍�') {
+ this.sWhere += " and 瀹℃牳浜�<>''";
+ } else if (this.hform.HStatus == '宸插叧闂�') {
+ this.sWhere += " and 鍏抽棴浜�<>''";
+ }
+ }
+ if (this.hform.BenginHCreateDate) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+ }
+ if (this.hform.EndHCreateDate) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
+ }
+ if (this.hform.HBillNo) {
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ }
+ if (this.hform.HICMOBillNo) {
+ this.sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + this.hform.HICMOBillNo + "%'";
+ }
+ if (this.hform.HProcExchBillNo) {
+ this.sWhere += " and 娴佽浆鍗″彿 like '%" + this.hform.HProcExchBillNo + "%'";
+ }
+ return this.sWhere
+ },
getPage(page, list) {
let sindex = (parseInt(page) - 1) * 20
let eindex = parseInt(page) * 20
@@ -272,6 +305,7 @@
return newList
},
getList() {
+ this.sWhere = this.SearchWhere()
uni.showLoading({
title: '鍔犺浇涓�...'
})
@@ -328,36 +362,7 @@
this.listData = []
this.page = 1
this.showList = []
-
- console.log(this.hform)
-
- if (this.hform.HStatus) {
- if (this.hform.HStatus == '鍏ㄩ儴') {
- this.sWhere += "";
- } else if (this.hform.HStatus == '鏈鏍�') {
- this.sWhere += " and 瀹℃牳浜�=''";
- } else if (this.hform.HStatus == '宸插鏍�') {
- this.sWhere += " and 瀹℃牳浜�<>''";
- } else if (this.hform.HStatus == '宸插叧闂�') {
- this.sWhere += " and 鍏抽棴浜�<>''";
- }
- }
- if (this.hform.BenginHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
- }
- if (this.hform.EndHCreateDate) {
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
- }
- if (this.hform.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
- }
- if (this.hform.HICMOBillNo) {
- this.sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + this.hform.HICMOBillNo + "%'";
- }
- if (this.hform.HProcExchBillNo) {
- this.sWhere += " and 娴佽浆鍗″彿 like '%" + this.hform.HProcExchBillNo + "%'";
- }
-
+
this.getList()
},
//鏂板
@@ -378,8 +383,8 @@
this.operations = -1,
this.hform = {
HStatus: '鍏ㄩ儴',
- HBeginDate: '',
- HEndDate: '',
+ HBeginDate: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString().split('T')[0],
+ HEndDate: new Date().toISOString().split('T')[0],
HICMOBillNo: '',
HBillNo: '',
HProcExchBillNo: '',
--
Gitblit v1.9.1