Skip to content

P
pda-ui
Commit 1c30fec9 authored by 张海景's avatar 张海景
Browse files
Options

update:修改类型设置、工装台账、维护保养页面样式

parent 01f09286
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 144 deletions
src/api/mes/tm/tmToolRequestUse.js
View file @ 1c30fec9
......@@ -25,6 +25,16 @@ export function getTmToolRequestList(toolRequestId) {
})
}
// 关联台账信息
export function getTmToolSnList(query) {
return request({
url: "/mes/tm/tool/list",
method: "get",
params: query
});
}
// 新增刀模板领用单
export function addTmToolRequestUse(data) {
......
src/views/mes/tm/maintenance/index.vue
View file @ 1c30fec9
This diff is collapsed.
src/views/mes/tm/tool/index.vue
View file @ 1c30fec9
......@@ -2,7 +2,7 @@
<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-col :span="6">
<el-form-item label="工装夹具编码" prop="toolCode">
<el-input
v-model="queryParams.toolCode"
......@@ -12,7 +12,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="工装夹具名称" prop="toolName">
<el-input
v-model="queryParams.toolName"
......@@ -22,7 +22,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="工装夹具类型" prop="toolTypeId">
<el-select v-model="form.toolTypeId" placeholder="请选择类型">
<el-option
......@@ -34,10 +34,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="品牌" label-width="60px" prop="brand">
<el-form-item label="品牌" prop="brand">
<el-input
v-model="queryParams.brand"
placeholder="请输入品牌"
......@@ -47,7 +45,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="型号" label-width="60px" prop="spec">
<el-form-item label="型号" prop="spec">
<el-input
v-model="queryParams.spec"
placeholder="请输入型号"
......@@ -57,7 +55,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="状态" label-width="60px" prop="status">
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option
v-for="dict in dict.type.mes_tool_status"
......@@ -217,7 +215,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="工装夹具类型" prop="toolTypeId">
<el-select v-model="form.toolTypeId" @change="onToolTypeChanged" placeholder="请选择类型">
<el-select style="width:100%;" v-model="form.toolTypeId" @change="onToolTypeChanged" placeholder="请选择类型">
<el-option
v-for="dict in toolTypeOptions"
:key="dict.toolTypeId"
......@@ -295,7 +293,7 @@
<el-form-item label="数量" prop="quantity">
<!-- <el-input v-if="form.codeFlag=='Y'" readonly v-model="form.quantity" /> -->
<!-- <el-input-number :min="0" @blur="onQuantityChanged" v-else v-model="form.quantity" /> -->
<el-input-number :min="0" @blur="onQuantityChanged" disabled v-model="form.quantity" />
<el-input-number style="width:100%;" :min="0" @blur="onQuantityChanged" disabled v-model="form.quantity" />
</el-form-item>
</el-col>
</el-row>
......@@ -307,7 +305,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="保养维护类型" prop="maintenType">
<el-select v-model="form.maintenType" placeholder="请选择保养维护类型">
<el-select style="width:100%;" v-model="form.maintenType" placeholder="请选择保养维护类型">
<el-option
v-for="dict in dict.type.mes_mainten_type"
:key="dict.value"
......
src/views/mes/tm/toolrequest/index.vue
View file @ 1c30fec9
<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="toolRequestCode">
<el-input
v-model="queryParams.toolRequestCode"
......
src/views/mes/tm/tooltype/index.vue
View file @ 1c30fec9
......@@ -79,7 +79,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="tooltypeList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="tooltypeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="类型编码" align="center" prop="toolTypeCode" >
<template slot-scope="scope">
......@@ -129,7 +129,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
......@@ -142,26 +142,25 @@
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="类型编码" prop="toolTypeCode">
<el-input v-model="form.toolTypeCode" placeholder="请输入类型编码" />
<div style="display: flex;align-items: center;">
<el-input v-model="form.toolTypeCode" placeholder="请输入类型编码" />
<el-switch v-model="autoGenFlag"
style="margin-left:10px;width: 175px;"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch>
</el-col>
<el-col :span="12">
<el-form-item label="类型名称" prop="toolTypeName">
<el-input v-model="form.toolTypeName" placeholder="请输入类型名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="是否编码管理" prop="codeFlag">
<el-radio-group v-model="form.codeFlag" disabled v-if="optType=='view'">
<el-radio
......@@ -179,9 +178,9 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8" v-if="form.codeFlag=='Y'">
<el-col :span="12" v-if="form.codeFlag=='Y'">
<el-form-item label="保养维护类型" prop="maintenType">
<el-select v-model="form.maintenType" placeholder="请选择保养维护类型">
<el-select style="width:100%;" v-model="form.maintenType" placeholder="请选择保养维护类型">
<el-option
v-for="dict in dict.type.mes_mainten_type"
:key="dict.value"
......@@ -191,18 +190,16 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" v-if="form.codeFlag=='Y'">
<el-col :span="12" v-if="form.codeFlag=='Y'">
<el-form-item label="保养周期" prop="maintenPeriod">
<el-input v-model="form.maintenPeriod" placeholder="请输入保养周期" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
......
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