Commit 553dd49f authored by 张海景's avatar 张海景

update:修改系统管理、系统工具和主数据页面排版

parent 3d8f4d87
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-row>
<el-col :span="8">
<el-form-item label="客户编码" prop="clientCode">
<el-input
v-model="queryParams.clientCode"
......@@ -11,8 +9,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户名称" prop="clientName">
<el-input
v-model="queryParams.clientName"
......@@ -21,8 +17,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户简称" prop="clientNick">
<el-input
v-model="queryParams.clientNick"
......@@ -31,10 +25,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="客户英文名称" prop="clientEn">
<el-input
v-model="queryParams.clientEn"
......@@ -43,14 +33,11 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否启用" prop="enableFlag">
<el-select
v-model="queryParams.enableFlag"
placeholder="是否启用"
clearable
style="width: 215px"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
......@@ -60,14 +47,10 @@
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
......
......@@ -362,7 +362,7 @@
<el-col :span="12">
<el-form-item label="单位" prop="unitOfMeasure">
<el-select
style="width: 100%;"
v-model="form.unitOfMeasure"
disabled
v-if="optType == 'view'"
......@@ -377,6 +377,7 @@
</el-select>
<el-select
style="width: 100%;"
v-model="form.unitOfMeasure"
placeholder="请选择单位"
filterable
......
......@@ -141,9 +141,9 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-row>
<el-col :span="10">
<el-col :span="12">
<el-form-item label="尺码组类型" label-width="100px" prop="sizeType">
<el-select v-model="form.sizeType" disabled v-if="optType=='view'">
<el-select style="width: 100%;" v-model="form.sizeType" disabled v-if="optType=='view'">
<el-option
v-for="dict in dict.type.size_type"
:key="dict.value"
......@@ -152,7 +152,7 @@
></el-option>
</el-select>
<el-select v-model="form.sizeType" placeholder="请选择尺码组类型" v-else>
<el-select style="width: 100%;" v-model="form.sizeType" placeholder="请选择尺码组类型" v-else>
<el-option
v-for="dict in dict.type.size_type"
:key="dict.value"
......@@ -162,7 +162,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-col :span="12">
<el-form-item label="是否启用" label-width="100px" prop="enableFlag">
<el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
<el-radio
......@@ -183,13 +183,13 @@
</el-row>
</el-row>
<el-row>
<el-col :span="10">
<el-col :span="12">
<el-form-item label="尺码组编码" label-width="100px" prop="sizeGroupCode">
<el-input v-model="form.sizeGroupCode" readonly="readonly" v-if="optType == 'view'"/>
<el-input v-model="form.sizeGroupCode" placeholder="请输入尺码组编码" v-else/>
</el-form-item>
</el-col>
<el-col :span="10">
<el-col :span="12">
<el-form-item label="尺码组名称" label-width="100px" prop="sizeGroupName">
<el-input v-model="form.sizeGroupName" readonly="readonly" v-if="optType=='view'"/>
<el-input v-model="form.sizeGroupName" placeholder="请输入尺码组名称" v-else/>
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-row>
<el-col :span="8">
<el-form-item label="供应商编码" prop="vendorCode">
<el-input
v-model="queryParams.vendorCode"
......@@ -11,8 +9,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="供应商名称" prop="vendorName">
<el-input
v-model="queryParams.vendorName"
......@@ -21,8 +17,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="供应商简称" prop="vendorNick">
<el-input
v-model="queryParams.vendorNick"
......@@ -31,10 +25,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="英文名称" prop="vendorEn">
<el-input
v-model="queryParams.vendorEn"
......@@ -43,8 +33,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否启用" prop="enableFlag">
<el-select
v-model="queryParams.enableFlag"
......@@ -60,14 +48,10 @@
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
......@@ -130,7 +114,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="供应商编码" align="center" prop="vendorCode" >
<template slot-scope="scope">
<el-button
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:md:vendor:query']"
......@@ -171,7 +155,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
......@@ -182,20 +166,19 @@
<!-- 添加或修改供应商对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-row>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="供应商编码" prop="vendorCode">
<el-input v-model="form.vendorCode" placeholder="请输入供应商编码" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch>
<div style="display:flex;align-items: center;">
<el-input v-model="form.vendorCode" placeholder="请输入供应商编码" />
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
style="width:175px;margin-left:10px;"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -484,7 +467,7 @@ export default {
},
// 表单重置
reset() {
this.form = {
this.form = {
vendorId: null,
vendorCode: null,
vendorName: null,
......@@ -635,7 +618,7 @@ export default {
});
}else{
this.form.vendorCode = null;
}
}
}
}
};
......
......@@ -8,8 +8,6 @@
v-show="showSearch"
label-width="100px"
>
<el-row>
<el-col :span="8">
<el-form-item label="工作站编码" prop="workstationCode">
<el-input
v-model="queryParams.workstationCode"
......@@ -18,8 +16,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工作站名称" prop="workstationName">
<el-input
v-model="queryParams.workstationName"
......@@ -28,8 +24,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所在车间名称" prop="workshopName">
<el-select
v-model="queryParams.workshopId"
......@@ -43,10 +37,6 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="所属工序" prop="processName">
<el-select v-model="queryParams.processId" placeholder="请选择工序">
<el-option
......@@ -57,8 +47,6 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button
type="primary"
......@@ -71,8 +59,6 @@
>重置</el-button
>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
......@@ -236,7 +222,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="所在车间" prop="workshopId">
<el-select v-model="form.workshopId" placeholder="请选择车间">
<el-select style="width:100%;" v-model="form.workshopId" placeholder="请选择车间">
<el-option
v-for="item in workshopOptions"
:key="item.workshopId"
......@@ -248,9 +234,9 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="所属工序" prop="processId">
<el-select v-model="form.processId" placeholder="请选择工序">
<el-select style="width:100%;" v-model="form.processId" placeholder="请选择工序">
<el-option
v-for="item in processOptions"
:key="item.processId"
......
......@@ -118,7 +118,7 @@
<el-input v-model="form.name" placeholder="请输入报表名称" />
</el-form-item>
<el-form-item label="报表类型" prop="reportType">
<el-select v-model="form.reportType" placeholder="请选择模板类型">
<el-select style="width:100%;" v-model="form.reportType" placeholder="请选择模板类型">
<el-option
v-for="dict in dict.type.sys_report_type"
:key="dict.value"
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="登录地址" prop="ipaddr">
<el-input
v-model="queryParams.ipaddr"
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="系统模块" prop="title">
<el-input
v-model="queryParams.title"
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="规则名称" prop="ruleName">
<el-input
v-model="queryParams.ruleName"
......@@ -332,4 +332,4 @@ export default {
}
}
};
</script>
\ No newline at end of file
</script>
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="参数名称" prop="configName">
<el-input
v-model="queryParams.configName"
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" v-show="showSearch">
<el-form-item label="部门名称" prop="deptName">
<el-input
v-model="queryParams.deptName"
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="字典名称" prop="dictName">
<el-input
v-model="queryParams.dictName"
......@@ -343,4 +343,4 @@ export default {
}
}
};
</script>
\ No newline at end of file
</script>
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="菜单名称" prop="menuName">
<el-input
v-model="queryParams.menuName"
......@@ -75,7 +75,7 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" fixed="right" width="250" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="岗位编码" prop="postCode">
<el-input
v-model="queryParams.postCode"
......
......@@ -148,7 +148,7 @@
<el-input v-model="form.templateName" placeholder="请输入模板名称" />
</el-form-item>
<el-form-item label="模板类型" prop="templateType">
<el-select v-model="form.templateType" placeholder="请选择模板类型">
<el-select v-model="form.templateType" placeholder="请选择模板类型">
<el-option
v-for="dict in dict.type.print_template_type"
:key="dict.value"
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" v-show="showSearch">
<el-form-item label="角色名称" prop="roleName">
<el-input
v-model="queryParams.roleName"
placeholder="请输入角色名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
......@@ -15,7 +14,6 @@
v-model="queryParams.roleKey"
placeholder="请输入权限字符"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
......@@ -24,7 +22,6 @@
v-model="queryParams.status"
placeholder="角色状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_normal_disable"
......@@ -37,7 +34,6 @@
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
......@@ -611,4 +607,4 @@ export default {
}
}
};
</script>
\ No newline at end of file
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment