Skip to content

P
pda-ui
Commit 36c81547 authored by 李驰骋's avatar 李驰骋
Browse files
Options

打样申请、制作、批量申请、制作、生产方案、品版报价、生产工单共七个模块调整工装量具关联为产品基础表

parent 2c88bed7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 372 additions and 380 deletions
src/views/mes/dv/brandquotation/components/ProcessTool.vue
View file @ 36c81547
......@@ -21,13 +21,12 @@
</el-col>
</el-row>
<el-table :data="tableData">
<el-table-column label="编号" align="center" prop="toolCode" >
<el-table-column label="编号" align="center" prop="itemCode" >
</el-table-column>
<el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true">
<el-table-column label="名称" align="center" prop="itemName" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/>
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150">
......@@ -67,15 +66,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码"
readonly>
<el-input v-model="form.itemCode" placeholder="请选择数据"
disabled>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true"
@click="$refs['ItemSelectRef'].showFlag = true"
></el-button>
</el-input>
<TmToolSelect ref="TmToolSelectRef" @onSelected="onTmToolSelect" />
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工装量具名称" prop="itemName">
<el-input
type="text"
v-model="form.itemName"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -109,7 +117,7 @@
</template>
<script>
import TmToolSelect from "@/components/TmTool/index.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
export default {
props: {
process: {
......@@ -117,16 +125,15 @@
default: () => ({}),
},
},
components: { TmToolSelect },
components: { ItemSelect },
dicts: ['mes_index_type'],
data() {
return {
form: {
toolCode: "",
toolName: "",
brand: "",
spec:"",
toolTypeName:"",
itemCode: "",
itemName: "",
specification:"",
itemTypeName:"",
remark: "",
quantity: "",
toolId:"",
......@@ -183,10 +190,9 @@
},
/**新增 */
configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) {
if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return;
}
console.log(this.process.processId);
this.tableData.unshift({
...this.form,
processId: this.process.processId,
......@@ -223,24 +229,22 @@
/**重置表单 */
resetForm() {
this.form = {
toolCode: "",
toolName: "",
brand: "",
spec:"",
toolTypeName:"",
toolId:"",
quantity: "",
itemCode: "",
itemName: "",
specification:"",
itemTypeName:"",
remark: "",
quantity: "",
toolId:"",
};
},
onTmToolSelect(row){
onItemSelect(row){
if (row != undefined && row != null) {
this.form.toolCode = row.toolCode;
this.form.toolName = row.toolName;
this.form.brand = row.brand;
this.form.spec = row.spec;
this.form.toolTypeName = row.toolTypeName;
this.form.toolId = row.toolId;
this.form.itemCode = row.itemCode;
this.form.itemName = row.itemName;
this.form.specification = row.specification;
this.form.itemTypeName = row.itemTypeName;
this.form.toolId = row.itemId;
}
}
},
......
src/views/mes/pro/productionMake/components/ProcessTool.vue
View file @ 36c81547
......@@ -21,13 +21,12 @@
</el-col>
</el-row>
<el-table :data="tableData">
<el-table-column label="编号" align="center" prop="toolCode" >
<el-table-column label="编号" align="center" prop="itemCode" >
</el-table-column>
<el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true">
<el-table-column label="名称" align="center" prop="itemName" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/>
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150">
......@@ -67,15 +66,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码"
readonly>
<el-input v-model="form.itemCode" placeholder="请选择数据"
disabled>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true"
@click="$refs['ItemSelectRef'].showFlag = true"
></el-button>
</el-input>
<TmToolSelect ref="TmToolSelectRef" @onSelected="onTmToolSelect" />
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工装量具名称" prop="itemName">
<el-input
type="text"
v-model="form.itemName"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -109,7 +117,7 @@
</template>
<script>
import TmToolSelect from "@/components/TmTool/index.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
export default {
props: {
process: {
......@@ -117,16 +125,15 @@
default: () => ({}),
},
},
components: { TmToolSelect },
components: { ItemSelect },
dicts: ['mes_index_type'],
data() {
return {
form: {
toolCode: "",
toolName: "",
brand: "",
spec:"",
toolTypeName:"",
itemCode: "",
itemName: "",
specification:"",
itemTypeName:"",
remark: "",
quantity: "",
toolId:"",
......@@ -183,7 +190,7 @@
},
/**新增 */
configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) {
if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return;
}
this.tableData.unshift({
......@@ -222,24 +229,22 @@
/**重置表单 */
resetForm() {
this.form = {
toolCode: "",
toolName: "",
brand: "",
spec:"",
toolTypeName:"",
toolId:"",
quantity: "",
itemCode: "",
itemName: "",
specification:"",
itemTypeName:"",
remark: "",
quantity: "",
toolId:"",
};
},
onTmToolSelect(row){
onItemSelect(row){
if (row != undefined && row != null) {
this.form.toolCode = row.toolCode;
this.form.toolName = row.toolName;
this.form.brand = row.brand;
this.form.spec = row.spec;
this.form.toolTypeName = row.toolTypeName;
this.form.toolId = row.toolId;
this.form.itemCode = row.itemCode;
this.form.itemName = row.itemName;
this.form.specification = row.specification;
this.form.itemTypeName = row.itemTypeName;
this.form.toolId = row.itemId;
}
}
},
......
src/views/mes/pro/productionSolution/components/ProcessTool.vue
View file @ 36c81547
......@@ -8,7 +8,7 @@
append-to-body
title="设置工装量具"
>
<!-- <el-row :gutter="10" class="mb8">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
......@@ -17,37 +17,18 @@
size="mini"
@click="handleAdd"
>新增</el-button
>
>
</el-col>
</el-row> -->
</el-row>
<el-table :data="tableData">
<el-table-column label="编号" align="center" prop="toolCode" >
<el-table-column label="编号" align="center" prop="itemCode" >
</el-table-column>
<el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true">
<el-table-column label="名称" align="center" prop="itemName" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/>
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" />
<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, $index)"
>修改</el-button
>
<el-button
type="text"
icon="el-icon-delete"
size="small"
@click="deleteRow($index)"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<div slot="footer">
......@@ -67,15 +48,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码"
readonly>
<el-input v-model="form.itemCode" placeholder="请选择数据"
disabled>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true"
@click="$refs['ItemSelectRef'].showFlag = true"
></el-button>
</el-input>
<TmToolSelect ref="TmToolSelectRef" @onSelected="onTmToolSelect" />
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工装量具名称" prop="itemName">
<el-input
type="text"
v-model="form.itemName"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -109,7 +99,7 @@
</template>
<script>
import TmToolSelect from "@/components/TmTool/index.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
export default {
props: {
process: {
......@@ -117,16 +107,15 @@
default: () => ({}),
},
},
components: { TmToolSelect },
components: { ItemSelect },
dicts: ['mes_index_type'],
data() {
return {
form: {
toolCode: "",
toolName: "",
brand: "",
spec:"",
toolTypeName:"",
itemCode: "",
itemName: "",
specification:"",
itemTypeName:"",
remark: "",
quantity: "",
toolId:"",
......@@ -183,7 +172,7 @@
},
/**新增 */
configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) {
if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return;
}
this.tableData.unshift({
......@@ -222,24 +211,22 @@
/**重置表单 */
resetForm() {
this.form = {
toolCode: "",
toolName: "",
brand: "",
spec:"",
toolTypeName:"",
toolId:"",
quantity: "",
itemCode: "",
itemName: "",
specification:"",
itemTypeName:"",
remark: "",
quantity: "",
toolId:"",
};
},
onTmToolSelect(row){
onItemSelect(row){
if (row != undefined && row != null) {
this.form.toolCode = row.toolCode;
this.form.toolName = row.toolName;
this.form.brand = row.brand;
this.form.spec = row.spec;
this.form.toolTypeName = row.toolTypeName;
this.form.toolId = row.toolId;
this.form.itemCode = row.itemCode;
this.form.itemName = row.itemName;
this.form.specification = row.specification;
this.form.itemTypeName = row.itemTypeName;
this.form.toolId = row.itemId;
}
}
},
......
src/views/mes/pro/productiorequest/components/ProcessTool.vue
View file @ 36c81547
......@@ -21,13 +21,12 @@
</el-col>
</el-row>
<el-table :data="tableData">
<el-table-column label="编号" align="center" prop="toolCode" >
<el-table-column label="编号" align="center" prop="itemCode" >
</el-table-column>
<el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true">
<el-table-column label="名称" align="center" prop="itemName" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/>
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150">
......@@ -67,15 +66,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码"
readonly>
<el-input v-model="form.itemCode" placeholder="请选择数据"
disabled>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true"
@click="$refs['ItemSelectRef'].showFlag = true"
></el-button>
</el-input>
<TmToolSelect ref="TmToolSelectRef" @onSelected="onTmToolSelect" />
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工装量具名称" prop="itemName">
<el-input
type="text"
v-model="form.itemName"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -109,7 +117,7 @@
</template>
<script>
import TmToolSelect from "@/components/TmTool/index.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
export default {
props: {
process: {
......@@ -117,16 +125,15 @@
default: () => ({}),
},
},
components: { TmToolSelect },
components: { ItemSelect },
dicts: ['mes_index_type'],
data() {
return {
form: {
toolCode: "",
toolName: "",
brand: "",
spec:"",
toolTypeName:"",
itemCode: "",
itemName: "",
specification:"",
itemTypeName:"",
remark: "",
quantity: "",
toolId:"",
......@@ -183,7 +190,7 @@
},
/**新增 */
configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) {
if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return;
}
this.tableData.unshift({
......@@ -222,24 +229,22 @@
/**重置表单 */
resetForm() {
this.form = {
toolCode: "",
toolName: "",
brand: "",
spec:"",
toolTypeName:"",
toolId:"",
quantity: "",
itemCode: "",
itemName: "",
specification:"",
itemTypeName:"",
remark: "",
quantity: "",
toolId:"",
};
},
onTmToolSelect(row){
onItemSelect(row){
if (row != undefined && row != null) {
this.form.toolCode = row.toolCode;
this.form.toolName = row.toolName;
this.form.brand = row.brand;
this.form.spec = row.spec;
this.form.toolTypeName = row.toolTypeName;
this.form.toolId = row.toolId;
this.form.itemCode = row.itemCode;
this.form.itemName = row.itemName;
this.form.specification = row.specification;
this.form.itemTypeName = row.itemTypeName;
this.form.toolId = row.itemId;
}
}
},
......
src/views/mes/pro/prototypeMake/components/ProcessTool.vue
View file @ 36c81547
......@@ -21,13 +21,12 @@
</el-col>
</el-row>
<el-table :data="tableData">
<el-table-column label="编号" align="center" prop="toolCode" >
<el-table-column label="编号" align="center" prop="itemCode" >
</el-table-column>
<el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true">
<el-table-column label="名称" align="center" prop="itemName" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/>
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150">
......@@ -67,15 +66,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码"
readonly>
<el-input v-model="form.itemCode" placeholder="请选择数据"
disabled>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true"
@click="$refs['ItemSelectRef'].showFlag = true"
></el-button>
</el-input>
<TmToolSelect ref="TmToolSelectRef" @onSelected="onTmToolSelect" />
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工装量具名称" prop="itemName">
<el-input
type="text"
v-model="form.itemName"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -109,7 +117,7 @@
</template>
<script>
import TmToolSelect from "@/components/TmTool/index.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
export default {
props: {
process: {
......@@ -117,16 +125,15 @@
default: () => ({}),
},
},
components: { TmToolSelect },
components: { ItemSelect },
dicts: ['mes_index_type'],
data() {
return {
form: {
toolCode: "",
toolName: "",
brand: "",
spec:"",
toolTypeName:"",
itemCode: "",
itemName: "",
specification:"",
itemTypeName:"",
remark: "",
quantity: "",
toolId:"",
......@@ -183,7 +190,7 @@
},
/**新增 */
configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) {
if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return;
}
this.tableData.unshift({
......@@ -222,24 +229,22 @@
/**重置表单 */
resetForm() {
this.form = {
toolCode: "",
toolName: "",
brand: "",
spec:"",
toolTypeName:"",
toolId:"",
quantity: "",
itemCode: "",
itemName: "",
specification:"",
itemTypeName:"",
remark: "",
quantity: "",
toolId:"",
};
},
onTmToolSelect(row){
onItemSelect(row){
if (row != undefined && row != null) {
this.form.toolCode = row.toolCode;
this.form.toolName = row.toolName;
this.form.brand = row.brand;
this.form.spec = row.spec;
this.form.toolTypeName = row.toolTypeName;
this.form.toolId = row.toolId;
this.form.itemCode = row.itemCode;
this.form.itemName = row.itemName;
this.form.specification = row.specification;
this.form.itemTypeName = row.itemTypeName;
this.form.toolId = row.itemId;
}
}
},
......
src/views/mes/proofing/components/ProcessTool.vue
View file @ 36c81547
......@@ -21,13 +21,12 @@
</el-col>
</el-row>
<el-table :data="tableData">
<el-table-column label="编号" align="center" prop="toolCode" >
<el-table-column label="编号" align="center" prop="itemCode" >
</el-table-column>
<el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true">
<el-table-column label="名称" align="center" prop="itemName" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/>
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150">
......@@ -67,15 +66,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码"
readonly>
<el-input v-model="form.itemCode" placeholder="请选择数据"
disabled>
<el-button
slot="append"
icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true"
@click="$refs['ItemSelectRef'].showFlag = true"
></el-button>
</el-input>
<TmToolSelect ref="TmToolSelectRef" @onSelected="onTmToolSelect" />
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工装量具名称" prop="itemName">
<el-input
type="text"
v-model="form.itemName"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -109,7 +117,7 @@
</template>
<script>
import TmToolSelect from "@/components/TmTool/index.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
export default {
props: {
process: {
......@@ -117,16 +125,15 @@
default: () => ({}),
},
},
components: { TmToolSelect },
components: { ItemSelect },
dicts: ['mes_index_type'],
data() {
return {
form: {
toolCode: "",
toolName: "",
brand: "",
spec:"",
toolTypeName:"",
itemCode: "",
itemName: "",
specification:"",
itemTypeName:"",
remark: "",
quantity: "",
toolId:"",
......@@ -183,7 +190,7 @@
},
/**新增 */
configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) {
if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return;
}
this.tableData.unshift({
......@@ -222,24 +229,22 @@
/**重置表单 */
resetForm() {
this.form = {
toolCode: "",
toolName: "",
brand: "",
spec:"",
toolTypeName:"",
toolId:"",
quantity: "",
itemCode: "",
itemName: "",
specification:"",
itemTypeName:"",
remark: "",
quantity: "",
toolId:"",
};
},
onTmToolSelect(row){
onItemSelect(row){
if (row != undefined && row != null) {
this.form.toolCode = row.toolCode;
this.form.toolName = row.toolName;
this.form.brand = row.brand;
this.form.spec = row.spec;
this.form.toolTypeName = row.toolTypeName;
this.form.toolId = row.toolId;
this.form.itemCode = row.itemCode;
this.form.itemName = row.itemName;
this.form.specification = row.specification;
this.form.itemTypeName = row.itemTypeName;
this.form.toolId = row.itemId;
}
}
},
......
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