Skip to content

M
mes-ui
Commit c79bc466 authored by 何远江's avatar 何远江
Browse files
Options

添加打样管理申请页面

parent dde9ef48
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 884 additions and 455 deletions
src/components/Page/PageTitle.vue
View file @ c79bc466
...@@ -26,7 +26,7 @@ export default { ...@@ -26,7 +26,7 @@ export default {
<style lang="scss"> <style lang="scss">
.page-header { .page-header {
background: #fff; background: #fff;
padding: 10px 0 7px; padding: 10px 0 4px;
box-shadow: 0 2px 3px #e3e3e3; box-shadow: 0 2px 3px #e3e3e3;
.page-buttons { .page-buttons {
padding: 0 20px; padding: 0 20px;
......
src/components/Page/PageWrapper.vue
View file @ c79bc466
<template> <template>
<div class="page-wrapper"> <div class="page-wrapper">
<el-scrollbar style="padding: 10px 0;" :style="{ height: scrollHeight }"> <el-scrollbar style="padding: 20px 20px 10px;" :style="{ height: scrollHeight }">
<slot /> <slot />
</el-scrollbar> </el-scrollbar>
</div> </div>
...@@ -20,7 +20,4 @@ export default { ...@@ -20,7 +20,4 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.page-wrapper {
}
</style> </style>
src/components/itemBomSelect/single.vue
View file @ c79bc466
<template> <template>
<el-dialog title="产品BOM物料选择" <el-dialog
title="产品BOM物料选择"
v-if="showFlag" v-if="showFlag"
:visible.sync="showFlag" :visible.sync="showFlag"
:modal= false :modal="true"
width="80%" width="80%"
center center
> >
<el-table v-loading="loading" :data="bomList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick"> <el-table
<el-table-column width="50" align="center" > v-loading="loading"
<template v-slot="scope"> :data="bomList"
<el-radio v-model="selectedItemId" :label="scope.row.bomItemId" @change="handleRowChange(scope.row)">{{""}}</el-radio> @current-change="handleCurrent"
</template> @row-dblclick="handleRowDbClick"
</el-table-column> >
<el-table-column label="物料编码" align="center" prop="bomItemCode" /> <el-table-column width="50" align="center">
<el-table-column label="物料名称" align="center" prop="bomItemName" :show-overflow-tooltip="true" /> <template v-slot="scope">
<el-table-column label="规格" align="center" prop="bomItemSpec" :show-overflow-tooltip="true" /> <el-radio
<el-table-column label="单位" width="60px" align="center" prop="unitOfMeasure" /> v-model="selectedItemId"
<el-table-column label="使用比例" width="90px" align="center" prop="quantity" /> :label="scope.row.bomItemId"
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> @change="handleRowChange(scope.row)"
</el-table> >{{ "" }}</el-radio
>
<pagination </template>
v-show="total>0" </el-table-column>
:total="total" <el-table-column label="物料编码" align="center" prop="bomItemCode" />
:page.sync="queryParams.pageNum" <el-table-column
:limit.sync="queryParams.pageSize" label="物料名称"
@pagination="getList" align="center"
prop="bomItemName"
:show-overflow-tooltip="true"
/> />
<div slot="footer" class="dialog-footer"> <el-table-column
<el-button type="primary" @click="confirmSelect">确 定</el-button> label="规格"
<el-button @click="showFlag=false">取 消</el-button> 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>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelect">确 定</el-button>
<el-button @click="showFlag = false">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template>
</template> <script>
import { listBom } from "@/api/mes/md/bom";
<script>
import { listBom } from "@/api/mes/md/bom"; export default {
name: "ItemBomSelectSingle",
export default { props: {
name: "ItemBomSelectSingle", itemId: undefined,
props: { },
itemId: undefined data() {
return {
showFlag: false,
// 遮罩层
loading: true,
selectedItemId: undefined,
selectedRows: undefined,
// 非单个禁用
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,
},
};
},
created() {
this.getList();
},
methods: {
/** 查询产品BOM关系列表 */
getList() {
debugger;
this.loading = true;
listBom(this.queryParams).then((response) => {
this.bomList = response.rows;
this.total = response.total;
this.loading = false;
});
}, },
data() { handleCurrent(row) {
return { if (row) {
showFlag: false, this.selectedRows = row;
// 遮罩层 }
loading: true,
selectedItemId: undefined,
selectedRows: undefined,
// 非单个禁用
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,
}
};
}, },
created() { handleRowDbClick(row) {
this.getList(); if (row) {
this.selectedRows = row;
this.$emit("onSelected", this.selectedRows);
this.showFlag = false;
}
},
// 单选选中数据
handleRowChange(row) {
if (row) {
this.selectedRows = row;
}
}, },
methods: {
/** 查询产品BOM关系列表 */
getList() {
debugger;
this.loading = true;
listBom(this.queryParams).then(response => {
this.bomList = response.rows;
this.total = response.total;
this.loading = false;
});
},
handleCurrent(row){
if(row){
this.selectedRows = row;
}
},
handleRowDbClick(row){
if(row){
this.selectedRows = row;
this.$emit('onSelected',this.selectedRows);
this.showFlag = false;
}
},
// 单选选中数据
handleRowChange(row) {
if(row){
this.selectedRows = row;
}
},
//确定选中 //确定选中
confirmSelect(){ confirmSelect() {
if(this.selectedItemId ==null || this.selectedItemId==0){ if (this.selectedItemId == null || this.selectedItemId == 0) {
this.$notify({ this.$notify({
title:'提示', title: "提示",
type:'warning', type: "warning",
message: '请至少选择一条数据!' message: "请至少选择一条数据!",
}); });
return; return;
} }
this.$emit('onSelected',this.selectedRows); this.$emit("onSelected", this.selectedRows);
this.showFlag = false; this.showFlag = false;
} },
} },
}; };
</script> </script>
\ No newline at end of file
src/components/itemSelect/single.vue
View file @ c79bc466
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<el-dialog title="物料产品选择" <el-dialog title="物料产品选择"
v-if="showFlag" v-if="showFlag"
:visible.sync="showFlag" :visible.sync="showFlag"
:modal= false :modal="true"
width="80%" width="80%"
center center
> >
......
src/views/mes/proofing/components/ProogingBom.vue 0 → 100644
View file @ c79bc466
<template>
<div>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
@click="handleDelete"
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-delete"
size="mini"
>产品分类导入</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-delete"
size="mini"
@click="$refs['ItemBomSelectRef'].showFlag = true"
>产品导入</el-button
>
<ItemBomSelect ref="ItemBomSelectRef" @onSelected="onItemBomSelect" />
</el-col>
</el-row>
<el-table :data="tableData" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column
label="组件数量"
align="center"
prop="quantity"
width="120"
/>
<el-table-column
label="计量单位"
align="center"
prop="unitOfMeasure"
width="120"
/>
<el-table-column
label="报废百分比"
align="center"
prop="scrapPercentage"
width="120"
/>
<el-table-column
label="替代组"
align="center"
prop="alternativeGroup"
width="120"
/>
<el-table-column
label="替代优先级"
align="center"
prop="alternativePriorities"
width="120"
/>
<el-table-column
label="策略"
align="center"
prop="alternativeStrategy"
width="120"
/>
<el-table-column
label="使用概率"
align="center"
prop="alternativeProbability"
width="120"
/>
<el-table-column
label="BOM行备注"
align="center"
prop="bomItemRemark"
width="120"
/>
<el-table-column
label="物料备注"
align="center"
prop="itemRemark"
width="120"
/>
<el-table-column label="操作" align="center" width="120">
<template slot-scope="{ row, index }">
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="updateRow(row)"
>修改</el-button
>
<el-button
type="text"
icon="el-icon-delete"
size="small"
@click="deleteRow(index)"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<el-dialog :visible.sync="showFlag" width="700px" title="添加BOM">
<el-form
ref="form"
:model="form"
:rules="rules"
inline
label-width="100px"
size="small"
>
<el-row>
<el-col :span="12">
<el-form-item label="组件数量" prop="quantity">
<el-input
type="number"
v-model="form.quantity"
placeholder="请输入组件数量"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="计量单位" prop="unitOfMeasure">
<el-input
v-model="form.unitOfMeasure"
placeholder="请输入计量单位"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报废百分比" prop="scrapPercentage">
<el-input
v-model="form.scrapPercentage"
placeholder="请输入报废百分比"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="替代组" prop="alternativeGroup">
<el-input
v-model="form.alternativeGroup"
placeholder="请输入替代组"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="替代优先级" prop="alternativePriorities">
<el-input
v-model="form.alternativePriorities"
placeholder="请输入替代优先级"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="策略" prop="alternativeStrategy">
<el-input
v-model="form.alternativeStrategy"
placeholder="请输入策略"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="使用概率" prop="alternativeProbability">
<el-input
v-model="form.alternativeProbability"
placeholder="请输入使用概率"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="BOM行备注" prop="bomItemRemark">
<el-input
v-model="form.bomItemRemark"
placeholder="请输入BOM行备注"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料备注" prop="itemRemark">
<el-input
v-model="form.itemRemark"
placeholder="请输入物料备注"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer">
<el-button type="primary" @click="submitForm">确定</el-button>
<el-button type="default" @click="showFlag = false">取消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import ItemBomSelect from "@/components/itemBomSelect/single.vue";
export default {
components: { ItemBomSelect },
data() {
return {
/**弹窗状态 */
showFlag: false,
/**表格数据 */
tableData: [],
/**表单规则 */
rules: {},
/**多选 */
selection: [],
/**表单初始化数据 */
form: {
quantity: "",
unitOfMeasure: "",
scrapPercentage: "",
alternativeGroup: "",
alternativePriorities: "",
alternativeStrategy: "",
alternativeProbability: "",
bomItemRemark: "",
itemRemark: "",
},
};
},
methods: {
/**多选 */
handleSelectionChange(val) {
this.selection = val;
},
/**删除操作 */
handleDelete() {},
/**添加操作 */
handleAdd() {
this.resetForm();
this.showFlag = true;
},
/**更新行 */
updateRow(row) {
Object.assign(this.form, row);
this.showFlag = true;
},
/**删除行 */
deleteRow(index) {
this.tableData.splice(index, 1);
},
onItemBomSelect(row) {
// if (row != undefined && row != null) {
// this.tableData.unshift({...row})
// }
},
/**表单提交 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
this.tableData.unshift({ ...this.form });
this.showFlag = false;
}
});
},
/**重置表单 */
resetForm() {
this.form = {
quantity: "",
unitOfMeasure: "",
scrapPercentage: "",
alternativeGroup: "",
alternativePriorities: "",
alternativeStrategy: "",
alternativeProbability: "",
bomItemRemark: "",
itemRemark: "",
};
},
/**获取组件数据 */
getComData() {
return this.tableData
}
},
};
</script>
<style></style>
src/views/mes/proofing/components/ProogingProcess.vue 0 → 100644
View file @ c79bc466
<template>
<div>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
@click="handleDelete"
>删除</el-button
>
</el-col>
</el-row>
<el-table :data="tableData" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="工序名称" prop="processName" width="120" align="center" />
<el-table-column label="工序编码" prop="processCode" width="120" align="center" />
<el-table-column label="与下一道工序关系" prop="linkType" width="160" align="center" />
<el-table-column label="工作站" prop="workstationId" width="120" align="center" />
<el-table-column label="甘特图显示颜色" prop="colorCode" width="120" align="center" />
<el-table-column label="操作" align="center" width="120">
<template slot-scope="{ row, index }">
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="updateRow(row)"
>修改</el-button
>
<el-button
type="text"
icon="el-icon-delete"
size="small"
@click="deleteRow(index)"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<el-dialog :visible.sync="showFlag" width="700px" title="添加工艺">
<el-form
ref="form"
:model="form"
:rules="rules"
inline
label-width="100px"
size="small"
>
<el-row>
<el-col :span="12">
<el-form-item label="组件数量" prop="quantity">
<el-input
type="number"
v-model="form.quantity"
placeholder="请输入组件数量"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="计量单位" prop="unitOfMeasure">
<el-input
v-model="form.unitOfMeasure"
placeholder="请输入计量单位"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报废百分比" prop="scrapPercentage">
<el-input
v-model="form.scrapPercentage"
placeholder="请输入报废百分比"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="替代组" prop="alternativeGroup">
<el-input
v-model="form.alternativeGroup"
placeholder="请输入替代组"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="替代优先级" prop="alternativePriorities">
<el-input
v-model="form.alternativePriorities"
placeholder="请输入替代优先级"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="策略" prop="alternativeStrategy">
<el-input
v-model="form.alternativeStrategy"
placeholder="请输入策略"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="使用概率" prop="alternativeProbability">
<el-input
v-model="form.alternativeProbability"
placeholder="请输入使用概率"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="BOM行备注" prop="bomItemRemark">
<el-input
v-model="form.bomItemRemark"
placeholder="请输入BOM行备注"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料备注" prop="itemRemark">
<el-input
v-model="form.itemRemark"
placeholder="请输入物料备注"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer">
<el-button type="primary" @click="submitForm">确定</el-button>
<el-button type="default" @click="showFlag = false">取消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import ItemBomSelect from "@/components/itemBomSelect/single.vue";
export default {
components: { ItemBomSelect },
data() {
return {
/**弹窗状态 */
showFlag: false,
/**表格数据 */
tableData: [],
/**表单规则 */
rules: {},
/**多选 */
selection: [],
/**表单初始化数据 */
form: {
quantity: "",
unitOfMeasure: "",
scrapPercentage: "",
alternativeGroup: "",
alternativePriorities: "",
alternativeStrategy: "",
alternativeProbability: "",
bomItemRemark: "",
itemRemark: "",
},
};
},
methods: {
/**多选 */
handleSelectionChange(val) {
this.selection = val;
},
/**删除操作 */
handleDelete() {},
/**添加操作 */
handleAdd() {
this.resetForm();
this.showFlag = true;
},
/**更新行 */
updateRow(row) {
Object.assign(this.form, row);
this.showFlag = true;
},
/**删除行 */
deleteRow(index) {
this.tableData.splice(index, 1);
},
onItemBomSelect(row) {
// if (row != undefined && row != null) {
// this.tableData.unshift({...row})
// }
},
/**表单提交 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
this.tableData.unshift({ ...this.form });
this.showFlag = false;
}
});
},
getComData() {},
/**重置表单 */
resetForm() {
this.form = {
quantity: "",
unitOfMeasure: "",
scrapPercentage: "",
alternativeGroup: "",
alternativePriorities: "",
alternativeStrategy: "",
alternativeProbability: "",
bomItemRemark: "",
itemRemark: "",
};
},
},
};
</script>
<style></style>
src/views/mes/proofing/proofingInfo.vue
View file @ c79bc466
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