2024-1-9-2 基础信息-工厂-加工厂建模类型+调整页面

src/views/wms/factory/index.vue

@@ -67,6 +67,14 @@
 		>
 			<el-table-column label="组织名称" align="center" prop="factoryName" width="350"/>
 			<el-table-column label="组织编码" align="center" prop="factoryCode" />
+      <el-table-column prop="ftype" label="工厂建模类型" width="100" align="center">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.f_type"
+            :value="scope.row.ftype"
+          />
+        </template>
+      </el-table-column>
 			<el-table-column label="创建人" align="center" prop="createBy" />
       		<el-table-column label="创建时间" align="center" prop="createTime" />
       		<el-table-column prop="status" label="是否启用" align="center" >
@@ -103,27 +111,42 @@
 
 		<!-- 添加或修改工厂模型对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+			<el-form ref="form" :model="form" :rules="rules" label-width="120px">
-				<el-form-item label="父组织名" prop="parentId" style="width:430px">
+				<el-form-item label="父组织名" prop="parentId" style="width:350px">
 					<treeselect v-model="form.parentId" :options="factoryOptions" :normalizer="normalizer" placeholder="请选择父组织id" />
 				</el-form-item>
-				<el-form-item label="组织名称" prop="factoryName" style="width:430px">
+				<el-form-item label="组织名称" prop="factoryName" style="width:350px">
 					<el-input v-model="form.factoryName" placeholder="请输入组织名称" />
 				</el-form-item>
-				<el-form-item label="组织编码" prop="factoryCode" style="width:430px">
+				<el-form-item label="组织编码" prop="factoryCode" style="width:350px">
         	<el-input v-model="form.factoryCode" placeholder="请输入组织编码" />
    			</el-form-item>
-				<el-form-item label="负责人" prop="leader" style="width:430px">
+        <el-form-item label="工厂建模分类" prop="ftype">
+          <el-select
+            v-model="form.ftype"
+            placeholder="请选择设备类型"
+            filterable
+            style="width: 230px"
+          >
+            <el-option
+              v-for="dict in dict.type.f_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+				<el-form-item label="负责人" prop="leader" style="width:350px">
 					<el-input v-model="form.leader" placeholder="请输入负责人" />
 				</el-form-item>
-				<el-form-item label="联系电话" prop="phone" style="width:430px">
+				<el-form-item label="联系电话" prop="phone" style="width:350px">
 					<el-input v-model="form.phone" placeholder="请输入联系电话" />
 				</el-form-item>
-				<el-form-item label="邮箱" prop="email" style="width:430px">
+				<el-form-item label="邮箱" prop="email" style="width:350px">
 					<el-input v-model="form.email" placeholder="请输入邮箱" />
 				</el-form-item>
 				<el-form-item label="是否启用" prop="status" >
-          			<el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:350px">
+          <el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:230px">
             <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
           </el-select>
         </el-form-item>
@@ -143,6 +166,9 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
 	name: "Factory",
+  dicts: [
+    "f_type",
+  ],
 	components: {
 		Treeselect
 	},
@@ -184,7 +210,6 @@ export default {
               }],
 			// 表单参数
 			form: {},
-			// 表单校验
 			// 表单校验
       			rules: {
       			  factoryCode: [