From d0bec404f2c22ca04e8592f1a2ba0b39eab0be2f Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 22 五月 2023 09:37:03 +0800
Subject: [PATCH] Default Changelist
---
src/views/intellectInspect/inspectBasic/discriminate/index.vue | 53 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/src/views/intellectInspect/inspectBasic/discriminate/index.vue b/src/views/intellectInspect/inspectBasic/discriminate/index.vue
index 1ddaf5b..8c99fb4 100644
--- a/src/views/intellectInspect/inspectBasic/discriminate/index.vue
+++ b/src/views/intellectInspect/inspectBasic/discriminate/index.vue
@@ -20,13 +20,16 @@
<el-icon>
<ele-FolderAdd />
</el-icon>
- 新增巡检指标
+ 新增RFID
</el-button>
</div>
<el-table :data="RFIDData.data" style="width: 100%">
<el-table-column type="index" label="序号" width="60" />
<el-table-column prop="rfidName" label="RFID名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="rfid" label="RFID编码" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="exceptionHandler" label="异常处理人" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="exceptionHandlerPhone" label="异常处理人手机号" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="rfidDepartment" label="RFID所属车间" show-overflow-tooltip></el-table-column>
<el-table-column prop="createUserName" label="创建人" show-overflow-tooltip></el-table-column>
<el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
<el-table-column prop="lastEditUserName" label="最后修改人" show-overflow-tooltip></el-table-column>
@@ -39,19 +42,7 @@
</el-table-column>
</el-table>
<br />
- <el-pagination
- @size-change="onHandleSizeChange"
- @current-change="onHandleCurrentChange"
- :pager-count="5"
- :page-sizes="[10, 20, 30]"
- v-model:current-page="RFIDData.params.pageIndex"
- background
- v-model:page-size="RFIDData.params.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="RFIDData.total"
- class="page-position"
- >
- </el-pagination>
+ <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" :pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="RFIDData.params.pageIndex" background v-model:page-size="RFIDData.params.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="RFIDData.total" class="page-position"> </el-pagination>
<br />
<br />
</el-card>
@@ -65,7 +56,8 @@
import RFIDDialog from './components/RFIDDialog.vue';
import { RFIDApi } from '/@/api/intellectInspectSystem/RFID';
import { Edit, View, Plus, Delete, Refresh, Search, Download } from '@element-plus/icons-vue';
-
+import type { UploadProps, UploadUserFile } from 'element-plus'
+import {departmentApi} from "/@/api/systemManage/department";
// 定义接口来定义对象的类型
interface TableData {
quota: string;
@@ -79,6 +71,7 @@
interface TableDataState {
RFIDData: {
data: Array<TableData>;
+ departmentList: [];
total: number;
loading: boolean;
params: {
@@ -98,6 +91,7 @@
const state = reactive<TableDataState>({
RFIDData: {
data: [],
+ departmentList: [],
total: 0,
loading: false,
params: {
@@ -108,6 +102,7 @@
}
}
});
+
// 初始化表格数据
const initRFIDTableData = async () => {
let res = await RFIDApi().getRFIDList(state.RFIDData.params);
@@ -124,7 +119,7 @@
// 打开弹窗
const onOpenDialogRef = (type: string, value: any) => {
- RFIDDialogRef.value.openRFIDDialog(type, value);
+ RFIDDialogRef.value.openRFIDDialog(type, value, state.departmentList);
};
// 删除
const onDelProductionDevice = (row: any) => {
@@ -152,6 +147,18 @@
.catch(() => {});
};
+ const getDepartmentData = async () => {
+ let res = await departmentApi().getDepartmentList();
+ if (res.data.code === '200') {
+ state.departmentList = res.data.data;
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ };
+
const handleSearch = () => {
initRFIDTableData();
};
@@ -168,6 +175,7 @@
// 页面加载时
onMounted(() => {
initRFIDTableData();
+ getDepartmentData();
});
return {
@@ -187,4 +195,15 @@
});
</script>
-<style scoped></style>
+<style scoped>
+:deep(.el-textarea.is-disabled .el-textarea__inner) {
+ background-color: var(--el-card-bg-color);
+ color: var(--el-input-text-color, var(--el-text-color-regular));
+}
+:deep(.el-input.is-disabled .el-input__inner) {
+ color: var(--el-input-text-color, var(--el-text-color-regular));
+}
+:deep(.el-input.is-disabled .el-input__wrapper) {
+ background-color: var(--el-card-bg-color);
+}
+</style>
--
Gitblit v1.9.2