From a30b3f8e6d0735fdd240de585ae596abefe62317 Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期二, 31 三月 2026 20:21:56 +0800
Subject: [PATCH] 1
---
RuoYi-Vue | 1
.env.development | 6 +-
src/views/basic/gyCurrency/gyCurrencyEdit.vue | 14 +++++++
src/views/basic/gyCurrency/gyCurrency.vue | 9 +++-
src/views/component/CurrencyDialog/index.vue | 26 ++++++++++---
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue | 2
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue | 18 ++++++---
7 files changed, 58 insertions(+), 18 deletions(-)
diff --git a/.env.development b/.env.development
index f6c8b8d..317b137 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
# VUE_APP_BASE_API = http://localhost:81/API/
-VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
# VUE_APP_BASE_API = 'http://localhost:8082/API/'
@@ -14,8 +14,8 @@
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 瀹佹尝 鍥涚淮灏�
-# VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
-# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
+VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
+VUE_APP_BASE_API = http://220.189.218.155:9010/API/
#鏉滆春
# VUE_APP_BASE_API = http://localhost:8082/API/
# 鍐呯綉鍦板潃娴嬭瘯
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/gyCurrency/gyCurrency.vue b/src/views/basic/gyCurrency/gyCurrency.vue
index 69f30aa..d2d4ad3 100644
--- a/src/views/basic/gyCurrency/gyCurrency.vue
+++ b/src/views/basic/gyCurrency/gyCurrency.vue
@@ -1177,12 +1177,17 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
if (this.checkIsIframe()) {
- window.parent.iframeCarCallBack(row);
+ window.parent.iframeCurrencyCallBack(row);
return;
}
this.OperationType = 3;
- this.handleEdit(row, this.OperationType);
+ if (this.openPage) {
+ this.$emit('deptEmitDb', row, 2)
+ } else {
+ this.handleEdit();
+ }
},
+
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
diff --git a/src/views/basic/gyCurrency/gyCurrencyEdit.vue b/src/views/basic/gyCurrency/gyCurrencyEdit.vue
index 41c01b1..d4ae207 100644
--- a/src/views/basic/gyCurrency/gyCurrencyEdit.vue
+++ b/src/views/basic/gyCurrency/gyCurrencyEdit.vue
@@ -134,6 +134,18 @@
},
mounted() {
this.user = sessionStorage["HUserName"] || "admin";
+ this.fetchData();
+ this.getdata();
+ // 甯佸埆 鍥炶皟
+ window.iframeCurrencyCallBack = (info) => {
+ // 鍥炶皟璧嬪��
+ console.log(info);
+ this.form.HCurID = info.HItemID;
+ this.form.HCurName = info["璐у竵鍚嶇О"];
+ this.form.HExRate = info["姹囩巼"];
+ // 鍏抽棴寮圭獥
+ this.deptClose();
+ };
},
methods: {
// 妫�鏌ユ槸鍚﹀湪iframe涓�
@@ -147,6 +159,8 @@
const hID = urlParams.HInterID ? parseInt(urlParams.HInterID) : 0;
const opType = urlParams.OperationType ? parseInt(urlParams.OperationType) : 1;
+
+
// 濡傛灉props娌℃湁浼犻�掞紝浣跨敤URL鍙傛暟
const operationType = this.OperationType || opType;
const linterid = this.linterid || hID;
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
index 2f9be03..cb1b268 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
@@ -86,7 +86,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="缁撶畻鏂瑰紡" prop="HSSName" required>
+ <el-form-item label="缁撶畻鏂瑰紡" prop="HSSName" >
<el-input v-model="form.HSSName" placeholder="璇烽�夋嫨缁撶畻鏂瑰紡" disabled>
<el-button
slot="append"
@@ -626,7 +626,7 @@
HCurID: [{ required: true, message: "甯佸埆涓嶈兘涓虹┖", trigger: "blur" }],
HExRate: [{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }],
HSTOCKINORGID: [{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "change" }],
- HSSName: [{ required: true, message: "缁撶畻鏂瑰紡涓嶈兘涓虹┖", trigger: "blur" }],
+ // HSSName: [{ required: true, message: "缁撶畻鏂瑰紡涓嶈兘涓虹┖", trigger: "blur" }],
},
};
},
@@ -703,8 +703,8 @@
this.form.HCurName = deptRow.璐у竵鍚嶇О;
this.form.HCurID = deptRow.HItemID;
this.form.HExRate = deptRow.姹囩巼;
- this.CurrencyDialogShow = false;
- this.openData = false;
+ this.CurrencyDialogShow = false;
+ this.openData = false;
} else if (num == 3) {
console.log(deptRow);
if(this.areaType==1)
@@ -1107,6 +1107,12 @@
},
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
+ this.form.HSupID = this.form.HSupID || 0;
+ this.form.HEmpID = this.form.HEmpID || 0;
+ this.form.HDeptID = this.form.HDeptID || 0;
+ this.form.HCurID = this.form.HCurID || 0;
+ this.form.HExRate = this.form.HExRate || 1;
+ this.form.HSSID = this.form.HSSID || 0;
this.$refs["form"].validate((valid) => {
if (valid) {
let fhck = false;
@@ -1119,8 +1125,8 @@
{ field: 'HDeptID', name: '閮ㄩ棬' },
{ field: 'HCurID', name: '甯佸埆' },
{ field: 'HExRate', name: '姹囩巼' },
- { field: 'HSTOCKINORGID', name: '缁勭粐' },
- { field: 'HSSName', name: '缁撶畻鏂瑰紡' }
+ { field: 'HSTOCKINORGID', name: '缁勭粐' }
+ // { field: 'HSSName', name: '缁撶畻鏂瑰紡' }
];
for (let i = 0; i < requiredFields.length; i++) {
const field = requiredFields[i].field;
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
index fa7b0c9..06d03f6 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
@@ -22,7 +22,7 @@
<el-form-item label-width="78px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery"> 鎼� 绱�</el-button>
<el-button icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</el-button>
- <el-button type="primary" icon="el-icon-search" @click="set_ResCnz">閲嶆柊鍚屾</el-button>
+ <!-- <el-button type="primary" icon="el-icon-search" @click="set_ResCnz">閲嶆柊鍚屾</el-button> -->
</el-form-item>
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
diff --git a/src/views/component/CurrencyDialog/index.vue b/src/views/component/CurrencyDialog/index.vue
index 7a6a636..3918d0a 100644
--- a/src/views/component/CurrencyDialog/index.vue
+++ b/src/views/component/CurrencyDialog/index.vue
@@ -596,18 +596,32 @@
},
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
- this.OperationType = 3
- if (this.openPage) {
- if(this.openPage='Kf_StockOutRequestBill')
- {
- this.$emit('deptEmitDb', row, 10)
+ if (this.checkIsIframe()) {
+ window.parent.iframeCurrencyCallBack(row);
+ return;
}
- else
+ this.OperationType = 3;
+ if (this.openPage) {
this.$emit('deptEmitDb', row, 2)
+ this.closeDialog();
} else {
this.handleEdit();
}
},
+ // handleDblclick(row, column, cell, event) {
+ // this.OperationType = 3
+ // if (this.openPage) {
+ // if(this.openPage='Kf_StockOutRequestBill')
+ // {
+ // this.$emit('deptEmitDb', row, 10)
+ // }
+ // else{
+ // this.$emit('deptEmitDb', row, 2)
+ // }
+ // } else {
+ // this.handleEdit();
+ // }
+ // },
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
--
Gitblit v1.9.1