Skip to content

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

工单修改完成

parent 66dc3921
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/ProcessTool.vue
View file @ c6363c06
......@@ -16,34 +16,66 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
v-if="!(optType === 'detail')"
>新增</el-button
>
</el-col>
</el-row>
<el-table :data="tableData">
<el-table-column label="编号" align="center" prop="itemCode" >
<el-table-column label="编号" align="center" prop="itemCode">
</el-table-column>
<el-table-column label="名称" align="center" prop="itemName" :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="specification" :show-overflow-tooltip="true"/>
<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">
<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="updateRow(row, $index)"
>修改</el-button
>修改</el-button
>
<el-button
type="text"
icon="el-icon-delete"
size="small"
@click="deleteRow($index)"
>删除</el-button
>删除</el-button
>
</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>
......@@ -51,7 +83,7 @@
<div slot="footer">
<el-button type="primary" size="small" @click="cancleConnect"
>关闭</el-button
>关闭</el-button
>
</div>
</el-dialog>
......@@ -65,9 +97,12 @@
<el-form ref="form" :model="form" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.itemCode" placeholder="请选择数据"
disabled>
<el-form-item label="工装量具编码" prop="toolCode">
<el-input
v-model="form.itemCode"
placeholder="请选择数据"
disabled
>
<el-button
slot="append"
icon="el-icon-search"
......@@ -79,11 +114,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="工装量具名称" prop="itemName">
<el-input
type="text"
v-model="form.itemName"
disabled
></el-input>
<el-input type="text" v-model="form.itemName" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -99,17 +130,25 @@
<el-row>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="3"></el-input>
<el-input
v-model="form.remark"
type="textarea"
:rows="3"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer">
<el-button type="primary" size="small" @click="addOrEditubmit"
>确认</el-button
<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>
......@@ -117,142 +156,150 @@
</template>
<script>
import ItemSelect from "@/components/itemSelect/single.vue";
export default {
props: {
process: {
type: Object,
default: () => ({}),
},
import ItemSelect from "@/components/itemSelect/single.vue";
export default {
props: {
process: {
type: Object,
default: () => ({}),
},
components: { ItemSelect },
dicts: ['mes_index_type'],
data() {
return {
form: {
itemCode: "",
itemName: "",
specification:"",
itemTypeName:"",
remark: "",
quantity: "",
toolId:"",
},
currentRowIdx: undefined,
tableData: [],
selectedItemId: undefined,
selectedRows: null,
showFlag: false,
optType:null,
showProcessProd: false,
editConnectVisible: false,
};
},
computed: {
title() {
return "设置" + this.process.itemName + "工装量具";
},
components: { ItemSelect },
dicts: ["mes_index_type"],
data() {
return {
optType: "add",
form: {
itemCode: "",
itemName: "",
specification: "",
itemTypeName: "",
remark: "",
quantity: "",
toolId: "",
},
currentRowIdx: undefined,
tableData: [],
selectedItemId: undefined,
selectedRows: null,
showFlag: false,
optType: null,
showProcessProd: false,
editConnectVisible: false,
};
},
computed: {
title() {
return "设置" + this.process.itemName + "工装量具";
},
watch: {
process: {
handler(val) {
this.tableData = val.toolList;
},
deep: true,
},
watch: {
process: {
handler(val) {
this.tableData = val.toolList;
},
deep: true,
},
methods: {
handleRowChange(row) {
if (row) {
this.selectedRows = row;
}
},
handleRowDbClick(row) {
if (row) {
this.selectedRows = row;
this.tableData.unshift(this.selectedRows);
this.showFlag = false;
}
},
/**新增按钮 */
handleAdd() {
this.resetForm();
this.optType='add';
this.editConnectVisible = true;
},
/**编辑 */
updateRow(row, idx) {
this.resetForm();
Object.assign(this.form, row);
this.currentRowIdx = idx;
this.optType='edit';
this.editConnectVisible = true;
},
/**新增 */
configmSelect() {
if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return;
}
this.tableData.unshift({
...this.form,
processId: this.process.processId,
});
this.editConnectVisible = false;
},
/** 提交编辑关联信息 */
submitEditConnect() {
this.tableData.splice(this.currentRowIdx, 1, {
...this.form,
});
this.editConnectVisible = false;
},
addOrEditubmit(){
if(this.optType=='add'){
this.configmSelect();
}else{
this.submitEditConnect();
}
},
deleteRow(index) {
this.tableData.splice(index, 1);
},
cancleConnect() {
this.$emit("updateTool", this.tableData);
this.showProcessProd = false;
},
beforeClose(done) {
// 更新父组件的processItemList
this.$emit("updateTool", this.tableData);
done();
},
/**重置表单 */
resetForm() {
this.form = {
itemCode: "",
itemName: "",
specification:"",
itemTypeName:"",
remark: "",
quantity: "",
toolId:"",
};
},
onItemSelect(row){
if (row != undefined && row != null) {
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;
}
},
methods: {
handleRowChange(row) {
if (row) {
this.selectedRows = row;
}
},
handleRowDbClick(row) {
if (row) {
this.selectedRows = row;
this.tableData.unshift(this.selectedRows);
this.showFlag = false;
}
},
/**新增按钮 */
handleAdd() {
this.resetForm();
this.optType = "add";
this.editConnectVisible = true;
},
/**编辑 */
updateRow(row, idx) {
this.resetForm();
Object.assign(this.form, row);
this.currentRowIdx = idx;
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.itemCode == null || this.form.itemCode.length == 0) {
return;
}
this.tableData.unshift({
...this.form,
processId: this.process.processId,
});
this.editConnectVisible = false;
},
/** 提交编辑关联信息 */
submitEditConnect() {
this.tableData.splice(this.currentRowIdx, 1, {
...this.form,
});
this.editConnectVisible = false;
},
addOrEditubmit() {
if (this.optType == "add") {
this.configmSelect();
} else {
this.submitEditConnect();
}
},
deleteRow(index) {
this.tableData.splice(index, 1);
},
cancleConnect() {
this.$emit("updateTool", this.tableData);
this.showProcessProd = false;
},
beforeClose(done) {
// 更新父组件的processItemList
this.$emit("updateTool", this.tableData);
done();
},
/**重置表单 */
resetForm() {
this.form = {
itemCode: "",
itemName: "",
specification: "",
itemTypeName: "",
remark: "",
quantity: "",
toolId: "",
};
},
onItemSelect(row) {
if (row != undefined && row != null) {
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;
}
},
};
},
};
</script>
<style>
.process-prod {
padding: 0 20px;
}
.process-prod {
padding: 0 20px;
}
</style>
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/components/WorkOrderSale.vue
View file @ c6363c06
......@@ -23,8 +23,281 @@
</el-col>
</el-row> -->
<el-table :data="tableData" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-form
class="page-form"
:model="form"
ref="form"
size="small"
:inline="true"
label-width="8em"
>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="指令号" prop="clientCmd"
><el-input
v-model="form.clientCmd"
placeholder="请输入指令号"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="LOSS数" prop="lossNum"
><el-input
v-model="form.lossNum"
placeholder="请输入LOSS数"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="销售凭证" prop="salesVoucher"
><el-input
v-model="form.salesVoucher"
placeholder="请输入销售凭证"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="销售凭证项目" prop="salesVoucherItem"
><el-input
v-model="form.salesVoucherItem"
placeholder="请输入销售凭证项目"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="客户编号" prop="clientCode"
><el-input
v-model="form.clientCode"
placeholder="请输入客户编号"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="尺码组" prop="sizeGroup"
><el-input
v-model="form.sizeGroup"
placeholder="请输入尺码组"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="尺码单位" prop="clientSizeUnit"
><el-input
v-model="form.clientSizeUnit"
placeholder="请输入尺码单位"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="型体号" prop="typeNo"
><el-input
v-model="form.typeNo"
placeholder="请输入型体号"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="配色号" prop="colorNo"
><el-input
v-model="form.colorNo"
placeholder="请输入配色号"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="颜色" prop="color"
><el-input
v-model="form.color"
placeholder="请输入颜色"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="销线" prop="salePath"
><el-input
v-model="form.salePath"
placeholder="请输入销线"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="段别" prop="segment"
><el-input
v-model="form.segment"
placeholder="请输入段别"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="季度" prop="quarter"
><el-input
v-model="form.quarter"
placeholder="请输入季度"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="整/半码" prop="wholeSize"
><el-input
v-model="form.wholeSize"
placeholder="请输入整/半码"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="特殊SIZE" prop="specSize"
><el-input
v-model="form.specSize"
placeholder="请输入特殊SIZE"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="PO#" prop="poNo"
><el-input
v-model="form.poNo"
placeholder="请输入PO#"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="WIP#" prop="wipNo"
><el-input
v-model="form.wipNo"
placeholder="请输入WIP#"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="装箱数" prop="packingNum"
><el-input
v-model="form.packingNum"
placeholder="请输入装箱数"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="产地" prop="region"
><el-input
v-model="form.region"
placeholder="请输入产地"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="周期" prop="cycle"
><el-input
v-model="form.cycle"
placeholder="请输入周期"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="SK编号" prop="skNo"
><el-input
v-model="form.skNo"
placeholder="请输入SK编号"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="专利号" prop="patentNo"
><el-input
v-model="form.patentNo"
placeholder="请输入专利号"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="材质描述" prop="materialDesc"
><el-input
v-model="form.materialDesc"
placeholder="请输入材质描述"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="签收人" prop="signer"
><el-input
v-model="form.signer"
placeholder="请输入签收人"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="SHIP TO ID" prop="shipToId"
><el-input
v-model="form.shipToId"
placeholder="请输入SHIP TO ID"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="产品规格" prop="prodSpec"
><el-input
v-model="form.prodSpec"
placeholder="请输入产品规格"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="产品用途" prop="prodUsage"
><el-input
v-model="form.prodUsage"
placeholder="请输入产品用途"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="厚度（丝）" prop="thickness"
><el-input
v-model="form.thickness"
placeholder="请输入厚度（丝）"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="包装方式" prop="packMode"
><el-input
v-model="form.packMode"
placeholder="请输入包装方式"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="印刷方向" prop="printingDirection"
><el-input
v-model="form.printingDirection"
placeholder="请输入印刷方向"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="工厂代号" prop="plantCode"
><el-input
v-model="form.plantCode"
placeholder="请输入工厂代号"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="包装数量" prop="packNum"
><el-input
v-model="form.packNum"
placeholder="请输入包装数量"
></el-input></el-form-item
></el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="按指令包装" prop="packByDirective">
<el-select
v-model="form.packByDirective"
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 :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="按size包装" prop="packBySize">
<el-select
v-model="form.packBySize"
placeholder="请选择是否按size包装"
>
<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 :lg="6" :md="8" :sm="12" :xs="12"
><el-form-item label="采购组织" prop="purchaseOrg"
><el-input
v-model="form.purchaseOrg"
placeholder="请输入采购组织"
></el-input></el-form-item
></el-col>
</el-row>
</el-form>
<!-- <el-table :data="tableData">
<el-table-column type="selection" width="55" align="center" />
<el-table-column
label="指令号"
align="center"
......@@ -118,7 +391,7 @@
<el-table-column label="周期" align="center" prop="cycle" width="120" />
<el-table-column label="SK编号" align="center" prop="skNo" width="120" />
<el-table-column
label="专利号 CHAR 50"
label="专利号"
align="center"
prop="patentNo"
width="120"
......@@ -183,7 +456,7 @@
prop="purchaseOrg"
width="120"
/>
<!-- <el-table-column
<el-table-column
v-if="mode != 'info'"
label="操作"
align="center"
......@@ -205,8 +478,8 @@
>删除</el-button
>
</template>
</el-table-column> -->
</el-table>
</el-table-column>
</el-table> -->
</div>
</template>
......@@ -214,6 +487,7 @@
export default {
components: {},
inject: ["mode"],
dicts: ["sys_yes_no"],
data() {
return {
/**弹窗状态 */
......@@ -227,15 +501,13 @@ export default {
optType: "add",
/**表单初始化数据 */
form: {
directiveList: "",
num: "",
clientCmd: "",
lossNum: "",
salesVoucher: "",
salesVoucherItem: "",
clientCode: "",
sizeGroup: "",
clientSizeUnit: "",
clientCmd: "",
typeNo: "",
colorNo: "",
color: "",
......@@ -260,6 +532,10 @@ export default {
packMode: "",
printingDirection: "",
plantCode: "",
packNum: "",
packByDirective: "",
packBySize: "",
purchaseOrg: "",
},
currentRowIdx: undefined,
};
......@@ -305,15 +581,13 @@ export default {
/**重置表单 */
resetForm() {
this.form = {
directiveList: "",
num: "",
clientCmd: "",
lossNum: "",
salesVoucher: "",
salesVoucherItem: "",
clientCode: "",
sizeGroup: "",
clientSizeUnit: "",
clientCmd: "",
typeNo: "",
colorNo: "",
color: "",
......@@ -338,6 +612,10 @@ export default {
packMode: "",
printingDirection: "",
plantCode: "",
packNum: "",
packByDirective: "",
packBySize: "",
purchaseOrg: "",
};
},
/**重置组件状态 */
......
src/views/mes/pro/workorder/components/WorkOrderSize.vue
View file @ c6363c06
......@@ -22,36 +22,362 @@
>
</el-col>
</el-row> -->
<el-table :data="tableData" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="尺码" align="center" prop="size" />
<el-table-column label="UPC3" align="center" prop="upc3" />
<el-table-column label="派工数" align="center" prop="dispatchMultiple" />
<el-table-column label="参考数" align="center" prop="referenceNum" />
<!-- <el-table-column label="序号" align="center" /> -->
<el-table-column
v-for="(item, index) in tableColums"
:key="index"
:label="item.label"
align="center"
:prop="item.prop"
:width="item.width"
/>
<!-- <el-table-column
label="销线"
align="center"
prop="salePath"
v-if="salePath != ''"
/> -->
<!-- <el-table-column
v-if="mode != 'info'"
label="操作"
label="SIZE类型组"
align="center"
prop="sizeType"
width="120"
v-if="sizeType != ''"
/>
<el-table-column
label="产品类别"
align="center"
prop="itemType"
v-if="itemType != ''"
/>
<el-table-column
label="段别"
align="center"
prop="segment"
v-if="segment != ''"
/>
<el-table-column
label="季度"
align="center"
prop="quarter"
v-if="quarter != ''"
/>
<el-table-column
label="特殊Size"
align="center"
prop="specSize"
v-if="specSize != ''"
/>
<el-table-column
label="整/半码"
align="center"
prop="wholeSize"
v-if="wholeSize != ''"
/>
<el-table-column
label="产品规格"
align="center"
prop="prodSpec"
v-if="prodSpec != ''"
/>
<el-table-column
label="标准SIZE类型"
align="center"
prop="standardSizeType"
width="120"
v-if="standardSizeType != ''"
/>
<el-table-column label="USA" align="center" prop="usa" v-if="usa != ''" />
<el-table-column label="UK" align="center" prop="uk" v-if="uk != ''" />
<el-table-column label="RUS" align="center" prop="pus" v-if="pus != ''" />
<el-table-column label="JAN" align="center" prop="jan" v-if="jan != ''" />
<el-table-column label="THA" align="center" prop="tha" v-if="tha != ''" />
<el-table-column label="CHN" align="center" prop="chn" v-if="chn != ''" />
<el-table-column label="IND" align="center" prop="ind" v-if="ind != ''" />
<el-table-column
label="KKET"
align="center"
prop="kket"
v-if="kket != ''"
/>
<el-table-column label="US" align="center" prop="us" v-if="us != ''" />
<el-table-column label="EU" align="center" prop="eu" v-if="eu != ''" />
<el-table-column label="JP" align="center" prop="jp" v-if="jp != ''" />
<el-table-column label="MM" align="center" prop="mm" v-if="mm != ''" />
<el-table-column label="BRA" align="center" prop="bra" v-if="bra != ''" />
<el-table-column label="EUR" align="center" prop="eur" v-if="eur != ''" />
<el-table-column label="CM" align="center" prop="cm" v-if="cm != ''" />
<el-table-column label="U" align="center" prop="u" v-if="u != ''" />
<el-table-column label="MX" align="center" prop="mx" v-if="mx != ''" />
<el-table-column label="CHI" align="center" prop="chi" v-if="chi != ''" />
<el-table-column label="JAP" align="center" prop="jap" v-if="jap != ''" />
<el-table-column
label="JAPAN"
align="center"
prop="japan"
v-if="japan != ''"
/>
<el-table-column label="MEX" align="center" prop="mex" v-if="mex != ''" />
<el-table-column
label="METRIC"
align="center"
prop="metric"
v-if="metric != ''"
/>
<el-table-column
label="PACK"
align="center"
prop="pack"
v-if="pack != ''"
/>
<el-table-column label="USM" align="center" prop="usm" v-if="usm != ''" />
<el-table-column label="USW" align="center" prop="usw" v-if="usw != ''" />
<el-table-column label="KX" align="center" prop="kx" v-if="kx != ''" />
<el-table-column label="AU" align="center" prop="au" v-if="au != ''" />
<el-table-column label="CN" align="center" prop="cn" v-if="cn != ''" />
<el-table-column
label="EURO"
align="center"
prop="euro"
v-if="euro != ''"
/>
<el-table-column label="GEN" align="center" prop="gen" v-if="gen != ''" />
<el-table-column
label="JPN-Y"
align="center"
prop="jpnY"
v-if="jpnY != ''"
/>
<el-table-column label="JPN" align="center" prop="jpn" v-if="jpn != ''" />
<el-table-column label="UKM" align="center" prop="ukm" v-if="ukm != ''" />
<el-table-column label="UKW" align="center" prop="ukw" v-if="ukw != ''" />
<el-table-column label="EUM" align="center" prop="eum" v-if="eum != ''" />
<el-table-column label="EUW" align="center" prop="euw" v-if="euw != ''" />
<el-table-column
label="JAPM"
align="center"
prop="japm"
v-if="japm != ''"
/>
<el-table-column
label="JAPW"
align="center"
prop="japw"
v-if="japw != ''"
/>
<el-table-column label="BR" align="center" prop="br" v-if="br != ''" />
<el-table-column label="USF" align="center" prop="usf" v-if="usf != ''" />
<el-table-column
label="FOOT"
align="center"
prop="foot"
v-if="foot != ''"
/>
<el-table-column
label="鞋内长"
align="center"
prop="shoeInnerLength"
v-if="shoeInnerLength != ''"
/>
<el-table-column label="KOR" align="center" prop="kor" v-if="kor != ''" />
<el-table-column label="XX" align="center" prop="xx" v-if="xx != ''" />
<el-table-column label="FR" align="center" prop="fr" v-if="fr != ''" />
<el-table-column
label="MULES"
align="center"
prop="mules"
v-if="mules != ''"
/>
<el-table-column label="S" align="center" prop="s" v-if="s != ''" />
<el-table-column label="XS" align="center" prop="xs" v-if="xs != ''" />
<el-table-column label="M" align="center" prop="m" v-if="m != ''" />
<el-table-column label="L" align="center" prop="l" v-if="l != ''" />
<el-table-column label="XL" align="center" prop="xl" v-if="xl != ''" />
<el-table-column label="XXL" align="center" prop="xxl" v-if="xxl != ''" />
<el-table-column
label="Re-fit"
align="center"
prop="reFit"
v-if="reFit != ''"
/>
<el-table-column
label="JPN(CM)"
align="center"
prop="jpnCm"
v-if="jpnCm != ''"
/>
<el-table-column label="CMM" align="center" prop="cmm" v-if="cmm != ''" />
<el-table-column label="CMW" align="center" prop="cmw" v-if="cmw != ''" />
<el-table-column
label="EURM"
align="center"
prop="eurm"
v-if="eurm != ''"
/>
<el-table-column
label="EURW"
align="center"
prop="eurw"
v-if="eurw != ''"
/>
<el-table-column label="JPM" align="center" prop="jpm" v-if="jpm != ''" />
<el-table-column label="JPW" align="center" prop="jpw" v-if="jpw != ''" />
<el-table-column label="EOR" align="center" prop="eor" v-if="eor != ''" />
<el-table-column label="MO" align="center" prop="mo" v-if="mo != ''" />
<el-table-column label="AUS" align="center" prop="aus" v-if="aus != ''" />
<el-table-column label="USL" align="center" prop="usl" v-if="usl != ''" />
<el-table-column
label="MEX(CM)"
align="center"
prop="mexCm"
v-if="mexCm != ''"
/>
<el-table-column
label="码数"
align="center"
prop="size"
v-if="size != ''"
/>
<el-table-column
label="鞋号"
align="center"
prop="shoeNum"
v-if="shoeNum != ''"
/>
<el-table-column label="CAD" align="center" prop="cad" v-if="cad != ''" />
<el-table-column
label="MONDO"
align="center"
prop="mondo"
v-if="mondo != ''"
/>
<el-table-column label="ARG" align="center" prop="arg" v-if="arg != ''" />
<el-table-column
label="US W’S"
align="center"
prop="usws"
v-if="usws != ''"
/>
<el-table-column label="M’S" align="center" prop="ms" v-if="ms != ''" />
<el-table-column
label="脚长"
align="center"
prop="footLength"
v-if="footLength != ''"
/>
<el-table-column
label="法码"
align="center"
prop="weights"
v-if="weights != ''"
/>
<el-table-column
label="鞋型"
align="center"
prop="shoeShape"
v-if="shoeShape != ''"
/>
<el-table-column
label="楦型"
align="center"
prop="lastShape"
v-if="lastShape != ''"
/>
<el-table-column
label="UK/AU/NZ"
align="center"
prop="ukAuNz"
width="120"
v-if="ukAuNz != ''"
/>
<el-table-column label="RU" align="center" prop="ru" v-if="ru != ''" />
<el-table-column
label="UKAUNZ"
align="center"
prop="unaunz"
v-if="unaunz != ''"
/>
<el-table-column label="NGG" align="center" prop="ngg" v-if="ngg != ''" />
<el-table-column label="ENG" align="center" prop="eng" v-if="eng != ''" />
<el-table-column
label="韩年龄"
align="center"
prop="koreaAge"
v-if="koreaAge != ''"
/>
<el-table-column label="US1" align="center" prop="us1" v-if="us1 != ''" />
<el-table-column label="US2" align="center" prop="us2" v-if="us2 != ''" />
<el-table-column
label="CHN&EU"
align="center"
prop="chnEu"
v-if="chnEu != ''"
/>
<el-table-column
label="CM(JP)"
align="center"
prop="cmJp"
v-if="cmJp != ''"
/>
<el-table-column
label="MONTHS"
align="center"
prop="months"
v-if="months != ''"
/>
<el-table-column
label="CN(cm)"
align="center"
prop="cnCm"
v-if="cnCm != ''"
/>
<el-table-column label="DPS" align="center" prop="dps" v-if="dps != ''" />
<el-table-column label="NBJ" align="center" prop="nbj" v-if="nbj != ''" />
<el-table-column label="AR" align="center" prop="ar" v-if="ar != ''" />
<el-table-column label="POR" align="center" prop="por" v-if="por != ''" />
<el-table-column
label="Spain"
align="center"
prop="spain"
v-if="spain != ''"
/>
<el-table-column label="MP" align="center" prop="mp" v-if="mp != ''" />
<el-table-column label="UA" align="center" prop="ua" v-if="ua != ''" />
<el-table-column
label="CHNW"
align="center"
prop="chnw"
v-if="chnw != ''"
/>
<el-table-column
label="CHNM"
align="center"
prop="chnm"
v-if="chnm != ''"
/>
<el-table-column
label="US/CAN"
align="center"
prop="usCan"
v-if="usCan != ''"
/>
<el-table-column
label="TYPE"
align="center"
prop="type"
v-if="type != ''"
/>
<el-table-column
label="USM/USW"
align="center"
prop="usmUsw"
width="120"
>
<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> -->
v-if="usmUsw != ''"
/>
<el-table-column label="CAN" align="center" prop="can" v-if="can != ''" />
<el-table-column label="ES" align="center" prop="es" v-if="es != ''" />
<el-table-column label="KR" align="center" prop="kr" v-if="kr != ''" /> -->
</el-table>
</div>
</template>
......@@ -78,6 +404,123 @@ export default {
dispatch_multiple: "",
reference_num: "",
},
tableColums: [],
colums: [
{ prop: "idx", label: "序号" },
{ prop: "brandCode", label: "品牌" },
{ prop: "salePath", label: "销线" },
{ prop: "sizeType", label: "SIZE类型组", width: "120" },
{ prop: "itemType", label: "产品类别" },
{ prop: "segment", label: "段别" },
{ prop: "quarter", label: "季度" },
{ prop: "specSize", label: "特殊Size" },
{ prop: "wholeSize", label: "整/半码" },
{ prop: "prodSpec", label: "产品规格" },
{ prop: "standardSizeType", label: "标准SIZE类型", width: "120" },
{ prop: "usa", label: "USA" },
{ prop: "uk", label: "UK" },
{ prop: "pus", label: "RUS" },
{ prop: "jan", label: "JAN" },
{ prop: "tha", label: "THA" },
{ prop: "chn", label: "CHN" },
{ prop: "ind", label: "IND" },
{ prop: "kket", label: "KKET" },
{ prop: "us", label: "US" },
{ prop: "eu", label: "EU" },
{ prop: "jp", label: "JP" },
{ prop: "mm", label: "MM" },
{ prop: "bra", label: "BRA" },
{ prop: "eur", label: "EUR" },
{ prop: "cm", label: "CM" },
{ prop: "u", label: "U" },
{ prop: "mx", label: "MX" },
{ prop: "chi", label: "CHI" },
{ prop: "jap", label: "JAP" },
{ prop: "japan", label: "JAPAN" },
{ prop: "mex", label: "MEX" },
{ prop: "metric", label: "METRIC" },
{ prop: "pack", label: "PACK" },
{ prop: "usm", label: "USM" },
{ prop: "usw", label: "USW" },
{ prop: "kx", label: "KX" },
{ prop: "au", label: "AU" },
{ prop: "cn", label: "CN" },
{ prop: "euro", label: "EURO" },
{ prop: "gen", label: "GEN" },
{ prop: "jpnY", label: "JPN-Y" },
{ prop: "jpn", label: "JPN" },
{ prop: "ukm", label: "UKM" },
{ prop: "ukw", label: "UKW" },
{ prop: "eum", label: "EUM" },
{ prop: "euw", label: "EUW" },
{ prop: "japm", label: "JAPM" },
{ prop: "japw", label: "JAPW" },
{ prop: "br", label: "BR" },
{ prop: "usf", label: "USF" },
{ prop: "foot", label: "FOOT" },
{ prop: "shoeInnerLength", label: "鞋内长" },
{ prop: "kor", label: "KOR" },
{ prop: "xx", label: "XX" },
{ prop: "fr", label: "FR" },
{ prop: "mules", label: "MULES" },
{ prop: "s", label: "S" },
{ prop: "xs", label: "XS" },
{ prop: "m", label: "M" },
{ prop: "l", label: "L" },
{ prop: "xl", label: "XL" },
{ prop: "xxl", label: "XXL" },
{ prop: "reFit", label: "Re-fit" },
{ prop: "jpnCm", label: "JPN(CM)" },
{ prop: "cmm", label: "CMM" },
{ prop: "cmw", label: "CMW" },
{ prop: "eurm", label: "EURM" },
{ prop: "eurw", label: "EURW" },
{ prop: "jpm", label: "JPM" },
{ prop: "jpw", label: "JPW" },
{ prop: "eor", label: "EOR" },
{ prop: "mo", label: "MO" },
{ prop: "aus", label: "AUS" },
{ prop: "usl", label: "USL" },
{ prop: "mexCm", label: "MEX(CM)" },
{ prop: "size", label: "码数" },
{ prop: "shoeNum", label: "鞋号" },
{ prop: "cad", label: "CAD" },
{ prop: "mondo", label: "MONDO" },
{ prop: "arg", label: "ARG" },
{ prop: "usws", label: "US W’S" },
{ prop: "ms", label: "M’S" },
{ prop: "footLength", label: "脚长" },
{ prop: "weights", label: "法码" },
{ prop: "shoeShape", label: "鞋型" },
{ prop: "lastShape", label: "楦型" },
{ prop: "ukAuNz", label: "UK/AU/NZ", width: "120" },
{ prop: "ru", label: "RU" },
{ prop: "unaunz", label: "UKAUNZ" },
{ prop: "ngg", label: "NGG" },
{ prop: "eng", label: "ENG" },
{ prop: "koreaAge", label: "韩年龄" },
{ prop: "us1", label: "US1" },
{ prop: "us2", label: "US2" },
{ prop: "chnEu", label: "CHN&EU" },
{ prop: "cmJp", label: "CM(JP)" },
{ prop: "months", label: "MONTHS" },
{ prop: "cnCm", label: "CN(cm)" },
{ prop: "dps", label: "DPS" },
{ prop: "nbj", label: "NBJ" },
{ prop: "ar", label: "AR" },
{ prop: "por", label: "POR" },
{ prop: "spain", label: "Spain" },
{ prop: "mp", label: "MP" },
{ prop: "ua", label: "UA" },
{ prop: "chnw", label: "CHNW" },
{ prop: "chnm", label: "CHNM" },
{ prop: "usCan", label: "US/CAN" },
{ prop: "type", label: "TYPE" },
{ prop: "usmUsw", label: "USM/USW", width: "120" },
{ prop: "can", label: "CAN" },
{ prop: "es", label: "ES" },
{ prop: "kr", label: "KR" },
],
currentRowIdx: undefined,
};
},
......
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="请选择产品" >
......
src/views/mes/pro/workorder/proofingInfo.vue
View file @ c6363c06
......@@ -42,74 +42,6 @@
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="来源类型" prop="orderSource">
<el-radio-group
v-model="form.orderSource"
disabled
v-if="optType == 'view'"
>
<el-radio
v-for="dict in dict.type.mes_workorder_sourcetype"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio
>
</el-radio-group>
<el-radio-group v-model="form.orderSource" v-else>
<el-radio
v-for="dict in dict.type.mes_workorder_sourcetype"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio
>
</el-radio-group>
</el-form-item>
</el-col>
<el-col
:lg="6"
:md="8"
:sm="12"
:xs="12"
v-if="form.orderSource == 'ORDER'"
>
<el-form-item label="订单编号" prop="sourceCode">
<el-input
v-model="form.sourceCode"
placeholder="请输入订单编号"
/>
</el-form-item>
</el-col>
<!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单据状态" prop="status">
<el-select
v-model="form.status"
disabled
placeholder="请选择单据状态"
>
<el-option
v-for="dict in dict.type.mes_order_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col> -->
<!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单据状态" prop="status">
<el-select v-model="form.status" disabled>
<el-option
v-for="dict in dict.type.mes_order_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工单类型" prop="workorderType">
<el-select v-model="form.workorderType" placeholder="请选择类型">
......@@ -167,24 +99,35 @@
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单位" prop="unitOfMeasure">
<el-form-item label="生产数量" prop="quantity">
<el-input
v-model="form.unitOfMeasure"
placeholder="请选择产品"
disabled
v-model="form.quantity"
placeholder="请输入生产数量"
type="number"
min="1"
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工单数量" prop="quantity">
<el-input-number
:min="1"
v-model="form.quantity"
placeholder="请输入生产数量"
<el-form-item label="计量单位" prop="unitOfMeasure">
<el-input
v-model="form.unitOfMeasure"
placeholder="请输入计量单位"
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="开始日期" prop="startDate">
<el-date-picker
clearable
v-model="form.startDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始日期"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="需求日期" prop="requestDate">
<el-date-picker
......@@ -198,89 +141,59 @@
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="批次号" prop="batchCode">
<el-input v-model="form.batchCode" placeholder="请输入批次号" />
<el-form-item label="生产主管" prop="productionAdministrator">
<el-input
v-model="form.productionAdministrator"
placeholder="请输入生产主管"
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="库存地点" prop="stockLocation">
<el-input
v-model="form.stockLocation"
placeholder="请输入库存地点"
/>
</el-form-item>
</el-col>
<!-- <el-row v-if="form.orderSource == 'ORDER'"> -->
<el-col
:lg="6"
:md="8"
:sm="12"
:xs="12"
v-if="form.orderSource == 'ORDER'"
>
<el-form-item label="客户编码" prop="clientCode">
<el-input v-model="form.clientCode" placeholder="请选择客户">
<el-button
slot="append"
@click="handleSelectClient"
icon="el-icon-search"
></el-button>
</el-input>
<ClientSelect ref="clientSelect" @onSelected="onClientSelected">
</ClientSelect>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="批号" prop="batchNumber">
<el-input v-model="form.batchNumber" placeholder="请输入批号" />
</el-form-item>
</el-col>
<el-col
:lg="6"
:md="8"
:sm="12"
:xs="12"
v-if="form.orderSource == 'ORDER'"
>
<el-form-item label="客户名称" prop="clientName">
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工单状态" prop="status">
<el-input v-model="form.status" placeholder="请输入工单状态" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="派工倍数" prop="dispatchMultiple">
<el-input
v-model="form.clientName"
readonly="readonly"
placeholder="请输入客户名称"
v-model="form.dispatchMultiple"
placeholder="请输入派工倍数"
/>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="排班行数" prop="rowNum">
<el-input v-model="form.rowNum" placeholder="请输入排版行数" />
</el-form-item>
</el-col>
<el-col
:lg="6"
:md="8"
:sm="12"
:xs="12"
v-if="
form.workorderType == 'OUTSOURCE' ||
form.workorderType == 'PURCHASE'
"
>
<el-form-item label="供应商编码" prop="vendorCode">
<el-input v-model="form.vendorCode" placeholder="请选择供应商">
<el-button
slot="append"
@click="handleSelectVendor"
icon="el-icon-search"
></el-button>
</el-input>
<VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" />
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单重" prop="singleWeight">
<el-input v-model="form.singleWeight" placeholder="请输入单重" />
</el-form-item>
</el-col>
<el-col
:lg="6"
:md="8"
:sm="12"
:xs="12"
v-if="
form.workorderType == 'OUTSOURCE' ||
form.workorderType == 'PURCHASE'
"
>
<el-form-item label="供应商名称" prop="vendorName">
<el-input
v-model="form.vendorName"
readonly="readonly"
placeholder="请选择供应商"
/>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="厚度(丝)" prop="thickness">
<el-input v-model="form.thickness" placeholder="厚度(丝)" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark">
<el-col :span="24">
<el-form-item label="工单备注" prop="remark">
<el-input
v-model="form.remark"
type="textarea"
......@@ -550,8 +463,20 @@ export default {
// 设置组件数据
this.$refs["ProogingBomRef"].tableData = data.bomList;
this.$refs["ProogingProcessRef"].tableData = data.processList;
this.$refs["WorkOrderSaleRef"].tableData = data.saleList;
this.$refs["WorkOrderSaleRef"].form = data.saleDirective;
this.$refs["WorkOrderSizeRef"].tableData = data.sizeList;
this.$refs["WorkOrderSizeRef"].tableColums = [];
this.$refs["WorkOrderSizeRef"].colums.forEach((value) => {
let flag = false;
data.sizeList.forEach((item) => {
if (item[value.prop] === 0 || item[value.prop]) {
flag = true;
}
});
if (flag) {
this.$refs["WorkOrderSizeRef"].tableColums.push(value);
}
});
})
.finally(() => {
this.loading = false;
......
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