From a0010bcabbfbc3771aa05d54094f5d02bcdd5609 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 15 十二月 2025 08:42:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

---
 src/views/component/CurrencyDialog/index.vue |  104 ++++++++++++++++++++++++++--------------------------
 1 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/views/component/CurrencyDialog/index.vue b/src/views/component/CurrencyDialog/index.vue
index 943ce98..44b393e 100644
--- a/src/views/component/CurrencyDialog/index.vue
+++ b/src/views/component/CurrencyDialog/index.vue
@@ -10,21 +10,21 @@
       <el-card class="search-card">
         <div slot="header" class="clearfix">
           <span>鏌ヨ鏉′欢</span>
-          <el-button 
-            style="float: right; padding: 3px 0" 
+          <el-button
+            style="float: right; padding: 3px 0"
             type="text"
             @click="toggleCollapse"
           >
             {{ collapse ? '灞曞紑' : '鏀惰捣' }}
           </el-button>
         </div>
-        
+
         <el-form :model="queryParams" ref="queryForm" :inline="true">
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="璐у竵浠g爜">
-                <el-input 
-                  v-model="queryParams.HNumber" 
+                <el-input
+                  v-model="queryParams.HNumber"
                   placeholder="璇疯緭鍏ヨ揣甯佷唬鐮�"
                   clearable
                   @keyup.enter.native="handleQuery"
@@ -33,8 +33,8 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="璐у竵鍚嶇О">
-                <el-input 
-                  v-model="queryParams.HName" 
+                <el-input
+                  v-model="queryParams.HName"
                   placeholder="璇疯緭鍏ヨ揣甯佸悕绉�"
                   clearable
                   @keyup.enter.native="handleQuery"
@@ -84,8 +84,8 @@
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="鍐呭">
-                    <el-input 
-                      v-model="queryParams.ColContent" 
+                    <el-input
+                      v-model="queryParams.ColContent"
                       placeholder="璇疯緭鍏ュ唴瀹�"
                       clearable
                       @keyup.enter.native="handleQuery"
@@ -124,7 +124,7 @@
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column 
+          <el-table-column
             v-for="column in tableColumns"
             :key="column.field"
             :prop="column.field"
@@ -192,24 +192,24 @@
         Comparator: '0',
         ColContent: ''
       },
-      
+
       tableData: [],
       tableColumns: [],
       selectedRow: null,
       multipleSelection: [],
-      
+
       pagination: {
         page: 1,
         size: 50,
         total: 0
       },
-      
+
       currentFilterScheme: '',
       HInterID_Choose: 0,
-      
+
       hiddenFields: ["HItemID"],
-      
-      baseURL: process.env.VUE_APP_BASE_URL || 'http://47.96.97.237/API/',
+
+      baseURL: process.env.VUE_APP_BASE_API || 'http://47.96.97.237/API/',
       user: 'admin',
       HModName: 'Gy_Currency',
       HModuleName: '璐у竵鍒楄〃缁存姢'
@@ -245,12 +245,12 @@
       this.loadTableData()
       this.getDefaultFilterScheme()
     },
-    
+
     async loadTableData() {
       this.loading = true
       try {
         const sWhere = this.buildQueryCondition()
-        
+
         const response = await axios.get(`${this.baseURL}/Gy_Currency/list1`, {
           params: {
             sWhere: sWhere,
@@ -259,7 +259,7 @@
             size: this.pagination.size
           }
         })
-        
+
         if (response.data.count === 1) {
           this.tableData = response.data.data
           this.pagination.total = response.data.total || response.data.data.length
@@ -274,18 +274,18 @@
         this.loading = false
       }
     },
-    
+
     buildQueryCondition() {
       let sWhere = ""
-      
+
       if (this.queryParams.HNumber) {
         sWhere += ` and 璐у竵浠g爜 like '%${this.queryParams.HNumber}%'`
       }
       if (this.queryParams.HName) {
         sWhere += ` and 璐у竵鍚嶇О like '%${this.queryParams.HName}%'`
       }
-      
-      if (this.queryParams.ColName && this.queryParams.ColName !== "0" && 
+
+      if (this.queryParams.ColName && this.queryParams.ColName !== "0" &&
           this.queryParams.Comparator && this.queryParams.Comparator !== "0") {
         let com = ""
         switch (this.queryParams.Comparator) {
@@ -307,24 +307,24 @@
         }
         sWhere += ` and ${this.queryParams.ColName} ${com}`
       }
-      
+
       sWhere += this.addSWhereByOpenType()
-      
+
       return sWhere
     },
-    
+
     addSWhereByOpenType() {
 
       return " and 绂佺敤鏍囪 = '' and 瀹℃牳浜� != ''"
     },
-    
+
     // 鐢熸垚琛ㄦ牸鍒�
     generateTableColumns(columnList) {
       this.tableColumns = []
-      
+
       // 娣诲姞閫夋嫨鍒�
       this.tableColumns.push({ type: 'selection', fixed: 'left' })
-      
+
       // 鍔ㄦ�佺敓鎴愬垪
       if (columnList && columnList.length > 0) {
         columnList.forEach(item => {
@@ -336,11 +336,11 @@
               sortable: true,
               width: 200
             }
-            
+
             if (item.ColmType === 'DateTime') {
               column.formatter = this.formatDate
             }
-            
+
             this.tableColumns.push(column)
           }
         })
@@ -361,13 +361,13 @@
         this.tableColumns = [...this.tableColumns, ...defaultColumns]
       }
     },
