Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
warehouse
Overview
Overview
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
胡懿
warehouse
Commits
dcf93974
Commit
dcf93974
authored
Aug 10, 2023
by
anxiaohe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
品名代码改为品名
parent
47fbe06b
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
31 additions
and
32 deletions
+31
-32
jeeplus.js
src/main/webapp/static/common/js/jeeplus.js
+1
-1
goodsDetail.jsp
...in/webapp/webpage/modules/warehouse/goods/goodsDetail.jsp
+2
-2
ledgerDetail.jsp
.../webapp/webpage/modules/warehouse/ledger/ledgerDetail.jsp
+1
-1
ledgerForm.jsp
...in/webapp/webpage/modules/warehouse/ledger/ledgerForm.jsp
+3
-3
ledgerList.jsp
...in/webapp/webpage/modules/warehouse/ledger/ledgerList.jsp
+1
-1
materialLossDetail.jsp
...age/modules/warehouse/materialloss/materialLossDetail.jsp
+2
-2
materialRequisitionDetail.jsp
...rehouse/materialrequisition/materialRequisitionDetail.jsp
+1
-1
materialTypeForm.jsp
...bpage/modules/warehouse/materialtype/materialTypeForm.jsp
+2
-2
materialTypeList.js
...ebpage/modules/warehouse/materialtype/materialTypeList.js
+6
-6
materialTypeList.jsp
...bpage/modules/warehouse/materialtype/materialTypeList.jsp
+3
-3
outboundDetail.jsp
...app/webpage/modules/warehouse/outbound/outboundDetail.jsp
+2
-2
profitWarehousingDetail.jsp
...s/warehouse/profitwarehousing/profitWarehousingDetail.jsp
+2
-2
storageDetail.jsp
...ebapp/webpage/modules/warehouse/storage/storageDetail.jsp
+3
-3
storageStatistic.jsp
...pp/webpage/modules/warehouse/storage/storageStatistic.jsp
+2
-3
No files found.
src/main/webapp/static/common/js/jeeplus.js
View file @
dcf93974
...
@@ -327,7 +327,7 @@ function delRow(obj, prefix){
...
@@ -327,7 +327,7 @@ function delRow(obj, prefix){
var
url
=
ctx
+
"/warehouse/storage/storage/findByPcTypeModel?goodsInfo.goods.batchNum="
+
params
.
batchNum
+
"&qrCode.state="
+
params
.
state
;
var
url
=
ctx
+
"/warehouse/storage/storage/findByPcTypeModel?goodsInfo.goods.batchNum="
+
params
.
batchNum
+
"&qrCode.state="
+
params
.
state
;
var
fieldLabels
=
"物资编码|品名|代码|单价|单位|数量|总价|型号"
;
var
fieldLabels
=
"物资编码|品名|代码|单价|单位|数量|总价|型号"
;
var
fieldKeys
=
"qrCode.code|type.name|type.code|type.amount|type.unit|num|infoSum|model"
;
var
fieldKeys
=
"qrCode.code|type.name|type.code|type.amount|type.unit|num|infoSum|model"
;
var
searchLabels
=
"品名
代码
|型号"
;
var
searchLabels
=
"品名|型号"
;
var
searchKeys
=
"goodsInfo.type|goodsInfo.model"
;
var
searchKeys
=
"goodsInfo.type|goodsInfo.model"
;
top
.
layer
.
open
({
top
.
layer
.
open
({
type
:
2
,
type
:
2
,
...
...
src/main/webapp/webpage/modules/warehouse/goods/goodsDetail.jsp
View file @
dcf93974
...
@@ -318,13 +318,13 @@
...
@@ -318,13 +318,13 @@
{{#row.canUse}}
{{#row.canUse}}
//<!--<sys:treeselect id="goodsInfoList{{idx}}_typeName" name="goodsInfoList[{{idx}}].type.id" value="{{row.type.id}}"
//<!--<sys:treeselect id="goodsInfoList{{idx}}_typeName" name="goodsInfoList[{{idx}}].type.id" value="{{row.type.id}}"
labelName="goodsInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}"
labelName="goodsInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}"
title="品名
代码
" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" delCallback="delType" />//-->
cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" delCallback="delType" />//-->
{{/row.canUse}}
{{/row.canUse}}
{{^row.canUse}}
{{^row.canUse}}
//<!--<sys:treeselect id="goodsInfoList{{idx}}_typeName" name="goodsInfoList[{{idx}}].type.id" value="{{row.type.id}}"
//<!--<sys:treeselect id="goodsInfoList{{idx}}_typeName" name="goodsInfoList[{{idx}}].type.id" value="{{row.type.id}}"
labelName="goodsInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}" disabled="disabled"
labelName="goodsInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}" disabled="disabled"
title="品名
代码
" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" delCallback="delType" />//-->
cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" delCallback="delType" />//-->
{{/row.canUse}}
{{/row.canUse}}
...
...
src/main/webapp/webpage/modules/warehouse/ledger/ledgerDetail.jsp
View file @
dcf93974
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
},
},
{
{
field: 'code',
field: 'code',
title: '
入库单
'
title: '
物资编码
'
},
},
{
{
field: 'batchNum',
field: 'batchNum',
...
...
src/main/webapp/webpage/modules/warehouse/ledger/ledgerForm.jsp
View file @
dcf93974
...
@@ -26,14 +26,14 @@
...
@@ -26,14 +26,14 @@
<td>
<td>
<sys:treeselect
id=
"type"
name=
"type.id"
value=
"${ledger.type.id}"
labelName=
"type.name"
<sys:treeselect
id=
"type"
name=
"type.id"
value=
"${ledger.type.id}"
labelName=
"type.name"
labelValue=
"${ledger.type.name}"
labelValue=
"${ledger.type.name}"
title=
"品名
代码
"
url=
"/warehouse/materialtype/materialType/treeData"
title=
"品名"
url=
"/warehouse/materialtype/materialType/treeData"
extId=
"${ledger.id}"
cssClass=
"form-control "
allowClear=
"true"
/>
extId=
"${ledger.id}"
cssClass=
"form-control "
allowClear=
"true"
/>
</td>
</td>
<td>
品名
代码
</td>
<td>
品名
</td>
<td>
<td>
<
%
--
<
sys:treeselect
id=
"type"
name=
"type.id"
value=
"${ledger.type.id}"
labelName=
"type.name"
--
%
>
<
%
--
<
sys:treeselect
id=
"type"
name=
"type.id"
value=
"${ledger.type.id}"
labelName=
"type.name"
--
%
>
<
%
--
labelValue=
"${ledger.type.name}"
--
%
>
<
%
--
labelValue=
"${ledger.type.name}"
--
%
>
<
%
--
title=
"品名
代码
"
url=
"/warehouse/materialtype/materialType/treeData"
--
%
>
<
%
--
title=
"品名"
url=
"/warehouse/materialtype/materialType/treeData"
--
%
>
<
%
--
extId=
"${ledger.id}"
cssClass=
"form-control "
allowClear=
"true"
/>
--%>
<
%
--
extId=
"${ledger.id}"
cssClass=
"form-control "
allowClear=
"true"
/>
--%>
<form:input
path=
"type.code"
htmlEscape=
"false"
class=
"form-control "
/>
<form:input
path=
"type.code"
htmlEscape=
"false"
class=
"form-control "
/>
</td>
</td>
...
...
src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.jsp
View file @
dcf93974
...
@@ -155,7 +155,7 @@
...
@@ -155,7 +155,7 @@
<
label
class
=
"col-sm-2 control-label"
>
品名:
<
/label
>
<
label
class
=
"col-sm-2 control-label"
>
品名:
<
/label
>
<
div
class
=
"col-sm-10 control-label text-left"
>
<
div
class
=
"col-sm-10 control-label text-left"
>
//
<!--<
sys
:
treeselect
id
=
"type"
name
=
"typeId"
//
<!--<
sys
:
treeselect
id
=
"type"
name
=
"typeId"
title
=
"品名
代码
"
url
=
"/warehouse/materialtype/materialType/treeData"
notAllowSelectParent
=
"true"
title
=
"品名"
url
=
"/warehouse/materialtype/materialType/treeData"
notAllowSelectParent
=
"true"
cssClass
=
"form-control required"
allowClear
=
"true"
allowSearch
=
"true"
/>
//-->
cssClass
=
"form-control required"
allowClear
=
"true"
allowSearch
=
"true"
/>
//-->
<
/div
>
<
/div
>
<
/div
>
<
/div
>
...
...
src/main/webapp/webpage/modules/warehouse/materialloss/materialLossDetail.jsp
View file @
dcf93974
...
@@ -172,7 +172,7 @@
...
@@ -172,7 +172,7 @@
title: '选择物资台账明细',
title: '选择物资台账明细',
isMultiSelect: true,
isMultiSelect: true,
url: "${ctx}/warehouse/ledger/ledger/findByQrOrCode",
url: "${ctx}/warehouse/ledger/ledger/findByQrOrCode",
fieldLabels: "物资编码|品名|品名
代码
|型号|批次号|单价|数量|单位",
fieldLabels: "物资编码|品名|品名|型号|批次号|单价|数量|单位",
fieldKeys: "code|type.name|type.code|model|batchNum|amount|num|type.unit",
fieldKeys: "code|type.name|type.code|model|batchNum|amount|num|type.unit",
searchLabels: "物资编码",
searchLabels: "物资编码",
searchKeys: "code",
searchKeys: "code",
...
@@ -270,7 +270,7 @@
...
@@ -270,7 +270,7 @@
<script id="ledgerInfoTypeTpl" type="text/html">//<!--
<script id="ledgerInfoTypeTpl" type="text/html">//<!--
<sys:treeselect id="materialLossInfoList{{idx}}_ledgerInfoType" name="materialLossInfoList[{{idx}}].ledgerInfo.type.id" value="{{row.ledgerInfo.type.id}}" labelName="materialLossInfoList{{idx}}.ledgerInfo.type.name" labelValue="{{row.ledgerInfo.type.name}}"
<sys:treeselect id="materialLossInfoList{{idx}}_ledgerInfoType" name="materialLossInfoList[{{idx}}].ledgerInfo.type.id" value="{{row.ledgerInfo.type.id}}" labelName="materialLossInfoList{{idx}}.ledgerInfo.type.name" labelValue="{{row.ledgerInfo.type.name}}"
title="品名
代码
" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//-->
title="品名" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//-->
</script>
</script>
<script id="ledgerInfoTypeCodeTpl" type="text/html">
<script id="ledgerInfoTypeCodeTpl" type="text/html">
<input id="materialLossInfoList{{idx}}_ledgerInfoTypeCode"
<input id="materialLossInfoList{{idx}}_ledgerInfoTypeCode"
...
...
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionDetail.jsp
View file @
dcf93974
...
@@ -628,7 +628,7 @@
...
@@ -628,7 +628,7 @@
<script id="ledgerInfoTypeTpl" type="text/html">//<!--
<script id="ledgerInfoTypeTpl" type="text/html">//<!--
<sys:treeselect id="materialRequisitionInfoList{{idx}}_ledgerInfoType" name="materialRequisitionInfoList[{{idx}}].ledgerInfo.type.id" value="{{row.ledgerInfo.type.id}}" labelName="materialRequisitionInfoList{{idx}}.ledgerInfo.type.name" labelValue="{{row.ledgerInfo.type.name}}"
<sys:treeselect id="materialRequisitionInfoList{{idx}}_ledgerInfoType" name="materialRequisitionInfoList[{{idx}}].ledgerInfo.type.id" value="{{row.ledgerInfo.type.id}}" labelName="materialRequisitionInfoList{{idx}}.ledgerInfo.type.name" labelValue="{{row.ledgerInfo.type.name}}"
title="品名
代码
" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//-->
title="品名" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//-->
</script>
</script>
<script id="ledgerInfoTypeCodeTpl" type="text/html">
<script id="ledgerInfoTypeCodeTpl" type="text/html">
<input id="materialRequisitionInfoList{{idx}}_ledgerInfoTypeCode"
<input id="materialRequisitionInfoList{{idx}}_ledgerInfoTypeCode"
...
...
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeForm.jsp
View file @
dcf93974
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<
%@
include
file=
"/webpage/include/taglib.jsp"
%
>
<
%@
include
file=
"/webpage/include/taglib.jsp"
%
>
<html>
<html>
<head>
<head>
<title>
物资品名
代码
管理
</title>
<title>
物资品名管理
</title>
<meta
name=
"decorator"
content=
"ani"
/>
<meta
name=
"decorator"
content=
"ani"
/>
<link
rel=
"stylesheet"
href=
"${ctxStatic}/common/css/form.css"
>
<link
rel=
"stylesheet"
href=
"${ctxStatic}/common/css/form.css"
>
</head>
</head>
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
class=
"form-horizontal"
>
class=
"form-horizontal"
>
<form:hidden
path=
"id"
/>
<form:hidden
path=
"id"
/>
<form:hidden
path=
"parentIds"
/>
<form:hidden
path=
"parentIds"
/>
<h3
class=
"text-center"
>
物资品名
代码
表
</h3>
<h3
class=
"text-center"
>
物资品名表
</h3>
<table
class=
"table table-bordered main-table"
>
<table
class=
"table table-bordered main-table"
>
<tr>
<tr>
<td><font
color=
"red"
>
*
</font>
名称
</td>
<td><font
color=
"red"
>
*
</font>
名称
</td>
...
...
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeList.js
View file @
dcf93974
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
});
});
function
del
(
con
,
id
){
function
del
(
con
,
id
){
jp
.
confirm
(
'确认要删除物资品名
代码
吗?'
,
function
(){
jp
.
confirm
(
'确认要删除物资品名吗?'
,
function
(){
jp
.
loading
();
jp
.
loading
();
$
.
get
(
"${ctx}/warehouse/materialtype/materialType/delete?id="
+
id
,
function
(
data
){
$
.
get
(
"${ctx}/warehouse/materialtype/materialType/delete?id="
+
id
,
function
(
data
){
if
(
data
.
success
){
if
(
data
.
success
){
...
@@ -49,16 +49,16 @@
...
@@ -49,16 +49,16 @@
}
}
function
add
(){
//新增
function
add
(){
//新增
jp
.
openSaveDialog
(
"新增物资品名
代码
"
,
'${ctx}/warehouse/materialtype/materialType/form/add'
,
'800'
,
'600'
);
jp
.
openSaveDialog
(
"新增物资品名"
,
'${ctx}/warehouse/materialtype/materialType/form/add'
,
'800'
,
'600'
);
}
}
function
edit
(
id
){
//编辑
function
edit
(
id
){
//编辑
jp
.
openSaveDialog
(
"编辑物资品名
代码
"
,
'${ctx}/warehouse/materialtype/materialType/form/edit?id='
+
id
,
'800'
,
'600'
);
jp
.
openSaveDialog
(
"编辑物资品名"
,
'${ctx}/warehouse/materialtype/materialType/form/edit?id='
+
id
,
'800'
,
'600'
);
}
}
function
view
(
id
){
//查看
function
view
(
id
){
//查看
jp
.
openViewDialog
(
"查看物资品名
代码
"
,
'${ctx}/warehouse/materialtype/materialType/form/view?id='
+
id
,
'800'
,
'600'
);
jp
.
openViewDialog
(
"查看物资品名"
,
'${ctx}/warehouse/materialtype/materialType/form/view?id='
+
id
,
'800'
,
'600'
);
}
}
function
addChild
(
id
){
//添加下级机构
function
addChild
(
id
){
//添加下级机构
jp
.
openSaveDialog
(
"添加下级物资品名
代码
"
,
'${ctx}/warehouse/materialtype/materialType/form/add?parent.id='
+
id
,
'800'
,
'600'
);
jp
.
openSaveDialog
(
"添加下级物资品名"
,
'${ctx}/warehouse/materialtype/materialType/form/add?parent.id='
+
id
,
'800'
,
'600'
);
}
}
function
refresh
(){
//刷新
function
refresh
(){
//刷新
var
index
=
jp
.
loading
(
"正在加载,请稍等..."
);
var
index
=
jp
.
loading
(
"正在加载,请稍等..."
);
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
<
li
><
a
onclick
=
"return del(this, '{{d.row.id}}')"
><
i
class
=
"fa fa-trash"
><
/i> 删除</
a
><
/li
>
<
li
><
a
onclick
=
"return del(this, '{{d.row.id}}')"
><
i
class
=
"fa fa-trash"
><
/i> 删除</
a
><
/li
>
<
/shiro:hasPermission
>
<
/shiro:hasPermission
>
<
shiro
:
hasPermission
name
=
"warehouse:materialtype:materialType:add"
>
<
shiro
:
hasPermission
name
=
"warehouse:materialtype:materialType:add"
>
<
li
><
a
onclick
=
"addChild('{{d.row.id}}')"
><
i
class
=
"fa fa-plus"
><
/i> 添加下级物资品名
代码
</
a
><
/li
>
<
li
><
a
onclick
=
"addChild('{{d.row.id}}')"
><
i
class
=
"fa fa-plus"
><
/i> 添加下级物资品名</
a
><
/li
>
<
/shiro:hasPermission
>
<
/shiro:hasPermission
>
<
/ul
>
<
/ul
>
<
/div
>
<
/div
>
...
...
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeList.jsp
View file @
dcf93974
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<
%@
include
file=
"/webpage/include/taglib.jsp"
%
>
<
%@
include
file=
"/webpage/include/taglib.jsp"
%
>
<html>
<html>
<head>
<head>
<title>
物资品名
代码
管理
</title>
<title>
物资品名管理
</title>
<meta
name=
"decorator"
content=
"ani"
/>
<meta
name=
"decorator"
content=
"ani"
/>
<
%@
include
file=
"materialTypeList.js"
%
>
<
%@
include
file=
"materialTypeList.js"
%
>
</head>
</head>
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<div
class=
"wrapper wrapper-content"
>
<div
class=
"wrapper wrapper-content"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel-heading"
>
<div
class=
"panel-heading"
>
<h3
class=
"panel-title"
>
物资品名
代码
列表
</h3>
<h3
class=
"panel-title"
>
物资品名列表
</h3>
</div>
</div>
<div
class=
"panel-body"
>
<div
class=
"panel-body"
>
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<thead>
<thead>
<tr>
<tr>
<th>
名称
</th>
<th>
名称
</th>
<th>
物资品名
代码
编码
</th>
<th>
物资品名编码
</th>
<th>
单价
</th>
<th>
单价
</th>
<th>
单位
</th>
<th>
单位
</th>
<th>
备注信息
</th>
<th>
备注信息
</th>
...
...
src/main/webapp/webpage/modules/warehouse/outbound/outboundDetail.jsp
View file @
dcf93974
...
@@ -164,7 +164,7 @@
...
@@ -164,7 +164,7 @@
title: '选择物资台账明细',
title: '选择物资台账明细',
isMultiSelect: true,
isMultiSelect: true,
url: "${ctx}/warehouse/ledger/ledger/findByQrOrCode",
url: "${ctx}/warehouse/ledger/ledger/findByQrOrCode",
fieldLabels: "物资编码|物资名称|品名
代码
|型号|批次号|单价",
fieldLabels: "物资编码|物资名称|品名|型号|批次号|单价",
fieldKeys: "code|name|type.name|model|batchNum|amount",
fieldKeys: "code|name|type.name|model|batchNum|amount",
searchLabels: "物资编码",
searchLabels: "物资编码",
searchKeys: "code",
searchKeys: "code",
...
@@ -315,7 +315,7 @@
...
@@ -315,7 +315,7 @@
<script id="ledgerInfoTypeTpl" type="text/html">//<!--
<script id="ledgerInfoTypeTpl" type="text/html">//<!--
<sys:treeselect id="outboundInfoList{{idx}}_ledgerInfoType" name="outboundInfoList[{{idx}}].ledgerInfo.type.id" value="{{row.ledgerInfo.type.id}}" labelName="outboundInfoList{{idx}}.ledgerInfo.type.name" labelValue="{{row.ledgerInfo.type.name}}"
<sys:treeselect id="outboundInfoList{{idx}}_ledgerInfoType" name="outboundInfoList[{{idx}}].ledgerInfo.type.id" value="{{row.ledgerInfo.type.id}}" labelName="outboundInfoList{{idx}}.ledgerInfo.type.name" labelValue="{{row.ledgerInfo.type.name}}"
title="品名
代码
" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//-->
title="品名" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//-->
</script>
</script>
<script id="ledgerInfoTypeCodeTpl" type="text/html">
<script id="ledgerInfoTypeCodeTpl" type="text/html">
<input id="outboundInfoList{{idx}}_ledgerInfoTypeCode"
<input id="outboundInfoList{{idx}}_ledgerInfoTypeCode"
...
...
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingDetail.jsp
View file @
dcf93974
...
@@ -528,11 +528,11 @@
...
@@ -528,11 +528,11 @@
<script id="typeTpl" type="text/html">//<!--
<script id="typeTpl" type="text/html">//<!--
{{#row.readonly}}
{{#row.readonly}}
<sys:treeselect id="profitWarehousingInfoList{{idx}}_type" name="profitWarehousingInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="profitWarehousingInfoList{{idx}}.type.name" labelValue="{{row.type.name}}"
<sys:treeselect id="profitWarehousingInfoList{{idx}}_type" name="profitWarehousingInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="profitWarehousingInfoList{{idx}}.type.name" labelValue="{{row.type.name}}"
title="品名
代码
" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true" cssClass="form-control required" allowClear="true" allowSearch="true" disabled="disabled" />
title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true" cssClass="form-control required" allowClear="true" allowSearch="true" disabled="disabled" />
{{/row.readonly}}
{{/row.readonly}}
{{^row.readonly}}
{{^row.readonly}}
<sys:treeselect id="profitWarehousingInfoList{{idx}}_type" name="profitWarehousingInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="profitWarehousingInfoList{{idx}}.type.name" labelValue="{{row.type.name}}"
<sys:treeselect id="profitWarehousingInfoList{{idx}}_type" name="profitWarehousingInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="profitWarehousingInfoList{{idx}}.type.name" labelValue="{{row.type.name}}"
title="品名
代码
" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true" cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" delCallback="delType" />
title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true" cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" delCallback="delType" />
{{/row.readonly}}//-->
{{/row.readonly}}//-->
</script>
</script>
<script id="typeCodeTpl" type="text/html">
<script id="typeCodeTpl" type="text/html">
...
...
src/main/webapp/webpage/modules/warehouse/storage/storageDetail.jsp
View file @
dcf93974
...
@@ -624,13 +624,13 @@
...
@@ -624,13 +624,13 @@
{{#row.readonly}}
{{#row.readonly}}
<sys:treeselectNotNameProperty id="storageInfoList{{idx}}_typeName" name="storageInfoList[{{idx}}].type.id" value="{{row.type.id}}"
<sys:treeselectNotNameProperty id="storageInfoList{{idx}}_typeName" name="storageInfoList[{{idx}}].type.id" value="{{row.type.id}}"
labelName="storageInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}"
labelName="storageInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}"
title="品名
代码
" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
cssClass="form-control required" disabled="disabled" allowClear="false" allowSearch="true" callback="onSelectType" />
cssClass="form-control required" disabled="disabled" allowClear="false" allowSearch="true" callback="onSelectType" />
{{/row.readonly}}
{{/row.readonly}}
{{^row.readonly}}
{{^row.readonly}}
<sys:treeselectNotNameProperty id="storageInfoList{{idx}}_typeName" name="storageInfoList[{{idx}}].type.id" value="{{row.type.id}}"
<sys:treeselectNotNameProperty id="storageInfoList{{idx}}_typeName" name="storageInfoList[{{idx}}].type.id" value="{{row.type.id}}"
labelName="storageInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}"
labelName="storageInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}"
title="品名
代码
" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
cssClass="form-control required" allowClear="false" allowSearch="true" callback="onSelectType" />
cssClass="form-control required" allowClear="false" allowSearch="true" callback="onSelectType" />
{{/row.readonly}}
{{/row.readonly}}
//-->
//-->
...
@@ -640,7 +640,7 @@
...
@@ -640,7 +640,7 @@
</script>
</script>
<script id="typeTpl" type="text/html">//<!--
<script id="typeTpl" type="text/html">//<!--
<sys:treeselectNotNameProperty id="storageInfoList{{idx}}_type" name="storageInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="storageInfoList{{idx}}.type.name" labelValue="{{row.type.name}}"
<sys:treeselectNotNameProperty id="storageInfoList{{idx}}_type" name="storageInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="storageInfoList{{idx}}.type.name" labelValue="{{row.type.name}}"
title="品名
代码
" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true" allowSearch="true" callback="onSelectType" />//-->
title="品名" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true" allowSearch="true" callback="onSelectType" />//-->
</script>
</script>
<script id="amountTpl" type="text/html">
<script id="amountTpl" type="text/html">
<input id="storageInfoList{{idx}}_amount" name="storageInfoList[{{idx}}].amount" type="text" value="{{row.amount}}" readonly onchange="onInputChange('{{idx}}', this, 'amount')" class="form-control required"/>
<input id="storageInfoList{{idx}}_amount" name="storageInfoList[{{idx}}].amount" type="text" value="{{row.amount}}" readonly onchange="onInputChange('{{idx}}', this, 'amount')" class="form-control required"/>
...
...
src/main/webapp/webpage/modules/warehouse/storage/storageStatistic.jsp
View file @
dcf93974
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
data: [],
data: [],
columns:[
columns:[
{field: 'name', title: '名称', align: 'center'},
{field: 'name', title: '名称', align: 'center'},
{field: 'type.name', title: '品名
代码
',align: 'center'},
{field: 'type.name', title: '品名',align: 'center'},
{field: 'model', title: '型号',align: 'center'},
{field: 'model', title: '型号',align: 'center'},
{field: 'warehouseNames', title: '仓库',align: 'center'},
{field: 'warehouseNames', title: '仓库',align: 'center'},
{field: 'shelvesNames', title: '货架',align: 'center'},
{field: 'shelvesNames', title: '货架',align: 'center'},
...
@@ -35,4 +35,4 @@
...
@@ -35,4 +35,4 @@
$("#statisticTable").bootstrapTable('append', data);
$("#statisticTable").bootstrapTable('append', data);
})
})
}
}
</script>
</script>
\ No newline at end of file
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