Skip to content

M
mes-ui
Commit ac9c3994 authored by 赵汉亭's avatar 赵汉亭
Browse files
Options

打样申请

parent c2e54f33
Show whitespace changes
Inline Side-by-side
Showing with 841 additions and 205 deletions
src/components/itemSelect/single.vue
View file @ ac9c3994
<template> <template>
<el-dialog title="物料产品选择" <el-dialog
title="物料产品选择"
v-if="showFlag" v-if="showFlag"
:visible.sync="showFlag" :visible.sync="showFlag"
:modal="true" :modal="true"
width="80%" width="80%"
center center
append-to-body
> >
<el-row :gutter="20"> <el-row :gutter="20">
<!--分类数据--> <!--分类数据-->
...@@ -33,7 +35,14 @@ ...@@ -33,7 +35,14 @@
</el-col> </el-col>
<!--物料数据--> <!--物料数据-->
<el-col :span="20" :xs="24"> <el-col :span="20" :xs="24">
<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="68px"
>
<el-form-item label="物料编码" prop="itemCode"> <el-form-item label="物料编码" prop="itemCode">
<el-input <el-input
v-model="queryParams.itemCode" v-model="queryParams.itemCode"
...@@ -53,28 +62,98 @@ ...@@ -53,28 +62,98 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="itemList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick"> <el-table
<el-table-column width="50" align="center" > v-loading="loading"
:data="itemList"
@current-change="handleCurrent"
@row-dblclick="handleRowDbClick"
>
<el-table-column width="50" align="center">
<template v-slot="scope"> <template v-slot="scope">
<el-radio v-model="selectedItemId" :label="scope.row.itemId" @change="handleRowChange(scope.row)">{{""}}</el-radio> <el-radio
v-model="selectedItemId"
:label="scope.row.itemId"
@change="handleRowChange(scope.row)"
>{{ "" }}</el-radio
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料编码" width = "120" align="center" key="itemCode" prop="itemCode" v-if="columns[0].visible" > <el-table-column
label="物料编码"
width="120"
align="center"
key="itemCode"
prop="itemCode"
v-if="columns[0].visible"
>
</el-table-column> </el-table-column>
<el-table-column label="物料名称" min-width="120" align="left" key="itemName" prop="itemName" v-if="columns[1].visible" :show-overflow-tooltip="true" /> <el-table-column
<el-table-column label="规格型号" align="left" key="specification" prop="specification" v-if="columns[2].visible" :show-overflow-tooltip="true" /> label="物料名称"
<el-table-column label="单位" align="center" key="unitOfMeasure" prop="unitOfMeasure" v-if="columns[3].visible" :show-overflow-tooltip="true" /> min-width="120"
<el-table-column label="物料/产品" align="center" key="itemOrProduct" prop="itemOrProduct" v-if="columns[4].visible" :show-overflow-tooltip="true" > align="left"
key="itemName"
prop="itemName"
v-if="columns[1].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
align="left"
key="specification"
prop="specification"
v-if="columns[2].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="单位"
align="center"
key="unitOfMeasure"
prop="unitOfMeasure"
v-if="columns[3].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="物料/产品"
align="center"
key="itemOrProduct"
prop="itemOrProduct"
v-if="columns[4].visible"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.mes_item_product" :value="scope.row.itemOrProduct"/> <dict-tag
:options="dict.type.mes_item_product"
:value="scope.row.itemOrProduct"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所属分类" align="center" key="itemTypeName" prop="itemTypeName" v-if="columns[5].visible" width="120" /> <el-table-column
<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160"> label="所属分类"
align="center"
key="itemTypeName"
prop="itemTypeName"
v-if="columns[5].visible"
width="120"
/>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
v-if="columns[6].visible"
width="160"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
...@@ -82,7 +161,7 @@ ...@@ -82,7 +161,7 @@
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
...@@ -92,15 +171,21 @@ ...@@ -92,15 +171,21 @@
</el-row> </el-row>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelect">确 定</el-button> <el-button type="primary" @click="confirmSelect">确 定</el-button>
<el-button @click="showFlag=false">取 消</el-button> <el-button @click="showFlag = false">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import { listMdItem, getMdItem, delMdItem, addMdItem, updateMdItem} from "@/api/mes/md/mdItem"; import {
import { listAllUnitmeasure} from "@/api/mes/md/unitmeasure"; listMdItem,
import {genCode} from "@/api/system/autocode/rule" getMdItem,
delMdItem,
addMdItem,
updateMdItem,
} from "@/api/mes/md/mdItem";
import { listAllUnitmeasure } from "@/api/mes/md/unitmeasure";
import { genCode } from "@/api/system/autocode/rule";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import { treeselect } from "@/api/mes/md/itemtype"; import { treeselect } from "@/api/mes/md/itemtype";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
...@@ -108,11 +193,11 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"; ...@@ -108,11 +193,11 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "MdItemSingle", name: "MdItemSingle",
dicts: ['sys_yes_no','mes_item_product'], dicts: ["sys_yes_no", "mes_item_product"],
components: { Treeselect }, components: { Treeselect },
data() { data() {
return { return {
showFlag:false, showFlag: false,
// 选中数组 // 选中数组
selectedItemId: undefined, selectedItemId: undefined,
selectedRows: undefined, selectedRows: undefined,
...@@ -132,7 +217,7 @@ export default { ...@@ -132,7 +217,7 @@ export default {
itemTypeName: undefined, itemTypeName: undefined,
defaultProps: { defaultProps: {
children: "children", children: "children",
label: "label" label: "label",
}, },
// 查询参数 // 查询参数
queryParams: { queryParams: {
...@@ -140,7 +225,7 @@ export default { ...@@ -140,7 +225,7 @@ export default {
pageSize: 10, pageSize: 10,
itemCode: undefined, itemCode: undefined,
itemName: undefined, itemName: undefined,
itemTypeId: 0 itemTypeId: 0,
}, },
// 列信息 // 列信息
columns: [ columns: [
...@@ -150,15 +235,15 @@ export default { ...@@ -150,15 +235,15 @@ export default {
{ key: 3, label: `单位`, visible: true }, { key: 3, label: `单位`, visible: true },
{ key: 4, label: `物料/产品`, visible: true }, { key: 4, label: `物料/产品`, visible: true },
{ key: 5, label: `物料分类`, visible: true }, { key: 5, label: `物料分类`, visible: true },
{ key: 6, label: `创建时间`, visible: true } { key: 6, label: `创建时间`, visible: true },
] ],
}; };
}, },
watch: { watch: {
// 根据名称筛选分类树 // 根据名称筛选分类树
itemTypeName(val) { itemTypeName(val) {
this.$refs.tree.filter(val); this.$refs.tree.filter(val);
} },
}, },
created() { created() {
this.getList(); this.getList();
...@@ -168,16 +253,15 @@ export default { ...@@ -168,16 +253,15 @@ export default {
/** 查询物料编码列表 */ /** 查询物料编码列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listMdItem(this.queryParams).then(response => { listMdItem(this.queryParams).then((response) => {
this.itemList = response.rows; this.itemList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
} });
);
}, },
/** 查询分类下拉树结构 */ /** 查询分类下拉树结构 */
getTreeselect() { getTreeselect() {
treeselect().then(response => { treeselect().then((response) => {
this.itemTypeOptions = response.data; this.itemTypeOptions = response.data;
}); });
}, },
...@@ -201,38 +285,38 @@ export default { ...@@ -201,38 +285,38 @@ export default {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
handleCurrent(row){ handleCurrent(row) {
if(row){ if (row) {
this.selectedRows = row; this.selectedRows = row;
} }
}, },
handleRowDbClick(row){ handleRowDbClick(row) {
if(row){ if (row) {
this.selectedRows = row; this.selectedRows = row;
this.$emit('onSelected',this.selectedRows); this.$emit("onSelected", this.selectedRows);
this.showFlag = false; this.showFlag = false;
} }
}, },
// 单选选中数据 // 单选选中数据
handleRowChange(row) { handleRowChange(row) {
debugger; debugger;
if(row){ if (row) {
this.selectedRows = 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>
src/components/routesProcessSelect/index.vue 0 → 100644
View file @ ac9c3994
<template>
<el-dialog
title="工艺路线选择"
v-if="showFlag"
:visible.sync="showFlag"
:modal="true"
width="80%"
center
>
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="110px"
>
<el-form-item label="工艺路线编号" prop="routeCode">
<el-input
v-model="queryParams.routeCode"
placeholder="请输入工艺路线编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工艺路线名称" prop="routeName">
<el-input
v-model="queryParams.routeName"
placeholder="请输入工艺路线名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否启用" prop="enableFlag">
<el-input
v-model="queryParams.enableFlag"
placeholder="请输入是否启用"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="processRoutesList"
highlight-current-row
@current-change="handleCurrent"
@row-dblclick="handleRowDbClick"
height="400"
>
<el-table-column width="50" align="center">
<template v-slot="scope">
<el-radio
v-model="selectedRouteId"
:label="scope.row.routeId"
@change="handleRowChange(scope.row)"
>{{ "" }}</el-radio
>
</template>
</el-table-column>
<el-table-column label="工艺路线编号" align="center" prop="routeCode" />
<el-table-column label="工艺路线名称" align="center" prop="routeName" />
<el-table-column label="工艺路线说明" align="center" prop="routeDesc" />
<el-table-column label="是否启用" align="center" prop="enableFlag" />
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<el-tabs type="border-card" style="margin-top: 30px">
<el-tab-pane label="工序">
<el-table v-loading="processLoading" :data="processList">
<el-table-column
label="工序编码"
width="120px"
fixed
align="center"
prop="processCode"
/>
<el-table-column
label="工序名称"
width="150px"
fixed
align="center"
prop="processName"
/>
<el-table-column
label="下一道工序"
width="150px"
align="center"
prop="nextProcessName"
/>
<el-table-column
label="与下一道工序关系"
width="150px"
align="center"
prop="linkType"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.mes_link_type"
:value="scope.row.linkType"
/>
</template>
</el-table-column>
<el-table-column
label="关键工序"
width="100px"
align="center"
prop="keyFlag"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.keyFlag"
/>
</template>
</el-table-column>
<el-table-column
label="质检确认"
width="100px"
align="center"
prop="isCheck"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.isCheck"
/>
</template>
</el-table-column>
<el-table-column
label="准备时间"
align="center"
prop="defaultPreTime"
/>
<el-table-column
label="等待时间"
align="center"
prop="defaultSufTime"
/>
</el-table>
</el-tab-pane>
</el-tabs>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelect">确 定</el-button>
<el-button @click="showFlag = false">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { listProroute } from "@/api/mes/pro/proroute";
import { listRouteprocess } from "@/api/mes/pro/routeprocess";
export default {
name: "RoutesProcessSelectSingle",
components: {},
dicts: ["sys_yes_no", "mes_link_type", "sys_yes_no"],
data() {
return {
showFlag: false,
// 选中数组
selectedRouteId: undefined,
selectedRows: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
processList: [],
// 品牌表格数据
processRoutesList: [],
// // 品牌名称
// brandName: undefined,
defaultProps: {
children: "children",
label: "label",
},
processLoading: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
routeCode: null,
routeName: null,
routeDesc: null,
enableFlag: null,
},
};
},
created() {
this.getList();
},
methods: {
/** 查询工厂列表 */
getList() {
this.loading = true;
listProroute(this.queryParams).then((response) => {
this.processRoutesList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
handleCurrent(row) {
const params = {
pageNum: 1,
pageSize: 1000,
routeId: row.routeId,
};
this.processLoading = true;
listRouteprocess(params)
.then(({ rows }) => {
this.processList = rows;
this.processLoading = false;
})
.catch(() => {
this.processLoading = false;
});
if (row) {
this.selectedRows = row;
}
},
getProcess() {},
// 单选选中数据
handleRowChange(row) {
if (row) {
this.selectedRows = row;
}
},
//双击选中
handleRowDbClick(row) {
if (row) {
this.selectedRows = row;
this.$emit("onSelected", this.selectedRows);
this.showFlag = false;
}
},
//确定选中
confirmSelect() {
if (this.selectedRouteId == null || this.selectedRouteId == 0) {
this.$notify({
title: "提示",
type: "warning",
message: "请至少选择一条数据!",
});
return;
}
this.$emit("onSelected", this.selectedRows);
this.showFlag = false;
},
},
};
</script>
src/views/mes/pro/proroute/index.vue
View file @ ac9c3994
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form-item label="工艺路线编号" prop="routeCode"> <el-form-item label="工艺路线编号" prop="routeCode">
<el-input <el-input
v-model="queryParams.routeCode" v-model="queryParams.routeCode"
...@@ -26,8 +33,16 @@ ...@@ -26,8 +33,16 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -40,7 +55,8 @@ ...@@ -40,7 +55,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['mes:pro:proroute:add']" v-hasPermi="['mes:pro:proroute:add']"
>新增</el-button> >新增</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -51,7 +67,8 @@ ...@@ -51,7 +67,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['mes:pro:proroute:edit']" v-hasPermi="['mes:pro:proroute:edit']"
>修改</el-button> >修改</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -62,7 +79,8 @@ ...@@ -62,7 +79,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['mes:pro:proroute:remove']" v-hasPermi="['mes:pro:proroute:remove']"
>删除</el-button> >删除</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -72,31 +90,47 @@ ...@@ -72,31 +90,47 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['mes:pro:proroute:export']" v-hasPermi="['mes:pro:proroute:export']"
>导出</el-button> >导出</el-button
>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="prorouteList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="prorouteList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="工艺路线编号" align="center" prop="routeCode" > <el-table-column label="工艺路线编号" align="center" prop="routeCode">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['mes:pro:proroute:query']" v-hasPermi="['mes:pro:proroute:query']"
>{{scope.row.routeCode}}</el-button> >{{ scope.row.routeCode }}</el-button
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工艺路线名称" align="center" prop="routeName" /> <el-table-column label="工艺路线名称" align="center" prop="routeName" />
<el-table-column label="工艺路线说明" align="center" prop="routeDesc" /> <el-table-column label="工艺路线说明" align="center" prop="routeDesc" />
<el-table-column label="是否启用" align="center" prop="enableFlag"> <el-table-column label="是否启用" align="center" prop="enableFlag">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
...@@ -104,20 +138,22 @@ ...@@ -104,20 +138,22 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:proroute:edit']" v-hasPermi="['mes:pro:proroute:edit']"
>修改</el-button> >修改</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['mes:pro:proroute:remove']" v-hasPermi="['mes:pro:proroute:remove']"
>删除</el-button> >删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
...@@ -125,43 +161,63 @@ ...@@ -125,43 +161,63 @@
/> />
<!-- 添加或修改工艺路线对话框 --> <!-- 添加或修改工艺路线对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1080px" append-to-body> <el-dialog
:title="title"
:visible.sync="open"
width="1080px"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="编号" prop="routeCode"> <el-form-item label="编号" prop="routeCode">
<el-input v-model="form.routeCode" placeholder="请输入工艺路线编号" /> <el-input
v-model="form.routeCode"
placeholder="请输入工艺路线编号"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<el-form-item label-width="80"> <el-form-item label-width="80">
<el-switch v-model="autoGenFlag" <el-switch
v-model="autoGenFlag"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'"> @change="handleAutoGenChange(autoGenFlag)"
v-if="optType != 'view'"
>
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item label="名称" prop="routeName"> <el-form-item label="名称" prop="routeName">
<el-input v-model="form.routeName" placeholder="请输入工艺路线名称" /> <el-input
v-model="form.routeName"
placeholder="请输入工艺路线名称"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="是否启用" prop="enableFlag"> <el-form-item label="是否启用" prop="enableFlag">
<el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'"> <el-radio-group
v-model="form.enableFlag"
disabled
v-if="optType == 'view'"
>
<el-radio <el-radio
v-for="dict in dict.type.sys_yes_no" v-for="dict in dict.type.sys_yes_no"
:key="dict.value" :key="dict.value"
:label="dict.value" :label="dict.value"
>{{dict.label}}</el-radio> >{{ dict.label }}</el-radio
>
</el-radio-group> </el-radio-group>
<el-radio-group v-model="form.enableFlag" v-else> <el-radio-group v-model="form.enableFlag" v-else>
<el-radio <el-radio
v-for="dict in dict.type.sys_yes_no" v-for="dict in dict.type.sys_yes_no"
:key="dict.value" :key="dict.value"
:label="dict.value" :label="dict.value"
>{{dict.label}}</el-radio> >{{ dict.label }}</el-radio
>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -169,28 +225,46 @@ ...@@ -169,28 +225,46 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="说明" prop="routeDesc"> <el-form-item label="说明" prop="routeDesc">
<el-input v-model="form.routeDesc" type="textarea" placeholder="请输入内容" /> <el-input
v-model="form.routeDesc"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-tabs type="border-card" v-if="form.routeId != null"> <el-tabs type="border-card" v-if="form.routeId != null">
<el-tab-pane label="组成工序"> <el-tab-pane label="组成工序">
<Routeprocess v-if="form.routeId !=null" :optType="optType" :routeId="form.routeId"></Routeprocess> <Routeprocess
v-if="form.routeId != null"
:optType="optType"
:routeId="form.routeId"
></Routeprocess>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="关联产品"> <el-tab-pane label="关联产品">
<Routeproduct v-if="form.routeId !=null" :optType="optType" :routeId="form.routeId"></Routeproduct> <Routeproduct
v-if="form.routeId != null"
:optType="optType"
:routeId="form.routeId"
></Routeproduct>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<div slot="footer" class="dialog-footer"> <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 type="primary" @click="submitForm" v-else>确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
...@@ -199,18 +273,24 @@ ...@@ -199,18 +273,24 @@
</template> </template>
<script> <script>
import { listProroute, getProroute, delProroute, addProroute, updateProroute } from "@/api/mes/pro/proroute"; import {
listProroute,
getProroute,
delProroute,
addProroute,
updateProroute,
} from "@/api/mes/pro/proroute";
import Routeprocess from "./routeprocess"; import Routeprocess from "./routeprocess";
import Routeproduct from "./product"; import Routeproduct from "./product";
import {genCode} from "@/api/system/autocode/rule" import { genCode } from "@/api/system/autocode/rule";
export default { export default {
name: "Proroute", name: "Proroute",
dicts: ['sys_yes_no'], dicts: ["sys_yes_no"],
components: {Routeprocess,Routeproduct}, components: { Routeprocess, Routeproduct },
data() { data() {
return { return {
//自动生成编码 //自动生成编码
autoGenFlag:false, autoGenFlag: false,
optType: undefined, optType: undefined,
// 遮罩层 // 遮罩层
loading: true, loading: true,
...@@ -244,15 +324,15 @@ export default { ...@@ -244,15 +324,15 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
routeCode: [ routeCode: [
{ required: true, message: "工艺路线编号不能为空", trigger: "blur" } { required: true, message: "工艺路线编号不能为空", trigger: "blur" },
], ],
routeName: [ routeName: [
{ required: true, message: "工艺路线名称不能为空", trigger: "blur" } { required: true, message: "工艺路线名称不能为空", trigger: "blur" },
], ],
enableFlag: [ enableFlag: [
{ required: true, message: "是否启用不能为空", trigger: "blur" } { required: true, message: "是否启用不能为空", trigger: "blur" },
], ],
} },
}; };
}, },
created() { created() {
...@@ -262,7 +342,7 @@ export default { ...@@ -262,7 +342,7 @@ export default {
/** 查询工艺路线列表 */ /** 查询工艺路线列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listProroute(this.queryParams).then(response => { listProroute(this.queryParams).then((response) => {
this.prorouteList = response.rows; this.prorouteList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
...@@ -280,12 +360,12 @@ export default { ...@@ -280,12 +360,12 @@ export default {
routeCode: null, routeCode: null,
routeName: null, routeName: null,
routeDesc: null, routeDesc: null,
enableFlag: 'Y', enableFlag: "Y",
remark: null, remark: null,
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null updateTime: null,
}; };
this.autoGenFlag = false; this.autoGenFlag = false;
this.resetForm("form"); this.resetForm("form");
...@@ -302,9 +382,9 @@ export default { ...@@ -302,9 +382,9 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.routeId) this.ids = selection.map((item) => item.routeId);
this.single = selection.length!==1 this.single = selection.length !== 1;
this.multiple = !selection.length this.multiple = !selection.length;
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
...@@ -314,10 +394,10 @@ export default { ...@@ -314,10 +394,10 @@ export default {
this.optType = "add"; this.optType = "add";
}, },
// 查询明细按钮操作 // 查询明细按钮操作
handleView(row){ handleView(row) {
this.reset(); this.reset();
const routeId = row.routeId || this.ids; const routeId = row.routeId || this.ids;
getProroute(routeId).then(response => { getProroute(routeId).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "查看工艺线路信息"; this.title = "查看工艺线路信息";
...@@ -327,8 +407,8 @@ export default { ...@@ -327,8 +407,8 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const routeId = row.routeId || this.ids const routeId = row.routeId || this.ids;
getProroute(routeId).then(response => { getProroute(routeId).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改工艺路线"; this.title = "修改工艺路线";
...@@ -337,16 +417,16 @@ export default { ...@@ -337,16 +417,16 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.routeId != null) { if (this.form.routeId != null) {
updateProroute(this.form).then(response => { updateProroute(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addProroute(this.form).then(response => { addProroute(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
...@@ -358,29 +438,37 @@ export default { ...@@ -358,29 +438,37 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const routeIds = row.routeId || this.ids; const routeIds = row.routeId || this.ids;
this.$modal.confirm('是否确认删除工艺路线编号为"' + routeIds + '"的数据项？').then(function() { this.$modal
.confirm('是否确认删除工艺路线编号为"' + routeIds + '"的数据项？')
.then(function () {
return delProroute(routeIds); return delProroute(routeIds);
}).then(() => { })
.then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); })
.catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('pro/proroute/export', { this.download(
...this.queryParams "pro/proroute/export",
}, `proroute_${new Date().getTime()}.xlsx`) {
...this.queryParams,
},
`proroute_${new Date().getTime()}.xlsx`
);
}, },
//自动生成编码 //自动生成编码
handleAutoGenChange(autoGenFlag){ handleAutoGenChange(autoGenFlag) {
if(autoGenFlag){ if (autoGenFlag) {
genCode('ROUTE_CODE').then(response =>{ genCode("ROUTE_CODE").then((response) => {
this.form.routeCode = response; this.form.routeCode = response;
}); });
}else{ } else {
this.form.routeCode = null; this.form.routeCode = null;
} }
} },
} },
}; };
</script> </script>
src/views/mes/pro/proroute/routeprocess.vue
View file @ ac9c3994
...@@ -117,9 +117,9 @@ ...@@ -117,9 +117,9 @@
<el-form-item label="与下一道工序关系" prop="linkType"> <el-form-item label="与下一道工序关系" prop="linkType">
<el-tooltip effect="dark" placement="right"> <el-tooltip effect="dark" placement="right">
<div slot="content"> <div slot="content">
S-to-S：当前工序开始生产，下一道工序才可开始生产 </br> S-to-S：当前工序开始生产，下一道工序才可开始生产</br>
F-to-F：当前工序结束生产，下一道工序才可结束生产 </br> F-to-F：当前工序结束生产，下一道工序才可结束生产</br>
S-to-F：当前工序开始生产，下一道工序才可结束生产 </br> S-to-F：当前工序开始生产，下一道工序才可结束生产</br>
F-to-S：当前工序结束生产，下一道工序才可开始生产 F-to-S：当前工序结束生产，下一道工序才可开始生产
</div> </div>
<el-select v-model="form.linkType" placeholder="请选择与下一道工序关系"> <el-select v-model="form.linkType" placeholder="请选择与下一道工序关系">
...@@ -144,10 +144,7 @@ ...@@ -144,10 +144,7 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item label="是否关键工序" prop="keyFlag"> <el-form-item label="是否关键工序" prop="keyFlag">
<el-tooltip effect="dark" placement="right"> <el-tooltip effect="dark" placement="right">
<div slot="content"> <div slot="content">是：整个工单的生产进度将根据当前工序的生产报工数量进行更新</br>每个工艺流程只能有一个关键工序</div>
是：整个工单的生产进度将根据当前工序的生产报工数量进行更新</br>
每个工艺流程只能有一个关键工序
</div>
<el-select v-model="form.keyFlag"> <el-select v-model="form.keyFlag">
<el-option <el-option
v-for="dict in dict.type.sys_yes_no" v-for="dict in dict.type.sys_yes_no"
......
src/views/mes/proofing/components/ProcessProd.vue 0 → 100644
View file @ ac9c3994
<template>
<div class="process-prod">
<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-row>
<el-table :data="tableData">
<el-table-column label="物料名称" prop="itemName" align="center" />
<el-table-column label="单位" prop="unitOfMeasure" align="center" />
<el-table-column label="用料比例" prop="quantity" align="center" />
<el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150">
<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"
title="skkskks"
width="800px"
append-to-body
>
<el-table :data="bomList" @selection-change="handleSelectionChange">
<el-table-column width="50" align="center">
<template v-slot="scope">
<el-radio
v-model="selectedItemId"
:label="scope.row.itemId"
@change="handleRowChange(scope.row)"
>{{ "" }}</el-radio
>
</template>
</el-table-column>
<el-table-column label="物料名称" prop="itemName" />
<el-table-column label="单位" prop="unitOfMeasure" />
<el-table-column label="用料比例" prop="quantity" />
</el-table>
<div slot="footer">
<el-button>确认</el-button>
<el-button @click="showFlag = false">取消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
props: {
bomList: {
type: Array,
default: () => [],
},
processId: {
type: Number | undefined,
default: undefined,
},
},
data() {
return {
tableData: [],
selectedItemId: undefined,
showFlag: false,
};
},
methods: {
handleSelectionChange() {},
handleRowChange() {},
handleAdd() {
this.showFlag = true;
},
updateRow() {},
deleteRow() {},
},
};
</script>
<style>
.process-prod {
padding: 0 20px;
}
</style>
src/views/mes/proofing/components/ProogingBom.vue
View file @ ac9c3994
...@@ -22,11 +22,7 @@ ...@@ -22,11 +22,7 @@
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" plain icon="el-icon-delete" size="mini"
type="primary"
plain
icon="el-icon-delete"
size="mini"
>产品分类导入</el-button >产品分类导入</el-button
> >
</el-col> </el-col>
...@@ -45,6 +41,12 @@ ...@@ -45,6 +41,12 @@
<el-table :data="tableData" @selection-change="handleSelectionChange"> <el-table :data="tableData" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column
label="物料名称"
align="center"
prop="itemName"
width="120"
/>
<el-table-column <el-table-column
label="组件数量" label="组件数量"
align="center" align="center"
...@@ -91,13 +93,13 @@ ...@@ -91,13 +93,13 @@
label="BOM行备注" label="BOM行备注"
align="center" align="center"
prop="bomItemRemark" prop="bomItemRemark"
width="120" min-width="120"
/> />
<el-table-column <el-table-column
label="物料备注" label="物料备注"
align="center" align="center"
prop="itemRemark" prop="itemRemark"
width="120" min-width="120"
/> />
<el-table-column label="操作" align="center" width="120"> <el-table-column label="操作" align="center" width="120">
<template slot-scope="{ row, index }"> <template slot-scope="{ row, index }">
...@@ -128,6 +130,24 @@ ...@@ -128,6 +130,24 @@
label-width="100px" label-width="100px"
size="small" size="small"
> >
<el-row>
<el-col :span="24">
<el-form-item label="产品" prop="itemId">
<el-input
v-model="form.itemName"
readonly
placeholder="请选择产品"
>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['ItemSelectRef'].showFlag = true"
></el-button>
</el-input>
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="组件数量" prop="quantity"> <el-form-item label="组件数量" prop="quantity">
...@@ -214,9 +234,10 @@ ...@@ -214,9 +234,10 @@
<script> <script>
import ItemBomSelect from "@/components/itemBomSelect/single.vue"; import ItemBomSelect from "@/components/itemBomSelect/single.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
components: { ItemBomSelect }, components: { ItemBomSelect, ItemSelect },
inject: ['mode'], inject: ["mode"],
data() { data() {
return { return {
/**弹窗状态 */ /**弹窗状态 */
...@@ -230,6 +251,8 @@ export default { ...@@ -230,6 +251,8 @@ export default {
/**表单初始化数据 */ /**表单初始化数据 */
form: { form: {
quantity: "", quantity: "",
itemName: "",
itemId: "",
unitOfMeasure: "", unitOfMeasure: "",
scrapPercentage: "", scrapPercentage: "",
alternativeGroup: "", alternativeGroup: "",
...@@ -241,9 +264,7 @@ export default { ...@@ -241,9 +264,7 @@ export default {
}, },
}; };
}, },
created() { created() {},
},
methods: { methods: {
/**多选 */ /**多选 */
handleSelectionChange(val) { handleSelectionChange(val) {
...@@ -270,6 +291,13 @@ export default { ...@@ -270,6 +291,13 @@ export default {
// this.tableData.unshift({...row}) // this.tableData.unshift({...row})
// } // }
}, },
onItemSelect(row) {
if (row != undefined && row != null) {
this.form.itemId = row.itemId;
this.form.itemName = row.itemName;
this.form.unit = row.unitOfMeasure;
}
},
/**表单提交 */ /**表单提交 */
submitForm() { submitForm() {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
...@@ -282,6 +310,8 @@ export default { ...@@ -282,6 +310,8 @@ export default {
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
itemName: "",
itemId: "",
quantity: "", quantity: "",
unitOfMeasure: "", unitOfMeasure: "",
scrapPercentage: "", scrapPercentage: "",
...@@ -295,8 +325,8 @@ export default { ...@@ -295,8 +325,8 @@ export default {
}, },
/**获取组件数据 */ /**获取组件数据 */
getComData() { getComData() {
return this.tableData return this.tableData;
} },
}, },
}; };
</script> </script>
......
src/views/mes/proofing/components/ProogingProcess.vue
View file @ ac9c3994
<template> <template>
<div> <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 :data="tableData" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="expand" 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 }"> <template slot-scope="{ row, index }">
<ProcessProd :processId="row.processId" :bomList="bomList" />
</template>
</el-table-column>
<el-table-column label="工序名称" prop="processName" align="center" />
<el-table-column label="工序编码" prop="processCode" align="center" />
<el-table-column
label="与下一道工序关系"
prop="linkType"
align="center"
/>
<el-table-column label="工作站" prop="workstationId" align="center" />
<el-table-column label="甘特图显示颜色" prop="colorCode" align="center" />
<el-table-column label="操作" align="center" width="150">
<template slot-scope="{ row }">
<el-button <el-button
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
...@@ -39,18 +24,16 @@ ...@@ -39,18 +24,16 @@
@click="updateRow(row)" @click="updateRow(row)"
>修改</el-button >修改</el-button
> >
<el-button
type="text"
icon="el-icon-delete"
size="small"
@click="deleteRow(index)"
>删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-dialog :visible.sync="showFlag" width="700px" title="添加工艺"> <el-dialog
v-dialogDrag
:visible.sync="showFlag"
width="800px"
title="添加工序"
>
<el-form <el-form
ref="form" ref="form"
:model="form" :model="form"
...@@ -145,14 +128,22 @@ ...@@ -145,14 +128,22 @@
<script> <script>
import ItemBomSelect from "@/components/itemBomSelect/single.vue"; import ItemBomSelect from "@/components/itemBomSelect/single.vue";
import ProcessProd from "./ProcessProd.vue";
export default { export default {
components: { ItemBomSelect }, components: { ItemBomSelect, ProcessProd },
props: {
bomList: {
type: Array,
default: () => [],
},
},
data() { data() {
return { return {
/**弹窗状态 */ /**弹窗状态 */
showFlag: false, showFlag: false,
/**表格数据 */ /**表格数据 */
tableData: [], tableData: [],
bomData: [],
/**表单规则 */ /**表单规则 */
rules: {}, rules: {},
/**多选 */ /**多选 */
...@@ -171,7 +162,19 @@ export default { ...@@ -171,7 +162,19 @@ export default {
}, },
}; };
}, },
watch: {
bomList: {
handler(val) {
console.log(val, "000000000");
this.bomData = val;
},
deep: true,
},
},
methods: { methods: {
setList(rows) {
this.tableData = rows;
},
/**多选 */ /**多选 */
handleSelectionChange(val) { handleSelectionChange(val) {
this.selection = val; this.selection = val;
......
src/views/mes/proofing/proofingInfo.vue
View file @ ac9c3994
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
ref="form" ref="form"
size="small" size="small"
:inline="true" :inline="true"
label-width="100px" label-width="8em"
> >
<el-row> <el-row>
<el-col :md="8" :xs="12"> <el-col :md="8" :xs="12">
...@@ -29,7 +29,11 @@ ...@@ -29,7 +29,11 @@
<el-col :md="8" :xs="12" style="height: 50.5px"> <el-col :md="8" :xs="12" style="height: 50.5px">
<el-form-item label="产品" prop="itemId"> <el-form-item label="产品" prop="itemId">
<el-input v-model="form.itemName" readonly placeholder="请选择产品"> <el-input
v-model="form.itemName"
readonly
placeholder="请选择产品"
>
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
...@@ -41,11 +45,25 @@ ...@@ -41,11 +45,25 @@
</el-col> </el-col>
<el-col :md="8" :xs="12" style="height: 50.5px"> <el-col :md="8" :xs="12" style="height: 50.5px">
<el-form-item label="工艺路线" prop="routeId"> <el-form-item label="工艺路线" prop="routeId">
<el-input v-model="form.routeId" placeholder="请选择工艺路线"> <el-input
<el-button slot="append" icon="el-icon-search"></el-button> v-model="form.routeName"
readonly
placeholder="请选择工艺路线"
>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['RoutesProcessSelectRef'].showFlag = true"
></el-button>
</el-input> </el-input>
<RoutesProcessSelect
ref="RoutesProcessSelectRef"
@onSelected="onRoutesProcessSelect"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :md="8" :xs="12"> <el-col :md="8" :xs="12">
<el-form-item label="简称" prop="abbreviation"> <el-form-item label="简称" prop="abbreviation">
<el-input <el-input
...@@ -64,10 +82,9 @@ ...@@ -64,10 +82,9 @@
</el-col> </el-col>
<el-col :md="8" :xs="12"> <el-col :md="8" :xs="12">
<el-form-item label="样品数量" prop="num"> <el-form-item label="样品数量" prop="num">
<el-input <el-input v-model="form.num" placeholder="请输入样品数量">
v-model="form.num" <template slot="suffix">{{ form.unit }}</template>
placeholder="请输入样品数量" </el-input>
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :xs="12"> <el-col :md="8" :xs="12">
...@@ -143,12 +160,12 @@ ...@@ -143,12 +160,12 @@
</el-row> </el-row>
</el-form> </el-form>
<el-tabs type="border-card"> <el-tabs type="border-card" @tab-click="tabClick">
<el-tab-pane label="BOM"> <el-tab-pane label="BOM">
<ProogingBom ref="ProogingBomRef" /> <ProogingBom ref="ProogingBomRef" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="工艺"> <el-tab-pane label="工艺">
<ProogingProcess ref="ProogingProcessRef" /> <ProogingProcess ref="ProogingProcessRef" :bomList="bomList" />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</PageWrapper> </PageWrapper>
...@@ -159,9 +176,11 @@ ...@@ -159,9 +176,11 @@
import ProogingBom from "./components/ProogingBom.vue"; import ProogingBom from "./components/ProogingBom.vue";
import ProogingProcess from "./components/ProogingProcess.vue"; import ProogingProcess from "./components/ProogingProcess.vue";
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue";
import { listRouteprocess } from "@/api/mes/pro/routeprocess";
export default { export default {
components: { ProogingBom, ProogingProcess, ItemSelect }, components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect },
dicts: [], dicts: [],
provide() { provide() {
return { return {
...@@ -170,12 +189,15 @@ export default { ...@@ -170,12 +189,15 @@ export default {
}, },
data() { data() {
return { return {
bomList: [],
// 表单参数 // 表单参数
form: { form: {
prototypeRequestCode: "", prototypeRequestCode: "",
itemId: "", itemId: "",
itemName: "", itemName: "",
unit: "",
routeId: "", routeId: "",
routeName: "",
abbreviation: "", abbreviation: "",
enName: "", enName: "",
num: "", num: "",
...@@ -209,21 +231,44 @@ export default { ...@@ -209,21 +231,44 @@ export default {
}, },
created() {}, created() {},
methods: { methods: {
/** 点击tab 获取bom的数据,将参数传递给后面的组件 */
tabClick(val) {
if (val.index != 0) {
this.bomList = this.$refs["ProogingBomRef"].getComData();
console.log(this.bomList, "7777777");
}
},
onItemSelect(row) { onItemSelect(row) {
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.form.itemId = row.itemId; this.form.itemId = row.itemId;
this.form.itemName = row.itemName; this.form.itemName = row.itemName;
this.form.unit = row.unitOfMeasure;
}
},
onRoutesProcessSelect(row) {
if (row != undefined && row != null) {
this.form.routeId = row.routeId;
this.form.routeName = row.routeName;
const params = {
pageNum: 1,
pageSize: 1000,
routeId: row.routeId,
};
listRouteprocess(params).then(({ rows }) => {
this.$refs["ProogingProcessRef"].setList(rows);
});
} }
}, },
/**提交 */ /**提交 */
saveForm() { saveForm() {
const bomData = this.$refs.ProogingBomRef.getComData() const bomData = this.$refs.ProogingBomRef.getComData();
const processData = this.$refs.ProogingProcess.getComData() const processData = this.$refs.ProogingProcess.getComData();
const params = { const params = {
...this.form, ...this.form,
bomList: bomData, bomList: bomData,
processList: processData processList: processData,
} };
}, },
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
......
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