From 05fb7af4f0316fdae54f52076509e582ca5e1e4c Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期四, 04 十二月 2025 11:01:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
index 67c0685..77c3b85 100644
--- a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
+++ b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
@@ -8,7 +8,7 @@
</el-select>
</el-form-item>
<el-form-item label="寮�濮嬫棩鏈�">
- <el-date-picker v-model="query.HBeginDate" type="date" placeholder="寮�濮嬫棩鏈�" style="width:160px" :disabled="timeCycleDisabled" value-formate="yyyy-mm-dd" format="yyyy-mm-dd"/>
+ <el-date-picker v-model="query.HBeginDate" type="date" placeholder="寮�濮嬫棩鏈�" style="width:160px" :disabled="timeCycleDisabled" value-formate="yyyy-MM-dd" format="yyyy-MM-dd"/>
</el-form-item>
<el-form-item label="缁撴潫鏃ユ湡">
<el-date-picker v-model="query.HEndDate" type="date" placeholder="缁撴潫鏃ユ湡" style="width:160px" :disabled="timeCycleDisabled" value-format="yyyy-MM-dd" format="yyyy-MM-dd"/>
@@ -72,14 +72,14 @@
<el-col :span="6">
<el-form-item label="杩囨护">
<el-select v-model="query.ColName" style="width:190px">
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-select v-model="query.Comparator" style="width:190px">
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option value="=" label="=" />
<el-option value=">=" label=">=" />
<el-option value=">" label=">" />
@@ -108,7 +108,7 @@
</el-col>
<el-col :span="6">
<el-select v-model="query.Comparator1" style="width:190px">
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option value="=" label="=" />
<el-option value=">=" label=">=" />
<el-option value=">" label=">" />
@@ -137,7 +137,7 @@
</el-col>
<el-col :span="6">
<el-select v-model="query.Comparator2" style="width:190px">
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option value="=" label="=" />
<el-option value=">=" label=">=" />
<el-option value=">" label=">" />
@@ -220,6 +220,7 @@
//import FbStepFoldinBillEdit from './fbStepFoldinBillEdit'
import FbStepFoldinBillEdit from '@/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit'
import BarCodeDetail from '@/views/component/BarCodeDetail'
+import dayjs from 'dayjs';
export default {
@@ -249,14 +250,14 @@
HSourceBillNo: '',
Warehouse: '',
Hmaker: '',
- ColName: '0',
- Comparator: '0',
+ ColName: '',
+ Comparator: '',
ColContent: '',
- ColName1: '0',
- Comparator1: '0',
+ ColName1: '',
+ Comparator1: '',
ColContent1: '',
- ColName2: '0',
- Comparator2: '0',
+ ColName2: '',
+ Comparator2: '',
ColContent2: ''
},
timeCycles: [
@@ -322,6 +323,7 @@
const yyyy = d.getFullYear();
const mm = String(d.getMonth() + 1).padStart(2, '0');
const dd = String(d.getDate()).padStart(2, '0');
+
return `${yyyy}-${mm}-${dd}`;
},
onTimeCycleChange() {
@@ -392,8 +394,8 @@
if (q.ColName2 && q.Comparator2 && q.Comparator2 !== '0' && q.ColContent2)
sWhereParts.push(buildComparator(q.ColName2, q.Comparator2, q.ColContent2));
- if (q.HBeginDate) sWhereParts.push(` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${q.HBeginDate}'`);
- if (q.HEndDate) sWhereParts.push(` and CONVERT(varchar(100),鏃ユ湡, 23) <= '${q.HEndDate}'`);
+ if (q.HBeginDate) sWhereParts.push(` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${dayjs(q.HBeginDate).format("YYYY-MM-DD")}'`);
+ if (q.HEndDate) sWhereParts.push(` and CONVERT(varchar(100),鏃ユ湡, 23) <= '${dayjs(q.HEndDate).format("YYYY-MM-DD")}'`);
if (q.HBillNo) sWhereParts.push(` and 鍗曟嵁鍙� like '%${q.HBillNo}%'`);
if (q.HDeptID) sWhereParts.push(` and 閮ㄩ棬 like '%${q.HDeptID}%'`);
if (q.MaterialCode) sWhereParts.push(` and 鐗╂枡浠ｇ爜 like '%${q.MaterialCode}%'`);
--
Gitblit v1.9.1