Просмотр исходного кода

首件签名新增三个部门

李士越 1 год назад
Родитель
Сommit
7cfbb90acb

+ 35 - 3
wwwroot/main/FirstRegistre/api/GetCheckBarcode.ashx

@@ -145,7 +145,9 @@ public class GetCheckBarcode : IHttpHandler
                     string field = "";
                     if (type != null)
                     {
-                        field = int.Parse(type) == 1 ? "PGSIGNATURE" : int.Parse(type) == 2 ? "CJSIGNATURE" : "SKSIGNATURE";
+                        field = GetFieldByType(int.Parse(type));
+                        //field = int.Parse(type) == 1 ? "PGSIGNATURE" : int.Parse(type) == 2 ? "CJSIGNATURE" : "SKSIGNATURE";
+
                     }
                     string sql = "UPDATE TP_PM_FIRSTREGISTER SET " + field + " =@fileBytes@ WHERE REGISTERID=" + registerId;
                     CDAParameter parameter = new CDAParameter("fileBytes", fileBytes, DataType.Binary);
@@ -168,7 +170,8 @@ public class GetCheckBarcode : IHttpHandler
             string field = "";
             if (type != null)
             {
-                field = int.Parse(type) == 1 ? "PGSIGNATURE" : int.Parse(type) == 2 ? "CJSIGNATURE" : "SKSIGNATURE";
+                field = GetFieldByType(int.Parse(type));
+                //field = int.Parse(type) == 1 ? "PGSIGNATURE" : int.Parse(type) == 2 ? "CJSIGNATURE" : "SKSIGNATURE";
             }
             string sqlStr = "SELECT " + field + " FROM TP_PM_FIRSTREGISTER WHERE REGISTERID=" + registerId;
             using (IDataAccess conn = DataAccess.Create())
@@ -563,7 +566,36 @@ public class GetCheckBarcode : IHttpHandler
         public string userId { get; set; }
         public string accountId { get; set; }
         public bool complete { get; set; }
-        public List<ItemData> data { get; set; } 
+        public List<ItemData> data { get; set; }
     }
+    /// <summary>
+    /// 获取签名字段
+    /// </summary>
+    /// <param name="type"></param>
+    /// <returns></returns>
+    public string GetFieldByType(int type)
+    {
+        switch (type)
+        {
+            case 1:
+                return "PGSIGNATURE";
+
+            case 2:
+                return "CJSIGNATURE";
 
+            case 3:
+                return "SKSIGNATURE";
+
+            case 4:
+                return "YFSIGNATURE";
+            case 5:
+                return "GYSIGNATURE";
+
+            case 6:
+                return "XMZSIGNATURE";
+            default:
+                // 可以根据实际需求修改默认返回值
+                return "UNKNOWN";
+        }
+    }
 }

+ 15 - 5
wwwroot/main/FirstRegistre/overallview.html

@@ -244,10 +244,20 @@
             </div>
             <div class="flex">
                 <div class="list-group-item" style="flex: 1; text-align: center">部门签名</div>
-                <div class="list-group-item" style="flex: 5; text-align: center; flex-direction: row; align-items: center; ">
-                    <button type="button" data-target="#tablet" data-toggle="modal" class="btn btn-primary btn-lg" style="margin:0 30px" onclick="openiframe(1)">品管签字</button>
-                    <button type="button" data-target="#tablet" data-toggle="modal" class="btn btn-primary btn-lg" style="margin:0 30px" onclick="openiframe(2)">成检签字</button>
-                    <button type="button" data-target="#tablet" data-toggle="modal" class="btn btn-primary btn-lg" style="margin:0 30px" onclick="openiframe(3)">生控签字</button>
+                <div class="list-group-item" style="flex: 5; text-align: center;  align-items: center;">
+                    <div style="display: flex; flex-direction: column;">
+                        <div style="display: flex; justify-content: space-between">
+                            <button type="button" data-target="#tablet" data-toggle="modal" class="btn btn-primary btn-lg" style="margin: 0 30px" onclick="openiframe(1)">品管签字</button>
+                            <button type="button" data-target="#tablet" data-toggle="modal" class="btn btn-primary btn-lg" style="margin:0 30px" onclick="openiframe(2)">成检签字</button>
+                            <button type="button" data-target="#tablet" data-toggle="modal" class="btn btn-primary btn-lg" style="margin:0 30px" onclick="openiframe(3)">生控签字</button>
+                        </div>
+                        <div style="display: flex; justify-content: space-between;padding-top:20px">
+                            <button type="button" data-target="#tablet" data-toggle="modal" class="btn btn-primary btn-lg" style="margin:0 30px" onclick="openiframe(4)">研发签字</button>
+                            <button type="button" data-target="#tablet" data-toggle="modal" class="btn btn-primary btn-lg" style="margin:0 30px" onclick="openiframe(5)">工艺签字</button>
+                            <button type="button" data-target="#tablet" data-toggle="modal" class="btn btn-primary btn-lg" style="margin:0 30px" onclick="openiframe(6)">项目签字</button>
+
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="flex">
@@ -327,7 +337,7 @@
         let TestDataMap = {};
         /**加载前调用*/
         $(document).ready(function () {
-            // loadData(); 
+            loadData(); 
             first();
         });
         //加载 生产工号