From 4dc0880780b52c0c35456666a4643a7866b454a7 Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com>
Date: 星期六, 20 十二月 2025 16:00:35 +0800
Subject: [PATCH] 1.产检提交增加日期选择器
---
pages/QC/SJ/List.vue | 165 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 145 insertions(+), 20 deletions(-)
diff --git a/pages/QC/SJ/List.vue b/pages/QC/SJ/List.vue
index 2032d68..c6feaed 100644
--- a/pages/QC/SJ/List.vue
+++ b/pages/QC/SJ/List.vue
@@ -11,16 +11,47 @@
@click="onClickItem({currentIndex: 0})">鏈畬鎴�({{ uncheckedCount }})
</button>
<button :class="['tab-button', current === 1 ? 'active' : '']"
- @click="onClickItem({currentIndex: 1})">{{ checkedCount }}
+ @click="onClickItem({currentIndex: 1})">宸叉彁浜�({{ checkedCount }})
</button>
</view>
</view>
-
+
+ <!-- 娣诲姞鎼滅储绛涢�夊尯鍩� -->
<view class="filter-controls" style="margin-bottom: 5px;">
+ <view class="dropdown-filter">
+ <picker @change="onOptionsChange" :value="optionsIndex" :range="options">
+ <view class="picker">{{options[optionsIndex]}}</view>
+ </picker>
+ </view>
+ <!-- 鎼滅储妗嗗拰鎸夐挳 -->
<view class="search-container">
- <input v-model="searchValue" class="search-input" placeholder="璇疯緭鍏ユ楠屽崟鍙锋垨鐗╂枡缂栫爜"
- @confirm="handleSearch"/>
+ <input class="search-input" v-model="searchValue" :placeholder="'璇疯緭鍏�'+options[optionsIndex]"
+ @confirm="handleSearch" />
<button class="search-button" @click="handleSearch">鎼滅储</button>
+ </view>
+ </view>
+
+ <!-- 鏈彁浜ら〉闈㈡樉绀烘椂闂存棩鏈熸枃鏈紝宸叉彁浜ら〉闈㈡樉绀虹姸鎬佺瓫閫� -->
+ <view class="filter-controls" style="margin-bottom: 5px;">
+ <!-- 鏈彁浜ら〉闈細鏄剧ず鏃堕棿鏃ユ湡鏂囨湰 -->
+ <view v-if="current === 0" class="dropdown-filter">
+ <view class="picker">鏃堕棿鏃ユ湡</view>
+ </view>
+ <!-- 宸叉彁浜ら〉闈細鏄剧ず鐘舵�佷笅鎷夋 -->
+ <view v-if="current === 1" class="dropdown-filter">
+ <picker @change="onStateChange" :value="stateIndex" :range="state">
+ <view class="picker">{{state[stateIndex]}}</view>
+ </picker>
+ </view>
+ <view class="dropdown-filter">
+ <picker mode="date" :value="startDate" :end="endDate" @change="bindStartDate">
+ <view class="picker">{{startDate}}</view>
+ </picker>
+ </view>
+ <view class="dropdown-filter">
+ <picker mode="date" :value="endDate" :start="startDate" @change="bindEndDate">
+ <view class="picker">{{endDate}}</view>
+ </picker>
</view>
</view>
</view>
@@ -38,12 +69,12 @@
<view :class="{
'status-pending': !item.result && current === 0,
'status-assigned': current === 0 && item.statusUser && !item.result,
- 'status-pass': item.result === '鍚堟牸',
- 'status-fail': item.result === '涓嶅悎鏍�',
+ 'status-pass': item.result === '鍚堟牸'&& current === 1,
+ 'status-fail': item.result === '涓嶅悎鏍�'&& current === 1,
'status-submitted': !item.result && current === 1
}"
class="status">
- {{ current === 0 ? (item.result ? item.result : '鏈彁浜�') : (item.result ? item.result : '宸叉彁浜�') }}
+ {{ current === 0 ? ('' ? item.result : '鏈彁浜�') : (item.result ? item.result : '宸叉彁浜�') }}
</view>
</view>
@@ -142,9 +173,16 @@
tipShow: false,
searchValue: '',
uncheckedCount: 0,
- checkedCount: '宸插畬鎴�',
+ checkedCount: 0,
IQCJL: 0, // IQC 妫�楠屽憳鏍囪瘑
- userId:""
+ userId:"",
+ optionsIndex: 0, // 鏂板锛氫笅鎷夐�夐」绱㈠紩
+ options: ['椤圭洰', '绾夸綋', '宸ュ崟鍙�', '鐗╂枡鍙�', '鐗╂枡鍚�'], // 鏂板锛氭悳绱㈤�夐」
+ // 娣诲姞鐘舵�佺瓫閫夊拰鏃ユ湡閫夋嫨鍣ㄧ浉鍏冲彉閲�
+ stateIndex: 0,
+ state: ['鎵�鏈夌姸鎬�', '鍚堟牸', '涓嶅悎鏍�'],
+ startDate: new Date().toISOString().slice(0, 10),
+ endDate: new Date().toISOString().slice(0, 10)
};
},
@@ -176,6 +214,45 @@
},
methods: {
+ // 鏂板锛氭悳绱㈤�夐」鏀瑰彉浜嬩欢
+ onOptionsChange(e) {
+ this.optionsIndex = e.detail.value;
+ },
+
+ // 鏂板锛氱姸鎬佺瓫閫夋敼鍙樹簨浠�
+ onStateChange(e) {
+ this.pageIndex = 1;
+ this.stateIndex = e.detail.value;
+ this.data = [];
+ console.log("鐘舵�佺瓫閫夋敼鍙橈紝閫変腑鐘舵��:", this.state[this.stateIndex]);
+ this.init();
+ },
+
+ // 鏂板锛氬紑濮嬫棩鏈熸敼鍙樹簨浠�
+ bindStartDate(e) {
+ this.startDate = e.detail.value;
+ this.pageIndex = 1;
+ this.data = [];
+ console.log("寮�濮嬫棩鏈熸敼鍙�:", this.startDate);
+ this.init();
+ },
+
+ // 鏂板锛氱粨鏉熸棩鏈熸敼鍙樹簨浠�
+ bindEndDate(e) {
+ this.endDate = e.detail.value;
+ this.pageIndex = 1;
+ this.data = [];
+ console.log("缁撴潫鏃ユ湡鏀瑰彉:", this.endDate);
+ this.init();
+ },
+
+ // 鏂板锛氭悳绱㈡寜閽偣鍑讳簨浠�
+ handleSearch() {
+ this.pageIndex = 1;
+ this.data = [];
+ this.init();
+ },
+
async init() {
let result = this.current === 1 ? "宸插畬鎴�" : "鏈畬鎴�";
if (this.isLoading) return;
@@ -191,11 +268,60 @@
limit: this.limit,
statusUser: userName,
result: result,
- searchValue: this.searchValue
+ searchValue: this.searchValue,
+ selectedIndex: this.optionsIndex // 鏂板锛氫紶閫掓悳绱㈤�夐」绱㈠紩
}
});
- const list = res.data.tbBillList || [];
+ let list = res.data.tbBillList || [];
+
+ // 瀵规墍鏈夐〉闈㈣繘琛屽墠绔瓫閫夛紙鏈畬鎴愬拰宸叉彁浜わ級
+ // 鐘舵�佺瓫閫�
+ if (this.stateIndex > 0) {
+ const selectedState = this.state[this.stateIndex];
+ console.log("鍓嶇鐘舵�佺瓫閫�:", selectedState);
+ if (selectedState === '鍚堟牸') {
+ list = list.filter(item => item.result === '鍚堟牸');
+ } else if (selectedState === '涓嶅悎鏍�') {
+ list = list.filter(item => item.result === '涓嶅悎鏍�');
+ }
+ }
+
+ // 鏃ユ湡鑼冨洿绛涢��
+ if (this.startDate || this.endDate) {
+ console.log("鍓嶇鏃ユ湡绛涢��:", this.startDate, "鍒�", this.endDate);
+ const startDateObj = this.startDate ? new Date(this.startDate) : null;
+ const endDateObj = this.endDate ? new Date(this.endDate) : null;
+
+ // 璁剧疆寮�濮嬫棩鏈熺殑鏃堕棿涓哄綋澶╃殑寮�濮嬫椂闂� (00:00:00)
+ if (startDateObj) {
+ startDateObj.setHours(0, 0, 0, 0);
+ }
+
+ // 璁剧疆缁撴潫鏃ユ湡鐨勬椂闂翠负褰撳ぉ鐨勭粨鏉熸椂闂� (23:59:59)
+ if (endDateObj) {
+ endDateObj.setHours(23, 59, 59, 999);
+ }
+
+ list = list.filter(item => {
+ if (item.createTime) {
+ const itemDate = new Date(item.createTime);
+ let isValid = true;
+
+ if (startDateObj && itemDate < startDateObj) {
+ isValid = false;
+ }
+
+ if (endDateObj && itemDate > endDateObj) {
+ isValid = false;
+ }
+
+ return isValid;
+ }
+ return true;
+ });
+ }
+
if (this.pageIndex === 1) {
this.data = list;
} else {
@@ -207,7 +333,7 @@
this.noData = this.pageIndex >= this.totalPage;
if (this.current === 1) {
- this.checkedCount = '宸插畬鎴愶紙' + this.totalCount + '锛�';
+ this.checkedCount = this.totalCount;
} else {
this.uncheckedCount = this.totalCount;
}
@@ -219,19 +345,18 @@
}
},
- // 鎼滅储
- handleSearch() {
- this.pageIndex = 1;
- this.data = [];
- this.init();
- },
-
// Tab 鍒囨崲
onClickItem(index) {
if (this.current !== index.currentIndex) {
this.current = index.currentIndex;
this.data = [];
this.pageIndex = 1;
+ // 閲嶇疆绛涢�夋潯浠�
+ this.optionsIndex = 0;
+ this.searchValue = '';
+ this.stateIndex = 0;
+ this.startDate = new Date().toISOString().slice(0, 10);
+ this.endDate = new Date().toISOString().slice(0, 10);
this.init();
}
},
@@ -512,7 +637,7 @@
}
.status-fail {
- background: linear-gradient(135deg, #3498db, #2980b9);
+ background: linear-gradient(135deg, #ff0000, #ff0000);
color: white;
}
--
Gitblit v1.9.3