From 1382e7f901677dce9db97ba25d9095668c1cb67f Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 10 三月 2021 19:49:36 +0800
Subject: [PATCH] 2021-03-10统一更新

---
 WebTM/views/车间管理/工序汇报/MES_StationInBill_PDA.html |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)

diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
similarity index 93%
rename from "WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
rename to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
index a7d711e..f28bdf8 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBill_PDA.html"
@@ -6,11 +6,11 @@
     <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">
-    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
-    <script src="../../layuiadmin/layui/layui.js"></script>
-    <script src="../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
-    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <style>
         .layui-form-label {
             font-size: 14px;
@@ -182,8 +182,8 @@
         </div>
     </div>
 
-    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
-    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script>
 
         function getUrlVars() {
@@ -201,7 +201,7 @@
         var InterID = params[params[1]];
 
         layui.config({
-            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
@@ -363,7 +363,7 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
                     , resize: false
                     , cancel: function (index, layero) {
                     }
@@ -379,7 +379,7 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes']
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes']
                     , resize: false
                     , cancel: function (index, layero) {
                     }
@@ -395,7 +395,7 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
                     , resize: false
                     , cancel: function (index, layero) {
                     }
@@ -416,9 +416,16 @@
                         success: function (result) {
                             console.log(result);
                             if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                $("#sHWHID").val("");
-                                layer.alert(result.msg + "鍗曞彿涓猴細" + $("#HBillNo").val(), { icon: 1 }, function () {
-                                    window.location.reload();//鍒锋柊椤甸潰
+                                //$("#sHWHID").val("");
+                                //layer.alert(result.msg + "鍗曞彿涓猴細" + $("#HBillNo").val(), { icon: 1 }, function () {
+                                //    window.location.reload();//鍒锋柊椤甸潰
+                                //});
+                                layer.confirm(result.msg + "鍗曞彿涓猴細" + $("#HBillNo").val(), {
+                                    btn: ['鍑虹珯', '鏂板'], skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", icon: 1
+                                }, function () {
+                                        parent.location.href = "../../../views/杞﹂棿绠$悊/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html";
+                                }, function () {
+                                    window.location.reload();
                                 });
                             }
                             else {
@@ -436,7 +443,7 @@
             //閫�鍑烘寜閽�
             form.on('submit(Close)', function (data) {//閫�鍑�
                 layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.location.href = "../../views/index.html";
+                    parent.location.href = "../../../views/index.html";
                 });
             });
 

--
Gitblit v1.9.1