MES-WEB-LayUI.git

parent: 9d0020f9 | 补丁 | 提交 | ignore whitespace

zrg

2024-04-15 bd45155a8920fff12bc921d9166223e98430ce9f

6个文件已修改

	WebTM/layuiadmin/Scripts/webConfig.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBill_PDA.html	53 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_QiaoYi_PDA.html	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/video/success.wav	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/工序检验单/MES_ProcessCheckBill_PDA.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转/MES_ColorRecordBill_PDA.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -3,11 +3,11 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //åå¬å®¤æå¡å¨
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //chæ¬å°*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost/API/";             //é¢æåæ¬å°éç½®
    var WEBURL = "http://localhost/API/";             //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
    //var WEBURL = "http://localhost:8082/API/";    //æè´ºæ¬å°éç½®
    //var WEBURL = "http://localhost:8083/API/";  //éé¯éæ¬å°éç½®
    var WEBURL = "http://localhost:8082/API/";    //å¼ çå¹¿æ¬å°éç½®
    //var WEBURL = "http://localhost:8082/API/";    //å¼ çå¹¿æ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //ä½ææ°æ¬å°éç½®
    //var WEBURL = "http://localhost:8088/ARAPI/";    //ä½ææ°æ¬å°éç½®(å®ç)
    //var WEBURL = "http://10.1.4.155/API/";   //æ±ä¸°å®¢æ·NEW

 WebTM/views/WMSÉ¨ÂëÄ£¿é/ÆäËûÈë¿â/Kf_OtherInBill_PDA.html

@@ -428,7 +428,8 @@
                                icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
                            }, function () { parent.location.href = "../../../views/index_Mobile.html"; });
                        }
                    }
                    },
                    complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                });
                layer.closeAll("loading");
            }
@@ -439,12 +440,22 @@
                console.log("playSound");
                var audio = document.getElementById("cs");
                audio.play();
                audio.onended = function () {
                    // å½é³é¢ææ¥å®ææ¶ï¼è°ç¨ pause åè®¾ç½® currentTime ä¸º 0 ä»¥åæ¢ææ¥å¹¶éç½®
                    audio.pause();
                    audio.currentTime = 0;
                };
            }
            //æåæç¤ºé³
            function playSound_OK() {
                console.log("playSound_OK");
                var audio = document.getElementById("cs2");
                audio.play();
                audio.onended = function () {
                    // å½é³é¢ææ¥å®ææ¶ï¼è°ç¨ pause åè®¾ç½® currentTime ä¸º 0 ä»¥åæ¢ææ¥å¹¶éç½®
                    audio.pause();
                    audio.currentTime = 0;
                };
            }

            //#region åå§åçé¢
@@ -532,7 +543,8 @@
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                    },
                    complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                })
            }
            //åå§åè¡¨æ ¼
@@ -544,6 +556,9 @@
                    , height: 'full-60'
                    , cellMinWidth: 90
                    , limit: 50
                    , done: function () {
                        layer.closeAll("loading");
                    }
                };
            }

@@ -595,7 +610,8 @@
                        else {
                            layer.msg(d.Message, { icon: 0, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                        }
                    }
                    },
                    complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                });
                HSourceFlag = false;
            }
@@ -648,7 +664,8 @@
                        $("#HSupID").val(d.data[0].HCusID);
                        $("#HSupName").val(d.data[0].HSupName);
                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                    }
                    },
                    complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                })
            }

@@ -719,7 +736,8 @@
                                });
                            }
                            layer.closeAll("loading");
                        }
                        },
                        complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                    });
                }
            });
@@ -799,7 +817,8 @@
                                });
                            }
                            layer.closeAll("loading");
                        }
                        },
                        complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                    });
                }
            });
@@ -872,7 +891,8 @@
                                });
                            }
                            layer.closeAll("loading");
                        }
                        },
                        complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                    });
                }
            });
