From bb40eba5dd2ec75a6fa2cd2c8eb41d769c092fca Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 05 十二月 2025 09:33:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/gyMaterial/GyMaterial.vue | 73 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 19 deletions(-)
diff --git a/src/views/gyMaterial/GyMaterial.vue b/src/views/gyMaterial/GyMaterial.vue
index 49028d1..3b24fb6 100644
--- a/src/views/gyMaterial/GyMaterial.vue
+++ b/src/views/gyMaterial/GyMaterial.vue
@@ -78,7 +78,7 @@
placeholder="璇烽�夋嫨"
style="width: 100%"
>
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="" label=""></el-option> -->
<el-option
v-for="(item, index) in visibleColumns"
:key="index"
@@ -93,7 +93,7 @@
placeholder="璇烽�夋嫨"
style="width: 100%"
>
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option
v-for="(item, index) in comparatorList"
:key="index"
@@ -120,7 +120,7 @@
placeholder="璇烽�夋嫨"
style="width: 100%"
>
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option
v-for="(item, index) in visibleColumns"
:key="index"
@@ -135,7 +135,7 @@
placeholder="璇烽�夋嫨"
style="width: 100%"
>
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option
v-for="(item, index) in comparatorList"
:key="index"
@@ -162,7 +162,7 @@
placeholder="璇烽�夋嫨"
style="width: 100%"
>
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option
v-for="(item, index) in visibleColumns"
:key="index"
@@ -177,7 +177,7 @@
placeholder="璇烽�夋嫨"
style="width: 100%"
>
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option
v-for="(item, index) in comparatorList"
:key="index"
@@ -642,12 +642,12 @@
HModel: null,
HOrgID: null,
HProject: null,
- ColName: "0",
- ColName1: "0",
- ColName2: "0",
- Comparator: "0",
- Comparator1: "0",
- Comparator2: "0",
+ ColName: "",
+ ColName1: "",
+ ColName2: "",
+ Comparator: "",
+ Comparator1: "",
+ Comparator2: "",
ColContent: "",
ColContent1: "",
ColContent2: "",
@@ -713,11 +713,13 @@
.then((response) => {
let data = response.data.data[0];
this.user = data.Czymc;
+
this.getOrganizations();
+ this.queryParams.HOrgID = data.HUSEORGID;
this.getTreeData();
this.getProjectOptions();
this.getList();
- this.getDefaultFilterScheme();
+ //this.getDefaultFilterScheme();
})
.catch((error) => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -730,9 +732,9 @@
.then((response) => {
if (response.data.count == 1) {
this.organizationOptions = response.data.data;
- if (this.organizationOptions.length > 0) {
- this.queryParams.HOrgID = this.organizationOptions[0].ID;
- }
+ // if (this.organizationOptions.length > 0) {
+ // this.queryParams.HOrgID = this.organizationOptions[0].ID;
+ // }
}
})
.catch((error) => {
@@ -1128,6 +1130,14 @@
},
handleRefresh() {
+ // 鍒锋柊鏃舵竻闄よ〃鏍奸�夋嫨骞堕噸缃浉鍏崇姸鎬侊紝淇濊瘉澶嶅埗/缂栬緫/鍒犻櫎/瀹℃牳绛夋寜閽绂佺敤
+ if (this.$refs.tableData && this.$refs.tableData.clearSelection) {
+ this.$refs.tableData.clearSelection();
+ }
+ this.selectedRow = null;
+ this.ids = [];
+ this.single = true;
+ this.multiple = true;
this.getList();
},
@@ -1144,7 +1154,7 @@
},
// 鐗╂枡浠ｇ爜鐐瑰嚮
- handleMaterialCodeClick(row) {
+ handleMaterialCodeClick(row) {
this.selectedRow = row;
this.OperationType = 3;
this.currentEditId = row.HItemID;
@@ -1155,6 +1165,13 @@
handleRowClick(row, column, event) {
+ if(this.openPage){
+ this.$emit('deptEmit', row, 3)
+ }
+ if (this.checkIsIframe()) {
+ // 灏嗗綋鍓嶉�変腑鐨勬暟鎹毚闇插埌window涓�
+ window.selectedRow = row;
+ }
this.$refs.tableData.toggleRowSelection(row);
this.selectedRow = row;
this.getFileList(row.鐗╂枡浠ｇ爜);
@@ -1217,12 +1234,21 @@
// 琛屾牱寮�
rowStyle({ row, rowIndex }) {
if (this.ids.includes(row.hmainid)) {
- return { background: "#ecf5ff" };
+ return { };
+ // background: "#ecf5ff"
}
},
// 鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
+ if(this.openPage){
+ this.$emit('deptEmitDb', row, 3)
+ }
+ if (this.checkIsIframe()) {
+ // IFrame 鍙屽嚮 杩斿洖褰撳墠鍙屽嚮鐨勬暟鎹�
+ window.parent.iFrameMaterialCallback(row);
+ return;
+ }
this.handleMaterialCodeClick(row);
},
@@ -1233,6 +1259,9 @@
if (!this.single) {
this.selectedRow = selection[0];
}
+ // if(this.openPage){
+ // this.$emit('deptEmit', this.selectedRow, 3)
+ // }
},
// 缂栬緫鍏抽棴鍥炶皟
handleEditClose() {
@@ -1338,7 +1367,13 @@
getDefaultFilterScheme() {
this.currentFilterScheme = "褰撳墠杩囨护鏂规锛氶粯璁ゆ柟妗�";
- }
+ },
+ checkIsIframe() {
+ if (window.self == window.top) {
+ return false;
+ }
+ return true;
+ },
},
};
</script>
--
Gitblit v1.9.1