From e50265de5ae4e5e4c8b8852e777216adab7c4ce4 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 09:13:06 +0800
Subject: [PATCH] 合并分支
---
WebTM/views/设备管理/Sb_EquipDotCheckBillList_PDA.html | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
index d77c8e2..ebb2ee9 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
@@ -6,14 +6,14 @@
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/PubCustom.js"></script>
- <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../layuiadmin/PubCustom.js"></script>
+ <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -79,7 +79,7 @@
<script>
layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
@@ -98,6 +98,8 @@
var sWhere = "";
var option = [];
var HModName = "Sb_EquipDotCheckBillList_PDA";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "璁惧ID", "鐐规椤圭洰ID","璐熻矗浜篒D","hsubid","HBillType"];
//#endregion
@@ -123,7 +125,10 @@
case 'btnDel': btnDel();
break;
//閫�鍑�
- case 'btn-exit': Pub_Close(2);
+ case 'btn-exit':
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.location.href = "../../../views/index_Mobile.html";
+ });
break;
//闅愯棌鍒楄缃�
case 'HideColumn':
@@ -167,9 +172,9 @@
//鍒濆鍖栨椂闂�
$("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-
//鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery();
+ //鍒濆鍖栬〃鏍�
DisPlay_HideColumn();
}
@@ -194,7 +199,7 @@
url: GetWEBURL() + "/Web/GetEquipmentBillsList",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "Type": "DJ" },
+ data: { "sWhere": sWhere, "Type": "DJ", "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -209,7 +214,7 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -1) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
@@ -300,9 +305,9 @@
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + '/ProcessCheck/DelProcessCheckBill',
+ url: GetWEBURL() + '/Sb_EquipDotCheckBill/DeltetEquipDotCheckBillList',
type: "GET",
- data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": hmainid, "user": sessionStorage["HUserName"] },
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
@@ -370,7 +375,7 @@
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["hmainid","HMaterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid","璁惧ID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
--
Gitblit v1.9.1