From c818b46e3d608f4bb015ad4503a9f2373e27a352 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 30 五月 2023 10:22:37 +0800
Subject: [PATCH] 反关闭
---
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html | 42 ++++++++++++++
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html | 44 ++++++++++++++
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillList.html | 42 ++++++++++++++
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 2
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html | 2
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html | 7 +-
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Add.html | 6 +-
7 files changed, 138 insertions(+), 7 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
index 19e1514..62c9443 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
@@ -63,6 +63,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill"><i class="layui-icon layui-icon-logout"></i>鍙嶅叧闂�</button>
</div>
</script>
</form>
@@ -121,6 +122,9 @@
break;
//鍏抽棴
case 'set_CloseBill': set_CloseBill();
+ break;
+ //鍙嶅叧闂�
+ case 'set_CancelCloseBill': set_CancelCloseBill();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
@@ -498,6 +502,44 @@
}
}
+ //鍙嶅叧闂�
+ function set_CancelCloseBill() {
+ var CheckStatus = table.checkStatus("mainTable");
+
+ if (CheckStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+ } else {
+ layer.confirm('鎮ㄧ‘瀹氳鍙嶅叧闂悧锛�', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+
+ $.ajax({
+ url: GetWEBURL() + '/JIT_Cg_PODemandPlanBill/CancelClosePODemandPlanBillList'
+ , type: "GET"
+ , data: { "HInterID": HInterID, "User": sessionStorage["HUserName"] }
+ , success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ ////閲嶈浇tree
+ //tree.reload('treeDepartment', {});
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ })
+ }
+ }
+
//#region 鏂板
function set_AddNew() {
layer.open({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
index b63c1ab..1938806 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
@@ -708,7 +708,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -720,7 +720,7 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
$("#HSupplierID").val(checkStatus.data[0].HItemID);
- $("#HSupplierIDName").val(checkStatus.data[0].HName);
+ $("#HSupplierIDName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
layer.close(index);//鍏抽棴寮圭獥
}
})
@@ -988,9 +988,10 @@
}
})
}
+
+ obj.event = "";
return false;
}
-
})
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
index cce1f71..06f5a20 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
@@ -349,7 +349,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -362,8 +362,8 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HSupplierID": checkStatus.data[0].HItemID
- , "HSupplierNumber": checkStatus.data[0].HNumber
- , "HSupplierName": checkStatus.data[0].HName
+ , "HSupplierNumber": checkStatus.data[0].渚涘簲鍟嗕唬鐮�
+ , "HSupplierName": checkStatus.data[0].渚涘簲鍟嗗悕绉�
})
layer.close(index);//鍏抽棴寮圭獥
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
index b77ef26..f33f315 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -98,6 +98,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill"><i class="layui-icon layui-icon-logout"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_TuiBill"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
@@ -155,6 +156,9 @@
break;
//鍏抽棴
case 'set_CloseBill': set_CloseBill();
+ break;
+ //鍙嶅叧闂�
+ case 'set_CancelCloseBill': set_CancelCloseBill();
break;
//涓嬫帹
case 'set_TuiBill': set_TuiBill();
@@ -466,6 +470,46 @@
}
}
+
+ //鍙嶅叧闂�
+ function set_CancelCloseBill() {
+ var CheckStatus = table.checkStatus("mainTable");
+
+ if (CheckStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+ } else {
+ layer.confirm('鎮ㄧ‘瀹氳鍙嶅叧闂悧锛�', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_WorkBillSortBill/CancelCloseBillWorkBillSortBillList'
+ , type: "GET"
+ , data: { "HInterID": HInterID, "User": sessionStorage["HUserName"] }
+ , success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ ////閲嶈浇tree
+ //tree.reload('treeDepartment', {});
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ })
+ }
+ }
+
+
//#region 鏂板
function set_AddNew() {
layer.open({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index ba3dcba..23d9ef4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -336,7 +336,7 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栨椂闂�
- $("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//缁勭粐
Organ();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
index 9fde80b..7cce13d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
@@ -838,6 +838,8 @@
}
})
}
+
+ obj.event = "";
return false;
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
index e983876..7317df2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
@@ -63,6 +63,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill"><i class="layui-icon layui-icon-logout"></i>鍙嶅叧闂�</button>
</div>
</script>
</form>
@@ -121,6 +122,9 @@
break;
//鍏抽棴
case 'set_CloseBill': set_CloseBill();
+ break;
+ //鍙嶅叧闂�
+ case 'set_CancelCloseBill': set_CancelCloseBill();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
@@ -508,6 +512,44 @@
}
}
+ //鍙嶅叧闂�
+ function set_CancelCloseBill() {
+ var CheckStatus = table.checkStatus("mainTable");
+
+ if (CheckStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+ } else {
+ layer.confirm('鎮ㄧ‘瀹氳鍙嶅叧闂悧锛�', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_WorkDemandPlanBill/CancelCloseWorkDemandPlanBillList'
+ , type: "GET"
+ , data: { "HInterID": HInterID, "User": sessionStorage["HUserName"] }
+ , success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ ////閲嶈浇tree
+ //tree.reload('treeDepartment', {});
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ })
+ }
+ }
+
//#region 鏂板
function set_AddNew() {
layer.open({
--
Gitblit v1.9.1