Commit 014c3906 authored by 沈翠玲's avatar 沈翠玲

生产工单号改成生产工单

parent a0f16d8b
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<el-table-column label="供应商编号" width="100px" align="center" prop="vendorCode" /> <el-table-column label="供应商编号" width="100px" align="center" prop="vendorCode" />
<el-table-column label="供应商名称" width="120px" align="center" prop="vendorName" :show-overflow-tooltip="true"/> <el-table-column label="供应商名称" width="120px" align="center" prop="vendorName" :show-overflow-tooltip="true"/>
<el-table-column label="供应商简称" width="100px" align="center" prop="vendorNick" /> <el-table-column label="供应商简称" width="100px" align="center" prop="vendorNick" />
<el-table-column label="生产工单" width="150px" align="center" prop="workorderCode" /> <el-table-column label="生产工单" width="150px" align="center" prop="workorderCode" />
<el-table-column label="在库数量" align="center" prop="quantityOnhand" /> <el-table-column label="在库数量" align="center" prop="quantityOnhand" />
<el-table-column label="库存有效期" align="center" prop="expireDate" width="180"> <el-table-column label="库存有效期" align="center" prop="expireDate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="生产工单" prop="workorderCode"> <el-form-item label="生产工单" prop="workorderCode">
<el-input <el-input
v-model="queryParams.workorderCode" v-model="queryParams.workorderCode"
placeholder="请输入生产工单" placeholder="请输入生产工单"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<el-table-column label="创建人" align="center" prop="createBy"/> <el-table-column label="创建人" align="center" prop="createBy"/>
<el-table-column label="创建时间" align="center" prop="createTime"/> <el-table-column label="创建时间" align="center" prop="createTime"/>
<!-- <el-table-column label="序号" align="center" prop="arrangeSort"/>--> <!-- <el-table-column label="序号" align="center" prop="arrangeSort"/>-->
<!-- <el-table-column label="生产工单" align="center" prop="workorderId"/>--> <!-- <el-table-column label="生产工单" align="center" prop="workorderId"/>-->
<!-- <el-table-column label="生产工单编号" align="center" prop="workorderCode"/>--> <!-- <el-table-column label="生产工单编号" align="center" prop="workorderCode"/>-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">--> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
...@@ -162,11 +162,11 @@ ...@@ -162,11 +162,11 @@
<el-form-item label="序号" prop="arrangeSort"> <el-form-item label="序号" prop="arrangeSort">
<el-input v-model="form.arrangeSort" placeholder="请输入序号"/> <el-input v-model="form.arrangeSort" placeholder="请输入序号"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="生产工单" prop="workorderId">--> <!-- <el-form-item label="生产工单" prop="workorderId">-->
<!-- <el-input v-model="form.workorderId" placeholder="请输入生产工单"/>--> <!-- <el-input v-model="form.workorderId" placeholder="请输入生产工单"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="生产工单" prop="workorderCode"> <el-form-item label="生产工单" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请输入生产工单"/> <el-input v-model="form.workorderCode" placeholder="请输入生产工单"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="生产工单" prop="workorderId">--> <!-- <el-form-item label="生产工单" prop="workorderId">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.workorderId"--> <!-- v-model="queryParams.workorderId"-->
<!-- placeholder="请输入生产工单"--> <!-- placeholder="请输入生产工单"-->
<!-- clearable--> <!-- clearable-->
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
label="序号"></el-input-number> label="序号"></el-input-number>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="生产工单" align="center" prop="workorderCode"/> <el-table-column label="生产工单" align="center" prop="workorderCode"/>
<el-table-column v-if="showBtn" label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column v-if="showBtn" label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -157,8 +157,8 @@ ...@@ -157,8 +157,8 @@
<el-input-number v-model="form.arrangeSort" :min="0" <el-input-number v-model="form.arrangeSort" :min="0"
label="序号"></el-input-number> label="序号"></el-input-number>
</el-form-item> </el-form-item>
<!-- <el-form-item label="生产工单" prop="workorderId"> <!-- <el-form-item label="生产工单" prop="workorderId">
<el-input v-model="form.workorderId" placeholder="请输入生产工单"/> <el-input v-model="form.workorderId" placeholder="请输入生产工单"/>
</el-form-item> --> </el-form-item> -->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="生产工单" prop="workorderCode"> <el-form-item label="生产工单" prop="workorderCode">
<el-input <el-input
v-model="queryParams.workorderCode" v-model="queryParams.workorderCode"
placeholder="请输入生产工单" placeholder="请输入生产工单"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<el-table-column label="创建人" align="center" prop="createBy"/> <el-table-column label="创建人" align="center" prop="createBy"/>
<el-table-column label="创建时间" align="center" prop="createTime"/> <el-table-column label="创建时间" align="center" prop="createTime"/>
<!-- <el-table-column label="序号" align="center" prop="combinationSort"/>--> <!-- <el-table-column label="序号" align="center" prop="combinationSort"/>-->
<!-- <el-table-column label="生产工单" align="center" prop="workorderCode"/>--> <!-- <el-table-column label="生产工单" align="center" prop="workorderCode"/>-->
<!-- <el-table-column label="销售订单号" align="center" prop="salesOrderNumber"/>--> <!-- <el-table-column label="销售订单号" align="center" prop="salesOrderNumber"/>-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">--> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
...@@ -148,8 +148,8 @@ ...@@ -148,8 +148,8 @@
<el-form-item label="序号" prop="combinationSort"> <el-form-item label="序号" prop="combinationSort">
<el-input v-model="form.combinationSort" placeholder="请输入序号"/> <el-input v-model="form.combinationSort" placeholder="请输入序号"/>
</el-form-item> </el-form-item>
<el-form-item label="生产工单" prop="workorderCode"> <el-form-item label="生产工单" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请输入生产工单"/> <el-input v-model="form.workorderCode" placeholder="请输入生产工单"/>
</el-form-item> </el-form-item>
<el-form-item label="销售订单号" prop="salesOrderNumber"> <el-form-item label="销售订单号" prop="salesOrderNumber">
<el-input v-model="form.salesOrderNumber" placeholder="请输入销售订单号"/> <el-input v-model="form.salesOrderNumber" placeholder="请输入销售订单号"/>
...@@ -218,7 +218,7 @@ export default { ...@@ -218,7 +218,7 @@ export default {
], combinationSort: [ ], combinationSort: [
{required: true, message: "序号不能为空", trigger: "blur"} {required: true, message: "序号不能为空", trigger: "blur"}
], workorderCode: [ ], workorderCode: [
{required: true, message: "生产工单不能为空", trigger: "blur"} {required: true, message: "生产工单不能为空", trigger: "blur"}
], salesOrderNumber: [ ], salesOrderNumber: [
{required: true, message: "销售订单号不能为空", trigger: "blur"} {required: true, message: "销售订单号不能为空", trigger: "blur"}
] ]
......
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="生产工单" prop="workorderCode">--> <!-- <el-form-item label="生产工单" prop="workorderCode">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.workorderCode"--> <!-- v-model="queryParams.workorderCode"-->
<!-- placeholder="请输入生产工单"--> <!-- placeholder="请输入生产工单"-->
<!-- clearable--> <!-- clearable-->
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
label="序号"></el-input-number> label="序号"></el-input-number>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="生产工单" align="center" prop="workorderCode"/> <el-table-column label="生产工单" align="center" prop="workorderCode"/>
<!-- <el-table-column label="销售订单号" align="center" prop="salesOrderId"/>--> <!-- <el-table-column label="销售订单号" align="center" prop="salesOrderId"/>-->
<el-table-column label="操作" v-if="showBtn" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" v-if="showBtn" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -145,8 +145,8 @@ ...@@ -145,8 +145,8 @@
<el-form-item label="序号" prop="combinationSort"> <el-form-item label="序号" prop="combinationSort">
<el-input v-model="form.combinationSort" placeholder="请输入序号"/> <el-input v-model="form.combinationSort" placeholder="请输入序号"/>
</el-form-item> </el-form-item>
<el-form-item label="生产工单" prop="workorderCode"> <el-form-item label="生产工单" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请输入生产工单"/> <el-input v-model="form.workorderCode" placeholder="请输入生产工单"/>
</el-form-item> </el-form-item>
<el-form-item label="销售订单号" prop="salesOrderNumber"> <el-form-item label="销售订单号" prop="salesOrderNumber">
<el-input v-model="form.salesOrderNumber" placeholder="请输入销售订单号"/> <el-input v-model="form.salesOrderNumber" placeholder="请输入销售订单号"/>
...@@ -226,7 +226,7 @@ export default { ...@@ -226,7 +226,7 @@ export default {
], combinationSort: [ ], combinationSort: [
{required: true, message: "序号不能为空", trigger: "blur"} {required: true, message: "序号不能为空", trigger: "blur"}
], workorderCode: [ ], workorderCode: [
{required: true, message: "生产工单不能为空", trigger: "blur"} {required: true, message: "生产工单不能为空", trigger: "blur"}
] ]
} }
}; };
......
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="生产工单" prop="workorderCode"> <el-form-item label="生产工单" prop="workorderCode">
<el-input <el-input
v-model="queryParams.workorderCode" v-model="queryParams.workorderCode"
placeholder="请输入生产工单" placeholder="请输入生产工单"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 供应商,外协单号,生产工单, 外协数量,已缴回数量,计划时间 --> <!-- 供应商,外协单号,生产工单, 外协数量,已缴回数量,计划时间 -->
<el-table v-loading="loading" :data="workorderList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick"> <el-table v-loading="loading" :data="workorderList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
<el-table-column width="55" align="center" > <el-table-column width="55" align="center" >
<template v-slot="scope"> <template v-slot="scope">
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</el-table-column> </el-table-column>
<el-table-column label="供应商" prop="supplierName" /> <el-table-column label="供应商" prop="supplierName" />
<el-table-column label="外协单号" align="center" prop="assistProcessCode" /> <el-table-column label="外协单号" align="center" prop="assistProcessCode" />
<el-table-column label="生产工单" align="center" prop="workorderCode" :show-overflow-tooltip="true"/> <el-table-column label="生产工单" align="center" prop="workorderCode" :show-overflow-tooltip="true"/>
<el-table-column label="外协数量" align="center" prop="quantity"/> <el-table-column label="外协数量" align="center" prop="quantity"/>
<el-table-column label="已缴回数量" align="center" prop="quantityFeedback"/> <el-table-column label="已缴回数量" align="center" prop="quantityFeedback"/>
<el-table-column label="计划时间" align="center" prop="scheduleEndDate" width="180"> <el-table-column label="计划时间" align="center" prop="scheduleEndDate" width="180">
......
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<el-table-column label="申请单编码" align="center" prop="applyNo" width="150"/> <el-table-column label="申请单编码" align="center" prop="applyNo" width="150"/>
<el-table-column label="工作单元编码" align="center" prop="workunitCode" width="150"/> <el-table-column label="工作单元编码" align="center" prop="workunitCode" width="150"/>
<el-table-column label="工作单元名称" align="center" prop="workunitName" width="150"/> <el-table-column label="工作单元名称" align="center" prop="workunitName" width="150"/>
<el-table-column label="生产工单" align="center" prop="workorderCode" width="150"/> <el-table-column label="生产工单" align="center" prop="workorderCode" width="150"/>
<el-table-column label="批次号" align="center" prop="batchNo" width="100"/> <el-table-column label="批次号" align="center" prop="batchNo" width="100"/>
<el-table-column label="卷号" align="center" prop="packNo" width="100"/> <el-table-column label="卷号" align="center" prop="packNo" width="100"/>
<el-table-column label="申请退料数量" align="center" prop="backNum" width="100"/> <el-table-column label="申请退料数量" align="center" prop="backNum" width="100"/>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
> >
<!-- <el-table-column type="selection" width="55" align="center"/> --> <!-- <el-table-column type="selection" width="55" align="center"/> -->
<el-table-column label="生产工单" width="180" prop="workorderCode"/> <el-table-column label="生产工单" width="180" prop="workorderCode"/>
<el-table-column label="产品编号" width="180" prop="productCode"/> <el-table-column label="产品编号" width="180" prop="productCode"/>
<el-table-column label="产品名称" prop="productName"/> <el-table-column label="产品名称" prop="productName"/>
<el-table-column label="生产订单数量" v-if="isOrder" prop="quantity"/> <el-table-column label="生产订单数量" v-if="isOrder" prop="quantity"/>
......
...@@ -154,8 +154,8 @@ ...@@ -154,8 +154,8 @@
<el-form-item label="工作单元编码" prop="workunitCode"> <el-form-item label="工作单元编码" prop="workunitCode">
<el-input v-model="form.workunitCode" placeholder="请输入工作单元编码"/> <el-input v-model="form.workunitCode" placeholder="请输入工作单元编码"/>
</el-form-item> </el-form-item>
<el-form-item label="生产工单" prop="workorderCode"> <el-form-item label="生产工单" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请输入生产工单"/> <el-input v-model="form.workorderCode" placeholder="请输入生产工单"/>
</el-form-item> </el-form-item>
<el-form-item label="刀模版领用单编码" prop="toolRequestUseCode"> <el-form-item label="刀模版领用单编码" prop="toolRequestUseCode">
<el-input v-model="form.toolRequestUseCode" placeholder="请输入刀模版领用单编码"/> <el-input v-model="form.toolRequestUseCode" 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