From a9ca5dafb781919fe8a24cd586258e9144966271 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 19 十一月 2025 11:07:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/sell/XsSeOutStockBackBillList.vue | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/src/views/sell/XsSeOutStockBackBillList.vue b/src/views/sell/XsSeOutStockBackBillList.vue
index ec0c6fd..423cde1 100644
--- a/src/views/sell/XsSeOutStockBackBillList.vue
+++ b/src/views/sell/XsSeOutStockBackBillList.vue
@@ -9,15 +9,23 @@
class="searchBox"
>
<el-row>
- <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
<el-date-picker
- v-model="dateRange"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
+ v-model="sTime"
+ type="date"
+ placeholder="寮�濮嬫棩鏈�"
+ style="width: 150px"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡">
+ <el-date-picker
+ v-model="eTime"
+ type="date"
+ placeholder="缁撴潫鏃ユ湡"
+ style="width: 150px"
+ >
+ </el-date-picker>
</el-form-item>
<el-form-item label="鏃ユ湡闂撮殧">
<el-select
@@ -776,10 +784,18 @@
uploadTotal: 0,
};
},
- mounted() {},
+ mounted() {
+ window.editGyClose = () => {
+ this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
+ };
+ },
created() {
this.riqiChange();
this.getList();
+ },
+ beforeDestroy() {
+ // 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
+ delete window.editGyClose;
},
methods: {
BillSync() {
@@ -875,7 +891,6 @@
// const ddE = String(end.getDate()).padStart(2, "0");
this.sTime = start;
this.eTime = end;
- this.dateRange = [this.sTime, this.eTime];
},
organizationChange(val) {
// let options=undefined
@@ -929,11 +944,9 @@
// this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
// 鏀舵枡閫氱煡鍗曞垪琛�
- if (this.dateRange.length > 0) {
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+ if (this.sTime && this.eTime) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
try {
@@ -1285,6 +1298,7 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
+
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
--
Gitblit v1.9.1