Commit 2597a536 authored by 张海景's avatar 张海景

update:修改排产换型对照信息

parent f12123d8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
width="80%" width="80%"
append-to-body append-to-body
> >
<el-row :gutter="20"> <el-row :gutter="20" style="max-height: 600px; overflow-y: auto;">
<!--分类数据--> <!--分类数据-->
<el-col :span="4" :xs="24"> <el-col :span="4" :xs="24">
<div class="head-container"> <div class="head-container">
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
> >
<!-- <el-form-item label="排序" prop="orderNum"> <!-- <el-form-item label="排序" prop="orderNum">
<el-input <el-input
v-model="queryParams.orderNum" v-model="queryParams.orderNum"
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="分类" label="分类"
align="left" align="left"
key="itemTypeName" key="itemTypeName"
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="排序" label="排序"
align="center" align="center"
key="orderNum" key="orderNum"
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
...@@ -206,7 +206,7 @@ export default { ...@@ -206,7 +206,7 @@ export default {
listItemType(this.queryParams).then(response => { listItemType(this.queryParams).then(response => {
this.itemList = response.data; this.itemList = response.data;
// this.total = response.total; // this.total = response.total;
this.loading = false; this.loading = false;
}); });
}, },
...@@ -234,8 +234,8 @@ export default { ...@@ -234,8 +234,8 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.form = { this.form = {
itemTypeName: null, itemTypeName: null,
orderNum: null, orderNum: null,
itemOrProduct: null itemOrProduct: null
}; };
this.resetForm("queryForm"); this.resetForm("queryForm");
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
:visible.sync="showFlag" :visible.sync="showFlag"
:modal= false :modal= false
width="80%" width="80%"
center
> >
<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="processName"> <el-form-item label="所属工序" prop="processName">
...@@ -38,7 +37,7 @@ ...@@ -38,7 +37,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工序编码" align="center" prop="processCode"/> <el-table-column label="工序编码" align="center" prop="processCode"/>
<el-table-column label="工序名称" align="center" prop="processName" /> <el-table-column label="工序名称" align="center" prop="processName" />
<el-table-column label="是否启用" align="center" prop="enableFlag"> <el-table-column label="是否启用" align="center" prop="enableFlag">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -114,7 +113,7 @@ ...@@ -114,7 +113,7 @@
}, },
// 表单参数 // 表单参数
form: {}, form: {},
}; };
}, },
created() { created() {
...@@ -146,8 +145,8 @@ ...@@ -146,8 +145,8 @@
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.form = { this.form = {
processName: null, processName: null,
processCode: null, processCode: null,
}; };
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<el-input <el-input
v-model="queryParams.arrangeRuleCode" v-model="queryParams.arrangeRuleCode"
placeholder="请输入编排对照编码" placeholder="请输入编排对照编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
</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"
...@@ -198,8 +198,8 @@ ...@@ -198,8 +198,8 @@
<el-row> <el-row>
<el-col span="12"> <el-col span="12">
<el-form-item label="编排对照编码" prop="arrangeRuleCode"> <el-form-item label="编排对照编码" prop="arrangeRuleCode">
<el-input <el-input
v-model="form.arrangeRuleCode" v-model="form.arrangeRuleCode"
placeholder="自动生成" placeholder="自动生成"
disabled disabled
/> />
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col span="12"> <el-col span="12">
<el-form-item label="工艺要求" label-width="120px"> <el-form-item label="工艺要求" label-width="120px">
<el-radio-group v-model="form.routeDesc" disabled v-if="optType=='view'"> <el-radio-group v-model="form.routeDesc" disabled v-if="optType=='view'">
<el-radio <el-radio
...@@ -522,7 +522,7 @@ ...@@ -522,7 +522,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="印刷尺寸" label-width="120px"> <el-form-item label="印刷尺寸" label-width="120px">
<el-radio-group v-model="form.printingWidth" disabled v-if="optType=='view'"> <el-radio-group v-model="form.printingWidth" disabled v-if="optType=='view'">
<el-radio <el-radio
...@@ -550,11 +550,11 @@ ...@@ -550,11 +550,11 @@
<script> <script>
import { import {
listProWorkOrderArrangeRule, listProWorkOrderArrangeRule,
getProWorkOrderArrangeRule, getProWorkOrderArrangeRule,
delProWorkOrderArrangeRule, delProWorkOrderArrangeRule,
addProWorkOrderArrangeRule, addProWorkOrderArrangeRule,
updateProWorkOrderArrangeRule } from "@/api/mes/pro/arrangeRule"; updateProWorkOrderArrangeRule } from "@/api/mes/pro/arrangeRule";
import { genCode } from "@/api/system/autocode/rule"; import { genCode } from "@/api/system/autocode/rule";
import BrandSelect from "@/components/itemType/single.vue"; import BrandSelect from "@/components/itemType/single.vue";
...@@ -587,27 +587,27 @@ export default { ...@@ -587,27 +587,27 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
arrangeRuleCode: null, arrangeRuleCode: null,
itemTypeId: null, itemTypeId: null,
itemTypeName: null, itemTypeName: null,
processId: null, processId: null,
processName: null, processName: null,
routeCode: null, routeCode: null,
routeDesc: null, routeDesc: null,
brandCode: null, brandCode: null,
itemCode: null, itemCode: null,
length: null, length: null,
width: null, width: null,
productMaterial: null, productMaterial: null,
processCode: null, processCode: null,
spacing: null, spacing: null,
frontImg: null, frontImg: null,
toolList: null, toolList: null,
shape: null, shape: null,
inlay: null, inlay: null,
blownFilmWidth: null, blownFilmWidth: null,
blownFilmThickness: null, blownFilmThickness: null,
printingWidth: null printingWidth: null
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -649,28 +649,28 @@ export default { ...@@ -649,28 +649,28 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
arrangeRuleId: null, arrangeRuleId: null,
arrangeRuleCode: null, arrangeRuleCode: null,
itemTypeId: null, itemTypeId: null,
itemTypeName: null, itemTypeName: null,
processId: null, processId: null,
processName: null, processName: null,
routeCode: null, routeCode: null,
routeDesc: null, routeDesc: null,
brandCode: null, brandCode: null,
itemCode: null, itemCode: null,
length: null, length: null,
width: null, width: null,
productMaterial: null, productMaterial: null,
processCode: null, processCode: null,
spacing: null, spacing: null,
frontImg: null, frontImg: null,
toolList: null, toolList: null,
shape: null, shape: null,
inlay: null, inlay: null,
blownFilmWidth: null, blownFilmWidth: null,
blownFilmThickness: null, blownFilmThickness: null,
printingWidth: null printingWidth: null
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -684,7 +684,7 @@ export default { ...@@ -684,7 +684,7 @@ export default {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
handleBrandSelect(){ handleBrandSelect(){
this.$refs.brSelect.showFlag = true; this.$refs.brSelect.showFlag = true;
}, },
onBrandSelected(row){ onBrandSelected(row){
...@@ -702,7 +702,7 @@ export default { ...@@ -702,7 +702,7 @@ export default {
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.form.processId = row.processId; this.form.processId = row.processId;
this.form.processName = row.processName; this.form.processName = row.processName;
} }
}, },
......
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