From a022cc252ee0c5adec17f0b66eb61ce91402a273 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 31 八月 2023 10:45:46 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckBillList.html | 2
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 2
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 2
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html | 201 +++++++++++++++++++++++++++++++++++++++++--------
WebTM/layuiadmin/PubCustom.js | 12 +++
5 files changed, 182 insertions(+), 37 deletions(-)
diff --git a/WebTM/layuiadmin/PubCustom.js b/WebTM/layuiadmin/PubCustom.js
index 760b295..ac8d3cb 100644
--- a/WebTM/layuiadmin/PubCustom.js
+++ b/WebTM/layuiadmin/PubCustom.js
@@ -33,6 +33,18 @@
return fmt;
}
+// 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
+function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+}
/**
*鍒ゆ柇鎵嬫満杩樻槸鐢佃剳锛岀數鑴戣繑鍥瀟rue锛屾墜鏈鸿繑鍥瀎alse
*by zgq
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
index 0156a3e..1ed6d9a 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
@@ -93,6 +93,12 @@
<input type="text" name="HMainProcName" id="HMainProcName" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" value="">
</div>
</div>
+ <div class="layui-colorpicker-xs" style="margin-top:15px">
+ <label class="layui-form-label"> 澶囨敞</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ </div>
+ </div>
</div>
</div>
<div class="layui-form-item">
@@ -173,12 +179,6 @@
<input type="text" name="HProcExchBillNo" id="HProcExchBillNo" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
- <div class="layui-colorpicker-xs">
- <label class="layui-form-label"> 澶囨敞</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
- </div>
- </div>
</div>
</div>
</div>
@@ -209,6 +209,12 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
</div>
</script>
+ <script type="text/html" id="toolbarDemo2">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine_Bad"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine_Bad"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
<script type="text/html" id="xuhao">
{{d.LAY_TABLE_INDEX+1}}
</script>
@@ -226,7 +232,7 @@
<select name="HQCNote1" lay-filter="HQCNote1" id="HQCNote1{{d.LAY_TABLE_INDEX+1}}">
<option value="">璇烽�夋嫨</option>
<option value="鍚堟牸">鍚堟牸</option>
- <option value="鍚堟牸">涓嶅悎鏍�</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
</select>
</script>
<!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�2)-->
@@ -234,7 +240,7 @@
<select name="HQCNote2" lay-filter="HQCNote2" id="HQCNote2{{d.LAY_TABLE_INDEX+1}}">
<option value="">璇烽�夋嫨</option>
<option value="鍚堟牸">鍚堟牸</option>
- <option value="鍚堟牸">涓嶅悎鏍�</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
</select>
</script>
<!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�3)-->
@@ -242,7 +248,7 @@
<select name="HQCNote3" lay-filter="HQCNote3" id="HQCNote3{{d.LAY_TABLE_INDEX+1}}">
<option value="">璇烽�夋嫨</option>
<option value="鍚堟牸">鍚堟牸</option>
- <option value="鍚堟牸">涓嶅悎鏍�</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
</select>
</script>
<!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�4)-->
@@ -250,7 +256,7 @@
<select name="HQCNote4" lay-filter="HQCNote4" id="HQCNote4{{d.LAY_TABLE_INDEX+1}}">
<option value="">璇烽�夋嫨</option>
<option value="鍚堟牸">鍚堟牸</option>
- <option value="鍚堟牸">涓嶅悎鏍�</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
</select>
</script>
<script src="../../../layuiadmin/layui/layui.js"></script>
@@ -258,6 +264,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<script>
//鑾峰彇鍙傛暟
function getUrlVars() {
@@ -300,6 +307,7 @@
// icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
// }, function () { window.location.href = "../../user/login.html"; });
//}
+ //debugger
var tableReload = table.reload;
var option = {
elem: '#mainTable'
@@ -312,8 +320,8 @@
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
, { field: '妫�楠岄」鐩垎绫�', title: '妫�楠岄」鐩垎绫�', event: "", width: 120 }
, { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
- , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text' ,width:120}
- , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "", width: 95, hide: true }
+ , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text', width: 120 }
+ , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "", width: 95, hide: true }
, { field: 'HQCNote1', title: '妫�楠岃褰�1(08:00--12:00)', width: 185, templet: '#HQCNote1' }
, { field: 'HQCNote2', title: '妫�楠岃褰�2(13:00--17:00)', width: 185, templet: '#HQCNote2' }
, { field: 'HQCNote3', title: '妫�楠岃褰�3(18:00--23:00)', width: 185, templet: '#HQCNote3' }
@@ -332,7 +340,7 @@
var option_BadRe = {
elem: '#BadReTable'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, height: 500
//,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
, page: true //寮�鍚垎椤�
@@ -367,11 +375,11 @@
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
- option.data = [{ "HBadReasonID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " ", "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " " }];
+ option.data = [{ "妫�楠岄」鐩垎绫�":"","HQCCheckItemID":0,"HQCCheckItemName": "", "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " ", "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " " }];
table.render(option);
option_BadRe.data = [{
- "HQCCheckItemID": 0, "HBadReasonNumber": "", "HBadReasonName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HProcID": 0,
+ "HBadReasonID":0,"HBadReasonNumber": "", "HBadReasonName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HProcID": 0,
"HProcNumber": "", "HProcName": "", "HCheckEmpID": 0, "HCheckEmpNumber": "", "HCheckEmpName": "", "HMaterID": 0, "HMaterNumber": "",
"HMaterName": "", "HMaterModel": "", "HCreateDate": Format(new Date(), "yyyy-MM-dd"), "HFinishDate": Format(new Date(), "yyyy-MM-dd"), "HQty": 0, "HRemark": ""
}];
@@ -379,15 +387,55 @@
}
else if (OperationType == 2) {
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
- //缂栬緫鍔犺浇鏁版嵁
+ //缂栬緫鍔犺浇鏁版嵁--琛ㄤ綋
$.ajax({
url: GetWEBURL() + 'MES_QC_PatrolProcCheckDetail_Json',
type: "GET",
data: { "sqlWhere": "and HInterID=" + linterid },
success: function (result) {
if (result.count == 1) {
- option.data = result.data;
+ //妫�楠岄」鐩�
+ var rowdata = [];
+ var data = result.data;
+ for (let i = 0; i < result.data.length; i++) {
+ rowdata.push({
+ "妫�楠岄」鐩垎绫�": data[i].妫�楠岄」鐩垎绫�, "HQCCheckItemID": data[i].HQCCheckItemID, "HQCCheckItemName": data[i].妫�楠岄」鐩悕绉�,
+ "HQCStd": data[i].HQCStd, "HQCNote1": data[i].HQCNote1, "HQCNote2": data[i].HQCNote2, "HQCNote3": data[i].HQCNote3,
+ "HQCNote4": data[i].HQCNote4, "HQCNote5": data[i].HQCNote5, "HQCNote6": data[i].HQCNote6, "HQCNote7": data[i].HQCNote7,
+ "HQCNote8": data[i].HQCNote8, "HQCNote9": data[i].HQCNote9, "HQCNote10": data[i].HQCNote10, "HRemark": data[i].琛ㄤ綋澶囨敞
+ });
+ }
+
+ option.data = rowdata;
table.render(option);
+ for (var i = 0; i < result.data.length; i++) {
+ $('#HQCNote1' + (i + 1)).find("option[value='" + result.data[i].HQCNote1 + "']").attr("selected", true);
+ $('#HQCNote2' + (i + 1)).find("option[value='" + result.data[i].HQCNote2 + "']").attr("selected", true);
+ $('#HQCNote3' + (i + 1)).find("option[value='" + result.data[i].HQCNote3 + "']").attr("selected", true);
+ $('#HQCNote4' + (i + 1)).find("option[value='" + result.data[i].HQCNote4 + "']").attr("selected", true);
+ }
+ form.render('select');
+
+ //涓嶈壇鍘熷洜
+ var baddata = [];
+ var HSEQArr = [];
+ for (let i = 0; i < result.data.length; i++) {
+ if (HSEQArr.indexOf(data[i].琛屽彿) == -1) {
+ HSEQArr.push(data[i].琛屽彿);
+ baddata.push({
+ "HBadReasonID": data[i].HBadReasonID, "HBadReasonNumber": data[i].涓嶈壇鍘熷洜浠ｇ爜, "HBadReasonName": data[i].涓嶈壇鍘熷洜鍚嶇О,
+ "HEmpID": data[i].HEmpID, "HEmpNumber": data[i].璐ｄ换浜轰唬鐮�, "HEmpName": data[i].璐ｄ换浜哄悕绉�, "HProcID": data[i].HProcID,
+ "HProcNumber": data[i].璐ｄ换宸ュ簭浠ｇ爜, "HProcName": data[i].璐ｄ换宸ュ簭鍚嶇О, "HCheckEmpID": data[i].HCheckEmpID,
+ "HCheckEmpNumber": data[i].纭浜轰唬鐮�, "HCheckEmpName": data[i].纭浜哄悕绉�, "HMaterID": data[i].HMaterID,
+ "HMaterNumber": data[i].鐗╂枡浠ｇ爜, "HMaterName": data[i].鐗╂枡鍚嶇О, "HMaterModel": data[i].瑙勬牸鍨嬪彿,
+ "HCreateDate": Format(new Date(data[i].鐧昏鏃ユ湡), "yyyy-MM-dd"), "HFinishDate": Format(new Date(data[i].瀹屾垚鏃ユ湡), "yyyy-MM-dd"),
+ "HQty": data[i].涓嶈壇鏁伴噺, "HRemark": data[i].涓嶈壇澶囨敞
+ });
+ }
+ }
+
+ option_BadRe.data = baddata;
+ table.render(option_BadRe);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
}
@@ -430,6 +478,43 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //layer.alert(copyrow);
+ }
+ break;
+ }
+ });
+ //涓嶈壇鍘熷洜
+ table.on('toolbar(BadReTable)', function (obj) {
+ var checkStatus = table.checkStatus('BadReTable')
+ , data = checkStatus.data;;
+ var AddRow = table.cache['BadReTable'];
+ var NewRow = {
+ "HQCCheckItemID": 0, "HBadReasonID": 0, "HBadReasonNumber": "", "HBadReasonName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HProcID": 0,
+ "HProcNumber": "", "HProcName": "", "HCheckEmpID": 0, "HCheckEmpNumber": "", "HCheckEmpName": "", "HMaterID": 0, "HMaterNumber": "",
+ "HMaterName": "", "HMaterModel": "", "HCreateDate": Format(new Date(), "yyyy-MM-dd"), "HFinishDate": Format(new Date(), "yyyy-MM-dd"), "HQty": 0, "HRemark": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine_Bad':
+ table.cache["BadReTable"].push(NewRow);
+ option_BadRe.data = table.cache["BadReTable"];
+ table.render(option_BadRe);
+ rows++;
+ layer.msg('澧炲姞涓�琛屾寜閽紒')
+ break;
+ case 'btn-CopyLine_Bad':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["BadReTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option_BadRe.data = table.cache["BadReTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option_BadRe);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
//layer.alert(copyrow);
}
break;
@@ -861,23 +946,28 @@
var data = result.data.h_v_QC_Edit_PatrolProcCheckBillList[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": data.鍗曟嵁鍙�
- , "HDate": data.鏃ユ湡
- , "HSource": data.鐢熶骇璧勬簮鍚嶇О
- , "HSourceID": data.鐢熶骇璧勬簮ID
- , "HICMOBillNo": data.HICMOBillNo
- , "HICMOQty": data.HICMOQty
- , "HICMOInterID": data.HICMOInterID
- , "HMaterNumber": data.浜у搧鍚嶇О
- , "HMaterID": data.浜у搧ID
- , "HMaterNumber": data.浜у搧鍐呯爜
- , "HProcExchQty": data.HProcExchQty
- , "HProcExchBillNo": data.HProcExchBillNo
- , "HProcExchInterID": data.HProcExchInterID
- , "HProcExchEntryID": data.HProcExchEntryID
+ , "HDate": formatDate(data.鏃ユ湡)
+ //, "HSource": data.鐢熶骇璧勬簮鍚嶇О
+ //, "HSourceID": data.鐢熶骇璧勬簮ID
+ //, "HICMOBillNo": data.HICMOBillNo
+ //, "HICMOQty": data.HICMOQty
+ //, "HICMOInterID": data.HICMOInterID
+ //, "HMaterNumber": data.浜у搧鍚嶇О
+ //, "HMaterID": data.浜у搧ID
+ //, "HMaterNumber": data.浜у搧鍐呯爜
+ //, "HProcExchQty": data.HProcExchQty
+ //, "HProcExchBillNo": data.HProcExchBillNo
+ //, "HProcExchInterID": data.HProcExchInterID
+ //, "HProcExchEntryID": data.HProcExchEntryID
, "HEmpName": data.妫�楠屽憳鍚嶇О
, "HFirstCheckEmp": data.妫�楠屽憳ID
+ , "HMainProcID": data.HMainProcID
+ , "HMainProcNumber": data.宸ュ簭浠ｇ爜
+ , "HMainProcName": data.宸ュ簭鍚嶇О
, "HRemark": data.琛ㄥご澶囨敞
});
+
+
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
@@ -914,7 +1004,7 @@
}
});
}
- else if (OperationType == 2){//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ else if (OperationType == 2) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
RoadBillMain(linterid);
/* RoadBillSub(linterid);*/
@@ -1184,9 +1274,8 @@
//debugger;
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- console.log(sSubStr);
- return;
- var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
+ var sBadStr = JSON.stringify(table.cache['BadReTable']);
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + sBadStr;
$.ajax(
{
type: "POST",
@@ -1229,6 +1318,50 @@
}
});
+ //琛岄�夋嫨澶勭悊锛堟楠岃褰�1锛�
+ form.on('select(HQCNote1)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HQCNote1 = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堟楠岃褰�2锛�
+ form.on('select(HQCNote2)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HQCNote2 = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堟楠岃褰�3锛�
+ form.on('select(HQCNote3)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HQCNote3 = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堟楠岃褰�4锛�
+ form.on('select(HQCNote4)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HQCNote4 = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
});
//瀹氫箟鍏ㄥ眬鍙橀噺
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
index f95a357..dc7db9c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
@@ -224,7 +224,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill.html?hID=' + hID
+ , content: '../宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill.html?OperationType=2&linterid=' + hID + '&HSouceBillType=0&closeType=1'
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 34cdf5e..df7c8a9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -1330,7 +1330,7 @@
return;
}
var tableData = data.field;
- var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
var index = layer.load();
$.ajax({
type: "POST",
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index f3e0f77..fdb86dc 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -542,7 +542,7 @@
return;
}
//console.log(data.field);
- var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
//var oMain = data.field;
var HUserName = sessionStorage["HUserName"];
var index = layer.load();
--
Gitblit v1.9.1