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
d3b84114
Commit
d3b84114
authored
Jan 18, 2024
by
鲁鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
产品管理页面-产品;工厂管理;工作单元管理
parent
214a0b6d
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
1153 additions
and
182 deletions
+1153
-182
factory.js
src/api/mes/md/factory.js
+44
-0
workunit.js
src/api/mes/md/workunit.js
+44
-0
index.vue
src/views/mes/md/factory/index.vue
+284
-0
backFaceColor.vue
src/views/mes/md/product/components/backFaceColor.vue
+250
-0
baseInfo.vue
src/views/mes/md/product/components/baseInfo.vue
+45
-67
customerLoss.vue
src/views/mes/md/product/components/customerLoss.vue
+30
-24
faceColor.vue
src/views/mes/md/product/components/faceColor.vue
+6
-1
factory.vue
src/views/mes/md/product/components/factory.vue
+20
-2
look.vue
src/views/mes/md/product/components/look.vue
+93
-75
publishedConf.vue
src/views/mes/md/product/components/publishedConf.vue
+10
-3
index.vue
src/views/mes/md/product/index.vue
+8
-10
index.vue
src/views/mes/md/workunit/index.vue
+319
-0
No files found.
src/api/mes/md/factory.js
0 → 100644
View file @
d3b84114
import
request
from
'@/utils/request'
// 查询工厂列表
export
function
listFactory
(
query
)
{
return
request
({
url
:
'/md/mdfactory/list'
,
method
:
'get'
,
params
:
query
})
}
// 查询工厂详细
export
function
getFactory
(
factoryId
)
{
return
request
({
url
:
'/md/mdfactory/'
+
factoryId
,
method
:
'get'
})
}
// 新增工厂
export
function
addFactory
(
data
)
{
return
request
({
url
:
'/md/mdfactory'
,
method
:
'post'
,
data
:
data
})
}
// 修改工厂
export
function
updateFactory
(
data
)
{
return
request
({
url
:
'/md/mdfactory'
,
method
:
'put'
,
data
:
data
})
}
// 删除工厂
export
function
delFactory
(
factoryId
)
{
return
request
({
url
:
'/md/mdfactory/'
+
factoryId
,
method
:
'delete'
})
}
src/api/mes/md/workunit.js
0 → 100644
View file @
d3b84114
import
request
from
'@/utils/request'
// 查询工作单元列表
export
function
listWorkunit
(
query
)
{
return
request
({
url
:
'/md/workunit/list'
,
method
:
'get'
,
params
:
query
})
}
// 查询工作单元详细
export
function
getWorkunit
(
workunitId
)
{
return
request
({
url
:
'/md/workunit/'
+
workunitId
,
method
:
'get'
})
}
// 新增工作单元
export
function
addWorkunit
(
data
)
{
return
request
({
url
:
'/md/workunit'
,
method
:
'post'
,
data
:
data
})
}
// 修改工作单元
export
function
updateWorkunit
(
data
)
{
return
request
({
url
:
'/md/workunit'
,
method
:
'put'
,
data
:
data
})
}
// 删除工作单元
export
function
delWorkunit
(
workunitId
)
{
return
request
({
url
:
'/md/workunit/'
+
workunitId
,
method
:
'delete'
})
}
src/views/mes/md/factory/index.vue
0 → 100644
View file @
d3b84114
<
template
>
<div
class=
"app-container"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"68px"
>
<el-form-item
label=
"工厂编码"
prop=
"factoryCode"
>
<el-input
v-model=
"queryParams.factoryCode"
placeholder=
"请输入工厂编码"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"工厂名称"
prop=
"factoryName"
>
<el-input
v-model=
"queryParams.factoryName"
placeholder=
"请输入工厂名称"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"是否启用"
prop=
"enableFlag"
>
<el-select
v-model=
"queryParams.enableFlag"
placeholder=
"请选择是或否"
clearable
>
<el-option
v-for=
"dict in dict.type.sys_yes_no"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
size=
"mini"
@
click=
"handleQuery"
>
搜索
</el-button>
<el-button
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button>
</el-form-item>
</el-form>
<el-row
:gutter=
"10"
class=
"mb8"
>
<el-col
:span=
"1.5"
>
<el-button
type=
"primary"
plain
icon=
"el-icon-plus"
size=
"mini"
@
click=
"handleAdd"
v-hasPermi=
"['md:factory:add']"
>
新增
</el-button>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"success"
plain
icon=
"el-icon-edit"
size=
"mini"
:disabled=
"single"
@
click=
"handleUpdate"
v-hasPermi=
"['md:factory:edit']"
>
修改
</el-button>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"danger"
plain
icon=
"el-icon-delete"
size=
"mini"
:disabled=
"multiple"
@
click=
"handleDelete"
v-hasPermi=
"['md:factory:remove']"
>
删除
</el-button>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"warning"
plain
icon=
"el-icon-download"
size=
"mini"
@
click=
"handleExport"
v-hasPermi=
"['md:factory:export']"
>
导出
</el-button>
</el-col>
<right-toolbar
:showSearch
.
sync=
"showSearch"
@
queryTable=
"getList"
></right-toolbar>
</el-row>
<el-table
v-loading=
"loading"
:data=
"factoryList"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<!--
<el-table-column
label=
"工厂id"
align=
"center"
prop=
"factoryId"
/>
-->
<el-table-column
label=
"工厂编码"
align=
"center"
prop=
"factoryCode"
/>
<el-table-column
label=
"工厂名称"
align=
"center"
prop=
"factoryName"
/>
<el-table-column
label=
"是否启用"
align=
"center"
prop=
"enableFlag"
>
<template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.sys_yes_no"
:value=
"scope.row.enableFlag"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"备注"
align=
"center"
prop=
"remark"
/>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleUpdate(scope.row)"
v-hasPermi=
"['md:factory:edit']"
>
修改
</el-button>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-delete"
@
click=
"handleDelete(scope.row)"
v-hasPermi=
"['md:factory:remove']"
>
删除
</el-button>
</
template
>
</el-table-column>
</el-table>
<pagination
v-show=
"total>0"
:total=
"total"
:page
.
sync=
"queryParams.pageNum"
:limit
.
sync=
"queryParams.pageSize"
@
pagination=
"getList"
/>
<!-- 添加或修改工厂对话框 -->
<el-dialog
:title=
"title"
:visible
.
sync=
"open"
width=
"500px"
append-to-body
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"80px"
>
<el-form-item
label=
"工厂编码"
prop=
"factoryCode"
>
<el-input
v-model=
"form.factoryCode"
placeholder=
"请输入工厂编码"
/>
</el-form-item>
<el-form-item
label=
"工厂名称"
prop=
"factoryName"
>
<el-input
v-model=
"form.factoryName"
placeholder=
"请输入工厂名称"
/>
</el-form-item>
<el-form-item
label=
"是否启用"
prop=
"enableFlag"
>
<el-select
v-model=
"form.enableFlag"
placeholder=
"请选择是或否"
>
<el-option
v-for=
"dict in dict.type.sys_yes_no"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"备注"
prop=
"remark"
>
<el-input
v-model=
"form.remark"
placeholder=
"请输入备注"
/>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"submitForm"
>
确 定
</el-button>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
</div>
</el-dialog>
</div>
</template>
<
script
>
import
{
listFactory
,
getFactory
,
delFactory
,
addFactory
,
updateFactory
}
from
"@/api/mes/md/factory"
;
export
default
{
name
:
"Factory"
,
dicts
:[
'sys_yes_no'
],
data
()
{
return
{
// 遮罩层
loading
:
true
,
// 选中数组
ids
:
[],
// 非单个禁用
single
:
true
,
// 非多个禁用
multiple
:
true
,
// 显示搜索条件
showSearch
:
true
,
// 总条数
total
:
0
,
// 工厂表格数据
factoryList
:
[],
// 弹出层标题
title
:
""
,
// 是否显示弹出层
open
:
false
,
// 查询参数
queryParams
:
{
pageNum
:
1
,
pageSize
:
10
,
factoryCode
:
null
,
factoryName
:
null
,
enableFlag
:
null
,
},
// 表单参数
form
:
{},
// 表单校验
rules
:
{
}
};
},
created
()
{
this
.
getList
();
},
methods
:
{
/** 查询工厂列表 */
getList
()
{
this
.
loading
=
true
;
listFactory
(
this
.
queryParams
).
then
(
response
=>
{
this
.
factoryList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
});
},
// 取消按钮
cancel
()
{
this
.
open
=
false
;
this
.
reset
();
},
// 表单重置
reset
()
{
this
.
form
=
{
factoryId
:
null
,
factoryCode
:
null
,
factoryName
:
null
,
enableFlag
:
null
,
remark
:
null
,
createBy
:
null
,
createTime
:
null
,
updateBy
:
null
,
updateTime
:
null
};
this
.
resetForm
(
"form"
);
},
/** 搜索按钮操作 */
handleQuery
()
{
this
.
queryParams
.
pageNum
=
1
;
this
.
getList
();
},
/** 重置按钮操作 */
resetQuery
()
{
this
.
resetForm
(
"queryForm"
);
this
.
handleQuery
();
},
// 多选框选中数据
handleSelectionChange
(
selection
)
{
this
.
ids
=
selection
.
map
(
item
=>
item
.
factoryId
)
this
.
single
=
selection
.
length
!==
1
this
.
multiple
=
!
selection
.
length
},
/** 新增按钮操作 */
handleAdd
()
{
this
.
reset
();
this
.
open
=
true
;
this
.
title
=
"添加工厂"
;
},
/** 修改按钮操作 */
handleUpdate
(
row
)
{
this
.
reset
();
const
factoryId
=
row
.
factoryId
||
this
.
ids
getFactory
(
factoryId
).
then
(
response
=>
{
this
.
form
=
response
.
data
;
this
.
open
=
true
;
this
.
title
=
"修改工厂"
;
});
},
/** 提交按钮 */
submitForm
()
{
this
.
$refs
[
"form"
].
validate
(
valid
=>
{
if
(
valid
)
{
if
(
this
.
form
.
factoryId
!=
null
)
{
updateFactory
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"修改成功"
);
this
.
open
=
false
;
this
.
getList
();
});
}
else
{
addFactory
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"新增成功"
);
this
.
open
=
false
;
this
.
getList
();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete
(
row
)
{
const
factoryIds
=
row
.
factoryId
||
this
.
ids
;
this
.
$modal
.
confirm
(
'是否确认删除工厂编号为"'
+
factoryIds
+
'"的数据项?'
).
then
(
function
()
{
return
delFactory
(
factoryIds
);
}).
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"删除成功"
);
}).
catch
(()
=>
{});
},
/** 导出按钮操作 */
handleExport
()
{
this
.
download
(
'md/factory/export'
,
{
...
this
.
queryParams
},
`factory_
${
new
Date
().
getTime
()}
.xlsx`
)
}
}
};
</
script
>
src/views/mes/md/product/components/backFaceColor.vue
0 → 100644
View file @
d3b84114
<!--产品正反面颜色-->
<
template
>
<div
class=
"app-container"
>
<el-row
:gutter=
"10"
class=
"mb8"
v-if=
"optType !='view'"
>
<el-col
:span=
"1.5"
>
<el-button
type=
"primary"
plain
icon=
"el-icon-plus"
size=
"mini"
@
click=
"handleAdd"
v-hasPermi=
"['mes:md:faceColor:add']"
>
新增
</el-button>
<ColorSelect
ref=
"colorSelect"
@
onSelected=
"onColorSelected"
>
</ColorSelect>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"danger"
plain
icon=
"el-icon-delete"
size=
"mini"
:disabled=
"multiple"
@
click=
"handleDelete"
v-hasPermi=
"['mes:md:faceColor:remove']"
>
删除
</el-button>
</el-col>
<right-toolbar
:showSearch
.
sync=
"showSearch"
@
queryTable=
"getList"
></right-toolbar>
</el-row>
<el-table
v-loading=
"loading"
:data=
"faceColorList"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
label=
"排序号"
align=
"center"
prop=
"sortOrder"
/>
<el-table-column
label=
"颜色"
align=
"center"
prop=
"colorName"
/>
<el-table-column
label=
"覆盖率(单位%)"
align=
"center"
prop=
"coverageRate"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"创建人"
align=
"center"
prop=
"createBy"
/>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
/>
<el-table-column
label=
"修改人"
align=
"center"
prop=
"updateBy"
/>
<el-table-column
label=
"修改时间"
align=
"center"
prop=
"updateTime"
/>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
v-if=
"optType !='view'"
>
<template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleUpdate(scope.row)"
v-hasPermi=
"['mes:md:faceColor:edit']"
>
修改
</el-button>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-delete"
@
click=
"handleDelete(scope.row)"
v-hasPermi=
"['mes:md:faceColor:remove']"
>
删除
</el-button>
</
template
>
</el-table-column>
</el-table>
<pagination
v-show=
"total>0"
:total=
"total"
:page
.
sync=
"queryParams.pageNum"
:limit
.
sync=
"queryParams.pageSize"
@
pagination=
"getList"
/>
<!-- 添加或修改产品颜色关系对话框 -->
<el-dialog
:title=
"title"
:visible
.
sync=
"open"
width=
"600px"
append-to-body
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"120px"
>
<el-form-item
label=
"排序号"
prop=
"sortOrder"
>
<el-input
v-model=
"form.sortOrder"
placeholder=
"请输入排序号"
/>
</el-form-item>
<el-form-item
label=
"颜色"
prop=
"colorName"
>
<el-input
v-model=
"form.colorName"
readonly
placeholder=
"请输入颜色"
/>
</el-form-item>
<el-form-item
label=
"覆盖率(单位%)"
prop=
"coverageRate"
>
<el-input
v-model=
"form.coverageRate"
type=
"textarea"
placeholder=
"请输入覆盖率"
/>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"submitForm"
>
确 定
</el-button>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
</div>
</el-dialog>
</div>
</template>
<
script
>
import
{
listFaceColor
,
getFaceColor
,
delFaceColor
,
addFaceColor
,
updateFaceColor
}
from
"@/api/mes/md/faceColor"
;
import
ColorSelect
from
"@/components/colorSelect/index.vue"
;
//import faceColor from "@/views/mes/md/product/components/faceColor.vue";
export
default
{
name
:
"FaceColor"
,
components
:
{
ColorSelect
},
data
()
{
return
{
// 遮罩层
loading
:
true
,
// 选中数组
ids
:
[],
// 非单个禁用
single
:
true
,
// 非多个禁用
multiple
:
true
,
// 显示搜索条件
showSearch
:
true
,
// 总条数
total
:
0
,
// 产品BOM关系表格数据
faceColorList
:
[],
// 弹出层标题
title
:
""
,
// 是否显示弹出层
open
:
false
,
// 查询参数
queryParams
:
{
pageNum
:
1
,
pageSize
:
10
,
itemId
:
this
.
itemId
,
colorId
:
null
,
mdFaceColorId
:
null
,
colorName
:
null
,
face
:
'back'
,
coverageRate
:
null
,
sortOrder
:
null
,
},
// 表单参数
form
:
{},
// 表单校验
rules
:
{
/*quantity: [
{ required: true, message: "物料使用比例不能为空", trigger: "blur" }
]*/
}
};
},
props
:
{
optType
:
undefined
,
itemId
:
undefined
},
created
()
{
this
.
getList
();
},
methods
:
{
/** 查询产品颜色关系列表 */
getList
()
{
this
.
loading
=
true
;
listFaceColor
(
this
.
queryParams
).
then
(
response
=>
{
this
.
faceColorList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
});
},
// 取消按钮
cancel
()
{
this
.
open
=
false
;
this
.
reset
();
},
// 表单重置
reset
()
{
this
.
form
=
{
itemId
:
null
,
colorId
:
null
,
mdFaceColorId
:
null
,
colorName
:
null
,
coverageRate
:
null
,
sortOrder
:
null
,
face
:
"back"
,
createBy
:
null
,
createTime
:
null
,
updateBy
:
null
,
updateTime
:
null
};
this
.
resetForm
(
"form"
);
},
/** 搜索按钮操作 */
handleQuery
()
{
this
.
queryParams
.
pageNum
=
1
;
this
.
getList
();
},
/** 重置按钮操作 */
resetQuery
()
{
this
.
resetForm
(
"queryForm"
);
this
.
handleQuery
();
},
// 多选框选中数据
handleSelectionChange
(
selection
)
{
this
.
ids
=
selection
.
map
(
item
=>
item
.
mdFaceColorId
)
this
.
single
=
selection
.
length
!==
1
this
.
multiple
=
!
selection
.
length
},
/** 新增按钮操作 */
handleAdd
()
{
this
.
$refs
.
colorSelect
.
showFlag
=
true
;
},
/** 修改按钮操作 */
handleUpdate
(
row
)
{
this
.
reset
();
const
mdFaceColorId
=
row
.
mdFaceColorId
||
this
.
ids
getFaceColor
(
mdFaceColorId
).
then
(
response
=>
{
this
.
form
=
response
.
data
;
this
.
open
=
true
;
this
.
title
=
"修改产品颜色"
;
});
},
/** 提交按钮 */
submitForm
()
{
this
.
$refs
[
"form"
].
validate
(
valid
=>
{
if
(
valid
)
{
updateFaceColor
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"修改成功"
);
this
.
open
=
false
;
this
.
getList
();
});
}
});
},
/** 删除按钮操作 */
handleDelete
(
row
)
{
const
mdFaceColorIds
=
row
.
mdFaceColorId
||
this
.
ids
;
this
.
$modal
.
confirm
(
'是否确认删除产品BOM关系编号为"'
+
mdFaceColorIds
+
'"的数据项?'
).
then
(
function
()
{
return
delFaceColor
(
mdFaceColorIds
);
}).
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"删除成功"
);
}).
catch
(()
=>
{});
},
//物料选择弹出框
onColorSelected
(
obj
){
debugger
;
this
.
form
.
itemId
=
this
.
itemId
;
if
(
obj
!=
undefined
&&
obj
!=
null
){
obj
.
forEach
(
element
=>
{
//this.form.itemId = element.itemId;
this
.
form
.
colorId
=
element
.
colorId
;
this
.
form
.
colorName
=
element
.
colorName
;
this
.
form
.
face
=
'back'
;
var
retFlag
=
false
;
addFaceColor
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"新增成功"
);
this
.
getList
();
});
});
}
}
}
};
</
script
>
src/views/mes/md/product/components/baseInfo.vue
View file @
d3b84114
...
...
@@ -4,53 +4,57 @@
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"120px"
>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"产品计量单位"
prop=
"productUnit"
>
<el-input
v-model=
"form.productUnit"
maxlength=
"64"
v-if=
"optType == 'view'"
/>
<el-input
v-model=
"form.productUnit"
placeholder=
"请输入产品计量单位"
maxlength=
"64"
v-else
/>
<el-form-item
label=
"产品代号"
prop=
"productNo"
>
<el-input
v-model=
"form.productNo"
placeholder=
"请输入产品代号"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"
产品有效起始日期"
prop=
"productStartDat
e"
>
<el-input
v-model=
"form.product
StartDate"
type=
"date"
placeholder=
"请输入产品有效起始日期"
/>
<el-form-item
label=
"
英文名称"
prop=
"productEnglishNam
e"
>
<el-input
v-model=
"form.product
EnglishName"
placeholder=
"请输入英文名称"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"样品编号"
prop=
"productSampleCode"
>
<el-input
v-model=
"form.productSampleCode"
maxlength=
"64"
v-if=
"optType == 'view'"
/>
<el-input
v-model=
"form.productSampleCode"
placeholder=
"样品编号"
maxlength=
"64"
v-else
/>
<el-form-item
label=
"计量单位"
prop=
"unitOfMeasure"
>
<el-input
v-model=
"form.unitOfMeasure"
placeholder=
"请输入计量单位"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"品牌名称"
prop=
"brandName"
>
<el-input
v-model=
"form.brandName"
maxlength=
"64"
v-if=
"optType == 'view'"
/>
<el-input
v-model=
"form.brandName"
placeholder=
"请输入品牌名称"
maxlength=
"64"
v-else
/>
<el-col
:span=
"12"
>
<el-form-item
label=
"有效开始日期"
prop=
"expirationDateStart"
>
<el-date-picker
clearable
v-model=
"form.expirationDateStart"
type=
"date"
value-format=
"yyyy-MM-dd"
placeholder=
"请选择有效开始日期"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"产品类型"
prop=
"productType"
>
<el-input
v-model=
"form.productType"
maxlength=
"64"
v-if=
"optType == 'view'"
/>
<el-input
v-model=
"form.productType"
placeholder=
"请输入产品类型"
maxlength=
"64"
v-else
/>
<el-col
:span=
"12"
>
<el-form-item
label=
"有效结束日期"
prop=
"expirationDateEnd"
>
<el-date-picker
clearable
v-model=
"form.expirationDateEnd"
type=
"date"
value-format=
"yyyy-MM-dd"
placeholder=
"请选择有效结束日期"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"尺码组id"
prop=
"productSizeGroupId"
>
<el-input
v-model=
"form.productSizeGroupId"
maxlength=
"64"
v-if=
"optType == 'view'"
/>
<el-input
v-model=
"form.productSizeGroupId"
placeholder=
"请输入尺码组id"
maxlength=
"64"
v-else
/>
<el-form-item
label=
"品牌id"
prop=
"brandId"
>
<el-input
v-model=
"form.brandId"
placeholder=
"请输入品牌id"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"工厂名称"
prop=
"factoryName"
>
<el-input
v-model=
"form.factoryName"
maxlength=
"64"
v-if=
"optType == 'view'"
/>
<el-input
v-model=
"form.factoryName"
placeholder=
"请输入工厂名称"
maxlength=
"64"
v-else
/>
<el-form-item
label=
"尺码组id"
prop=
"sizeGroupId"
>
<el-input
v-model=
"form.sizeGroupId"
placeholder=
"请输入尺码组id"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"版面"
prop=
"
productL
ayout"
>
<el-select
v-model=
"form.
productLayout"
placeholder=
"请选择任务分组
"
>
<el-form-item
label=
"版面"
prop=
"
l
ayout"
>
<el-select
v-model=
"form.
layout"
placeholder=
"请选择版面
"
>
<el-option
v-for=
"dict in dict.type.product_layout"
:key=
"dict.value"
...
...
@@ -60,26 +64,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"产品代号"
prop=
"productNo"
>
<el-input
v-model=
"form.productNo"
maxlength=
"64"
v-if=
"optType == 'view'"
/>
<el-input
v-model=
"form.productNo"
placeholder=
"请输入产品代号"
maxlength=
"64"
v-else
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"英文名称"
prop=
"productEnglishName"
>
<el-input
v-model=
"form.productEnglishName"
maxlength=
"64"
v-if=
"optType == 'view'"
/>
<el-input
v-model=
"form.productEnglishName"
placeholder=
"请输入英文名称"
maxlength=
"64"
v-else
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"客户料号"
prop=
"customerMaterialCode"
>
<el-input
v-model=
"form.customerMaterialCode"
maxlength=
"64"
v-if=
"optType == 'view'"
/>
<el-input
v-model=
"form.customerMaterialCode"
placeholder=
"请输入客户料号"
maxlength=
"64"
v-else
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
...
...
@@ -116,18 +100,15 @@ export default {
},
// 表单参数
form
:
{
baseInfoId
:
''
,
productUnit
:
''
,
productStartDate
:
''
,
productSampleCode
:
''
,
brandName
:
''
,
productType
:
''
,
productSizeGroupId
:
''
,
factoryName
:
''
,
productLayout
:
''
,
productNo
:
''
,
productEnglishName
:
''
,
customerMaterialCode
:
''
,
itemId
:
''
,
productNo
:
''
,
productEnglishName
:
''
,
unitOfMeasure
:
''
,
expirationDateStart
:
''
,
expirationDateEnd
:
''
,
brandId
:
''
,
sizeGroupId
:
''
,
layout
:
''
,
},
// 表单校验
rules
:
{
...
...
@@ -166,17 +147,14 @@ export default {
reset
()
{
this
.
form
=
{
itemId
:
this
.
itemId
,
productUnit
:
null
,
productStartDate
:
null
,
productSampleCode
:
null
,
brandName
:
null
,
productType
:
null
,
productSizeGroupId
:
null
,
factoryName
:
null
,
productLayout
:
null
,
productNo
:
null
,
productEnglishName
:
null
,
customerMaterialCode
:
null
unitOfMeasure
:
null
,
expirationDateStart
:
null
,
expirationDateEnd
:
null
,
brandId
:
null
,
sizeGroupId
:
null
,
layout
:
null
,
};
this
.
resetForm
(
"form"
);
},
...
...
src/views/mes/md/product/components/customerLoss.vue
View file @
d3b84114
...
...
@@ -41,11 +41,12 @@
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<!--
<el-table-column
label=
"产品lossID"
align=
"center"
prop=
"productLossId"
/>
<el-table-column
label=
"产品ID"
align=
"center"
prop=
"itemId"
/>
-->
<el-table-column
label=
"产品最大loss数量"
align=
"center"
prop=
"productLossMax"
/>
<el-table-column
label=
"loss比率(单位%)"
align=
"center"
prop=
"productLossRate"
/>
<el-table-column
label=
"冗余量"
align=
"center"
prop=
"productLossRedundance"
/>
<el-table-column
label=
"备注信息"
align=
"center"
prop=
"productLossRemark"
/>
<el-table-column
label=
"客户名称"
align=
"center"
prop=
"customerName"
/>
<el-table-column
label=
"分段数量"
align=
"center"
prop=
"segmentCount"
/>
<el-table-column
label=
"最大loss数量"
align=
"center"
prop=
"maxLossCount"
/>
<el-table-column
label=
"loss比率(单位%)"
align=
"center"
prop=
"lossRate"
/>
<el-table-column
label=
"冗余量"
align=
"center"
prop=
"lossRedundance"
/>
<el-table-column
label=
"备注信息"
align=
"center"
prop=
"remark"
/>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<template
slot-scope=
"scope"
>
<el-button
...
...
@@ -80,20 +81,23 @@
<!-- <el-form-item label="产品ID" prop="itemId">
<el-input v-model="form.itemId" placeholder="请输入产品ID" />
</el-form-item>-->
<el-form-item
label=
"
产品最大loss数量"
prop=
"productLossMax
"
>
<el-input
v-model=
"form.
productLossMax"
placeholder=
"请输入产品最大loss数量
"
/>
<el-form-item
label=
"
客户名称"
prop=
"customerName
"
>
<el-input
v-model=
"form.
customerName"
placeholder=
"请输入客户名称
"
/>
</el-form-item>
<el-form-item
label=
"
loss比率(单位%)"
prop=
"productLossRate
"
>
<el-input
v-model=
"form.
productLossRate"
placeholder=
"请输入loss比率(单位%)
"
/>
<el-form-item
label=
"
分段数量"
prop=
"segmentCount
"
>
<el-input
v-model=
"form.
segmentCount"
placeholder=
"请输入分段数量
"
/>
</el-form-item>
<el-form-item
label=
"
冗余量"
prop=
"productLossRedundance
"
>
<el-input
v-model=
"form.
productLossRedundance"
placeholder=
"请输入冗余
量"
/>
<el-form-item
label=
"
最大loss数量"
prop=
"maxLossCount
"
>
<el-input
v-model=
"form.
maxLossCount"
placeholder=
"请输入最大loss数
量"
/>
</el-form-item>
<el-form-item
label=
"
备注信息"
prop=
"productLossRemark
"
>
<el-input
v-model=
"form.
productLossRemark"
placeholder=
"请输入备注信息
"
/>
<el-form-item
label=
"
loss比率(单位%)"
prop=
"lossRate
"
>
<el-input
v-model=
"form.
lossRate"
placeholder=
"请输入loss比率(单位%)
"
/>
</el-form-item>
<el-form-item
label=
"客户名称"
prop=
"customerName"
>
<el-input
v-model=
"form.customerName"
placeholder=
"请输入客户名称"
/>
<el-form-item
label=
"冗余量"
prop=
"lossRedundance"
>
<el-input
v-model=
"form.lossRedundance"
placeholder=
"请输入冗余量"
/>
</el-form-item>
<el-form-item
label=
"备注信息"
prop=
"remark"
>
<el-input
v-model=
"form.remark"
placeholder=
"请输入备注信息"
/>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
...
...
@@ -134,11 +138,12 @@ export default {
pageNum
:
1
,
pageSize
:
10
,
itemId
:
this
.
itemId
,
productLossMax
:
null
,
productLossRate
:
null
,
productLossRedundance
:
null
,
productLossRemark
:
null
,
customerName
:
null
customerId
:
null
,
segmentCount
:
null
,
maxLossCount
:
null
,
lossRate
:
null
,
lossRedundance
:
null
,
remark
:
null
},
// 表单参数
form
:
{},
...
...
@@ -174,11 +179,12 @@ export default {
this
.
form
=
{
productLossId
:
null
,
itemId
:
null
,
productLossMax
:
null
,
productLossRate
:
null
,
productLossRedundance
:
null
,
productLossRemark
:
null
,
customerName
:
null
customerId
:
null
,
segmentCount
:
null
,
maxLossCount
:
null
,
lossRate
:
null
,
lossRedundance
:
null
,
remark
:
null
};
this
.
resetForm
(
"form"
);
},
...
...
src/views/mes/md/product/components/faceColor.vue
View file @
d3b84114
...
...
@@ -32,6 +32,10 @@
<el-table-column
label=
"排序号"
align=
"center"
prop=
"sortOrder"
/>
<el-table-column
label=
"颜色"
align=
"center"
prop=
"colorName"
/>
<el-table-column
label=
"覆盖率(单位%)"
align=
"center"
prop=
"coverageRate"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"创建人"
align=
"center"
prop=
"createBy"
/>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
/>
<el-table-column
label=
"修改人"
align=
"center"
prop=
"updateBy"
/>
<el-table-column
label=
"修改时间"
align=
"center"
prop=
"updateTime"
/>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
v-if=
"optType !='view'"
>
<template
slot-scope=
"scope"
>
<el-button
...
...
@@ -118,7 +122,7 @@ export default {
colorId
:
null
,
mdFaceColorId
:
null
,
colorName
:
null
,
face
:
null
,
face
:
'front'
,
coverageRate
:
null
,
sortOrder
:
null
,
},
...
...
@@ -232,6 +236,7 @@ export default {
//this.form.itemId = element.itemId;
this
.
form
.
colorId
=
element
.
colorId
;
this
.
form
.
colorName
=
element
.
colorName
;
this
.
form
.
face
=
'front'
;
var
retFlag
=
false
;
addFaceColor
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"新增成功"
);
...
...
src/views/mes/md/product/components/factory.vue
View file @
d3b84114
...
...
@@ -51,8 +51,13 @@
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<!--
<el-table-column
label=
"产品工厂id"
align=
"center"
prop=
"productFactoryId"
/>
<el-table-column
label=
"产品id"
align=
"center"
prop=
"itemId"
/>
-->
<el-table-column
label=
"工厂id"
align=
"center"
prop=
"factoryId"
/>
<el-table-column
label=
"工厂编码"
align=
"center"
prop=
"factoryCode"
/>
<el-table-column
label=
"工厂名称"
align=
"center"
prop=
"factoryName"
/>
<el-table-column
label=
"创建人"
align=
"center"
prop=
"createBy"
/>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
/>
<el-table-column
label=
"修改人"
align=
"center"
prop=
"updateBy"
/>
<el-table-column
label=
"修改时间"
align=
"center"
prop=
"updateTime"
/>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<template
slot-scope=
"scope"
>
<el-button
...
...
@@ -84,6 +89,9 @@
<!-- 添加或修改产品工厂配置对话框 -->
<el-dialog
:title=
"title"
:visible
.
sync=
"open"
width=
"500px"
append-to-body
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"80px"
>
<el-form-item
label=
"工厂id"
prop=
"factoryId"
>
<el-input
v-model=
"form.factoryId"
placeholder=
"请选择工厂id"
/>
</el-form-item>
<el-form-item
label=
"工厂编码"
prop=
"factoryCode"
>
<el-input
v-model=
"form.factoryCode"
placeholder=
"请输入工厂编码"
/>
</el-form-item>
...
...
@@ -129,8 +137,13 @@ export default {
pageNum
:
1
,
pageSize
:
10
,
itemId
:
this
.
itemId
,
factoryId
:
null
,
factoryCode
:
null
,
factoryName
:
null
factoryName
:
null
,
createBy
:
null
,
createTime
:
null
,
updateBy
:
null
,
updateTime
:
null
},
// 表单参数
form
:
{},
...
...
@@ -166,8 +179,13 @@ export default {
this
.
form
=
{
productFactoryId
:
null
,
itemId
:
null
,
factoryId
:
null
,
factoryCode
:
null
,
factoryName
:
null
factoryName
:
null
,
createBy
:
null
,
createTime
:
null
,
updateBy
:
null
,
updateTime
:
null
};
this
.
resetForm
(
"form"
);
},
...
...
src/views/mes/md/product/components/look.vue
View file @
d3b84114
...
...
@@ -5,35 +5,35 @@
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"80px"
>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"长度cm"
prop=
"
productL
ength"
>
<el-input
v-model=
"form.
productL
ength"
type=
"number"
:precision=
"2"
placeholder=
"请输入长度"
/>
<el-form-item
label=
"长度cm"
prop=
"
l
ength"
>
<el-input
v-model=
"form.
l
ength"
type=
"number"
:precision=
"2"
placeholder=
"请输入长度"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"宽度cm"
prop=
"
productW
idth"
>
<el-input
v-model=
"form.
productW
idth"
type=
"number"
:precision=
"2"
placeholder=
"请输入宽度"
/>
<el-form-item
label=
"宽度cm"
prop=
"
w
idth"
>
<el-input
v-model=
"form.
w
idth"
type=
"number"
:precision=
"2"
placeholder=
"请输入宽度"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"高度cm"
prop=
"
productH
eight"
>
<el-input
v-model=
"form.
productH
eight"
type=
"number"
:precision=
"2"
placeholder=
"请输入高度"
/>
<el-form-item
label=
"高度cm"
prop=
"
h
eight"
>
<el-input
v-model=
"form.
h
eight"
type=
"number"
:precision=
"2"
placeholder=
"请输入高度"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"厚度mm"
prop=
"
productT
hick"
>
<el-input
v-model=
"form.
productT
hick"
type=
"number"
:precision=
"2"
placeholder=
"请输入厚度"
/>
<el-form-item
label=
"厚度mm"
prop=
"
t
hick"
>
<el-input
v-model=
"form.
t
hick"
type=
"number"
:precision=
"2"
placeholder=
"请输入厚度"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"成品克重g"
prop=
"
productW
eight"
>
<el-input
v-model=
"form.
productW
eight"
type=
"number"
:precision=
"2"
placeholder=
"请输入成品克重"
/>
<el-form-item
label=
"成品克重g"
prop=
"
w
eight"
>
<el-input
v-model=
"form.
w
eight"
type=
"number"
:precision=
"2"
placeholder=
"请输入成品克重"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"角型"
prop=
"
productA
ngleType"
>
<el-select
v-model=
"form.
productA
ngleType"
placeholder=
"请选择角型"
>
<el-form-item
label=
"角型"
prop=
"
a
ngleType"
>
<el-select
v-model=
"form.
a
ngleType"
placeholder=
"请选择角型"
>
<el-option
v-for=
"dict in dict.type.product_shape"
:key=
"dict.value"
...
...
@@ -46,35 +46,35 @@
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"角度(mm)"
prop=
"
productA
ngle"
>
<el-input
v-model=
"form.
productA
ngle"
type=
"number"
:precision=
"2"
placeholder=
"请输入角度"
/>
<el-form-item
label=
"角度(mm)"
prop=
"
a
ngle"
>
<el-input
v-model=
"form.
a
ngle"
type=
"number"
:precision=
"2"
placeholder=
"请输入角度"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"孔径(mm)"
prop=
"
productA
perture"
>
<el-input
v-model=
"form.
productA
perture"
type=
"number"
:precision=
"2"
placeholder=
"请输入孔径"
/>
<el-form-item
label=
"孔径(mm)"
prop=
"
a
perture"
>
<el-input
v-model=
"form.
a
perture"
type=
"number"
:precision=
"2"
placeholder=
"请输入孔径"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"单层厚(丝)"
prop=
"
productSingleLayer
"
>
<el-input
v-model=
"form.
productSingleLayer
"
type=
"number"
:precision=
"2"
placeholder=
"请输入单层厚(单位丝)"
/>
<el-form-item
label=
"单层厚(丝)"
prop=
"
singleLayerThick
"
>
<el-input
v-model=
"form.
singleLayerThick
"
type=
"number"
:precision=
"2"
placeholder=
"请输入单层厚(单位丝)"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"单重(KG)"
prop=
"
productS
ingleWeight"
>
<el-input
v-model=
"form.
productS
ingleWeight"
type=
"number"
:precision=
"2"
placeholder=
"请输入单重"
/>
<el-form-item
label=
"单重(KG)"
prop=
"
s
ingleWeight"
>
<el-input
v-model=
"form.
s
ingleWeight"
type=
"number"
:precision=
"2"
placeholder=
"请输入单重"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"层数"
prop=
"
productL
ayerNum"
>
<el-input
v-model=
"form.
productL
ayerNum"
type=
"number"
:precision=
"2"
placeholder=
"请输入层数"
/>
<el-form-item
label=
"层数"
prop=
"
l
ayerNum"
>
<el-input
v-model=
"form.
l
ayerNum"
type=
"number"
:precision=
"2"
placeholder=
"请输入层数"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"是否防霉"
prop=
"
product
Mould"
>
<el-select
v-model=
"form.
product
Mould"
placeholder=
"请选择是否防霉"
>
<el-form-item
label=
"是否防霉"
prop=
"
is
Mould"
>
<el-select
v-model=
"form.
is
Mould"
placeholder=
"请选择是否防霉"
>
<el-option
v-for=
"dict in dict.type.sys_yes_no"
:key=
"dict.value"
...
...
@@ -87,8 +87,8 @@
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"是否写码"
prop=
"
product
Coding"
>
<el-select
v-model=
"form.
product
Coding"
placeholder=
"请选择是否写码"
>
<el-form-item
label=
"是否写码"
prop=
"
is
Coding"
>
<el-select
v-model=
"form.
is
Coding"
placeholder=
"请选择是否写码"
>
<el-option
v-for=
"dict in dict.type.sys_yes_no"
:key=
"dict.value"
...
...
@@ -99,20 +99,15 @@
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"体系认证"
prop=
"productSysCertification"
>
<el-input
v-model=
"form.productSysCertification"
placeholder=
"请输入体系认证"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"采购单位"
prop=
"productBuyUnit"
>
<el-input
v-model=
"form.productBuyUnit"
placeholder=
"请输入采购单位"
/>
<el-form-item
label=
"体系认证"
prop=
"certification"
>
<el-input
v-model=
"form.certification"
placeholder=
"请输入体系认证"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"样品形状"
prop=
"
productS
hape"
>
<el-select
v-model=
"form.
productS
hape"
placeholder=
"请选择样品形状"
>
<el-form-item
label=
"样品形状"
prop=
"
s
hape"
>
<el-select
v-model=
"form.
s
hape"
placeholder=
"请选择样品形状"
>
<el-option
v-for=
"dict in dict.type.product_shape"
:key=
"dict.value"
...
...
@@ -123,16 +118,35 @@
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"样品形状大小"
prop=
"productShapeSize"
>
<el-input
v-model=
"form.productShapeSize"
type=
"number"
:precision=
"4"
placeholder=
"请输入样品形状大小"
/>
<el-form-item
label=
"样品形状大小"
prop=
"shapeSize"
>
<el-input
v-model=
"form.shapeSize"
type=
"number"
:precision=
"4"
placeholder=
"请输入样品形状大小"
/>
</el-form-item>
</el-col>
</el-row>
<!--
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"创建人"
prop=
"createBy"
>
<el-input
v-model=
"form.createBy"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"
换算值"
prop=
"purchaseConversionValu
e"
>
<el-input
v-model=
"form.
purchaseConversionValue"
type=
"number"
:precision=
"4"
placeholder=
"请输入采购换算值
"
/>
<el-form-item
label=
"
创建日期"
prop=
"createTim
e"
>
<el-input
v-model=
"form.
createTime
"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"修改人"
prop=
"updateBy"
>
<el-input
v-model=
"form.updateBy"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"修改日期"
prop=
"updateTime"
>
<el-input
v-model=
"form.updateTime"
/>
</el-form-item>
</el-col>
</el-row>
-->
</el-form>
</div>
</
template
>
...
...
@@ -168,24 +182,26 @@ export default {
},
// 表单参数
form
:
{
productLength
:
''
,
productWidth
:
''
,
productHeight
:
''
,
productThick
:
''
,
productWeight
:
''
,
productAngleType
:
''
,
productAngle
:
''
,
productAperture
:
''
,
productSingleLayer
:
''
,
productSingleWeight
:
''
,
productLayerNum
:
''
,
productMould
:
''
,
productCoding
:
''
,
productSysCertification
:
''
,
productBuyUnit
:
''
,
productShape
:
''
,
productShapeSize
:
''
,
purchaseConversionValue
:
''
length
:
''
,
width
:
''
,
height
:
''
,
thick
:
''
,
weight
:
''
,
angleType
:
''
,
angle
:
''
,
aperture
:
''
,
singleLayerThick
:
''
,
singleWeight
:
''
,
layerNum
:
''
,
isMould
:
''
,
isCoding
:
''
,
certification
:
''
,
shape
:
''
,
shapeSize
:
''
,
createBy
:
''
,
createTime
:
''
,
updateBy
:
''
,
updateTime
:
''
},
// 表单校验
rules
:
{
...
...
@@ -223,24 +239,26 @@ export default {
reset
()
{
this
.
form
=
{
itemId
:
this
.
itemId
,
productLength
:
null
,
productWidth
:
null
,
productHeight
:
null
,
productThick
:
null
,
productWeight
:
null
,
productAngleType
:
null
,
productAngle
:
null
,
productAperture
:
null
,
productSingleLayer
:
null
,
productSingleWeight
:
null
,
productLayerNum
:
null
,
productMould
:
null
,
productCoding
:
null
,
productSysCertification
:
null
,
productBuyUnit
:
null
,
productShape
:
null
,
productShapeSize
:
null
,
purchaseConversionValue
:
null
length
:
null
,
width
:
null
,
height
:
null
,
thick
:
null
,
weight
:
null
,
angleType
:
null
,
angle
:
null
,
aperture
:
null
,
singleLayerThick
:
null
,
singleWeight
:
null
,
layerNum
:
null
,
isMould
:
null
,
isCoding
:
null
,
certification
:
null
,
shape
:
null
,
shapeSize
:
null
,
createBy
:
null
,
createTime
:
null
,
updateBy
:
null
,
updateTime
:
null
};
this
.
resetForm
(
"form"
);
},
...
...
src/views/mes/md/product/components/publishedConf.vue
View file @
d3b84114
...
...
@@ -46,7 +46,6 @@
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"印张长度(cm)"
prop=
"sheetLength"
>
<!--
<el-input
v-model=
"form.sheetLength"
placeholder=
"请输入印张长度(单位cm)"
/>
-->
<el-input
v-model=
"form.sheetLength"
type=
"number"
:precision=
"2"
placeholder=
"请输入印张长度(单位cm)"
/>
</el-form-item>
</el-col>
...
...
@@ -99,7 +98,11 @@ export default {
columnDoubleBlade
:
''
,
dispatchMultiple
:
''
,
sheetLength
:
''
,
sheetWidth
:
''
sheetWidth
:
''
,
createBy
:
''
,
createTime
:
''
,
updateBy
:
''
,
updateTime
:
''
},
// 表单校验
rules
:
{
...
...
@@ -145,7 +148,11 @@ export default {
columnDoubleBlade
:
null
,
dispatchMultiple
:
null
,
sheetLength
:
null
,
sheetWidth
:
null
sheetWidth
:
null
,
createBy
:
null
,
createTime
:
null
,
updateBy
:
null
,
updateTime
:
null
};
this
.
resetForm
(
"form"
);
},
...
...
src/views/mes/md/product/index.vue
View file @
d3b84114
...
...
@@ -321,27 +321,24 @@
<el-tab-pane
label=
"工厂信息"
>
<Factory
:optType=
"optType"
:itemId=
"form.itemId"
></Factory>
</el-tab-pane>
<el-tab-pane
label=
"客户信息"
>
<!--
<el-tab-pane label="客户信息">
<Customer :optType="optType" :itemId="form.itemId"></Customer>
</el-tab-pane>
</el-tab-pane>
-->
<el-tab-pane
label=
"产品外观"
>
<Look
ref=
"look"
:optType=
"optType"
:itemId=
"form.itemId"
></Look>
</el-tab-pane>
<el-tab-pane
label=
"排版参数"
>
<PublishedConf
ref=
"publishedConf"
:optType=
"optType"
:itemId=
"form.itemId"
></PublishedConf>
</el-tab-pane>
<el-tab-pane
label=
"正
反
面颜色"
>
<el-tab-pane
label=
"正面颜色"
>
<FaceColor
:optType=
"optType"
:itemId=
"form.itemId"
></FaceColor>
</el-tab-pane>
<el-tab-pane
label=
"反面颜色"
>
<BackFaceColor
:optType=
"optType"
:itemId=
"form.itemId"
></BackFaceColor>
</el-tab-pane>
<el-tab-pane
label=
"客户loss"
>
<CustomerLoss
:optType=
"optType"
:itemId=
"form.itemId"
></CustomerLoss>
</el-tab-pane>
<el-tab-pane
label=
"BOM组成"
>
<ItemBom
:optType=
"optType"
:itemId=
"form.itemId"
></ItemBom>
</el-tab-pane>
<el-tab-pane
label=
"供应商"
></el-tab-pane>
<el-tab-pane
label=
"替代品"
></el-tab-pane>
<el-tab-pane
label=
"SIP"
></el-tab-pane>
<el-tab-pane
label=
"SOP"
>
<SOPTab
:itemId=
"form.itemId"
:optType=
"optType"
></SOPTab>
</el-tab-pane>
...
...
@@ -397,6 +394,7 @@ import Customer from "./components/customer.vue";
import
Look
from
"./components/look.vue"
;
import
PublishedConf
from
"./components/publishedConf.vue"
;
import
FaceColor
from
"./components/faceColor.vue"
;
import
BackFaceColor
from
"./components/backFaceColor.vue"
;
import
CustomerLoss
from
"./components/customerLoss.vue"
;
import
ItemBom
from
"./components/itembom.vue"
;
import
SOPTab
from
"./components/sop.vue"
...
...
@@ -410,7 +408,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export
default
{
name
:
"MdItem"
,
dicts
:
[
'sys_yes_no'
,
'mes_item_product'
],
components
:
{
Treeselect
,
BaseInfo
,
SpecProperty
,
Purchase
,
Factory
,
Customer
,
Look
,
PublishedConf
,
FaceColor
,
CustomerLoss
,
ItemBom
,
SOPTab
},
components
:
{
Treeselect
,
BaseInfo
,
SpecProperty
,
Purchase
,
Factory
,
Customer
,
Look
,
PublishedConf
,
FaceColor
,
BackFaceColor
,
CustomerLoss
,
ItemBom
,
SOPTab
},
data
()
{
return
{
// 遮罩层
...
...
src/views/mes/md/workunit/index.vue
0 → 100644
View file @
d3b84114
<
template
>
<div
class=
"app-container"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"68px"
>
<el-form-item
label=
"工作单元编码"
prop=
"workunitCode"
>
<el-input
v-model=
"queryParams.workunitCode"
placeholder=
"请输入工作单元编码"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"工作单元名称"
prop=
"workunitName"
>
<el-input
v-model=
"queryParams.workunitName"
placeholder=
"请输入工作单元名称"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"是否启用"
prop=
"enableFlag"
>
<el-select
v-model=
"queryParams.enableFlag"
placeholder=
"请选择是或否"
clearable
>
<el-option
v-for=
"dict in dict.type.sys_yes_no"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
size=
"mini"
@
click=
"handleQuery"
>
搜索
</el-button>
<el-button
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button>
</el-form-item>
</el-form>
<el-row
:gutter=
"10"
class=
"mb8"
>
<el-col
:span=
"1.5"
>
<el-button
type=
"primary"
plain
icon=
"el-icon-plus"
size=
"mini"
@
click=
"handleAdd"
v-hasPermi=
"['md:workunit:add']"
>
新增
</el-button>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"success"
plain
icon=
"el-icon-edit"
size=
"mini"
:disabled=
"single"
@
click=
"handleUpdate"
v-hasPermi=
"['md:workunit:edit']"
>
修改
</el-button>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"danger"
plain
icon=
"el-icon-delete"
size=
"mini"
:disabled=
"multiple"
@
click=
"handleDelete"
v-hasPermi=
"['md:workunit:remove']"
>
删除
</el-button>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"warning"
plain
icon=
"el-icon-download"
size=
"mini"
@
click=
"handleExport"
v-hasPermi=
"['md:workunit:export']"
>
导出
</el-button>
</el-col>
<right-toolbar
:showSearch
.
sync=
"showSearch"
@
queryTable=
"getList"
></right-toolbar>
</el-row>
<el-table
v-loading=
"loading"
:data=
"workunitList"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<!--
<el-table-column
label=
"工作单元ID"
align=
"center"
prop=
"workunitId"
/>
-->
<el-table-column
label=
"工作站ID"
align=
"center"
prop=
"workstationId"
/>
<el-table-column
label=
"工作单元编码"
align=
"center"
prop=
"workunitCode"
/>
<el-table-column
label=
"工作单元名称"
align=
"center"
prop=
"workunitName"
/>
<el-table-column
label=
"是否启用"
align=
"center"
prop=
"enableFlag"
>
<template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.sys_yes_no"
:value=
"scope.row.enableFlag"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"备注"
align=
"center"
prop=
"remark"
/>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleUpdate(scope.row)"
v-hasPermi=
"['md:workunit:edit']"
>
修改
</el-button>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-delete"
@
click=
"handleDelete(scope.row)"
v-hasPermi=
"['md:workunit:remove']"
>
删除
</el-button>
</
template
>
</el-table-column>
</el-table>
<pagination
v-show=
"total>0"
:total=
"total"
:page
.
sync=
"queryParams.pageNum"
:limit
.
sync=
"queryParams.pageSize"
@
pagination=
"getList"
/>
<!-- 添加或修改工作单元对话框 -->
<el-dialog
:title=
"title"
:visible
.
sync=
"open"
width=
"500px"
append-to-body
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"80px"
>
<el-form-item
label=
"工作站"
prop=
"workstation"
>
<el-input
v-model=
"form.workstation"
placeholder=
"请输入工作站"
>
<el-button
slot=
"append"
icon=
"el-icon-search"
@
click=
"handleWorkstationSelect"
></el-button>
</el-input>
</el-form-item>
<WorkstationSelect
ref=
"workstationSelect"
@
onSelected=
"onWorkstationSelected"
>
</WorkstationSelect>
<el-form-item
label=
"工作单元编码"
prop=
"workunitCode"
>
<el-input
v-model=
"form.workunitCode"
placeholder=
"请输入工作单元编码"
/>
</el-form-item>
<el-form-item
label=
"工作单元名称"
prop=
"workunitName"
>
<el-input
v-model=
"form.workunitName"
placeholder=
"请输入工作单元名称"
/>
</el-form-item>
<el-form-item
label=
"是否启用"
prop=
"enableFlag"
>
<el-select
v-model=
"form.enableFlag"
placeholder=
"请选择是或否"
>
<el-option
v-for=
"dict in dict.type.sys_yes_no"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"备注"
prop=
"remark"
>
<el-input
v-model=
"form.remark"
placeholder=
"请输入备注"
/>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"submitForm"
>
确 定
</el-button>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
</div>
</el-dialog>
</div>
</template>
<
script
>
import
{
listWorkunit
,
getWorkunit
,
delWorkunit
,
addWorkunit
,
updateWorkunit
}
from
"@/api/mes/md/workunit"
;
import
WorkstationSelect
from
"@/components/workstationSelect/simpletableSingle.vue"
;
export
default
{
name
:
"Workunit"
,
components
:
{
WorkstationSelect
},
dicts
:[
'sys_yes_no'
],
data
()
{
return
{
// 遮罩层
loading
:
true
,
// 选中数组
ids
:
[],
// 非单个禁用
single
:
true
,
// 非多个禁用
multiple
:
true
,
// 显示搜索条件
showSearch
:
true
,
// 总条数
total
:
0
,
// 工作单元表格数据
workunitList
:
[],
// 弹出层标题
title
:
""
,
// 是否显示弹出层
open
:
false
,
// 查询参数
queryParams
:
{
pageNum
:
1
,
pageSize
:
10
,
workstationId
:
null
,
workunitCode
:
null
,
workunitName
:
null
,
enableFlag
:
null
,
},
// 表单参数
form
:
{
workstationId
:
''
,
workunitCode
:
''
,
workstation
:
''
,
workunitName
:
''
,
enableFlag
:
''
,
},
// 表单校验
rules
:
{
}
};
},
created
()
{
this
.
getList
();
},
methods
:
{
/** 查询工作单元列表 */
getList
()
{
this
.
loading
=
true
;
listWorkunit
(
this
.
queryParams
).
then
(
response
=>
{
this
.
workunitList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
});
},
// 取消按钮
cancel
()
{
this
.
open
=
false
;
this
.
reset
();
},
// 表单重置
reset
()
{
this
.
form
=
{
workstationId
:
''
,
workunitCode
:
''
,
workstation
:
''
,
workunitName
:
''
,
enableFlag
:
''
,
}
this
.
resetForm
(
"form"
);
},
/** 搜索按钮操作 */
handleQuery
()
{
this
.
queryParams
.
pageNum
=
1
;
this
.
getList
();
},
/** 重置按钮操作 */
resetQuery
()
{
this
.
resetForm
(
"queryForm"
);
this
.
handleQuery
();
},
// 多选框选中数据
handleSelectionChange
(
selection
)
{
this
.
ids
=
selection
.
map
(
item
=>
item
.
workunitId
)
this
.
single
=
selection
.
length
!==
1
this
.
multiple
=
!
selection
.
length
},
/** 新增按钮操作 */
handleAdd
()
{
this
.
reset
();
this
.
open
=
true
;
this
.
title
=
"添加工作单元"
;
},
/** 修改按钮操作 */
handleUpdate
(
row
)
{
this
.
reset
();
const
workunitId
=
row
.
workunitId
||
this
.
ids
getWorkunit
(
workunitId
).
then
(
response
=>
{
this
.
form
=
response
.
data
;
this
.
open
=
true
;
this
.
title
=
"修改工作单元"
;
});
},
/** 提交按钮 */
submitForm
()
{
this
.
$refs
[
"form"
].
validate
(
valid
=>
{
if
(
valid
)
{
if
(
this
.
form
.
workunitId
!=
null
)
{
updateWorkunit
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"修改成功"
);
this
.
open
=
false
;
this
.
getList
();
});
}
else
{
addWorkunit
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"新增成功"
);
this
.
open
=
false
;
this
.
getList
();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete
(
row
)
{
const
workunitIds
=
row
.
workunitId
||
this
.
ids
;
this
.
$modal
.
confirm
(
'是否确认删除工作单元编号为"'
+
workunitIds
+
'"的数据项?'
).
then
(
function
()
{
return
delWorkunit
(
workunitIds
);
}).
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"删除成功"
);
}).
catch
(()
=>
{});
},
/** 导出按钮操作 */
handleExport
()
{
this
.
download
(
'md/workunit/export'
,
{
...
this
.
queryParams
},
`workunit_
${
new
Date
().
getTime
()}
.xlsx`
)
},
handleWorkstationSelect
(){
this
.
$refs
.
workstationSelect
.
showFlag
=
true
;
this
.
$refs
.
workstationSelect
.
getList
();
},
onWorkstationSelected
(
row
){
console
.
log
(
row
,
'rowwwwwww'
)
if
(
row
!=
undefined
&&
row
!=
null
){
this
.
form
.
workstationId
=
row
.
workstationId
;
this
.
form
.
workstation
=
row
.
workstationName
;
}
},
}
};
</
script
>
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