Skip to content

P
pda-ui
Commit 9a4f0086 authored by 鲁鑫's avatar 鲁鑫
Browse files
Options

工作单元自动编码；产品转正式；

parent 00032dbb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 267 additions and 178 deletions
src/api/mes/md/mdItem.js
View file @ 9a4f0086
......@@ -42,3 +42,11 @@ export function delMdItem(itemId) {
method: 'delete'
})
}
// 临时产品转正式
export function becomeFormalProduct(itemId) {
return request({
url: '/mes/md/mditem/becomeFormalProduct/' + itemId,
method: 'put'
})
}
src/views/index.vue
View file @ 9a4f0086
This diff is collapsed.
src/views/mes/md/factory/index.vue
View file @ 9a4f0086
......@@ -127,15 +127,21 @@
<el-form-item label="工厂名称" prop="factoryName">
<el-input v-model="form.factoryName" placeholder="请输入工厂名称" />
</el-form-item>
<el-form-item label="是否启用" prop="enableFlag">
<el-select v-model="form.enableFlag" placeholder="请选择是或否">
<el-option
<el-form-item label="是否启用">
<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.label"
:value="dict.value"
></el-option>
</el-select>
: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-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
......
src/views/mes/md/product/index.vue
View file @ 9a4f0086
......@@ -75,7 +75,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes:md:faceColor:add']"
v-hasPermi="['mes:md:mditem:add']"
>新增</el-button
>
</el-col>
......@@ -87,7 +87,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['mes:md:faceColor:edit']"
v-hasPermi="['mes:md:mditem:edit']"
>修改</el-button
>
</el-col>
......@@ -99,10 +99,22 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes:md:faceColor:remove']"
v-hasPermi="['mes:md:mditem:remove']"
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="multiple"
@click="handBecomeFormalProduct"
v-hasPermi="['mes:md:mditem:becomeFormalProduct']"
>转正式产品</el-button
>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="info"
......@@ -627,6 +639,7 @@ import {
delMdItem,
addMdItem,
updateMdItem,
becomeFormalProduct,
} from "@/api/mes/md/mdItem";
import BaseInfo from "./components/baseInfo.vue";
......@@ -939,6 +952,20 @@ export default {
})
.catch(() => {});
},
/** 临时产品转正式按钮操作 */
handBecomeFormalProduct(row){
const itemIds = row.itemId || this.ids;
this.$modal
.confirm("确认转正式产品？")
.then(function () {
return becomeFormalProduct(itemIds);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("转正式成功");
})
.catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download(
......
src/views/mes/md/workunit/index.vue
View file @ 9a4f0086
......@@ -130,31 +130,66 @@
<!-- 添加或修改工作单元对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="工作站" label-width="100px" prop="workstationName">
<el-input v-model="form.workstationName" placeholder="请输入工作站" >
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
</el-input>
</el-form-item>
<WorkstationSelect ref="workstationSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect>
<el-form-item label="工作单元编码" label-width="100px" prop="workunitCode">
<el-input v-model="form.workunitCode" placeholder="请输入工作单元编码" />
</el-form-item>
<el-form-item label="工作单元名称" label-width="100px" prop="workunitName">
<el-input v-model="form.workunitName" placeholder="请输入工作单元名称" />
</el-form-item>
<el-form-item label="是否启用" label-width="100px" prop="enableFlag">
<el-select v-model="form.enableFlag" placeholder="请选择是或否">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" label-width="100px" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-row>
<el-col :span="20">
<el-form-item label="工作站" label-width="100px" prop="workstationName">
<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="16">
<el-form-item label="工作单元编码" label-width="100px" prop="workunitCode">
<el-input v-model="form.workunitCode" 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>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="工作单元名称" label-width="100px" prop="workunitName">
<el-input v-model="form.workunitName" placeholder="请输入工作单元名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="是否启用">
<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-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="备注" label-width="100px" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
......@@ -168,6 +203,7 @@
<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"
export default {
name: "Workunit",
......@@ -190,6 +226,7 @@ export default {
total: 0,
// 工作单元表格数据
workunitList: [],
autoGenFlag: false,
// 弹出层标题
title: "",
// 是否显示弹出层
......@@ -246,6 +283,7 @@ export default {
workunitName: '',
enableFlag: '',
}
this.autoGenFlag = false;
this.resetForm("form");
},
/** 搜索按钮操作 */
......@@ -332,12 +370,22 @@ export default {
this.$refs.workstationSelect.getList();
},
onWorkstationSelected(row){
console.log(row, 'rowwwwwww')
if(row != undefined && row != null){
this.form.workstationId = row.workstationId;
this.form.workstationName = row.workstationName;
}
},
//自动生成物料编码
handleAutoGenChange(autoGenFlag){
debugger;
if(autoGenFlag){
genCode('WORK_UNIT').then(response =>{
this.form.workunitCode = response;
});
}else{
this.form.workunitCode = null;
}
}
}
};
</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