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
mes
mes-ui
Commits
6f21924c
Commit
6f21924c
authored
Dec 26, 2024
by
tanjunxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 1.生产领料增加编排单号查询条件; 2.生产工单增加产品编码查询条件; 3.某些细节的优化
parent
f84b06ae
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
38 deletions
+46
-38
indexApply.vue
src/views/mes/pro/workorder/indexApply.vue
+9
-11
index.vue
src/views/mes/wm/issue/index.vue
+31
-22
line.vue
src/views/mes/wm/issue/line.vue
+6
-5
No files found.
src/views/mes/pro/workorder/indexApply.vue
View file @
6f21924c
...
@@ -23,19 +23,17 @@
...
@@ -23,19 +23,17 @@
<el-form-item
label=
"来源单据"
prop=
"sourceCode"
>
<el-form-item
label=
"来源单据"
prop=
"sourceCode"
>
<el-input
v-model=
"queryParams.sourceCode"
placeholder=
"请输入来源单据"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
<el-input
v-model=
"queryParams.sourceCode"
placeholder=
"请输入来源单据"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"产品名称"
prop=
"productName"
>
<!--
<el-form-item
label=
"产品编号"
prop=
"productCode"
>
<el-input
v-model=
"queryParams.productName"
placeholder=
"请输入产品名称"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"产品编号"
prop=
"productCode"
>
<el-input
<el-input
v-model=
"queryParams.productCode"
v-model=
"queryParams.productCode"
placeholder=
"请输入产品编号"
placeholder=
"请输入产品编号"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
</el-form-item>
-->
<el-form-item
label=
"产品名称"
prop=
"productName"
>
<el-input
v-model=
"queryParams.productName"
placeholder=
"请输入产品名称"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
<!--
<el-form-item
label=
"客户编码"
prop=
"clientCode"
>
<!--
<el-form-item
label=
"客户编码"
prop=
"clientCode"
>
<el-input
<el-input
v-model=
"queryParams.clientCode"
v-model=
"queryParams.clientCode"
...
@@ -119,6 +117,11 @@
...
@@ -119,6 +117,11 @@
v-hasPermi=
"['mes:pro:workorder:edit']"
>
导入
v-hasPermi=
"['mes:pro:workorder:edit']"
>
导入
</el-button>
</el-button>
</el-col>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"warning"
plain
icon=
"el-icon-plus"
size=
"mini"
:disabled=
"single"
@
click=
"handleTurnWorry"
>
转急单
</el-button>
</el-col>
<el-col
:span=
"1.5"
>
<el-col
:span=
"1.5"
>
<el-button
type=
"warning"
plain
icon=
"el-icon-plus"
size=
"mini"
:disabled=
"multiple"
@
click=
"handleToolNumCheck"
<el-button
type=
"warning"
plain
icon=
"el-icon-plus"
size=
"mini"
:disabled=
"multiple"
@
click=
"handleToolNumCheck"
v-hasPermi=
"['mes:pro:workorder:dofinish']"
>
刀模版具齐套检查
v-hasPermi=
"['mes:pro:workorder:dofinish']"
>
刀模版具齐套检查
...
@@ -129,11 +132,6 @@
...
@@ -129,11 +132,6 @@
v-hasPermi=
"['pro:combination:add']"
>
订单组合
v-hasPermi=
"['pro:combination:add']"
>
订单组合
</el-button>
</el-button>
</el-col>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"warning"
plain
icon=
"el-icon-plus"
size=
"mini"
:disabled=
"single"
@
click=
"handleTurnWorry"
>
转急单
</el-button>
</el-col>
<el-col
:span=
"1.5"
>
<el-col
:span=
"1.5"
>
<el-button
type=
"warning"
plain
icon=
"el-icon-edit"
size=
"mini"
@
click=
"()=>handleCombination('del')"
:disabled=
"combinationDisable"
<el-button
type=
"warning"
plain
icon=
"el-icon-edit"
size=
"mini"
@
click=
"()=>handleCombination('del')"
:disabled=
"combinationDisable"
>
取消组合
>
取消组合
...
...
src/views/mes/wm/issue/index.vue
View file @
6f21924c
...
@@ -17,6 +17,14 @@
...
@@ -17,6 +17,14 @@
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"编排单号"
prop=
"arrangeCode"
>
<el-input
v-model=
"queryParams.arrangeCode"
placeholder=
"请输入编排单号"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"创建时间"
>
<el-form-item
label=
"创建时间"
>
<el-date-picker
<el-date-picker
v-model=
"daterangePurchaseDate"
v-model=
"daterangePurchaseDate"
...
@@ -267,6 +275,7 @@ export default {
...
@@ -267,6 +275,7 @@ export default {
issueDate
:
null
,
issueDate
:
null
,
status
:
'PREPARE'
,
status
:
'PREPARE'
,
applyNo
:
null
,
applyNo
:
null
,
arrangeCode
:
null
,
},
},
// 表单参数
// 表单参数
form
:
{},
form
:
{},
...
...
src/views/mes/wm/issue/line.vue
View file @
6f21924c
...
@@ -46,6 +46,7 @@
...
@@ -46,6 +46,7 @@
<el-table-column
label=
"单位"
align=
"center"
prop=
"unitOfMeasure"
/>
<el-table-column
label=
"单位"
align=
"center"
prop=
"unitOfMeasure"
/>
<el-table-column
label=
"领料数量"
align=
"center"
prop=
"quantityIssued"
/>
<el-table-column
label=
"领料数量"
align=
"center"
prop=
"quantityIssued"
/>
<el-table-column
label=
"批次号"
align=
"center"
prop=
"batchCode"
/>
<el-table-column
label=
"批次号"
align=
"center"
prop=
"batchCode"
/>
<el-table-column
width=
"200"
label=
"PL号"
align=
"center"
prop=
"plNum"
/>
<el-table-column
label=
"仓库名称"
align=
"center"
prop=
"warehouseName"
/>
<el-table-column
label=
"仓库名称"
align=
"center"
prop=
"warehouseName"
/>
<el-table-column
label=
"备注"
align=
"center"
prop=
"remark"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"备注"
align=
"center"
prop=
"remark"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"操作"
align=
"center"
v-if=
"optType != 'view'"
width=
"100px"
class-name=
"small-padding fixed-width"
>
<el-table-column
label=
"操作"
align=
"center"
v-if=
"optType != 'view'"
width=
"100px"
class-name=
"small-padding fixed-width"
>
...
...
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