From 7ae052d141e69fe9e19392172fc2960134a03232 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 01 十二月 2025 15:54:52 +0800
Subject: [PATCH] 1.采购入库单列表、直接调拨单列表、其他出库单列表、生产入库列表、销售出库单列表:layui中开发 查看包装明细

---
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList2.html |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
index 829a11f..b332c42 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
@@ -663,6 +663,13 @@
                                 if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
                                 }
+                                else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+                                        }, style: 'cursor: pointer;'
+                                    });
+                                }
                                 else {
                                     switch (data[i].Type) {
                                         //int
@@ -773,7 +780,7 @@
                             com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                             break;
                     }
-                    sWhere += " and " + ColName1 + " " + com1;
+                    sqlWhere += " and " + ColName1 + " " + com1;
                 }
                 if (ColName2 != 0 && Comparator2 != 0) {
                     var com2 = "";
@@ -794,7 +801,7 @@
                             com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                             break;
                     }
-                    sWhere += " and " + ColName2 + " " + com2;
+                    sqlWhere += " and " + ColName2 + " " + com2;
                 }
                 if (HBillNo)
                     sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
@@ -816,10 +823,10 @@
                     sqlWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
 
                 if (HDate1) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate1 + "'";
+                    sqlWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate1 + "'";
                 }
                 if (HDate2) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate2 + "'";
+                    sqlWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate2 + "'";
                 }
                 if (number == 2) {
                     if (HProject) {
@@ -875,6 +882,9 @@
                         }
                         if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
                             item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                        }
+                        if (itemobj === '瑙勬牸鍨嬪彿') {
+                            item[itemobj] = item[itemobj].replace(/,/g, '锛�');  // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
                         }
                     }
                 });
@@ -1109,8 +1119,8 @@
 
             //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
             function setSelect_HInitTimeCycle() {
-                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
-                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29, 180, 365]; //valuelist鏁扮粍鍖呭惈涓庢椂闂寸浉鍏崇殑鏁存暟鍊�
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�", "杩戝崐骞�", "杩戜竴骞�"];  //itilelist涓巚aluelist鍊肩浉瀵逛簬鐨勮〃锛屼笖浣滀负涓嬫媺妗嗘枃鏈樉绀�
 
                 var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
                 for (var i = 0; i < valueList.length; i++) {

--
Gitblit v1.9.1