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/AreaDialog/index.vue | 94 +++++++++++++++++++++++-----------------------
1 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/src/views/component/AreaDialog/index.vue b/src/views/component/AreaDialog/index.vue
index b1d526c..2cc522c 100644
--- a/src/views/component/AreaDialog/index.vue
+++ b/src/views/component/AreaDialog/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="鍦板尯浠ｇ爜">
- <el-input
- v-model="queryParams.HNumber"
+ <el-input
+ v-model="queryParams.HNumber"
placeholder="璇疯緭鍏ュ湴鍖轰唬鐮�"
clearable
/>
@@ -32,8 +32,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
/>
@@ -82,8 +82,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
/>
@@ -117,7 +117,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"
@@ -136,7 +136,7 @@
</el-table-column>
</el-table>
-
+
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -168,7 +168,7 @@
dialogVisible: false,
collapse: false,
loading: false,
-
+
// 鏌ヨ鍙傛暟
queryParams: {
HNumber: '',
@@ -177,24 +177,24 @@
Comparator: '0',
ColContent: ''
},
-
+
// 琛ㄦ牸鏁版嵁
tableData: [],
tableColumns: [],
selectedRow: null,
multipleSelection: [],
-
+
// 鍒嗛〉
pagination: {
page: 1,
size: 50,
total: 0
},
-
+
// 闅愯棌瀛楁
hiddenFields: ["HItemID", "鐭唬鐮�", "鐖剁骇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_AreaSet'
}
@@ -227,12 +227,12 @@
initData() {
this.loadTableData()
},
-
+
async loadTableData() {
this.loading = true
try {
const sWhere = this.buildQueryCondition()
-
+
const response = await axios.get(`${this.baseURL}/Gy_BadReason/Gy_AreaSetList`, {
params: {
sWhere: sWhere,
@@ -241,7 +241,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
@@ -256,11 +256,11 @@
this.loading = false
}
},
-
-
+
+
buildQueryCondition() {
let sWhere = ""
-
+
if (this.queryParams.HNumber) {
sWhere += ` and 鍦板尯浠ｇ爜 like '%${this.queryParams.HNumber}%'`
@@ -269,7 +269,7 @@
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) {
@@ -291,26 +291,26 @@
}
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 => {
@@ -322,12 +322,12 @@
sortable: true,
width: 200
}
-
-
+
+
if (item.ColmType === 'DateTime') {
column.formatter = this.formatDate
}
-
+
this.tableColumns.push(column)
}
})
@@ -346,13 +346,13 @@
this.tableColumns = [...this.tableColumns, ...defaultColumns]
}
},
-
+
// 鏌ヨ
handleQuery() {
this.pagination.page = 1
this.loadTableData()
},
-
+
// 閲嶇疆鏌ヨ
handleReset() {
this.queryParams = {
@@ -365,29 +365,29 @@
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
},
-
+
// 閫夋嫨鍙樺寲
handleSelectionChange(selection) {
this.multipleSelection = selection
@@ -395,7 +395,7 @@
this.selectedRow = selection[0]
}
},
-
+
// 纭閫夋嫨
confirmSelection() {
if (this.selectedRow) {
@@ -408,12 +408,12 @@
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
}
},
-
+
// 閫�鍑�
handleExit() {
this.dialogVisible = false
},
-
+
// 鍏抽棴瀵硅瘽妗�
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -422,20 +422,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 ''
--
Gitblit v1.9.1