From 4cdb79b66c656cfe52bcccdf338f5a655f2b965b Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 17 四月 2025 10:47:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/basicData/apsPlant/index.vue | 70 ++++++++++------------------------
1 files changed, 21 insertions(+), 49 deletions(-)
diff --git a/src/views/basicData/apsPlant/index.vue b/src/views/basicData/apsPlant/index.vue
index 3fdb1f1..c9806a5 100644
--- a/src/views/basicData/apsPlant/index.vue
+++ b/src/views/basicData/apsPlant/index.vue
@@ -1,37 +1,5 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="宸ュ巶鍚嶇О" prop="plantName">
- <el-input
- v-model="queryParams.plantName"
- placeholder="璇疯緭鍏ュ伐鍘傚悕绉�"
- clearable
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <el-form-item label="宸ュ巶缂栫爜" prop="plantCode">
- <el-input
- v-model="queryParams.plantCode"
- placeholder="璇疯緭鍏ュ伐鍘傜紪鐮�"
- clearable
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鍚敤鐘舵��" prop="status">
- <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨鍚敤鐘舵��" clearable>
- <el-option
- v-for="dict in aps_plant_status"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@@ -40,7 +8,7 @@
plain
icon="Plus"
@click="handleAdd"
- v-hasPermi="['aps_plant:aps_plant:add']"
+ v-hasPermi="['plant:add']"
>鏂板</el-button>
</el-col>
<el-col :span="1.5">
@@ -50,10 +18,10 @@
icon="Edit"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['aps_plant:aps_plant:edit']"
+ v-hasPermi="['plant:edit']"
>淇敼</el-button>
</el-col>
- <el-col :span="1.5">
+<!-- <el-col :span="1.5">
<el-button
type="danger"
plain
@@ -62,14 +30,14 @@
@click="handleDelete"
v-hasPermi="['aps_plant:aps_plant:remove']"
>鍒犻櫎</el-button>
- </el-col>
+ </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
- v-hasPermi="['aps_plant:aps_plant:export']"
+ v-hasPermi="['plant:export']"
>瀵煎嚭</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -86,12 +54,10 @@
</el-table-column>
<el-table-column label="鍒涘缓鑰�" align="center" prop="createBy" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" />
- <el-table-column label="鏇存柊鑰�" align="center" prop="updateBy" />
- <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['aps_plant:aps_plant:edit']">淇敼</el-button>
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['aps_plant:aps_plant:remove']">鍒犻櫎</el-button>
+ <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['plant:edit']">淇敼</el-button>
+<!-- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['aps_plant:aps_plant:remove']">鍒犻櫎</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -107,14 +73,12 @@
<!-- 娣诲姞鎴栦慨鏀瑰伐鍘傜鐞嗗璇濇 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="aps_plantRef" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="id" prop="id">
- <el-input v-model="form.id" placeholder="璇疯緭鍏d" />
- </el-form-item>
+
<el-form-item label="宸ュ巶鍚嶇О" prop="plantName">
<el-input v-model="form.plantName" placeholder="璇疯緭鍏ュ伐鍘傚悕绉�" />
</el-form-item>
<el-form-item label="宸ュ巶缂栫爜" prop="plantCode">
- <el-input v-model="form.plantCode" placeholder="璇疯緭鍏ュ伐鍘傜紪鐮�" />
+ <el-input v-model="form.plantCode" placeholder="璇疯緭鍏ュ伐鍘傜紪鐮�" :disabled=disabled />
</el-form-item>
<el-form-item label="鍚敤鐘舵��" prop="status">
<el-radio-group v-model="form.status">
@@ -151,7 +115,7 @@
const multiple = ref(true);
const total = ref(0);
const title = ref("");
-
+const disabled = ref(false);
const data = reactive({
form: {},
queryParams: {
@@ -162,8 +126,14 @@
status: null,
},
rules: {
- id: [
- { required: true, message: "id涓嶈兘涓虹┖", trigger: "blur" }
+ plantName: [
+ { required: true, message: "宸ュ巶鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ plantCode: [
+ { required: true, message: "宸ュ巶缂栫爜涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ status: [
+ { required: true, message: "鍚敤鐘舵�佷笉鑳戒负绌�", trigger: "blur" },
],
}
});
@@ -225,12 +195,14 @@
reset();
open.value = true;
title.value = "娣诲姞宸ュ巶绠＄悊";
+ disabled.value = false;
}
/** 淇敼鎸夐挳鎿嶄綔 */
function handleUpdate(row) {
reset();
const _id = row.id || ids.value
+ disabled.value = true;
getAps_plant(_id).then(response => {
form.value = response.data;
open.value = true;
@@ -262,7 +234,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
function handleDelete(row) {
const _ids = row.id || ids.value;
- proxy.$modal.confirm('鏄惁纭鍒犻櫎宸ュ巶绠＄悊缂栧彿涓�"' + _ids + '"鐨勬暟鎹」锛�').then(function() {
+ proxy.$modal.confirm('鏄惁纭鍒犻櫎宸ュ巶鏁版嵁锛�').then(function() {
return delAps_plant(_ids);
}).then(() => {
getList();
--
Gitblit v1.9.3