From ec8537f306d56eabd2c8665ae014af3c46f1faa4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 10 三月 2023 19:02:45 +0800
Subject: [PATCH] 页面优化 工艺路线 工序多选
---
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 115 +++++++++++++++++++++++++++++++++++++++++++++------------
WebTM/views/系统管理/组织架构设置/Gy_DutyList.html | 2
2 files changed, 92 insertions(+), 25 deletions(-)
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyList.html"
index 03d3386..caed4d4 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyList.html"
@@ -59,7 +59,7 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
<div class="layui-row" style="padding:10px 0">
- <div class="layui-col-xs3 layui-inline">
+ <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
<div id="TreeTable" class="demo-tree demo-tree-box"></div>
</div>
<div class="layui-col-xs8 layui-inline">
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index bf736c2..dc1a7a0 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -1354,38 +1354,105 @@
var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ if (checkStatus.data.length ==0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
}
- var HCenterID = 0;
- var HCenterNUmber = "";
- var HCenterName = "";
+
+ //鑾峰彇宸ュ簭浠ｇ爜
+ var ProcessNumber = [];
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ ProcessNumber.push("'" + checkStatus.data[i]["宸ュ簭浠ｇ爜"] + "'");
+ }
+
+ //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
+ var NowNum = 0;
+ for (var i = 0; i < option.data.length; i++) {
+ if (obj.data["HProcNo"] == option.data[i]["HProcNo"]) {
+ NowNum = i + 1;
+ }
+ }
+
//鏌ヨ宸ヤ綔涓績鐨勬暟鎹�
+ var WorkCente = [];
+ var sWhere = "select isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠ｇ爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О from Gy_Process p left join Gy_WorkCenter a on p.HNumber = a.HNumber where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber";
$.ajax({
- type: "get",
- url: GetWEBURL() + '/Gy_WorkCenter/list',
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: false,
- data: { "sWhere": " and 宸ヤ綔涓績浠ｇ爜='" + checkStatus.data[0].宸ュ簭浠ｇ爜 + "' ", user: sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- if (result.data.length > 0) {
- HCenterID = result.data[0]["HItemID"];
- HCenterNUmber = result.data[0]["宸ヤ綔涓績浠ｇ爜"];
- HCenterName = result.data[0]["宸ヤ綔涓績鍚嶇О"];
- }
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ WorkCente = data.data;
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
}
layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
}
- })
+ });
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "宸ュ簭": checkStatus.data[0].宸ュ簭鍚嶇О
- , "HProcID": checkStatus.data[0].HItemID
- , "宸ヤ綔涓績": HCenterName
- , "HCenterID": HCenterID
- , "宸ヤ綔涓績浠ｇ爜": HCenterNUmber
- })
+ //鍒ゆ柇閫夋嫨鐨勬暟鎹�绘暟 鏄惁澶т簬琛ㄦ牸鐜版湁鐨勬暟鎹�
+ if (ProcessNumber.length > option.data.length - (NowNum - 1)) {
+ //鑾峰彇琛ㄦ牸鍓╀綑琛屾暟閲�
+ var num = ProcessNumber.length - option.data.length + (NowNum - 1);
+ //寰幆璧嬪�� 鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+ var j = 0;
+ for (var i = (NowNum - 1); i < option.data.length; i++) {
+ option.data[i]["宸ュ簭"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+ option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
+ option.data[i]["宸ヤ綔涓績"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
+ option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
+ option.data[i]["宸ヤ綔涓績浠ｇ爜"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
+ j++;
+ }
+
+ //鍦ㄤ笅鏂规坊鍔犳柊鐨勮〃鏍兼暟鎹�
+ for (var i = 0; i < num; i++) {
+ option.data.push({
+ "HProcNo": (table.cache["mainTable"].length + i + 1) * 10, "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": ""
+ , "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
+ , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": WorkCente[j]["宸ュ簭鍚嶇О"]
+ , "HProcID": WorkCente[j]["HProcID"], "宸ヤ綔涓績浠ｇ爜": WorkCente[j]["宸ヤ綔涓績浠ｇ爜"], "HCenterID": WorkCente[j]["HCenterID"], "宸ヤ綔涓績": WorkCente[j]["宸ヤ綔涓績鍚嶇О"], "HSupID": 0
+ , "渚涘簲鍟嗕唬鐮�": "", "渚涘簲鍟�": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
+ , "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
+ , "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
+ , "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
+ , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
+ , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
+ , "HWHID": 0, "HWHName": ""
+ })
+ j++;
+ }
+ } else {
+ //寰幆璧嬪�� 鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+ var j = 0;
+ for (var i = (NowNum - 1); i < (NowNum - 1) + ProcessNumber.length; i++) {
+ option.data[i]["宸ュ簭"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+ option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
+ option.data[i]["宸ヤ綔涓績"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
+ option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
+ option.data[i]["宸ヤ綔涓績浠ｇ爜"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
+ j++;
+ }
+ }
+ table.render(option);
+ //var HCenterID = 0;
+ //var HCenterNUmber = "";
+ //var HCenterName = "";
+
+
+ ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ //obj.update({
+ // "宸ュ簭": checkStatus.data[0].宸ュ簭鍚嶇О
+ // , "HProcID": checkStatus.data[0].HItemID
+ // , "宸ヤ綔涓績": HCenterName
+ // , "HCenterID": HCenterID
+ // , "宸ヤ綔涓績浠ｇ爜": HCenterNUmber
+ //})
layer.close(index);//鍏抽棴寮圭獥
}
--
Gitblit v1.9.1