Skip to content

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

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

parent 2c88bed7
Show 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 @@ ...@@ -21,13 +21,12 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="tableData"> <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>
<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>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/> <el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/> <el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" /> <el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" /> <el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150"> <el-table-column label="操作" align="center" width="150">
...@@ -67,15 +66,24 @@ ...@@ -67,15 +66,24 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" > <el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码" <el-input v-model="form.itemCode" placeholder="请选择数据"
readonly> disabled>
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -109,7 +117,7 @@ ...@@ -109,7 +117,7 @@
</template> </template>
<script> <script>
import TmToolSelect from "@/components/TmTool/index.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
props: { props: {
process: { process: {
...@@ -117,16 +125,15 @@ ...@@ -117,16 +125,15 @@
default: () => ({}), default: () => ({}),
}, },
}, },
components: { TmToolSelect }, components: { ItemSelect },
dicts: ['mes_index_type'], dicts: ['mes_index_type'],
data() { data() {
return { return {
form: { form: {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
remark: "", remark: "",
quantity: "", quantity: "",
toolId:"", toolId:"",
...@@ -183,10 +190,9 @@ ...@@ -183,10 +190,9 @@
}, },
/**新增 */ /**新增 */
configmSelect() { configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) { if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return; return;
} }
console.log(this.process.processId);
this.tableData.unshift({ this.tableData.unshift({
...this.form, ...this.form,
processId: this.process.processId, processId: this.process.processId,
...@@ -223,24 +229,22 @@ ...@@ -223,24 +229,22 @@
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
toolId:"",
quantity: "",
remark: "", remark: "",
quantity: "",
toolId:"",
}; };
}, },
onTmToolSelect(row){ onItemSelect(row){
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.form.toolCode = row.toolCode; this.form.itemCode = row.itemCode;
this.form.toolName = row.toolName; this.form.itemName = row.itemName;
this.form.brand = row.brand; this.form.specification = row.specification;
this.form.spec = row.spec; this.form.itemTypeName = row.itemTypeName;
this.form.toolTypeName = row.toolTypeName; this.form.toolId = row.itemId;
this.form.toolId = row.toolId;
} }
} }
}, },
......
src/views/mes/pro/productionMake/components/ProcessTool.vue
View file @ 36c81547
...@@ -21,13 +21,12 @@ ...@@ -21,13 +21,12 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="tableData"> <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>
<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>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/> <el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/> <el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" /> <el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" /> <el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150"> <el-table-column label="操作" align="center" width="150">
...@@ -67,15 +66,24 @@ ...@@ -67,15 +66,24 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" > <el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码" <el-input v-model="form.itemCode" placeholder="请选择数据"
readonly> disabled>
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -109,7 +117,7 @@ ...@@ -109,7 +117,7 @@
</template> </template>
<script> <script>
import TmToolSelect from "@/components/TmTool/index.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
props: { props: {
process: { process: {
...@@ -117,16 +125,15 @@ ...@@ -117,16 +125,15 @@
default: () => ({}), default: () => ({}),
}, },
}, },
components: { TmToolSelect }, components: { ItemSelect },
dicts: ['mes_index_type'], dicts: ['mes_index_type'],
data() { data() {
return { return {
form: { form: {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
remark: "", remark: "",
quantity: "", quantity: "",
toolId:"", toolId:"",
...@@ -183,7 +190,7 @@ ...@@ -183,7 +190,7 @@
}, },
/**新增 */ /**新增 */
configmSelect() { configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) { if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return; return;
} }
this.tableData.unshift({ this.tableData.unshift({
...@@ -222,24 +229,22 @@ ...@@ -222,24 +229,22 @@
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
toolId:"",
quantity: "",
remark: "", remark: "",
quantity: "",
toolId:"",
}; };
}, },
onTmToolSelect(row){ onItemSelect(row){
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.form.toolCode = row.toolCode; this.form.itemCode = row.itemCode;
this.form.toolName = row.toolName; this.form.itemName = row.itemName;
this.form.brand = row.brand; this.form.specification = row.specification;
this.form.spec = row.spec; this.form.itemTypeName = row.itemTypeName;
this.form.toolTypeName = row.toolTypeName; this.form.toolId = row.itemId;
this.form.toolId = row.toolId;
} }
} }
}, },
......
src/views/mes/pro/productionSolution/components/ProcessTool.vue
View file @ 36c81547
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
append-to-body append-to-body
title="设置工装量具" title="设置工装量具"
> >
<!-- <el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
...@@ -19,35 +19,16 @@ ...@@ -19,35 +19,16 @@
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
</el-row> --> </el-row>
<el-table :data="tableData"> <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>
<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>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/> <el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/> <el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" /> <el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" 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, $index)"
>修改</el-button
>
<el-button
type="text"
icon="el-icon-delete"
size="small"
@click="deleteRow($index)"
>删除</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<div slot="footer"> <div slot="footer">
...@@ -67,15 +48,24 @@ ...@@ -67,15 +48,24 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" > <el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码" <el-input v-model="form.itemCode" placeholder="请选择数据"
readonly> disabled>
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -109,7 +99,7 @@ ...@@ -109,7 +99,7 @@
</template> </template>
<script> <script>
import TmToolSelect from "@/components/TmTool/index.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
props: { props: {
process: { process: {
...@@ -117,16 +107,15 @@ ...@@ -117,16 +107,15 @@
default: () => ({}), default: () => ({}),
}, },
}, },
components: { TmToolSelect }, components: { ItemSelect },
dicts: ['mes_index_type'], dicts: ['mes_index_type'],
data() { data() {
return { return {
form: { form: {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
remark: "", remark: "",
quantity: "", quantity: "",
toolId:"", toolId:"",
...@@ -183,7 +172,7 @@ ...@@ -183,7 +172,7 @@
}, },
/**新增 */ /**新增 */
configmSelect() { configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) { if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return; return;
} }
this.tableData.unshift({ this.tableData.unshift({
...@@ -222,24 +211,22 @@ ...@@ -222,24 +211,22 @@
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
toolId:"",
quantity: "",
remark: "", remark: "",
quantity: "",
toolId:"",
}; };
}, },
onTmToolSelect(row){ onItemSelect(row){
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.form.toolCode = row.toolCode; this.form.itemCode = row.itemCode;
this.form.toolName = row.toolName; this.form.itemName = row.itemName;
this.form.brand = row.brand; this.form.specification = row.specification;
this.form.spec = row.spec; this.form.itemTypeName = row.itemTypeName;
this.form.toolTypeName = row.toolTypeName; this.form.toolId = row.itemId;
this.form.toolId = row.toolId;
} }
} }
}, },
......
src/views/mes/pro/productiorequest/components/ProcessTool.vue
View file @ 36c81547
...@@ -21,13 +21,12 @@ ...@@ -21,13 +21,12 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="tableData"> <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>
<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>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/> <el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/> <el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" /> <el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" /> <el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150"> <el-table-column label="操作" align="center" width="150">
...@@ -67,15 +66,24 @@ ...@@ -67,15 +66,24 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" > <el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码" <el-input v-model="form.itemCode" placeholder="请选择数据"
readonly> disabled>
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -109,7 +117,7 @@ ...@@ -109,7 +117,7 @@
</template> </template>
<script> <script>
import TmToolSelect from "@/components/TmTool/index.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
props: { props: {
process: { process: {
...@@ -117,16 +125,15 @@ ...@@ -117,16 +125,15 @@
default: () => ({}), default: () => ({}),
}, },
}, },
components: { TmToolSelect }, components: { ItemSelect },
dicts: ['mes_index_type'], dicts: ['mes_index_type'],
data() { data() {
return { return {
form: { form: {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
remark: "", remark: "",
quantity: "", quantity: "",
toolId:"", toolId:"",
...@@ -183,7 +190,7 @@ ...@@ -183,7 +190,7 @@
}, },
/**新增 */ /**新增 */
configmSelect() { configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) { if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return; return;
} }
this.tableData.unshift({ this.tableData.unshift({
...@@ -222,24 +229,22 @@ ...@@ -222,24 +229,22 @@
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
toolId:"",
quantity: "",
remark: "", remark: "",
quantity: "",
toolId:"",
}; };
}, },
onTmToolSelect(row){ onItemSelect(row){
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.form.toolCode = row.toolCode; this.form.itemCode = row.itemCode;
this.form.toolName = row.toolName; this.form.itemName = row.itemName;
this.form.brand = row.brand; this.form.specification = row.specification;
this.form.spec = row.spec; this.form.itemTypeName = row.itemTypeName;
this.form.toolTypeName = row.toolTypeName; this.form.toolId = row.itemId;
this.form.toolId = row.toolId;
} }
} }
}, },
......
src/views/mes/pro/prototypeMake/components/ProcessTool.vue
View file @ 36c81547
...@@ -21,13 +21,12 @@ ...@@ -21,13 +21,12 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="tableData"> <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>
<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>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/> <el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/> <el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" /> <el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" /> <el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150"> <el-table-column label="操作" align="center" width="150">
...@@ -67,15 +66,24 @@ ...@@ -67,15 +66,24 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" > <el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码" <el-input v-model="form.itemCode" placeholder="请选择数据"
readonly> disabled>
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -109,7 +117,7 @@ ...@@ -109,7 +117,7 @@
</template> </template>
<script> <script>
import TmToolSelect from "@/components/TmTool/index.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
props: { props: {
process: { process: {
...@@ -117,16 +125,15 @@ ...@@ -117,16 +125,15 @@
default: () => ({}), default: () => ({}),
}, },
}, },
components: { TmToolSelect }, components: { ItemSelect },
dicts: ['mes_index_type'], dicts: ['mes_index_type'],
data() { data() {
return { return {
form: { form: {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
remark: "", remark: "",
quantity: "", quantity: "",
toolId:"", toolId:"",
...@@ -183,7 +190,7 @@ ...@@ -183,7 +190,7 @@
}, },
/**新增 */ /**新增 */
configmSelect() { configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) { if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return; return;
} }
this.tableData.unshift({ this.tableData.unshift({
...@@ -222,24 +229,22 @@ ...@@ -222,24 +229,22 @@
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
toolId:"",
quantity: "",
remark: "", remark: "",
quantity: "",
toolId:"",
}; };
}, },
onTmToolSelect(row){ onItemSelect(row){
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.form.toolCode = row.toolCode; this.form.itemCode = row.itemCode;
this.form.toolName = row.toolName; this.form.itemName = row.itemName;
this.form.brand = row.brand; this.form.specification = row.specification;
this.form.spec = row.spec; this.form.itemTypeName = row.itemTypeName;
this.form.toolTypeName = row.toolTypeName; this.form.toolId = row.itemId;
this.form.toolId = row.toolId;
} }
} }
}, },
......
src/views/mes/pro/workorder/components/ProcessTool.vue
View file @ 36c81547
...@@ -21,28 +21,12 @@ ...@@ -21,28 +21,12 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="tableData"> <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>
<el-table-column <el-table-column label="名称" align="center" prop="itemName" :show-overflow-tooltip="true">
label="名称"
align="center"
prop="toolName"
:show-overflow-tooltip="true"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
label="品牌" <el-table-column label="类型" align="center" prop="itemTypeName" />
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="quantity" /> <el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" /> <el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150"> <el-table-column label="操作" align="center" width="150">
...@@ -81,22 +65,25 @@ ...@@ -81,22 +65,25 @@
<el-form ref="form" :model="form" label-width="120px"> <el-form ref="form" :model="form" label-width="120px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode"> <el-form-item label="工装量具编码" prop="toolCode" >
<el-input <el-input v-model="form.itemCode" placeholder="请选择数据"
v-model="form.toolName" disabled>
placeholder="请选择测项编码"
readonly
>
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </el-input>
<TmToolSelect <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
ref="TmToolSelectRef" </el-form-item>
@onSelected="onTmToolSelect" </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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -112,11 +99,7 @@ ...@@ -112,11 +99,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input <el-input v-model="form.remark" type="textarea" :rows="3"></el-input>
v-model="form.remark"
type="textarea"
:rows="3"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -134,34 +117,33 @@ ...@@ -134,34 +117,33 @@
</template> </template>
<script> <script>
import TmToolSelect from "@/components/TmTool/index.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
props: { props: {
process: { process: {
type: Object, type: Object,
default: () => ({}), default: () => ({}),
}, },
}, },
components: { TmToolSelect }, components: { ItemSelect },
dicts: ["mes_index_type"], dicts: ['mes_index_type'],
data() { data() {
return { return {
form: { form: {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec: "", itemTypeName:"",
toolTypeName: "",
remark: "", remark: "",
quantity: "", quantity: "",
toolId: "", toolId:"",
}, },
currentRowIdx: undefined, currentRowIdx: undefined,
tableData: [], tableData: [],
selectedItemId: undefined, selectedItemId: undefined,
selectedRows: null, selectedRows: null,
showFlag: false, showFlag: false,
optType: null, optType:null,
showProcessProd: false, showProcessProd: false,
editConnectVisible: false, editConnectVisible: false,
}; };
...@@ -195,7 +177,7 @@ export default { ...@@ -195,7 +177,7 @@ export default {
/**新增按钮 */ /**新增按钮 */
handleAdd() { handleAdd() {
this.resetForm(); this.resetForm();
this.optType = "add"; this.optType='add';
this.editConnectVisible = true; this.editConnectVisible = true;
}, },
/**编辑 */ /**编辑 */
...@@ -203,17 +185,18 @@ export default { ...@@ -203,17 +185,18 @@ export default {
this.resetForm(); this.resetForm();
Object.assign(this.form, row); Object.assign(this.form, row);
this.currentRowIdx = idx; this.currentRowIdx = idx;
this.optType = "edit"; this.optType='edit';
this.editConnectVisible = true; this.editConnectVisible = true;
}, },
/**新增 */ /**新增 */
configmSelect() { configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) { if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return; return;
} }
this.tableData.unshift({ this.tableData.unshift({
...this.form, ...this.form,
processId: this.process.processId, processId: this.process.processId,
}); });
this.editConnectVisible = false; this.editConnectVisible = false;
}, },
...@@ -224,10 +207,10 @@ export default { ...@@ -224,10 +207,10 @@ export default {
}); });
this.editConnectVisible = false; this.editConnectVisible = false;
}, },
addOrEditubmit() { addOrEditubmit(){
if (this.optType == "add") { if(this.optType=='add'){
this.configmSelect(); this.configmSelect();
} else { }else{
this.submitEditConnect(); this.submitEditConnect();
} }
}, },
...@@ -246,32 +229,30 @@ export default { ...@@ -246,32 +229,30 @@ export default {
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec: "", itemTypeName:"",
toolTypeName: "",
toolId: "",
quantity: "",
remark: "", remark: "",
quantity: "",
toolId:"",
}; };
}, },
onTmToolSelect(row) { onItemSelect(row){
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.form.toolCode = row.toolCode; this.form.itemCode = row.itemCode;
this.form.toolName = row.toolName; this.form.itemName = row.itemName;
this.form.brand = row.brand; this.form.specification = row.specification;
this.form.spec = row.spec; this.form.itemTypeName = row.itemTypeName;
this.form.toolTypeName = row.toolTypeName; this.form.toolId = row.itemId;
this.form.toolId = row.toolId; }
} }
}, },
}, };
};
</script> </script>
<style> <style>
.process-prod { .process-prod {
padding: 0 20px; padding: 0 20px;
} }
</style> </style>
src/views/mes/proofing/components/ProcessTool.vue
View file @ 36c81547
...@@ -21,13 +21,12 @@ ...@@ -21,13 +21,12 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="tableData"> <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>
<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>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/> <el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/> <el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" /> <el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" /> <el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150"> <el-table-column label="操作" align="center" width="150">
...@@ -67,15 +66,24 @@ ...@@ -67,15 +66,24 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" > <el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码" <el-input v-model="form.itemCode" placeholder="请选择数据"
readonly> disabled>
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -109,7 +117,7 @@ ...@@ -109,7 +117,7 @@
</template> </template>
<script> <script>
import TmToolSelect from "@/components/TmTool/index.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
props: { props: {
process: { process: {
...@@ -117,16 +125,15 @@ ...@@ -117,16 +125,15 @@
default: () => ({}), default: () => ({}),
}, },
}, },
components: { TmToolSelect }, components: { ItemSelect },
dicts: ['mes_index_type'], dicts: ['mes_index_type'],
data() { data() {
return { return {
form: { form: {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
remark: "", remark: "",
quantity: "", quantity: "",
toolId:"", toolId:"",
...@@ -183,7 +190,7 @@ ...@@ -183,7 +190,7 @@
}, },
/**新增 */ /**新增 */
configmSelect() { configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) { if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return; return;
} }
this.tableData.unshift({ this.tableData.unshift({
...@@ -222,24 +229,22 @@ ...@@ -222,24 +229,22 @@
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
toolId:"",
quantity: "",
remark: "", remark: "",
quantity: "",
toolId:"",
}; };
}, },
onTmToolSelect(row){ onItemSelect(row){
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.form.toolCode = row.toolCode; this.form.itemCode = row.itemCode;
this.form.toolName = row.toolName; this.form.itemName = row.itemName;
this.form.brand = row.brand; this.form.specification = row.specification;
this.form.spec = row.spec; this.form.itemTypeName = row.itemTypeName;
this.form.toolTypeName = row.toolTypeName; this.form.toolId = row.itemId;
this.form.toolId = row.toolId;
} }
} }
}, },
......
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