Skip to content

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

工单页面添加指令、size页签

parent bb393d3e
Show whitespace changes
Inline Side-by-side
Showing with 603 additions and 223 deletions
src/api/mes/pro/workOrderSoDirective.js 0 → 100644
View file @ 739bb74e
import request from '@/utils/request'
// 查询生产工单指令列表
export function listWorkOrderSoDirective(query) {
return request({
url: '/mes/pro/workOrderSoDirective/list',
method: 'get',
params: query
})
}
// 查询生产工单指令详细
export function getWorkOrderSoDirective(workorderSoDirectiveId) {
return request({
url: '/mes/pro/workOrderSoDirective/' + workorderSoDirectiveId,
method: 'get'
})
}
// 新增生产工单指令
export function addWorkOrderSoDirective(data) {
return request({
url: '/mes/pro/workOrderSoDirective',
method: 'post',
data: data
})
}
// 修改生产工单指令
export function updateWorkOrderSoDirective(data) {
return request({
url: '/mes/pro/workOrderSoDirective',
method: 'put',
data: data
})
}
// 删除生产工单指令
export function delWorkOrderSoDirective(workorderSoDirectiveId) {
return request({
url: '/mes/pro/workOrderSoDirective/' + workorderSoDirectiveId,
method: 'delete'
})
}
src/api/mes/pro/workOrderSoSizeItem.js 0 → 100644
View file @ 739bb74e
import request from '@/utils/request'
// 查询生产工单尺码列表
export function listWorkOrderSoSizeItem(query) {
return request({
url: '/mes/pro/workOrderSoSizeItem/list',
method: 'get',
params: query
})
}
// 查询生产工单尺码详细
export function getWorkOrderSoSizeItem(workorderSoSizeItemId) {
return request({
url: '/mes/pro/workOrderSoSizeItem/' + workorderSoSizeItemId,
method: 'get'
})
}
// 新增生产工单尺码
export function addWorkOrderSoSizeItem(data) {
return request({
url: '/mes/pro/workOrderSoSizeItem',
method: 'post',
data: data
})
}
// 修改生产工单尺码
export function updateWorkOrderSoSizeItem(data) {
return request({
url: '/mes/pro/workOrderSoSizeItem',
method: 'put',
data: data
})
}
// 删除生产工单尺码
export function delWorkOrderSoSizeItem(workorderSoSizeItemId) {
return request({
url: '/mes/pro/workOrderSoSizeItem/' + workorderSoSizeItemId,
method: 'delete'
})
}
src/views/mes/pro/workorder/components/ProogingBom.vue
View file @ 739bb74e
......@@ -24,12 +24,8 @@
</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="itemName"
/>
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="物料名称" align="center" prop="itemName" />
<el-table-column
label="组件数量"
align="center"
......
src/views/mes/pro/workorder/components/WorkOrderSale.vue 0 → 100644
View file @ 739bb74e
<template>
<div>
<!-- <el-row :gutter="10" class="mb8" v-if="mode != 'info'">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
@click="handleDelete"
>删除</el-button
>
</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="directiveList"
width="120"
/>
<el-table-column label="数量" align="center" prop="num" width="120" />
<el-table-column
label="LOSS数"
align="center"
prop="lossNum"
width="120"
/>
<el-table-column
label="销售凭证"
align="center"
prop="salesVoucher"
width="120"
/>
<el-table-column
label="销售凭证项目"
align="center"
prop="salesVoucherItem"
width="120"
/>
<el-table-column
label="客户编号"
align="center"
prop="clientCode"
width="120"
/>
<el-table-column
label="尺码组"
align="center"
prop="sizeGroup"
width="120"
/>
<el-table-column
label="尺码单位"
align="center"
prop="clientSizeUnit"
width="120"
/>
<el-table-column
label="指令号"
align="center"
prop="clientCmd"
width="120"
/>
<el-table-column
label="型体号"
align="center"
prop="typeNo"
width="120"
/>
<el-table-column
label="配色号"
align="center"
prop="colorNo"
width="120"
/>
<el-table-column label="颜色" align="center" prop="color" width="120" />
<el-table-column
label="销线"
align="center"
prop="salePath"
width="120"
/>
<el-table-column label="段别" align="center" prop="segment" width="120" />
<el-table-column label="季度" align="center" prop="quarter" width="120" />
<el-table-column
label="整/半码"
align="center"
prop="wholeSize"
width="120"
/>
<el-table-column
label="特殊SIZE"
align="center"
prop="specSize"
width="120"
/>
<el-table-column label="PO#" align="center" prop="poNo" width="120" />
<el-table-column label="WIP#" align="center" prop="wipNo" width="120" />
<el-table-column
label="装箱数"
align="center"
prop="packingNum"
width="120"
/>
<el-table-column label="产地" align="center" prop="region" width="120" />
<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"
align="center"
prop="patentNo"
width="120"
/>
<el-table-column
label="材质描述"
align="center"
prop="materialDesc"
width="120"
/>
<el-table-column
label="签收人"
align="center"
prop="signer"
width="120"
/>
<el-table-column
label="SHIP TO ID"
align="center"
prop="shipToId"
width="120"
/>
<el-table-column
label="产品规格"
align="center"
prop="prodSpec"
width="120"
/>
<el-table-column
label="产品用途"
align="center"
prop="prodUsage"
width="120"
/>
<el-table-column
label="厚度（丝）"
align="center"
prop="thickness"
width="120"
/>
<el-table-column
label="包装方式"
align="center"
prop="packMode"
width="120"
/>
<el-table-column
label="印刷方向"
align="center"
prop="printingDirection"
width="120"
/>
<el-table-column
label="工厂代号"
align="center"
prop="plantCode"
width="120"
/>
<!-- <el-table-column
v-if="mode != 'info'"
label="操作"
align="center"
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> -->
</el-table>
</div>
</template>
<script>
export default {
components: {},
inject: ["mode"],
data() {
return {
/**弹窗状态 */
showFlag: false,
/**表格数据 */
tableData: [],
/**表单规则 */
rules: {},
/**多选 */
selection: [],
optType: "add",
/**表单初始化数据 */
form: {
directiveList: "",
num: "",
lossNum: "",
salesVoucher: "",
salesVoucherItem: "",
clientCode: "",
sizeGroup: "",
clientSizeUnit: "",
clientCmd: "",
typeNo: "",
colorNo: "",
color: "",
salePath: "",
segment: "",
quarter: "",
wholeSize: "",
specSize: "",
poNo: "",
wipNo: "",
packingNum: "",
region: "",
cycle: "",
skNo: "",
patentNo: "",
materialDesc: "",
signer: "",
shipToId: "",
prodSpec: "",
prodUsage: "",
thickness: "",
packMode: "",
printingDirection: "",
plantCode: "",
},
currentRowIdx: undefined,
};
},
created() {},
methods: {
/**多选 */
handleSelectionChange(val) {
this.selection = val;
},
/**删除操作 */
handleDelete() {},
/**添加操作 */
handleAdd() {
this.resetForm();
this.showFlag = true;
this.optType = "add";
},
/**更新行 */
updateRow(row, idx) {
Object.assign(this.form, row);
this.currentRowIdx = idx;
this.optType = "edit";
this.showFlag = true;
},
/**删除行 */
deleteRow(index) {
this.tableData.splice(index, 1);
},
/**表单提交 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.optType == "add") {
this.tableData.unshift({ ...this.form });
} else {
this.tableData.splice(this.currentRowIdx, 1, this.form);
}
this.showFlag = false;
}
});
},
/**重置表单 */
resetForm() {
this.form = {
directiveList: "",
num: "",
lossNum: "",
salesVoucher: "",
salesVoucherItem: "",
clientCode: "",
sizeGroup: "",
clientSizeUnit: "",
clientCmd: "",
typeNo: "",
colorNo: "",
color: "",
salePath: "",
segment: "",
quarter: "",
wholeSize: "",
specSize: "",
poNo: "",
wipNo: "",
packingNum: "",
region: "",
cycle: "",
skNo: "",
patentNo: "",
materialDesc: "",
signer: "",
shipToId: "",
prodSpec: "",
prodUsage: "",
thickness: "",
packMode: "",
printingDirection: "",
plantCode: "",
};
},
/**重置组件状态 */
resetState() {
this.resetForm();
this.tableData = [];
},
/**获取组件数据 */
getComData() {
return this.tableData;
},
},
};
</script>
<style></style>
src/views/mes/pro/workorder/components/WorkOrderSize.vue 0 → 100644
View file @ 739bb74e
<template>
<div>
<!-- <el-row :gutter="10" class="mb8" v-if="mode != 'info'">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
@click="handleDelete"
>删除</el-button
>
</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
v-if="mode != 'info'"
label="操作"
align="center"
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> -->
</el-table>
</div>
</template>
<script>
export default {
components: {},
inject: ["mode"],
data() {
return {
/**弹窗状态 */
showFlag: false,
/**表格数据 */
tableData: [],
/**表单规则 */
rules: {},
/**多选 */
selection: [],
optType: "add",
/**表单初始化数据 */
form: {
size: "",
upc3: "",
dispatch_multiple: "",
reference_num: "",
},
currentRowIdx: undefined,
};
},
created() {},
methods: {
/**多选 */
handleSelectionChange(val) {
this.selection = val;
},
/**删除操作 */
handleDelete() {},
/**添加操作 */
handleAdd() {
this.resetForm();
this.showFlag = true;
this.optType = "add";
},
/**更新行 */
updateRow(row, idx) {
Object.assign(this.form, row);
this.currentRowIdx = idx;
this.optType = "edit";
this.showFlag = true;
},
/**删除行 */
deleteRow(index) {
this.tableData.splice(index, 1);
},
/**表单提交 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.optType == "add") {
this.tableData.unshift({ ...this.form });
} else {
this.tableData.splice(this.currentRowIdx, 1, this.form);
}
this.showFlag = false;
}
});
},
/**重置表单 */
resetForm() {
this.form = {
size: "",
upc3: "",
dispatch_multiple: "",
reference_num: "",
};
},
/**重置组件状态 */
resetState() {
this.resetForm();
this.tableData = [];
},
/**获取组件数据 */
getComData() {
return this.tableData;
},
},
};
</script>
<style></style>
src/views/mes/pro/workorder/proofingInfo.vue
View file @ 739bb74e
......@@ -289,175 +289,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-if="mode != 'apply'">
<el-col>
<el-divider content-position="center">销售信息</el-divider>
</el-col>
</el-row>
<el-row v-if="mode != 'apply'">
<el-form-item label="订单编码" prop="orderNo">
<el-input v-model="form.orderNo" disabled />
</el-form-item>
<el-form-item label="产品id" prop="itemId">
<el-input v-model="form.itemId" disabled />
</el-form-item>
<el-form-item label="产品代码" prop="itemNo">
<el-input v-model="form.itemNo" disabled />
</el-form-item>
<el-form-item label="sap产品代码" prop="sapItemNo">
<el-input v-model="form.sapItemNo" disabled />
</el-form-item>
<el-form-item label="产品名称" prop="itemName">
<el-input v-model="form.itemName" disabled />
</el-form-item>
<el-form-item label="总数量" prop="totalNum">
<el-input v-model="form.totalNum" disabled />
</el-form-item>
<el-form-item label="数量" prop="num">
<el-input v-model="form.num" disabled />
</el-form-item>
<el-form-item label="loss数量" prop="lossNum">
<el-input v-model="form.lossNum" disabled />
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input v-model="form.price" disabled />
</el-form-item>
<el-form-item label="装运点" prop="shipmentPointNo">
<el-input v-model="form.shipmentPointNo" disabled />
</el-form-item>
<el-form-item label="存储地点" prop="storeAddr">
<el-input v-model="form.storeAddr" disabled />
</el-form-item>
<el-form-item label="批次号" prop="batchNo">
<el-input v-model="form.batchNo" disabled />
</el-form-item>
<el-form-item label="实际交货日期" prop="actualDeliveryDate">
<el-input
v-model="form.actualDeliveryDate"
value-format="yyyy-MM-dd"
disabled
>
</el-input>
</el-form-item>
<el-form-item label="定价值" prop="pricingVal">
<el-input v-model="form.pricingVal" disabled />
</el-form-item>
<el-form-item label="销售工厂" prop="saleFactory">
<el-input v-model="form.saleFactory" disabled />
</el-form-item>
<el-form-item label="报价单位" prop="offerUnit">
<el-input v-model="form.offerUnit" disabled />
</el-form-item>
<el-form-item label="销售单位" prop="saleUnit">
<el-input v-model="form.saleUnit" disabled />
</el-form-item>
<el-form-item label="尺码单位" prop="sizeUnit">
<el-input v-model="form.sizeUnit" disabled />
</el-form-item>
<el-form-item label="客户订单号" prop="poOrderNo">
<el-input v-model="form.poOrderNo" disabled />
</el-form-item>
<el-form-item label="客户产品代码" prop="clientItemNo">
<el-input v-model="form.clientItemNo" disabled />
</el-form-item>
<el-form-item label="客户产品名称" prop="clientItemName">
<el-input v-model="form.clientItemName" disabled />
</el-form-item>
<el-form-item label="客户尺码单位" prop="clientSizeUnit">
<el-input v-model="form.clientSizeUnit" disabled />
</el-form-item>
<el-form-item label="客户指令号" prop="clientCmd">
<el-input v-model="form.clientCmd" disabled />
</el-form-item>
<el-form-item label="型体号" prop="typeNo">
<el-input v-model="form.typeNo" disabled />
</el-form-item>
<el-form-item label="配色号" prop="colorNo">
<el-input v-model="form.colorNo" disabled />
</el-form-item>
<el-form-item label="客户颜色" prop="color">
<el-input v-model="form.color" disabled />
</el-form-item>
<el-form-item label="客户单重" prop="clientKg">
<el-input v-model="form.clientKg" disabled />
</el-form-item>
<el-form-item label="销线" prop="salePath">
<el-input v-model="form.salePath" disabled />
</el-form-item>
<el-form-item label="段别" prop="segment">
<el-input v-model="form.segment" disabled />
</el-form-item>
<el-form-item label="版面" prop="layout">
<el-input v-model="form.layout" disabled />
</el-form-item>
<el-form-item label="季度" prop="quarter">
<el-input v-model="form.quarter" disabled />
</el-form-item>
<el-form-item label="整/半码" prop="wholeSize">
<el-input v-model="form.wholeSize" disabled />
</el-form-item>
<el-form-item label="特殊尺码" prop="specSize">
<el-input v-model="form.specSize" disabled />
</el-form-item>
<el-form-item label="po_no" prop="poNo">
<el-input v-model="form.poNo" disabled />
</el-form-item>
<el-form-item label="wip_no" prop="wipNo">
<el-input v-model="form.wipNo" disabled />
</el-form-item>
<el-form-item label="装箱数" prop="packingNum">
<el-input v-model="form.packingNum" disabled />
</el-form-item>
<el-form-item label="周期" prop="cycle">
<el-input v-model="form.cycle" disabled />
</el-form-item>
<el-form-item label="sk_no" prop="skNo">
<el-input v-model="form.skNo" disabled />
</el-form-item>
<el-form-item label="专利号" prop="patentNo">
<el-input v-model="form.patentNo" disabled />
</el-form-item>
<el-form-item label="材质描述" prop="materialDesc">
<el-input v-model="form.materialDesc" disabled />
</el-form-item>
<el-form-item label="签收人" prop="signer">
<el-input v-model="form.signer" disabled />
</el-form-item>
<el-form-item label="shipToId" prop="shipToId">
<el-input v-model="form.shipToId" disabled />
</el-form-item>
<el-form-item label="交货日期" prop="deliveryDate">
<el-input v-model="form.deliveryDate" disabled />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" disabled />
</el-form-item>
<el-form-item label="尺码组" prop="sizeGroup">
<el-input v-model="form.sizeGroup" disabled />
</el-form-item>
<el-form-item label="尺码" prop="size">
<el-input v-model="form.size" disabled />
</el-form-item>
<el-form-item label="订单量" prop="orderNum">
<el-input v-model="form.orderNum" disabled />
</el-form-item>
<el-form-item label="条码" prop="barCode">
<el-input v-model="form.barCode" disabled />
</el-form-item>
<el-form-item label="印刷方向" prop="printingDirection">
<el-input v-model="form.printingDirection" disabled />
</el-form-item>
<el-form-item label="产品规格" prop="prodSpec">
<el-input v-model="form.prodSpec" disabled />
</el-form-item>
<el-form-item label="客户工厂代号" prop="plantCode">
<el-input v-model="form.plantCode" disabled />
</el-form-item>
<el-form-item label="包装方式" prop="packMode">
<el-input v-model="form.packMode" disabled />
</el-form-item>
</el-row>
</el-form>
<el-tabs type="border-card" @tab-click="tabClick">
......@@ -467,6 +298,12 @@
<el-tab-pane label="工艺">
<ProogingProcess ref="ProogingProcessRef" :bomList="bomList" />
</el-tab-pane>
<el-tab-pane label="指令">
<WorkOrderSale ref="WorkOrderSaleRef" />
</el-tab-pane>
<el-tab-pane label="SIZE">
<WorkOrderSize ref="WorkOrderSizeRef" />
</el-tab-pane>
</el-tabs>
</PageWrapper>
<RoutesProcessSelect
......@@ -481,6 +318,8 @@
import { genCode } from "@/api/system/autocode/rule";
import ProogingBom from "./components/ProogingBom.vue";
import ProogingProcess from "./components/ProogingProcess.vue";
import WorkOrderSale from "./components/WorkOrderSale.vue";
import WorkOrderSize from "./components/WorkOrderSize.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
import ClientSelect from "@/components/clientSelect/single.vue";
import VendorSelect from "@/components/vendorSelect/single.vue";
......@@ -504,6 +343,8 @@ export default {
components: {
ProogingProcess,
ProogingBom,
WorkOrderSale,
WorkOrderSize,
ItemSelect,
RoutesProcessSelect,
ClientSelect,
......@@ -556,54 +397,6 @@ export default {
orderNo: null,
itemId: null,
itemNo: null,
sapItemNo: null,
itemName: null,
totalNum: null,
num: null,
lossNum: null,
price: null,
shipmentPointNo: null,
storeAddr: null,
batchNo: null,
actualDeliveryDate: null,
pricingVal: null,
saleFactory: null,
offerUnit: null,
saleUnit: null,
sizeUnit: null,
poOrderNo: null,
clientItemNo: null,
clientItemName: null,
clientSizeUnit: null,
clientCmd: null,
typeNo: null,
colorNo: null,
color: null,
clientKg: null,
salePath: null,
segment: null,
layout: null,
quarter: null,
wholeSize: null,
specSize: null,
poNo: null,
wipNo: null,
packingNum: null,
cycle: null,
skNo: null,
patentNo: null,
materialDesc: null,
signer: null,
shipToId: null,
deliveryDate: null,
sizeGroup: null,
size: null,
orderNum: null,
barCode: null,
printingDirection: null,
prodSpec: null,
plantCode: null,
packMode: null,
remark: null,
createBy: null,
createTime: null,
......@@ -757,6 +550,8 @@ export default {
// 设置组件数据
this.$refs["ProogingBomRef"].tableData = data.bomList;
this.$refs["ProogingProcessRef"].tableData = data.processList;
this.$refs["WorkOrderSaleRef"].tableData = data.saleList;
this.$refs["WorkOrderSizeRef"].tableData = data.sizeList;
})
.finally(() => {
this.loading = false;
......@@ -802,10 +597,14 @@ export default {
saveForm() {
const bomList = this.$refs.ProogingBomRef.getComData();
const processList = this.$refs.ProogingProcessRef.getComData();
const saleList = this.$refs.WorkOrderSaleRef.getComData();
const sizeList = this.$refs.WorkOrderSizeRef.getComData();
const params = {
...this.form,
bomList,
processList,
saleList,
sizeList,
};
this.loading = true;
if (this.mode == "apply") {
......@@ -872,6 +671,8 @@ export default {
};
this.$refs["ProogingBomRef"].resetState();
this.$refs["ProogingProcessRef"].resetState();
this.$refs["WorkOrderSaleRef"].resetState();
this.$refs["WorkOrderSizeRef"].resetState();
this.gCode();
},
},
......
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