Merge remote-tracking branch 'origin/master'

yangwl
wws 1 year ago
commit a8cbb119fe

@ -9,6 +9,13 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="组织编码" prop="factoryCode">
<el-input
v-model="queryParams.factoryCode"
placeholder="请输入组织编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="启用状态" prop="status"> <el-form-item label="启用状态" prop="status">
<el-input <el-input
@ -58,7 +65,7 @@
:default-expand-all="isExpandAll" :default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
> >
<el-table-column label="组织名称" align="center" prop="factoryName" /> <el-table-column label="组织名称" align="center" prop="factoryName" width="350"/>
<el-table-column label="组织编码" align="center" prop="factoryCode" /> <el-table-column label="组织编码" align="center" prop="factoryCode" />
<el-table-column label="创建人" align="center" prop="createBy" /> <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" /> <el-table-column label="创建时间" align="center" prop="createTime" />
@ -177,8 +184,18 @@ export default {
}], }],
// //
form: {}, form: {},
//
// //
rules: { rules: {
factoryCode: [
{ required: true, message: "组织编码不能为空", trigger: "blur" }
],
factoryName: [
{ required: true, message: "组织名称不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "组织状态不能为空", trigger: "blur" }
]
} }
}; };
}, },

Loading…
Cancel
Save