From da52c668f82f4217e0b56c0fabe72d36fac2dd28 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 14:07:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/machinery/index.vue | 54 +++++++++++++------------------
 1 file changed, 23 insertions(+), 31 deletions(-)

diff --git a/src/views/wms/machinery/index.vue b/src/views/wms/machinery/index.vue
index 90b8375..920fdfc 100644
--- a/src/views/wms/machinery/index.vue
+++ b/src/views/wms/machinery/index.vue
@@ -75,6 +75,7 @@
             <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
 			<el-table-column label="机台编码" align="center" prop="machineryCode" />
 			<el-table-column label="机台名称" align="center" prop="machineryName" />
+			<el-table-column label="设备类型" align="center" prop="machineryTypeCode" />
 			<el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column prop="status" label="是否启用" align="center" >
@@ -113,41 +114,36 @@
 		<!-- 添加或修改机台管理对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
-				<el-form-item label="机台编码" prop="machineryCode">
+				<el-form-item label="机台编码" prop="machineryCode" style="width:400px">
 					<el-input v-model="form.machineryCode" placeholder="请输入机台类型编码" />
 				</el-form-item>
-				<el-form-item label="机台名称" prop="machineryName">
+				<el-form-item label="机台名称" prop="machineryName" style="width:400px">
 					<el-input v-model="form.machineryName" placeholder="请输入机台类型名称" />
 				</el-form-item>
-				<el-form-item label="品牌" prop="machineryBrand">
+				<el-form-item label="品牌" prop="machineryBrand" style="width:400px">
 					<el-input v-model="form.machineryBrand" placeholder="请输入品牌" />
 				</el-form-item>
-				<el-form-item label="规格型号" prop="machinerySpec">
+				<el-form-item label="规格型号" prop="machinerySpec" style="width:400px">
 					<el-input v-model="form.machinerySpec" placeholder="请输入规格型号" />
 				</el-form-item>
-				<el-form-item label="机台类型ID" prop="machineryTypeId">
-					<el-input v-model="form.machineryTypeId" placeholder="请输入机台类型ID" />
-				</el-form-item>
-				<el-form-item label="机台类型编码" prop="machineryTypeCode">
-					<el-input v-model="form.machineryTypeCode" placeholder="请输入机台类型编码" />
-				</el-form-item>
-				<el-form-item label="机台类型名称" prop="machineryTypeName">
-					<el-input v-model="form.machineryTypeName" placeholder="请输入机台类型名称" />
-				</el-form-item>
-				<el-form-item label="所属线体ID" prop="workshopId">
-					<el-input v-model="form.workshopId" placeholder="请输入所属车间ID" />
+				<el-form-item label="设备类型" prop="machineryTypeCode">
+					<el-select v-model="form.machineryTypeCode" placeholder="请选择设备类型" style="width:300px">
+            <el-option
+              v-for="dict in dict.type.equ_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
 				</el-form-item>
-				<el-form-item label="所属线体编码" prop="workshopCode">
+				<el-form-item label="所属线体编码" prop="workshopCode" style="width:400px">
 					<el-input v-model="form.workshopCode" placeholder="请输入所属车间编码" />
 				</el-form-item>
-				<el-form-item label="机台产能" prop="">
-        	<el-input v-model="form.workshopCode" placeholder="" />
-   			</el-form-item>
-				<el-form-item label="所属车间名称" prop="workshopName">
+				<el-form-item label="所属车间名称" prop="workshopName" style="width:400px">
 					<el-input v-model="form.workshopName" placeholder="请输入所属车间名称" />
 				</el-form-item>
-				<el-form-item label="是否启用" prop="status">
-          <el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable>
+				<el-form-item label="是否启用" prop="status" style="width:400px">
+          <el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:300px">
             <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
           </el-select>
         </el-form-item>
@@ -166,6 +162,7 @@ import { listMachinery, getMachinery, delMachinery, addMachinery, updateMachiner
 
 export default {
 	name: "Machinery",
+	dicts: ['sys_normal_disable', 'equ_type'],
 	data() {
 		return {
 			// 遮罩层
@@ -220,15 +217,6 @@ export default {
 				machineryCode: [
 					{ required: true, message: "机台类型编码不能为空", trigger: "blur" }
 				],
-				machineryName: [
-					{ required: true, message: "机台类型名称不能为空", trigger: "blur" }
-				],
-				machineryTypeId: [
-					{ required: true, message: "机台类型ID不能为空", trigger: "blur" }
-				],
-				workshopId: [
-					{ required: true, message: "所属车间ID不能为空", trigger: "blur" }
-				],
 				status: [
 					{ required: true, message: "机台状态不能为空", trigger: "change" }
 				],
@@ -239,6 +227,10 @@ export default {
 		this.getList();
 	},
 	methods: {
+	   // 生成表头序号
+        indexMethod(index){
+        return index+1 ;
+        },
 		/** 查询机台管理列表 */
 		getList() {
 			this.loading = true;