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
7d89ae4e
Commit
7d89ae4e
authored
Apr 23, 2024
by
张海景
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update:修改工作站改成工作中心
parent
06044a4f
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
126 additions
and
126 deletions
+126
-126
workstation.js
src/api/mes/md/workstation.js
+5
-5
taskSelectSingle.vue
src/components/TaskSelect/taskSelectSingle.vue
+5
-5
simpletableSingle.vue
src/components/workstationSelect/simpletableSingle.vue
+8
-8
single.vue
src/components/workunitSelect/single.vue
+3
-3
ProogingProcess.vue
...iews/mes/dv/brandquotation/components/ProogingProcess.vue
+4
-4
tool.vue
src/views/mes/md/workstation/components/tool.vue
+1
-1
worker.vue
src/views/mes/md/workstation/components/worker.vue
+1
-1
index.vue
src/views/mes/md/workstation/index.vue
+7
-7
index.vue
src/views/mes/md/workunit/index.vue
+4
-4
index.vue
src/views/mes/pro/feedback/index.vue
+3
-3
ProogingProcess.vue
...ews/mes/pro/productionMake/components/ProogingProcess.vue
+4
-4
ProogingProcess.vue
...mes/pro/productionSolution/components/ProogingProcess.vue
+4
-4
ProogingProcess.vue
...s/mes/pro/productiorequest/components/ProogingProcess.vue
+4
-4
routeprocess.vue
src/views/mes/pro/proroute/routeprocess.vue
+5
-5
ProogingProcess.vue
...iews/mes/pro/prototypeMake/components/ProogingProcess.vue
+4
-4
ganttx.vue
src/views/mes/pro/schedule/ganttx.vue
+1
-1
index.vue
src/views/mes/pro/schedule/index.vue
+4
-4
proTask.vue
src/views/mes/pro/schedule/proTask.vue
+5
-5
ProogingProcess.vue
src/views/mes/pro/workorder/components/ProogingProcess.vue
+4
-4
ProogingProcess.vue
src/views/mes/proofing/components/ProogingProcess.vue
+4
-4
index.vue
src/views/mes/qc/ipqc/index.vue
+4
-4
iqc.vue
src/views/mes/qc/pendinginspect/iqc.vue
+1
-1
pqc.vue
src/views/mes/qc/pendinginspect/pqc.vue
+4
-4
index.vue
src/views/mes/wm/barcode/index.vue
+6
-6
index.vue
src/views/mes/wm/issue/index.vue
+1
-1
index.vue
src/views/mes/wm/itemconsume/index.vue
+15
-15
index.vue
src/views/mes/wm/productproduce/index.vue
+15
-15
No files found.
src/api/mes/md/workstation.js
View file @
7d89ae4e
import
request
from
'@/utils/request'
import
request
from
'@/utils/request'
// 查询工作
站
列表
// 查询工作
中心
列表
export
function
listWorkstation
(
query
)
{
export
function
listWorkstation
(
query
)
{
return
request
({
return
request
({
url
:
'/mes/md/workstation/list'
,
url
:
'/mes/md/workstation/list'
,
...
@@ -9,7 +9,7 @@ export function listWorkstation(query) {
...
@@ -9,7 +9,7 @@ export function listWorkstation(query) {
})
})
}
}
// 查询工作
站
详细
// 查询工作
中心
详细
export
function
getWorkstation
(
workstationId
)
{
export
function
getWorkstation
(
workstationId
)
{
return
request
({
return
request
({
url
:
'/mes/md/workstation/'
+
workstationId
,
url
:
'/mes/md/workstation/'
+
workstationId
,
...
@@ -17,7 +17,7 @@ export function getWorkstation(workstationId) {
...
@@ -17,7 +17,7 @@ export function getWorkstation(workstationId) {
})
})
}
}
// 新增工作
站
// 新增工作
中心
export
function
addWorkstation
(
data
)
{
export
function
addWorkstation
(
data
)
{
return
request
({
return
request
({
url
:
'/mes/md/workstation'
,
url
:
'/mes/md/workstation'
,
...
@@ -26,7 +26,7 @@ export function addWorkstation(data) {
...
@@ -26,7 +26,7 @@ export function addWorkstation(data) {
})
})
}
}
// 修改工作
站
// 修改工作
中心
export
function
updateWorkstation
(
data
)
{
export
function
updateWorkstation
(
data
)
{
return
request
({
return
request
({
url
:
'/mes/md/workstation'
,
url
:
'/mes/md/workstation'
,
...
@@ -35,7 +35,7 @@ export function updateWorkstation(data) {
...
@@ -35,7 +35,7 @@ export function updateWorkstation(data) {
})
})
}
}
// 删除工作
站
// 删除工作
中心
export
function
delWorkstation
(
workstationId
)
{
export
function
delWorkstation
(
workstationId
)
{
return
request
({
return
request
({
url
:
'/mes/md/workstation/'
+
workstationId
,
url
:
'/mes/md/workstation/'
+
workstationId
,
...
...
src/components/TaskSelect/taskSelectSingle.vue
View file @
7d89ae4e
...
@@ -17,10 +17,10 @@
...
@@ -17,10 +17,10 @@
></el-option>
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"所属工作
站
"
prop=
"workstationCode"
>
<el-form-item
label=
"所属工作
中心
"
prop=
"workstationCode"
>
<el-input
<el-input
v-model=
"queryParams.workstationCode"
v-model=
"queryParams.workstationCode"
placeholder=
"请输入工作
站
编号"
placeholder=
"请输入工作
中心
编号"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
...
@@ -47,8 +47,8 @@
...
@@ -47,8 +47,8 @@
</el-table-column>
</el-table-column>
<el-table-column
label=
"任务编号"
align=
"center"
width=
"150px"
prop=
"taskCode"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"任务编号"
align=
"center"
width=
"150px"
prop=
"taskCode"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"任务名称"
align=
"center"
width=
"250px"
prop=
"taskName"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"任务名称"
align=
"center"
width=
"250px"
prop=
"taskName"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"工作
站
编号"
align=
"center"
width=
"150px"
prop=
"workstationCode"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"工作
中心
编号"
align=
"center"
width=
"150px"
prop=
"workstationCode"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"工作
站
名称"
align=
"center"
width=
"150px"
prop=
"workstationName"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"工作
中心
名称"
align=
"center"
width=
"150px"
prop=
"workstationName"
: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"
width=
"100px"
prop=
"quantityProduced"
/>
<el-table-column
label=
"已生产数量"
align=
"center"
width=
"100px"
prop=
"quantityProduced"
/>
<el-table-column
label=
"开始生产时间"
align=
"center"
prop=
"startTime"
width=
"180"
>
<el-table-column
label=
"开始生产时间"
align=
"center"
prop=
"startTime"
width=
"180"
>
...
@@ -183,7 +183,7 @@
...
@@ -183,7 +183,7 @@
// 表单校验
// 表单校验
rules
:
{
rules
:
{
workstationId
:
[
workstationId
:
[
{
required
:
true
,
message
:
"工作
站
不能为空"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"工作
中心
不能为空"
,
trigger
:
"blur"
}
],
],
quantity
:
[
quantity
:
[
{
required
:
true
,
message
:
"排产数量不能为空"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"排产数量不能为空"
,
trigger
:
"blur"
}
...
...
src/components/workstationSelect/simpletableSingle.vue
View file @
7d89ae4e
<
template
>
<
template
>
<el-dialog
<el-dialog
title=
"工作
站
选择"
title=
"工作
中心
选择"
v-if=
"showFlag"
v-if=
"showFlag"
:visible
.
sync=
"showFlag"
:visible
.
sync=
"showFlag"
:modal=
"false"
:modal=
"false"
...
@@ -18,13 +18,13 @@
...
@@ -18,13 +18,13 @@
<el-row>
<el-row>
<el-col
:span=
"7"
>
<el-col
:span=
"7"
>
<el-form-item
<el-form-item
label=
"工作
站
编号"
label=
"工作
中心
编号"
label-width=
"120"
label-width=
"120"
prop=
"workstationCode"
prop=
"workstationCode"
>
>
<el-input
<el-input
v-model=
"queryParams.workstationCode"
v-model=
"queryParams.workstationCode"
placeholder=
"请输入工作
站
编号"
placeholder=
"请输入工作
中心
编号"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
...
@@ -93,15 +93,15 @@
...
@@ -93,15 +93,15 @@
>
>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"工作
站
编号"
align=
"center"
prop=
"workstationCode"
>
<el-table-column
label=
"工作
中心
编号"
align=
"center"
prop=
"workstationCode"
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
label=
"工作
站
名称"
label=
"工作
中心
名称"
align=
"center"
align=
"center"
prop=
"workstationName"
prop=
"workstationName"
/>
/>
<el-table-column
<el-table-column
label=
"工作
站
地点"
label=
"工作
中心
地点"
align=
"center"
align=
"center"
prop=
"workstationAddress"
prop=
"workstationAddress"
/>
/>
...
@@ -159,7 +159,7 @@ export default {
...
@@ -159,7 +159,7 @@ export default {
showSearch
:
true
,
showSearch
:
true
,
// 总条数
// 总条数
total
:
0
,
total
:
0
,
// 工作
站
表格数据
// 工作
中心
表格数据
workstationList
:
[],
workstationList
:
[],
//车间选项
//车间选项
workshopOptions
:
[],
workshopOptions
:
[],
...
@@ -210,7 +210,7 @@ export default {
...
@@ -210,7 +210,7 @@ export default {
},
},
},
},
methods
:
{
methods
:
{
/** 查询工作
站
列表 */
/** 查询工作
中心
列表 */
getList
()
{
getList
()
{
this
.
loading
=
true
;
this
.
loading
=
true
;
listWorkstation
(
this
.
queryParams
).
then
((
response
)
=>
{
listWorkstation
(
this
.
queryParams
).
then
((
response
)
=>
{
...
...
src/components/workunitSelect/single.vue
View file @
7d89ae4e
...
@@ -30,10 +30,10 @@
...
@@ -30,10 +30,10 @@
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"工作
站
"
prop=
"workstationName"
>
<el-form-item
label=
"工作
中心
"
prop=
"workstationName"
>
<el-input
<el-input
v-model=
"queryParams.workstationName"
v-model=
"queryParams.workstationName"
placeholder=
"请输入工作
站
名称"
placeholder=
"请输入工作
中心
名称"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
...
@@ -68,7 +68,7 @@
...
@@ -68,7 +68,7 @@
>
>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"工作
站
名称"
width=
"180"
prop=
"workstationName"
/>
<el-table-column
label=
"工作
中心
名称"
width=
"180"
prop=
"workstationName"
/>
<el-table-column
<el-table-column
label=
"工作单元编码"
label=
"工作单元编码"
width=
"200"
width=
"200"
...
...
src/views/mes/dv/brandquotation/components/ProogingProcess.vue
View file @
7d89ae4e
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
prop=
"linkType"
prop=
"linkType"
align=
"center"
align=
"center"
/>
/>
<el-table-column
label=
"工作
站
"
prop=
"workstationName"
align=
"center"
/>
<el-table-column
label=
"工作
中心
"
prop=
"workstationName"
align=
"center"
/>
<el-table-column
label=
"标准工时"
prop=
"stdWorkingTime"
align=
"center"
/>
<el-table-column
label=
"标准工时"
prop=
"stdWorkingTime"
align=
"center"
/>
<el-table-column
label=
"甘特图显示颜色"
prop=
"colorCode"
align=
"center"
/>
<el-table-column
label=
"甘特图显示颜色"
prop=
"colorCode"
align=
"center"
/>
<el-table-column
<el-table-column
...
@@ -82,11 +82,11 @@
...
@@ -82,11 +82,11 @@
>
>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"工作
站
"
prop=
"workstationName"
>
<el-form-item
label=
"工作
中心
"
prop=
"workstationName"
>
<el-input
<el-input
v-model=
"form.workstationName"
v-model=
"form.workstationName"
disabled
disabled
placeholder=
"请选择工作
站
信息"
placeholder=
"请选择工作
中心
信息"
>
>
<el-button
<el-button
slot=
"append"
slot=
"append"
...
@@ -222,7 +222,7 @@ export default {
...
@@ -222,7 +222,7 @@ export default {
this
.
resetForm
();
this
.
resetForm
();
this
.
tableData
=
[];
this
.
tableData
=
[];
},
},
// 查询工作
站
信息
// 查询工作
中心
信息
handleWorkstationSelect
()
{
handleWorkstationSelect
()
{
this
.
$refs
.
WorkstationSelect
.
showFlag
=
true
;
this
.
$refs
.
WorkstationSelect
.
showFlag
=
true
;
},
},
...
...
src/views/mes/md/workstation/components/tool.vue
View file @
7d89ae4e
...
@@ -90,7 +90,7 @@ export default {
...
@@ -90,7 +90,7 @@ export default {
// 表单校验
// 表单校验
rules
:
{
rules
:
{
workstationId
:
[
workstationId
:
[
{
required
:
true
,
message
:
"工作
站
ID不能为空"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"工作
中心
ID不能为空"
,
trigger
:
"blur"
}
],
],
toolTypeId
:
[
toolTypeId
:
[
{
required
:
true
,
message
:
"工装夹具类型ID不能为空"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"工装夹具类型ID不能为空"
,
trigger
:
"blur"
}
...
...
src/views/mes/md/workstation/components/worker.vue
View file @
7d89ae4e
...
@@ -110,7 +110,7 @@ export default {
...
@@ -110,7 +110,7 @@ export default {
// 表单校验
// 表单校验
rules
:
{
rules
:
{
workstationId
:
[
workstationId
:
[
{
required
:
true
,
message
:
"工作
站
ID不能为空"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"工作
中心
ID不能为空"
,
trigger
:
"blur"
}
],
],
postId
:
[
postId
:
[
{
required
:
true
,
message
:
"岗位ID不能为空"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"岗位ID不能为空"
,
trigger
:
"blur"
}
...
...
src/views/mes/md/workstation/index.vue
View file @
7d89ae4e
...
@@ -590,7 +590,7 @@ export default {
...
@@ -590,7 +590,7 @@ export default {
showSearch
:
true
,
showSearch
:
true
,
// 总条数
// 总条数
total
:
0
,
total
:
0
,
// 工作
站
表格数据
// 工作
中心
表格数据
workstationList
:
[],
workstationList
:
[],
//车间选项
//车间选项
workshopOptions
:
[],
workshopOptions
:
[],
...
@@ -620,10 +620,10 @@ export default {
...
@@ -620,10 +620,10 @@ export default {
// 表单校验
// 表单校验
rules
:
{
rules
:
{
workstationCode
:
[
workstationCode
:
[
{
required
:
true
,
message
:
"工作
站
编号不能为空"
,
trigger
:
"blur"
},
{
required
:
true
,
message
:
"工作
中心
编号不能为空"
,
trigger
:
"blur"
},
],
],
workstationName
:
[
workstationName
:
[
{
required
:
true
,
message
:
"工作
站
名称不能为空"
,
trigger
:
"blur"
},
{
required
:
true
,
message
:
"工作
中心
名称不能为空"
,
trigger
:
"blur"
},
],
],
enableFlag
:
[
enableFlag
:
[
{
required
:
true
,
message
:
"是否启用不能为空"
,
trigger
:
"blur"
},
{
required
:
true
,
message
:
"是否启用不能为空"
,
trigger
:
"blur"
},
...
@@ -654,7 +654,7 @@ export default {
...
@@ -654,7 +654,7 @@ export default {
}
}
console
.
log
(
value
,
this
.
form
)
console
.
log
(
value
,
this
.
form
)
},
},
/** 查询工作
站
列表 */
/** 查询工作
中心
列表 */
getList
()
{
getList
()
{
this
.
loading
=
true
;
this
.
loading
=
true
;
listWorkstation
(
this
.
queryParams
).
then
((
response
)
=>
{
listWorkstation
(
this
.
queryParams
).
then
((
response
)
=>
{
...
@@ -792,7 +792,7 @@ export default {
...
@@ -792,7 +792,7 @@ export default {
this
.
handleAutoGenChange
(
true
);
this
.
handleAutoGenChange
(
true
);
this
.
getWorkshops
();
this
.
getWorkshops
();
this
.
open
=
true
;
this
.
open
=
true
;
this
.
title
=
"添加工作
站
"
;
this
.
title
=
"添加工作
中心
"
;
this
.
optType
=
"add"
;
this
.
optType
=
"add"
;
},
},
// 查询明细按钮操作
// 查询明细按钮操作
...
@@ -815,7 +815,7 @@ export default {
...
@@ -815,7 +815,7 @@ export default {
getWorkstation
(
workstationId
).
then
((
response
)
=>
{
getWorkstation
(
workstationId
).
then
((
response
)
=>
{
this
.
form
=
response
.
data
;
this
.
form
=
response
.
data
;
this
.
open
=
true
;
this
.
open
=
true
;
this
.
title
=
"修改工作
站
"
;
this
.
title
=
"修改工作
中心
"
;
this
.
optType
=
"edit"
;
this
.
optType
=
"edit"
;
});
});
},
},
...
@@ -843,7 +843,7 @@ export default {
...
@@ -843,7 +843,7 @@ export default {
handleDelete
(
row
)
{
handleDelete
(
row
)
{
const
workstationIds
=
row
.
workstationId
||
this
.
ids
;
const
workstationIds
=
row
.
workstationId
||
this
.
ids
;
this
.
$modal
this
.
$modal
.
confirm
(
"是否确认删除工作
站
?"
)
.
confirm
(
"是否确认删除工作
中心
?"
)
.
then
(
function
()
{
.
then
(
function
()
{
return
delWorkstation
(
workstationIds
);
return
delWorkstation
(
workstationIds
);
})
})
...
...
src/views/mes/md/workunit/index.vue
View file @
7d89ae4e
...
@@ -90,7 +90,7 @@
...
@@ -90,7 +90,7 @@
>
{{
scope
.
row
.
workunitCode
}}
</el-button>
>
{{
scope
.
row
.
workunitCode
}}
</el-button>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"工作
站
"
align=
"center"
prop=
"workstationName"
/>
<el-table-column
label=
"工作
中心
"
align=
"center"
prop=
"workstationName"
/>
<el-table-column
label=
"工作单元名称"
align=
"center"
prop=
"workunitName"
/>
<el-table-column
label=
"工作单元名称"
align=
"center"
prop=
"workunitName"
/>
<el-table-column
label=
"是否启用"
align=
"center"
prop=
"enableFlag"
>
<el-table-column
label=
"是否启用"
align=
"center"
prop=
"enableFlag"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
...
@@ -136,8 +136,8 @@
...
@@ -136,8 +136,8 @@
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"80px"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"80px"
>
<el-row>
<el-row>
<el-col
:span=
"20"
>
<el-col
:span=
"20"
>
<el-form-item
label=
"工作
站
"
label-width=
"120px"
prop=
"workstationName"
>
<el-form-item
label=
"工作
中心
"
label-width=
"120px"
prop=
"workstationName"
>
<el-input
v-model=
"form.workstationName"
placeholder=
"请输入工作
站
"
>
<el-input
v-model=
"form.workstationName"
placeholder=
"请输入工作
中心
"
>
<el-button
slot=
"append"
icon=
"el-icon-search"
@
click=
"handleWorkstationSelect"
></el-button>
<el-button
slot=
"append"
icon=
"el-icon-search"
@
click=
"handleWorkstationSelect"
></el-button>
</el-input>
</el-input>
<WorkstationSelect
ref=
"workstationSelect"
@
onSelected=
"onWorkstationSelected"
>
</WorkstationSelect>
<WorkstationSelect
ref=
"workstationSelect"
@
onSelected=
"onWorkstationSelected"
>
</WorkstationSelect>
...
@@ -270,7 +270,7 @@ export default {
...
@@ -270,7 +270,7 @@ export default {
// 表单校验
// 表单校验
rules
:
{
rules
:
{
workstationName
:
[
workstationName
:
[
{
required
:
true
,
message
:
"工作
站
不能为空"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"工作
中心
不能为空"
,
trigger
:
"blur"
}
],
],
workunitName
:
[
workunitName
:
[
{
required
:
true
,
message
:
"工作单元名称不能为空"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"工作单元名称不能为空"
,
trigger
:
"blur"
}
...
...
src/views/mes/pro/feedback/index.vue
View file @
7d89ae4e
...
@@ -11,10 +11,10 @@
...
@@ -11,10 +11,10 @@
/>
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"工作
站
名称"
prop=
"workstationName"
>
<el-form-item
label=
"工作
中心
名称"
prop=
"workstationName"
>
<el-input
<el-input
v-model=
"queryParams.workstationName"
v-model=
"queryParams.workstationName"
placeholder=
"请输入工作
站
名称"
placeholder=
"请输入工作
中心
名称"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
...
@@ -124,7 +124,7 @@
...
@@ -124,7 +124,7 @@
<dict-tag
:options=
"dict.type.mes_feedback_type"
:value=
"scope.row.feedbackType"
/>
<dict-tag
:options=
"dict.type.mes_feedback_type"
:value=
"scope.row.feedbackType"
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"工作
站
"
width=
"120"
align=
"center"
prop=
"workstationName"
/>
<el-table-column
label=
"工作
中心
"
width=
"120"
align=
"center"
prop=
"workstationName"
/>
<el-table-column
label=
"工作单元"
width=
"120"
align=
"center"
prop=
"workunitName"
/>
<el-table-column
label=
"工作单元"
width=
"120"
align=
"center"
prop=
"workunitName"
/>
<el-table-column
label=
"外协单号"
width=
"150"
align=
"center"
prop=
"assistProcessCode"
/>
<el-table-column
label=
"外协单号"
width=
"150"
align=
"center"
prop=
"assistProcessCode"
/>
<el-table-column
label=
"生产工单编号"
width=
"150"
align=
"center"
prop=
"workorderCode"
/>
<el-table-column
label=
"生产工单编号"
width=
"150"
align=
"center"
prop=
"workorderCode"
/>
...
...
src/views/mes/pro/productionMake/components/ProogingProcess.vue
View file @
7d89ae4e
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
prop=
"linkType"
prop=
"linkType"
align=
"center"
align=
"center"
/>
/>
<el-table-column
label=
"工作
站
"
prop=
"workstationName"
align=
"center"
/>
<el-table-column
label=
"工作
中心
"
prop=
"workstationName"
align=
"center"
/>
<el-table-column
label=
"标准工时"
prop=
"stdWorkingTime"
align=
"center"
/>
<el-table-column
label=
"标准工时"
prop=
"stdWorkingTime"
align=
"center"
/>
<el-table-column
label=
"甘特图显示颜色"
prop=
"colorCode"
align=
"center"
/>
<el-table-column
label=
"甘特图显示颜色"
prop=
"colorCode"
align=
"center"
/>
<el-table-column
<el-table-column
...
@@ -84,11 +84,11 @@
...
@@ -84,11 +84,11 @@
>
>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"工作
站
"
prop=
"workstationId"
>
<el-form-item
label=
"工作
中心
"
prop=
"workstationId"
>
<el-input
<el-input
v-model=
"form.workstationName"
v-model=
"form.workstationName"
disabled
disabled
placeholder=
"请选择工作
站
信息"
placeholder=
"请选择工作
中心
信息"
>
>
<el-button
<el-button
slot=
"append"
slot=
"append"
...
@@ -223,7 +223,7 @@ export default {
...
@@ -223,7 +223,7 @@ export default {
this
.
resetForm
();
this
.
resetForm
();
this
.
tableData
=
[];
this
.
tableData
=
[];
},
},
// 查询工作
站
信息
// 查询工作
中心
信息
handleWorkstationSelect
()
{
handleWorkstationSelect
()
{
this
.
$refs
.
WorkstationSelect
.
showFlag
=
true
;
this
.
$refs
.
WorkstationSelect
.
showFlag
=
true
;
},
},
...
...
src/views/mes/pro/productionSolution/components/ProogingProcess.vue
View file @
7d89ae4e
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<el-table
:data=
"tableData"
>
<el-table
:data=
"tableData"
>
<el-table-column
label=
"序号"
prop=
"idx"
align=
"center"
/>
<el-table-column
label=
"序号"
prop=
"idx"
align=
"center"
/>
<el-table-column
label=
"工序名称"
prop=
"processName"
align=
"center"
/>
<el-table-column
label=
"工序名称"
prop=
"processName"
align=
"center"
/>
<el-table-column
label=
"工作
站
"
prop=
"workstationName"
align=
"center"
/>
<el-table-column
label=
"工作
中心
"
prop=
"workstationName"
align=
"center"
/>
<el-table-column
label=
"标准工时"
prop=
"stdWorkingTime"
align=
"center"
/>
<el-table-column
label=
"标准工时"
prop=
"stdWorkingTime"
align=
"center"
/>
<el-table-column
label=
"换行时间"
prop=
"lineBreakTime"
align=
"center"
/>
<el-table-column
label=
"换行时间"
prop=
"lineBreakTime"
align=
"center"
/>
<el-table-column
<el-table-column
...
@@ -123,11 +123,11 @@
...
@@ -123,11 +123,11 @@
>
>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"工作
站
"
prop=
"workstationId"
>
<el-form-item
label=
"工作
中心
"
prop=
"workstationId"
>
<el-input
<el-input
v-model=
"form.workstationName"
v-model=
"form.workstationName"
disabled
disabled
placeholder=
"请选择工作
站
信息"
placeholder=
"请选择工作
中心
信息"
>
>
<el-button
<el-button
slot=
"append"
slot=
"append"
...
@@ -504,7 +504,7 @@ export default {
...
@@ -504,7 +504,7 @@ export default {
this
.
resetForm
();
this
.
resetForm
();
this
.
tableData
=
[];
this
.
tableData
=
[];
},
},
// 查询工作
站
信息
// 查询工作
中心
信息
handleWorkstationSelect
()
{
handleWorkstationSelect
()
{
this
.
$refs
.
WorkstationSelect
.
showFlag
=
true
;
this
.
$refs
.
WorkstationSelect
.
showFlag
=
true
;
},
},
...
...
src/views/mes/pro/productiorequest/components/ProogingProcess.vue
View file @
7d89ae4e
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
prop=
"linkType"
prop=
"linkType"
align=
"center"
align=
"center"
/>
/>
<el-table-column
label=
"工作
站
"
prop=
"workstationName"
align=
"center"
/>
<el-table-column
label=
"工作
中心
"
prop=
"workstationName"
align=
"center"
/>
<el-table-column
label=
"标准工时"
prop=
"stdWorkingTime"
align=
"center"
/>
<el-table-column
label=
"标准工时"
prop=
"stdWorkingTime"
align=
"center"
/>
<el-table-column
label=
"甘特图显示颜色"
prop=
"colorCode"
align=
"center"
/>
<el-table-column
label=
"甘特图显示颜色"
prop=
"colorCode"
align=
"center"
/>
<el-table-column
<el-table-column
...
@@ -82,11 +82,11 @@
...
@@ -82,11 +82,11 @@
>
>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"工作
站
"
prop=
"workstationName"
>
<el-form-item
label=
"工作
中心
"
prop=
"workstationName"
>
<el-input
<el-input
v-model=
"form.workstationName"
v-model=
"form.workstationName"
disabled
disabled
placeholder=
"请选择工作
站
信息"
placeholder=
"请选择工作
中心
信息"
>
>
<el-button
<el-button
slot=
"append"
slot=
"append"
...
@@ -221,7 +221,7 @@ export default {
...
@@ -221,7 +221,7 @@ export default {
this
.
resetForm
();
this
.
resetForm
();
this
.
tableData
=
[];
this
.
tableData
=
[];
},
},
// 查询工作
站
信息
// 查询工作
中心
信息
handleWorkstationSelect
()
{
handleWorkstationSelect
()
{
this
.
$refs
.
WorkstationSelect
.
showFlag
=
true
;
this
.
$refs
.
WorkstationSelect
.
showFlag
=
true
;
},
},
...
...
src/views/mes/pro/proroute/routeprocess.vue
View file @
7d89ae4e
...
@@ -187,11 +187,11 @@
...
@@ -187,11 +187,11 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"工作
站
"
prop=
"workstationId"
>
<el-form-item
label=
"工作
中心
"
prop=
"workstationId"
>
<el-input
<el-input
v-model=
"form.workstationName"
v-model=
"form.workstationName"
disabled
disabled
placeholder=
"请选择工作
站
信息"
placeholder=
"请选择工作
中心
信息"
>
>
<el-button
<el-button
slot=
"append"
slot=
"append"
...
@@ -291,7 +291,7 @@ export default {
...
@@ -291,7 +291,7 @@ export default {
{
required
:
true
,
message
:
"请指定当前工序是否需要质检确认"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"请指定当前工序是否需要质检确认"
,
trigger
:
"blur"
}
],
],
workstationId
:
[
workstationId
:
[
{
required
:
true
,
message
:
"请选择工作
站
"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"请选择工作
中心
"
,
trigger
:
"blur"
}
]
]
}
}
};
};
...
@@ -322,7 +322,7 @@ export default {
...
@@ -322,7 +322,7 @@ export default {
console
.
log
(
this
.
processOptions
.
processId
)
console
.
log
(
this
.
processOptions
.
processId
)
});
});
},
},
// 查询工作
站
信息
// 查询工作
中心
信息
handleWorkstationSelect
()
{
handleWorkstationSelect
()
{
this
.
$refs
.
WorkstationSelect
.
showFlag
=
true
;
this
.
$refs
.
WorkstationSelect
.
showFlag
=
true
;
},
},
...
@@ -426,7 +426,7 @@ export default {
...
@@ -426,7 +426,7 @@ export default {
this
.
form
.
stdWorkingTime
=
''
this
.
form
.
stdWorkingTime
=
''
// watch:{
// watch:{
// processId(newValue){
// processId(newValue){
// alert("工序发生改变,请重新选择工作
站
");
// alert("工序发生改变,请重新选择工作
中心
");
// this.form={
// this.form={
// workstationId : null,
// workstationId : null,
// workstationName: null,
// workstationName: null,
...
...
src/views/mes/pro/prototypeMake/components/ProogingProcess.vue
View file @
7d89ae4e
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
prop=
"linkType"
prop=
"linkType"
align=
"center"
align=
"center"
/>
/>
<el-table-column
label=
"工作
站
"
prop=
"workstationName"
align=
"center"
/>
<el-table-column
label=
"工作
中心
"
prop=
"workstationName"
align=
"center"
/>
<el-table-column
label=
"标准工时"
prop=
"stdWorkingTime"
align=
"center"
/>
<el-table-column
label=
"标准工时"
prop=
"stdWorkingTime"
align=
"center"
/>
<el-table-column
label=
"甘特图显示颜色"
prop=
"colorCode"
align=
"center"
/>
<el-table-column
label=
"甘特图显示颜色"
prop=
"colorCode"
align=
"center"
/>
<el-table-column
<el-table-column
...
@@ -82,11 +82,11 @@
...
@@ -82,11 +82,11 @@
>
>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"工作
站
"
prop=
"workstationId"
>
<el-form-item
label=
"工作
中心
"
prop=
"workstationId"
>
<el-input
<el-input
v-model=
"form.workstationName"
v-model=
"form.workstationName"
disabled
disabled
placeholder=
"请选择工作
站
信息"
placeholder=
"请选择工作
中心
信息"
>
>
<el-button
<el-button
slot=
"append"
slot=
"append"
...
@@ -221,7 +221,7 @@ export default {
...
@@ -221,7 +221,7 @@ export default {
this
.
resetForm
();
this
.
resetForm
();
this
.
tableData
=
[];
this
.
tableData
=
[];
},
},
// 查询工作
站
信息
// 查询工作
中心
信息
handleWorkstationSelect
()
{
handleWorkstationSelect
()
{
this
.
$refs
.
WorkstationSelect
.
showFlag
=
true
;
this
.
$refs
.
WorkstationSelect
.
showFlag
=
true
;
},
},
...
...
src/views/mes/pro/schedule/ganttx.vue
View file @
7d89ae4e
...
@@ -83,7 +83,7 @@ export default {
...
@@ -83,7 +83,7 @@ export default {
gantt
.
config
.
grid_width
=
520
;
gantt
.
config
.
grid_width
=
520
;
gantt
.
config
.
columns
=
[
gantt
.
config
.
columns
=
[
{
name
:
"text"
,
label
:
"任务名"
,
tree
:
true
,
width
:
"200"
},
{
name
:
"text"
,
label
:
"任务名"
,
tree
:
true
,
width
:
"200"
},
{
name
:
"workstation"
,
label
:
"工作
站
"
,
align
:
"center"
,
width
:
"*"
},
{
name
:
"workstation"
,
label
:
"工作
中心
"
,
align
:
"center"
,
width
:
"*"
},
{
name
:
"process"
,
label
:
"工序"
,
align
:
"center"
,
width
:
"*"
},
{
name
:
"process"
,
label
:
"工序"
,
align
:
"center"
,
width
:
"*"
},
{
name
:
"start_date"
,
label
:
"开始时间"
,
align
:
"center"
,
width
:
"*"
},
{
name
:
"start_date"
,
label
:
"开始时间"
,
align
:
"center"
,
width
:
"*"
},
{
name
:
"end_date"
,
label
:
"结束时间"
,
align
:
"center"
,
width
:
"*"
},
{
name
:
"end_date"
,
label
:
"结束时间"
,
align
:
"center"
,
width
:
"*"
},
...
...
src/views/mes/pro/schedule/index.vue
View file @
7d89ae4e
...
@@ -33,12 +33,12 @@
...
@@ -33,12 +33,12 @@
<el-form-item
prop=
"workstationName"
>
<el-form-item
prop=
"workstationName"
>
<el-input
<el-input
v-model=
"queryParams.workstationName"
v-model=
"queryParams.workstationName"
placeholder=
"请输入工作
站
名称"
placeholder=
"请输入工作
中心
名称"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
<
template
slot=
"label"
>
<
template
slot=
"label"
>
<TipLabel
title=
"工作
站"
tip=
"工作站
名称"
/>
<TipLabel
title=
"工作
中心"
tip=
"工作中心
名称"
/>
</
template
>
</
template
>
</el-form-item>
</el-form-item>
...
@@ -149,7 +149,7 @@
...
@@ -149,7 +149,7 @@
:show-overflow-tooltip=
"true"
:show-overflow-tooltip=
"true"
/>
/>
<el-table-column
<el-table-column
label=
"工作
站
名称"
label=
"工作
中心
名称"
align=
"center"
align=
"center"
prop=
"workstationName"
prop=
"workstationName"
width=
"180"
width=
"180"
...
@@ -315,7 +315,7 @@
...
@@ -315,7 +315,7 @@
<
/el-form-item
>
<
/el-form-item
>
<
/el-col
>
<
/el-col
>
<
el
-
col
:
lg
=
"8"
:
md
=
"8"
:
sm
=
"12"
:
xs
=
"12"
>
<
el
-
col
:
lg
=
"8"
:
md
=
"8"
:
sm
=
"12"
:
xs
=
"12"
>
<
el
-
form
-
item
label
=
"工作
站
"
prop
=
"workstationName"
>
<
el
-
form
-
item
label
=
"工作
中心
"
prop
=
"workstationName"
>
<
el
-
input
<
el
-
input
v
-
model
=
"form.workstationName"
v
-
model
=
"form.workstationName"
readonly
=
"readonly"
readonly
=
"readonly"
...
...
src/views/mes/pro/schedule/proTask.vue
View file @
7d89ae4e
...
@@ -50,8 +50,8 @@
...
@@ -50,8 +50,8 @@
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
label=
"任务编号"
align=
"center"
width=
"100px"
prop=
"taskCode"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"任务编号"
align=
"center"
width=
"100px"
prop=
"taskCode"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"任务名称"
align=
"center"
width=
"120px"
prop=
"taskName"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"任务名称"
align=
"center"
width=
"120px"
prop=
"taskName"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"工作
站
编号"
align=
"center"
width=
"150px"
prop=
"workstationCode"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"工作
中心
编号"
align=
"center"
width=
"150px"
prop=
"workstationCode"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"工作
站
名称"
align=
"center"
width=
"150px"
prop=
"workstationName"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"工作
中心
名称"
align=
"center"
width=
"150px"
prop=
"workstationName"
: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"
width=
"100px"
prop=
"quantityProduced"
/>
<el-table-column
label=
"已生产数量"
align=
"center"
width=
"100px"
prop=
"quantityProduced"
/>
<el-table-column
label=
"开始生产时间"
align=
"center"
prop=
"startTime"
width=
"180"
>
<el-table-column
label=
"开始生产时间"
align=
"center"
prop=
"startTime"
width=
"180"
>
...
@@ -102,8 +102,8 @@
...
@@ -102,8 +102,8 @@
<
el
-
form
ref
=
"form"
:
model
=
"form"
:
rules
=
"rules"
label
-
width
=
"120px"
>
<
el
-
form
ref
=
"form"
:
model
=
"form"
:
rules
=
"rules"
label
-
width
=
"120px"
>
<
el
-
row
>
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"工作
站
"
prop
=
"workstationName"
>
<
el
-
form
-
item
label
=
"工作
中心
"
prop
=
"workstationName"
>
<
el
-
input
v
-
model
=
"form.workstationName"
placeholder
=
"请选择工作
站
"
>
<
el
-
input
v
-
model
=
"form.workstationName"
placeholder
=
"请选择工作
中心
"
>
<
el
-
button
slot
=
"append"
icon
=
"el-icon-search"
@
click
=
"handleWorkstationSelect"
><
/el-button
>
<
el
-
button
slot
=
"append"
icon
=
"el-icon-search"
@
click
=
"handleWorkstationSelect"
><
/el-button
>
<
/el-input
>
<
/el-input
>
<
/el-form-item
>
<
/el-form-item
>
...
@@ -226,7 +226,7 @@ export default {
...
@@ -226,7 +226,7 @@ export default {
// 表单校验
// 表单校验
rules
:
{
rules
:
{
workstationName
:
[
workstationName
:
[
{
required
:
true
,
message
:
"工作
站
不能为空"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"工作
中心
不能为空"
,
trigger
:
"blur"
}
],
],
quantity
:
[
quantity
:
[
{
required
:
true
,
message
:
"排产数量不能为空"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"排产数量不能为空"
,
trigger
:
"blur"
}
...
...
src/views/mes/pro/workorder/components/ProogingProcess.vue
View file @
7d89ae4e
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<el-table-column
label=
"序号"
prop=
"orderNum"
width=
"50"
align=
"center"
/>
<el-table-column
label=
"序号"
prop=
"orderNum"
width=
"50"
align=
"center"
/>
<el-table-column
label=
"工序名称"
prop=
"processName"
align=
"center"
/>
<el-table-column
label=
"工序名称"
prop=
"processName"
align=
"center"
/>
<el-table-column
label=
"工序编码"
prop=
"processCode"
align=
"center"
/>
<el-table-column
label=
"工序编码"
prop=
"processCode"
align=
"center"
/>
<el-table-column
label=
"工作
站
"
prop=
"workstationName"
align=
"center"
/>
<el-table-column
label=
"工作
中心
"
prop=
"workstationName"
align=
"center"
/>
<el-table-column
v-if=
"mode === 'make'"
label=
"工作单元名称"
width=
"200"
prop=
"workunitName"
align=
"center"
>
<el-table-column
v-if=
"mode === 'make'"
label=
"工作单元名称"
width=
"200"
prop=
"workunitName"
align=
"center"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<el-input
readonly
v-model=
"scope.row.workunitName"
>
<el-input
readonly
v-model=
"scope.row.workunitName"
>
...
@@ -142,11 +142,11 @@
...
@@ -142,11 +142,11 @@
>
>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"工作
站
"
prop=
"workstationId"
>
<el-form-item
label=
"工作
中心
"
prop=
"workstationId"
>
<el-input
<el-input
v-model=
"form.workstationName"
v-model=
"form.workstationName"
disabled
disabled
placeholder=
"请选择工作
站
信息"
placeholder=
"请选择工作
中心
信息"
>
>
<el-button
<el-button
slot=
"append"
slot=
"append"
...
@@ -348,7 +348,7 @@ export default {
...
@@ -348,7 +348,7 @@ export default {
this
.
$refs
[
"ProcessToolRef"
].
optType
=
"detail"
;
this
.
$refs
[
"ProcessToolRef"
].
optType
=
"detail"
;
this
.
$refs
[
"ProcessToolRef"
].
showProcessProd
=
true
;
this
.
$refs
[
"ProcessToolRef"
].
showProcessProd
=
true
;
},
},
// 查询工作
站
信息
// 查询工作
中心
信息
handleWorkstationSelect
()
{
handleWorkstationSelect
()
{
this
.
$refs
.
WorkstationSelect
.
showFlag
=
true
;
this
.
$refs
.
WorkstationSelect
.
showFlag
=
true
;
},
},
...
...
src/views/mes/proofing/components/ProogingProcess.vue
View file @
7d89ae4e
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
prop=
"linkType"
prop=
"linkType"
align=
"center"
align=
"center"
/>
/>
<el-table-column
label=
"工作
站
"
prop=
"workstationName"
align=
"center"
/>
<el-table-column
label=
"工作
中心
"
prop=
"workstationName"
align=
"center"
/>
<el-table-column
label=
"标准工时"
prop=
"stdWorkingTime"
align=
"center"
/>
<el-table-column
label=
"标准工时"
prop=
"stdWorkingTime"
align=
"center"
/>
<el-table-column
label=
"甘特图显示颜色"
prop=
"colorCode"
align=
"center"
/>
<el-table-column
label=
"甘特图显示颜色"
prop=
"colorCode"
align=
"center"
/>
<el-table-column
<el-table-column
...
@@ -82,11 +82,11 @@
...
@@ -82,11 +82,11 @@
>
>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"工作
站
"
prop=
"workstationName"
>
<el-form-item
label=
"工作
中心
"
prop=
"workstationName"
>
<el-input
<el-input
v-model=
"form.workstationName"
v-model=
"form.workstationName"
disabled
disabled
placeholder=
"请选择工作
站
信息"
placeholder=
"请选择工作
中心
信息"
>
>
<el-button
<el-button
slot=
"append"
slot=
"append"
...
@@ -221,7 +221,7 @@
...
@@ -221,7 +221,7 @@
this
.
resetForm
();
this
.
resetForm
();
this
.
tableData
=
[];
this
.
tableData
=
[];
},
},
// 查询工作
站
信息
// 查询工作
中心
信息
handleWorkstationSelect
()
{
handleWorkstationSelect
()
{
this
.
$refs
.
WorkstationSelect
.
showFlag
=
true
;
this
.
$refs
.
WorkstationSelect
.
showFlag
=
true
;
},
},
...
...
src/views/mes/qc/ipqc/index.vue
View file @
7d89ae4e
...
@@ -229,15 +229,15 @@
...
@@ -229,15 +229,15 @@
<
/el-row
>
<
/el-row
>
<
el
-
row
>
<
el
-
row
>
<
el
-
col
:
span
=
"8"
>
<
el
-
col
:
span
=
"8"
>
<
el
-
form
-
item
label
=
"工作
站
编号"
prop
=
"workstationCode"
>
<
el
-
form
-
item
label
=
"工作
中心
编号"
prop
=
"workstationCode"
>
<
el
-
input
v
-
model
=
"form.workstationCode"
placeholder
=
"请输入工作
站
编号"
>
<
el
-
input
v
-
model
=
"form.workstationCode"
placeholder
=
"请输入工作
中心
编号"
>
<
el
-
button
slot
=
"append"
icon
=
"el-icon-search"
@
click
=
"handleWorkstationSelect"
><
/el-button
>
<
el
-
button
slot
=
"append"
icon
=
"el-icon-search"
@
click
=
"handleWorkstationSelect"
><
/el-button
>
<
/el-input
>
<
/el-input
>
<
/el-form-item
>
<
/el-form-item
>
<
WorkstationSelect
ref
=
"wsSelect"
@
onSelected
=
"onWorkstationSelected"
>
<
/WorkstationSelect
>
<
WorkstationSelect
ref
=
"wsSelect"
@
onSelected
=
"onWorkstationSelected"
>
<
/WorkstationSelect
>
<
/el-col
>
<
/el-col
>
<
el
-
col
:
span
=
"8"
>
<
el
-
col
:
span
=
"8"
>
<
el
-
form
-
item
label
=
"工作
站
名称"
prop
=
"workstationName"
>
<
el
-
form
-
item
label
=
"工作
中心
名称"
prop
=
"workstationName"
>
<
el
-
input
v
-
model
=
"form.workstationName"
readonly
=
"readonly"
/>
<
el
-
input
v
-
model
=
"form.workstationName"
readonly
=
"readonly"
/>
<
/el-form-item
>
<
/el-form-item
>
<
/el-col
>
<
/el-col
>
...
@@ -468,7 +468,7 @@ export default {
...
@@ -468,7 +468,7 @@ export default {
],
],
workstationCode
:
[
workstationCode
:
[
{
required
:
true
,
message
:
"请选择工作
站
"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"请选择工作
中心
"
,
trigger
:
"blur"
}
],
],
quantityCheck
:
[
quantityCheck
:
[
...
...
src/views/mes/qc/pendinginspect/iqc.vue
View file @
7d89ae4e
...
@@ -212,7 +212,7 @@ export default {
...
@@ -212,7 +212,7 @@ export default {
],
],
workstationCode
:
[
workstationCode
:
[
{
required
:
true
,
message
:
"请选择工作
站
"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"请选择工作
中心
"
,
trigger
:
"blur"
}
],
],
quantityCheck
:
[
quantityCheck
:
[
...
...
src/views/mes/qc/pendinginspect/pqc.vue
View file @
7d89ae4e
...
@@ -52,13 +52,13 @@
...
@@ -52,13 +52,13 @@
</el-row>
</el-row>
<el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"工作
站
编号"
prop=
"workstationCode"
>
<el-form-item
label=
"工作
中心
编号"
prop=
"workstationCode"
>
<el-input
v-model=
"form.workstationCode"
placeholder=
"请输入工作
站
编号"
>
<el-input
v-model=
"form.workstationCode"
placeholder=
"请输入工作
中心
编号"
>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"工作
站
名称"
prop=
"workstationName"
>
<el-form-item
label=
"工作
中心
名称"
prop=
"workstationName"
>
<el-input
v-model=
"form.workstationName"
readonly=
"readonly"
/>
<el-input
v-model=
"form.workstationName"
readonly=
"readonly"
/>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -240,7 +240,7 @@ export default {
...
@@ -240,7 +240,7 @@ export default {
],
],
workstationCode
:
[
workstationCode
:
[
{
required
:
true
,
message
:
"请选择工作
站
"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"请选择工作
中心
"
,
trigger
:
"blur"
}
],
],
quantityCheck
:
[
quantityCheck
:
[
...
...
src/views/mes/wm/barcode/index.vue
View file @
7d89ae4e
...
@@ -255,18 +255,18 @@
...
@@ -255,18 +255,18 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
<!-- 工作
站
-->
<!-- 工作
中心
-->
<el-row
v-else-if=
"form.barcodeType=='WORKSTATION'"
>
<el-row
v-else-if=
"form.barcodeType=='WORKSTATION'"
>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"工作
站
"
prop=
"bussinessCode"
>
<el-form-item
label=
"工作
中心
"
prop=
"bussinessCode"
>
<el-input
v-model=
"form.bussinessCode"
placeholder=
"请选择工作
站
"
>
<el-input
v-model=
"form.bussinessCode"
placeholder=
"请选择工作
中心
"
>
<el-button
slot=
"append"
icon=
"el-icon-search"
@
click=
"handleWorkstationSelect"
></el-button>
<el-button
slot=
"append"
icon=
"el-icon-search"
@
click=
"handleWorkstationSelect"
></el-button>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<WorkstationSelect
ref=
"wsSelect"
@
onSelected=
"onWorkstationSelected"
>
</WorkstationSelect>
<WorkstationSelect
ref=
"wsSelect"
@
onSelected=
"onWorkstationSelected"
>
</WorkstationSelect>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"工作
站
名称"
prop=
"bussinessName"
>
<el-form-item
label=
"工作
中心
名称"
prop=
"bussinessName"
>
<el-input
v-model=
"form.bussinessName"
readonly=
"readonly"
>
<el-input
v-model=
"form.bussinessName"
readonly=
"readonly"
>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
...
@@ -581,11 +581,11 @@ export default {
...
@@ -581,11 +581,11 @@ export default {
this
.
form
.
barcodeContent
=
""
.
concat
(
this
.
form
.
barcodeType
,
'-'
,
this
.
form
.
bussinessCode
);
this
.
form
.
barcodeContent
=
""
.
concat
(
this
.
form
.
barcodeType
,
'-'
,
this
.
form
.
bussinessCode
);
}
}
},
},
/**选择工作
站
*/
/**选择工作
中心
*/
handleWorkstationSelect
(){
handleWorkstationSelect
(){
this
.
$refs
.
wsSelect
.
showFlag
=
true
;
this
.
$refs
.
wsSelect
.
showFlag
=
true
;
},
},
/**工作
站
选择返回 */
/**工作
中心
选择返回 */
onWorkstationSelected
(
obj
){
onWorkstationSelected
(
obj
){
if
(
obj
!=
undefined
&&
obj
!=
null
){
if
(
obj
!=
undefined
&&
obj
!=
null
){
this
.
form
.
bussinessId
=
obj
.
workstationId
;
this
.
form
.
bussinessId
=
obj
.
workstationId
;
...
...
src/views/mes/wm/issue/index.vue
View file @
7d89ae4e
...
@@ -498,7 +498,7 @@ export default {
...
@@ -498,7 +498,7 @@ export default {
this
.
form
.
areaId
=
obj
[
2
];
this
.
form
.
areaId
=
obj
[
2
];
}
}
},
},
//选择工作
站
//选择工作
中心
handleWorkstationSelect
(){
handleWorkstationSelect
(){
this
.
$refs
.
wsSelect
.
showFlag
=
true
;
this
.
$refs
.
wsSelect
.
showFlag
=
true
;
},
},
...
...
src/views/mes/wm/itemconsume/index.vue
View file @
7d89ae4e
...
@@ -49,26 +49,26 @@
...
@@ -49,26 +49,26 @@
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"工作
站
ID"
prop=
"workstationId"
>
<el-form-item
label=
"工作
中心
ID"
prop=
"workstationId"
>
<el-input
<el-input
v-model=
"queryParams.workstationId"
v-model=
"queryParams.workstationId"
placeholder=
"请输入工作
站
ID"
placeholder=
"请输入工作
中心
ID"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"工作
站
编号"
prop=
"workstationCode"
>
<el-form-item
label=
"工作
中心
编号"
prop=
"workstationCode"
>
<el-input
<el-input
v-model=
"queryParams.workstationCode"
v-model=
"queryParams.workstationCode"
placeholder=
"请输入工作
站
编号"
placeholder=
"请输入工作
中心
编号"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"工作
站
名称"
prop=
"workstationName"
>
<el-form-item
label=
"工作
中心
名称"
prop=
"workstationName"
>
<el-input
<el-input
v-model=
"queryParams.workstationName"
v-model=
"queryParams.workstationName"
placeholder=
"请输入工作
站
名称"
placeholder=
"请输入工作
中心
名称"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
...
@@ -176,9 +176,9 @@
...
@@ -176,9 +176,9 @@
<el-table-column
label=
"生产任务ID"
align=
"center"
prop=
"taskId"
/>
<el-table-column
label=
"生产任务ID"
align=
"center"
prop=
"taskId"
/>
<el-table-column
label=
"生产任务编号"
align=
"center"
prop=
"taskCode"
/>
<el-table-column
label=
"生产任务编号"
align=
"center"
prop=
"taskCode"
/>
<el-table-column
label=
"生产任务名称"
align=
"center"
prop=
"taskName"
/>
<el-table-column
label=
"生产任务名称"
align=
"center"
prop=
"taskName"
/>
<el-table-column
label=
"工作
站
ID"
align=
"center"
prop=
"workstationId"
/>
<el-table-column
label=
"工作
中心
ID"
align=
"center"
prop=
"workstationId"
/>
<el-table-column
label=
"工作
站
编号"
align=
"center"
prop=
"workstationCode"
/>
<el-table-column
label=
"工作
中心
编号"
align=
"center"
prop=
"workstationCode"
/>
<el-table-column
label=
"工作
站
名称"
align=
"center"
prop=
"workstationName"
/>
<el-table-column
label=
"工作
中心
名称"
align=
"center"
prop=
"workstationName"
/>
<el-table-column
label=
"工序ID"
align=
"center"
prop=
"processId"
/>
<el-table-column
label=
"工序ID"
align=
"center"
prop=
"processId"
/>
<el-table-column
label=
"工序编号"
align=
"center"
prop=
"processCode"
/>
<el-table-column
label=
"工序编号"
align=
"center"
prop=
"processCode"
/>
<el-table-column
label=
"工序名称"
align=
"center"
prop=
"processName"
/>
<el-table-column
label=
"工序名称"
align=
"center"
prop=
"processName"
/>
...
@@ -242,14 +242,14 @@
...
@@ -242,14 +242,14 @@
<
el
-
form
-
item
label
=
"生产任务名称"
prop
=
"taskName"
>
<
el
-
form
-
item
label
=
"生产任务名称"
prop
=
"taskName"
>
<
el
-
input
v
-
model
=
"form.taskName"
placeholder
=
"请输入生产任务名称"
/>
<
el
-
input
v
-
model
=
"form.taskName"
placeholder
=
"请输入生产任务名称"
/>
<
/el-form-item
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"工作
站
ID"
prop
=
"workstationId"
>
<
el
-
form
-
item
label
=
"工作
中心
ID"
prop
=
"workstationId"
>
<
el
-
input
v
-
model
=
"form.workstationId"
placeholder
=
"请输入工作
站
ID"
/>
<
el
-
input
v
-
model
=
"form.workstationId"
placeholder
=
"请输入工作
中心
ID"
/>
<
/el-form-item
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"工作
站
编号"
prop
=
"workstationCode"
>
<
el
-
form
-
item
label
=
"工作
中心
编号"
prop
=
"workstationCode"
>
<
el
-
input
v
-
model
=
"form.workstationCode"
placeholder
=
"请输入工作
站
编号"
/>
<
el
-
input
v
-
model
=
"form.workstationCode"
placeholder
=
"请输入工作
中心
编号"
/>
<
/el-form-item
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"工作
站
名称"
prop
=
"workstationName"
>
<
el
-
form
-
item
label
=
"工作
中心
名称"
prop
=
"workstationName"
>
<
el
-
input
v
-
model
=
"form.workstationName"
placeholder
=
"请输入工作
站
名称"
/>
<
el
-
input
v
-
model
=
"form.workstationName"
placeholder
=
"请输入工作
中心
名称"
/>
<
/el-form-item
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"工序ID"
prop
=
"processId"
>
<
el
-
form
-
item
label
=
"工序ID"
prop
=
"processId"
>
<
el
-
input
v
-
model
=
"form.processId"
placeholder
=
"请输入工序ID"
/>
<
el
-
input
v
-
model
=
"form.processId"
placeholder
=
"请输入工序ID"
/>
...
...
src/views/mes/wm/productproduce/index.vue
View file @
7d89ae4e
...
@@ -49,26 +49,26 @@
...
@@ -49,26 +49,26 @@
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"工作
站
ID"
prop=
"workstationId"
>
<el-form-item
label=
"工作
中心
ID"
prop=
"workstationId"
>
<el-input
<el-input
v-model=
"queryParams.workstationId"
v-model=
"queryParams.workstationId"
placeholder=
"请输入工作
站
ID"
placeholder=
"请输入工作
中心
ID"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"工作
站
编号"
prop=
"workstationCode"
>
<el-form-item
label=
"工作
中心
编号"
prop=
"workstationCode"
>
<el-input
<el-input
v-model=
"queryParams.workstationCode"
v-model=
"queryParams.workstationCode"
placeholder=
"请输入工作
站
编号"
placeholder=
"请输入工作
中心
编号"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"工作
站
名称"
prop=
"workstationName"
>
<el-form-item
label=
"工作
中心
名称"
prop=
"workstationName"
>
<el-input
<el-input
v-model=
"queryParams.workstationName"
v-model=
"queryParams.workstationName"
placeholder=
"请输入工作
站
名称"
placeholder=
"请输入工作
中心
名称"
clearable
clearable
@
keyup
.
enter
.
native=
"handleQuery"
@
keyup
.
enter
.
native=
"handleQuery"
/>
/>
...
@@ -176,9 +176,9 @@
...
@@ -176,9 +176,9 @@
<el-table-column
label=
"生产任务ID"
align=
"center"
prop=
"taskId"
/>
<el-table-column
label=
"生产任务ID"
align=
"center"
prop=
"taskId"
/>
<el-table-column
label=
"生产任务编号"
align=
"center"
prop=
"taskCode"
/>
<el-table-column
label=
"生产任务编号"
align=
"center"
prop=
"taskCode"
/>
<el-table-column
label=
"生产任务名称"
align=
"center"
prop=
"taskName"
/>
<el-table-column
label=
"生产任务名称"
align=
"center"
prop=
"taskName"
/>
<el-table-column
label=
"工作
站
ID"
align=
"center"
prop=
"workstationId"
/>
<el-table-column
label=
"工作
中心
ID"
align=
"center"
prop=
"workstationId"
/>
<el-table-column
label=
"工作
站
编号"
align=
"center"
prop=
"workstationCode"
/>
<el-table-column
label=
"工作
中心
编号"
align=
"center"
prop=
"workstationCode"
/>
<el-table-column
label=
"工作
站
名称"
align=
"center"
prop=
"workstationName"
/>
<el-table-column
label=
"工作
中心
名称"
align=
"center"
prop=
"workstationName"
/>
<el-table-column
label=
"工序ID"
align=
"center"
prop=
"processId"
/>
<el-table-column
label=
"工序ID"
align=
"center"
prop=
"processId"
/>
<el-table-column
label=
"工序编号"
align=
"center"
prop=
"processCode"
/>
<el-table-column
label=
"工序编号"
align=
"center"
prop=
"processCode"
/>
<el-table-column
label=
"工序名称"
align=
"center"
prop=
"processName"
/>
<el-table-column
label=
"工序名称"
align=
"center"
prop=
"processName"
/>
...
@@ -242,14 +242,14 @@
...
@@ -242,14 +242,14 @@
<
el
-
form
-
item
label
=
"生产任务名称"
prop
=
"taskName"
>
<
el
-
form
-
item
label
=
"生产任务名称"
prop
=
"taskName"
>
<
el
-
input
v
-
model
=
"form.taskName"
placeholder
=
"请输入生产任务名称"
/>
<
el
-
input
v
-
model
=
"form.taskName"
placeholder
=
"请输入生产任务名称"
/>
<
/el-form-item
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"工作
站
ID"
prop
=
"workstationId"
>
<
el
-
form
-
item
label
=
"工作
中心
ID"
prop
=
"workstationId"
>
<
el
-
input
v
-
model
=
"form.workstationId"
placeholder
=
"请输入工作
站
ID"
/>
<
el
-
input
v
-
model
=
"form.workstationId"
placeholder
=
"请输入工作
中心
ID"
/>
<
/el-form-item
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"工作
站
编号"
prop
=
"workstationCode"
>
<
el
-
form
-
item
label
=
"工作
中心
编号"
prop
=
"workstationCode"
>
<
el
-
input
v
-
model
=
"form.workstationCode"
placeholder
=
"请输入工作
站
编号"
/>
<
el
-
input
v
-
model
=
"form.workstationCode"
placeholder
=
"请输入工作
中心
编号"
/>
<
/el-form-item
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"工作
站
名称"
prop
=
"workstationName"
>
<
el
-
form
-
item
label
=
"工作
中心
名称"
prop
=
"workstationName"
>
<
el
-
input
v
-
model
=
"form.workstationName"
placeholder
=
"请输入工作
站
名称"
/>
<
el
-
input
v
-
model
=
"form.workstationName"
placeholder
=
"请输入工作
中心
名称"
/>
<
/el-form-item
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"工序ID"
prop
=
"processId"
>
<
el
-
form
-
item
label
=
"工序ID"
prop
=
"processId"
>
<
el
-
input
v
-
model
=
"form.processId"
placeholder
=
"请输入工序ID"
/>
<
el
-
input
v
-
model
=
"form.processId"
placeholder
=
"请输入工序ID"
/>
...
...
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