Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
0ffe35a4
Commit
0ffe35a4
authored
Nov 22, 2020
by
季圣华
Browse files
优化单据选择商品的弹窗界面
parent
1ccc93e6
Changes
14
Show whitespace changes
Inline
Side-by-side
erp_web/js/pages/bill/in_out.js
View file @
0ffe35a4
...
...
@@ -1255,7 +1255,7 @@
initMaterialSelectData
:
function
(){
var
self
=
this
;
$
(
'
#materialSelectData
'
).
datagrid
({
height
:
39
0
,
height
:
48
0
,
rownumbers
:
false
,
//动画效果
animate
:
false
,
...
...
erp_web/pages/bill/allocation_out_list.html
View file @
0ffe35a4
...
...
@@ -134,7 +134,7 @@
<a
href=
"javascript:void(0)"
id=
"cancelDepotHeadShow"
class=
"easyui-linkbutton"
iconCls=
"icon-cancel"
onclick=
"javascript:$('#depotHeadDlgShow').dialog('close')"
>
取消
</a>
</div>
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
width:880px;padding:10px 20px;
"
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
padding:10px;"
fit=
"true
"
closed=
"true"
modal=
"true"
buttons=
"#materialSelectDlgBtn"
cache=
"false"
collapsible=
"false"
closable=
"true"
>
<div
class=
"box-body form-inline"
>
<div
class=
"form-group"
>
...
...
@@ -522,7 +522,6 @@
depotId
=
$
(
edDepot
.
target
).
combobox
(
'
getValue
'
);
}
$
(
'
#materialSelectDlg
'
).
dialog
(
'
open
'
).
dialog
(
'
setTitle
'
,
'
<img src="/js/easyui/themes/icons/edit_add.png"/> 选择商品
'
);
$
(
"
#materialSelectDlg
"
).
panel
(
"
move
"
,{
top
:
$
(
document
).
scrollTop
()
+
(
$
(
window
).
height
()
-
500
)
*
0.5
});
inOutService
.
initMaterialSelectData
();
inOutService
.
initMaterialSelectPager
(
depotId
);
inOutService
.
materialSelectFun
(
depotId
);
...
...
erp_web/pages/bill/assemble_list.html
View file @
0ffe35a4
...
...
@@ -133,7 +133,7 @@
<a
href=
"javascript:void(0)"
id=
"cancelDepotHeadShow"
class=
"easyui-linkbutton"
iconCls=
"icon-cancel"
onclick=
"javascript:$('#depotHeadDlgShow').dialog('close')"
>
取消
</a>
</div>
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
width:880px;padding:10px 20px;
"
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
padding:10px;"
fit=
"true
"
closed=
"true"
modal=
"true"
buttons=
"#materialSelectDlgBtn"
cache=
"false"
collapsible=
"false"
closable=
"true"
>
<div
class=
"box-body form-inline"
>
<div
class=
"form-group"
>
...
...
@@ -520,7 +520,6 @@
depotId
=
$
(
edDepot
.
target
).
combobox
(
'
getValue
'
);
}
$
(
'
#materialSelectDlg
'
).
dialog
(
'
open
'
).
dialog
(
'
setTitle
'
,
'
<img src="/js/easyui/themes/icons/edit_add.png"/> 选择商品
'
);
$
(
"
#materialSelectDlg
"
).
panel
(
"
move
"
,{
top
:
$
(
document
).
scrollTop
()
+
(
$
(
window
).
height
()
-
500
)
*
0.5
});
inOutService
.
initMaterialSelectData
();
inOutService
.
initMaterialSelectPager
(
depotId
);
inOutService
.
materialSelectFun
(
depotId
);
...
...
erp_web/pages/bill/disassemble_list.html
View file @
0ffe35a4
...
...
@@ -133,7 +133,7 @@
<a
href=
"javascript:void(0)"
id=
"cancelDepotHeadShow"
class=
"easyui-linkbutton"
iconCls=
"icon-cancel"
onclick=
"javascript:$('#depotHeadDlgShow').dialog('close')"
>
取消
</a>
</div>
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
width:880px;padding:10px 20px;
"
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
padding:10px;"
fit=
"true
"
closed=
"true"
modal=
"true"
buttons=
"#materialSelectDlgBtn"
cache=
"false"
collapsible=
"false"
closable=
"true"
>
<div
class=
"box-body form-inline"
>
<div
class=
"form-group"
>
...
...
@@ -521,7 +521,6 @@
depotId
=
$
(
edDepot
.
target
).
combobox
(
'
getValue
'
);
}
$
(
'
#materialSelectDlg
'
).
dialog
(
'
open
'
).
dialog
(
'
setTitle
'
,
'
<img src="/js/easyui/themes/icons/edit_add.png"/> 选择商品
'
);
$
(
"
#materialSelectDlg
"
).
panel
(
"
move
"
,{
top
:
$
(
document
).
scrollTop
()
+
(
$
(
window
).
height
()
-
500
)
*
0.5
});
inOutService
.
initMaterialSelectData
();
inOutService
.
initMaterialSelectPager
(
depotId
);
inOutService
.
materialSelectFun
(
depotId
);
...
...
erp_web/pages/bill/other_in_list.html
View file @
0ffe35a4
...
...
@@ -144,7 +144,7 @@
<a
href=
"javascript:void(0)"
id=
"cancelDepotHeadShow"
class=
"easyui-linkbutton"
iconCls=
"icon-cancel"
onclick=
"javascript:$('#depotHeadDlgShow').dialog('close')"
>
取消
</a>
</div>
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
width:880px;padding:10px 20px;
"
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
padding:10px;"
fit=
"true
"
closed=
"true"
modal=
"true"
buttons=
"#materialSelectDlgBtn"
cache=
"false"
collapsible=
"false"
closable=
"true"
>
<div
class=
"box-body form-inline"
>
<div
class=
"form-group"
>
...
...
@@ -532,7 +532,6 @@
depotId
=
$
(
edDepot
.
target
).
combobox
(
'
getValue
'
);
}
$
(
'
#materialSelectDlg
'
).
dialog
(
'
open
'
).
dialog
(
'
setTitle
'
,
'
<img src="/js/easyui/themes/icons/edit_add.png"/> 选择商品
'
);
$
(
"
#materialSelectDlg
"
).
panel
(
"
move
"
,{
top
:
$
(
document
).
scrollTop
()
+
(
$
(
window
).
height
()
-
500
)
*
0.5
});
inOutService
.
initMaterialSelectData
();
inOutService
.
initMaterialSelectPager
(
depotId
);
inOutService
.
materialSelectFun
(
depotId
);
...
...
erp_web/pages/bill/other_out_list.html
View file @
0ffe35a4
...
...
@@ -138,7 +138,7 @@
<a
href=
"javascript:void(0)"
id=
"cancelDepotHeadShow"
class=
"easyui-linkbutton"
iconCls=
"icon-cancel"
onclick=
"javascript:$('#depotHeadDlgShow').dialog('close')"
>
取消
</a>
</div>
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
width:880px;padding:10px 20px;
"
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
padding:10px;"
fit=
"true
"
closed=
"true"
modal=
"true"
buttons=
"#materialSelectDlgBtn"
cache=
"false"
collapsible=
"false"
closable=
"true"
>
<div
class=
"box-body form-inline"
>
<div
class=
"form-group"
>
...
...
@@ -525,7 +525,6 @@
depotId
=
$
(
edDepot
.
target
).
combobox
(
'
getValue
'
);
}
$
(
'
#materialSelectDlg
'
).
dialog
(
'
open
'
).
dialog
(
'
setTitle
'
,
'
<img src="/js/easyui/themes/icons/edit_add.png"/> 选择商品
'
);
$
(
"
#materialSelectDlg
"
).
panel
(
"
move
"
,{
top
:
$
(
document
).
scrollTop
()
+
(
$
(
window
).
height
()
-
500
)
*
0.5
});
inOutService
.
initMaterialSelectData
();
inOutService
.
initMaterialSelectPager
(
depotId
);
inOutService
.
materialSelectFun
(
depotId
);
...
...
erp_web/pages/bill/purchase_back_list.html
View file @
0ffe35a4
...
...
@@ -270,7 +270,7 @@
<a
href=
"javascript:void(0)"
id=
"saveOtherMoneyDlg"
class=
"easyui-linkbutton"
iconCls=
"icon-ok"
>
保存
</a>
<a
href=
"javascript:void(0)"
id=
"cancelOtherMoneyDlg"
class=
"easyui-linkbutton"
iconCls=
"icon-cancel"
>
取消
</a>
</div>
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
width:880px;padding:10px 20px;
"
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
padding:10px;"
fit=
"true
"
closed=
"true"
modal=
"true"
buttons=
"#materialSelectDlgBtn"
cache=
"false"
collapsible=
"false"
closable=
"true"
>
<div
class=
"box-body form-inline"
>
<div
class=
"form-group"
>
...
...
@@ -663,7 +663,6 @@
depotId
=
$
(
edDepot
.
target
).
combobox
(
'
getValue
'
);
}
$
(
'
#materialSelectDlg
'
).
dialog
(
'
open
'
).
dialog
(
'
setTitle
'
,
'
<img src="/js/easyui/themes/icons/edit_add.png"/> 选择商品
'
);
$
(
"
#materialSelectDlg
"
).
panel
(
"
move
"
,{
top
:
$
(
document
).
scrollTop
()
+
(
$
(
window
).
height
()
-
500
)
*
0.5
});
inOutService
.
initMaterialSelectData
();
inOutService
.
initMaterialSelectPager
(
depotId
);
inOutService
.
materialSelectFun
(
depotId
);
...
...
erp_web/pages/bill/purchase_in_list.html
View file @
0ffe35a4
...
...
@@ -295,7 +295,7 @@
<a
href=
"javascript:void(0)"
id=
"cancelLinkBill"
class=
"easyui-linkbutton"
iconCls=
"icon-cancel"
onclick=
"javascript:$('#linkBillDlg').dialog('close')"
>
取消
</a>
</div>
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
width:880px;padding:10px 20px;
"
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
padding:10px;"
fit=
"true
"
closed=
"true"
modal=
"true"
buttons=
"#materialSelectDlgBtn"
cache=
"false"
collapsible=
"false"
closable=
"true"
>
<div
class=
"box-body form-inline"
>
<div
class=
"form-group"
>
...
...
@@ -788,7 +788,6 @@
depotId
=
$
(
edDepot
.
target
).
combobox
(
'
getValue
'
);
}
$
(
'
#materialSelectDlg
'
).
dialog
(
'
open
'
).
dialog
(
'
setTitle
'
,
'
<img src="/js/easyui/themes/icons/edit_add.png"/> 选择商品
'
);
$
(
"
#materialSelectDlg
"
).
panel
(
"
move
"
,{
top
:
$
(
document
).
scrollTop
()
+
(
$
(
window
).
height
()
-
500
)
*
0.5
});
inOutService
.
initMaterialSelectData
();
inOutService
.
initMaterialSelectPager
(
depotId
);
inOutService
.
materialSelectFun
(
depotId
);
...
...
erp_web/pages/bill/purchase_orders_list.html
View file @
0ffe35a4
...
...
@@ -197,7 +197,7 @@
<a
href=
"javascript:void(0)"
id=
"saveOtherMoneyDlg"
class=
"easyui-linkbutton"
iconCls=
"icon-ok"
>
保存
</a>
<a
href=
"javascript:void(0)"
id=
"cancelOtherMoneyDlg"
class=
"easyui-linkbutton"
iconCls=
"icon-cancel"
>
取消
</a>
</div>
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
width:880px;padding:10px 20px;
"
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
padding:10px;"
fit=
"true
"
closed=
"true"
modal=
"true"
buttons=
"#materialSelectDlgBtn"
cache=
"false"
collapsible=
"false"
closable=
"true"
>
<div
class=
"box-body form-inline"
>
<div
class=
"form-group"
>
...
...
@@ -618,7 +618,6 @@
depotId
=
$
(
edDepot
.
target
).
combobox
(
'
getValue
'
);
}
$
(
'
#materialSelectDlg
'
).
dialog
(
'
open
'
).
dialog
(
'
setTitle
'
,
'
<img src="/js/easyui/themes/icons/edit_add.png"/> 选择商品
'
);
$
(
"
#materialSelectDlg
"
).
panel
(
"
move
"
,{
top
:
$
(
document
).
scrollTop
()
+
(
$
(
window
).
height
()
-
500
)
*
0.5
});
inOutService
.
initMaterialSelectData
();
inOutService
.
initMaterialSelectPager
(
depotId
);
inOutService
.
materialSelectFun
(
depotId
);
...
...
erp_web/pages/bill/retail_back_list.html
View file @
0ffe35a4
...
...
@@ -210,7 +210,7 @@
<a
href=
"javascript:void(0)"
id=
"cancelDepotHeadShow"
class=
"easyui-linkbutton"
iconCls=
"icon-cancel"
onclick=
"javascript:$('#depotHeadDlgShow').dialog('close')"
>
取消
</a>
</div>
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
width:880px;padding:10px 20px;
"
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
padding:10px;"
fit=
"true
"
closed=
"true"
modal=
"true"
buttons=
"#materialSelectDlgBtn"
cache=
"false"
collapsible=
"false"
closable=
"true"
>
<div
class=
"box-body form-inline"
>
<div
class=
"form-group"
>
...
...
@@ -682,7 +682,6 @@
depotId
=
$
(
edDepot
.
target
).
combobox
(
'
getValue
'
);
}
$
(
'
#materialSelectDlg
'
).
dialog
(
'
open
'
).
dialog
(
'
setTitle
'
,
'
<img src="/js/easyui/themes/icons/edit_add.png"/> 选择商品
'
);
$
(
"
#materialSelectDlg
"
).
panel
(
"
move
"
,{
top
:
$
(
document
).
scrollTop
()
+
(
$
(
window
).
height
()
-
500
)
*
0.5
});
inOutService
.
initMaterialSelectData
();
inOutService
.
initMaterialSelectPager
(
depotId
);
inOutService
.
materialSelectFun
(
depotId
);
...
...
erp_web/pages/bill/retail_out_list.html
View file @
0ffe35a4
...
...
@@ -247,7 +247,7 @@
<a
href=
"javascript:void(0)"
id=
"saveDepotHeadAccountDlg"
class=
"easyui-linkbutton"
iconCls=
"icon-ok"
>
保存
</a>
<a
href=
"javascript:void(0)"
id=
"cancelDepotHeadAccountDlg"
class=
"easyui-linkbutton"
iconCls=
"icon-cancel"
>
取消
</a>
</div>
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
width:880px;padding:10px 20px;
"
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
padding:10px;"
fit=
"true
"
closed=
"true"
modal=
"true"
buttons=
"#materialSelectDlgBtn"
cache=
"false"
collapsible=
"false"
closable=
"true"
>
<div
class=
"box-body form-inline"
>
<div
class=
"form-group"
>
...
...
@@ -718,7 +718,6 @@
depotId
=
$
(
edDepot
.
target
).
combobox
(
'
getValue
'
);
}
$
(
'
#materialSelectDlg
'
).
dialog
(
'
open
'
).
dialog
(
'
setTitle
'
,
'
<img src="/js/easyui/themes/icons/edit_add.png"/> 选择商品
'
);
$
(
"
#materialSelectDlg
"
).
panel
(
"
move
"
,{
top
:
$
(
document
).
scrollTop
()
+
(
$
(
window
).
height
()
-
500
)
*
0.5
});
inOutService
.
initMaterialSelectData
();
inOutService
.
initMaterialSelectPager
(
depotId
);
inOutService
.
materialSelectFun
(
depotId
);
...
...
erp_web/pages/bill/sale_back_list.html
View file @
0ffe35a4
...
...
@@ -270,7 +270,7 @@
<a
href=
"javascript:void(0)"
id=
"saveOtherMoneyDlg"
class=
"easyui-linkbutton"
iconCls=
"icon-ok"
>
保存
</a>
<a
href=
"javascript:void(0)"
id=
"cancelOtherMoneyDlg"
class=
"easyui-linkbutton"
iconCls=
"icon-cancel"
>
取消
</a>
</div>
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
width:880px;padding:10px 20px;
"
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
padding:10px;"
fit=
"true
"
closed=
"true"
modal=
"true"
buttons=
"#materialSelectDlgBtn"
cache=
"false"
collapsible=
"false"
closable=
"true"
>
<div
class=
"box-body form-inline"
>
<div
class=
"form-group"
>
...
...
@@ -704,7 +704,6 @@
depotId
=
$
(
edDepot
.
target
).
combobox
(
'
getValue
'
);
}
$
(
'
#materialSelectDlg
'
).
dialog
(
'
open
'
).
dialog
(
'
setTitle
'
,
'
<img src="/js/easyui/themes/icons/edit_add.png"/> 选择商品
'
);
$
(
"
#materialSelectDlg
"
).
panel
(
"
move
"
,{
top
:
$
(
document
).
scrollTop
()
+
(
$
(
window
).
height
()
-
500
)
*
0.5
});
inOutService
.
initMaterialSelectData
();
inOutService
.
initMaterialSelectPager
(
depotId
);
inOutService
.
materialSelectFun
(
depotId
);
...
...
erp_web/pages/bill/sale_orders_list.html
View file @
0ffe35a4
...
...
@@ -199,7 +199,7 @@
<a
href=
"javascript:void(0)"
id=
"saveOtherMoneyDlg"
class=
"easyui-linkbutton"
iconCls=
"icon-ok"
>
保存
</a>
<a
href=
"javascript:void(0)"
id=
"cancelOtherMoneyDlg"
class=
"easyui-linkbutton"
iconCls=
"icon-cancel"
>
取消
</a>
</div>
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
width:880px;padding:10px 20px;
"
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
padding:10px;"
fit=
"true
"
closed=
"true"
modal=
"true"
buttons=
"#materialSelectDlgBtn"
cache=
"false"
collapsible=
"false"
closable=
"true"
>
<div
class=
"box-body form-inline"
>
<div
class=
"form-group"
>
...
...
@@ -662,7 +662,6 @@
depotId
=
$
(
edDepot
.
target
).
combobox
(
'
getValue
'
);
}
$
(
'
#materialSelectDlg
'
).
dialog
(
'
open
'
).
dialog
(
'
setTitle
'
,
'
<img src="/js/easyui/themes/icons/edit_add.png"/> 选择商品
'
);
$
(
"
#materialSelectDlg
"
).
panel
(
"
move
"
,{
top
:
$
(
document
).
scrollTop
()
+
(
$
(
window
).
height
()
-
500
)
*
0.5
});
inOutService
.
initMaterialSelectData
();
inOutService
.
initMaterialSelectPager
(
depotId
);
inOutService
.
materialSelectFun
(
depotId
);
...
...
erp_web/pages/bill/sale_out_list.html
View file @
0ffe35a4
...
...
@@ -297,7 +297,7 @@
<a
href=
"javascript:void(0)"
id=
"cancelLinkBill"
class=
"easyui-linkbutton"
iconCls=
"icon-cancel"
onclick=
"javascript:$('#linkBillDlg').dialog('close')"
>
取消
</a>
</div>
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
width:880px;padding:10px 20px;
"
<div
id=
"materialSelectDlg"
class=
"easyui-dialog"
style=
"
padding:10px;"
fit=
"true
"
closed=
"true"
modal=
"true"
buttons=
"#materialSelectDlgBtn"
cache=
"false"
collapsible=
"false"
closable=
"true"
>
<div
class=
"box-body form-inline"
>
<div
class=
"form-group"
>
...
...
@@ -857,7 +857,6 @@
depotId
=
$
(
edDepot
.
target
).
combobox
(
'
getValue
'
);
}
$
(
'
#materialSelectDlg
'
).
dialog
(
'
open
'
).
dialog
(
'
setTitle
'
,
'
<img src="/js/easyui/themes/icons/edit_add.png"/> 选择商品
'
);
$
(
"
#materialSelectDlg
"
).
panel
(
"
move
"
,{
top
:
$
(
document
).
scrollTop
()
+
(
$
(
window
).
height
()
-
500
)
*
0.5
});
inOutService
.
initMaterialSelectData
();
inOutService
.
initMaterialSelectPager
(
depotId
);
inOutService
.
materialSelectFun
(
depotId
);
...
...
Write
Preview
Supports
Markdown
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