From a442e2c4bd43c15bba79e44c0673311ce7918b5a Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 09 四月 2021 08:25:46 +0800
Subject: [PATCH] 委外工序发出完善-合并
---
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 12 +
WebTM/views/生产工序管理/工序汇报单/Sc_ProcessReport_PDA.html | 521 +++++++++++++++++++++++++++++++++++++++++++++++
WebTM/views/index.html | 1
WebTM/views/生产工序管理/工序派工单/Sc_ProcessSendWorkList.html | 108 +++++----
WebTM/WebTM.csproj | 1
5 files changed, 591 insertions(+), 52 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index 29ecc18..4ccdce9 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -1177,6 +1177,9 @@
<File Include="views/鐢熶骇宸ュ簭绠＄悊/濮斿宸ュ簭姹囨姤鍗�/Sc_StationOutBillMainList.html">
<publishTime>04/08/2021 09:14:52</publishTime>
</File>
+ <File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReport_PDA.html">
+ <publishTime>04/08/2021 20:15:42</publishTime>
+ </File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html">
<publishTime>04/08/2021 09:14:52</publishTime>
</File>
@@ -1231,6 +1234,15 @@
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBillList.html">
<publishTime>03/30/2021 10:39:26</publishTime>
</File>
+ <File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html">
+ <publishTime>04/08/2021 10:57:44</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBillList.html">
+ <publishTime>04/08/2021 10:57:44</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBillList.html">
+ <publishTime>04/08/2021 10:57:44</publishTime>
+ </File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill.html">
<publishTime>03/29/2021 10:48:22</publishTime>
</File>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e1c3216..40f8a6d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -457,6 +457,7 @@
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ崟\WW_EntrustWorkOrderBillMainList.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭姹囨姤鍗昞Sc_StationOutBillMainList.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞Sc_ProcessReportList.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞Sc_ProcessReport_PDA.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭娲惧伐鍗昞Sc_Add_ProcessSendWork.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭娲惧伐鍗昞Sc_ProcessSendWorkList.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭璁″垝鍗昞Sc_ProcessPlanList.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index abbf2e4..ff0e4fe 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -113,6 +113,7 @@
<a>宸ュ簭姹囨姤鍗�</a>
<dl class="layui-nav-child">
<dd><a lay-href="鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">宸ュ簭姹囨姤鍗曞垪琛�</a></dd>
+ <dd><a lay-href="鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReport_PDA.html">PDA宸ュ簭姹囨姤鍗曞垪琛�</a></dd>
</dl>
</dd>
<dd class="layui-nav-itemed">
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReport_PDA.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReport_PDA.html"
new file mode 100644
index 0000000..e75640a
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReport_PDA.html"
@@ -0,0 +1,521 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" style="background-color:white;">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>PDA宸ュ簭姹囨姤鍗�</title>
+ <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>
+ <style>
+ .layui-form-label {
+ font-size: 14px;
+ width: 85px;
+ text-align: inherit;
+ }
+ /*鍏ㄥ眬璁剧疆杈撳叆妗嗛珮搴�*/
+ .layui-input {
+ height: 30px;
+ }
+ /*璁剧疆琛ㄥご杈撳叆妗�*/
+ .t1_input {
+ padding: 1%;
+ }
+ /*鏈珯淇℃伅td*/
+ .bz_td {
+ display: -webkit-box; /*璁剧疆鎸夐挳涓嶆崲琛�*/
+ padding: 1%; /*璁剧疆杈撳叆妗嗚竟璺�*/
+ }
+ /*璁剧疆鏈珯淇℃伅鎸夐挳楂樺害*/
+ .bz_btu {
+ height: 30px;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding:0">
+ <div class="layui-card">
+ <!--<div class="layui-card-header"></div>-->
+ <div class="layui-card-body" style="padding: 0;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div style="background-color:#0085E8;">
+ <span style="color: white;"><i class="layui-icon layui-icon-form"></i>PDA宸ュ簭姹囨姤鍗�</span>
+ </div>
+ <div class="layui-form-item" style="margin: 1% 0;text-align: right;">
+ <button type="button" lay-submit="" lay-filter="HAddBT" class="layui-btn layui-btn-radius">鏂板</button>
+ <!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">娓呯┖</button>-->
+ <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Close" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+ </div>
+ <div class="layui-form-item">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>鏉″舰鐮�</th>
+ <td class="t1_input">
+ <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇锋壂鎻忔潯褰㈢爜" style="border-radius: 50px;">
+ </td>
+ </tr>
+
+ <tr>
+ <th>娲惧伐鍗曟嵁鍙�</th>
+ <td class="t1_input">
+ <input type="text" name="HSendWorkBillNo" class="layui-input" id="HSendWorkBillNo" placeholder="娲惧伐鍗曟嵁鍙�" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>姹囨姤鍗曞彿</th>
+ <td class="t1_input">
+ <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="璇疯緭鍏ユ眹鎶ュ崟鍙�" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" class="layui-input" id="HInterID">
+ </td>
+ </tr>
+ <tr>
+ <th>宸ュ簭鍙�</th>
+ <td class="t1_input">
+ <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇疯緭鍏ュ伐搴忓彿" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+
+ <tr>
+ <th>宸ュ簭浠ｇ爜</th>
+ <td class="t1_input">
+ <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="璇疯緭鍏ュ伐搴忎唬鐮�" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ <tr>
+ <th>宸ュ簭鍚嶇О</th>
+ <td class="t1_input">
+ <input type="text" name="HProc" class="layui-input" id="HProc" placeholder="璇疯緭鍏ュ伐搴忓悕绉�" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>瑙勬牸鍨嬪彿</th>
+ <td class="t1_input">
+ <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鍒涘缓浜�</th>
+ <td class="t1_input">
+ <input type="text" class="layui-input" id="HEmp" name="HEmp" placeholder="璇疯緭鍏ュ垱寤轰汉" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ <tr>
+ <th>瀹炰綔鏁伴噺</th>
+ <td class="t1_input">
+ <input type="text" name="HQty" class="layui-input" id="HQty" placeholder="璇疯緭鍏ュ疄浣滄暟閲�">
+ </td>
+ </tr>
+ <tr style="display:none;">
+ <th>鐢熶骇璧勬簮</th>
+ <td class="bz_td">
+ <input type="text" name="HSource" class="layui-input" id="HSource" placeholder="閫夋嫨鐢熶骇璧勬簮" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionResources-BT">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇鐝粍</th>
+ <td class="bz_td">
+ <input type="text" name="HGroup" class="layui-input" id="HGroup" placeholder="閫夋嫨鐢熶骇鐝粍" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HGroupID" id="HGroupID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionTeam-BT">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇璁㈠崟</th>
+ <td class="t1_input">
+ <input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="璇疯緭鍏ョ敓浜ц鍗�" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+
+ <tr>
+ <th>鏃ユ湡</th>
+ <td class="t1_input">
+ <input type="date" name="HReportTime" class="layui-input" id="HReportTime" placeholder="璇烽�夋嫨鏃ユ湡">
+ </td>
+ </tr>
+
+ <tr>
+ <th>浜у搧浠ｇ爜</th>
+ <td class="t1_input">
+ <input type="text" name="HMaterID" class="layui-input" id="HMaterID" placeholder="璇疯緭鍏ヤ骇鍝佷唬鐮�" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>浜у搧鍚嶇О</th>
+ <td class="t1_input">
+ <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+
+ <tr>
+ <th>鐢熶骇璁㈠崟鏁伴噺</th>
+ <td class="t1_input">
+ <input type="text" name="HICMOQty" class="layui-input" id="HICMOQty" placeholder="璇疯緭鍏ョ敓浜ц鍗曟暟閲�" style="background-color:#efefef4d;" readonly>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="HICMOInterID" class="layui-input" id="HICMOInterID"><!--浠诲姟鍗曞彿ID鍙杊icmointerid-->
+ <input type="hidden" name="HDeptID" class="layui-input" id="HDeptID"><!--鐢熶骇杞﹂棿id-->
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script>
+
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ var params = getUrlVars();
+ var BillStatusjson = params[params[0]];
+ var InterID = params[params[1]];
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , element = layui.element
+ , layer = layui.layer
+ , table = layui.table
+ , laydate = layui.laydate
+ , form = layui.form;
+
+ //鑾峰彇褰撳墠鏃堕棿澶勭悊
+ $("#HReportTime").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEmp").val(sessionStorage["HUserName"]);//鍒涘缓浜�
+ $("#HEmpID").val(sessionStorage["HEmpID"]);
+ $("#HProc").val(sessionStorage["HProc"]);//宸ュ簭
+ $("#HProcName").val(sessionStorage["HProcName"]);//宸ュ簭浠ｇ爜
+ $("#HProcID").val(sessionStorage["HProcID"]);//宸ュ簭ID
+ $("#HSource").val(sessionStorage["HSource"]);//鐢熶骇璧勬簮
+ $("#HSourceID").val(sessionStorage["HSourceID"]);
+ $("#HGroup").val(sessionStorage["HGroup"]);//鐢熶骇鐝粍
+ $("#HGroupID").val(sessionStorage["HGroupID"]);
+ $("#HCenter").val(sessionStorage["HWorkCenter"]);//宸ヤ綔涓績
+ $("#HCenterID").val(sessionStorage["HWorkCenterID"]);
+ $("#HProcNo").val(sessionStorage["HProcNo"]);//宸ュ簭鍙�
+
+
+
+ //椤甸潰鍒濆鍖栬祴鍊�
+ //鑾峰彇鍗曟嵁鍙�
+ $.ajax({
+ url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
+ type: "GET",
+ data: { "billType": '3714' },
+ success: function (d) {
+ $("#HBillNo").val(d.data.HBillNo);//姹囨姤鍗曞彿
+ $("#HInterID").val(d.data.HInterID);//杩涚珯鍗曞彿ID
+ }, error: function () {
+ layer.alert("鑾峰彇鍗曟嵁鍙峰け璐�!", { icon: 5 });
+ }
+ });
+
+ $("#HBarCode").focus();
+ $("#HBarCode").css("box-shadow", "0 0 0 1px #00ff00");
+
+
+ //鎵潯褰㈢爜鏂规硶
+ $('#HBarCode').on('keydown', function (event) { //鎵潯褰㈢爜
+ var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+ if (event.keyCode == 13) {
+ //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ if (HBarCode == "") {
+ layer.alert("鏉″舰鐮佷负绌猴紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ //鏌ヨ娲惧伐鍗曟嵁鏄惁瀛樺湪
+ $.ajax({
+ url: GetWEBURL() + "Sc_ProcessMangement/getHbarCodeDetail",
+ type: "GET",
+ data: {
+ "sBillBarCode": HBarCode
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sc_ProcessSendWorkList[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HSendWorkBillNo": $("#HBarCode").val()
+ , "HEmp": $("#HEmp").val()
+ //, "HProcID": data.HProcID
+ //, "HProc": data.宸ュ簭
+ //, "HCenter": data.宸ヤ綔涓績
+ //, "HCenterID": data.宸ヤ綔涓績浠ｇ爜
+ , "HICMOInterID": data.HICMOInterID
+ , "HICMOBillNo": data.鐢熶骇浠诲姟鍗曞彿
+ , "HDeptID": data.HDeptID
+ , "HQty": data.鏁伴噺
+ , "HMaterID": data.HMaterID
+ , "HMaterName": data.鐗╂枡鍚嶇О
+ , "HMaterModel": data.瑙勬牸鍨嬪彿
+ , "HICMOQty": data.鏁伴噺
+ //, "HOrderProcNO":data.璁㈠崟璺熻釜鍙�
+ });
+ //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ //$("#HBarCode").css("background-color", "#efefef4d");
+ $("#HBarCode").css("box-shadow", "none");
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鎵潯褰㈢爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ });
+
+ //姹囨姤鍗曞彿鍥炶溅鏂规硶
+ $('#HProcNo').on('keydown', function (event) { //鎵潯褰㈢爜
+ var HProcNo = $('#HProcNo').val();
+ var HBarCode = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (HProcNo == "" || HBarCode == "") {
+ layer.alert("宸ュ簭鍙锋垨姹囨姤鍗曞彿涓虹┖锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ $.ajax({
+ url: GetWEBURL() + "Sc_ProcessMangement/getProcDetail",
+ type: "GET",
+ data: {
+ "sBillNo": HBarCode
+ , "sProcNo": HProcNo
+ },
+ success: function (result) {
+ var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ //"HProcID": data.HProcID
+ //, "HProc": data.宸ュ簭
+ //, "HCenter": data.宸ヤ綔涓績
+ //, "HCenterID": data.宸ヤ綔涓績浠ｇ爜
+ "HICMOInterID": data.hicmointerid
+ , "HEmp": $("#HEmp").val()
+ , "HICMOBillNo": data.鐢熶骇浠诲姟鍗曞彿
+ , "HDeptID": data.HDeptID
+ , "HQty": data.鏁伴噺
+ , "HMaterID": data.HMaterID
+ , "HMaterName": data.鐗╂枡鍚嶇О
+ , "HMaterModel": data.瑙勬牸鍨嬪彿
+ , "HICMOQty": data.鏁伴噺
+ });
+ $("#HProcNo").css("box-shadow", "none");
+ checkPopup();
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("宸ュ簭鍙锋柟娉曞彂鐢熼敊璇�!", { icon: 5 });
+ }
+ });
+ }
+ });
+
+ //杩涚珯鏁伴噺鍥炶溅鏂规硶
+ //$('#Entrants_number').on('keydown', function (event) {
+ // if (event.keyCode == 13) {
+ // $("#Entrants_number").attr("readonly", "readonly");//杩涚珯鏁伴噺鍙
+ // $("#Entrants_number").css("background-color", "#efefef4d");
+ // $("#Entrants_number").css("box-shadow", "none");
+ // if ($("#Receiver").val()) {
+ // $("#Receiver").css("box-shadow", "none");
+ // } else {
+ // $("#Receiver").css("box-shadow", "1px 1px 1px 2px #00ff00");
+ // }
+ // }
+ //});
+
+ //閫夋嫨鐢熶骇鐝粍寮圭獥
+ form.on('submit(ProductionTeam-BT)', function () {//閫夋嫨鐢熶骇鐝粍
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇鐝粍'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+
+ //閫夋嫨鐢熶骇璧勬簮寮圭獥
+ form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇璧勬簮'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+
+ //閫夋嫨宸ヤ綔涓績寮圭獥
+ form.on('submit(HWorkingProcedure-BT)', function () {//閫夋嫨宸ヤ綔涓績
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '宸ヤ綔涓績'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+
+ //淇濆瓨鎸夐挳
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ //debugger;
+ var sMainStr = JSON.stringify(data.field);
+ console.log(sMainStr);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "SaveProcessReport", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: {"msg":sMainStr},
+ dataType: "json",
+ success: function (result) {
+ console.log(result);
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ layer.msg(data.Message, { icon: 1 });
+ //$("#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 {
+ layer.alert(result.msg, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ layui.form.render();
+ },
+ error: function (err) {
+ layer.alert("鎺ュ彛璇锋眰澶辫触:" + err, { icon: 5 });
+ }
+ });
+ });
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Close)', function (data) {//閫�鍑�
+ layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.location.href = "../../../views/index.html";
+ });
+ });
+
+ //鏂板鎸夐挳
+ form.on('submit(HAddBT)', function (data) {//閫�鍑�
+ layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+ window.location.reload();
+ });
+ });
+
+
+
+
+
+
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+ //鍘熺敓js鍒濆鍖�
+ $(function () {
+
+ });
+
+ //鏍￠獙鏄惁閫夋嫨寮圭獥浜嬩欢
+ function checkPopup() {
+ //if (!$("#HSource").val()) {//鐢熶骇璧勬簮
+ // $("#HSource").css("box-shadow", "0 0 1px 2px #00ff00");
+ //}
+ //else
+ if (!$("#HGroup").val()) {
+ $("#HGroup").css("box-shadow", "0 0 1px 2px #00ff00");
+ }
+ else if (!$("#HCenter").val()) {
+ $("#HCenter").css("box-shadow", "0 0 1px 2px #00ff00");
+ }
+ }
+
+ //杩斿洖鐢熶骇鐝粍
+ function GetProductionTeamValue(obj) { //杩斿洖鐢熶骇鐝粍
+ if (obj.length == 0) {
+ layer.msg("璇峰厛閫夋嫨鐝粍", { index: 0 });
+ } else {
+ $("#HGroup").val(obj[0].鐝粍);
+ $("#HGroupID").val(obj[0].HItemID);
+ $("#HGroup").css("box-shadow", "none");
+ checkPopup();
+ layer.closeAll();
+ }
+ }
+
+ //杩斿洖鐢熶骇璧勬簮
+ function GetProductionResourcesValue(obj) { //杩斿洖鐢熶骇璧勬簮
+ if ($("#HSource").val()) {
+ $("#HSource").css("box-shadow", "none");
+ }
+ $("#HSource").val(obj[0].鐢熶骇璧勬簮);
+ $("#HSourceID").val(obj[0].HItemID);
+ $("#HSource").css("box-shadow", "none");
+ checkPopup();
+ }
+
+ //杩斿洖宸ヤ綔涓績
+ function GetWorkCenterValue(obj) { //杩斿洖宸ヤ綔涓績
+ if (obj.length == 0) {
+ layer.msg("璇峰厛閫夋嫨宸ヤ綔涓績", { index: 0 });
+ } else {
+ $("#HCenter").val(obj[0].宸ヤ綔涓績);
+ $("#HCenterID").val(obj[0].HItemID);
+ $("#HCenter").css("box-shadow", "none");
+ checkPopup();
+ layer.closeAll();
+ }
+ }
+
+
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_ProcessSendWorkList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_ProcessSendWorkList.html"
index 9b36ed6..a51f601 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_ProcessSendWorkList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_ProcessSendWorkList.html"
@@ -109,64 +109,68 @@
,cellMinWidth: 90
, cols: [[
//{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
- { type: 'checkbox' }
- ,{ field: 'HDate', title: '鏃ユ湡', sort: true, width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', sort: true, width: 170 }
- , { field: 'HBillStatus ', title: '鍗曟嵁鐘舵��', width: 105 }
- , { field: 'HICMOBillNo', title: '浠诲姟鍗曞彿' }
- , { field: 'HCheckItemNowID', title: '褰撳墠瀹℃牳椤圭洰' }
- , { field: 'HCheckItemNextID', title: '寰呭鏍搁」鐩�' }
- , { field: 'HCheckFlowID', title: '瀹℃壒娴�' }
- , { field: 'HICMOInterID', title: '浠诲姟鍗旾D', width: 115 }
- , { field: 'HProcPlanBillNo', title: '宸ュ簭璁″垝鍗曞彿', width: 115 }
- , { field: 'HPlanBeginDate', title: '宸ュ簭璁″垝寮�宸ユ棩鏈�' }
- , { field: 'HPlanEndDate', title: '宸ュ簭璁″垝瀹屽伐鏃ユ湡', width: 160 }
- , { field: 'HBatchNo', title: '鎵瑰彿', width: 160 }
- , { field: 'HSeOrderInterID ', title: '閿�鍞鍗曚富ID', width: 215 }
+ { type: 'checkbox' }
+ ,{ field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
+ ,{ field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+ , { field: 'HDeptID ', title: 'HDeptID', width: 105 }
+ , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜' }
+ , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
+ , { field: 'HMaterID', title: 'HMaterID' }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 115 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 115 }
+ , { field: 'HUnitID', title: 'HUnitID' }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 160 }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 160 }
+ , { field: 'HprocID ', title: 'HprocID', width: 215 }
////, { field: 'hunitid', title: 'hunitid' }
- , { field: 'HSeOrderEntryID ', title: '閿�鍞瓙ID ', width: 115 }
- , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿' }
+ , { field: '宸ュ簭浠ｇ爜 ', title: '宸ュ簭浠ｇ爜 ', width: 115 }
+ , { field: '宸ュ簭', title: '宸ュ簭' }
////, { field: 'hempid', title: 'hempid' }
- , { field: 'HProcID ', title: '宸ュ簭ID', width: 100 }
- , { field: 'HProcNumber', title: '宸ュ簭浠ｇ爜' }
- , { field: 'HDeptID', title: '閮ㄩ棬ID' }
- , { field: 'HDeptNumber', title: '閮ㄩ棬浠ｇ爜' }
- , { field: 'HGroupID', title: '鐝粍ID' }
+ , { field: 'HGroupID ', title: 'HGroupID', width: 100 }
+ , { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜' }
+ , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О' }
+ , { field: 'HSourceID', title: 'HSourceID' }
+ , { field: '璧勬簮浠ｇ爜', title: '璧勬簮浠ｇ爜' }
////, { field: 'HCenterID', title: 'HCenterID' }
- , { field: 'HGroupNumber', title: '鐝粍浠ｇ爜' }
- , { field: 'HMaterID ', title: '浜у搧ID' }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
+ , { field: 'HWorkerID ', title: 'HWorkerID' }
////, { field: 'hbomid', title: 'hbomid' }
- , { field: 'HMaterNumber', title: '浜у搧浠ｇ爜' }
+ , { field: '鑱屽憳浠ｇ爜', title: '鑱屽憳浠ｇ爜' }
////, { field: 'HRoutingInterID', title: 'HRoutingInterID' }
- , { field: 'HUnitID ', title: '鍗曚綅ID' }
- , { field: 'HUnitNumber', title: '鍗曚綅浠ｇ爜' }
- , { field: 'HRoutingInterID', title: '宸ュ簭璺嚎ID' }
- , { field: 'HPlanQty', title: '宸ュ簭璁″垝鐢熶骇鏁伴噺' }
- , { field: 'HExplanation', title: '鎽樿' }
- , { field: 'HInnerBillNo', title: '鍐呴儴鍗曟嵁鍙�' }
- , { field: 'HBacker', title: '閫�鍥炰汉' }
- , { field: 'HBackDate', title: '閫�鍥炴棩鏈� ' }
- , { field: 'HChecker', title: '瀹℃牳浜�' }
- , { field: 'HCheckDate', title: '瀹℃牳鏃ユ湡' }
- , { field: 'HMaker', title: '鍒跺崟浜�' }
+ , { field: '鑱屽憳 ', title: '鑱屽憳' }
+ , { field: 'hsubid', title: 'hsubid', hide: true }
+ , { field: '鏁伴噺', title: '鏁伴噺' }
+ , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
+ , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
+ , { field: '璁″垝宸ユ椂', title: '璁″垝宸ユ椂' }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+ , { field: 'HICMOInterID', title: 'HICMOInterID ' }
+ , { field: '鐢熶骇浠诲姟鍗曞彿', title: '鐢熶骇浠诲姟鍗曞彿' }
+ , { field: 'HSeOrderInterID', title: 'HSeOrderInterID' }
+ , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿' }
////, { field: 'hsubid', title: 'hsubid' }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡' }
- , { field: 'HUpDater', title: '淇敼浜�' }
- , { field: 'HUpDateDate', title: '淇敼鏃ユ湡' }
- , { field: 'HCloseMan', title: '鍏抽棴浜�' }
- , { field: 'HCloseDate', title: '鍏抽棴鏃ユ湡' }
- , { field: 'HCloseType', title: '鍏抽棴绫诲瀷 ' }
- , { field: 'HDeleteMan', title: '浣滃簾浜�' }
- , { field: 'HDeleteDate', title: '浣滃簾鏃ユ湡' }
- //, { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
- //, { field: 'HDeleteMan', title: '鍏抽棴浜�' }
- //, { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
- //, { field: '浣滃簾浜�', title: '浣滃簾浜�' }
- //, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
- //, { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
- //, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
- //, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
- //, { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+ , { field: '淇敼浜�', title: '淇敼浜� ' }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+ , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�' }
+ , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷' }
+ , { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
+ , { field: 'HBillType', title: 'HBillType' }
+ , { field: 'HQtyDecimal', title: 'HQtyDecimal' }
+ , { field: 'HPriceDecimal', title: 'HPriceDecimal' }
+
]]
};
--
Gitblit v1.9.1