From aa148fcafe00faa9dffcbbd1ea181b373702448e Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 6 Sep 2023 16:37:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/equipment/index.vue | 35 +++++++------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index ea5bb60..32da029 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -90,13 +90,13 @@
 		</el-table-column>
 			<el-table-column label="设备名称" align="center" prop="equipmentName" />
 			<el-table-column label="规格型号" align="center" prop="equipmentSpec" />
-			<el-table-column label="设备类型编码" align="center" prop="equipmentTypeCode" width="100" />
-			<el-table-column label="设备类型名称" align="center" prop="equipmentTypeName" width="100"/>
-			<el-table-column label="所属车间编码" align="center" prop="workshopCode" width="100"/>
-			<el-table-column label="所属车间名称" align="center" prop="workshopName" width="100"/>
+			<el-table-column label="设备类型编码" align="center" prop="equipmentTypeCode" width="120" />
+			<el-table-column label="设备类型名称" align="center" prop="equipmentTypeName" width="120"/>
+			<el-table-column label="所属车间编码" align="center" prop="workshopCode" width="120"/>
+			<el-table-column label="所属车间名称" align="center" prop="workshopName" width="120"/>
 			<el-table-column label="设备状态" align="center" prop="status">
         <template slot-scope="scope">
-          {{ scope.row.status == 1 ? "是" : "否" }}
+          {{ scope.row.status == 1 ? "正常" : "停用" }}
         </template>
       </el-table-column>
 			<el-table-column label="单台能力工时" align="center" prop="unitWorkingHours" width="100"/>
@@ -266,10 +266,10 @@ export default {
 			},
 			  options: [{
           status: "1",
-          label: '是'
+          label: '正常'
         }, {
           status: "0",
-          label: '否'
+          label: '停用'
         }],
 			// 表单参数
 			form: {},
@@ -280,27 +280,6 @@ export default {
 				],
 				equipmentName: [
 					{ required: true, message: "设备类型名称不能为空", trigger: "blur" }
-				],
-				equipmentTypeId: [
-					{ required: true, message: "设备类型ID不能为空", trigger: "blur" }
-				],
-				workshopId: [
-					{ required: true, message: "所属车间ID不能为空", trigger: "blur" }
-				],
-				status: [
-					{ required: true, message: "设备状态不能为空", trigger: "change" }
-				],
-				unitWorkingHours: [
-					{ required: true, message: "单台能力工时不能为空", trigger: "blur" }
-				],
-				workshopSection: [
-					{ required: true, message: "工段不能为空", trigger: "blur" }
-				],
-				equipmentLocation: [
-					{ required: true, message: "设备位置不能为空", trigger: "blur" }
-				],
-				hourlyUnitPrice: [
-					{ required: true, message: "工时单价不能为空", trigger: "blur" }
 				]
 			}
 		};