@@ -941,7 +961,8 @@
                                });
                            }
                            layer.closeAll("loading");
                        }
                        },
                        complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                    });
                }
            });
@@ -1010,7 +1031,8 @@
                                });
                            }
                            layer.closeAll("loading");
                        }
                        },
                        complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                    });
                }
            });
@@ -1079,7 +1101,8 @@
                                });
                            }
                            layer.closeAll("loading");
                        }
                        },
                        complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                    });
                }
            });
@@ -1169,6 +1192,7 @@
                                    layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                                }
                            },
                            complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
                            error: function (err) {
                                layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            }
@@ -1245,6 +1269,7 @@
                                        layer.msg(data.Message, { icon: 2, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                                    }
                                },
                                complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
                                error: function (err) {
                                    layer.msg('éè¯¯' + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                                }
@@ -1342,7 +1367,8 @@
                                $("#HSourceBillNo").focus();
                            });
                        }
                    }
                    },
                    complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                });
                layer.closeAll("loading");
            }
@@ -1426,6 +1452,7 @@
                                    });
                                }
                            },
                            complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
                            error: function (err) {
                                playSound();
                                layer.msg('éè¯¯' + err, {
@@ -1591,6 +1618,7 @@
                                });
                            }
                        },
                        complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
                        error: function (err) {
                            playSound();
                            layer.msg("éè¯¯ï¼" + err, {
@@ -1707,7 +1735,8 @@
                            $("#HWHName_B").val("");
                            $("#HSPName_B").val("");
                        }
                    }
                    },
                    complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                });
            }


 WebTM/views/WMSÉ¨ÂëÄ£¿é/ÏúÊÛ³ö¿â/Kf_SellOutBill_QiaoYi_PDA.html

@@ -290,8 +290,9 @@
            var HMaker = sessionStorage["HUserName"]
            var HBillerID = sessionStorage["HBillerID"]
            var HStockOrgID = sessionStorage["OrganizationID"]  //ç»ç»ID
            var HSourceFlag = false     //æ¯å¦å·²æ«ç æ å¿
            var OperationType = 0       //æä½ç±»åï¼1æ°å¢ã2ä»ç¼ååè¡¨ä¸è¿åï¼
            var HSourceFlag = false         //æ¯å¦å·²æ«ç æ å¿
            var HDisBillEntryList = false   //æ¯å¦åå»ºå¹¶æ¸²æè¿è¡¨æ ¼
            var OperationType = 0           //æä½ç±»åï¼1æ°å¢ã2ä»ç¼ååè¡¨ä¸è¿åï¼
            var listOption = [];
            var BarCodelistOption = [];
            var columns = "";
