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/SettleStyleDialog/index.vue | 116 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/src/views/component/SettleStyleDialog/index.vue b/src/views/component/SettleStyleDialog/index.vue
index e15d97a..c265627 100644
--- a/src/views/component/SettleStyleDialog/index.vue
+++ b/src/views/component/SettleStyleDialog/index.vue
@@ -11,21 +11,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="6">
<el-form-item label="浠ｇ爜">
- <el-input
- v-model="queryParams.HNumber"
+ <el-input
+ v-model="queryParams.HNumber"
placeholder="璇疯緭鍏ヤ唬鐮�"
clearable
@keyup.enter.native="handleQuery"
@@ -34,8 +34,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="鍚嶇О">
- <el-input
- v-model="queryParams.HName"
+ <el-input
+ v-model="queryParams.HName"
placeholder="璇疯緭鍏ュ悕绉�"
clearable
@keyup.enter.native="handleQuery"
@@ -44,8 +44,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="缁撶畻鏂瑰紡浠ｇ爜">
- <el-input
- v-model="queryParams.HNumber2"
+ <el-input
+ v-model="queryParams.HNumber2"
placeholder="璇疯緭鍏ョ粨绠楁柟寮忎唬鐮�"
clearable
style="width: 190px"
@@ -97,8 +97,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"
@@ -138,7 +138,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"
@@ -189,7 +189,7 @@
dialogVisible: false,
collapse: false,
loading: false,
-
+
// 鏌ヨ鍙傛暟
queryParams: {
HNumber: '',
@@ -199,28 +199,28 @@
Comparator: '0',
ColContent: ''
},
-
+
// 琛ㄦ牸鏁版嵁
tableData: [],
tableColumns: [],
selectedRow: null,
multipleSelection: [],
-
+
// 鍒嗛〉
pagination: {
page: 1,
size: 50,
total: 0
},
-
+
// 杩囨护鏂规
currentFilterScheme: '',
HInterID_Choose: 0,
-
+
// 闅愯棌瀛楁
hiddenFields: ["HItemID", "HUSEORGID", "HCREATEORGID", "鐖剁骇ID"],
-
- 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_SettleStyle',
HModuleName: '缁撶畻鏂瑰紡缁存姢',
@@ -257,13 +257,13 @@
this.loadTableData()
this.getDefaultFilterScheme()
},
-
+
// 鍔犺浇琛ㄦ牸鏁版嵁
async loadTableData() {
this.loading = true
try {
const sWhere = this.buildQueryCondition()
-
+
const response = await axios.get(`${this.baseURL}/Gy_SettleStyle/SettleStyleList`, {
params: {
sWhere: sWhere,
@@ -271,7 +271,7 @@
Organization: this.Organization
}
})
-
+
if (response.data.count === 1) {
this.tableData = response.data.data
console.log('缁撶畻鏂瑰紡鏁版嵁:', this.tableData)
@@ -287,11 +287,11 @@
this.loading = false
}
},
-
+
// 鏋勫缓鏌ヨ鏉′欢
buildQueryCondition() {
let sWhere = ""
-
+
// 鍩烘湰鏌ヨ鏉′欢
if (this.queryParams.HNumber) {
sWhere += ` and 缁撶畻鏂瑰紡浠ｇ爜 like '%${this.queryParams.HNumber}%'`
@@ -299,9 +299,9 @@
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) {
@@ -323,26 +323,26 @@
}
sWhere += ` and ${this.queryParams.ColName} ${com}`
}
-
+
// 娣诲姞鎵撳紑绫诲瀷鐨勮繃婊ゆ潯浠�
sWhere += this.addSWhereByOpenType()
-
+
return sWhere
},
-
+
// 鏍规嵁鎵撳紑绫诲瀷娣诲姞鏉′欢
addSWhereByOpenType() {
// 杩欓噷鍙互鏍规嵁闇�瑕佹坊鍔犵壒瀹氱殑杩囨护鏉′欢
return " and 绂佺敤鏍囪 = ''"
},
-
+
// 鐢熸垚琛ㄦ牸鍒�
generateTableColumns(columnList) {
this.tableColumns = []
-
+
// 娣诲姞閫夋嫨鍒�
this.tableColumns.push({ type: 'selection', fixed: 'left' })
-
+
// 鍔ㄦ�佺敓鎴愬垪
if (columnList && columnList.length > 0) {
columnList.forEach(item => {
@@ -354,12 +354,12 @@
sortable: true,
width: 200
}
-
+
// 鏍规嵁瀛楁绫诲瀷璁剧疆涓嶅悓鐨勬ā鏉�
if (item.ColmType === 'DateTime') {
column.formatter = this.formatDate
}
-
+
this.tableColumns.push(column)
}
})
@@ -378,13 +378,13 @@
this.tableColumns = [...this.tableColumns, ...defaultColumns]
}
},
-
+
// 鏌ヨ
handleQuery() {
this.pagination.page = 1
this.loadTableData()
},
-
+
// 閲嶇疆鏌ヨ
handleReset() {
this.queryParams = {
@@ -398,14 +398,14 @@
this.pagination.page = 1
this.loadTableData()
},
-
+
// 閲嶆柊鍚屾
async handleResCnz() {
if (!this.queryParams.HNumber2) {
this.$message.warning('璇疯緭鍏ョ粨绠楁柟寮忎唬鐮�')
return
}
-
+
try {
const response = await axios.get(`${this.baseURL}/Gy_SettleStyle/Gy_SettleStyleViewApi`, {
params: {
@@ -413,7 +413,7 @@
Type: 'JSFS'
}
})
-
+
if (response.data.count === 1) {
this.$message.success(response.data.Message)
this.loadTableData() // 閲嶆柊鍔犺浇鏁版嵁
@@ -425,29 +425,29 @@
this.$message.error('閲嶆柊鍚屾澶辫触')
}
},
-
+
// 鍒锋柊
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
},
-
+
// 閫夋嫨鍙樺寲
handleSelectionChange(selection) {
this.multipleSelection = selection
@@ -455,7 +455,7 @@
this.selectedRow = selection[0]
}
},
-
+
// 纭閫夋嫨
confirmSelection() {
if (this.selectedRow) {
@@ -468,12 +468,12 @@
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
}
},
-
+
// 閫�鍑�
handleExit() {
this.dialogVisible = false
},
-
+
// 鍏抽棴瀵硅瘽妗�
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -482,20 +482,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 ''
@@ -506,7 +506,7 @@
return dateString
}
},
-
+
// 鑾峰彇榛樿杩囨护鏂规
async getDefaultFilterScheme() {
try {
@@ -518,12 +518,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)
}
@@ -531,7 +531,7 @@
console.error('鑾峰彇杩囨护鏂规澶辫触:', error)
}
},
-
+
// 搴旂敤杩囨护鏉′欢
applyFilterConditions(filterData) {
filterData.forEach(item => {
@@ -540,17 +540,17 @@
}
})
},
-
+
// 淇濆瓨杩囨护鏂规
handleSaveScheme() {
this.$message.info('淇濆瓨鏂规鍔熻兘')
},
-
+
// 璇诲彇杩囨护鏂规
handleReadScheme() {
this.$message.info('璇诲彇鏂规鍔熻兘')
},
-
+
// 鍒楄缃�
handleColumnSetting() {
this.$message.info('鍒楄缃姛鑳�')
@@ -606,4 +606,4 @@
color: #fc9393;
margin: 10px 0;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1