From 2bb55a40bf0121078595aa84cb8a397916df80a6 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 24 三月 2026 20:43:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
RuoYi-Vue | 1 +
src/views/basic/gyCar/gyCarList.vue | 4 ++--
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue | 6 +++---
src/views/system/user/GyDriver.vue | 8 ++++----
src/views/sell/XsSeOutStockBill.vue | 16 +++++++++-------
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue | 4 ++++
6 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/RuoYi-Vue b/RuoYi-Vue
new file mode 160000
index 0000000..8a1cf9e
--- /dev/null
+++ b/RuoYi-Vue
@@ -0,0 +1 @@
+Subproject commit 8a1cf9ed55747229ce4149ddacf8596fa0995814
diff --git a/src/views/basic/gyCar/gyCarList.vue b/src/views/basic/gyCar/gyCarList.vue
index e34bf0b..895bb27 100644
--- a/src/views/basic/gyCar/gyCarList.vue
+++ b/src/views/basic/gyCar/gyCarList.vue
@@ -1111,9 +1111,9 @@
.then(() => {
if (!this.rowForm.瀹℃牳浜�) {
axios
- .get(this.$baseUrl + "Xs_SeOrderBill/DropXs_SeOrderBill", {
+ .get(this.$baseUrl + "Gy_CarController/DropGy_Car", {
params: {
- HInterID: this.rowForm.hmainid.toString(),
+ HItemID: this.rowForm.hmainid.toString(),
user: sessionStorage["HUserName"],
},
})
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
index 0946f36..2f9be03 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
@@ -374,6 +374,10 @@
label: '寰�杩�',
value: '寰�杩�',
},
+ {
+ label: '闆舵媴',
+ value: '闆舵媴',
+ },
]"
:key="index"
:label="item.label"
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
index f8b804e..fa7b0c9 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
@@ -588,7 +588,8 @@
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.hmainid)) {
+ // 浣跨敤 HInterID 鍒ゆ柇
+ if (this.ids.includes(row.HInterID)) {
return { "background": "#ecf5ff" }
}
},
@@ -603,8 +604,7 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- // this.rowForm = {}
- this.ids = selection.map(item => item.hmainid)
+ this.ids = selection.map(item => item.HInterID)
this.single = selection.length != 1
this.multiple = !selection.length
if (!this.single) {
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index 82ff637..51a8e45 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">
@@ -707,6 +707,9 @@
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
)?.Name;
@@ -1070,9 +1073,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 + "%'";
}
diff --git a/src/views/system/user/GyDriver.vue b/src/views/system/user/GyDriver.vue
index d8b9a4a..ccd0e42 100644
--- a/src/views/system/user/GyDriver.vue
+++ b/src/views/system/user/GyDriver.vue
@@ -437,7 +437,7 @@
);
if (userRes.data.data && userRes.data.data[0]) {
const userData = userRes.data.data[0];
- this.user = userData.Czymc || "admin";
+ this.user = sessionStorage["HUserName"] ;
this.Organization = userData.HUSEORGID;
this.queryParams.HUSEORGID = userData.HUSEORGID;
}
@@ -628,9 +628,9 @@
if (this.queryParams.HName) {
conditions.push(`椹鹃┒鍛樺悕绉� like '%${this.queryParams.HName}%'`);
}
- // if (this.queryParams.HUSEORGID) {
- // conditions.push(`HUSEORGID = '${this.queryParams.HUSEORGID}'`);
- // }
+ if (this.queryParams.HUSEORGID) {
+ conditions.push(`浣跨敤缁勭粐 = '${this.queryParams.HUSEORGID}'`);
+ }
if (this.queryParams.ColName !== "0" && this.queryParams.Comparator !== "0") {
--
Gitblit v1.9.1