Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doc_wei
Skyeye
提交
e6bf3556
S
Skyeye
项目概览
doc_wei
/
Skyeye
通知
1171
Star
154
Fork
127
代码
文件
提交
分支
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看板
提交
e6bf3556
编写于
10月 02, 2022
作者:
doc_wei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
生产计划单列表修改
上级
431bb912
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
114 addition
and
127 deletion
+114
-127
erp-produce/src/main/resources/template/js/erpProduction/erpProductionEdit.js
.../resources/template/js/erpProduction/erpProductionEdit.js
+0
-1
erp-produce/src/main/resources/template/js/erpProduction/erpProductionNoSuccessChoose.js
...template/js/erpProduction/erpProductionNoSuccessChoose.js
+59
-66
erp-produce/src/main/resources/template/js/erpProduction/erpProductionNoSuccessChooseProcedure.js
...js/erpProduction/erpProductionNoSuccessChooseProcedure.js
+50
-55
erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionDetail.html
...urces/template/tpl/erpProduction/erpProductionDetail.html
+5
-5
未找到文件。
erp-produce/src/main/resources/template/js/erpProduction/erpProductionEdit.js
浏览文件 @
e6bf3556
...
...
@@ -40,7 +40,6 @@ layui.config({
textool
.
init
({
eleId
:
'
remark
'
,
maxlength
:
200
});
//回显数据
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
erpproduction003
"
,
params
:
{
id
:
parent
.
rowId
},
type
:
'
json
'
,
method
:
"
GET
"
,
callback
:
function
(
json
)
{
// 商品信息
erpOrderUtil
.
chooseProductMation
=
{
...
...
erp-produce/src/main/resources/template/js/erpProduction/erpProductionNoSuccessChoose.js
浏览文件 @
e6bf3556
...
...
@@ -6,10 +6,8 @@ layui.config({
}).
extend
({
window
:
'
js/winui.window
'
}).
define
([
'
window
'
,
'
table
'
,
'
jquery
'
,
'
winui
'
,
'
form
'
],
function
(
exports
)
{
winui
.
renderColor
();
var
index
=
parent
.
layer
.
getFrameIndex
(
window
.
name
);
var
$
=
layui
.
$
,
form
=
layui
.
form
,
table
=
layui
.
table
;
...
...
@@ -18,69 +16,66 @@ layui.config({
var
s
=
'
生产计划单选择规则:1.单选,双击指定行数据即可选中;2.已审批通过的未完成的生产计划单。如没有查到要选择的单据,请检查单据信息是否满足当前规则。
'
;
$
(
"
#showInfo
"
).
html
(
s
);
initTable
();
function
initTable
(){
table
.
render
({
id
:
'
messageTable
'
,
elem
:
'
#messageTable
'
,
method
:
'
post
'
,
url
:
flowableBasePath
+
'
erpproduction009
'
,
where
:
getTableParams
(),
even
:
true
,
page
:
false
,
cols
:
[[
{
type
:
'
radio
'
},
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
},
{
field
:
'
defaultNumber
'
,
title
:
'
生产单号
'
,
align
:
'
center
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
defaultNumber
+
'
</a>
'
;
}},
{
field
:
'
salesOrderNum
'
,
width
:
200
,
title
:
'
关联销售单
'
,
align
:
'
center
'
},
{
field
:
'
materialName
'
,
width
:
150
,
title
:
'
商品名称
'
},
{
field
:
'
materialModel
'
,
width
:
150
,
title
:
'
商品型号
'
},
{
field
:
'
number
'
,
width
:
80
,
title
:
'
计划数量
'
},
{
field
:
'
planStartDate
'
,
width
:
140
,
align
:
'
center
'
,
title
:
'
计划开始时间
'
},
{
field
:
'
planComplateDate
'
,
width
:
140
,
align
:
'
center
'
,
title
:
'
计划结束时间
'
}
]],
done
:
function
(
res
,
curr
,
count
){
matchingLanguage
();
$
(
'
#messageTable
'
).
next
().
find
(
'
.layui-table-body
'
).
find
(
"
table
"
).
find
(
"
tbody
"
).
children
(
"
tr
"
).
on
(
'
dblclick
'
,
function
(){
var
dubClick
=
$
(
'
#messageTable
'
).
next
().
find
(
'
.layui-table-body
'
).
find
(
"
table
"
).
find
(
"
tbody
"
).
find
(
"
.layui-table-hover
"
);
dubClick
.
find
(
"
input[type='radio']
"
).
prop
(
"
checked
"
,
true
);
form
.
render
();
var
chooseIndex
=
JSON
.
stringify
(
dubClick
.
data
(
'
index
'
));
var
obj
=
res
.
rows
[
chooseIndex
];
//根据生产计划单id获取该单据下的所有外购商品以及剩余数量
//chooseType:根据生产计划单选择工序时,采购订单需要回显外购一种类型的商品
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
erpproduction010
"
,
params
:
{
orderId
:
obj
.
id
,
chooseType
:
"
1
"
},
type
:
'
json
'
,
callback
:
function
(
json
)
{
obj
.
norms
=
[].
concat
(
json
.
rows
);
parent
.
productionMation
=
obj
;
table
.
render
({
id
:
'
messageTable
'
,
elem
:
'
#messageTable
'
,
method
:
'
post
'
,
url
:
flowableBasePath
+
'
erpproduction009
'
,
where
:
getTableParams
(),
even
:
true
,
page
:
false
,
cols
:
[[
{
type
:
'
radio
'
},
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
},
{
field
:
'
defaultNumber
'
,
title
:
'
生产单号
'
,
align
:
'
center
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
defaultNumber
+
'
</a>
'
;
}},
{
field
:
'
salesOrderNum
'
,
width
:
200
,
title
:
'
关联销售单
'
,
align
:
'
center
'
},
{
field
:
'
materialName
'
,
width
:
150
,
title
:
'
商品名称
'
},
{
field
:
'
materialModel
'
,
width
:
150
,
title
:
'
商品型号
'
},
{
field
:
'
number
'
,
width
:
80
,
title
:
'
计划数量
'
},
{
field
:
'
planStartDate
'
,
width
:
140
,
align
:
'
center
'
,
title
:
'
计划开始时间
'
},
{
field
:
'
planComplateDate
'
,
width
:
140
,
align
:
'
center
'
,
title
:
'
计划结束时间
'
}
]],
done
:
function
(
res
,
curr
,
count
){
matchingLanguage
();
$
(
'
#messageTable
'
).
next
().
find
(
'
.layui-table-body
'
).
find
(
"
table
"
).
find
(
"
tbody
"
).
children
(
"
tr
"
).
on
(
'
dblclick
'
,
function
(){
var
dubClick
=
$
(
'
#messageTable
'
).
next
().
find
(
'
.layui-table-body
'
).
find
(
"
table
"
).
find
(
"
tbody
"
).
find
(
"
.layui-table-hover
"
);
dubClick
.
find
(
"
input[type='radio']
"
).
prop
(
"
checked
"
,
true
);
form
.
render
();
var
chooseIndex
=
JSON
.
stringify
(
dubClick
.
data
(
'
index
'
));
var
obj
=
res
.
rows
[
chooseIndex
];
parent
.
refreshCode
=
'
0
'
;
parent
.
layer
.
close
(
index
);
}});
});
$
(
'
#messageTable
'
).
next
().
find
(
'
.layui-table-body
'
).
find
(
"
table
"
).
find
(
"
tbody
"
).
children
(
"
tr
"
).
on
(
'
click
'
,
function
(){
var
click
=
$
(
'
#messageTable
'
).
next
().
find
(
'
.layui-table-body
'
).
find
(
"
table
"
).
find
(
"
tbody
"
).
find
(
"
.layui-table-hover
"
);
click
.
find
(
"
input[type='radio']
"
).
prop
(
"
checked
"
,
true
);
form
.
render
();
})
}
});
table
.
on
(
'
tool(messageTable)
'
,
function
(
obj
)
{
var
data
=
obj
.
data
;
var
layEvent
=
obj
.
event
;
if
(
layEvent
===
'
details
'
)
{
//详情
details
(
data
);
}
});
form
.
render
();
}
//详情
//根据生产计划单id获取该单据下的所有外购商品以及剩余数量
//chooseType:根据生产计划单选择工序时,采购订单需要回显外购一种类型的商品
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
erpproduction010
"
,
params
:
{
orderId
:
obj
.
id
,
chooseType
:
"
1
"
},
type
:
'
json
'
,
callback
:
function
(
json
)
{
obj
.
norms
=
[].
concat
(
json
.
rows
);
parent
.
productionMation
=
obj
;
parent
.
refreshCode
=
'
0
'
;
parent
.
layer
.
close
(
index
);
}});
});
$
(
'
#messageTable
'
).
next
().
find
(
'
.layui-table-body
'
).
find
(
"
table
"
).
find
(
"
tbody
"
).
children
(
"
tr
"
).
on
(
'
click
'
,
function
(){
var
click
=
$
(
'
#messageTable
'
).
next
().
find
(
'
.layui-table-body
'
).
find
(
"
table
"
).
find
(
"
tbody
"
).
find
(
"
.layui-table-hover
"
);
click
.
find
(
"
input[type='radio']
"
).
prop
(
"
checked
"
,
true
);
form
.
render
();
})
}
});
table
.
on
(
'
tool(messageTable)
'
,
function
(
obj
)
{
var
data
=
obj
.
data
;
var
layEvent
=
obj
.
event
;
if
(
layEvent
===
'
details
'
)
{
//详情
details
(
data
);
}
});
form
.
render
();
// 详情
function
details
(
data
)
{
rowId
=
data
.
id
;
_openNewWindows
({
...
...
@@ -92,9 +87,7 @@ layui.config({
}});
}
form
.
on
(
'
submit(formSearch)
'
,
function
(
data
)
{
if
(
winui
.
verifyForm
(
data
.
elem
))
{
refreshTable
();
}
...
...
erp-produce/src/main/resources/template/js/erpProduction/erpProductionNoSuccessChooseProcedure.js
浏览文件 @
e6bf3556
...
...
@@ -6,10 +6,8 @@ layui.config({
}).
extend
({
window
:
'
js/winui.window
'
}).
define
([
'
window
'
,
'
table
'
,
'
jquery
'
,
'
winui
'
,
'
form
'
],
function
(
exports
)
{
winui
.
renderColor
();
var
index
=
parent
.
layer
.
getFrameIndex
(
window
.
name
);
var
$
=
layui
.
$
,
form
=
layui
.
form
,
table
=
layui
.
table
;
...
...
@@ -20,59 +18,56 @@ layui.config({
var
chooseMation
=
{};
initTable
();
function
initTable
(){
table
.
render
({
id
:
'
messageTable
'
,
elem
:
'
#messageTable
'
,
method
:
'
post
'
,
url
:
flowableBasePath
+
'
erpproduction009
'
,
where
:
getTableParams
(),
even
:
true
,
page
:
false
,
cols
:
[[
{
type
:
'
radio
'
},
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
},
{
field
:
'
defaultNumber
'
,
title
:
'
生产单号
'
,
align
:
'
center
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
defaultNumber
+
'
</a>
'
;
}},
{
field
:
'
salesOrderNum
'
,
width
:
200
,
title
:
'
关联销售单
'
,
align
:
'
center
'
},
{
field
:
'
materialName
'
,
width
:
150
,
title
:
'
商品名称
'
},
{
field
:
'
materialModel
'
,
width
:
150
,
title
:
'
商品型号
'
},
{
field
:
'
number
'
,
width
:
80
,
title
:
'
计划数量
'
},
{
field
:
'
planStartDate
'
,
width
:
140
,
align
:
'
center
'
,
title
:
'
计划开始时间
'
},
{
field
:
'
planComplateDate
'
,
width
:
140
,
align
:
'
center
'
,
title
:
'
计划结束时间
'
}
]],
done
:
function
(
res
,
curr
,
count
){
matchingLanguage
();
$
(
'
#messageTable
'
).
next
().
find
(
'
.layui-table-body
'
).
find
(
"
table
"
).
find
(
"
tbody
"
).
children
(
"
tr
"
).
on
(
'
click
'
,
function
(){
var
dubClick
=
$
(
'
#messageTable
'
).
next
().
find
(
'
.layui-table-body
'
).
find
(
"
table
"
).
find
(
"
tbody
"
).
find
(
"
.layui-table-hover
"
);
dubClick
.
find
(
"
input[type='radio']
"
).
prop
(
"
checked
"
,
true
);
form
.
render
();
var
chooseIndex
=
JSON
.
stringify
(
dubClick
.
data
(
'
index
'
));
var
obj
=
res
.
rows
[
chooseIndex
];
chooseMation
=
obj
;
});
$
(
'
#messageTable
'
).
next
().
find
(
'
.layui-table-body
'
).
find
(
"
table
"
).
find
(
"
tbody
"
).
children
(
"
tr
"
).
on
(
'
click
'
,
function
(){
var
click
=
$
(
'
#messageTable
'
).
next
().
find
(
'
.layui-table-body
'
).
find
(
"
table
"
).
find
(
"
tbody
"
).
find
(
"
.layui-table-hover
"
);
click
.
find
(
"
input[type='radio']
"
).
prop
(
"
checked
"
,
true
);
form
.
render
();
})
}
});
table
.
on
(
'
tool(messageTable)
'
,
function
(
obj
)
{
var
data
=
obj
.
data
;
var
layEvent
=
obj
.
event
;
if
(
layEvent
===
'
details
'
)
{
//详情
details
(
data
);
}
});
form
.
render
();
}
table
.
render
({
id
:
'
messageTable
'
,
elem
:
'
#messageTable
'
,
method
:
'
post
'
,
url
:
flowableBasePath
+
'
erpproduction009
'
,
where
:
getTableParams
(),
even
:
true
,
page
:
false
,
cols
:
[[
{
type
:
'
radio
'
},
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
},
{
field
:
'
defaultNumber
'
,
title
:
'
生产单号
'
,
align
:
'
center
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
defaultNumber
+
'
</a>
'
;
}},
{
field
:
'
salesOrderNum
'
,
width
:
200
,
title
:
'
关联销售单
'
,
align
:
'
center
'
},
{
field
:
'
materialName
'
,
width
:
150
,
title
:
'
商品名称
'
},
{
field
:
'
materialModel
'
,
width
:
150
,
title
:
'
商品型号
'
},
{
field
:
'
number
'
,
width
:
80
,
title
:
'
计划数量
'
},
{
field
:
'
planStartDate
'
,
width
:
140
,
align
:
'
center
'
,
title
:
'
计划开始时间
'
},
{
field
:
'
planComplateDate
'
,
width
:
140
,
align
:
'
center
'
,
title
:
'
计划结束时间
'
}
]],
done
:
function
(
res
,
curr
,
count
){
matchingLanguage
();
$
(
'
#messageTable
'
).
next
().
find
(
'
.layui-table-body
'
).
find
(
"
table
"
).
find
(
"
tbody
"
).
children
(
"
tr
"
).
on
(
'
click
'
,
function
(){
var
dubClick
=
$
(
'
#messageTable
'
).
next
().
find
(
'
.layui-table-body
'
).
find
(
"
table
"
).
find
(
"
tbody
"
).
find
(
"
.layui-table-hover
"
);
dubClick
.
find
(
"
input[type='radio']
"
).
prop
(
"
checked
"
,
true
);
form
.
render
();
var
chooseIndex
=
JSON
.
stringify
(
dubClick
.
data
(
'
index
'
));
var
obj
=
res
.
rows
[
chooseIndex
];
chooseMation
=
obj
;
});
$
(
'
#messageTable
'
).
next
().
find
(
'
.layui-table-body
'
).
find
(
"
table
"
).
find
(
"
tbody
"
).
children
(
"
tr
"
).
on
(
'
click
'
,
function
(){
var
click
=
$
(
'
#messageTable
'
).
next
().
find
(
'
.layui-table-body
'
).
find
(
"
table
"
).
find
(
"
tbody
"
).
find
(
"
.layui-table-hover
"
);
click
.
find
(
"
input[type='radio']
"
).
prop
(
"
checked
"
,
true
);
form
.
render
();
})
}
});
table
.
on
(
'
tool(messageTable)
'
,
function
(
obj
)
{
var
data
=
obj
.
data
;
var
layEvent
=
obj
.
event
;
if
(
layEvent
===
'
details
'
)
{
//详情
details
(
data
);
}
});
form
.
render
();
// 详情
function
details
(
data
)
{
rowId
=
data
.
id
;
...
...
erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionDetail.html
浏览文件 @
e6bf3556
...
...
@@ -163,11 +163,11 @@
<
/thead
>
<
tbody
id
=
"
tBody
"
>
{{
#
each
childList
}}
<
tr
rowid
=
"
{{
product
Id}}
"
>
<
td
id
=
"
name{{
productId}}
"
>
{{
product
Name
}}
<
/td
>
<
td
id
=
"
model{{
productId}}
"
>
{{
product
Model
}}
<
/td
>
<
td
>
{{
c
ategoryName
}}
<
/td
>
<
td
>
{{
t
ypeName
}}
<
/td
>
<
tr
rowid
=
"
{{
material
Id}}
"
>
<
td
id
=
"
name{{
materialId}}
"
>
{{
material
Name
}}
<
/td
>
<
td
id
=
"
model{{
materialId}}
"
>
{{
material
Model
}}
<
/td
>
<
td
>
{{
materialC
ategoryName
}}
<
/td
>
<
td
>
{{
materialT
ypeName
}}
<
/td
>
<
td
>
{{
#
each
procedureMationList
}}
<
span
class
=
"
layui-badge layui-bg-gray
"
>
{{
number
}}
<
/span>{{procedureName}}<br
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录