From a5e8fb4e50f285538ad6800d5abdb66ea367db00 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 14 一月 2026 10:59:42 +0800
Subject: [PATCH] 添康获取多车间订单排产；小卫彩盒SN校验标题调整；过站解绑列表添加日期区间过滤；香囊标签打印，添加暂停打印，继续打印功能
---
WebTM/views/项目管理/报表分析/PM_ProjectBillMainMy.html | 393 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 225 insertions(+), 168 deletions(-)
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ProjectBillMainMy.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ProjectBillMainMy.html"
index 8e2a878..1268a1b 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ProjectBillMainMy.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ProjectBillMainMy.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>宸ュ簭娴佽浆鍗″垪琛�</title>
+ <title>鎴戠殑椤圭洰鍒楄〃</title>
<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">
@@ -26,13 +26,13 @@
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="padding: 10px; ">
- <button type="button" class="layui-btn layui-btn-radius" style="display:none;" id="btn_LookDown" lay-event="btn_LookDown">寮曞嚭</button>
- <button type="button" class="layui-btn layui-btn-radius" style="display:none;" id="btn_view" lay-event="btn_view">棰勮</button>
- <button type="button" class="layui-btn layui-btn-radius" style="display:none;" id="btn_print" lay-event="btn_print">鎵撳嵃</button>
- <button type="button" class="layui-btn layui-btn-radius" style="display:none;" id="btn_push_down" lay-event="btn_push_down_phase">涓嬫帹闃舵姹囨姤</button>
- <button type="button" class="layui-btn layui-btn-radius" style="display:none;" id="btn_push_down" lay-event="btn_push_down_work">涓嬫帹宸ヤ綔浠诲姟</button>
- <button type="button" class="layui-btn layui-btn-radius" style="display:none;" id="btn_push_down" lay-event="btn_push_down_monthly">涓嬫帹闃舵鏈堝害璁″垝</button>
- <button type="button" class="layui-btn layui-btn-radius" style="display:none;" id="get_Exit" lay-event="get_Exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_LookDown" lay-filter="btn_LookDown">寮曞嚭</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">棰勮</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_print" lay-filter="btn_print">鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_push_down" lay-filter="btn_push_down_phase">涓嬫帹闃舵姹囨姤</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_push_down" lay-filter="btn_push_down_work">涓嬫帹宸ヤ綔浠诲姟</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_push_down" lay-filter="btn_push_down_monthly">涓嬫帹闃舵鏈堝害璁″垝</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">閫�鍑�</button>
</div>
<!--<div class="layui-collapse">
<div class="layui-colla-item">
@@ -132,11 +132,11 @@
, soulTable = layui.soulTable
//var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
- var option = "";
- var option2 = "";
+ var option = ""; //鎴戜富瀵肩殑
+ var option1 = ""; //鎴戝弬涓庣殑
+ var ins;
-
-
+
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -144,82 +144,41 @@
//
var HModName = "PM_ProjectBillMainMy";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜涓诲鐨勶級
- var titleData = ["HInterID", "鍗曟嵁鐘舵��", "椤圭洰浠ｇ爜", "HCusID", "HProjectStageID", "HPMEmpID"];
- //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜鍙備笌鐨勶級
- var titleData1 = ["HInterID", "鍗曟嵁鐘舵��", "椤圭洰浠ｇ爜", "HCusID", "HProjectStageID", "HPMEmpID"];
-
+ var titleData = ["HInterID","HEntryID", "鍗曟嵁鐘舵��", "椤圭洰浠ｇ爜", "HCusID", "HProjectStageID", "HPMEmpID"];
//鍒濆鍖栫晫闈�
set_ClearBill();
-
//#endregion
//#region 澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(mainTable)', function (obj) {
- switch (obj.event) {
- //寮曞嚭
- case 'btn_LookDown': btn_LookDown();
- break;
- //閫�鍑烘寜閽�
- case 'get_Exit': Pub_Close(2);
- break;
- //棰勮
- case 'btn_view': get_view();
- break;
- //鎵撳嵃
- case 'btn_print': get_print();
- break;
- //涓嬫帹闃舵姹囨姤
- case 'btn_push_down_phase': btn_push_down_phase();
- break;
- //涓嬫帹宸ヤ綔浠诲姟
- case 'btn_push_down_work': btn_push_down_work();
- break;
- //涓嬫帹闃舵鏈堝害璁″垝
- case 'btn_push_down_monthly': btn_push_down_monthly();
- break;
-
- };
+ //寮曞嚭
+ form.on('submit(btn_LookDown)', function (data) {
+ get_Export();
});
- table.on('toolbar(mainTable1)', function (obj) {
- switch (obj.event) {
- //寮曞嚭
- case 'btn_LookDown': btn_LookDown();
- break;
- //閫�鍑烘寜閽�
- case 'get_Exit': Pub_Close(2);
- break;
- //棰勮
- case 'btn_view': get_view();
- break;
- //鎵撳嵃
- case 'btn_print': get_print();
- break;
- //涓嬫帹闃舵姹囨姤
- case 'btn_push_down_phase': btn_push_down_phase();
- break;
- //涓嬫帹宸ヤ綔浠诲姟
- case 'btn_push_down_work': btn_push_down_work();
- break;
- //涓嬫帹闃舵鏈堝害璁″垝
- case 'btn_push_down_monthly': btn_push_down_monthly();
- break;
-
- };
+ //鎵撳嵃
+ form.on('submit(btn_view)', function (data) {
+ get_print();
+ });
+ //鎵撳嵃
+ form.on('submit(btn_print)', function (data) {
+ get_print();
+ });
+ //涓嬫帹闃舵姹囨姤
+ form.on('submit(btn_push_down_phase)', function (data) {
+ set_ProjectReport();
+ });
+ //涓嬫帹宸ヤ綔浠诲姟
+ form.on('submit(btn_push_down_work)', function (data) {
+ set_WorkTask();
+ });
+ //涓嬫帹鏈堝害闃舵璁″垝
+ form.on('submit(btn_push_down_monthly)', function (data) {
+ set_WorkTasks();
+ });
+ //閫�鍑�
+ form.on('submit(get_Exit)', function (data) {
+ Pub_Close(2);
});
//#endregion
-
- //#region 閲嶇疆鎸夐挳
- form.on('submit(btnReSearch)', function (data) {
- set_ClearQuery();
- });
- //#endregion
-
- //#region 鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
- });
- //#endregion
-
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
function set_ClearBill() {
@@ -228,32 +187,13 @@
set_InitGrid();
//鍒濆鍖栦粠琛ㄥ垪琛�
set_InitGrid2();
-
- table.render(option2);
//鏌ヨ
get_FastQuery();
}
-
- //#region 閲嶇疆杩囨护鏉′欢鏂规硶
- function set_ClearQuery() {
-
- //$("#HBillNo").val("");//鍗曟嵁鍙�
- //$("#ColContent").val("");
- //$("#ColName").val("0");
- //$("#Comparator").val("0");
- //form.render('select');
- //$("#btnSearch").click();
- sWhere = "";
- get_FastQuery();
- }
- //#endregion
-
//#region 蹇�熻繃婊�
function get_FastQuery() {
-
get_Display(sWhere);
- get_Display1(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
@@ -265,6 +205,7 @@
, toolbar: '#toolbarDemo'
, page: true
, height: 300
+ , totalRow: true
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -279,6 +220,7 @@
elem: '#mainTable2'
//, toolbar: '#toolbarDemo'
, page: false
+ , totalRow: true
, height: 500
, cellMinWidth: 90
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
@@ -287,9 +229,10 @@
}
- //#region 鏌ヨ 鎴戜富瀵肩殑
+ //#region 鏌ヨ 鎴戜富瀵肩殑 鎴戝弬涓庣殑
function get_Display(sWhere) {
var ajaxLoad = layer.load();
+
$.ajax({
url: GetWEBURL() + '/PM_ReportController/PM_ProjectBillMYList',
type: "GET",
@@ -297,6 +240,7 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
+ var totalArray = ["杩涘害鍗犳瘮", "鍚堝悓瀹炴柦浜哄ぉ", "棰勪及浜屾寮�鍙戜汉澶�", "鑰楃敤澶╂暟"];
var data = [];
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
@@ -309,6 +253,9 @@
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
}
else {
switch (data[i].Type) {
@@ -327,89 +274,29 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, cols: [col]
- , data: data1.data
+ , data: data1.data.h_p_My_PM_ProjectReportBill
, height: 'full-80'
, page: true
+ , totalRow: true
, limits: [50, 500, 5000, 50000]
, limit: 50
, cellMinWidth: 90
}
table.render(option);
- //鍒锋柊鎸夐挳鏄剧ず
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- var HBillType = "PM_ProjectBillMainMy";
- Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
-
- layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- ColFilter();
- }
-
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- }
- //#endregion
-
- //#region 鏌ヨ 鎴戝弬涓庣殑
- function get_Display1(sWhere) {
- var ajaxLoad = layer.load();
- $.ajax({
- url: GetWEBURL() + '/PM_ReportController/PM_ProjectBillMYList',
- type: "GET",
- async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.count == 1) {
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
- for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
- }
- }
-
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
+ ins = table.render(option);
+ option1 = {
elem: '#mainTable1'
, toolbar: '#toolbarDemo'
, cols: [col]
- , data: data1.data
+ , data: data1.data.h_p_My_PM_ProjectReportBill1
, height: 'full-80'
, page: true
+ , totalRow: true
, limits: [50, 500, 5000, 50000]
, limit: 50
, cellMinWidth: 90
}
- table.render(option);
+ table.render(option1);
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
var HBillType = "PM_ProjectBillMainMy";
@@ -435,8 +322,178 @@
});
}
-
//#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ let data = option.data; // 鍋囪option.data鏄綘鐨勬暟鎹�
+ for (let i = 0; i < data.length; i++) {
+ if (data[i].椤圭洰鎴愬憳 && typeof data[i].椤圭洰鎴愬憳 === 'string') {
+ data[i].椤圭洰鎴愬憳 = formatNames(data[i].椤圭洰鎴愬憳);
+ }
+ }
+ table.exportFile(ins.config.id, data, "xls");
+ }
+ function formatNames(names) {
+ return `"${names.replace(/,/g, "銆�")}"`;
+ }
+ //#endregion
+
+ //#region 鎵撳嵃
+ function get_print() {
+ var activeTab =getActiveTab();
+ if (activeTab=="鎴戜富瀵肩殑") {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data,
+ Num = 1;
+ } else if (activeTab == "鎴戝弬涓庣殑") {
+ var checkStatus = table.checkStatus('mainTable1')
+ , data = checkStatus.data,
+ Num = 2;
+ }
+
+ if (checkStatus.data.length >0 ) {
+ var linterid = [];
+
+ for (var i = 0; i < data.length; i++) {
+ linterid.push(data[i].HInterID.toString())
+ }
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + "|" + Num + '&MyMsg=' + linterid.toString() + '&Type=PM_ProjectBillMainMy', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+
+ function getActiveTab() {
+ var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+ var activeTab;
+ for (var i = 0; i < tabs.length; i++) {
+ if (tabs[i].classList.contains("layui-this")) {
+ activeTab = tabs[i].innerText;
+ break;
+ }
+ }
+ return activeTab;
+
+ }
+ //#endregion
+
+ //#region 涓嬫帹(闃舵姹囨姤)
+ function set_ProjectReport() {
+ var activeTab = getActiveTab();
+ if (activeTab == "鎴戜富瀵肩殑") {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ } else if (activeTab == "鎴戝弬涓庣殑") {
+ var checkStatus = table.checkStatus('mainTable1')
+ , data = checkStatus.data;
+ }
+ var InterID = data[0].HInterID.toString();
+ var HProjectStageID = data[0].HProjectStageID;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HInterID.toString();
+ var HProjectStageID = data[0].HProjectStageID;
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '椤圭洰闃舵姹囨姤-涓嬫帹'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../椤圭洰绠＄悊/椤圭洰闃舵/PM_ProjectReportBill.html?OperationType=4&linterid=' + InterID + '&HSouceBillType=' + '&HProjectStageID=' + HProjectStageID
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ btn1: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 涓嬫帹(宸ヤ綔浠诲姟)
+ function set_WorkTask() {
+ var activeTab = getActiveTab();
+ if (activeTab == "鎴戜富瀵肩殑") {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ } else if (activeTab == "鎴戝弬涓庣殑") {
+ var checkStatus = table.checkStatus('mainTable1')
+ , data = checkStatus.data;
+ }
+ var HInterID = data[0].HInterID.toString();
+ var HEntryID = data[0].HEntryID.toString();
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '宸ヤ綔浠诲姟-涓嬫帹'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskBill.html?OperationType=4&linterid=' + HInterID + '&HSouceBillType=' + '&HEntryID=' + HEntryID
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ btn1: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
+ }
+ }
+ //#endregion
+
+ //#region 涓嬫帹(鏈堝害闃舵姹囨姤)
+ function set_WorkTasks() {
+ var activeTab = getActiveTab();
+ if (activeTab == "鎴戜富瀵肩殑") {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ } else if (activeTab == "鎴戝弬涓庣殑") {
+ var checkStatus = table.checkStatus('mainTable1')
+ , data = checkStatus.data;
+ }
+ var HInterID = data[0].HInterID.toString();
+ var HEntryID = data[0].HEntryID.toString();
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '宸ヤ綔浠诲姟-涓嬫帹'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_WorkPlanMonthBillMain.html?OperationType=4&linterid=' + HInterID + '&HSouceBillType=' + '&HEntryID=' + HEntryID
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ btn1: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
+ }
+ }
+ //#endregion
+
+
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
--
Gitblit v1.9.1