Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Skyeye云
Skyeye
提交
9e47720a
S
Skyeye
项目概览
Skyeye云
/
Skyeye
通知
1423
Star
161
Fork
130
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Skyeye
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
9e47720a
编写于
7月 15, 2024
作者:
L
LAPTOP-NDCM9L6Q\王丽雅
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update:仓库入库单 禁止新增
上级
66440cb2
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
377 addition
and
67 deletion
+377
-67
erp-produce/src/main/resources/template/js/departmentMachining/departmentMachiningList.js
...emplate/js/departmentMachining/departmentMachiningList.js
+170
-0
erp-produce/src/main/resources/template/js/erpPreProductionPlan/erpPreProductionPlanList.js
...plate/js/erpPreProductionPlan/erpPreProductionPlanList.js
+27
-14
erp-produce/src/main/resources/template/js/erpPreProductionPlan/preProductionTurnToProduction.js
.../js/erpPreProductionPlan/preProductionTurnToProduction.js
+48
-0
erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js
.../resources/template/js/erpProduction/erpProductionList.js
+23
-24
erp-produce/src/main/resources/template/js/wholeOut/wholeOutList.js
...e/src/main/resources/template/js/wholeOut/wholeOutList.js
+14
-16
erp-produce/src/main/resources/template/tpl/departmentMachining/departmentMachiningList.html
...late/tpl/departmentMachining/departmentMachiningList.html
+46
-4
erp-produce/src/main/resources/template/tpl/erpPreProductionPlan/erpPreProductionPlanList.html
...te/tpl/erpPreProductionPlan/erpPreProductionPlanList.html
+15
-3
erp-produce/src/main/resources/template/tpl/erpPreProductionPlan/preProductionTurnToProduction.html
...l/erpPreProductionPlan/preProductionTurnToProduction.html
+29
-0
erp/src/main/resources/template/tpl/depotPut/list.html
erp/src/main/resources/template/tpl/depotPut/list.html
+0
-1
erp/src/main/resources/template/tpl/salesOrder/salesOrderList.html
...ain/resources/template/tpl/salesOrder/salesOrderList.html
+5
-5
未找到文件。
erp-produce/src/main/resources/template/js/departmentMachining/departmentMachiningList.js
浏览文件 @
9e47720a
var
rowId
=
""
;
layui
.
config
({
base
:
basePath
,
version
:
skyeyeVersion
}).
extend
({
window
:
'
js/winui.window
'
}).
define
([
'
window
'
,
'
table
'
,
'
jquery
'
,
'
winui
'
,
'
form
'
],
function
(
exports
)
{
winui
.
renderColor
();
var
$
=
layui
.
$
,
form
=
layui
.
form
,
table
=
layui
.
table
;
// 新增
authBtn
(
'
1720796297124
'
);
table
.
render
({
id
:
'
messageTable
'
,
elem
:
'
#messageTable
'
,
method
:
'
post
'
,
// 获取加工单列表
url
:
sysMainMation
.
erpBasePath
+
'
erpmachin001
'
,
where
:
getTableParams
(),
even
:
true
,
page
:
true
,
limits
:
getLimits
(),
limit
:
getLimit
(),
cols
:
[[
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
rowspan
:
'
2
'
,
type
:
'
numbers
'
},
{
field
:
'
oddNumber
'
,
title
:
'
加工单号
'
,
align
:
'
center
'
,
rowspan
:
'
2
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
oddNumber
+
'
</a>
'
;
}},
{
field
:
'
operTime
'
,
title
:
'
单据日期
'
,
align
:
'
center
'
,
rowspan
:
'
2
'
,
width
:
140
},
{
colspan
:
'
2
'
,
title
:
'
来源单据信息
'
,
align
:
'
center
'
},
{
field
:
'
processInstanceId
'
,
title
:
'
流程ID
'
,
rowspan
:
'
2
'
,
width
:
100
,
templet
:
function
(
d
)
{
return
'
<a lay-event="processDetails" class="notice-title-click">
'
+
getNotUndefinedVal
(
d
.
processInstanceId
)
+
'
</a>
'
;
}},
{
field
:
'
state
'
,
title
:
'
状态
'
,
rowspan
:
'
2
'
,
width
:
90
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
flowableStateEnum
"
,
'
id
'
,
d
.
state
,
'
name
'
);
}},
{
field
:
'
createName
'
,
title
:
systemLanguage
[
"
com.skyeye.createName
"
][
languageType
],
rowspan
:
'
2
'
,
width
:
120
},
{
field
:
'
createTime
'
,
title
:
systemLanguage
[
"
com.skyeye.createTime
"
][
languageType
],
align
:
'
center
'
,
rowspan
:
'
2
'
,
width
:
150
},
{
field
:
'
lastUpdateName
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateName
"
][
languageType
],
align
:
'
left
'
,
rowspan
:
'
2
'
,
width
:
120
},
{
field
:
'
lastUpdateTime
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateTime
"
][
languageType
],
align
:
'
center
'
,
rowspan
:
'
2
'
,
width
:
150
},
{
title
:
systemLanguage
[
"
com.skyeye.operation
"
][
languageType
],
fixed
:
'
right
'
,
align
:
'
center
'
,
rowspan
:
'
2
'
,
width
:
240
,
toolbar
:
'
#tableBar
'
}
],[
{
field
:
'
fromTypeId
'
,
title
:
'
来源类型
'
,
rowspan
:
'
2
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
sealOutLetFromType
"
,
'
id
'
,
d
.
fromTypeId
,
'
name
'
);
}},
{
field
:
'
fromId
'
,
title
:
'
单据编号
'
,
rowspan
:
'
2
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
getNotUndefinedVal
(
d
.
fromMation
?.
oddNumber
);
}}
]],
done
:
function
(
json
)
{
matchingLanguage
();
initTableSearchUtil
.
initAdvancedSearch
(
this
,
json
.
searchFilter
,
form
,
"
请输入单号
"
,
function
()
{
table
.
reloadData
(
"
messageTable
"
,
{
page
:
{
curr
:
1
},
where
:
getTableParams
()});
});
}
});
table
.
on
(
'
tool(messageTable)
'
,
function
(
obj
)
{
var
data
=
obj
.
data
;
var
layEvent
=
obj
.
event
;
if
(
layEvent
===
'
delete
'
)
{
//删除
del
(
data
,
obj
);
}
else
if
(
layEvent
===
'
edit
'
)
{
//编辑
edit
(
data
);
}
else
if
(
layEvent
===
'
details
'
)
{
//详情
details
(
data
);
}
else
if
(
layEvent
===
'
subApproval
'
)
{
//提交审核
subApproval
(
data
);
}
else
if
(
layEvent
===
'
processDetails
'
)
{
// 工作流流程详情查看
activitiUtil
.
activitiDetails
(
data
);
}
else
if
(
layEvent
===
'
revoke
'
)
{
//撤销
revoke
(
data
);
}
});
// 新增
$
(
"
body
"
).
on
(
"
click
"
,
"
#addBean
"
,
function
()
{
_openNewWindows
({
url
:
systemCommonUtil
.
getUrl
(
'
FP2023100300001
'
,
null
),
title
:
systemLanguage
[
"
com.skyeye.addPageTitle
"
][
languageType
],
pageId
:
"
machiningAdd
"
,
area
:
[
'
90vw
'
,
'
90vh
'
],
callBack
:
function
(
refreshCode
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.successfulOperation
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
});
// 编辑
function
edit
(
data
)
{
_openNewWindows
({
url
:
systemCommonUtil
.
getUrl
(
'
FP2023100300002&id=
'
+
data
.
id
,
null
),
title
:
systemLanguage
[
"
com.skyeye.editPageTitle
"
][
languageType
],
pageId
:
"
machiningEdit
"
,
area
:
[
'
90vw
'
,
'
90vh
'
],
callBack
:
function
(
refreshCode
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.successfulOperation
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
}
// 详情
function
details
(
data
)
{
_openNewWindows
({
url
:
systemCommonUtil
.
getUrl
(
'
FP2023100300003&id=
'
+
data
.
id
,
null
),
title
:
systemLanguage
[
"
com.skyeye.detailsPageTitle
"
][
languageType
],
pageId
:
"
machiningDetail
"
,
area
:
[
'
90vw
'
,
'
90vh
'
],
callBack
:
function
(
refreshCode
)
{
}});
}
// 删除
function
del
(
data
,
obj
)
{
layer
.
confirm
(
systemLanguage
[
"
com.skyeye.deleteOperationMsg
"
][
languageType
],
{
icon
:
3
,
title
:
systemLanguage
[
"
com.skyeye.deleteOperation
"
][
languageType
]},
function
(
index
)
{
layer
.
close
(
index
);
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
deleteMachinById
"
,
params
:
{
id
:
data
.
id
},
type
:
'
json
'
,
method
:
'
DELETE
'
,
callback
:
function
(
json
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.deleteOperationSuccessMsg
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
});
}
// 提交审批
function
subApproval
(
data
)
{
layer
.
confirm
(
systemLanguage
[
"
com.skyeye.approvalOperationMsg
"
][
languageType
],
{
icon
:
3
,
title
:
systemLanguage
[
"
com.skyeye.approvalOperation
"
][
languageType
]},
function
(
index
)
{
layer
.
close
(
index
);
activitiUtil
.
startProcess
(
data
.
serviceClassName
,
null
,
function
(
approvalId
)
{
var
params
=
{
id
:
data
.
id
,
approvalId
:
approvalId
};
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
erpmachin007
"
,
params
:
params
,
type
:
'
json
'
,
method
:
'
POST
'
,
callback
:
function
(
json
)
{
winui
.
window
.
msg
(
"
提交成功
"
,
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
});
});
}
// 撤销
function
revoke
(
data
)
{
layer
.
confirm
(
'
确认撤销该申请吗?
'
,
{
icon
:
3
,
title
:
'
撤销操作
'
},
function
(
index
)
{
layer
.
close
(
index
);
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
revokeMachin
"
,
params
:
{
processInstanceId
:
data
.
processInstanceId
},
type
:
'
json
'
,
method
:
"
PUT
"
,
callback
:
function
(
json
)
{
winui
.
window
.
msg
(
"
提交成功
"
,
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
});
}
form
.
render
();
$
(
"
body
"
).
on
(
"
click
"
,
"
#reloadTable
"
,
function
()
{
loadTable
();
});
function
loadTable
()
{
table
.
reloadData
(
"
messageTable
"
,
{
where
:
getTableParams
()});
}
function
getTableParams
()
{
return
$
.
extend
(
true
,
{},
initTableSearchUtil
.
getSearchValue
(
"
messageTable
"
));
}
exports
(
'
departmentMachiningList
'
,
{});
});
erp-produce/src/main/resources/template/js/erpPreProductionPlan/erpPreProductionPlanList.js
浏览文件 @
9e47720a
...
...
@@ -28,22 +28,20 @@ layui.config({
limit
:
getLimit
(),
cols
:
[[
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
rowspan
:
'
2
'
,
type
:
'
numbers
'
},
{
field
:
'
oddNumber
'
,
title
:
'
生产
单号
'
,
align
:
'
center
'
,
rowspan
:
'
2
'
,
width
:
200
,
templet
:
function
(
d
)
{
{
field
:
'
oddNumber
'
,
title
:
'
单号
'
,
align
:
'
center
'
,
rowspan
:
'
2
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
oddNumber
+
'
</a>
'
;
}},
{
field
:
'
operTime
'
,
title
:
'
单据日期
'
,
align
:
'
center
'
,
rowspan
:
'
2
'
,
width
:
140
},
{
colspan
:
'
2
'
,
title
:
'
来源单据信息
'
,
align
:
'
center
'
},
{
field
:
'
processInstanceId
'
,
title
:
'
流程ID
'
,
rowspan
:
'
2
'
,
width
:
100
,
templet
:
function
(
d
)
{
return
'
<a lay-event="processDetails" class="notice-title-click">
'
+
getNotUndefinedVal
(
d
.
processInstanceId
)
+
'
</a>
'
;
}},
{
field
:
'
state
'
,
title
:
'
状态
'
,
rowspan
:
'
2
'
,
width
:
90
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
flowableStateEnum
"
,
'
id
'
,
d
.
state
,
'
name
'
);
{
field
:
'
processInstanceId
'
,
title
:
'
流程ID
'
,
width
:
280
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
getNotUndefinedVal
(
d
.
processInstanceId
)
+
'
</a>
'
;
}},
{
field
:
'
createName
'
,
title
:
systemLanguage
[
"
com.skyeye.createName
"
][
languageType
],
rowspan
:
'
2
'
,
width
:
120
},
{
field
:
'
createTime
'
,
title
:
systemLanguage
[
"
com.skyeye.createTime
"
][
languageType
],
align
:
'
center
'
,
rowspan
:
'
2
'
,
width
:
150
},
{
field
:
'
lastUpdateName
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateName
"
][
languageType
],
align
:
'
left
'
,
rowspan
:
'
2
'
,
width
:
120
},
{
field
:
'
lastUpdateTime
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateTime
"
][
languageType
],
align
:
'
center
'
,
rowspan
:
'
2
'
,
width
:
150
},
{
title
:
systemLanguage
[
"
com.skyeye.operation
"
][
languageType
],
fixed
:
'
right
'
,
align
:
'
center
'
,
rowspan
:
'
2
'
,
width
:
240
,
toolbar
:
'
#tableBar
'
}
{
colspan
:
'
2
'
,
title
:
'
来源单据信息
'
,
align
:
'
center
'
},
{
field
:
'
operTime
'
,
width
:
150
,
title
:
'
单据日期
'
,
rowspan
:
'
2
'
,
align
:
'
center
'
},
{
field
:
'
name
'
,
title
:
'
产品名称
'
,
align
:
'
left
'
,
rowspan
:
'
2
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
materialMation
)
?
''
:
d
.
materialMation
.
name
}},
{
field
:
'
---
'
,
width
:
150
,
align
:
'
center
'
,
rowspan
:
'
2
'
,
title
:
'
规格
'
},
{
field
:
'
---
'
,
width
:
150
,
align
:
'
center
'
,
rowspan
:
'
2
'
,
title
:
'
交货日期
'
},
{
field
:
'
---
'
,
width
:
150
,
align
:
'
center
'
,
rowspan
:
'
2
'
,
title
:
'
数量
'
},
{
title
:
systemLanguage
[
"
com.skyeye.operation
"
][
languageType
],
rowspan
:
'
2
'
,
fixed
:
'
right
'
,
align
:
'
center
'
,
width
:
200
,
toolbar
:
'
#tableBar
'
}
],[
{
field
:
'
fromTypeId
'
,
title
:
'
来源类型
'
,
rowspan
:
'
2
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
sealOutLetFromType
"
,
'
id
'
,
d
.
fromTypeId
,
'
name
'
);
...
...
@@ -54,7 +52,7 @@ layui.config({
]],
done
:
function
(
json
)
{
matchingLanguage
();
initTableSearchUtil
.
initAdvancedSearch
(
this
,
json
.
searchFilter
,
form
,
"
请输入
生产
单号
"
,
function
()
{
initTableSearchUtil
.
initAdvancedSearch
(
this
,
json
.
searchFilter
,
form
,
"
请输入单号
"
,
function
()
{
table
.
reloadData
(
"
messageTable
"
,
{
page
:
{
curr
:
1
},
where
:
getTableParams
()});
});
}
...
...
@@ -75,6 +73,8 @@ layui.config({
activitiUtil
.
activitiDetails
(
data
);
}
else
if
(
layEvent
===
'
revoke
'
)
{
//撤销
revoke
(
data
);
}
else
if
(
layEvent
===
'
turnProductionPlan
'
)
{
//转生产计划
turnProductionPlan
(
data
);
}
});
...
...
@@ -154,6 +154,19 @@ layui.config({
});
}
// 转生产计划
function
turnProductionPlan
(
data
)
{
_openNewWindows
({
url
:
"
../../tpl/erpPreProductionPlan/preProductionTurnToProduction.html?id=
"
+
data
.
id
,
title
:
"
转生产计划
"
,
pageId
:
"
turnProductionPlan
"
,
area
:
[
'
90vw
'
,
'
90vh
'
],
callBack
:
function
(
refreshCode
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.successfulOperation
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
}
form
.
render
();
$
(
"
body
"
).
on
(
"
click
"
,
"
#reloadTable
"
,
function
()
{
loadTable
();
...
...
erp-produce/src/main/resources/template/js/erpPreProductionPlan/preProductionTurnToProduction.js
0 → 100644
浏览文件 @
9e47720a
// 以下两个参数开启团队权限时有值
var
objectId
=
''
,
objectKey
=
''
;
// 根据以下两个参数判断:工作流的判断是否要根据serviceClassName的判断
var
serviceClassName
;
layui
.
config
({
base
:
basePath
,
version
:
skyeyeVersion
}).
extend
({
window
:
'
js/winui.window
'
}).
define
([
'
window
'
,
'
table
'
,
'
jquery
'
],
function
(
exports
)
{
winui
.
renderColor
();
var
index
=
parent
.
layer
.
getFrameIndex
(
window
.
name
);
var
$
=
layui
.
$
;
var
id
=
GetUrlParam
(
"
id
"
);
// 预生产计划 转 生产计划
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
queryProductionPlanTransById
"
,
params
:
{
id
:
id
},
type
:
'
json
'
,
method
:
'
GET
'
,
callback
:
function
(
json
)
{
let
data
=
json
.
bean
;
console
.
log
(
5555
,
data
)
// 生产计划的【编辑布局】
dsFormUtil
.
initEditPageForStatic
(
'
content
'
,
'
FP2023092200002
'
,
data
,
{
savePreParams
:
function
(
params
)
{
},
saveData
:
function
(
params
)
{
// 保存数据
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
insertProductionPlanToProduction
"
,
params
:
params
,
type
:
'
json
'
,
method
:
"
POST
"
,
callback
:
function
(
json
)
{
parent
.
layer
.
close
(
index
);
parent
.
refreshCode
=
'
0
'
;
}});
},
// 新增行的回调函数
// tableAddRowCallback: function (tableId) {
// $("#addRow" + tableId).remove();
// $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".specifications").prop('disabled', true);
// }
});
}});
});
\ No newline at end of file
erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js
浏览文件 @
9e47720a
...
...
@@ -25,30 +25,29 @@ layui.config({
page
:
true
,
limits
:
getLimits
(),
limit
:
getLimit
(),
cols
:
[[
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
},
{
field
:
'
oddNumber
'
,
title
:
'
生产单号
'
,
align
:
'
center
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
oddNumber
+
'
</a>
'
;
}},
{
field
:
'
salesOrderNum
'
,
width
:
200
,
title
:
'
关联销售单
'
,
align
:
'
center
'
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
sealOrderMation
)
?
''
:
d
.
sealOrderMation
.
oddNumber
}},
{
field
:
'
name
'
,
title
:
'
产品名称
'
,
align
:
'
left
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
materialMation
)
?
''
:
d
.
materialMation
.
name
}},
{
field
:
'
model
'
,
title
:
'
产品型号
'
,
align
:
'
left
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
materialMation
)
?
''
:
d
.
materialMation
.
model
}},
{
field
:
'
norms
'
,
title
:
'
产品规格
'
,
align
:
'
left
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
normsMation
)
?
''
:
d
.
normsMation
.
name
}},
{
field
:
'
number
'
,
width
:
100
,
title
:
'
计划生产数量
'
},
{
field
:
'
processInstanceId
'
,
title
:
'
流程ID
'
,
width
:
100
,
templet
:
function
(
d
)
{
return
'
<a lay-event="processDetails" class="notice-title-click">
'
+
getNotUndefinedVal
(
d
.
processInstanceId
)
+
'
</a>
'
;
}},
{
field
:
'
state
'
,
title
:
'
状态
'
,
width
:
90
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
flowableStateEnum
"
,
'
id
'
,
d
.
state
,
'
name
'
);
}},
{
field
:
'
planStartDate
'
,
width
:
150
,
align
:
'
center
'
,
title
:
'
计划开始时间
'
},
{
field
:
'
planComplateDate
'
,
width
:
150
,
align
:
'
center
'
,
title
:
'
计划结束时间
'
},
{
field
:
'
createName
'
,
title
:
systemLanguage
[
"
com.skyeye.createName
"
][
languageType
],
width
:
120
},
{
field
:
'
createTime
'
,
title
:
systemLanguage
[
"
com.skyeye.createTime
"
][
languageType
],
align
:
'
center
'
,
width
:
150
},
{
field
:
'
lastUpdateName
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateName
"
][
languageType
],
align
:
'
left
'
,
width
:
120
},
{
field
:
'
lastUpdateTime
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateTime
"
][
languageType
],
align
:
'
center
'
,
width
:
150
},
{
title
:
systemLanguage
[
"
com.skyeye.operation
"
][
languageType
],
fixed
:
'
right
'
,
align
:
'
center
'
,
width
:
240
,
toolbar
:
'
#tableBar
'
}
]],
cols
:
[[
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
rowspan
:
'
2
'
,
type
:
'
numbers
'
},
{
field
:
'
oddNumber
'
,
title
:
'
单号
'
,
align
:
'
center
'
,
rowspan
:
'
2
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
oddNumber
+
'
</a>
'
;
}},
{
field
:
'
processInstanceId
'
,
title
:
'
流程ID
'
,
width
:
280
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
getNotUndefinedVal
(
d
.
processInstanceId
)
+
'
</a>
'
;
}},
{
colspan
:
'
2
'
,
title
:
'
来源单据信息
'
,
align
:
'
center
'
},
{
field
:
'
operTime
'
,
width
:
150
,
title
:
'
单据日期
'
,
rowspan
:
'
2
'
,
align
:
'
center
'
},
{
field
:
'
name
'
,
title
:
'
产品名称
'
,
align
:
'
left
'
,
rowspan
:
'
2
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
materialMation
)
?
''
:
d
.
materialMation
.
name
}},
{
field
:
'
salesOrderNum
'
,
width
:
100
,
title
:
'
生产类型
'
,
rowspan
:
'
2
'
,
align
:
'
center
'
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
sealOrderMation
)
?
''
:
d
.
sealOrderMation
.
oddNumber
}},
{
field
:
'
name
'
,
title
:
'
bom方案
'
,
align
:
'
left
'
,
rowspan
:
'
2
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
materialMation
)
?
''
:
d
.
materialMation
.
name
}},
{
field
:
'
---
'
,
width
:
150
,
align
:
'
center
'
,
rowspan
:
'
2
'
,
title
:
'
交货日期
'
},
{
title
:
systemLanguage
[
"
com.skyeye.operation
"
][
languageType
],
rowspan
:
'
2
'
,
fixed
:
'
right
'
,
align
:
'
center
'
,
width
:
200
,
toolbar
:
'
#tableBar
'
}
],[
{
field
:
'
fromTypeId
'
,
title
:
'
来源类型
'
,
rowspan
:
'
2
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
sealOutLetFromType
"
,
'
id
'
,
d
.
fromTypeId
,
'
name
'
);
}},
{
field
:
'
fromId
'
,
title
:
'
单据编号
'
,
rowspan
:
'
2
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
getNotUndefinedVal
(
d
.
fromMation
?.
oddNumber
);
}}
]],
done
:
function
(
json
)
{
matchingLanguage
();
initTableSearchUtil
.
initAdvancedSearch
(
this
,
json
.
searchFilter
,
form
,
"
请输入生产单号
"
,
function
()
{
...
...
erp-produce/src/main/resources/template/js/wholeOut/wholeOutList.js
浏览文件 @
9e47720a
...
...
@@ -27,26 +27,24 @@ layui.config({
limit
:
getLimit
(),
cols
:
[[
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
},
{
field
:
'
oddNumber
'
,
title
:
'
生产
单号
'
,
align
:
'
center
'
,
width
:
200
,
templet
:
function
(
d
)
{
{
field
:
'
oddNumber
'
,
title
:
'
单号
'
,
align
:
'
center
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
oddNumber
+
'
</a>
'
;
}},
{
field
:
'
salesOrderNum
'
,
width
:
200
,
title
:
'
关联销售单
'
,
align
:
'
center
'
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
sealOrderMation
)
?
''
:
d
.
sealOrderMation
.
oddNumber
}},
{
field
:
'
name
'
,
title
:
'
产品名称
'
,
align
:
'
left
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
materialMation
)
?
''
:
d
.
materialMation
.
name
}},
{
field
:
'
model
'
,
title
:
'
产品型号
'
,
align
:
'
left
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
materialMation
)
?
''
:
d
.
materialMation
.
model
}},
{
field
:
'
norms
'
,
title
:
'
产品规格
'
,
align
:
'
left
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
normsMation
)
?
''
:
d
.
normsMation
.
name
}},
{
field
:
'
number
'
,
width
:
100
,
title
:
'
计划生产数量
'
},
{
field
:
'
processInstanceId
'
,
title
:
'
流程ID
'
,
width
:
100
,
templet
:
function
(
d
)
{
return
'
<a lay-event="processDetails" class="notice-title-click">
'
+
getNotUndefinedVal
(
d
.
processInstanceId
)
+
'
</a>
'
;
}},
{
field
:
'
state
'
,
title
:
'
状态
'
,
width
:
90
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
flowableStateEnum
"
,
'
id
'
,
d
.
state
,
'
name
'
);
}},
{
field
:
'
planStartDate
'
,
width
:
150
,
align
:
'
center
'
,
title
:
'
计划开始时间
'
},
{
field
:
'
planComplateDate
'
,
width
:
150
,
align
:
'
center
'
,
title
:
'
计划结束时间
'
},
{
field
:
'
createName
'
,
title
:
systemLanguage
[
"
com.skyeye.createName
"
][
languageType
],
width
:
120
},
{
field
:
'
createTime
'
,
title
:
systemLanguage
[
"
com.skyeye.createTime
"
][
languageType
],
align
:
'
center
'
,
width
:
150
},
{
field
:
'
accountId
'
,
width
:
150
,
title
:
'
账户
'
,
align
:
'
center
'
},
{
field
:
'
operTime
'
,
width
:
150
,
title
:
'
单据日期
'
,
align
:
'
center
'
},
{
field
:
'
farmId
'
,
width
:
150
,
title
:
'
车间
'
,
align
:
'
center
'
},
{
field
:
'
holderId
'
,
width
:
150
,
title
:
'
客户
'
,
align
:
'
center
'
},
{
field
:
'
departmentId
'
,
width
:
120
,
title
:
'
部门
'
,
align
:
'
center
'
},
{
field
:
'
salesman
'
,
width
:
150
,
title
:
'
业务员
'
,
align
:
'
center
'
},
{
field
:
'
planComplateTime
'
,
width
:
140
,
title
:
'
计划完成时间
'
,
align
:
'
center
'
},
{
field
:
'
processInstanceId
'
,
width
:
200
,
title
:
'
流程ID
'
,
align
:
'
center
'
},
// { field: 'state', title: '状态', width: 90, templet: function (d) {
// return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("purchaseOrderState", 'id', d.state, 'name');
// }},
{
field
:
'
lastUpdateName
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateName
"
][
languageType
],
align
:
'
left
'
,
width
:
120
},
{
field
:
'
lastUpdateTime
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateTime
"
][
languageType
],
align
:
'
center
'
,
width
:
150
},
{
field
:
'
createName
'
,
title
:
systemLanguage
[
"
com.skyeye.createName
"
][
languageType
],
width
:
120
},
{
field
:
'
createTime
'
,
title
:
systemLanguage
[
"
com.skyeye.createTime
"
][
languageType
],
align
:
'
center
'
,
width
:
150
},
{
title
:
systemLanguage
[
"
com.skyeye.operation
"
][
languageType
],
fixed
:
'
right
'
,
align
:
'
center
'
,
width
:
240
,
toolbar
:
'
#tableBar
'
}
]],
done
:
function
(
json
)
{
...
...
erp-produce/src/main/resources/template/tpl/departmentMachining/departmentMachiningList.html
浏览文件 @
9e47720a
<!DOCTYPE html>
<html
lang=
"en"
>
<html>
<head>
<meta
charset=
"UTF-8"
>
<title>
Title
</title>
<meta
charset=
"utf-8"
/>
<title></title>
<link
href=
"../../assets/lib/layui/css/layui.css"
rel=
"stylesheet"
/>
<link
href=
"../../assets/lib/winui/css/winui.css"
rel=
"stylesheet"
/>
</head>
<body>
<div
class=
"winui-toolbar"
>
<div
class=
"winui-tool"
>
<button
id=
"reloadTable"
class=
"winui-toolbtn search-table-btn-right"
><i
class=
"fa fa-refresh"
aria-hidden=
"true"
></i><language
showName=
"com.skyeye.refreshDataBtn"
></language></button>
<button
id=
"addBean"
class=
"winui-toolbtn search-table-btn-right"
auth=
"1590913527206"
><i
class=
"fa fa-plus"
aria-hidden=
"true"
></i><language
showName=
"com.skyeye.addBtn"
></language></button>
</div>
</div>
<div
style=
"margin:auto 10px;"
>
<table
id=
"messageTable"
lay-filter=
"messageTable"
></table>
<script
type=
"text/html"
id=
"tableBar"
>
{{
#
if
(
d
.
editRow
==
1
)
{
}}
{{
#
if
(
auth
(
'
1720796345289
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
subApproval
"
>
提交审批
<
/a
>
{{
#
}
}}
{{
#
if
(
auth
(
'
1720796297124
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs layui-btn-normal
"
lay
-
event
=
"
edit
"
><
language
showName
=
"
com.skyeye.editBtn
"
><
/language></
a
>
{{
#
}
}}
{{
#
if
(
auth
(
'
1720796332498
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-danger layui-btn-xs
"
lay
-
event
=
"
delete
"
><
language
showName
=
"
com.skyeye.deleteBtn
"
><
/language></
a
>
{{
#
}
}}
{{
#
}
}}
{{
#
if
(
d
.
editRow
==
2
)
{
}}
{{
#
if
(
auth
(
'
1720796375123
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs layui-btn-danger
"
lay
-
event
=
"
revoke
"
>
撤销
<
/a
>
{{
#
}
}}
{{
#
}
}}
<!--
{{
#
if
(
d
.
state
==
'
pass
'
)
{
}}
-->
<!--
{{
#
if
(
auth
(
'
1720796281035
'
))
{
}}
-->
<!--
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
----
"
>
转仓库入库
<
/a>--
>
<!--
{{
#
}
}}
-->
<!--
{{
#
}
}}
-->
</script>
</div>
<script
src=
"../../assets/lib/layui/layui.js"
></script>
<script
src=
"../../assets/lib/layui/custom.js"
></script>
<script
type=
"text/javascript"
>
layui
.
config
({
base
:
'
../../js/departmentMachining/
'
}).
use
(
'
departmentMachiningList
'
);
</script>
</body>
</html>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/erpPreProductionPlan/erpPreProductionPlanList.html
浏览文件 @
9e47720a
...
...
@@ -20,19 +20,31 @@
{{
#
if
(
auth
(
'
1720705286166
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
subApproval
"
>
提交审批
<
/a
>
{{
#
}
}}
{{
#
if
(
auth
(
'
1
590913527206
'
))
{
}}
{{
#
if
(
auth
(
'
1
720705272841
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs layui-btn-normal
"
lay
-
event
=
"
edit
"
><
language
showName
=
"
com.skyeye.editBtn
"
><
/language></
a
>
{{
#
}
}}
{{
#
if
(
auth
(
'
1
590926876459
'
))
{
}}
{{
#
if
(
auth
(
'
1
720705252808
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-danger layui-btn-xs
"
lay
-
event
=
"
delete
"
><
language
showName
=
"
com.skyeye.deleteBtn
"
><
/language></
a
>
{{
#
}
}}
{{
#
}
}}
{{
#
if
(
d
.
editRow
==
2
)
{
}}
{{
#
if
(
auth
(
'
1
696246760629
'
))
{
}}
{{
#
if
(
auth
(
'
1
720705233677
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs layui-btn-danger
"
lay
-
event
=
"
revoke
"
>
撤销
<
/a
>
{{
#
}
}}
{{
#
}
}}
{{
#
if
(
d
.
state
==
'
pass
'
)
{
}}
{{
#
if
(
auth
(
'
1720705318422
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
turnProductionPlan
"
>
转生产计划
<
/a
>
{{
#
}
}}
{{
#
}
}}
{{
#
if
(
d
.
state
==
'
partiallyCompleted
'
)
{
}}
{{
#
if
(
auth
(
'
1720705318422
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
turnProductionPlan
"
>
转生产计划
<
/a
>
{{
#
}
}}
{{
#
}
}}
</script>
</div>
<script
src=
"../../assets/lib/layui/layui.js"
></script>
...
...
erp-produce/src/main/resources/template/tpl/erpPreProductionPlan/preProductionTurnToProduction.html
0 → 100644
浏览文件 @
9e47720a
<!DOCTYPE html>
<html>
<head>
<meta
charset=
"UTF-8"
>
<title></title>
<link
href=
"../../assets/lib/layui/css/layui.css"
rel=
"stylesheet"
/>
<link
href=
"../../assets/lib/winui/css/winui.css"
rel=
"stylesheet"
/>
</head>
<body>
<div
style=
"margin:0 auto;padding:20px;"
>
<form
class=
"layui-form"
action=
""
id=
"showForm"
autocomplete=
"off"
>
<div
id=
"content"
></div>
<div
class=
"layui-form-item layui-col-xs12"
>
<div
class=
"layui-input-block"
>
<button
class=
"winui-btn"
type=
"button"
id=
"cancle"
><language
showName=
"com.skyeye.cancel"
></language></button>
<button
class=
"winui-btn"
lay-submit
lay-filter=
"formSaveDraft"
id=
"formSaveDraft"
>
保存为草稿
</button>
`
<button
class=
"winui-btn"
lay-submit
lay-filter=
"formWriteBean"
id=
"formWriteBean"
>
提交
</button>
</div>
</div>
</form>
</div>
<script
src=
"../../assets/lib/layui/layui.js"
></script>
<script
src=
"../../assets/lib/layui/custom.js"
></script>
<script
type=
"text/javascript"
>
layui
.
config
({
base
:
'
../../js/erpPreProductionPlan/
'
}).
use
(
'
preProductionTurnToProduction
'
);
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/tpl/depotPut/list.html
浏览文件 @
9e47720a
...
...
@@ -10,7 +10,6 @@
<div
class=
"winui-toolbar"
>
<div
class=
"winui-tool"
>
<button
id=
"reloadTable"
class=
"winui-toolbtn search-table-btn-right"
><i
class=
"fa fa-refresh"
aria-hidden=
"true"
></i><language
showName=
"com.skyeye.refreshDataBtn"
></language></button>
<button
id=
"addBean"
class=
"winui-toolbtn search-table-btn-right"
auth=
"1719831367679"
><i
class=
"fa fa-plus"
aria-hidden=
"true"
></i><language
showName=
"com.skyeye.addBtn"
></language></button>
</div>
</div>
<div
style=
"margin:auto 10px;"
>
...
...
erp/src/main/resources/template/tpl/salesOrder/salesOrderList.html
浏览文件 @
9e47720a
...
...
@@ -52,11 +52,11 @@
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
turnReturns
"
>
转销售退货
<
/a
>
{{
#
}
}}
{{
#
}
}}
{{
#
if
(
d
.
state
==
'
partiallyCompleted
'
)
{
}}
{{
#
if
(
auth
(
''
)){
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
turnReturns
"
>
转预生产计划
<
/a
>
{{
#
}
}}
{{
#
}
}}
<!--
{{
#
if
(
d
.
state
==
'
partiallyCompleted
'
)
{
}}
-->
<!--
{{
#
if
(
auth
(
''
)){
}}
-->
<!--
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
turnReturns
"
>
转预生产计划
<
/a>--
>
<!--
{{
#
}
}}
-->
<!--
{{
#
}
}}
-->
</script>
</div>
<script
src=
"../../assets/lib/layui/layui.js"
></script>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录