-    
+
     // 鏌ヨ
     handleQuery() {
       this.pagination.page = 1
       this.loadTableData()
     },
-    
+
     // 閲嶇疆鏌ヨ
     handleReset() {
       this.queryParams = {
@@ -380,35 +380,35 @@
       this.pagination.page = 1
       this.loadTableData()
     },
-    
+
     // 鍒锋柊
     handleRefresh() {
       this.loadTableData()
     },
-    
+
     // 鍒囨崲鎶樺彔鐘舵��
     toggleCollapse() {
       this.collapse = !this.collapse
     },
-    
+
     // 琛屽弻鍑讳簨浠�
     handleRowDblClick(row) {
       this.selectedRow = row
       this.confirmSelection()
     },
-    
+
     // 琛岀偣鍑讳簨浠�
     handleRowClick(row) {
       this.$refs.table.toggleRowSelection(row)
       this.selectedRow = row
     },
-    
+
     handleCurrencyCodeClick(row) {
       console.log('鐐瑰嚮璐у竵浠g爜:', row)
       this.selectedRow = row
       this.confirmSelection()
     },
-    
+
     // 閫夋嫨鍙樺寲
     handleSelectionChange(selection) {
       this.multipleSelection = selection
@@ -416,7 +416,7 @@
         this.selectedRow = selection[0]
       }
     },
-    
+
     // 纭閫夋嫨
     confirmSelection() {
       if (this.selectedRow) {
@@ -430,12 +430,12 @@
         this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
       }
     },
-    
+
     // 閫�鍑�
     handleExit() {
       this.dialogVisible = false
     },
-    
+
     // 鍏抽棴瀵硅瘽妗�
     handleClose(done) {
       this.$confirm('纭鍏抽棴锛�')
@@ -444,20 +444,20 @@
         })
         .catch(_ => {})
     },
-    
+
     // 鍒嗛〉澶у皬鏀瑰彉
     handleSizeChange(size) {
       this.pagination.size = size
       this.pagination.page = 1
       this.loadTableData()
     },
-    
+
     // 褰撳墠椤垫敼鍙�
     handleCurrentChange(page) {
       this.pagination.page = page
       this.loadTableData()
     },
-    
+
     // 鏍煎紡鍖栨棩鏈�
     formatDate(dateString) {
       if (!dateString) return ''
@@ -468,7 +468,7 @@
         return dateString
       }
     },
-    
+
     // 鑾峰彇榛樿杩囨护鏂规
     async getDefaultFilterScheme() {
       try {
@@ -480,12 +480,12 @@
             Type: "Default"
           }
         })
-        
+
         if (response.data.count === 1) {
           const data = response.data.data[0]
           this.HInterID_Choose = data.hmainid
           this.currentFilterScheme = `褰撳墠杩囨护鏂规锛�${data.鏂规鍚嶇О} (${data.澶囨敞})`
-          
+
           // 搴旂敤杩囨护鏉′欢
           this.applyFilterConditions(response.data.data)
         }
@@ -493,7 +493,7 @@
         console.error('鑾峰彇杩囨护鏂规澶辫触:', error)
       }
     },
-    
+
     // 搴旂敤杩囨护鏉′欢
     applyFilterConditions(filterData) {
       filterData.forEach(item => {
@@ -502,13 +502,13 @@
         }
       })
     },
-    
+
     // 淇濆瓨杩囨护鏂规
     handleSaveScheme() {
       // 瀹炵幇淇濆瓨杩囨护鏂规鐨勯�昏緫
       this.$message.info('淇濆瓨鏂规鍔熻兘')
     },
-    
+
     // 璇诲彇杩囨护鏂规
     handleReadScheme() {
       // 瀹炵幇璇诲彇杩囨护鏂规鐨勯�昏緫
@@ -565,4 +565,4 @@
   color: #fc9393;
   margin: 10px 0;
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.1