From acadfc413aeea932667c60ccfdf8866d994ddd2b Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 05 八月 2021 10:54:07 +0800
Subject: [PATCH] 1

---
 WebTM/views/IpadIndex.html |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index c3a1be1..419923a 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -63,7 +63,7 @@
         });
         function TSLoad() {
             $("#topleft").html("");
-            var HUserName = "Admin";  //sessionStorage["HUserName"];     //榛樿褰撳墠鐧诲綍浜哄憳
+            var HUserName = sessionStorage["HUserName"];  //sessionStorage["HUserName"];     //榛樿褰撳墠鐧诲綍浜哄憳
             $.ajax({
                 url: GetWEBURL() + "/ReportPlatForm/SearchGetLineBindBillList",
                 type: "GET",
@@ -213,7 +213,7 @@
                                         html1 += '<h1><span>褰撳墠璁㈠崟锛�</span><span>' + LoadData2[i].HSourceBillNo + '</span></h1>';
                                         html1 += '<h1><span>鐗╂枡鍚嶇О锛�</span><span>' + LoadData2[i].HMaterName + '</span></h1>';
                                         html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData2[i].HPlanQty + '</span></h1>';
-                                        html1 += '<h1><span>浠ユ眹鎶ユ暟閲忥細</span><span>' + LoadData2[i].HRelationQty + '</span></h1>';
+                                        html1 += '<h1><span>宸叉眹鎶ユ暟閲忥細</span><span>' + LoadData2[i].HRelationQty + '</span></h1>';
                                         if (LoadData2[i].HRelationQty == 0 || LoadData2[i].HRelationQty == null)
                                         {
                                             html1 += '<h1><span>杩涘害锛�</span><span>0%</span></h1>';
@@ -722,7 +722,8 @@
                         "HSourceName": HSourceName1,
                         "HICMOInterID": HICMOInterID,
                         "HICMOEntryID": HICMOEntryID,
-                        "HMaker": "Admin",    //sessionStorage["HUserName"]
+                        "HMaker": sessionStorage["HUserName"],    //sessionStorage["HUserName"]
+                        "Czybm": sessionStorage["Czybm"],
                         //"HEmpID": "0",    //sessionStorage["HEmpID"]
                         "HSourceBillType": HSourceBillType
                     });
@@ -738,6 +739,10 @@
         //棣栨妫�楠�
         function OpenFistCheck(event, obj)
         {
+            if (wktag == 0) {
+                layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+                return false;
+            }
             layer.open({
                 type: 2
                 , area: ['100%', '100%']
@@ -758,6 +763,10 @@
         //杩囩▼妫�楠�
         function OpenProcess(event, obj)
         {
+            if (wktag == 0) {
+                layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+                return false;
+            }
             layer.open({
                 type: 2
                 , area: ['100%', '100%']
@@ -790,16 +799,16 @@
             var sWhere = "";
             switch (btn) {
                 case "寮�宸�":
-                    sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID+"' and hicmostatus not in('0')";   //寮�宸ョ姸鎬�
+                    sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID+"' and hicmostatus not in('0','2')";   //鏄惁鏈変笉涓哄紑宸ュ紑宸ョ姸鎬併�佸仠宸ョ姸鎬�
                     break;
                 case "瀹屽伐":
-                    sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID +"' and hicmostatus not in('1','2')";   //瀹屽伐鐘舵��
+                    sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID +"' and hicmostatus not in('1','2')";   //鏄惁鏈変笉涓哄紑宸ャ�佸畬宸ョ姸鎬�
                     break;
                 case "鍋滃伐":
-                    sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID +"' and hicmostatus not in('1')";   //鍋滃伐鎸傝捣鐘舵��
+                    sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID +"' and hicmostatus not in('1')";   //鏄惁鏈変笉涓哄仠宸ユ寕璧风姸鎬�
                     break;
                 case "姹囨姤":
-                    sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1')";   //姹囨姤鐘舵��
+                    sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')";   //鏄惁鏈変笉涓哄紑宸ャ�佸仠宸ユ寕璧风姸鎬�
                     break;
                 case "鎶ユ鐢宠":
                     

--
Gitblit v1.9.1