Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ximai
mes-ui
Commits
014c3906
Commit
014c3906
authored
Jul 15, 2024
by
沈翠玲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
生产工单号改成生产工单
parent
a0f16d8b
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
33 additions
and
33 deletions
+33
-33
single.vue
src/components/stockSelect/single.vue
+1
-1
index.vue
src/views/mes/pro/arrange/index.vue
+7
-7
info.vue
src/views/mes/pro/arrange/info.vue
+5
-5
index.vue
src/views/mes/pro/combination/index.vue
+6
-6
info.vue
src/views/mes/pro/combination/info.vue
+6
-6
assistProcessSelect.vue
...views/mes/pro/feedback/components/assistProcessSelect.vue
+4
-4
index.vue
src/views/mes/pro/return/index.vue
+1
-1
arrangCodeList.vue
src/views/mes/pro/scheduleList/arrangCodeList.vue
+1
-1
index.vue
src/views/mes/tm/toolmachines/index.vue
+2
-2
No files found.
src/components/stockSelect/single.vue
View file @
014c3906
...
...
@@ -124,7 +124,7 @@
<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=
"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=
"expireDate"
width=
"180"
>
<
template
slot-scope=
"scope"
>
...
...
src/views/mes/pro/arrange/index.vue
View file @
014c3906
...
...
@@ -17,10 +17,10 @@
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"生产工单
号
"
prop=
"workorderCode"
>
<el-form-item
label=
"生产工单"
prop=
"workorderCode"
>
<el-input
v-model=
"queryParams.workorderCode"
placeholder=
"请输入生产工单
号
"
placeholder=
"请输入生产工单"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
...
...
@@ -121,7 +121,7 @@
<el-table-column
label=
"创建人"
align=
"center"
prop=
"createBy"
/>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
/>
<!-- <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" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
...
...
@@ -162,11 +162,11 @@
<el-form-item
label=
"序号"
prop=
"arrangeSort"
>
<el-input
v-model=
"form.arrangeSort"
placeholder=
"请输入序号"
/>
</el-form-item>
<!-- <el-form-item label="生产工单
号
" prop="workorderId">-->
<!-- <el-input v-model="form.workorderId" placeholder="请输入生产工单
号
"/>-->
<!-- <el-form-item label="生产工单" prop="workorderId">-->
<!-- <el-input v-model="form.workorderId" placeholder="请输入生产工单"/>-->
<!-- </el-form-item>-->
<el-form-item
label=
"生产工单
号
"
prop=
"workorderCode"
>
<el-input
v-model=
"form.workorderCode"
placeholder=
"请输入生产工单
号
"
/>
<el-form-item
label=
"生产工单"
prop=
"workorderCode"
>
<el-input
v-model=
"form.workorderCode"
placeholder=
"请输入生产工单"
/>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
...
...
src/views/mes/pro/arrange/info.vue
View file @
014c3906
...
...
@@ -17,10 +17,10 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!--
</el-form-item>
-->
<!--
<el-form-item
label=
"生产工单
号
"
prop=
"workorderId"
>
-->
<!--
<el-form-item
label=
"生产工单"
prop=
"workorderId"
>
-->
<!--
<el-input-->
<!-- v-model="queryParams.workorderId"-->
<!-- placeholder="请输入生产工单
号
"-->
<!-- placeholder="请输入生产工单"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
...
...
@@ -111,7 +111,7 @@
label=
"序号"
></el-input-number>
</
template
>
</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"
>
<
template
slot-scope=
"scope"
>
<el-button
...
...
@@ -157,8 +157,8 @@
<el-input-number
v-model=
"form.arrangeSort"
:min=
"0"
label=
"序号"
></el-input-number>
</el-form-item>
<!-- <el-form-item label="生产工单
号
" prop="workorderId">
<el-input v-model="form.workorderId" placeholder="请输入生产工单
号
"/>
<!-- <el-form-item label="生产工单" prop="workorderId">
<el-input v-model="form.workorderId" placeholder="请输入生产工单"/>
</el-form-item> -->
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
...
...
src/views/mes/pro/combination/index.vue
View file @
014c3906
...
...
@@ -17,10 +17,10 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!--
</el-form-item>
-->
<el-form-item
label=
"生产工单
号
"
prop=
"workorderCode"
>
<el-form-item
label=
"生产工单"
prop=
"workorderCode"
>
<el-input
v-model=
"queryParams.workorderCode"
placeholder=
"请输入生产工单
号
"
placeholder=
"请输入生产工单"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
...
...
@@ -108,7 +108,7 @@
<el-table-column
label=
"创建人"
align=
"center"
prop=
"createBy"
/>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
/>
<!-- <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" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
...
...
@@ -148,8 +148,8 @@
<el-form-item
label=
"序号"
prop=
"combinationSort"
>
<el-input
v-model=
"form.combinationSort"
placeholder=
"请输入序号"
/>
</el-form-item>
<el-form-item
label=
"生产工单
号
"
prop=
"workorderCode"
>
<el-input
v-model=
"form.workorderCode"
placeholder=
"请输入生产工单
号
"
/>
<el-form-item
label=
"生产工单"
prop=
"workorderCode"
>
<el-input
v-model=
"form.workorderCode"
placeholder=
"请输入生产工单"
/>
</el-form-item>
<el-form-item
label=
"销售订单号"
prop=
"salesOrderNumber"
>
<el-input
v-model=
"form.salesOrderNumber"
placeholder=
"请输入销售订单号"
/>
...
...
@@ -218,7 +218,7 @@ export default {
],
combinationSort
:
[
{
required
:
true
,
message
:
"序号不能为空"
,
trigger
:
"blur"
}
],
workorderCode
:
[
{
required
:
true
,
message
:
"生产工单
号
不能为空"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"生产工单不能为空"
,
trigger
:
"blur"
}
],
salesOrderNumber
:
[
{
required
:
true
,
message
:
"销售订单号不能为空"
,
trigger
:
"blur"
}
]
...
...
src/views/mes/pro/combination/info.vue
View file @
014c3906
...
...
@@ -9,10 +9,10 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!--
</el-form-item>
-->
<!--
<el-form-item
label=
"生产工单
号
"
prop=
"workorderCode"
>
-->
<!--
<el-form-item
label=
"生产工单"
prop=
"workorderCode"
>
-->
<!--
<el-input-->
<!-- v-model="queryParams.workorderCode"-->
<!-- placeholder="请输入生产工单
号
"-->
<!-- placeholder="请输入生产工单"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
...
...
@@ -104,7 +104,7 @@
label=
"序号"
></el-input-number>
</
template
>
</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=
"操作"
v-if=
"showBtn"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
...
...
@@ -145,8 +145,8 @@
<el-form-item
label=
"序号"
prop=
"combinationSort"
>
<el-input
v-model=
"form.combinationSort"
placeholder=
"请输入序号"
/>
</el-form-item>
<el-form-item
label=
"生产工单
号
"
prop=
"workorderCode"
>
<el-input
v-model=
"form.workorderCode"
placeholder=
"请输入生产工单
号
"
/>
<el-form-item
label=
"生产工单"
prop=
"workorderCode"
>
<el-input
v-model=
"form.workorderCode"
placeholder=
"请输入生产工单"
/>
</el-form-item>
<el-form-item
label=
"销售订单号"
prop=
"salesOrderNumber"
>
<el-input
v-model=
"form.salesOrderNumber"
placeholder=
"请输入销售订单号"
/>
...
...
@@ -226,7 +226,7 @@ export default {
],
combinationSort
:
[
{
required
:
true
,
message
:
"序号不能为空"
,
trigger
:
"blur"
}
],
workorderCode
:
[
{
required
:
true
,
message
:
"生产工单
号
不能为空"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"生产工单不能为空"
,
trigger
:
"blur"
}
]
}
};
...
...
src/views/mes/pro/feedback/components/assistProcessSelect.vue
View file @
014c3906
...
...
@@ -22,10 +22,10 @@
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"生产工单
号
"
prop=
"workorderCode"
>
<el-form-item
label=
"生产工单"
prop=
"workorderCode"
>
<el-input
v-model=
"queryParams.workorderCode"
placeholder=
"请输入生产工单
号
"
placeholder=
"请输入生产工单"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
...
...
@@ -37,7 +37,7 @@
</el-form-item>
</el-form>
<!-- 供应商,外协单号,生产工单
号
, 外协数量,已缴回数量,计划时间 -->
<!-- 供应商,外协单号,生产工单, 外协数量,已缴回数量,计划时间 -->
<el-table
v-loading=
"loading"
:data=
"workorderList"
@
current-change=
"handleCurrent"
@
row-dblclick=
"handleRowDbClick"
>
<el-table-column
width=
"55"
align=
"center"
>
<template
v-slot=
"scope"
>
...
...
@@ -46,7 +46,7 @@
</el-table-column>
<el-table-column
label=
"供应商"
prop=
"supplierName"
/>
<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=
"quantityFeedback"
/>
<el-table-column
label=
"计划时间"
align=
"center"
prop=
"scheduleEndDate"
width=
"180"
>
...
...
src/views/mes/pro/return/index.vue
View file @
014c3906
...
...
@@ -126,7 +126,7 @@
<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=
"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=
"packNo"
width=
"100"
/>
<el-table-column
label=
"申请退料数量"
align=
"center"
prop=
"backNum"
width=
"100"
/>
...
...
src/views/mes/pro/scheduleList/arrangCodeList.vue
View file @
014c3906
...
...
@@ -6,7 +6,7 @@
>
<!--
<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=
"产品名称"
prop=
"productName"
/>
<el-table-column
label=
"生产订单数量"
v-if=
"isOrder"
prop=
"quantity"
/>
...
...
src/views/mes/tm/toolmachines/index.vue
View file @
014c3906
...
...
@@ -154,8 +154,8 @@
<el-form-item
label=
"工作单元编码"
prop=
"workunitCode"
>
<el-input
v-model=
"form.workunitCode"
placeholder=
"请输入工作单元编码"
/>
</el-form-item>
<el-form-item
label=
"生产工单
号
"
prop=
"workorderCode"
>
<el-input
v-model=
"form.workorderCode"
placeholder=
"请输入生产工单
号
"
/>
<el-form-item
label=
"生产工单"
prop=
"workorderCode"
>
<el-input
v-model=
"form.workorderCode"
placeholder=
"请输入生产工单"
/>
</el-form-item>
<el-form-item
label=
"刀模版领用单编码"
prop=
"toolRequestUseCode"
>
<el-input
v-model=
"form.toolRequestUseCode"
placeholder=
"请输入刀模版领用单编码"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment