Skip to content

M
mes-ui
Commit 6cf2670d authored by chenzj's avatar chenzj
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

parents 3acc2423 bb393d3e
Show whitespace changes
Inline Side-by-side
Showing with 240 additions and 11 deletions
src/views/mes/pro/workorder/indexApply.vue
View file @ 6cf2670d
...@@ -350,7 +350,7 @@ ...@@ -350,7 +350,7 @@
<el-table-column label="单据状态" align="center" prop="status"> <el-table-column label="单据状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.mes_order_status" :options="dict.type.mes_workorder_status"
:value="scope.row.status" :value="scope.row.status"
/> />
</template> </template>
...@@ -496,7 +496,7 @@ ...@@ -496,7 +496,7 @@
placeholder="请选择单据状态" placeholder="请选择单据状态"
> >
<el-option <el-option
v-for="dict in dict.type.mes_order_status" v-for="dict in dict.type.mes_workorder_status"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
...@@ -718,7 +718,11 @@ import { getToken } from "@/utils/auth"; ...@@ -718,7 +718,11 @@ import { getToken } from "@/utils/auth";
export default { export default {
name: "Workorder", name: "Workorder",
dicts: ["mes_order_status", "mes_workorder_sourcetype", "mes_workorder_type", "mes_order_status"], dicts: [
"mes_workorder_status",
"mes_workorder_sourcetype",
"mes_workorder_type",
],
components: { components: {
Treeselect, Treeselect,
ItemSelect, ItemSelect,
......
src/views/mes/pro/workorder/proofingInfo.vue
View file @ 6cf2670d
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> <!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单据状态" prop="status"> <el-form-item label="单据状态" prop="status">
<el-select <el-select
v-model="form.status" v-model="form.status"
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<!-- <el-col :lg="6" :md="8" :sm="12" :xs="12"> <!-- <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="单据状态" prop="status"> <el-form-item label="单据状态" prop="status">
<el-select v-model="form.status" disabled> <el-select v-model="form.status" disabled>
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<!-- <el-col :lg="6" :md="8" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工单类型" prop="workorderType"> <el-form-item label="工单类型" prop="workorderType">
<el-select v-model="form.workorderType" placeholder="请选择类型"> <el-select v-model="form.workorderType" placeholder="请选择类型">
<el-option <el-option
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> --> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="工艺名称" prop="routeId"> <el-form-item label="工艺名称" prop="routeId">
<el-input <el-input
...@@ -289,6 +289,175 @@ ...@@ -289,6 +289,175 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </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-form>
<el-tabs type="border-card" @tab-click="tabClick"> <el-tabs type="border-card" @tab-click="tabClick">
...@@ -340,7 +509,11 @@ export default { ...@@ -340,7 +509,11 @@ export default {
ClientSelect, ClientSelect,
VendorSelect, VendorSelect,
}, },
dicts: ["mes_order_status", "mes_workorder_sourcetype", "mes_workorder_type"], dicts: [
"mes_workorder_status",
"mes_workorder_sourcetype",
"mes_workorder_type",
],
provide() { provide() {
return { return {
mode: this.mode, mode: this.mode,
...@@ -379,6 +552,58 @@ export default { ...@@ -379,6 +552,58 @@ export default {
requestDate: null, requestDate: null,
parentId: null, parentId: null,
status: "PREPARE", status: "PREPARE",
orderId: null,
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, remark: null,
createBy: null, createBy: null,
createTime: null, createTime: null,
...@@ -593,9 +818,9 @@ export default { ...@@ -593,9 +818,9 @@ export default {
// 关闭页签 // 关闭页签
tabPlugins.closeOpenPage(); tabPlugins.closeOpenPage();
this.$router.replace({ this.$router.replace({
path: '/mes/pro/workorder' path: "/mes/pro/workorder",
}) });
}) });
}) })
.catch(() => { .catch(() => {
this.loading = false; 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