From 723793a0aa8d69cbbb463830a3344dbd6655cee5 Mon Sep 17 00:00:00 2001
From: chenhaozhe <gaozhechen26@gmail.com>
Date: 星期六, 04 四月 2026 14:57:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/sell/XsSeOutStockBill.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index 82ff637..56ee72c 100644
--- a/src/views/sell/XsSeOutStockBill.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -88,9 +88,8 @@
<el-col :span="6" style="padding: 0 10px">
<el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange"
class="ForFilteringSchemes">
- <span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
- </span>
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
</el-select>
</el-col>
<el-col :span="11">
@@ -104,8 +103,9 @@
<el-col :span="7">
<el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange"
class="ForFilteringSchemes">
- <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
- :value="item.field"></el-option>
+ <span v-for="(item, index) in btList" :key="index">
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ </span>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
@@ -696,7 +696,7 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
- if (this.openPage && this.propsHOrgID) {
+ if (this.openPage && this.propsHOrgID && this.queryParams.HOrgID == "") {
this.queryParams.HOrgID = this.propsHOrgID
}
// this.queryParams.HOrgID = 100038
@@ -706,6 +706,9 @@
if (this.sTime && this.eTime) {
this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
+ }
+ if (this.queryParams.HOrgID) {
+ this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
}
let Organization = this.organizationList.find(
(e) => e.ID == this.queryParams.HOrgID
@@ -990,6 +993,9 @@
this.rowForm = selection[0];
}
this.selRowList = selection
+ if (this.openPage) {
+ this.$emit('deptEmit', this.selRowList, 12)
+ }
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
handleSearch() {
@@ -1070,9 +1076,8 @@
}
if (this.queryParams.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HNumber + "%'";
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
-
if (this.queryParams.HProjectNumber) {
this.sWhere += " and 椤圭洰缂栫爜 like '%" + this.queryParams.HProjectNumber + "%'";
}
--
Gitblit v1.9.1