Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/resources/templates/quality/qualityOrder/qualityOrder.html

@@ -48,11 +48,6 @@
                 </form>
             </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="quality:qualityOrder:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-            </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
             </div>

ruoyi-admin/src/main/resources/templates/quality/qualityOrder/qualityOrderReport.html

@@ -203,12 +203,22 @@
                 {
                     title: '数量',
                     field: 'processBadNum',
-                    editable:true
+                    editable:{
+                        type: 'text',
+                        mode:'inline',
+                        validate: function (v) {
+                            if (!v) return '数量不能为空';
+                            if (isNaN(v)) return '数量必须是数字';
+                            var processBadNum = parseInt(v);
+                            if (processBadNum <= 0) return '数量必须是正整数';
+                        }
+                    }
                 },
                 {
                     title: '报告',
                     field: 'unqualifiedReportUrl',
                     editable: {
+                        mode:'inline',
                         type: 'text', // 表示该列可以被编辑为文本
                     },
                 },