Aidea product update by Strive Date 2020-10-14

aidea-modules/consult-module-web/src/main/webapp/WEB-INF/views/consultSheet/consultSheetform.html

@@ -205,11 +205,10 @@
 
                                 <div class="box-footer">
                                     #if($shiro.hasPermission("qy:consultSheet:edit"))
-                                    <input class="btn btn-primary" id="save" value="审核" type="submit">
+                                    <input class="btn btn-info" id="save" value="通过" type="submit">
+                                    <a id="reject"  class="btn btn-danger" onclick="beizhu()">拒绝</a>
                                     #end
-                                    <a style="background: #3C8DBC" id="reject"  class="btn btn-default"
-                                       onclick="beizhu()">拒绝</a>
-                                    <a  style="background: #3C8DBC" href="#springUrl('/a/consultSheet/list')" class="btn btn-default">返回</a>
+                                    <a  href="#springUrl('/a/consultSheet/list')" class="btn btn-default">返回</a>
                                 </div>
                             </div>
                         </form>

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/dao/ConsultSheetMapper.xml

@@ -103,7 +103,7 @@
         (
         #{id, jdbcType=BIGINT},
 
-        #{consultId, jdbcType=BIGINT},
+        #{consultId, jdbcType=VARCHAR},
         #{userName, jdbcType=VARCHAR},
         #{numberId, jdbcType=VARCHAR},
         now(),
@@ -173,7 +173,7 @@
             </if>
 
             <if test="consultId != null">
-                consult_id = #{consultId, jdbcType=BIGINT},
+                consult_id = #{consultId, jdbcType=VARCHAR},
             </if>
             <if test="userName != null">
                 user_name = #{userName, jdbcType=VARCHAR},

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/model/ConsultSheet.java

@@ -26,7 +26,7 @@ public class ConsultSheet extends UserSheet implements Serializable {
 
 /* 咨询单编码 */
         @ExportConfig(value = "咨询单编码", width = 100, showLevel = 1)
-    private Long consultId;
+    private String consultId;
 /* 用药人name */
         @ExportConfig(value = "用药人姓名", width = 100, showLevel = 1)
     private String userName;

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/model/ConsultSheetVO.java

@@ -16,7 +16,7 @@ public class ConsultSheetVO {
 
     /* 咨询单编码 */
     @ExportConfig(value = "咨询单编码", width = 100, showLevel = 1)
-    private Long consultId;
+    private String consultId;
     /* 用药人name */
     @ExportConfig(value = "用药人姓名", width = 100, showLevel = 1)
     private String userName;

aidea-modules/product-into-wareroom-module-web/src/main/webapp/WEB-INF/views/productIntoWareroom/productIntoWareroomform.html

@@ -125,6 +125,13 @@
                                 >
                             </div>
 
+                            <!--<div class="form-group form-md-line-input col-md-12">
+                            <input type="text" required class="form-control pull-right"
+                                   maxlength="500"
+                                   name="ScanningGun" placeholder="监听扫码枪"
+                            >
+                            </div>-->
+
                             <div class="box-footer">
                                 <a href="#springUrl('/a/productIntoWareroom/list')" class="btn btn-default">返回</a>
                             </div>
@@ -174,6 +181,9 @@
         recdTypeAdd.init();
     });
 
+//    document.οnkeydοwn() = function () {
+//        console.log("111111111");
+//    };
 
     var recdTypeAdd = function () {
         var initForm = function () {
@@ -181,6 +191,36 @@
                 bindEvent();
             };
             var bindEvent = function () {
+                //按下按钮触发 event.target ev.originalEvent.changedTouches 原生对象
+                $('#input[name="ScanningGun"]').on('keydown', function(event) {
+                    var ev = event.originalEvent.changedTouches;
+
+                    var x;
+                    if(window.event) // IE8 及更早IE版本
+                    {
+                        x=ev.keyCode;
+                    }
+                    else if(ev.which) // IE9/Firefox/Chrome/Opera/Safari
+                    {
+                        x=ev.which;
+                    }
+                    keychar=String.fromCharCode(x);
+//                    alert("按键 " + keychar + " 被按下");
+                      alert(event.originalEvent.changedTouches);
+                });
+
+                //功能按键不会触发keypress事件（keypress事件有个额外的charCode属性）
+                $('#input[name="ScanningGun"]').on('keypress', function() {
+
+                });
+
+                $('#input[name="ScanningGun"]').on('keyup', function() {
+
+                });
+
+
+
+
 
                 $("#myForm").validate({
                     rules: {},

cos-modules/cos-upload-module-web/src/main/webapp/WEB-INF/views/upload/materialUploadlist.html

@@ -100,10 +100,8 @@
                                                        placeholder="素材标题" name="title"
                                                        value="">
                                             </div>
-                                            <div class="col-xs-1">
-                                                <a class="search btn btn-primary">搜索</a>
-                                            </div>
                                             <div class="col-xs-5">
+                                                <a class="search btn btn-primary">搜索</a>
                                                 #if($shiro.hasPermission("material:edit"))
                                                 <button type="button" class="add btn btn-primary">新增</button>
                                                 #end