Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
pda-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
pda
pda-ui
Commits
46a9011d
Commit
46a9011d
authored
May 11, 2024
by
张海景
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update:修改生产工单的问题
parent
a686f53f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
14 deletions
+46
-14
WorkOrderSale.vue
src/views/mes/pro/workorder/components/WorkOrderSale.vue
+34
-4
WorkOrderSize.vue
src/views/mes/pro/workorder/components/WorkOrderSize.vue
+1
-1
indexApply.vue
src/views/mes/pro/workorder/indexApply.vue
+2
-3
proofingInfo.vue
src/views/mes/pro/workorder/proofingInfo.vue
+9
-6
No files found.
src/views/mes/pro/workorder/components/WorkOrderSale.vue
View file @
46a9011d
...
@@ -322,6 +322,36 @@
...
@@ -322,6 +322,36 @@
prop=
"salesVoucherItem"
prop=
"salesVoucherItem"
width=
"120"
width=
"120"
/>
/>
<el-table-column
label=
"包装数量"
align=
"center"
prop=
"packNum"
width=
"120"
/>
<el-table-column
label=
"包装类型"
align=
"center"
prop=
"packType"
width=
"120"
/>
<el-table-column
label=
"包装单位"
align=
"center"
prop=
"packUnitOfMeasure"
width=
"120"
/>
<el-table-column
label=
"LOSS数是否单独包装"
align=
"center"
prop=
"lossIndividuallyWrap"
width=
"150"
/>
<el-table-column
label=
"数量"
align=
"center"
prop=
"quantity"
width=
"120"
/>
<el-table-column
<el-table-column
label=
"客户编号"
label=
"客户编号"
align=
"center"
align=
"center"
...
@@ -340,12 +370,12 @@
...
@@ -340,12 +370,12 @@
prop=
"clientSizeUnit"
prop=
"clientSizeUnit"
width=
"120"
width=
"120"
/>
/>
<el-table-column
<
!--
<
el-table-column
label=
"指令号"
label=
"指令号"
align=
"center"
align=
"center"
prop=
"clientCmd"
prop=
"clientCmd"
width=
"120"
width=
"120"
/>
/>
-->
<el-table-column
<el-table-column
label=
"型体号"
label=
"型体号"
align=
"center"
align=
"center"
...
@@ -408,12 +438,12 @@
...
@@ -408,12 +438,12 @@
prop=
"signer"
prop=
"signer"
width=
"120"
width=
"120"
/>
/>
<el-table-column
<
!--
<
el-table-column
label=
"SHIP TO ID"
label=
"SHIP TO ID"
align=
"center"
align=
"center"
prop=
"shipToId"
prop=
"shipToId"
width=
"120"
width=
"120"
/>
/>
-->
<el-table-column
<el-table-column
label=
"产品规格"
label=
"产品规格"
align=
"center"
align=
"center"
...
...
src/views/mes/pro/workorder/components/WorkOrderSize.vue
View file @
46a9011d
...
@@ -410,7 +410,7 @@ export default {
...
@@ -410,7 +410,7 @@ export default {
{
prop
:
"salesId"
,
label
:
"销售订单号"
},
{
prop
:
"salesId"
,
label
:
"销售订单号"
},
{
prop
:
"salesItem"
,
label
:
"销售订单行项目"
},
{
prop
:
"salesItem"
,
label
:
"销售订单行项目"
},
{
prop
:
"clientCmd"
,
label
:
"销售订单指令号"
},
{
prop
:
"clientCmd"
,
label
:
"销售订单指令号"
},
{
prop
:
"
dispatchMultiple
"
,
label
:
"派工数"
},
{
prop
:
"
quantity
"
,
label
:
"派工数"
},
{
prop
:
"lossNum"
,
label
:
"Loss数"
},
{
prop
:
"lossNum"
,
label
:
"Loss数"
},
{
prop
:
"brandCode"
,
label
:
"品牌"
},
{
prop
:
"brandCode"
,
label
:
"品牌"
},
{
prop
:
"salePath"
,
label
:
"销线"
},
{
prop
:
"salePath"
,
label
:
"销线"
},
...
...
src/views/mes/pro/workorder/indexApply.vue
View file @
46a9011d
...
@@ -229,8 +229,7 @@
...
@@ -229,8 +229,7 @@
@
click=
"handleMake"
@
click=
"handleMake"
v-hasPermi=
"['mes:pro:workorder:make']"
v-hasPermi=
"['mes:pro:workorder:make']"
>
生产补单
>
生产补单
</el-button
</el-button>
>
</el-col>
</el-col>
<el-col
:span=
"1.5"
>
<el-col
:span=
"1.5"
>
...
@@ -474,7 +473,7 @@
...
@@ -474,7 +473,7 @@
<
el
-
table
-
column
<
el
-
table
-
column
label
=
"操作"
label
=
"操作"
width
=
"
15
0px"
width
=
"
22
0px"
align
=
"center"
align
=
"center"
fixed
=
"right"
fixed
=
"right"
class
-
name
=
"small-padding fixed-width"
class
-
name
=
"small-padding fixed-width"
...
...
src/views/mes/pro/workorder/proofingInfo.vue
View file @
46a9011d
...
@@ -216,7 +216,7 @@
...
@@ -216,7 +216,7 @@
<el-input
v-model=
"form.thickness"
:disabled=
"mode == 'make'"
placeholder=
"请输入厚度(丝)"
/>
<el-input
v-model=
"form.thickness"
:disabled=
"mode == 'make'"
placeholder=
"请输入厚度(丝)"
/>
</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="packNum">
<el-form-item label="包装数量" prop="packNum">
<el-input v-model="form.packNum" :disabled="mode == 'make'" placeholder="请输入包装数量" />
<el-input v-model="form.packNum" :disabled="mode == 'make'" placeholder="请输入包装数量" />
</el-form-item>
</el-form-item>
...
@@ -232,8 +232,8 @@
...
@@ -232,8 +232,8 @@
></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="packUnitOfMeasure">
<el-form-item label="包装单位" prop="packUnitOfMeasure">
<el-input
<el-input
v-model="form.packUnitOfMeasure"
v-model="form.packUnitOfMeasure"
...
@@ -260,7 +260,7 @@
...
@@ -260,7 +260,7 @@
></el-option>
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
-->
</el-row>
</el-row>
<el-row>
<el-row>
<el-col
:span=
"24"
>
<el-col
:span=
"24"
>
...
@@ -397,7 +397,7 @@ export default {
...
@@ -397,7 +397,7 @@ export default {
packUnitOfMeasure
:
null
,
packUnitOfMeasure
:
null
,
lossIndividuallyWrap
:
null
,
lossIndividuallyWrap
:
null
,
packNum
:
null
,
packNum
:
null
,
productionSolutionId
:
null
,
productionSolutionId
:
null
,
productionSolutionCode
:
null
,
productionSolutionCode
:
null
,
productionSolutionName
:
null
,
productionSolutionName
:
null
,
},
},
...
@@ -626,11 +626,14 @@ export default {
...
@@ -626,11 +626,14 @@ export default {
// }
// }
// },
// },
//物料选择弹出框
//物料选择弹出框
onRoutesProcessSelect
(
row
)
{
onRoutesProcessSelect
(
row
)
{
console
.
log
(
row
,
'rows444'
)
if
(
row
!=
undefined
&&
row
!=
null
)
{
if
(
row
!=
undefined
&&
row
!=
null
)
{
this
.
form
.
productionSolutionId
=
row
.
productionSolutionId
;
this
.
form
.
productionSolutionId
=
row
.
productionSolutionId
;
this
.
form
.
productionSolutionCode
=
row
.
productionSolutionCode
;
this
.
form
.
productionSolutionCode
=
row
.
productionSolutionCode
;
this
.
form
.
productCode
=
row
.
itemCode
;
this
.
form
.
productName
=
row
.
itemName
;
const
params
=
{
const
params
=
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
1000
,
pageSize
:
1000
,
...
...
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