From e12d6ed93cff2a302ad45ccfd189ea123d9f4b7f Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期四, 15 一月 2026 15:40:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/basic/gyUnit/gyUnit.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/views/basic/gyUnit/gyUnit.vue b/src/views/basic/gyUnit/gyUnit.vue
index b4f1e6c..8bb80a0 100644
--- a/src/views/basic/gyUnit/gyUnit.vue
+++ b/src/views/basic/gyUnit/gyUnit.vue
@@ -447,16 +447,16 @@
this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
};
this.queryParams.HOrgID = sessionStorage["OrganizationID"];
+
+ this.riqiChange();
+ this.handleQuery();
},
beforeDestroy() {
// 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
delete window.editGyClose;
},
- created() {
- this.riqiChange();
- this.handleQuery();
- },
+ created() {},
methods: {
onDateScanOptionChangerHandler(e) {
this.queryParams.timeSpan = e;
@@ -1005,6 +1005,7 @@
sWhere += " and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') != ''";
return sWhere;
}
+
return sWhere;
},
//鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
@@ -1095,7 +1096,8 @@
.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
.then(() => {
if (!this.rowForm.瀹℃牳浜�) {
- const InterID = this.rowForm.hmainid || this.rowForm.HItemID || this.rowForm.HInterID;
+ const InterID =
+ this.rowForm.hmainid || this.rowForm.HItemID || this.rowForm.HInterID;
axios
.get(this.baseURL + "DeltetGy_Unit", {
params: {
@@ -1147,8 +1149,8 @@
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
-
-
+
+
// 鍙嶇鐢�/绂佺敤鏁版嵁
set_De_Stop(num, form) {
@@ -1224,7 +1226,6 @@
);
return org ? org.Name : ''; // 鍙繑鍥炵粍缁囧悕绉�
},
-
// 鎻愪氦涓婁紶鏂囦欢
submitFileForm() {
--
Gitblit v1.9.1