Skip to content

M
mes-ui
Commit b086dcd3 authored by chenzj's avatar chenzj
Browse files
Options

工作单元页面调整

parent cd1ce324
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 156 deletions
src/views/mes/md/product/index.vue
View file @ b086dcd3
......@@ -19,8 +19,8 @@
<el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px">
<el-form-item label="物料编码" prop="itemCode">
<el-input v-model="queryParams.itemCode" placeholder="请输入物料编码" clearable style="width: 240px"
<el-form-item label="物料编码" prop="sapItemCode">
<el-input v-model="queryParams.sapItemCode" placeholder="请输入物料编码" clearable style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="物料名称" prop="itemName">
......
src/views/mes/md/workunit/index.vue
View file @ b086dcd3
......@@ -2,37 +2,20 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="工作单元编码" label-width="100px" prop="workunitCode">
<el-input
v-model="queryParams.workunitCode"
placeholder="请输入工作单元编码"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.workunitCode" placeholder="请输入工作单元编码" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="工作单元名称" label-width="100px" prop="workunitName">
<el-input
v-model="queryParams.workunitName"
placeholder="请输入工作单元名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.workunitName" placeholder="请输入工作单元名称" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="工作中心名称" label-width="100px" prop="workstationName">
<el-input
v-model="queryParams.workstationName"
placeholder="请输入工作中心"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.workstationName" placeholder="请输入工作中心" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="是否启用" prop="enableFlag">
<el-select v-model="queryParams.enableFlag" placeholder="请选择是或否" clearable>
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
......@@ -43,190 +26,188 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['md:workunit:add']"
>新增</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['md:workunit:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['md:workunit:edit']"
>修改</el-button>
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['md:workunit:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['md:workunit:remove']"
>删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['md:workunit:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['md:workunit:export']"
>导出</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['md:workunit:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="workunitList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="工作单元ID" align="center" prop="workunitId" />-->
<el-table-column label="工作单元编码" align="center" prop="workunitCode">
<!-- <el-table-column label="工作单元ID" align="center" prop="workunitId" />-->
<el-table-column label="工作单元编码" align="center" width="150" prop="workunitCode">
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
>{{scope.row.workunitCode}}</el-button>
<el-button type="text" @click="handleView(scope.row)">{{ scope.row.workunitCode }}</el-button>
</template>
</el-table-column>
<el-table-column label="工作中心" align="center" prop="workstationName" />
<el-table-column label="工作单元名称" align="center" prop="workunitName" />
<el-table-column label="是否启用" align="center" prop="enableFlag" >
<el-table-column label="是否启用" align="center" prop="enableFlag">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag" />
</template>
</el-table-column>
<el-table-column label="是否故障" align="center" prop="faultFlag" >
<el-table-column label="是否故障" align="center" prop="faultFlag">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.faultFlag"/>
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.faultFlag" />
</template>
</el-table-column>
<el-table-column label="是否固化" align="center" prop="solidify" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.solidify"/>
<el-table-column label="是否固化" align="center" width="150" prop="solidify">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.solidify" />
</template>
</el-table-column>
<el-table-column label="固化时间" align="center" prop="solidifyTime" />
<el-table-column label="加工处理最小厚度" align="center" prop="treatingThicknessMin" />
<el-table-column label="加工处理最大厚度" align="center" prop="treatingThicknessMax" />
<el-table-column label="加工处理最小宽度" align="center" prop="treatingWidthMin" />
<el-table-column label="加工处理最大宽度" align="center" prop="treatingWidthMax" />
<el-table-column label="凹印_胶版油槽数" align="center" prop="dieSunkOffsetOilTankNum" />
<el-table-column label="印刷方式" align="center" prop="printingMethod" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['md:workunit:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['md:workunit:remove']"
>删除</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['md:workunit:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['md:workunit:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改工作单元对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="20">
<el-col :span="12">
<el-form-item label="工作中心" label-width="120px" prop="workstationName">
<el-input v-model="form.workstationName" placeholder="请输入工作中心" >
<el-input v-model="form.workstationName" placeholder="请输入工作中心">
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
</el-input>
<WorkstationSelect ref="workstationSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-col :span="12">
<el-form-item label="工作单元编码" label-width="120px" prop="workunitCode">
<el-input v-model="form.workunitCode" placeholder="请输入工作单元编码" readonly="readonly"/>
<el-input v-model="form.workunitCode" placeholder="请输入工作单元编码" readonly="readonly">
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-col :span="12">
<el-form-item label="工作单元名称" label-width="120px" prop="workunitName">
<el-input v-model="form.workunitName" placeholder="请输入工作单元名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="印刷方式" label-width="120px" prop="printingMethod">
<el-input v-model="form.printingMethod" placeholder="请输入印刷方式" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-col :span="12">
<el-form-item label="凹印_胶版油槽数" label-width="120px" prop="dieSunkOffsetOilTankNum">
<el-input v-model="form.dieSunkOffsetOilTankNum" placeholder="请输入凹印_胶版油槽数">
<i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">个</i>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="固化时间" label-width="120px" prop="solidifyTime">
<el-input v-model="form.solidifyTime" placeholder="请输入固化时间">
<i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">MIN</i>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="最小厚度" label-width="120px" prop="treatingThicknessMin">
<el-input v-model="form.treatingThicknessMin" placeholder="请输入最小厚度">
<i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">cm</i>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="最大厚度" label-width="120px" prop="treatingThicknessMax">
<el-input v-model="form.treatingThicknessMax" placeholder="请输入最大厚度">
<i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">cm</i>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="最小宽度" label-width="120px" prop="treatingWidthMin">
<el-input v-model="form.treatingWidthMin" placeholder="请输入最小宽度">
<i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">cm</i>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="最大宽度" label-width="120px" prop="treatingWidthMax">
<el-input v-model="form.treatingWidthMax" placeholder="请输入最大宽度">
<i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">cm</i>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="是否启用" label-width="120px">
<el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
<el-radio-group v-model="form.enableFlag" disabled v-if="optType == 'view'">
<el-radio v-for="dict in dict.type.sys_yes_no" :key="dict.value"
:label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
<el-radio-group v-model="form.enableFlag" v-else>
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
<el-radio v-for="dict in dict.type.sys_yes_no" :key="dict.value"
:label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-col :span="12">
<el-form-item label="是否故障" label-width="120px">
<el-radio-group v-model="form.faultFlag" disabled v-if="optType=='view'">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
<el-radio-group v-model="form.faultFlag" disabled v-if="optType == 'view'">
<el-radio v-for="dict in dict.type.sys_yes_no" :key="dict.value"
:label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
<el-radio-group v-model="form.faultFlag" v-else>
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
<el-radio v-for="dict in dict.type.sys_yes_no" :key="dict.value"
:label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-col :span="12">
<el-form-item label="是否固化" label-width="120px">
<el-radio-group v-model="form.solidify" disabled v-if="optType=='view'">
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
<el-radio-group v-model="form.solidify" disabled v-if="optType == 'view'">
<el-radio v-for="dict in dict.type.sys_yes_no" :key="dict.value"
:label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
<el-radio-group v-model="form.solidify" v-else>
<el-radio
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
<el-radio v-for="dict in dict.type.sys_yes_no" :key="dict.value"
:label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
......@@ -240,7 +221,7 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
<el-button type="primary" @click="cancel" v-if="optType == 'view'">返回</el-button>
<el-button type="primary" @click="submitForm" v-else>确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
......@@ -251,12 +232,12 @@
<script>
import { listWorkunit, getWorkunit, delWorkunit, addWorkunit, updateWorkunit } from "@/api/mes/md/workunit";
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
import {genCode} from "@/api/system/autocode/rule"
import { genCode } from "@/api/system/autocode/rule"
export default {
name: "Workunit",
components: {WorkstationSelect},
dicts:['sys_yes_no'],
components: { WorkstationSelect },
dicts: ['sys_yes_no'],
data() {
return {
optType: undefined,
......@@ -300,6 +281,13 @@ export default {
enableFlag: 'Y',
faultFlag: 'N',
solidify: 'N',
solidifyTime: '',
treatingThicknessMin: '',
treatingThicknessMax: '',
treatingWidthMin: '',
treatingWidthMax: '',
dieSunkOffsetOilTankNum: '',
printingMethod: '',
},
// 表单校验
rules: {
......@@ -344,7 +332,14 @@ export default {
enableFlag: 'Y',
faultFlag: 'N',
solidify: 'N',
solidifyTime: '',
treatingThicknessMin: '',
treatingThicknessMax: '',
treatingWidthMin: '',
treatingWidthMax: '',
dieSunkOffsetOilTankNum: '',
printingMethod: '',
}
this.autoGenFlag = false;
this.resetForm("form");
......@@ -362,7 +357,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.workunitId)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
......@@ -383,7 +378,7 @@ export default {
});
},
// 查询明细按钮操作
handleView(row){
handleView(row) {
this.reset();
const workunitId = row.workunitId || this.ids
getWorkunit(workunitId).then(response => {
......@@ -416,12 +411,12 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const workunitIds = row.workunitId || this.ids;
this.$modal.confirm('是否确认删除工作单元编号为"' + workunitIds + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除工作单元编号为"' + workunitIds + '"的数据项？').then(function () {
return delWorkunit(workunitIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => { });
},
/** 导出按钮操作 */
handleExport() {
......@@ -429,24 +424,24 @@ export default {
...this.queryParams
}, `workunit_${new Date().getTime()}.xlsx`)
},
handleWorkstationSelect(){
handleWorkstationSelect() {
this.$refs.workstationSelect.showFlag = true;
this.$refs.workstationSelect.getList();
},
onWorkstationSelected(row){
if(row != undefined && row != null){
onWorkstationSelected(row) {
if (row != undefined && row != null) {
this.form.workstationId = row.workstationId;
this.form.workstationName = row.workstationName;
}
},
//自动生成物料编码
handleAutoGenChange(autoGenFlag){
handleAutoGenChange(autoGenFlag) {
debugger;
if(autoGenFlag){
genCode('WORK_UNIT').then(response =>{
if (autoGenFlag) {
genCode('WORK_UNIT').then(response => {
this.form.workunitCode = response;
});
}else{
} else {
this.form.workunitCode = null;
}
}
......
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