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

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

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