From 0ffe35a4a29570524f3fdd04fdc14702cdcd9f21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sun, 22 Nov 2020 21:30:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=95=86=E5=93=81=E7=9A=84=E5=BC=B9=E7=AA=97=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/js/pages/bill/in_out.js | 2 +- erp_web/pages/bill/allocation_out_list.html | 3 +-- erp_web/pages/bill/assemble_list.html | 3 +-- erp_web/pages/bill/disassemble_list.html | 3 +-- erp_web/pages/bill/other_in_list.html | 3 +-- erp_web/pages/bill/other_out_list.html | 3 +-- erp_web/pages/bill/purchase_back_list.html | 3 +-- erp_web/pages/bill/purchase_in_list.html | 3 +-- erp_web/pages/bill/purchase_orders_list.html | 3 +-- erp_web/pages/bill/retail_back_list.html | 3 +-- erp_web/pages/bill/retail_out_list.html | 3 +-- erp_web/pages/bill/sale_back_list.html | 3 +-- erp_web/pages/bill/sale_orders_list.html | 3 +-- erp_web/pages/bill/sale_out_list.html | 3 +-- 14 files changed, 14 insertions(+), 27 deletions(-) diff --git a/erp_web/js/pages/bill/in_out.js b/erp_web/js/pages/bill/in_out.js index 6a8b1159..a443d5d1 100644 --- a/erp_web/js/pages/bill/in_out.js +++ b/erp_web/js/pages/bill/in_out.js @@ -1255,7 +1255,7 @@ initMaterialSelectData: function(){ var self = this; $('#materialSelectData').datagrid({ - height: 390, + height: 480, rownumbers: false, //动画效果 animate: false, diff --git a/erp_web/pages/bill/allocation_out_list.html b/erp_web/pages/bill/allocation_out_list.html index b765c8a6..26df4427 100644 --- a/erp_web/pages/bill/allocation_out_list.html +++ b/erp_web/pages/bill/allocation_out_list.html @@ -134,7 +134,7 @@ 取消 -
@@ -522,7 +522,6 @@ depotId = $(edDepot.target).combobox('getValue'); } $('#materialSelectDlg').dialog('open').dialog('setTitle', ' 选择商品'); - $("#materialSelectDlg").panel("move",{top:$(document).scrollTop() + ($(window).height()-500) * 0.5}); inOutService.initMaterialSelectData(); inOutService.initMaterialSelectPager(depotId); inOutService.materialSelectFun(depotId); diff --git a/erp_web/pages/bill/assemble_list.html b/erp_web/pages/bill/assemble_list.html index bb785073..79fa9bad 100644 --- a/erp_web/pages/bill/assemble_list.html +++ b/erp_web/pages/bill/assemble_list.html @@ -133,7 +133,7 @@ 取消
-
@@ -520,7 +520,6 @@ depotId = $(edDepot.target).combobox('getValue'); } $('#materialSelectDlg').dialog('open').dialog('setTitle', ' 选择商品'); - $("#materialSelectDlg").panel("move",{top:$(document).scrollTop() + ($(window).height()-500) * 0.5}); inOutService.initMaterialSelectData(); inOutService.initMaterialSelectPager(depotId); inOutService.materialSelectFun(depotId); diff --git a/erp_web/pages/bill/disassemble_list.html b/erp_web/pages/bill/disassemble_list.html index 2d580587..7987e996 100644 --- a/erp_web/pages/bill/disassemble_list.html +++ b/erp_web/pages/bill/disassemble_list.html @@ -133,7 +133,7 @@ 取消
-
@@ -521,7 +521,6 @@ depotId = $(edDepot.target).combobox('getValue'); } $('#materialSelectDlg').dialog('open').dialog('setTitle', ' 选择商品'); - $("#materialSelectDlg").panel("move",{top:$(document).scrollTop() + ($(window).height()-500) * 0.5}); inOutService.initMaterialSelectData(); inOutService.initMaterialSelectPager(depotId); inOutService.materialSelectFun(depotId); diff --git a/erp_web/pages/bill/other_in_list.html b/erp_web/pages/bill/other_in_list.html index 35575405..40076089 100644 --- a/erp_web/pages/bill/other_in_list.html +++ b/erp_web/pages/bill/other_in_list.html @@ -144,7 +144,7 @@ 取消
-
@@ -532,7 +532,6 @@ depotId = $(edDepot.target).combobox('getValue'); } $('#materialSelectDlg').dialog('open').dialog('setTitle', ' 选择商品'); - $("#materialSelectDlg").panel("move",{top:$(document).scrollTop() + ($(window).height()-500) * 0.5}); inOutService.initMaterialSelectData(); inOutService.initMaterialSelectPager(depotId); inOutService.materialSelectFun(depotId); diff --git a/erp_web/pages/bill/other_out_list.html b/erp_web/pages/bill/other_out_list.html index 4bc99dd9..3e55cb8b 100644 --- a/erp_web/pages/bill/other_out_list.html +++ b/erp_web/pages/bill/other_out_list.html @@ -138,7 +138,7 @@ 取消
-
@@ -525,7 +525,6 @@ depotId = $(edDepot.target).combobox('getValue'); } $('#materialSelectDlg').dialog('open').dialog('setTitle', ' 选择商品'); - $("#materialSelectDlg").panel("move",{top:$(document).scrollTop() + ($(window).height()-500) * 0.5}); inOutService.initMaterialSelectData(); inOutService.initMaterialSelectPager(depotId); inOutService.materialSelectFun(depotId); diff --git a/erp_web/pages/bill/purchase_back_list.html b/erp_web/pages/bill/purchase_back_list.html index e9c0431d..c47376e9 100644 --- a/erp_web/pages/bill/purchase_back_list.html +++ b/erp_web/pages/bill/purchase_back_list.html @@ -270,7 +270,7 @@ 保存 取消
-
@@ -663,7 +663,6 @@ depotId = $(edDepot.target).combobox('getValue'); } $('#materialSelectDlg').dialog('open').dialog('setTitle', ' 选择商品'); - $("#materialSelectDlg").panel("move",{top:$(document).scrollTop() + ($(window).height()-500) * 0.5}); inOutService.initMaterialSelectData(); inOutService.initMaterialSelectPager(depotId); inOutService.materialSelectFun(depotId); diff --git a/erp_web/pages/bill/purchase_in_list.html b/erp_web/pages/bill/purchase_in_list.html index a0f89afd..33f3c410 100644 --- a/erp_web/pages/bill/purchase_in_list.html +++ b/erp_web/pages/bill/purchase_in_list.html @@ -295,7 +295,7 @@ 取消
-
@@ -788,7 +788,6 @@ depotId = $(edDepot.target).combobox('getValue'); } $('#materialSelectDlg').dialog('open').dialog('setTitle', ' 选择商品'); - $("#materialSelectDlg").panel("move",{top:$(document).scrollTop() + ($(window).height()-500) * 0.5}); inOutService.initMaterialSelectData(); inOutService.initMaterialSelectPager(depotId); inOutService.materialSelectFun(depotId); diff --git a/erp_web/pages/bill/purchase_orders_list.html b/erp_web/pages/bill/purchase_orders_list.html index 596c4355..166638cc 100644 --- a/erp_web/pages/bill/purchase_orders_list.html +++ b/erp_web/pages/bill/purchase_orders_list.html @@ -197,7 +197,7 @@ 保存 取消
-
@@ -618,7 +618,6 @@ depotId = $(edDepot.target).combobox('getValue'); } $('#materialSelectDlg').dialog('open').dialog('setTitle', ' 选择商品'); - $("#materialSelectDlg").panel("move",{top:$(document).scrollTop() + ($(window).height()-500) * 0.5}); inOutService.initMaterialSelectData(); inOutService.initMaterialSelectPager(depotId); inOutService.materialSelectFun(depotId); diff --git a/erp_web/pages/bill/retail_back_list.html b/erp_web/pages/bill/retail_back_list.html index da83d295..59988b3c 100644 --- a/erp_web/pages/bill/retail_back_list.html +++ b/erp_web/pages/bill/retail_back_list.html @@ -210,7 +210,7 @@ 取消
-
@@ -682,7 +682,6 @@ depotId = $(edDepot.target).combobox('getValue'); } $('#materialSelectDlg').dialog('open').dialog('setTitle', ' 选择商品'); - $("#materialSelectDlg").panel("move",{top:$(document).scrollTop() + ($(window).height()-500) * 0.5}); inOutService.initMaterialSelectData(); inOutService.initMaterialSelectPager(depotId); inOutService.materialSelectFun(depotId); diff --git a/erp_web/pages/bill/retail_out_list.html b/erp_web/pages/bill/retail_out_list.html index c2a1cd63..7897b6c0 100644 --- a/erp_web/pages/bill/retail_out_list.html +++ b/erp_web/pages/bill/retail_out_list.html @@ -247,7 +247,7 @@ 保存 取消
-
@@ -718,7 +718,6 @@ depotId = $(edDepot.target).combobox('getValue'); } $('#materialSelectDlg').dialog('open').dialog('setTitle', ' 选择商品'); - $("#materialSelectDlg").panel("move",{top:$(document).scrollTop() + ($(window).height()-500) * 0.5}); inOutService.initMaterialSelectData(); inOutService.initMaterialSelectPager(depotId); inOutService.materialSelectFun(depotId); diff --git a/erp_web/pages/bill/sale_back_list.html b/erp_web/pages/bill/sale_back_list.html index 2dd29fb8..d42e4fc6 100644 --- a/erp_web/pages/bill/sale_back_list.html +++ b/erp_web/pages/bill/sale_back_list.html @@ -270,7 +270,7 @@ 保存 取消
-
@@ -704,7 +704,6 @@ depotId = $(edDepot.target).combobox('getValue'); } $('#materialSelectDlg').dialog('open').dialog('setTitle', ' 选择商品'); - $("#materialSelectDlg").panel("move",{top:$(document).scrollTop() + ($(window).height()-500) * 0.5}); inOutService.initMaterialSelectData(); inOutService.initMaterialSelectPager(depotId); inOutService.materialSelectFun(depotId); diff --git a/erp_web/pages/bill/sale_orders_list.html b/erp_web/pages/bill/sale_orders_list.html index 41c2709c..cfb59ec2 100644 --- a/erp_web/pages/bill/sale_orders_list.html +++ b/erp_web/pages/bill/sale_orders_list.html @@ -199,7 +199,7 @@ 保存 取消
-
@@ -662,7 +662,6 @@ depotId = $(edDepot.target).combobox('getValue'); } $('#materialSelectDlg').dialog('open').dialog('setTitle', ' 选择商品'); - $("#materialSelectDlg").panel("move",{top:$(document).scrollTop() + ($(window).height()-500) * 0.5}); inOutService.initMaterialSelectData(); inOutService.initMaterialSelectPager(depotId); inOutService.materialSelectFun(depotId); diff --git a/erp_web/pages/bill/sale_out_list.html b/erp_web/pages/bill/sale_out_list.html index 027e2846..9ef0e122 100644 --- a/erp_web/pages/bill/sale_out_list.html +++ b/erp_web/pages/bill/sale_out_list.html @@ -297,7 +297,7 @@ 取消
-
@@ -857,7 +857,6 @@ depotId = $(edDepot.target).combobox('getValue'); } $('#materialSelectDlg').dialog('open').dialog('setTitle', ' 选择商品'); - $("#materialSelectDlg").panel("move",{top:$(document).scrollTop() + ($(window).height()-500) * 0.5}); inOutService.initMaterialSelectData(); inOutService.initMaterialSelectPager(depotId); inOutService.materialSelectFun(depotId);