From bded7e678de9838c80ed06ada4ff7385b7e8c3af Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 09 十一月 2021 15:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index ff4c1d3..91f60fd 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -86,12 +86,12 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fp"><i class="layui-icon layui-icon-tips"></i>鍒嗛厤</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fb"><i class="layui-icon layui-icon-tips"></i>鍙戝竷</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>鎾ら攢</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-yxj"><i class="layui-icon layui-icon-tips"></i>浼樺厛绾�</button>
-
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -167,6 +167,8 @@
//浼樺厛绾�
case 'btn-yxj': set_Yxj();
break;
+ case 'btn-back': set_Back();
+ break;
};
});
@@ -234,6 +236,7 @@
, { field: 'HBillType', title: 'HBillType', hide: true }
, { field: 'HSupID', title: 'HSupID', hide: true }
, { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 100 }
+ , { field: '渚涘簲鍟嗗崗鍚岀姸鎬�', title: '渚涘簲鍟嗗崗鍚岀姸鎬�', width: 135 }
, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120}
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 100 }
, { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100 }
@@ -759,7 +762,6 @@
}
-
//鍙戝竷
function set_Release() {
var hmainid = '';
@@ -797,6 +799,45 @@
});
}
+ //鎾ら攢
+ function set_Back() {
+ var hmainid = '';
+ var checkStatus = table.checkStatus('mainTable'),
+ data = checkStatus.data;
+ if (checkStatus.data.length == 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ for (var i = 0; i < data.length; i++) {
+ hmainid += data[i]["hmainid"] + ',';
+ if (data[i]["涓氬姟鐘舵��"] != "宸插彂甯�") {
+ return layer.msg('鍗曟嵁鍙凤細' + data[i]["鍗曟嵁鍙�"] + '鏈彂甯�');
+ }
+ if (data[i]["渚涘簲鍟嗗崗鍚岀姸鎬�"] != "鏈‘璁�") {
+ return layer.msg('鍗曟嵁鍙凤細' + data[i]["鍗曟嵁鍙�"] + '锛屼緵搴斿晢宸茬‘璁�');
+ }
+ }
+ hmainid = hmainid.substring(0, hmainid.length - 1)
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/Back',
+ async: false,
+ type: "GET",
+ dataType: "json",
+ data: { "Hmainid": hmainid },
+ success: function (data1) {
+ if (data1.Message.indexOf("鎴愬姛") > 0) {
+ layer.msg("鎿嶄綔鎴愬姛", { time: 1 * 1000, icon: 1 }, function () {
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function (e) {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ });
+ }
+
//浼樺厛绾�
function set_Yxj() {
var hmainid = '';
--
Gitblit v1.9.1