From f5fef647ef9026a1ed92de89383083f38698c48f Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 25 一月 2024 10:20:18 +0800
Subject: [PATCH] 工作任务列表添加判断打开方式；PDA首件检验单
---
WebTM/views/车间管理/工序流转/MES_ColorRecordBill_PDA.html | 695 +++++++++++++++++++++++++++++++++------------------------
WebTM/views/项目管理/工作任务/PM_WorkTaskBillList.html | 17 +
2 files changed, 417 insertions(+), 295 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
index 6601c6d..c1896af 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
@@ -16,63 +16,7 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<!--鑷畾涔夋牱寮�-->
- <style>
- /* .maintitle {
- background-color: #1492ff;
- color: #fff;
- padding: 5px 10px;
- border: none;
- border-radius: 4px;
- }
-
- .title {
- border-left: 4px solid #1492ff;
- padding-left: 6px;
- margin: 20px 10px 4px;
- font-size: 16px;
- color: #333;
- }
-
- .buttom_box_little {
- width: 60px;
- height: 36px;
- color: #fff;
- background-color: #1492ff;
- border-radius: 4px;
- border: none;
- margin: 10px;
- }
-
- .layui-input {
- width: 93%;
- }
-
- .layui-inline, img {
- display: block;
- vertical-align: middle
- }
-
- .layui-input, .layui-textarea {
- display: inline-block;
- width: 100%;
- padding-left: 10px;
- }
-
- .laydate-time-list ol {
- overflow-x: hidden !important;
- overflow-y: auto !important;
- }
-
- .layui-form-label {
- padding: 9px 5px;
- width: 85px;
- }
-
- .layui-input-block {
- margin-left: 85px;
- min-height: 36px;
- }*/
-
+ <style>
.layui-form-label {
font-size: 14px;
width: 85px;
@@ -101,6 +45,17 @@
th {
width: 70px;
text-align: left;
+ }
+
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
}
</style>
</head>
@@ -227,6 +182,21 @@
<table style="width:80%;">
<tbody>
<tr>
+ <th>妫�楠屾柟妗�</th>
+ <td class="bz_td">
+ <input type="text" name="HQCSchemeName" class="layui-input" id="HQCSchemeName" placeholder="閫夋嫨妫�楠屾柟妗�" style="border-radius: 50px; background-color: #efefef4d;">
+ <input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme" style="font-weight:bolder;">...</button>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
<th>鍒跺崟浜�</th>
<td class="bz_td">
<input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
@@ -280,6 +250,7 @@
</div>
<ul class="layui-tab-title">
<li class="layui-this">鍗曟嵁淇℃伅</li>
+ <li>妫�楠岄」鐩�</li>
<li>鍒跺崟淇℃伅</li>
</ul>
</div>
@@ -296,253 +267,393 @@
</div>
</body>
</html>
+<!--琛屾寜閽�-->
+<script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<!--澶嶉�夋锛堟楠岀粨璁猴級-->
+<script type="text/html" id="HResult">
+ <input type="checkbox" value="{{d.HResult}}" lay-skin="primary" id="HResult{{d.LAY_TABLE_INDEX+1}}" lay-filter="HResult" {{ d.HResult == 1 ? 'checked' : '' }}>
+</script>
+<!--澶嶉�夋锛堥噸鐐规鏌ワ級-->
+<script type="text/html" id="HKeyInspect">
+ <input type="checkbox" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
+</script>
+<!--琛屼笅鎷夐�夋嫨(鍒嗘瀽鏂规硶)-->
+<script type="text/html" id="HAnalysisMethod">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">瀹氭�у垎鏋�</option>
+ <option value="2">瀹氶噺鍒嗘瀽</option>
+ <option value="3">鍏朵粬鍒嗘瀽</option>
+ </select>
+</script>
<script>
- layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
- var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , laydate = layui.laydate
- , upload = layui.upload
- , element = layui.element;
- //#region 鍏叡鍙橀噺
- var params = get_UrlVars();
- var option = [];
- var titleData = [];
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , upload = layui.upload
+ , element = layui.element;
+ //#region 鍏叡鍙橀噺
+ var params = get_UrlVars();
+ var option = [];
+ var titleData = [];
- //#endregion
+ //#endregion
- //#region 杩涘叆椤甸潰鍗冲姞杞�
- var params = getUrlVars();
- if (typeof (params[params[0]]) == "undefined") {
- var OperationType = 1;//鎿嶄綔绫诲瀷
- var closeType = 2; //鍏抽棴绫诲瀷
- }
- else {
- var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
- var linterid = params[params[1]];//婧愬崟id
- var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
- var HBillNo = params[params[3]]; //鑾峰彇鍗曟嵁鍙�
- var closeType = params[params[4]]; //鍏抽棴绫诲瀷
- }
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ var params = getUrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ }
+ else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HBillNo = params[params[3]]; //鑾峰彇鍗曟嵁鍙�
+ var closeType = params[params[4]]; //鍏抽棴绫诲瀷
+ }
- //鍒ゆ柇鏄惁鏂板
- if (OperationType == 1) {
- $("#HInterID").val("");
- $("#HBillNo").val("");
- //鑾峰彇鏈�澶у崟鎹彿
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '7505' },
- success: function (d) {
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
- $('#Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳榛樿绂佺敤
- //GetDefValByUser();
- }
-
- //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
- $("#HBarCode").focus();
- //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
- var HProcExchBillNoFlag = false;
- //鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HMaker").val(sessionStorage["HUserName"]);
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
- $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
-
- //#endregion
-
- //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
- //鏉″舰鐮佸洖杞︽柟娉�
- $('#HBarCode').on('keydown', function (event) {
- var HBarCode = $('#HBarCode').val();
- if (event.keyCode == 13) {
- if (!HBarCode) {
- layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
- return;
- }
- txtHBarCode_KeyDown(HBarCode);
+ //鍒ゆ柇鏄惁鏂板
+ if (OperationType == 1) {
+ $("#HInterID").val("");
+ $("#HBillNo").val("");
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '7505' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
}
});
+ $('#Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳榛樿绂佺敤
+ //GetDefValByUser();
+ }
- //閫夋嫨鐢熶骇璧勬簮寮圭獥
- form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
- layer.open({
- type: 2 //绫诲瀷
- , skin: 'layui-layer-rim'//鍔犱笂杈规
- , area: ['90%', '90%']//澶у皬
- , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
- , shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
- , btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- //鑾峰彇鏁版嵁
- $("#HSourceID").val(checkStatus.data[0].HItemID);
- $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
- layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- })
- });
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+ $("#HBarCode").focus();
+ //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
+ var HProcExchBillNoFlag = false;
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
- //閫夋嫨璁￠噺鍗曚綅
- form.on('submit(BtnHUnit)', function () {//鐢熶骇璧勬簮
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html", "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+ //#endregion
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
- $("#HUnitID").val(checkStatus.data[0].HItemID);//鍐呯爜
- $("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);//鍚嶇О
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- });
-
- //鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- if (!HProcExchBillNoFlag) {
- layer.msg("璇锋壂鏉＄爜!");
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ var HBarCode = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
return;
}
- Get_Save(data);
-
- });
-
- //閫�鍑�--鍏ㄥ睆鐗�
- form.on('submit(Cancel)', function () {
- layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
- });
- })
-
- form.on('submit(Add)', function () {//鎻愪氦
- layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- location.replace('MES_ColorRecordBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
- });
- })
- //#endregion
-
- //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
-
- function txtHBarCode_KeyDown(HBarCode) {
- //鎵爜绫诲瀷2
- var barNo2 = HBarCode.substr(0, 4);
- var index = layer.load();
- $.ajax({
- url: GetWEBURL() + "/MES_SampleRecordBill_PDA/SampleRecordBillHBarCode_KeyDown",
- type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "" },
- success: function (result) {
- if (result.count == 1) {
- var data = result.data[0];
-
- switch (barNo2) {
- case "GXLX":
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HProcExchBillNo": data.鍗曟嵁鍙�,
- "HICMOInterID": data.hicmointerid,
- "HICMOBillNo": data.浠诲姟鍗曞彿,
- "HMaterID": data.HMaterID,
- "HMaterName": data.浜у搧,
- "HMaterNumber": data.浜у搧浠ｇ爜,
- "HMaterModel": data.瑙勬牸鍨嬪彿,
- "HPRDORGID": data.缁勭粐,
- "HPRDORGName": data.缁勭粐鍚嶇О,
- "HUnitID": data.HUnitID,
- "HUnitName": data.鍗曚綅
- });
- HProcExchBillNoFlag = true;
-
- var HProcExchHinteID = $('#HProcExchHinteID').val();
- var HInterID = data.hmainid;
- break;
- }
- layer.close(index);
- //娓呯┖鏉＄爜妗�
- $('#HBarCode').val("");
- }
- else {
- layer.close(index);
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
+ txtHBarCode_KeyDown(HBarCode);
}
-
- //淇濆瓨
- function Get_Save(data) {
- var tableData = data.field;
- var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/MES_SampleRecordBill_PDA/ColorRecordAddBill",
- async: false,
- data: { "oMain": oMain },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) {
- layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
- $('#Add').removeClass("layui-btn-disabled").attr("disabled", false);//鏂板鎸夐挳鍚敤
- $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤淇濆瓨鎸夐挳
- }
- else {
- layer.close(index);
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
- }
-
- //鑾峰彇鍙傛暟
- function getUrlVars() {
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
- for (var i = 0; i < hashes.length; i++) {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = hash[1];
- }
- return vars;
- }
- //#endregion
- //浠ヤ笂涓簂ayui妯″潡
});
+
+ //閫夋嫨鐢熶骇璧勬簮寮圭獥
+ form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
+
+ //琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
+ form.on('submit(btnSearchQCScheme)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ area: ['90%', '90%'],
+ title: '妫�楠屾柟妗堝垪琛�',
+ shift: 2,//寮瑰嚭鍔ㄧ敾,
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
+ $("#HQCSchemeName").val(checkStatus.data[0].鏂规鍚嶇О);
+ get_CheckItem();
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //閫夋嫨璁￠噺鍗曚綅
+ form.on('submit(BtnHUnit)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ $("#HUnitID").val(checkStatus.data[0].HItemID);//鍐呯爜
+ $("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);//鍚嶇О
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ });
+
+ //鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ if (!HProcExchBillNoFlag) {
+ layer.msg("璇锋壂鏉＄爜!");
+ return;
+ }
+ Get_Save(data);
+
+ });
+
+ //閫�鍑�--鍏ㄥ睆鐗�
+ form.on('submit(Cancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
+ });
+ })
+
+ form.on('submit(Add)', function () {//鎻愪氦
+ layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ location.replace('MES_ColorRecordBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+ });
+ })
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ function set_InitGrid() {
+ rowdata = [{
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "", "HMax": "", "HMin": "", "HAvg": "", "HKeyInspect": false
+ }];
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , height: 'full-50'
+ , cellMinWidth: 150
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
+ , { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
+ , { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
+ , { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
+ , { field: 'HResult', title: '缁撹', width: 70, templet: '#HResult' }
+ , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
+ , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
+ , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
+ , { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
+ , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
+ , { field: 'HMax', title: '鏈�澶у��', edit: 'text' }
+ , { field: 'HMin', title: '鏈�灏忓��', edit: 'text' }
+ , { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ ]]
+ , done: function (res, curr, count) {
+ option.data = res.data;
+ //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+ $('.layui-form-select').find('input').unbind("blur");
+ //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+ $('tr').each(function (e) {
+ var $cr = $(this);
+ var dataIndex = $cr.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TNDEX == dataIndex) {
+ $cr.find('input').val(value.HResult);
+ }
+ });
+ });
+ }
+ , text: {
+ none: '鏃犳暟鎹紒'
+ }
+ };
+ //鍔犺浇绌鸿〃鏍�
+ option.data = rowdata;
+ table.render(option);
+ }
+
+ function get_CheckItem() {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
+ type: "GET",
+ data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": 0 },
+ success: function (result) {
+ if (result.code == 1) {
+ var rowdata = [];
+ rowdata_Value = [];
+ var data = result.data;
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push(
+ {
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
+ "HMax": "", "HMin": "", "HAvg": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false,
+ }
+ );
+ }
+ //妫�楠岄」鐩�
+ option.data = rowdata;
+ table.render(option);
+ }
+ }
+ })
+ }
+
+ function txtHBarCode_KeyDown(HBarCode) {
+ //鎵爜绫诲瀷2
+ var barNo2 = HBarCode.substr(0, 4);
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/MES_SampleRecordBill_PDA/SampleRecordBillHBarCode_KeyDown",
+ type: "GET",
+ data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "" },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+
+ switch (barNo2) {
+ case "GXLX":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HICMOInterID": data.hicmointerid,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPRDORGID": data.缁勭粐,
+ "HPRDORGName": data.缁勭粐鍚嶇О,
+ "HUnitID": data.HUnitID,
+ "HUnitName": data.鍗曚綅
+ });
+ HProcExchBillNoFlag = true;
+
+ var HProcExchHinteID = $('#HProcExchHinteID').val();
+ var HInterID = data.hmainid;
+ break;
+ }
+ layer.close(index);
+ //娓呯┖鏉＄爜妗�
+ $('#HBarCode').val("");
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //淇濆瓨
+ function Get_Save(data) {
+ var tableData = data.field;
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/MES_SampleRecordBill_PDA/ColorRecordAddBill",
+ async: false,
+ data: { "oMain": oMain },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ $('#Add').removeClass("layui-btn-disabled").attr("disabled", false);//鏂板鎸夐挳鍚敤
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤淇濆瓨鎸夐挳
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+ //浠ヤ笂涓簂ayui妯″潡
+ });
</script>
\ No newline at end of file
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
index aa1483b..d8723a3 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
@@ -321,11 +321,13 @@
//鏌ヨ
if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
get_FastQuery(2);
+
} else {
get_FastQuery(1);
}
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
+
}
//#endregion
@@ -1094,15 +1096,24 @@
$("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
}
}
- //鎵ц鏌ヨ鏂规硶
- get_FastQuery();
+ //鏌ヨ
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
form.render("select");
} else {
//褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery();
+ //鏌ヨ
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
form.render("select");
}
}, error: function () {
--
Gitblit v1.9.1