Skip to content

P
pda-ui
Commit 57a377a3 authored by 全洪江's avatar 全洪江
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui

parents 6cdc2eae f52b7706
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1498 additions and 0 deletions
src/api/mes/md/mdProduct.js 0 → 100644
View file @ 57a377a3
// import request from '@/utils/request'
//
// // 查询物料列表
// export function listMdProduct(query) {
// return request({
// url: '/mes/md/mdproduct/list',
// method: 'get',
// params: query
// })
// }
//
// // 查询物料详细
// export function getMdProduct(productId) {
// return request({
// url: '/mes/md/mdproduct/' + productId,
// method: 'get'
// })
// }
//
// // 新增物料
// export function addMdProduct(data) {
// return request({
// url: '/mes/md/mdproduct',
// method: 'post',
// data: data
// })
// }
//
// // 修改物料
// export function updateMdProduct(data) {
// return request({
// url: '/mes/md/mdproduct',
// method: 'put',
// data: data
// })
// }
//
// // 删除物料
// export function delMdProduct(productId) {
// return request({
// url: '/mes/md/mdproduct/' + productId,
// method: 'delete'
// })
// }
src/views/mes/md/product/components/itembom.vue 0 → 100644
View file @ 57a377a3
<template>
<div class="app-container">
<el-row :gutter="10" class="mb8" v-if="optType !='view'">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes:md:mditem:add']"
>新增</el-button>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes:md:mditem:remove']"
>删除</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="bomList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="物料编码" align="center" prop="bomItemCode" />
<el-table-column label="物料名称" align="center" prop="bomItemName" :show-overflow-tooltip="true" />
<el-table-column label="规格" align="center" prop="bomItemSpec" :show-overflow-tooltip="true" />
<el-table-column label="单位" width="60px" align="center" prop="unitOfMeasure" />
<el-table-column label="使用比例" width="90px" align="center" prop="quantity" />
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="optType !='view'">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:md:mditem:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:md:mditem: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"
/>
<!-- 添加或修改产品BOM关系对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="BOM物料编码" prop="bomItemCode">
<el-input v-model="form.bomItemCode" readonly placeholder="请输入BOM物料编码" />
</el-form-item>
<el-form-item label="BOM物料名称" prop="bomItemName">
<el-input v-model="form.bomItemName" readonly placeholder="请输入BOM物料名称" />
</el-form-item>
<el-form-item label="BOM物料规格" prop="bomItemSpec">
<el-input v-model="form.bomItemSpec" readonly type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="BOM物料单位" prop="unitOfMeasure">
<el-input v-model="form.unitOfMeasure" readonly placeholder="请输入BOM物料单位" />
</el-form-item>
<el-form-item label="物料使用比例" prop="quantity">
<el-input-number :precision="4" :step="0.1" :min="0" v-model="form.quantity" placeholder="请输入物料使用比例" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listBom, getBom, delBom, addBom, updateBom } from "@/api/mes/md/bom";
import ItemSelect from "@/components/itemSelect/index.vue";
export default {
name: "Bom",
components: { ItemSelect },
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 产品BOM关系表格数据
bomList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
itemId: this.itemId,
bomItemId: null,
bomItemCode: null,
bomItemName: null,
bomItemSpec: null,
unitOfMeasure: null,
quantity: null,
enableFlag: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
quantity: [
{ required: true, message: "物料使用比例不能为空", trigger: "blur" }
]
}
};
},
props: {
optType: undefined,
itemId: undefined
},
created() {
this.getList();
},
methods: {
/** 查询产品BOM关系列表 */
getList() {
this.loading = true;
listBom(this.queryParams).then(response => {
this.bomList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
bomId: null,
itemId: null,
bomItemId: null,
bomItemCode: null,
bomItemName: null,
bomItemSpec: null,
unitOfMeasure: null,
itemOrProduct: null,
quantity: null,
enableFlag: 'Y',
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.bomId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.$refs.itemSelect.showFlag = true;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const bomId = row.bomId || this.ids
getBom(bomId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改产品BOM关系";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
updateBom(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const bomIds = row.bomId || this.ids;
this.$modal.confirm('是否确认删除产品BOM关系编号为"' + bomIds + '"的数据项？').then(function() {
return delBom(bomIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
//物料选择弹出框
onItemSelected(obj){
debugger;
this.form.itemId = this.itemId;
if(obj != undefined && obj != null){
obj.forEach(element => {
this.form.bomItemId = element.itemId;
this.form.bomItemCode = element.itemCode;
this.form.bomItemName = element.itemName;
this.form.bomItemSpec = element.specification;
this.form.unitOfMeasure = element.unitOfMeasure;
this.form.itemOrProduct = element.itemOrProduct;
this.form.quantity = 1;
this.form.enableFlag = 'Y';
var retFlag = false;
addBom(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.getList();
});
});
}
}
}
};
</script>
src/views/mes/md/product/components/sop.vue 0 → 100644
View file @ 57a377a3
<template>
<div class="app-container">
<el-row v-if="optType != 'view'" :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes:md:mditem:add']"
>新增</el-button>
</el-col>
</el-row>
<div class="header">
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="标题" prop="sopTitle">
<el-input v-model="form.sopTitle" placeholder="请输入标题"></el-input>
</el-form-item>
<el-form-item label="展示顺序">
<el-input-number :min="1" v-model="form.orderNum"></el-input-number>
</el-form-item>
<el-form-item label="内容说明">
<el-input type="textarea" v-model="form.sopDescription" placeholder="请输入说明信息"></el-input>
</el-form-item>
<el-form-item label="所属工序" prop="processId">
<el-select v-model="form.processId" placeholder="请选择工序">
<el-option
v-for="item in processOptions"
:key="item.processId"
:label="item.processName"
:value="item.processId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="图片">
<ImageUpload :limit="1" :value="form.sopUrl" :fileSize="5" @onUploaded="handleImgUplaoded" @onRemoved="handleImgRemoved" ></ImageUpload>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">提 交</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
<div class="images">
<div v-for="(item,index) in sopList" :key="index" class="image-middle">
<el-card shadow="hover" :body-style="{pading: '10px'}">
<el-popover>
<img :src="sopList[index].sopUrl" slot="reference" class="image"/>
<el-image class="imagePreview" :src="sopList[index].sopUrl" :preview-src-list="imageList"></el-image>
</el-popover>
<div style="text-align:center;padding-top:12px">
<span>
{{sopList[index].sopTitle}}
</span>
<el-button @click="handleUpdate(sopList[index])" type="primary" icon="el-icon-edit"></el-button>
<el-button @click="handleDelete(sopList[index])" type="danger" icon="el-icon-delete"></el-button>
</div>
</el-card>
</div>
</div>
</div>
</template>
<script>
import { listSop, getSop, delSop, addSop, updateSop } from "@/api/mes/md/sop";
import ImageUpload from "@/components/ImageUpload/index.vue"
import {listAllProcess} from "@/api/mes/pro/process";
export default{
name: "SOPTab",
components: {ImageUpload},
props:{
itemId: null,
optType: null,
},
data(){
return {
title: "新增SOP信息",
loading: true,
open: false,
// 表单参数
form: {},
// 表单校验
rules: {
itemId: [
{ required: true, message: "物料产品ID不能为空", trigger: "blur" }
],
},
// 产品SOP表格数据
sopList: [],
//用于图片预览的清单
imageList: [],
//工序选项
processOptions:[],
queryParams: {
itemId: this.itemId
}
}
},
created(){
this.getList();
this.getProcess();
},
methods: {
//获取当前产品的SOP资料清单
getList(){
listSop(this.queryParams).then(response =>{
debugger;
this.imageList = [];
this.sopList = response.rows;
this.sopList.forEach(row => {
this.imageList.push(row.sopUrl);
});
});
},
//查询工序信息
getProcess(){
listAllProcess().then( response =>{
this.processOptions = response.data;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
sopId: null,
itemId: this.itemId,
orderNum: null,
processId: null,
processCode: null,
processName: null,
sopTitle: null,
sopDescription: null,
sopUrl: null
};
this.resetForm("form");
},
/**
* 新增操作
*/
handleAdd(){
this.reset();
this.open = true;
this.title = "添加产品SOP";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const sopId = row.sopId || this.ids
getSop(sopId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改产品SOP";
});
},
//图片上传成功
handleImgUplaoded(imgUrl){
console.log(imgUrl);
this.form.sopUrl = imgUrl;
},
//图片移除
handleImgRemoved(imgUrl){
console.log(imgUrl);
this.form.sopUrl = null;
},
//提交
submitForm(){
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.sopId != null) {
updateSop(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addSop(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const sopIds = row.sopId || this.ids;
this.$modal.confirm('是否确认删除产品SOP编号为"' + sopIds + '"的数据项？').then(function() {
return delSop(sopIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
}
}
</script>
<style scoped>
.header {
margin-left: 15px;
font-size: 30px;
font-weight: 600;
}
.images {
display: flex;
margin-top: 20px;
margin-left: 21px;
margin-right: 20px;
flex-wrap: wrap;
}
.image-middle{
margin-right: 15px;
margin-bottom: 15px;
}
.image{
width:110px;
height: 110px;
}
.imagePreview {
width: 600px;
height: 500px;
}
</style>
src/views/mes/md/product/components/technology.vue 0 → 100644
View file @ 57a377a3
<template>
<div class="app-container">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="8">
<el-form-item label="工艺路线名称" prop="technologyName">
<el-input v-model="form.technologyName" maxlength="64" v-if="optType == 'view'"/>
<el-input v-model="form.technologyName" placeholder="请输入工艺路线名称" maxlength="64" v-else/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8" v-if="optType !='view'">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes:md:mdtechnology:add']"
>新增</el-button>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes:md:mdtechnology:remove']"
>删除</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="bomList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="工序名称" align="center" prop="processName" />
<el-table-column label="工序编码" align="center" prop="processCode" />
<el-table-column label="工时" align="center" prop="workHours" />
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="optType !='view'">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:md:mditem:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:md:mditem: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"
/>
</div>
</template>
<script>
import { listBom, getBom, delBom, addBom, updateBom } from "@/api/mes/md/bom";
import ItemSelect from "@/components/itemSelect/index.vue";
import Treeselect from "@riophae/vue-treeselect";
export default {
name: "Process",
components: {Treeselect, ItemSelect },
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 产品BOM关系表格数据
bomList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
productId: this.productId,
processId:null,
processName: null,
processCode: null,
workHours: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
quantity: [
{ required: true, message: "物料使用比例不能为空", trigger: "blur" }
]
}
};
},
props: {
optType: undefined,
productId: undefined
},
created() {
this.getList();
},
methods: {
/** 查询产品BOM关系列表 */
getList() {
this.loading = true;
listBom(this.queryParams).then(response => {
this.bomList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
productId: this.productId,
processId:null,
processName: null,
processCode: null,
workHours: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.bomId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.$refs.itemSelect.showFlag = true;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const bomId = row.bomId || this.ids
getBom(bomId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改产品BOM关系";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
updateBom(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const bomIds = row.bomId || this.ids;
this.$modal.confirm('是否确认删除产品BOM关系编号为"' + bomIds + '"的数据项？').then(function() {
return delBom(bomIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
//物料选择弹出框
onItemSelected(obj){
debugger;
this.form.itemId = this.itemId;
if(obj != undefined && obj != null){
obj.forEach(element => {
this.form.bomItemId = element.itemId;
this.form.bomItemCode = element.itemCode;
this.form.bomItemName = element.itemName;
this.form.bomItemSpec = element.specification;
this.form.unitOfMeasure = element.unitOfMeasure;
this.form.itemOrProduct = element.itemOrProduct;
this.form.quantity = 1;
this.form.enableFlag = 'Y';
var retFlag = false;
addBom(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.getList();
});
});
}
}
}
};
</script>
src/views/mes/md/product/index.vue 0 → 100644
View file @ 57a377a3
This diff is collapsed.
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