Skip to content

M
mes-ui
Commit c6363c06 authored by 赵汉亭's avatar 赵汉亭
Browse files
Options

工单修改完成

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