Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Skyeye云
Skyeye
提交
0d478c99
S
Skyeye
项目概览
Skyeye云
/
Skyeye
通知
1433
Star
162
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看板
提交
0d478c99
编写于
7月 08, 2024
作者:
L
LAPTOP-UV1MNL38\18023
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'company_server' of
https://gitee.com/doc_wei01/skyeye
into company_server
上级
4ac168a2
2a98f722
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
290 addition
and
89 deletion
+290
-89
admin-assistant/src/main/resources/template/js/assetInventory/assetInventoryList.js
...esources/template/js/assetInventory/assetInventoryList.js
+39
-27
admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseList.js
...emplate/js/assetManagePurchase/assetManagePurchaseList.js
+33
-3
admin-assistant/src/main/resources/template/js/assetManagePurchase/turnAssetInventory.js
...ces/template/js/assetManagePurchase/turnAssetInventory.js
+44
-0
admin-assistant/src/main/resources/template/js/assetManagePurchase/turnAssetProcurementReturn.js
...late/js/assetManagePurchase/turnAssetProcurementReturn.js
+43
-0
admin-assistant/src/main/resources/template/js/assetProcurementReturn/assetProcurementReturnList.js
...e/js/assetProcurementReturn/assetProcurementReturnList.js
+41
-27
admin-assistant/src/main/resources/template/tpl/assetManagePurchase/assetManagePurchaseList.html
...late/tpl/assetManagePurchase/assetManagePurchaseList.html
+9
-0
admin-assistant/src/main/resources/template/tpl/assetManagePurchase/turnAssetInventory.html
.../template/tpl/assetManagePurchase/turnAssetInventory.html
+29
-0
admin-assistant/src/main/resources/template/tpl/assetManagePurchase/turnAssetProcurementReturn.html
...e/tpl/assetManagePurchase/turnAssetProcurementReturn.html
+29
-0
erp/src/main/resources/template/js/salesOrder/salesOrderToReturns.js
...n/resources/template/js/salesOrder/salesOrderToReturns.js
+0
-18
erp/src/main/resources/template/js/salesReturns/salesReturnsList.js
...in/resources/template/js/salesReturns/salesReturnsList.js
+20
-12
erp/src/main/resources/template/tpl/salesOrder/salesOrderList.html
...ain/resources/template/tpl/salesOrder/salesOrderList.html
+2
-2
web/src/main/resources/template/json/skyeyeClassEnum.json
web/src/main/resources/template/json/skyeyeClassEnum.json
+1
-0
未找到文件。
admin-assistant/src/main/resources/template/js/assetInventory/assetInventoryList.js
浏览文件 @
0d478c99
...
...
@@ -26,26 +26,38 @@ layui.config({
limits
:
getLimits
(),
limit
:
getLimit
(),
cols
:
[[
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
},
{
field
:
'
oddNumber
'
,
title
:
'
单号
'
,
width
:
200
,
align
:
'
center
'
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
oddNumber
+
'
</a>
'
;
}},
{
field
:
'
title
'
,
title
:
'
标题
'
,
width
:
300
},
{
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
:
'
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
:
200
,
toolbar
:
'
#messageTableBar
'
}
]],
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
,
rowspan
:
'
2
'
},
{
field
:
'
oddNumber
'
,
title
:
'
单号
'
,
rowspan
:
'
2
'
,
width
:
200
,
align
:
'
center
'
,
templet
:
function
(
d
)
{
var
str
=
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
oddNumber
+
'
</a>
'
;
if
(
!
isNull
(
d
.
fromId
))
{
str
+=
'
<span class="state-new">[转]</span>
'
;
}
return
str
;
}},
{
field
:
'
title
'
,
title
:
'
标题
'
,
rowspan
:
'
2
'
,
width
:
300
},
{
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
'
);
}},
{
colspan
:
'
2
'
,
title
:
'
来源单据信息
'
,
align
:
'
center
'
},
{
field
:
'
createName
'
,
title
:
systemLanguage
[
"
com.skyeye.createName
"
][
languageType
],
rowspan
:
'
2
'
,
width
:
120
},
{
field
:
'
createTime
'
,
title
:
systemLanguage
[
"
com.skyeye.createTime
"
][
languageType
],
rowspan
:
'
2
'
,
align
:
'
center
'
,
width
:
150
},
{
field
:
'
lastUpdateName
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateName
"
][
languageType
],
rowspan
:
'
2
'
,
align
:
'
left
'
,
width
:
120
},
{
field
:
'
lastUpdateTime
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateTime
"
][
languageType
],
rowspan
:
'
2
'
,
align
:
'
center
'
,
width
:
150
},
{
title
:
systemLanguage
[
"
com.skyeye.operation
"
][
languageType
],
fixed
:
'
right
'
,
align
:
'
center
'
,
rowspan
:
'
2
'
,
width
:
200
,
toolbar
:
'
#messageTableBar
'
}
],[
{
field
:
'
fromTypeId
'
,
title
:
'
来源类型
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
assetPurchasePutFromType
"
,
'
id
'
,
d
.
fromTypeId
,
'
name
'
);
}},
{
field
:
'
fromId
'
,
title
:
'
单据编号
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
getNotUndefinedVal
(
d
.
fromMation
?.
oddNumber
);
}}
]],
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
()});
});
}
...
...
@@ -88,9 +100,9 @@ layui.config({
layer
.
confirm
(
msg
,
{
icon
:
3
,
title
:
'
撤销操作
'
},
function
(
index
)
{
layer
.
close
(
index
);
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
admBasePath
+
"
revokeAssetPurchasePut
"
,
params
:
{
processInstanceId
:
data
.
processInstanceId
},
type
:
'
json
'
,
method
:
"
PUT
"
,
callback
:
function
(
json
)
{
winui
.
window
.
msg
(
"
提交成功
"
,
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
winui
.
window
.
msg
(
"
提交成功
"
,
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
});
}
...
...
@@ -126,9 +138,9 @@ layui.config({
layer
.
confirm
(
systemLanguage
[
"
com.skyeye.deleteOperationMsg
"
][
languageType
],
{
icon
:
3
,
title
:
systemLanguage
[
"
com.skyeye.deleteOperation
"
][
languageType
]},
function
(
index
)
{
layer
.
close
(
index
);
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
admBasePath
+
"
deleteAssetPurchasePutById
"
,
params
:
{
id
:
data
.
id
},
type
:
'
json
'
,
method
:
"
DELETE
"
,
callback
:
function
(
json
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.deleteOperationSuccessMsg
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.deleteOperationSuccessMsg
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
});
}
...
...
@@ -142,9 +154,9 @@ layui.config({
approvalId
:
approvalId
};
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
admBasePath
+
"
submitAssetPurchasePut
"
,
params
:
params
,
type
:
'
json
'
,
callback
:
function
(
json
)
{
winui
.
window
.
msg
(
"
提交成功
"
,
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
winui
.
window
.
msg
(
"
提交成功
"
,
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
});
});
}
...
...
admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseList.js
浏览文件 @
0d478c99
...
...
@@ -26,7 +26,7 @@ layui.config({
limits
:
getLimits
(),
limit
:
getLimit
(),
cols
:
[[
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
},
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
,
rowspan
:
'
2
'
},
{
field
:
'
oddNumber
'
,
title
:
'
单号
'
,
width
:
200
,
align
:
'
center
'
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
oddNumber
+
'
</a>
'
;
}},
...
...
@@ -35,7 +35,7 @@ layui.config({
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
'
);
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
purchaseOrderState
"
,
'
id
'
,
d
.
state
,
'
name
'
);
}},
{
field
:
'
createName
'
,
title
:
systemLanguage
[
"
com.skyeye.createName
"
][
languageType
],
width
:
120
},
{
field
:
'
createTime
'
,
title
:
systemLanguage
[
"
com.skyeye.createTime
"
][
languageType
],
align
:
'
center
'
,
width
:
150
},
...
...
@@ -67,7 +67,11 @@ layui.config({
activitiUtil
.
activitiDetails
(
data
);
}
else
if
(
layEvent
===
'
revoke
'
)
{
//撤销采购申请
revoke
(
data
);
}
}
else
if
(
layEvent
===
'
turnAssetInventory
'
)
{
//转资产采购入库单
turnAssetInventory
(
data
);
}
else
if
(
layEvent
===
'
turnAssetProcurementReturn
'
)
{
//转资产退货单
turnAssetProcurementReturn
(
data
);
}
});
// 资产采购详情
...
...
@@ -150,6 +154,32 @@ layui.config({
});
}
// 转资产采购入库
function
turnAssetInventory
(
data
)
{
_openNewWindows
({
url
:
"
../../tpl/assetManagePurchase/turnAssetInventory.html?id=
"
+
data
.
id
,
title
:
"
转资产采购入库
"
,
pageId
:
"
turnAssetInventory
"
,
area
:
[
'
90vw
'
,
'
90vh
'
],
callBack
:
function
(
refreshCode
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.successfulOperation
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
}
//转资产采购退货单
function
turnAssetProcurementReturn
(
data
){
parent
.
_openNewWindows
({
url
:
"
../../tpl/assetManagePurchase/turnAssetProcurementReturn.html?id=
"
+
data
.
id
,
title
:
'
转资产采购退货单
'
,
pageId
:
"
turnAssetProcurementReturn
"
,
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
();
...
...
admin-assistant/src/main/resources/template/js/assetManagePurchase/turnAssetInventory.js
0 → 100644
浏览文件 @
0d478c99
// 以下两个参数开启团队权限时有值
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
.
admBasePath
+
"
queryAssetPurchaseOrderTransById
"
,
params
:
{
id
:
id
},
type
:
'
json
'
,
method
:
'
GET
'
,
callback
:
function
(
json
)
{
let
data
=
json
.
bean
;
// 资产采购入库的【编辑布局】
dsFormUtil
.
initEditPageForStatic
(
'
content
'
,
'
FP2024070500002
'
,
data
,
{
savePreParams
:
function
(
params
)
{
params
.
fromId
=
data
.
oddNumber
},
saveData
:
function
(
params
)
{
// 保存数据
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
admBasePath
+
"
insertAssetPurchaseOrderToTurnPut
"
,
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
(
"
.assetId
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.fromId
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.unitPrice
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.chooseAssetBtn
"
).
prop
(
'
disabled
'
,
true
);
}
});
}});
});
\ No newline at end of file
admin-assistant/src/main/resources/template/js/assetManagePurchase/turnAssetProcurementReturn.js
0 → 100644
浏览文件 @
0d478c99
// 以下两个参数开启团队权限时有值
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
.
admBasePath
+
"
queryAssetPurchaseOrderTransById
"
,
params
:
{
id
:
id
},
type
:
'
json
'
,
method
:
'
GET
'
,
callback
:
function
(
json
)
{
let
data
=
json
.
bean
;
// 资产采购退货单的【编辑布局】
dsFormUtil
.
initEditPageForStatic
(
'
content
'
,
'
FP2024070700002
'
,
data
,
{
savePreParams
:
function
(
params
)
{
params
.
fromId
=
data
.
oddNumber
},
saveData
:
function
(
params
)
{
// 保存数据
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
admBasePath
+
"
insertAssetPurchaseOrderToReturns
"
,
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
(
"
.assetId
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.fromId
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.unitPrice
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.chooseAssetBtn
"
).
prop
(
'
disabled
'
,
true
);
}
});
}});
});
\ No newline at end of file
admin-assistant/src/main/resources/template/js/assetProcurementReturn/assetProcurementReturnList.js
浏览文件 @
0d478c99
...
...
@@ -23,26 +23,40 @@ layui.config({
limits
:
getLimits
(),
limit
:
getLimit
(),
cols
:
[[
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
},
{
field
:
'
oddNumber
'
,
title
:
'
单号
'
,
width
:
200
,
align
:
'
center
'
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
oddNumber
+
'
</a>
'
;
}},
{
field
:
'
title
'
,
title
:
'
标题
'
,
width
:
300
},
{
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
:
'
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
:
200
,
toolbar
:
'
#messageTableBar
'
}
]],
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
,
rowspan
:
'
2
'
},
{
field
:
'
oddNumber
'
,
title
:
'
单号
'
,
rowspan
:
'
2
'
,
width
:
200
,
align
:
'
center
'
,
templet
:
function
(
d
)
{
var
str
=
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
oddNumber
+
'
</a>
'
;
if
(
!
isNull
(
d
.
fromId
))
{
str
+=
'
<span class="state-new">[转]</span>
'
;
}
return
str
;
}},
{
field
:
'
title
'
,
title
:
'
标题
'
,
width
:
300
,
rowspan
:
'
2
'
},
{
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
'
);
}},
{
colspan
:
'
2
'
,
title
:
'
来源单据信息
'
,
align
:
'
center
'
},
{
field
:
'
createName
'
,
title
:
systemLanguage
[
"
com.skyeye.createName
"
][
languageType
],
rowspan
:
'
2
'
,
width
:
120
},
{
field
:
'
createTime
'
,
title
:
systemLanguage
[
"
com.skyeye.createTime
"
][
languageType
],
rowspan
:
'
2
'
,
align
:
'
center
'
,
width
:
150
},
{
field
:
'
lastUpdateName
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateName
"
][
languageType
],
rowspan
:
'
2
'
,
align
:
'
left
'
,
width
:
120
},
{
field
:
'
lastUpdateTime
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateTime
"
][
languageType
],
rowspan
:
'
2
'
,
align
:
'
center
'
,
width
:
150
},
{
title
:
systemLanguage
[
"
com.skyeye.operation
"
][
languageType
],
fixed
:
'
right
'
,
align
:
'
center
'
,
rowspan
:
'
2
'
,
width
:
200
,
toolbar
:
'
#messageTableBar
'
}
],
[
{
field
:
'
fromTypeId
'
,
title
:
'
来源类型
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
assetPurchaseReturnFromType
"
,
'
id
'
,
d
.
fromTypeId
,
'
name
'
);
}},
{
field
:
'
fromId
'
,
title
:
'
单据编号
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
getNotUndefinedVal
(
d
.
fromMation
?.
oddNumber
);
}}
]
],
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
()});
});
}
...
...
@@ -111,9 +125,9 @@ layui.config({
layer
.
confirm
(
msg
,
{
icon
:
3
,
title
:
'
撤销操作
'
},
function
(
index
)
{
layer
.
close
(
index
);
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
admBasePath
+
"
revokeAssetPurchaseReturn
"
,
params
:
{
processInstanceId
:
data
.
processInstanceId
},
type
:
'
json
'
,
method
:
"
PUT
"
,
callback
:
function
(
json
)
{
winui
.
window
.
msg
(
"
提交成功
"
,
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
winui
.
window
.
msg
(
"
提交成功
"
,
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
});
}
...
...
@@ -122,9 +136,9 @@ layui.config({
layer
.
confirm
(
systemLanguage
[
"
com.skyeye.deleteOperationMsg
"
][
languageType
],
{
icon
:
3
,
title
:
systemLanguage
[
"
com.skyeye.deleteOperation
"
][
languageType
]},
function
(
index
)
{
layer
.
close
(
index
);
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
admBasePath
+
"
deleteAssetPurchaseReturnById
"
,
params
:
{
id
:
data
.
id
},
type
:
'
json
'
,
method
:
"
DELETE
"
,
callback
:
function
(
json
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.deleteOperationSuccessMsg
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.deleteOperationSuccessMsg
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
});
}
...
...
@@ -139,9 +153,9 @@ layui.config({
approvalId
:
approvalId
};
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
admBasePath
+
"
submitAssetPurchaseReturn
"
,
params
:
params
,
type
:
'
json
'
,
callback
:
function
(
json
)
{
winui
.
window
.
msg
(
"
提交成功
"
,
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
winui
.
window
.
msg
(
"
提交成功
"
,
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
});
});
}
...
...
admin-assistant/src/main/resources/template/tpl/assetManagePurchase/assetManagePurchaseList.html
浏览文件 @
0d478c99
...
...
@@ -32,6 +32,15 @@
<
a
class
=
"
layui-btn layui-btn-xs layui-btn-danger
"
lay
-
event
=
"
revoke
"
>
撤销
<
/a
>
{{
#
}
}}
{{
#
}
}}
{{
#
if
(
d
.
state
==
'
pass
'
||
d
.
state
==
'
partiallyCompleted
'
)
{
}}
{{
#
if
(
auth
(
'
1720362868984
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
turnAssetInventory
"
>
转采购入库
<
/a
>
{{
#
}
}}
{{
#
if
(
auth
(
'
1720363038492
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
turnAssetProcurementReturn
"
>
转采购退货单
<
/a
>
{{
#
}
}}
{{
#
}
}}
</script>
</div>
<script
src=
"../../assets/lib/layui/layui.js"
></script>
...
...
admin-assistant/src/main/resources/template/tpl/assetManagePurchase/turnAssetInventory.html
0 → 100644
浏览文件 @
0d478c99
<!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/assetManagePurchase/
'
}).
use
(
'
turnAssetInventory
'
);
</script>
</body>
</html>
\ No newline at end of file
admin-assistant/src/main/resources/template/tpl/assetManagePurchase/turnAssetProcurementReturn.html
0 → 100644
浏览文件 @
0d478c99
<!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/assetManagePurchase/
'
}).
use
(
'
turnAssetProcurementReturn
'
);
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/js/salesOrder/salesOrderToReturns.js
浏览文件 @
0d478c99
...
...
@@ -30,24 +30,6 @@ layui.config({
parent
.
refreshCode
=
'
0
'
;
}});
},
// // 组件加载完成后的回调函数
// loadComponentCallback: function () {
// $("div[controlType='customer']").remove();
// },
//
// // 新增行的回调函数
// 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/src/main/resources/template/js/salesReturns/salesReturnsList.js
浏览文件 @
0d478c99
...
...
@@ -23,30 +23,38 @@ layui.config({
limits
:
getLimits
(),
limit
:
getLimit
(),
cols
:
[[
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
},
{
field
:
'
oddNumber
'
,
title
:
'
单据编号
'
,
align
:
'
left
'
,
width
:
250
,
templet
:
function
(
d
)
{
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
,
rowspan
:
'
2
'
},
{
field
:
'
oddNumber
'
,
title
:
'
单据编号
'
,
rowspan
:
'
2
'
,
align
:
'
left
'
,
width
:
250
,
templet
:
function
(
d
)
{
var
str
=
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
oddNumber
+
'
</a>
'
;
if
(
!
isNull
(
d
.
fromId
))
{
str
+=
'
<span class="state-new">[转]</span>
'
;
}
return
str
;
}},
{
field
:
'
holderMation
'
,
title
:
'
客户
'
,
align
:
'
left
'
,
width
:
150
,
templet
:
function
(
d
)
{
{
field
:
'
holderMation
'
,
title
:
'
客户
'
,
rowspan
:
'
2
'
,
align
:
'
left
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
getNotUndefinedVal
(
d
.
holderMation
?.
name
);
}},
{
field
:
'
totalPrice
'
,
title
:
'
合计金额
'
,
align
:
'
left
'
,
width
:
120
},
{
field
:
'
operTime
'
,
title
:
'
单据日期
'
,
align
:
'
center
'
,
width
:
140
},
{
field
:
'
processInstanceId
'
,
title
:
'
流程ID
'
,
width
:
100
,
templet
:
function
(
d
)
{
{
field
:
'
totalPrice
'
,
title
:
'
合计金额
'
,
rowspan
:
'
2
'
,
align
:
'
left
'
,
width
:
120
},
{
field
:
'
operTime
'
,
title
:
'
单据日期
'
,
rowspan
:
'
2
'
,
align
:
'
center
'
,
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
:
'
状态
'
,
width
:
90
,
templet
:
function
(
d
)
{
{
field
:
'
state
'
,
title
:
'
状态
'
,
rowspan
:
'
2
'
,
width
:
90
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
erpOrderStateEnum
"
,
'
id
'
,
d
.
state
,
'
name
'
);
}},
{
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
:
200
,
toolbar
:
'
#tableBar
'
}
{
field
:
'
createName
'
,
title
:
systemLanguage
[
"
com.skyeye.createName
"
][
languageType
],
rowspan
:
'
2
'
,
width
:
120
},
{
field
:
'
createTime
'
,
title
:
systemLanguage
[
"
com.skyeye.createTime
"
][
languageType
],
rowspan
:
'
2
'
,
align
:
'
center
'
,
width
:
150
},
{
field
:
'
lastUpdateName
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateName
"
][
languageType
],
rowspan
:
'
2
'
,
align
:
'
left
'
,
width
:
120
},
{
field
:
'
lastUpdateTime
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateTime
"
][
languageType
],
rowspan
:
'
2
'
,
align
:
'
center
'
,
width
:
150
},
{
title
:
systemLanguage
[
"
com.skyeye.operation
"
][
languageType
],
rowspan
:
'
2
'
,
fixed
:
'
right
'
,
align
:
'
center
'
,
width
:
200
,
toolbar
:
'
#tableBar
'
}
],[
{
field
:
'
fromTypeId
'
,
title
:
'
来源类型
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
sealReturnFromType
"
,
'
id
'
,
d
.
fromTypeId
,
'
name
'
);
}},
{
field
:
'
fromId
'
,
title
:
'
单据编号
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
getNotUndefinedVal
(
d
.
fromMation
?.
oddNumber
);
}}
]],
done
:
function
(
json
)
{
matchingLanguage
();
...
...
erp/src/main/resources/template/tpl/salesOrder/salesOrderList.html
浏览文件 @
0d478c99
...
...
@@ -44,12 +44,12 @@
{{
#
}
}}
{{
#
if
(
d
.
state
==
'
pass
'
)
{
}}
{{
#
if
(
auth
(
'
1720343655250
'
)){
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
turn
Sale
s
"
>
转销售退货
<
/a
>
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
turn
Return
s
"
>
转销售退货
<
/a
>
{{
#
}
}}
{{
#
}
}}
{{
#
if
(
d
.
state
==
'
partiallyCompleted
'
)
{
}}
{{
#
if
(
auth
(
'
1720343655250
'
)){
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
turn
Sale
s
"
>
转销售退货
<
/a
>
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
turn
Return
s
"
>
转销售退货
<
/a
>
{{
#
}
}}
{{
#
}
}}
</script>
...
...
web/src/main/resources/template/json/skyeyeClassEnum.json
浏览文件 @
0d478c99
...
...
@@ -145,6 +145,7 @@
"clockInTime"
:
{
"name"
:
"上班打卡状态"
,
"className"
:
"skyeye-checkwork#com.skyeye.checkwork.classenum.ClockInTime"
},
"clockOutTime"
:
{
"name"
:
"下班打卡状态"
,
"className"
:
"skyeye-checkwork#com.skyeye.checkwork.classenum.ClockOutTime"
},
"purchaseOrderState"
:
{
"name"
:
"资产采购订单状态"
,
"className"
:
"skyeye-adm#com.skyeye.eve.assets.classenum.PurchaseOrderStateEnum"
},
"assetReportState"
:
{
"name"
:
"资产明细状态"
,
"className"
:
"skyeye-adm#com.skyeye.eve.assets.classenum.AssetReportState"
},
"conferenceState"
:
{
"name"
:
"会议室状态"
,
"className"
:
"skyeye-adm#com.skyeye.eve.conference.classenum.ConferenceState"
},
"vehicleState"
:
{
"name"
:
"车辆状态"
,
"className"
:
"skyeye-adm#com.skyeye.eve.vehicle.classenum.VehicleState"
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录