From 770a4150fa45b8c6fdeacd39413505a257e58388 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 09 一月 2023 09:40:37 +0800
Subject: [PATCH] 末道工序出站列表 入库 首道工序出站 列表 维护 委外工序发出单 委外工序接收单 工序进站接收单 维护
---
WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html | 33 +++
WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBill.html | 68 +++++-
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 5
WebTM/views/生产工序管理/工序汇报单/Sc_ProcessReportOverList.html | 27 ++
WebTM/views/index.html | 3
WebTM/views/生产工序管理/工序汇报单/Sc_ProcessReportList_Last.html | 369 +++++++++++++++++++++++++++++++++++++++++
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html | 2
WebTM/WebTM.csproj | 1
8 files changed, 483 insertions(+), 25 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index c228ef4..3f1aa9a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -895,6 +895,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱KF_BarCodeStatusChangeBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱KF_BarCodeStatusChangeBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sb_Add_MouldRepairWorkBillList.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞Sc_ProcessReportList_Last.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍏ュ簱妫�楠岄獙鏀跺崟\Sb_EquipStockInCheckBillEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍏ュ簱妫�楠岄獙鏀跺崟\Sb_EquipStockInCheckBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldConkBookBillList.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 88f4310..037bc23 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -474,7 +474,8 @@
<dd><a lay-href="鐢熶骇宸ュ簭绠＄悊/濮斿宸ュ簭娲惧伐鍗�/WW_EntrustProcSendWorkBillList.html">濮斿宸ュ簭娲惧伐鍗曠淮鎶�</a></dd>
<dd><a lay-href="鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html">宸ュ簭姹囨姤鍗�</a></dd>
<dd><a lay-href="鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">宸ュ簭姹囨姤鍗曠淮鎶�</a></dd>
- <dd><a lay-href="鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportOverList.html">宸ュ簭姹囨姤鍏ュ簱鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportOverList.html">棣栭亾宸ュ簭姹囨姤鍏ュ簱鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList_Last.html">鏈亾宸ュ簭姹囨姤鍏ュ簱鍒楄〃</a></dd>
<dd><a lay-href="鐢熶骇宸ュ簭绠＄悊/濮斿宸ュ簭璁″垝杞嚭鍗�/WW_Add_EntrustProcessSendOutBill.html">濮斿宸ュ簭璁″垝杞嚭鍗�</a></dd>
<dd><a lay-href="鐢熶骇宸ュ簭绠＄悊/濮斿宸ュ簭璁″垝杞嚭鍗�/WW_EntrustProcessSendOutBillList.html">濮斿宸ュ簭璁″垝杞嚭鍗曠淮鎶�</a></dd>
<dd><a lay-href="鐢熶骇宸ュ簭绠＄悊/濮斿宸ュ簭璁″垝姹囨姤鍗�/WW_Add_EntrustProcessReport.html">濮斿宸ュ簭璁″垝姹囨姤鍗�</a></dd>
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_ProcessReportList_Last.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_ProcessReportList_Last.html"
new file mode 100644
index 0000000..803943f
--- /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_ProcessReportList_Last.html"
@@ -0,0 +1,369 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鏈亾宸ュ簭姹囨姤鍏ュ簱鍒楄〃</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/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗″彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚屾鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 125px;width:55%;">
+ <select name="HRelationQty" lay-filter="aihao" id="HRelationQty">
+ <option value="1" selected="selected">鍏ㄩ儴</option>
+ <option value="2">宸插悓姝�</option>
+ <option value="3">鏈悓姝�</option>
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RK" id="btn-RK"><i class="layui-icon layui-icon-ok-circle"></i>鍏ュ簱</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InStorage" id="btn-InStorage"><i class="layui-icon layui-icon-ok-circle"></i>姹囨姤</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/html" id="toolBar">
+ <a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鍏敤鍙橀噺
+ var sWhere = "";
+ var option = [];
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //鐢熶骇璁㈠崟鍥炶溅鏂规硶
+ $('#HWorkBillNo').on('keydown', function (event) {
+ var HWorkBillNo = $('#HWorkBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HWorkBillNo) {
+ layer.msg("浠诲姟鍗曞彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+ //鍗曟嵁鍙峰洖杞︽柟娉�
+ $('#HBillNo').on('keydown', function (event) {
+ var HBillNo = $('#HBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HBillNo) {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌猴紒")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+ //宸ュ簭娴佽浆鍗″洖杞︽柟娉�
+ $('#HProcExchBillNo').on('keydown', function (event) {
+ var HProcExchBillNo = $('#HProcExchBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNo) {
+ layer.msg("宸ュ簭娴佽浆鍗″彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 125 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 125 }
+ , { field: '鍚屾鐘舵��', title: '鍚屾鐘舵��'}
+ , { field: 'HProcID', title: 'HProcID', hide: true }
+ , { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 125 }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭' }
+ , { field: 'HMaterID', title: 'HMaterID', hide: true }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 125 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ , {
+ field: '鍑虹珯鏃堕棿', title: '鍑虹珯鏃堕棿', width: 160, templet: function (d) {
+ if (d.鍑虹珯鏃堕棿 == null) {
+ return "";
+ }
+ return util.toDateString(d.鍑虹珯鏃堕棿, "yyyy-MM-dd HH:mm:ss");
+ }
+ }
+ , { field: 'HEmpID', title: 'HEmpID', hide: true }
+ , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�', width: 190 }
+ , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�' }
+ , { field: 'HSourceID', title: 'HSourceID', hide: true }
+ , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 125 }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
+ , { field: 'HGroupID', title: 'HGroupID', hide: true }
+ , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 125 }
+ , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
+ , { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺' }
+ , { field: '鎺ユ敹鏁伴噺', title: '鍑虹珯鏁伴噺' }
+ ]]
+ , text: {
+ none: '鏃犳暟鎹紒'
+ }
+ };
+ set_ClearQuery();
+ get_FastQuery();
+ }
+
+
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鍏ュ簱
+ case 'btn-RK': BtnRK();
+ break;
+ //姹囨姤
+ case 'btn-InStorage': GetInStorage();
+ break;
+ //閫�鍑�
+ case 'btn-Exit': get_Exit();
+ break;
+ };
+ });
+
+ //#endregion
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HWorkBillNo").val("");
+ $("#HBillNo").val("");
+ $("#HProcExchBillNo").val("");
+ $("#HRelationQty").val("1")
+ form.render("select");
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HWorkBillNo = $("#HWorkBillNo").val();
+ var HBillNo = $("#HBillNo").val();
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var HRelationQty = $("#HRelationQty").val();
+ switch (HRelationQty) {
+ case "1":
+ sWhere += "";
+ break;
+ case "2":
+ sWhere += " and 鍚屾鐘舵�� = '宸插悓姝�'";
+ break;
+ case "3":
+ sWhere += " and 鍚屾鐘舵�� = ''";
+ break;
+ }
+ if (HWorkBillNo) {
+ sWhere += " and 浠诲姟鍗� like '%" + HWorkBillNo + "%'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HProcExchBillNo) {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProcessMangement/Sc_ProcessReportList_Last',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 0) {
+ option.data = [];
+ layer.alert(data1.Message, { icon: 5 });
+ } else {
+ option.data = data1.data;
+ }
+ table.render(option);
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鍏ュ簱
+ function BtnRK() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var BillNo = data[0].鍗曟嵁鍙�.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ProcessMangement/SaveProcdutInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "BillNo": BillNo },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叆搴擄紒');
+ }
+ }
+
+ //姹囨姤
+ function GetInStorage() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ var BillNo = data[0].鍗曟嵁鍙�.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ProcessMangement/SaveICMOReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "InterID": InterID, "user": sessionStorage["HUserName"], "BillNo": BillNo, "OrganizationID": sessionStorage["OrganizationID"] },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹眹鎶ワ紒');
+ }
+ }
+
+ //閫�鍑�
+ function get_Exit() {
+ Pub_Close(2);
+ }
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+</body>
+</html>
\ No newline at end of file
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_ProcessReportOverList.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_ProcessReportOverList.html"
index e3b8070..b8c85bc 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\261\207\346\212\245\345\215\225/Sc_ProcessReportOverList.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_ProcessReportOverList.html"
@@ -32,6 +32,16 @@
<input type="date" class="layui-input" id="HDate" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚屾鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 125px;width:55%;">
+ <select name="HRelationQty" lay-filter="aihao" id="HRelationQty">
+ <option value="1" selected="selected">鍏ㄩ儴</option>
+ <option value="2">宸插悓姝�</option>
+ <option value="3">鏈悓姝�</option>
+ </select>
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -161,6 +171,7 @@
, { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 125 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
, { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 125 }
+ , { field: '鍚屾鐘舵��', title: '鍚屾鐘舵��' }
, { field: 'HProcID', title: 'HProcID', hide: true }
, { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 125 }
, { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭' }
@@ -214,10 +225,12 @@
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HWorkBillNo").val();
+ $("#HWorkBillNo").val("");
$("#HBillNo").val("");
$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HProcExchBillNo").val("");
+ $("#HRelationQty").val("1")
+ form.render("select");
}
//蹇�熻繃婊�
@@ -226,6 +239,18 @@
var HWorkBillNo = $("#HWorkBillNo").val();
var HBillNo = $("#HBillNo").val();
var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var HRelationQty = $("#HRelationQty").val();
+ switch (HRelationQty) {
+ case "1":
+ sWhere += "";
+ break;
+ case "2":
+ sWhere += " and 鍚屾鐘舵�� = '宸插悓姝�'";
+ break;
+ case "3":
+ sWhere += " and 鍚屾鐘舵�� = ''";
+ break;
+ }
if (HDate) {
sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) = '" + HDate + "'";
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
index a50c002..78b0369 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
@@ -85,7 +85,7 @@
<label class="layui-form-label">鐢熶骇缁勭粐</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
+ <input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0">
</div>
</div>
</div>
@@ -170,7 +170,7 @@
<label class="layui-form-label">渚涘簲鍟�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HSupName" id="HSupName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HSupID" id="HSupID">
+ <input type="hidden" name="HSupID" id="HSupID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSupID-BT" id="HSupID-BT" style="width: 40px; padding: 0 10px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -179,7 +179,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label"><span style="color:red;">*</span>鍙戝嚭浜�</label>
+ <label class="layui-form-label"><span style="color:red;">*</span>鎿嶄綔鍛�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
<button type="button" class="layui-btn" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="width: 40px; padding: 0 10px;">
@@ -191,7 +191,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鍙戝嚭鏁伴噺</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HQty" id="HQty">
+ <input type="text" class="layui-input" name="HQty" id="HQty" value="0">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -253,13 +253,13 @@
<input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
+ <!--<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鎿嶄綔鍛�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HEmp" id="HEmp" style="background-color:#efefef4d;" readonly>
<input type="hidden" value="0" name="HEmpID" id="HEmpID">
</div>
- </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -546,8 +546,8 @@
})
}
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HEmpID").val(sessionStorage["Czybm"]);
- $("#HEmp").val(sessionStorage["HUserName"]);
+ //$("#HEmpID").val(sessionStorage["Czybm"]);
+ //$("#HEmp").val(sessionStorage["HUserName"]);
$("#HMaker").val(sessionStorage["HUserName"]);
//娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
var HProcExchBillNoFlag = false;
@@ -582,7 +582,7 @@
"HMaterName": data.浜у搧,
"HMaterNumber": data.浜у搧浠ｇ爜,
"HMaterModel": data.瑙勬牸鍨嬪彿,
- "HQty": 0,
+ "HQty": $("#HQty").val() == 0 ? 0 : $("#HQty").val(),
"HPieceQty": data.鐢熶骇鏁伴噺,
"HPlanQty": data.鐢熶骇鏁伴噺,
"lngBillSubKey": data.hsubid,
@@ -595,8 +595,8 @@
//"HProcID": data.HProcID,
//"HProcNo": data.宸ュ簭鍙�,
//"HProcName": data.宸ュ簭,
- "HSupID": data.HSupID,
- "HSup": data.渚涘簲鍟�,
+ "HSupID": $("#HSupID").val() == 0 ? data.HSupID:$("#HSupID").val(),
+ "HSupName": $("#HSupID").val() == 0 ? data.渚涘簲鍟� : $("#HSupName").val(),
"HSourceID": data.HSourceID,
"HSource": data.鐢熶骇璧勬簮,
"HGroupID": data.HGroupID,
@@ -604,7 +604,8 @@
"HDeptID": sessionStorage["HDeptID"],
"HDept": sessionStorage["HDept"],
"HProcExchHinteID": data.hmainid,
- "HPRDOrg": data.缁勭粐
+ "HPRDOrg": data.缁勭粐,
+ "HPRDOrgID": data.缁勭粐
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
@@ -790,7 +791,6 @@
//閫夋嫨渚涘簲鍟�
form.on('submit(HSupID-BT)', function () {
- var HStockInOrgID = sessionStorage["OrganizationID"];
layer.open({
type: 2
, area: ['80%', '80%']
@@ -798,15 +798,49 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html?HOrgID=' + HStockInOrgID + '', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+ $("#HSupID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
})
});
+
+ //閫夋嫨鎿嶄綔鍛�
+ form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨浜у搧
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鎿嶄綔鍛樺垪琛�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ ,btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ //layer.msg('绂佹閫夋嫨');
+ });
//閫夋嫨浜у搧
form.on('submit(HMateriaID-BT)', function () {//閫夋嫨浜у搧
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
index 713e8d9..b5ff7bc 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
@@ -639,8 +639,8 @@
//鍒濆鍩烘湰淇℃伅璧嬪��
$("#HStationOutTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
- $("#HEmpID").val(sessionStorage["Czybm"]);
- $("#HEmp").val(sessionStorage["HUserName"]);
+ //$("#HEmpID").val(sessionStorage["Czybm"]);
+ //$("#HEmp").val(sessionStorage["HUserName"]);
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
//娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
@@ -695,7 +695,8 @@
"HDeptID": sessionStorage["HDeptID"],
"HDept": sessionStorage["HDept"],
"HProcExchHinteID": data.hmainid,
- "HPRDOrg": data.缁勭粐
+ "HPRDOrg": data.缁勭粐,
+ "HPRDOrgID": data.缁勭粐
});
if ($("#eventType").val() === "Add") {
form.val("formData", {
@@ -988,6 +989,32 @@
})
});
+ //閫夋嫨鎿嶄綔鍛�
+ form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨浜у搧
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鎿嶄綔鍛樺垪琛�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ //layer.msg('绂佹閫夋嫨');
+ });
+
//閫夋嫨褰撳墠宸ュ簭寮圭獥
form.on('submit(CurrPro-BT)', function () {//閫夋嫨褰撳墠宸ュ簭
layer.open({
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index b01e99e..0a2e3b5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -84,7 +84,7 @@
<label class="layui-form-label">鐢熶骇缁勭粐</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
+ <input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0">
</div>
</div>
</div>
@@ -856,7 +856,8 @@
"HICMOQty": data.浠诲姟鍗曟暟閲�,
"lngBillKey": data.hmainid,
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
- "HPRDOrg": data.缁勭粐
+ "HPRDOrg": data.缁勭粐,
+ "HPRDOrgID": data.缁勭粐
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index 9777077..5d0c73c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -483,7 +483,7 @@
}
if (宸ュ簭娴佽浆鍗″彿) {
- sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + 宸ュ簭娴佽浆鍗″彿 + "%'";
+ sWhere += " and 娴佽浆鍗″彿 like '%" + 宸ュ簭娴佽浆鍗″彿 + "%'";
}
if (HBeginDate) {
sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) >= '" + HBeginDate + "'";
--
Gitblit v1.9.1