Commit c6363c06 authored by 赵汉亭's avatar 赵汉亭

工单修改完成

parent 66dc3921
...@@ -16,16 +16,30 @@ ...@@ -16,16 +16,30 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-if="!(optType === 'detail')"
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="tableData"> <el-table :data="tableData">
<el-table-column label="物料名称" prop="itemName" align="center" /> <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="quantity" align="center" />
<el-table-column label="单位" prop="unitOfMeasure" align="center" />
<el-table-column label="是否倒冲" prop="isBackflush" align="center">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.isBackflush"
/>
</template>
</el-table-column>
<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"
v-if="!(optType === 'detail')"
>
<template slot-scope="{ row, $index }"> <template slot-scope="{ row, $index }">
<el-button <el-button
type="text" type="text"
...@@ -43,6 +57,22 @@ ...@@ -43,6 +57,22 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="操作"
align="center"
width="150"
v-if="optType === 'detail'"
>
<template slot-scope="{ row, $index }">
<el-button
type="text"
icon="el-icon-search"
size="small"
@click="searchRow(row, $index)"
>查看详情</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<div slot="footer"> <div slot="footer">
...@@ -55,7 +85,7 @@ ...@@ -55,7 +85,7 @@
<!-- 选择Bom物料 --> <!-- 选择Bom物料 -->
<el-dialog <el-dialog
:visible.sync="showFlag" :visible.sync="showFlag"
title="选择Bom物料" title="Bom物料"
width="800px" width="800px"
append-to-body append-to-body
> >
...@@ -64,7 +94,7 @@ ...@@ -64,7 +94,7 @@
@current-change="handleRowChange" @current-change="handleRowChange"
@row-dblclick="handleRowDbClick" @row-dblclick="handleRowDbClick"
> >
<el-table-column width="50" align="center"> <el-table-column width="50" align="center" v-if="mode != 'info'">
<template v-slot="scope"> <template v-slot="scope">
<el-radio <el-radio
v-model="selectedItemId" v-model="selectedItemId"
...@@ -75,11 +105,35 @@ ...@@ -75,11 +105,35 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料名称" prop="itemName" /> <el-table-column label="物料名称" prop="itemName" />
<el-table-column label="数量" prop="quantity" />
<el-table-column label="单位" prop="unitOfMeasure" /> <el-table-column label="单位" prop="unitOfMeasure" />
<el-table-column label="用料比例" prop="quantity" /> <el-table-column label="存储地点" prop="storeAddr" />
<el-table-column label="报废百分比" prop="scrapPercentage" />
<el-table-column label="单位用量" prop="unitUsage" />
<el-table-column label="虚拟项目标识" prop="virtualProjectLog">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.virtualProjectLog"
/>
</template>
</el-table-column>
<el-table-column label="副单位" prop="deputyUnitOfMeasure" />
<el-table-column label="主副单位转换比例" prop="unitConvert" />
<el-table-column label="存储地点2" prop="storeAddr2" />
<el-table-column label="是否倒冲" prop="isBackflush">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.isBackflush"
/>
</template>
</el-table-column>
</el-table> </el-table>
<div slot="footer"> <div slot="footer">
<el-button @click="configmSelect">确认</el-button> <el-button @click="configmSelect" v-if="!(optType === 'detail')"
>确认</el-button
>
<el-button @click="showFlag = false">取消</el-button> <el-button @click="showFlag = false">取消</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -91,25 +145,67 @@ ...@@ -91,25 +145,67 @@
title="编辑物料关联信息" title="编辑物料关联信息"
> >
<el-form :model="form" inline size="small" label-width="80px"> <el-form :model="form" inline size="small" label-width="80px">
<el-form-item label="物料名称"> <el-form-item label="物料名称" prop="itemName">
<el-input disabled v-model="form.itemName"></el-input> <el-input disabled v-model="form.itemName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="单位"> <el-form-item label="单位" prop="unitOfMeasure">
<el-input disabled v-model="form.unitOfMeasure"></el-input> <el-input disabled v-model="form.unitOfMeasure"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="数量"> <el-form-item label="数量" prop="quantity">
<el-input type="number" v-model="form.quantity"></el-input> <el-input type="number" v-model="form.quantity"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="存储地点" prop="storeAddr">
<el-input v-model="form.remark" type="textarea" :rows="3"></el-input> <el-input v-model="form.storeAddr"></el-input>
</el-form-item>
<el-form-item label="报废百分比" prop="scrapPercentage">
<el-input type="number" v-model="form.scrapPercentage"></el-input>
</el-form-item>
<el-form-item label="单位用量" prop="unitUsage">
<el-input type="number" v-model="form.unitUsage"></el-input>
</el-form-item>
<el-form-item label="虚拟项目标识" prop="virtualProjectLog">
<el-select
v-model="form.virtualProjectLog"
placeholder="请选择虚拟项目标识"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="副单位" prop="deputyUnitOfMeasure">
<el-input v-model="form.deputyUnitOfMeasure"></el-input>
</el-form-item>
<el-form-item label="主副单位转换比例" prop="unitConvert">
<el-input type="number" v-model="form.unitConvert"></el-input>
</el-form-item>
<el-form-item label="存储地点2" prop="storeAddr2">
<el-input v-model="form.storeAddr2"></el-input>
</el-form-item>
<el-form-item label="是否倒冲" prop="isBackflush">
<el-select v-model="form.isBackflush" placeholder="请选择是否倒冲">
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer"> <div slot="footer">
<el-button type="primary" size="small" @click="submitEditConnect" <el-button
type="primary"
size="small"
@click="submitEditConnect"
v-if="!(optType === 'detail')"
>确认</el-button >确认</el-button
> >
<el-button size="small" @click="editConnectVisible = false" <el-button size="small" @click="editConnectVisible = false"
>取消</el-button >返回</el-button
> >
</div> </div>
</el-dialog> </el-dialog>
...@@ -128,13 +224,24 @@ export default { ...@@ -128,13 +224,24 @@ export default {
default: () => ({}), default: () => ({}),
}, },
}, },
dicts: ["sys_yes_no"],
data() { data() {
return { return {
optType: "add",
form: { form: {
quantity: "",
itemName: "", itemName: "",
itemId: "",
unitOfMeasure: "", unitOfMeasure: "",
quantity: "", scrapPercentage: "",
remark: "", isBackflush: "",
virtualProjectLog: "",
storeAddr: "",
unitUsage: "",
storeAddr2: "",
processRef: "",
requirementNumber: "",
requirementProjectNumber: "",
}, },
currentRowIdx: undefined, currentRowIdx: undefined,
tableData: [], tableData: [],
...@@ -193,6 +300,14 @@ export default { ...@@ -193,6 +300,14 @@ export default {
this.currentRowIdx = idx; this.currentRowIdx = idx;
this.editConnectVisible = true; this.editConnectVisible = true;
}, },
/**查看 */
searchRow(row, idx) {
this.resetForm();
Object.assign(this.form, row);
this.currentRowIdx = idx;
this.optType = "detail";
this.editConnectVisible = true;
},
deleteRow(index) { deleteRow(index) {
this.tableData.splice(index, 1); this.tableData.splice(index, 1);
}, },
...@@ -208,10 +323,19 @@ export default { ...@@ -208,10 +323,19 @@ export default {
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
quantity: "",
itemName: "", itemName: "",
itemId: "",
unitOfMeasure: "", unitOfMeasure: "",
quantity: "", scrapPercentage: "",
remark: "", isBackflush: "",
virtualProjectLog: "",
storeAddr: "",
unitUsage: "",
storeAddr2: "",
processRef: "",
requirementNumber: "",
requirementProjectNumber: "",
}; };
}, },
/** 提交编辑关联信息 */ /** 提交编辑关联信息 */
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-if="!(optType === 'detail')"
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
...@@ -33,7 +34,12 @@ ...@@ -33,7 +34,12 @@
</el-table-column> </el-table-column>
<el-table-column label="检测工具" align="center" prop="qcTool" /> <el-table-column label="检测工具" align="center" prop="qcTool" />
<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"
v-if="!(optType === 'detail')"
>
<template slot-scope="{ row, $index }"> <template slot-scope="{ row, $index }">
<el-button <el-button
type="text" type="text"
...@@ -51,6 +57,22 @@ ...@@ -51,6 +57,22 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="操作"
align="center"
width="150"
v-if="optType === 'detail'"
>
<template slot-scope="{ row, $index }">
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="SearchRow(row, $index)"
>查看详情</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<div slot="footer"> <div slot="footer">
...@@ -101,11 +123,15 @@ ...@@ -101,11 +123,15 @@
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer"> <div slot="footer">
<el-button type="primary" size="small" @click="addOrEditubmit" <el-button
type="primary"
size="small"
@click="addOrEditubmit"
v-if="!(optType === 'detail')"
>确认</el-button >确认</el-button
> >
<el-button size="small" @click="editConnectVisible = false" <el-button size="small" @click="editConnectVisible = false"
>取消</el-button >返回</el-button
> >
</div> </div>
</el-dialog> </el-dialog>
...@@ -125,6 +151,7 @@ export default { ...@@ -125,6 +151,7 @@ export default {
dicts: ["mes_index_type"], dicts: ["mes_index_type"],
data() { data() {
return { return {
optType: "add",
form: { form: {
indexCode: "", indexCode: "",
indexName: "", indexName: "",
...@@ -183,6 +210,14 @@ export default { ...@@ -183,6 +210,14 @@ export default {
this.optType = "edit"; this.optType = "edit";
this.editConnectVisible = true; this.editConnectVisible = true;
}, },
/**查看详情 */
SearchRow(row, idx) {
this.resetForm();
Object.assign(this.form, row);
this.currentRowIdx = idx;
this.optType = "detail";
this.editConnectVisible = true;
},
/**新增 */ /**新增 */
configmSelect() { configmSelect() {
if (this.form.indexCode == null || this.form.indexCode == 0) { if (this.form.indexCode == null || this.form.indexCode == 0) {
......
...@@ -38,18 +38,19 @@ ...@@ -38,18 +38,19 @@
prop="unitOfMeasure" prop="unitOfMeasure"
width="120" width="120"
/> />
<el-table-column
label="替代组"
align="center"
prop="alternativeGroup"
width="120"
/>
<el-table-column <el-table-column
label="是否倒冲" label="是否倒冲"
align="center" align="center"
prop="recoil" prop="isBackflush"
width="120" width="120"
/> >
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.isBackflush"
/>
</template>
</el-table-column>
<el-table-column <el-table-column
v-if="mode != 'info'" v-if="mode != 'info'"
label="操作" label="操作"
...@@ -73,6 +74,22 @@ ...@@ -73,6 +74,22 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
v-if="mode == 'info'"
label="操作"
align="center"
width="120"
>
<template slot-scope="{ row, $index }">
<el-button
type="text"
icon="el-icon-search"
size="small"
@click="searchRow(row, $index)"
>查看详情</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<el-dialog :visible.sync="showFlag" width="700px" title="添加BOM"> <el-dialog :visible.sync="showFlag" width="700px" title="添加BOM">
...@@ -85,7 +102,7 @@ ...@@ -85,7 +102,7 @@
size="small" size="small"
> >
<el-row> <el-row>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="物料" prop="itemId"> <el-form-item label="物料" prop="itemId">
<el-input <el-input
v-model="form.itemName" v-model="form.itemName"
...@@ -96,13 +113,12 @@ ...@@ -96,13 +113,12 @@
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['ItemSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
v-if="mode != 'info'"
></el-button> ></el-button>
</el-input> </el-input>
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" /> <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="组件数量" prop="quantity"> <el-form-item label="组件数量" prop="quantity">
<el-input <el-input
...@@ -129,57 +145,70 @@ ...@@ -129,57 +145,70 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="替代组" prop="alternativeGroup"> <el-form-item label="存储地点" prop="storeAddr">
<el-input
v-model="form.alternativeGroup"
placeholder="请输入替代组"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="替代优先级" prop="alternativePriorities">
<el-input <el-input
v-model="form.alternativePriorities" v-model="form.storeAddr"
placeholder="请输入替代优先级" placeholder="请输入存储地点"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="策略" prop="alternativeStrategy"> <el-form-item label="单位用量" prop="unitUsage">
<el-input <el-input
v-model="form.alternativeStrategy" type="number"
placeholder="请输入策略" min="1"
v-model="form.unitUsage"
placeholder="请输入单位用量"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="使用概率" prop="alternativeProbability"> <el-form-item label="虚拟项目标识" prop="virtualProjectLog">
<el-input <el-select
v-model="form.alternativeProbability" v-model="form.virtualProjectLog"
placeholder="请输入使用概率" placeholder="请选择虚拟项目标识"
></el-input> >
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="BOM行备注" prop="bomItemRemark"> <el-form-item label="存储地点2" prop="storeAddr2">
<el-input <el-input
v-model="form.bomItemRemark" v-model="form.storeAddr2"
placeholder="请输入BOM行备注" placeholder="请输入存储地点2"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料备注" prop="itemRemark"> <el-form-item label="是否倒冲" prop="isBackflush">
<el-input <el-select
v-model="form.itemRemark" v-model="form.isBackflush"
placeholder="请输入物料备注" placeholder="请选择是否倒冲"
></el-input> >
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer"> <div slot="footer">
<el-button type="primary" @click="submitForm">确定</el-button> <el-button
v-if="!(optType === 'detail')"
type="primary"
@click="submitForm"
>确定</el-button
>
<el-button type="default" @click="showFlag = false">取消</el-button> <el-button type="default" @click="showFlag = false">取消</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -192,6 +221,7 @@ import ItemSelect from "@/components/itemSelect/single.vue"; ...@@ -192,6 +221,7 @@ import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
components: { ItemBomSelect, ItemSelect }, components: { ItemBomSelect, ItemSelect },
inject: ["mode"], inject: ["mode"],
dicts: ["sys_yes_no"],
data() { data() {
return { return {
/**弹窗状态 */ /**弹窗状态 */
...@@ -210,12 +240,14 @@ export default { ...@@ -210,12 +240,14 @@ export default {
itemId: "", itemId: "",
unitOfMeasure: "", unitOfMeasure: "",
scrapPercentage: "", scrapPercentage: "",
alternativeGroup: "", isBackflush: "",
alternativePriorities: "", virtualProjectLog: "",
alternativeStrategy: "", storeAddr: "",
alternativeProbability: "", unitUsage: "",
bomItemRemark: "", storeAddr2: "",
itemRemark: "", processRef: "",
requirementNumber: "",
requirementProjectNumber: "",
}, },
currentRowIdx: undefined, currentRowIdx: undefined,
}; };
...@@ -241,6 +273,13 @@ export default { ...@@ -241,6 +273,13 @@ export default {
this.optType = "edit"; this.optType = "edit";
this.showFlag = true; this.showFlag = true;
}, },
/**查看行 */
searchRow(row, idx) {
this.form = Object.assign(this.form, row);
this.currentRowIdx = idx;
this.optType = "detail";
this.showFlag = true;
},
/**删除行 */ /**删除行 */
deleteRow(index) { deleteRow(index) {
this.tableData.splice(index, 1); this.tableData.splice(index, 1);
...@@ -274,18 +313,19 @@ export default { ...@@ -274,18 +313,19 @@ export default {
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
quantity: "",
itemName: "", itemName: "",
itemId: "", itemId: "",
quantity: "",
unitOfMeasure: "", unitOfMeasure: "",
scrapPercentage: "", scrapPercentage: "",
alternativeGroup: "", isBackflush: "",
alternativePriorities: "", virtualProjectLog: "",
alternativeStrategy: "", storeAddr: "",
alternativeProbability: "", unitUsage: "",
bomItemRemark: "", storeAddr2: "",
itemRemark: "", processRef: "",
recoil:"", requirementNumber: "",
requirementProjectNumber: "",
}; };
}, },
/**重置组件状态 */ /**重置组件状态 */
......
<template> <template>
<div> <div>
<el-table :data="tableData"> <el-table :data="tableData">
<el-table-column label="序号" prop="processRef" align="center" />
<el-table-column label="工序名称" prop="processName" align="center" /> <el-table-column label="工序名称" prop="processName" align="center" />
<el-table-column label="工序编码" prop="processCode" align="center" /> <el-table-column label="工序编码" prop="processCode" align="center" />
<el-table-column
label="与下一道工序关系"
prop="linkType"
align="center"
/>
<el-table-column label="工作站" prop="workstationName" align="center" /> <el-table-column label="工作站" prop="workstationName" align="center" />
<el-table-column label="标准工时" prop="stdWorkingTime" align="center" /> <el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
<el-table-column label="甘特图显示颜色" prop="colorCode" align="center" /> <el-table-column label="换型时间" prop="lineBreakTime" align="center" />
<el-table-column label="工序总数量" prop="quantity" align="center" />
<el-table-column label="加工方式" prop="controlCode" align="center">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sap_control_code"
:value="scope.row.controlCode"
/>
</template>
</el-table-column>
<el-table-column label="标准文本代码" prop="x" align="center" />
<el-table-column <el-table-column
v-if="mode != 'info'" v-if="mode != 'info'"
label="操作" label="操作"
...@@ -37,6 +43,32 @@ ...@@ -37,6 +43,32 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
v-if="mode == 'info'"
label="操作"
align="center"
width="300"
fixed="right"
>
<template slot-scope="{ row, $index }">
<el-button type="text" size="small" @click="SearchProd(row, $index)">
查看物料
</el-button>
<el-button
type="text"
size="small"
@click="searchQrindex(row, $index)"
>
查看检验项
</el-button>
<el-button type="text" size="small" @click="searchTool(row, $index)">
查看工装量具
</el-button>
<!-- <el-button type="text" size="small" @click="searchRow(row, $index)"
>查看工序信息</el-button
> -->
</template>
</el-table-column>
</el-table> </el-table>
<ProcessProd <ProcessProd
...@@ -118,6 +150,7 @@ export default { ...@@ -118,6 +150,7 @@ export default {
ProcessTool, ProcessTool,
}, },
inject: ["mode"], inject: ["mode"],
dicts: ["sap_control_code", "sys_yes_no"],
props: { props: {
bomList: { bomList: {
type: Array, type: Array,
...@@ -133,10 +166,17 @@ export default { ...@@ -133,10 +166,17 @@ export default {
/**表单规则 */ /**表单规则 */
rules: {}, rules: {},
/**表单初始化数据 */ /**表单初始化数据 */
optType: "add",
form: { form: {
stdWorkingTime: "", stdWorkingTime: "",
workstationId: "", workstationId: "",
workstationName: "", workstationName: "",
processRef: "",
controlCode: "",
x: "",
quantity: "",
stdWorkingTime: "",
lineBreakTime: "",
}, },
currentRow: {}, currentRow: {},
currentRowIndex: undefined, currentRowIndex: undefined,
...@@ -166,12 +206,26 @@ export default { ...@@ -166,12 +206,26 @@ export default {
this.currentRowIndex = idx; this.currentRowIndex = idx;
this.$refs["ProcessProdRef"].showProcessProd = true; this.$refs["ProcessProdRef"].showProcessProd = true;
}, },
/**查看物料 */
SearchProd(row, idx) {
this.currentRow = row;
this.currentRowIndex = idx;
this.$refs["ProcessProdRef"].optType = "detail";
this.$refs["ProcessProdRef"].showProcessProd = true;
},
/**更新行 */ /**更新行 */
updateRow(row, idx) { updateRow(row, idx) {
Object.assign(this.form, row); Object.assign(this.form, row);
this.currentRowIndex = idx; this.currentRowIndex = idx;
this.showFlag = true; this.showFlag = true;
}, },
/**查看行 */
searchRow(row, idx) {
this.form = Object.assign(this.form, row);
this.currentRowIdx = idx;
this.optType = "detail";
this.showFlag = true;
},
/**表单提交 */ /**表单提交 */
submitForm() { submitForm() {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
...@@ -193,6 +247,12 @@ export default { ...@@ -193,6 +247,12 @@ export default {
stdWorkingTime: "", stdWorkingTime: "",
workstationId: "", workstationId: "",
workstationName: "", workstationName: "",
processRef: "",
controlCode: "",
x: "",
quantity: "",
stdWorkingTime: "",
lineBreakTime: "",
}; };
}, },
/**重置组件状态 */ /**重置组件状态 */
...@@ -200,16 +260,32 @@ export default { ...@@ -200,16 +260,32 @@ export default {
this.resetForm(); this.resetForm();
this.tableData = []; this.tableData = [];
}, },
/**质检 */
openSetQrindex(row, idx) { openSetQrindex(row, idx) {
this.currentRow = row; this.currentRow = row;
this.currentRowIndex = idx; this.currentRowIndex = idx;
this.$refs["ProcessQcindexRef"].showProcessProd = true; this.$refs["ProcessQcindexRef"].showProcessProd = true;
}, },
/**查看质检 */
searchQrindex(row, idx) {
this.currentRow = row;
this.currentRowIndex = idx;
this.$refs["ProcessQcindexRef"].optType = "detail";
this.$refs["ProcessQcindexRef"].showProcessProd = true;
},
/**工装 */
openSetTool(row, idx) { openSetTool(row, idx) {
this.currentRow = row; this.currentRow = row;
this.currentRowIndex = idx; this.currentRowIndex = idx;
this.$refs["ProcessToolRef"].showProcessProd = true; this.$refs["ProcessToolRef"].showProcessProd = true;
}, },
/**查看工装 */
searchTool(row, idx) {
this.currentRow = row;
this.currentRowIndex = idx;
this.$refs["ProcessToolRef"].optType = "detail";
this.$refs["ProcessToolRef"].showProcessProd = true;
},
// 查询工作站信息 // 查询工作站信息
handleWorkstationSelect() { handleWorkstationSelect() {
this.$refs.WorkstationSelect.showFlag = true; this.$refs.WorkstationSelect.showFlag = true;
......
...@@ -317,22 +317,22 @@ ...@@ -317,22 +317,22 @@
prop="workorderName" prop="workorderName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<!-- <el-table-column label="工单类型" align="center" prop="workorderType"> <el-table-column label="工单类型" align="center" prop="workorderType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.mes_workorder_type" :options="dict.type.mes_workorder_type"
:value="scope.row.workorderType" :value="scope.row.workorderType"
/> />
</template> </template>
</el-table-column> --> </el-table-column>
<el-table-column label="工单来源" align="center" prop="orderSource"> <!-- <el-table-column label="工单来源" align="center" prop="orderSource">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.mes_workorder_sourcetype" :options="dict.type.mes_workorder_sourcetype"
:value="scope.row.orderSource" :value="scope.row.orderSource"
/> />
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column <el-table-column
label="工艺名称" label="工艺名称"
width="160" width="160"
...@@ -386,13 +386,13 @@ ...@@ -386,13 +386,13 @@
width="100px" width="100px"
prop="arrangeCode" prop="arrangeCode"
/> />
<el-table-column label="客户编码" align="center" prop="clientCode"/> <!-- <el-table-column label="客户编码" align="center" prop="clientCode"/>
<el-table-column <el-table-column
label="客户名称" label="客户名称"
align="center" align="center"
prop="clientName" prop="clientName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> /> -->
<el-table-column <el-table-column
label="需求日期" label="需求日期"
align="center" align="center"
...@@ -403,7 +403,7 @@ ...@@ -403,7 +403,7 @@
<span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span> <span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据状态" align="center" prop="status"> <el-table-column label="单据状态" align="center" prop="status" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.mes_workorder_status" :options="dict.type.mes_workorder_status"
...@@ -514,7 +514,7 @@ ...@@ -514,7 +514,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <!-- <el-col :span="8">
<el-form-item label="来源类型" prop="orderSource"> <el-form-item label="来源类型" prop="orderSource">
<el-radio-group <el-radio-group
v-model="form.orderSource" v-model="form.orderSource"
...@@ -539,7 +539,7 @@ ...@@ -539,7 +539,7 @@
> >
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="8" v-if="form.orderSource == 'ORDER'"> <el-col :span="8" v-if="form.orderSource == 'ORDER'">
<el-form-item label="订单编号" prop="sourceCode"> <el-form-item label="订单编号" prop="sourceCode">
<el-input <el-input
...@@ -566,7 +566,7 @@ ...@@ -566,7 +566,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<!-- <el-col :span="8"> <el-col :span="8">
<el-form-item label="工单类型" prop="workorderType"> <el-form-item label="工单类型" prop="workorderType">
<el-select v-model="form.workorderType" placeholder="请选择类型"> <el-select v-model="form.workorderType" placeholder="请选择类型">
<el-option <el-option
...@@ -577,7 +577,7 @@ ...@@ -577,7 +577,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> --> </el-col>
<!-- <el-col :span="8"> <!-- <el-col :span="8">
<el-form-item label="产品编号" prop="productCode"> <el-form-item label="产品编号" prop="productCode">
<el-input v-model="form.productCode" placeholder="请选择产品" > <el-input v-model="form.productCode" placeholder="请选择产品" >
......
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