From a13efdd8dd7767a50f79ab804713a260492fc206 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期二, 19 八月 2025 16:00:39 +0800
Subject: [PATCH] 产品包装单与单品过站优化
---
WebTM/views/车间管理/产线/Sc_PackUnionBillCacheList.html | 57 +++++----------------------------------------------------
1 files changed, 5 insertions(+), 52 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_PackUnionBillCacheList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_PackUnionBillCacheList.html"
index d2fb087..a0e67d2 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_PackUnionBillCacheList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_PackUnionBillCacheList.html"
@@ -12,7 +12,7 @@
<script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
@@ -214,7 +214,7 @@
$.ajax({
type: "get",
async: false,
- url: GetWEBURlLanguage() + "/Web/GetOrganizations",
+ url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
var Organization = "";
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -271,55 +271,8 @@
data: { "sWhere": sWhere },
success: function (data1) {
if (data1.count == 1) {
- var data = [];
- var col = [];
- var totalArray = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- 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 ($.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: false, totalRow: true, width: 120 });
- } else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
- break;
- case 'long':
- case 'Int32':
- case 'Int64':
- case 'double':
- case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120, totalRow: true });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
- }
- }
- }
-
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- /* , toolbar: '#toolbarDemo'*/
- , cols: [col]
- , data: data1.data
- , height: 'full-80'
- , page: true
- , limits: [50, 500, 5000, 20000]
- , limit: 50
- , totalRow: true
- , cellMinWidth: 90
- , done: function (res, curr, count) {
- soulTable.render(this);
- }
- }
+ option.data = data1.data;
+ table.render(option);
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -357,7 +310,7 @@
$.ajax({
type: "GET",
async: false,
- url: GetWEBURlLanguage() + "/Xt_User/getOrgIDListByUser", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� 浼犲弬 缁勭粐蹇呴』鏄垪琛ㄥご閮ㄦ煡璇㈢殑缁勭粐 涓嶈兘浣跨敤鐢ㄦ埛榛樿
+ url: GetWEBURL() + "/Xt_User/getOrgIDListByUser", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� 浼犲弬 缁勭粐蹇呴』鏄垪琛ㄥご閮ㄦ煡璇㈢殑缁勭粐 涓嶈兘浣跨敤鐢ㄦ埛榛樿
data: { "UserID": sessionStorage["Czybm"], "UserName": sessionStorage["HUserName"], HOrgID: $("#HOrgID").val() },
success: function (result) {
if (result.count == 1) {
--
Gitblit v1.9.1