瀏覽代碼

凌云集团更改公司

peiguo 5 年之前
父節點
當前提交
3ddd3296ea

+ 16 - 1
admin-ui/app/whepi/scan/xqmanage.js

@@ -21,7 +21,7 @@ define(function (require) {
                 var queryForm = $form.formGet();
                 $.yvan.download({
                     method: 'post',
-                    url: api('/sweepCode/export?queryProperties=' + queryForm.queryProperties + '&uptownId=' + queryForm.uptownId + '&goStatus=' + queryForm.goStatus + '&dateSta=' + queryForm.dateSta + '&dateEnd=' + queryForm.dateEnd),
+                    url: api('/sweepCode/export?queryProperties=' + queryForm.queryProperties + '&phone=' + queryForm.phone + '&uptownId=' + queryForm.uptownId + '&goStatus=' + queryForm.goStatus + '&dateSta=' + queryForm.dateSta + '&dateEnd=' + queryForm.dateEnd),
                     fileName: '进出管理-' + $.yvan.getMoment().format('YYYY-MM-DD HH:mm:ss') + '.xlsx'
 
                 });
@@ -35,6 +35,13 @@ define(function (require) {
                     queryGrid1();
                 }
             }
+            function enterQueryGrid2(e) {
+                if (e.keyCode === 13) {
+                    var tmp = $(this).val();
+                    $form.formSet({phone: tmp});
+                    queryGrid1();
+                }
+            }
 
             // 检索条件查询
             function queryGrid1() {
@@ -92,6 +99,14 @@ define(function (require) {
                         labelWidth: 'auto',
                         events: {keydown: enterQueryGrid1}, width: 250
                     },
+                    {
+                        xtype: 'textbox',
+                        label: '姓名/电话',
+                        name: 'phone',
+                        prompt: "姓名/电话",
+                        labelWidth: 'auto',
+                        events: {keydown: enterQueryGrid2}, width: 250
+                    },
                     {xtype: 'hidden', name: 'uptownId'},
                     {
                         xtype: 'searchbox',

+ 16 - 1
admin-ui/app/whepi/scan/xqmanageHC.js

@@ -21,7 +21,7 @@ define(function (require) {
                 var queryForm = $form.formGet();
                 $.yvan.download({
                     method: 'post',
-                    url: api('/sweepCode/exportHC?queryProperties=' + queryForm.queryProperties + '&unitId=' + queryForm.unitId + '&goStatus=' + queryForm.goStatus + '&dateSta=' + queryForm.dateSta + '&dateEnd=' + queryForm.dateEnd),
+                    url: api('/sweepCode/exportHC?queryProperties=' + queryForm.queryProperties + '&phone=' + queryForm.phone + '&unitId=' + queryForm.unitId + '&goStatus=' + queryForm.goStatus + '&dateSta=' + queryForm.dateSta + '&dateEnd=' + queryForm.dateEnd),
                     fileName: '进出管理-' + $.yvan.getMoment().format('YYYY-MM-DD HH:mm:ss') + '.xlsx'
 
                 });
@@ -35,6 +35,13 @@ define(function (require) {
                     queryGrid1();
                 }
             }
+            function enterQueryGrid2(e) {
+                if (e.keyCode === 13) {
+                    var tmp = $(this).val();
+                    $form.formSet({phone: tmp});
+                    queryGrid1();
+                }
+            }
 
             // 检索条件查询
             function queryGrid1() {
@@ -92,6 +99,14 @@ define(function (require) {
                         labelWidth: 'auto',
                         events: {keydown: enterQueryGrid1}, width: 250
                     },
+                    {
+                        xtype: 'textbox',
+                        label: '姓名/电话',
+                        name: 'phone',
+                        prompt: "姓名/电话",
+                        labelWidth: 'auto',
+                        events: {keydown: enterQueryGrid2}, width: 250
+                    },
                     {xtype: 'hidden', name: 'unitId'},
                     {
                         xtype: 'searchbox',

+ 16 - 1
admin-ui/app/whepi/scan/xqmanageLY.js

@@ -21,7 +21,7 @@ define(function (require) {
                 var queryForm = $form.formGet();
                 $.yvan.download({
                     method: 'post',
-                    url: api('/sweepCode/exportLY?queryProperties=' + queryForm.queryProperties + '&unitId=' + queryForm.unitId + '&goStatus=' + queryForm.goStatus + '&dateSta=' + queryForm.dateSta + '&dateEnd=' + queryForm.dateEnd),
+                    url: api('/sweepCode/exportLY?queryProperties=' + queryForm.queryProperties + '&phone=' + queryForm.phone + '&unitId=' + queryForm.unitId + '&goStatus=' + queryForm.goStatus + '&dateSta=' + queryForm.dateSta + '&dateEnd=' + queryForm.dateEnd),
                     fileName: '进出管理-' + $.yvan.getMoment().format('YYYY-MM-DD HH:mm:ss') + '.xlsx'
 
                 });
@@ -35,6 +35,13 @@ define(function (require) {
                     queryGrid1();
                 }
             }
+            function enterQueryGrid2(e) {
+                if (e.keyCode === 13) {
+                    var tmp = $(this).val();
+                    $form.formSet({phone: tmp});
+                    queryGrid1();
+                }
+            }
 
             // 检索条件查询
             function queryGrid1() {
@@ -92,6 +99,14 @@ define(function (require) {
                         labelWidth: 'auto',
                         events: {keydown: enterQueryGrid1}, width: 250
                     },
+                    {
+                        xtype: 'textbox',
+                        label: '姓名/电话',
+                        name: 'phone',
+                        prompt: "姓名/电话",
+                        labelWidth: 'auto',
+                        events: {keydown: enterQueryGrid2}, width: 250
+                    },
                     {xtype: 'hidden', name: 'unitId'},
                     {
                         xtype: 'searchbox',

+ 24 - 0
whepi-web/src/main/resources/mapper/SweepCodeMapper.xml

@@ -28,6 +28,10 @@
             <if test="queryProperties != null and queryProperties != ''">
                 b.door_name like concat('%',#{queryProperties},'%')
             </if>
+            <if test="phone != null and phone != ''">
+                and (g.linkman like concat('%',#{phone},'%')
+                or g.phone = #{phone} )
+            </if>
             <if test="uptownId != null and uptownId != ''">
                 and a.uptown_id = #{uptownId}
             </if>
@@ -96,6 +100,10 @@
             <if test="queryProperties != null and queryProperties != ''">
                 b.door_name like concat('%',#{queryProperties},'%')
             </if>
+            <if test="phone != null and phone != ''">
+                and (g.linkman like concat('%',#{phone},'%')
+                or g.phone = #{phone} )
+            </if>
             <if test="uptownId != null and uptownId != ''">
                 and a.uptown_id = #{uptownId}
             </if>
@@ -140,6 +148,10 @@
             <if test="queryProperties != null and queryProperties != ''">
                 and b.door_name like concat('%',#{queryProperties},'%')
             </if>
+            <if test="phone != null and phone != ''">
+                and (g.linkman like concat('%',#{phone},'%')
+                or g.phone = #{phone} )
+            </if>
             <if test="unitId != null and unitId != ''">
                 and d.unit_id = #{unitId}
             </if>
@@ -182,6 +194,10 @@
             <if test="queryProperties != null and queryProperties != ''">
                 and b.door_name like concat('%',#{queryProperties},'%')
             </if>
+            <if test="phone != null and phone != ''">
+                and (g.linkman like concat('%',#{phone},'%')
+                or g.phone = #{phone} )
+            </if>
             <if test="unitId != null and unitId != ''">
                 and d.unit_id = #{unitId}
             </if>
@@ -225,6 +241,10 @@
             <if test="queryProperties != null and queryProperties != ''">
                 and b.door_name like concat('%',#{queryProperties},'%')
             </if>
+            <if test="phone != null and phone != ''">
+                and (g.linkman like concat('%',#{phone},'%')
+                or g.phone = #{phone} )
+            </if>
             <if test="unitId != null and unitId != ''">
                 and d.unit_id = #{unitId}
             </if>
@@ -267,6 +287,10 @@
             <if test="queryProperties != null and queryProperties != ''">
                 and b.door_name like concat('%',#{queryProperties},'%')
             </if>
+            <if test="phone != null and phone != ''">
+                and (g.linkman like concat('%',#{phone},'%')
+                or g.phone = #{phone} )
+            </if>
             <if test="unitId != null and unitId != ''">
                 and d.unit_id = #{unitId}
             </if>