@@ -410,14 +411,18 @@
                    , height: 'full-100'
                    , cellMinWidth: 90
                    , limit: 150
                    , done: function () {
                        layer.closeAll("loading");
                    }
                };

                //æç»æ¸å
                BarCodelistOption = {
                    elem: '#mx-table'
                    //, toolbar: '#toolbarDemo'
                    , page: true
                    , cellMinWidth: 90
                    , limit: 3000
                    , limit: 50
                    , totalRow: true
                    , cols: [[
                        { field: 'åå·', title: 'åå·', width: 80 }
@@ -1499,9 +1504,19 @@
                            listOption.cols = [columns];
                            listOption.data = result.data.Materlist;
                            listOption.totalRow = true;
                            table.render(listOption);
                            BarCodelistOption.data = result.data.BarCodelist;
                            table.render(BarCodelistOption);

                            if (!HDisBillEntryList) {
                                table.render(listOption);               //åå»ºå¹¶æ¸²æè¡¨æ ¼
                                table.render(BarCodelistOption);
                                HDisBillEntryList = true;
                            }
                            else {
                                table.cache['wl-table'] = null;         //æ¸ç©ºè¡¨æ ¼ç¼åæ°æ®
                                table.reload('wl-table', listOption);   //å¯¹è¡¨æ ¼è¿è¡éè½½
                                table.cache['mx - table'] = null;
                                table.reload('mx-table', BarCodelistOption);
                            }
                        }
                        else {
                            layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });

 WebTM/views/video/success.wav

Binary files differ

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/MES_ProcessCheckBill_PDA.html

@@ -537,7 +537,7 @@
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
                //åå§è¡¨æ ¼æ°æ®
                rowdata = [{
                    "HQCCheckItemID": "", "æ£éªé¡¹ç®": "", "HInspectInstruMentID": 0, "æ£éªä»ªå¨": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
                    "HQCCheckItemID": 0, "æ£éªé¡¹ç®": "", "HInspectInstruMentID": 0, "æ£éªä»ªå¨": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, 
                }];
                option = {
@@ -665,7 +665,7 @@
                                        "HUnitName": data.åä½,
                                        "HProcName": data.å·¥åº,
                                        "HProcID": data.HProcID,
                                        "HQCSchemeID": data.æ£éªæ¹æ¡ID,
                                        "HQCSchemeID": data.æ£éªæ¹æ¡ID == null ? 0 : data.æ£éªæ¹æ¡ID,
                                        "HQCSchemeName": data.æ£éªæ¹æ¡åç§°,
                                        "HMainSourceInterID": data.hmainid,
                                        "HMainSourceEntryID": data.hsubid,
@@ -697,7 +697,7 @@
                                        "HUnitName": data.è®¡éåä½,
                                        "HProcName": data.å½åå·¥åº,
                                        "HProcID": data.HProcID,
                                        "HQCSchemeID": data.æ£éªæ¹æ¡ID,
                                        "HQCSchemeID": data.æ£éªæ¹æ¡ID == null ? 0 : data.æ£éªæ¹æ¡ID,
                                        "HQCSchemeName": data.æ£éªæ¹æ¡åç§°,
                                        "HMainSourceInterID": data.hmainid,
                                        "HMainSourceEntryID": 0,
@@ -727,7 +727,7 @@
                                        "HUnitName": data.è®¡éåä½,
                                        "HProcName": data.å½åå·¥åº,
                                        "HProcID": data.HProcID,
                                        "HQCSchemeID": data.æ£éªæ¹æ¡ID,
                                        "HQCSchemeID": data.æ£éªæ¹æ¡ID == null ? 0 : data.æ£éªæ¹æ¡ID,
                                        "HQCSchemeName": data.æ£éªæ¹æ¡åç§°,
                                        "HMainSourceInterID": data.hmainid,
                                        "HMainSourceEntryID": data.hsubid,

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷×ª/MES_ColorRecordBill_PDA.html

@@ -538,7 +538,7 @@
            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
            //åå§è¡¨æ ¼æ°æ®
            rowdata = [{
                "HQCCheckItemID": "", "æ£éªé¡¹ç®": "", "HInspectInstruMentID": 0, "æ£éªä»ªå¨": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
                "HQCCheckItemID": 0, "æ£éªé¡¹ç®": "", "HInspectInstruMentID": 0, "æ£éªä»ªå¨": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
                "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0,
            }];
            option = {
@@ -666,7 +666,7 @@
                                    "HUnitName": data.åä½,
                                    "HProcName": data.å·¥åº,
                                    "HProcID": data.HProcID,
                                    "HQCSchemeID": data.æ£éªæ¹æ¡ID,
                                    "HQCSchemeID": data.æ£éªæ¹æ¡ID == null ? 0 : data.æ£éªæ¹æ¡ID,
                                    "HQCSchemeName": data.æ£éªæ¹æ¡åç§°,
                                    "HMainSourceInterID": data.hmainid,
                                    "HMainSourceEntryID": data.hsubid,
@@ -698,7 +698,7 @@
                                    "HUnitName": data.è®¡éåä½,
                                    "HProcName": data.å½åå·¥åº,
                                    "HProcID": data.HProcID,
                                    "HQCSchemeID": data.æ£éªæ¹æ¡ID,
                                    "HQCSchemeID": data.æ£éªæ¹æ¡ID == null ? 0 : data.æ£éªæ¹æ¡ID,
                                    "HQCSchemeName": data.æ£éªæ¹æ¡åç§°,
                                    "HMainSourceInterID": data.hmainid,
                                    "HMainSourceEntryID": 0,
@@ -727,7 +727,7 @@
                                    "HUnitName": data.è®¡éåä½,
                                    "HProcName": data.å½åå·¥åº,
                                    "HProcID": data.HProcID,
                                    "HQCSchemeID": data.æ£éªæ¹æ¡ID,
                                    "HQCSchemeID": data.æ£éªæ¹æ¡ID == null ? 0 : data.æ£éªæ¹æ¡ID,
                                    "HQCSchemeName": data.æ£éªæ¹æ¡åç§°,
                                    "HMainSourceInterID": data.hmainid,
                                    "HMainSourceEntryID": data.hsubid,

			@@ -3,11 +3,11 @@
			//var WEBURL = "http://192.168.16.80:8011/"; //åå¬å®¤æå¡å¨
			//var WEBURL = "http://localhost:8081/SWEAPI/"; //chæ¬å°*/
			//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
			//var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°éç½®
			var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°éç½®
			//var WEBURL = "http://localhost:8083/API/"; //éé¯éæ¬å°éç½®
			var WEBURL = "http://localhost:8082/API/"; //å¼ çå¹¿æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/API/"; //å¼ çå¹¿æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ä½ææ°æ¬å°éç½®
			//var WEBURL = "http://localhost:8088/ARAPI/"; //ä½ææ°æ¬å°éç½®(å®ç)
			//var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW

			@@ -428,7 +428,8 @@
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
			}
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			});
			layer.closeAll("loading");
			}
			@@ -439,12 +440,22 @@
			console.log("playSound");
			var audio = document.getElementById("cs");
			audio.play();
			audio.onended = function () {
			// å½é³é¢ææ¥å®ææ¶ï¼è°ç¨ pause åè®¾ç½® currentTime ä¸º 0 ä»¥åæ¢ææ¥å¹¶éç½®
			audio.pause();
			audio.currentTime = 0;
			};
			}
			//æåæç¤ºé³
			function playSound_OK() {
			console.log("playSound_OK");
			var audio = document.getElementById("cs2");
			audio.play();
			audio.onended = function () {
			// å½é³é¢ææ¥å®ææ¶ï¼è°ç¨ pause åè®¾ç½® currentTime ä¸º 0 ä»¥åæ¢ææ¥å¹¶éç½®
			audio.pause();
			audio.currentTime = 0;
			};
			}

			//#region åå§åçé¢
			@@ -532,7 +543,8 @@
			form.render('select');
			}
			layer.closeAll("loading");
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			})
			}
			//åå§åè¡¨æ ¼
			@@ -544,6 +556,9 @@
			, height: 'full-60'
			, cellMinWidth: 90
			, limit: 50
			, done: function () {
			layer.closeAll("loading");
			}
			};
			}

			@@ -595,7 +610,8 @@
			else {
			layer.msg(d.Message, { icon: 0, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			});
			HSourceFlag = false;
			}
			@@ -648,7 +664,8 @@
			$("#HSupID").val(d.data[0].HCusID);
			$("#HSupName").val(d.data[0].HSupName);
			$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			})
			}

			@@ -719,7 +736,8 @@
			});
			}
			layer.closeAll("loading");
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			});
			}
			});
			@@ -799,7 +817,8 @@
			});
			}
			layer.closeAll("loading");
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			});
			}
			});
			@@ -872,7 +891,8 @@
			});
			}
			layer.closeAll("loading");
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			});
			}
			});
			@@ -941,7 +961,8 @@
			});
			}
			layer.closeAll("loading");
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			});
			}
			});
			@@ -1010,7 +1031,8 @@
			});
			}
			layer.closeAll("loading");
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			});
			}
			});
			@@ -1079,7 +1101,8 @@
			});
			}
			layer.closeAll("loading");
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			});
			}
			});
			@@ -1169,6 +1192,7 @@
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			@@ -1245,6 +1269,7 @@
			layer.msg(data.Message, { icon: 2, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
			error: function (err) {
			layer.msg('éè¯¯' + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			@@ -1342,7 +1367,8 @@
			$("#HSourceBillNo").focus();
			});
			}
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			});
			layer.closeAll("loading");
			}
			@@ -1426,6 +1452,7 @@
			});
			}
			},
			complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
			error: function (err) {
			playSound();
			layer.msg('éè¯¯' + err, {
			@@ -1591,6 +1618,7 @@
			});
			}
			},
			complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
			error: function (err) {
			playSound();
			layer.msg("éè¯¯ï¼" + err, {
			@@ -1707,7 +1735,8 @@
			$("#HWHName_B").val("");
			$("#HSPName_B").val("");
			}
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			});
			}

			@@ -290,8 +290,9 @@
			var HMaker = sessionStorage["HUserName"]
			var HBillerID = sessionStorage["HBillerID"]
			var HStockOrgID = sessionStorage["OrganizationID"] //ç»ç»ID
			var HSourceFlag = false //æ¯å¦å·²æ«ç æ å¿
			var OperationType = 0 //æä½ç±»åï¼1æ°å¢ã2ä»ç¼ååè¡¨ä¸è¿åï¼
			var HSourceFlag = false //æ¯å¦å·²æ«ç æ å¿
			var HDisBillEntryList = false //æ¯å¦åå»ºå¹¶æ¸²æè¿è¡¨æ ¼
			var OperationType = 0 //æä½ç±»åï¼1æ°å¢ã2ä»ç¼ååè¡¨ä¸è¿åï¼
			var listOption = [];
			var BarCodelistOption = [];
			var columns = "";
			@@ -410,14 +411,18 @@
			, height: 'full-100'
			, cellMinWidth: 90
			, limit: 150
			, done: function () {
			layer.closeAll("loading");
			}
			};

			//æç»æ¸å
			BarCodelistOption = {
			elem: '#mx-table'
			//, toolbar: '#toolbarDemo'
			, page: true
			, cellMinWidth: 90
			, limit: 3000
			, limit: 50
			, totalRow: true
			, cols: [[
			{ field: 'åå·', title: 'åå·', width: 80 }
			@@ -1499,9 +1504,19 @@
			listOption.cols = [columns];
			listOption.data = result.data.Materlist;
			listOption.totalRow = true;
			table.render(listOption);
			BarCodelistOption.data = result.data.BarCodelist;
			table.render(BarCodelistOption);

			if (!HDisBillEntryList) {
			table.render(listOption); //åå»ºå¹¶æ¸²æè¡¨æ ¼
			table.render(BarCodelistOption);
			HDisBillEntryList = true;
			}
			else {
			table.cache['wl-table'] = null; //æ¸ç©ºè¡¨æ ¼ç¼åæ°æ®
			table.reload('wl-table', listOption); //å¯¹è¡¨æ ¼è¿è¡éè½½
			table.cache['mx - table'] = null;
			table.reload('mx-table', BarCodelistOption);
			}
			}
			else {
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });

			@@ -537,7 +537,7 @@
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§è¡¨æ ¼æ°æ®
			rowdata = [{
			"HQCCheckItemID": "", "æ£éªé¡¹ç®": "", "HInspectInstruMentID": 0, "æ£éªä»ªå¨": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
			"HQCCheckItemID": 0, "æ£éªé¡¹ç®": "", "HInspectInstruMentID": 0, "æ£éªä»ªå¨": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
			"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0,
			}];
			option = {
			@@ -665,7 +665,7 @@
			"HUnitName": data.åä½,
			"HProcName": data.å·¥åº,
			"HProcID": data.HProcID,
			"HQCSchemeID": data.æ£éªæ¹æ¡ID,
			"HQCSchemeID": data.æ£éªæ¹æ¡ID == null ? 0 : data.æ£éªæ¹æ¡ID,
			"HQCSchemeName": data.æ£éªæ¹æ¡åç§°,
			"HMainSourceInterID": data.hmainid,
			"HMainSourceEntryID": data.hsubid,
			@@ -697,7 +697,7 @@
			"HUnitName": data.è®¡éåä½,
			"HProcName": data.å½åå·¥åº,
			"HProcID": data.HProcID,
			"HQCSchemeID": data.æ£éªæ¹æ¡ID,
			"HQCSchemeID": data.æ£éªæ¹æ¡ID == null ? 0 : data.æ£éªæ¹æ¡ID,
			"HQCSchemeName": data.æ£éªæ¹æ¡åç§°,
			"HMainSourceInterID": data.hmainid,
			"HMainSourceEntryID": 0,
			@@ -727,7 +727,7 @@
			"HUnitName": data.è®¡éåä½,
			"HProcName": data.å½åå·¥åº,
			"HProcID": data.HProcID,
			"HQCSchemeID": data.æ£éªæ¹æ¡ID,
			"HQCSchemeID": data.æ£éªæ¹æ¡ID == null ? 0 : data.æ£éªæ¹æ¡ID,
			"HQCSchemeName": data.æ£éªæ¹æ¡åç§°,
			"HMainSourceInterID": data.hmainid,
			"HMainSourceEntryID": data.hsubid,

			@@ -538,7 +538,7 @@
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§è¡¨æ ¼æ°æ®
			rowdata = [{
			"HQCCheckItemID": "", "æ£éªé¡¹ç®": "", "HInspectInstruMentID": 0, "æ£éªä»ªå¨": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
			"HQCCheckItemID": 0, "æ£éªé¡¹ç®": "", "HInspectInstruMentID": 0, "æ£éªä»ªå¨": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": false,
			"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0,
			}];
			option = {
			@@ -666,7 +666,7 @@
			"HUnitName": data.åä½,
			"HProcName": data.å·¥åº,
			"HProcID": data.HProcID,
			"HQCSchemeID": data.æ£éªæ¹æ¡ID,
			"HQCSchemeID": data.æ£éªæ¹æ¡ID == null ? 0 : data.æ£éªæ¹æ¡ID,
			"HQCSchemeName": data.æ£éªæ¹æ¡åç§°,
			"HMainSourceInterID": data.hmainid,
			"HMainSourceEntryID": data.hsubid,
			@@ -698,7 +698,7 @@
			"HUnitName": data.è®¡éåä½,
			"HProcName": data.å½åå·¥åº,
			"HProcID": data.HProcID,
			"HQCSchemeID": data.æ£éªæ¹æ¡ID,
			"HQCSchemeID": data.æ£éªæ¹æ¡ID == null ? 0 : data.æ£éªæ¹æ¡ID,
			"HQCSchemeName": data.æ£éªæ¹æ¡åç§°,
			"HMainSourceInterID": data.hmainid,
			"HMainSourceEntryID": 0,
			@@ -727,7 +727,7 @@
			"HUnitName": data.è®¡éåä½,
			"HProcName": data.å½åå·¥åº,
			"HProcID": data.HProcID,
			"HQCSchemeID": data.æ£éªæ¹æ¡ID,
			"HQCSchemeID": data.æ£éªæ¹æ¡ID == null ? 0 : data.æ£éªæ¹æ¡ID,
			"HQCSchemeName": data.æ£éªæ¹æ¡åç§°,
			"HMainSourceInterID": data.hmainid,
			"HMainSourceEntryID": data.hsubid,