按钮”再加工“=”废品Checkbox“

wwwroot/main/Common/dialogdefect.html

@@ -22,7 +22,7 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <div style="padding-top: 1px;"><input type="checkbox" id="OemProcessing">&nbsp;&nbsp;<button id="Onm" type="button" class="btn btn-danger" onclick="CheckFlag()" style="font-size:16px; font-family:'微软雅黑';">再加工</button></div>
+                <!--<div style="padding-top: 1px;"><input type="checkbox" id="OemProcessing">&nbsp;&nbsp;<button id="Onm" type="button" class="btn btn-danger" onclick="CheckFlag()" style="font-size:16px; font-family:'微软雅黑';">代加工</button></div>-->
                 <!--<button type="button" id="OemProcessing" class="btn btn-danger" data-dismiss="modal">代加工</button>-->
                 <button type="button" id="cancelButtonDefect" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 <button type="button" id="okButtonDefect" class="btn btn-danger" data-dismiss="modal">确定</button>

wwwroot/main/ProductCheck/index.html

@@ -43,7 +43,6 @@
                             </div>
                             <div class="form-group col-4 mb-1">
                                 <label for="产品条码">产品条码</label>
-                                <label ID="金蝶代码" style="color: red; display: none;float:right;">没有对应的金蝶代码！</label>
                                 <input value="" onkeydown="if (event.keyCode == 13) loadProduct();" type="text" class="form-control" id="产品条码" placeholder="请输入" required onchange="ChangeBarcode()">
                                 <div id="softkeyboard"></div>
                             </div>
@@ -88,7 +87,7 @@
                                         <input type="radio" name="产品分级按钮项" id="产品分级{text}" value="{text}"> {text}
                                     </label>
                                 </div>
-                                <div id="产品分级按钮" class="btn-group btn-group-toggle pt-2" data-toggle="buttons">
+                                <div id="产品分级按钮" style="width:230px;height:50px;font-size:12px;" class="btn-group btn-group-toggle pt-2" data-toggle="buttons">
                                     <label class="btn btn-info" id="产品分级正品1" onclick="goodsLevelSelect('0')">
                                         <input type="radio" name="产品分级按钮项" id="产品分级正品" value="正品"> 正品
                                     </label>
@@ -102,10 +101,15 @@
                                         <input type="radio" name="产品分级按钮项" id="产品分级次品" value="次品"> 次品
                                     </label>
                                 </div>
+                                <!--<div style="width: 75px;" class="pt-2">-->
+                                <label class="btn btn-info" id="产品分级废品5" onclick="CheckFlag()" style="height: 42px; width: 75px; margin-top: -62px; margin-left: 230px;">
+                                    <input type="checkbox" name="oem" id="OemProcessing" value="废品">废品
+                                </label>
+                                <!--</div>-->
                             </div>
                             <div class="form-group col-4">
-                                <label for="返工工序">返工工序</label>
-                                <select id="返工工序" class="custom-select" required disabled>
+                                <label for="返工工序" style="margin-left: 18px;">返工工序</label>
+                                <select id="返工工序" class="custom-select" required disabled style="width: 273px;margin-left: 18px;">
                                     <option value="">请选择...</option>
                                 </select>
                             </div>
@@ -853,10 +857,9 @@
             $.post('api/GetKingdeeCode.ashx', { 'BarCode': barcode }, function (data) {
                 var json = JSON.parse(data);
                 if (json['success'] == true && json['rows'] == "1") {
-					$('#金蝶代码').css('display', 'none');
                 }
                 else {
-					$('#金蝶代码').css('display', 'block');
+                    alert("没有对应的金蝶代码！")
                 }
             });
         }
@@ -1054,6 +1057,7 @@
 
                 //缺陷页控制
                 if ($("#产品分级").find("option:selected").text() == '正品') {
+                    //document.getElementById("OemProcessing").checked == true
                     //如果有缺陷记录要确认是否删除
                     if (productionDefects.length > 0) {
                         swal({
@@ -1082,6 +1086,13 @@
                 else {
                     $('#产品分级保存按钮').prop('disabled', true);
                 }
+                if ($("#产品分级").find("option:selected").text() == '次品') {
+                    document.getElementById("OemProcessing").checked = false;
+                    $('#OemProcessing').prop('disabled', false);
+                } else {
+                    document.getElementById("OemProcessing").checked = false;
+                    $('#OemProcessing').prop('readonly', true);
+                }
                 //更新保存按钮
                 resetSaveButton();
             }