From dad06b3708ba653dcec5b4707aa35ed95587d60e Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期二, 20 四月 2021 21:46:19 +0800
Subject: [PATCH] 新增委外工序接收单模块
---
WebTM/views/生产工序管理/工序派工单/Sc_Add_ProcessSendWork.html | 3 +
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 2
WebTM/views/生产工序管理/增加不良评审单/QC_Add_NoPassProdCheckBill.html | 56 ++++++++++++++++++++++-----
WebTM/views/生产工序管理/工序汇报单/Sc_Add_ProcessReportList.html | 3 +
4 files changed, 50 insertions(+), 14 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index fa1a0c1..5ea179d 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -1188,7 +1188,7 @@
<publishTime>04/08/2021 09:14:52</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_Add_NoPassProdCheckBill.html">
- <publishTime>04/20/2021 09:58:16</publishTime>
+ <publishTime>04/20/2021 09:15:32</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdCheckBill.html">
<publishTime>04/13/2021 10:12:44</publishTime>
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html"
index d10e224..666a52d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html"
@@ -19,7 +19,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
</div>
@@ -144,7 +144,8 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
-
+ <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="xuhao">
@@ -155,6 +156,10 @@
</div>
</div>
</div>
+ <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 src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -181,7 +186,8 @@
//,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
, page: true //寮�鍚垎椤�
, cols: [[ //琛ㄥご
- { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left',event:"qwe" }
+ {type:'checkbox', fixed: 'left'}
+ ,{ templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left',event:"qwe" }
, { field: 'HWasterReasonName', title: '涓嶈壇鍘熷洜', event: "ReasonNameEvent" }
, { field: 'HBadReasonID', title: '涓嶈壇鍘熷洜id' }
, { field: 'HEmpName', title: '璐ｄ换浜�', edit: 'text', event: "EmpNameEvent" }
@@ -192,6 +198,7 @@
, { field: 'HRemark', title: '澶囨敞', edit: 'text', event: "RemarkEvent" }
, { field: 'HPSProcName', title: '涓嶈壇纭浜�', event: "PSProcNameEvent" }
, { field: 'HCloseMan', title: '鍒ゅ畾缁撴灉', edit: 'text', event: "CloseManEvent" }
+ ,{fixed: 'right', title:'鎿嶄綔', toolbar: '#barDemo', width:150}
]]
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
};
@@ -232,19 +239,35 @@
var rowid = 0;
var rows = 0;
table.on('toolbar(mainTable)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id);
+ var checkStatus = table.checkStatus('mainTable')
+ ,data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
-
+ var NewRow={ "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " };
switch (obj.event) {
case 'btn-AddLine':
-
- table.cache["mainTable"].push(AddRow[rows]);
+ //table.cache["mainTable"].push(AddRow[rows]);
+ table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
- console.log("鏂板涓�琛�" + AddRow + "搴忓彿" + rows);
+ rows++;
layer.msg('澧炲姞涓�琛屾寜閽紒')
-
-
+ break;
+ case 'btn-CopyLine':
+ 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["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //layer.alert(copyrow);
+ }
break;
}
});
@@ -252,7 +275,17 @@
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
var rowIndex = $(obj.tr).attr("data-index");
-
+ if (obj.event==='del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex ==='0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ obj.del();
+ layer.close(index);
+ }
+ });
+ }
if (obj.event === 'ReasonNameEvent') {
var _obj = obj;
switch (rowIndex) {
@@ -2393,6 +2426,7 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled",true);
}
else {
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
index 5eab3dc..dff6014 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
@@ -19,7 +19,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -470,6 +470,7 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled",true);
}
else {
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html"
index dd61dc4..881a752 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html"
@@ -19,7 +19,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -490,6 +490,7 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled",true);
}
else {
--
Gitblit v1.9.1