Browse Source

凌云集团更改公司

peiguo 5 years ago
parent
commit
614fc8347e

+ 18 - 3
admin-ui/app/whepi/scan/xqmanage.js

@@ -21,7 +21,7 @@ define(function (require) {
                 var queryForm = $form.formGet();
                 var queryForm = $form.formGet();
                 $.yvan.download({
                 $.yvan.download({
                     method: 'post',
                     method: 'post',
-                    url: api('/sweepCode/export?queryProperties=' + queryForm.queryProperties + '&phone=' + queryForm.phone + '&uptownId=' + queryForm.uptownId + '&goStatus=' + queryForm.goStatus + '&dateSta=' + queryForm.dateSta + '&dateEnd=' + queryForm.dateEnd),
+                    url: api('/sweepCode/export?queryProperties=' + queryForm.queryProperties + '&errorInfo=' + queryForm.errorInfo + '&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'
                     fileName: '进出管理-' + $.yvan.getMoment().format('YYYY-MM-DD HH:mm:ss') + '.xlsx'
 
 
                 });
                 });
@@ -42,6 +42,13 @@ define(function (require) {
                     queryGrid1();
                     queryGrid1();
                 }
                 }
             }
             }
+            function enterQueryGrid3(e) {
+                if (e.keyCode === 13) {
+                    var tmp = $(this).val();
+                    $form.formSet({errorInfo: tmp});
+                    queryGrid1();
+                }
+            }
 
 
             // 检索条件查询
             // 检索条件查询
             function queryGrid1() {
             function queryGrid1() {
@@ -107,6 +114,14 @@ define(function (require) {
                         labelWidth: 'auto',
                         labelWidth: 'auto',
                         events: {keydown: enterQueryGrid2}, width: 250
                         events: {keydown: enterQueryGrid2}, width: 250
                     },
                     },
+                    {
+                        xtype: 'textbox',
+                        label: '错误提示',
+                        name: 'errorInfo',
+                        prompt: "错误提示",
+                        labelWidth: 'auto',
+                        events: {keydown: enterQueryGrid3}, width: 250
+                    },
                     {xtype: 'hidden', name: 'uptownId'},
                     {xtype: 'hidden', name: 'uptownId'},
                     {
                     {
                         xtype: 'searchbox',
                         xtype: 'searchbox',
@@ -124,7 +139,7 @@ define(function (require) {
                             }
                             }
                             queryGrid1();
                             queryGrid1();
                         },
                         },
-                    },
+                    },],[
                     {
                     {
                         xtype: 'yvselect', label: '通行状态', name: 'goStatus', labelWidth: 'auto', value: '', width: 220,
                         xtype: 'yvselect', label: '通行状态', name: 'goStatus', labelWidth: 'auto', value: '', width: 220,
                         data: [
                         data: [
@@ -183,7 +198,7 @@ define(function (require) {
 
 
             return {
             return {
                 north: {
                 north: {
-                    height: 88,
+                    height: 132,
                     /* split: true,
                     /* split: true,
                      border: false,*///底框是否可变动
                      border: false,*///底框是否可变动
                     items: [
                     items: [

+ 18 - 3
admin-ui/app/whepi/scan/xqmanageHC.js

@@ -21,7 +21,7 @@ define(function (require) {
                 var queryForm = $form.formGet();
                 var queryForm = $form.formGet();
                 $.yvan.download({
                 $.yvan.download({
                     method: 'post',
                     method: 'post',
-                    url: api('/sweepCode/exportHC?queryProperties=' + queryForm.queryProperties + '&phone=' + queryForm.phone + '&unitId=' + queryForm.unitId + '&goStatus=' + queryForm.goStatus + '&dateSta=' + queryForm.dateSta + '&dateEnd=' + queryForm.dateEnd),
+                    url: api('/sweepCode/exportHC?queryProperties=' + queryForm.queryProperties + '&errorInfo=' + queryForm.errorInfo + '&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'
                     fileName: '进出管理-' + $.yvan.getMoment().format('YYYY-MM-DD HH:mm:ss') + '.xlsx'
 
 
                 });
                 });
@@ -42,6 +42,13 @@ define(function (require) {
                     queryGrid1();
                     queryGrid1();
                 }
                 }
             }
             }
+            function enterQueryGrid3(e) {
+                if (e.keyCode === 13) {
+                    var tmp = $(this).val();
+                    $form.formSet({errorInfo: tmp});
+                    queryGrid1();
+                }
+            }
 
 
             // 检索条件查询
             // 检索条件查询
             function queryGrid1() {
             function queryGrid1() {
@@ -107,6 +114,14 @@ define(function (require) {
                         labelWidth: 'auto',
                         labelWidth: 'auto',
                         events: {keydown: enterQueryGrid2}, width: 250
                         events: {keydown: enterQueryGrid2}, width: 250
                     },
                     },
+                    {
+                        xtype: 'textbox',
+                        label: '错误提示',
+                        name: 'errorInfo',
+                        prompt: "错误提示",
+                        labelWidth: 'auto',
+                        events: {keydown: enterQueryGrid3}, width: 250
+                    },
                     {xtype: 'hidden', name: 'unitId'},
                     {xtype: 'hidden', name: 'unitId'},
                     {
                     {
                         xtype: 'searchbox',
                         xtype: 'searchbox',
@@ -124,7 +139,7 @@ define(function (require) {
                             }
                             }
                             queryGrid1();
                             queryGrid1();
                         },
                         },
-                    },
+                    },],[
                     {
                     {
                         xtype: 'yvselect', label: '通行状态', name: 'goStatus', labelWidth: 'auto', value: '', width: 220,
                         xtype: 'yvselect', label: '通行状态', name: 'goStatus', labelWidth: 'auto', value: '', width: 220,
                         data: [
                         data: [
@@ -183,7 +198,7 @@ define(function (require) {
 
 
             return {
             return {
                 north: {
                 north: {
-                    height: 88,
+                    height: 132,
                     /* split: true,
                     /* split: true,
                      border: false,*///底框是否可变动
                      border: false,*///底框是否可变动
                     items: [
                     items: [

+ 18 - 3
admin-ui/app/whepi/scan/xqmanageLY.js

@@ -21,7 +21,7 @@ define(function (require) {
                 var queryForm = $form.formGet();
                 var queryForm = $form.formGet();
                 $.yvan.download({
                 $.yvan.download({
                     method: 'post',
                     method: 'post',
-                    url: api('/sweepCode/exportLY?queryProperties=' + queryForm.queryProperties + '&phone=' + queryForm.phone + '&unitId=' + queryForm.unitId + '&goStatus=' + queryForm.goStatus + '&dateSta=' + queryForm.dateSta + '&dateEnd=' + queryForm.dateEnd),
+                    url: api('/sweepCode/exportLY?queryProperties=' + queryForm.queryProperties + '&errorInfo=' + queryForm.errorInfo  + '&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'
                     fileName: '进出管理-' + $.yvan.getMoment().format('YYYY-MM-DD HH:mm:ss') + '.xlsx'
 
 
                 });
                 });
@@ -42,6 +42,13 @@ define(function (require) {
                     queryGrid1();
                     queryGrid1();
                 }
                 }
             }
             }
+            function enterQueryGrid3(e) {
+                if (e.keyCode === 13) {
+                    var tmp = $(this).val();
+                    $form.formSet({errorInfo: tmp});
+                    queryGrid1();
+                }
+            }
 
 
             // 检索条件查询
             // 检索条件查询
             function queryGrid1() {
             function queryGrid1() {
@@ -107,6 +114,14 @@ define(function (require) {
                         labelWidth: 'auto',
                         labelWidth: 'auto',
                         events: {keydown: enterQueryGrid2}, width: 250
                         events: {keydown: enterQueryGrid2}, width: 250
                     },
                     },
+                    {
+                        xtype: 'textbox',
+                        label: '错误提示',
+                        name: 'errorInfo',
+                        prompt: "错误提示",
+                        labelWidth: 'auto',
+                        events: {keydown: enterQueryGrid3}, width: 250
+                    },
                     {xtype: 'hidden', name: 'unitId'},
                     {xtype: 'hidden', name: 'unitId'},
                     {
                     {
                         xtype: 'searchbox',
                         xtype: 'searchbox',
@@ -124,7 +139,7 @@ define(function (require) {
                             }
                             }
                             queryGrid1();
                             queryGrid1();
                         },
                         },
-                    },
+                    },],[
                     {
                     {
                         xtype: 'yvselect', label: '通行状态', name: 'goStatus', labelWidth: 'auto', value: '', width: 220,
                         xtype: 'yvselect', label: '通行状态', name: 'goStatus', labelWidth: 'auto', value: '', width: 220,
                         data: [
                         data: [
@@ -183,7 +198,7 @@ define(function (require) {
 
 
             return {
             return {
                 north: {
                 north: {
-                    height: 88,
+                    height: 132,
                     /* split: true,
                     /* split: true,
                      border: false,*///底框是否可变动
                      border: false,*///底框是否可变动
                     items: [
                     items: [

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

@@ -33,6 +33,9 @@
                 and (g.linkman like concat('%',#{phone},'%')
                 and (g.linkman like concat('%',#{phone},'%')
                 or g.phone = #{phone} )
                 or g.phone = #{phone} )
             </if>
             </if>
+            <if test="errorInfo != null and errorInfo != ''">
+                and c.error_info like concat('%',#{errorInfo},'%')
+            </if>
             <if test="uptownId != null and uptownId != ''">
             <if test="uptownId != null and uptownId != ''">
                 and a.uptown_id = #{uptownId}
                 and a.uptown_id = #{uptownId}
             </if>
             </if>
@@ -106,6 +109,9 @@
                 and (g.linkman like concat('%',#{phone},'%')
                 and (g.linkman like concat('%',#{phone},'%')
                 or g.phone = #{phone} )
                 or g.phone = #{phone} )
             </if>
             </if>
+            <if test="errorInfo != null and errorInfo != ''">
+                and c.error_info like concat('%',#{errorInfo},'%')
+            </if>
             <if test="uptownId != null and uptownId != ''">
             <if test="uptownId != null and uptownId != ''">
                 and a.uptown_id = #{uptownId}
                 and a.uptown_id = #{uptownId}
             </if>
             </if>
@@ -155,6 +161,9 @@
                 and (g.linkman like concat('%',#{phone},'%')
                 and (g.linkman like concat('%',#{phone},'%')
                 or g.phone = #{phone} )
                 or g.phone = #{phone} )
             </if>
             </if>
+            <if test="errorInfo != null and errorInfo != ''">
+                and c.error_info like concat('%',#{errorInfo},'%')
+            </if>
             <if test="unitId != null and unitId != ''">
             <if test="unitId != null and unitId != ''">
                 and d.unit_id = #{unitId}
                 and d.unit_id = #{unitId}
             </if>
             </if>
@@ -202,6 +211,9 @@
                 and (g.linkman like concat('%',#{phone},'%')
                 and (g.linkman like concat('%',#{phone},'%')
                 or g.phone = #{phone} )
                 or g.phone = #{phone} )
             </if>
             </if>
+            <if test="errorInfo != null and errorInfo != ''">
+                and c.error_info like concat('%',#{errorInfo},'%')
+            </if>
             <if test="unitId != null and unitId != ''">
             <if test="unitId != null and unitId != ''">
                 and d.unit_id = #{unitId}
                 and d.unit_id = #{unitId}
             </if>
             </if>
@@ -250,6 +262,9 @@
                 and (g.linkman like concat('%',#{phone},'%')
                 and (g.linkman like concat('%',#{phone},'%')
                 or g.phone = #{phone} )
                 or g.phone = #{phone} )
             </if>
             </if>
+            <if test="errorInfo != null and errorInfo != ''">
+                and c.error_info like concat('%',#{errorInfo},'%')
+            </if>
             <if test="unitId != null and unitId != ''">
             <if test="unitId != null and unitId != ''">
                 and d.unit_id = #{unitId}
                 and d.unit_id = #{unitId}
             </if>
             </if>
@@ -297,6 +312,9 @@
                 and (g.linkman like concat('%',#{phone},'%')
                 and (g.linkman like concat('%',#{phone},'%')
                 or g.phone = #{phone} )
                 or g.phone = #{phone} )
             </if>
             </if>
+            <if test="errorInfo != null and errorInfo != ''">
+                and c.error_info like concat('%',#{errorInfo},'%')
+            </if>
             <if test="unitId != null and unitId != ''">
             <if test="unitId != null and unitId != ''">
                 and d.unit_id = #{unitId}
                 and d.unit_id = #{unitId}
             </if>
             </if>