From a0f70a49ad4d396016f3305ea6257db91c00fc75 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 29 一月 2026 18:43:16 +0800
Subject: [PATCH] 模具页面跳转
---
WebTM/views/PublicPage/MaterialInfo.html | 20 ++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html | 14 +
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html | 14 +
WebTM/views/成本管理/费用单引入/CB_ItemMoneyBillImport.html | 373 +++++++++++++++++++++++++++++++++++++++++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html | 60 ++++--
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillEdit.html | 14 +
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/WebTM.csproj | 1
8 files changed, 461 insertions(+), 37 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 1089108..45ff3a4 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -645,6 +645,7 @@
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_SellOutCompareToProductReport.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeMaterEntryReport.html" />
+ <Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBillImport.html" />
<Content Include="views\鏉＄爜鏄庣粏\Kf_MateOutBillList_CodeDetail.html" />
<Content Include="views\妗堜緥浠ｇ爜\鍗庤繙\HY_HistogramReport_ForPCSCheckNote.html" />
<Content Include="views\妗堜緥浠ｇ爜\鍗庤繙\HY_HistogramReport.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 773eb71..0f34bb0 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/* var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
diff --git a/WebTM/views/PublicPage/MaterialInfo.html b/WebTM/views/PublicPage/MaterialInfo.html
index 8feafc5..4fc18a9 100644
--- a/WebTM/views/PublicPage/MaterialInfo.html
+++ b/WebTM/views/PublicPage/MaterialInfo.html
@@ -47,6 +47,18 @@
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWHNumber" id="HWHNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWHName" id="HWHName">
+ </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>
@@ -169,12 +181,20 @@
form.on('submit(btnSearch)', function (data) {
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
+ var HWHNumber = $("#HWHNumber").val();
+ var HWHName = $("#HWHName").val()
if (HNumber) {
sWhere += " and 鐗╂枡浠ｇ爜 = '" + HNumber + "'";
}
if (HName) {
sWhere += " and 鐗╂枡鍚嶇О = '" + HName + "'";
}
+ if (HWHNumber) {
+ sWhere += " and 浠撳簱浠ｇ爜 = '" + HWHNumber + "'";
+ }
+ if (HWHName) {
+ sWhere += " and 浠撳簱 = '" + HWHName + "'";
+ }
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/MaterialList',
type: "GET",
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_ItemMoneyBillImport.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_ItemMoneyBillImport.html"
new file mode 100644
index 0000000..756ec8e
--- /dev/null
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_ItemMoneyBillImport.html"
@@ -0,0 +1,373 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; 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/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+
+ <style type="text/css">
+ .loader {
+ border: 8px solid #f3f3f3; /* Light grey */
+ border-top: 8px solid #3498db; /* Blue */
+ border-radius: 50%;
+ width: 50px;
+ height: 50px;
+ animation: spin 2s linear infinite;
+ }
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</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">
+ <h1 style="text-align: center; padding: 30px 0;"><b>璐圭敤寮曞叆</b></h1>
+ <div class="layui-colla-item" style="padding-top:20px;">
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID" disabled>-->
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ <!--</select>
+ </div>
+ </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">寮曞叆绫诲瀷</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+
+ <select name="HType" id="HType" lay-verify="HType">
+ <option value="1" selected="selected">涓绘潗/杈呮潗鎴愭湰寮曞叆</option>
+ <option value="2">璐圭敤鎴愭湰寮曞叆</option>
+
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">骞�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+
+ <select name="HYear" id="HYear" lay-verify="HYear">
+ <option value="2023">2023骞�</option>
+ <option value="2024">2024骞�</option>
+ <option value="2025">2025骞�</option>
+ <option value="2026" selected="selected">2026骞�</option>
+ <option value="2027">2027骞�</option>
+ <option value="2028">2028骞�</option>
+ <option value="2029">2029骞�</option>
+ <option value="2030">2030骞�</option>
+ <option value="2031">2031骞�</option>
+ <option value="2032">2032骞�</option>
+ <option value="2033">2033骞�</option>
+ <option value="2034">2034骞�</option>
+ <option value="2035">2035骞�</option>
+ <option value="2036">2036骞�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HMonth" id="HMonth" lay-verify="HMonth">
+ <option value="1">1鏈�</option>
+ <option value="2">2鏈�</option>
+ <option value="3">3鏈�</option>
+ <option value="4">4鏈�</option>
+ <option value="5">5鏈�</option>
+ <option value="6">6鏈�</option>
+ <option value="7">7鏈�</option>
+ <option value="8">8鏈�</option>
+ <option value="9">9鏈�</option>
+ <option value="10">10鏈�</option>
+ <option value="11">11鏈�</option>
+ <option value="12">12鏈�</option>
+ </select>
+
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Import" id="btn_Import" style="padding:0 30px;margin-left:50px;">寮�濮嬪紩鍏�</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel" style="padding:0 20px">閫�鍑�</button>
+ </div>
+ <div class="layui-colla-item" style="height:600px;margin-top:20px;">
+ <font size="5" color="blue" id="HRemark"></font>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/javascript">
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'tableSelect'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , tableSelect = layui.tableSelect;
+ var HModName = "CB_ItemMoneyBillImport";
+ var HMaker = sessionStorage["HUserName"]
+ var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ //#endregion
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ // 鑾峰彇褰撳墠鏃ユ湡
+ var currentDate = new Date();
+ var currentYear = currentDate.getFullYear();
+ var currentMonth = currentDate.getMonth() + 1; // 鏈堜唤浠�0寮�濮嬶紝鎵�浠ヨ+1
+
+ // 璁剧疆榛樿閫変腑褰撳墠骞翠唤
+ var yearSelect = document.getElementById('HYear');
+ if (yearSelect) {
+ yearSelect.value = currentYear;
+ }
+
+ // 璁剧疆榛樿閫変腑褰撳墠鏈堜唤
+ var monthSelect = document.getElementById('HMonth');
+ if (monthSelect) {
+ monthSelect.value = currentMonth;
+ }
+ //閮ㄩ棬杈撳叆妗�
+ tableSelect.render({
+ elem: '#HWorkShopIDName',//杈撳叆妗哾om閫夋嫨
+ searchKey: '閮ㄩ棬鍚嶇О,HItemID',//鏌ヨ鐨勫垪鍚�
+ sWhere: " and 绂佺敤鏍囪 = '' and 杞﹂棿鏍囪 = 'Y' ",//table鎼滅储sWhere鏉′欢 //榛樿绛涢�夐」
+ ajaxSelect: function (sWhere) {
+ var data = '';
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Department/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": HMaker, "Organization": sessionStorage["Organization"] },
+ async: false,
+ success: function (data1) {
+ if (data1.count == 1) {
+ data = data1.data
+ }
+ },
+ error: function () {
+ layer.alert('鑾峰彇鍒楄〃澶辫触锛�', { icon: 15, title: '閫氫俊閿欒' });
+ }
+ });
+ return data;
+ },//璁剧疆鍓嶇鍒嗛〉鏃跺彲浠ヨ缃殑
+ table: {
+ //url: GetWEBURL() + 'Gy_Supplier/page',
+ //where: { user: '缈佹稕娑�', Organization: '娴欐睙鏅轰簯杩堟��' },
+ cols: [[
+ { type: 'radio', fixed: 'left' },//闇�瑕佸姞杩欎釜fixed灞炴�т笉鐒剁偣鍑籧heckbox浼氳Е鍙戣鐐瑰嚮瀵艰嚧鏃犳硶姝ｇ‘鐐瑰嚮
+ { field: 'HItemID', title: 'HItemID' },
+ { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О' },
+ ]],
+ page: true,
+ limit: 5,
+ limits: [5]
+ },
+ done: function (elem, data) {
+ if (data != []) {
+ $("#HWorkShopIDName").val(data.data[0]['閮ㄩ棬鍚嶇О']);
+ $("#HWorkShopID").val(data.data[0]['HItemID']);
+ }
+
+ }
+ })
+ Organ();
+ }
+ //鐢熶骇杞﹂棿
+ form.on('submit(btnHWorkShopID)', function (data) {
+ btnHWorkShopID();
+ });
+
+ //#endregion
+
+ //#region 寮�濮嬭垂鐢ㄥ紩鍏�
+ form.on('submit(btn_Import)', function (data) {
+ if (set_ModCheck("CB_ItemMoneyBillImport") == true) {
+ var index = layer.open({
+ type: 1, // page 灞傜被鍨�
+ area: ['20%', '20%'],
+ shade: 0.6, // 閬僵閫忔槑搴�
+ shadeClose: false, // 鐐瑰嚮閬僵鍖哄煙锛屼笉鍏抽棴寮瑰眰
+ maxmin: false, // 涓嶅厑璁稿叏灞忔渶灏忓寲
+ anim: 0, // 0-6 鐨勫姩鐢诲舰寮忥紝-1 涓嶅紑鍚�
+ content: '<div style="padding: 12px;">姝ｅ湪杩愮畻,璇疯�愬績绛夊緟!!!<div class="loader" style="height:10px;width:10px;"></div></div>'
+ });
+ setTimeout(function () {
+ set_Calculate(data);
+ layer.close(index);
+ layer.close(index1);
+ }, 1000)
+ }
+
+ });
+
+ //鏉冮檺鍒ゅ畾
+ function set_ModCheck(ModRightNameCheck) {
+ var Permission = false;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ Permission = true;
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return Permission;
+ }
+
+ function set_Calculate() {
+ //var HWorkShopID = $("#HWorkShopID").val();
+ //if (HWorkShopID == 0) {
+ // layer.close(ajaxLoad);
+ // layer.msg("璇烽�夋嫨閮ㄩ棬");
+ // return
+ //}
+ var HMonth = $("#HMonth").val();
+ var HYear = $("#HYear").val();
+ var Type = $("#HType").val();
+ //娆犳枡杩愮畻
+
+ var sql = `exec h_p_CB_ItemMoneyBillImport ${HYear},${HMonth},${Type},'${HMaker}',${HStockOrgID}`;
+ var startTime = new Date().getTime();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ // 璁＄畻璇锋眰鑺辫垂鐨勬椂闂�
+ var endTime = new Date().getTime();
+ var executionTime = endTime - startTime; // 姣
+ var executionTimeInSeconds = (executionTime / 1000).toFixed(2); // 杞崲涓虹骞朵繚鐣欎袱浣嶅皬鏁�
+ if (data1.count == 1) {
+ layer.msg("瀹屾垚璐圭敤寮曞叆");
+ // 鍚屾牱浣跨敤setTimeout寤惰繜鏄剧ず鎵ц鏃堕棿锛堝湪閿欒澶勭悊涓篃璁＄畻鏃堕棿锛�
+ setTimeout(function () {
+ layer.msg("鎵ц鏃堕棿: " + executionTimeInSeconds + " 绉�");
+ layer.close(ajaxLoad);
+ }, 1000);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HProdORGID").append(Organization);
+ $("#HProdORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
+ //#region 閫�鍑�
+ form.on('submit(btn_Cancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ Pub_Close(2);
+ });
+ })
+ //#endregion
+
+ //#region 閫夋嫨鐢熶骇杞﹂棿
+ function btnHWorkShopID() {
+ var HOrgName = $(".layui-form-select input").val();
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=1&HOrgName=' + HOrgName, '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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
+ $("#HWorkShopIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
+ /*get_WriteConfigFile();*/
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+ });
+ function GetHDeptNameValue(obj) //杩斿洖閲囪喘閮ㄩ棬
+ {
+ $("#HWorkShopID").val(obj[0].HItemID);//杞﹂棿id
+ $("#HWorkShopIDName").val(obj[0].閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
+ }
+ //浠ヤ笂涓簂ayui妯″潡
+ //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
index 0c8138a..3714f14 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
@@ -1791,6 +1791,12 @@
HUnitID: OptionData.HUnitID,
HUnitNumber: OptionData.璁￠噺鍗曚綅浠ｇ爜,
HUnitName: OptionData.璁￠噺鍗曚綅,
+ HWHID: OptionData.HWhID ? OptionData.HWhID : 0,
+ HWHName: OptionData.榛樿浠撳簱,
+ HWHNumber: OptionData.榛樿浠撳簱浠ｇ爜,
+ HSPID: OptionData.HSPID ? OptionData.HSPID : 0,
+ HSPName: OptionData.榛樿浠撲綅,
+ HSPNumber: OptionData.榛樿浠撲綅浠ｇ爜,
HDesignLife: 0, //璁捐瀵垮懡
HLeaveLife: 0, //鍓╀綑瀵垮懡
HQty: 1, //瀹炴敹鏁伴噺
@@ -2194,10 +2200,10 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if (sSubStr[i].HUnitID == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁￠噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
+ //if (sSubStr[i].HUnitID == "") {
+ // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁￠噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
if (sSubStr[i].HQty == "0") {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏁伴噺涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
index c03c1bd..bb16a2d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
@@ -120,7 +120,7 @@
<input type="text" name="HWHName" id="HWHName" readonly
class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input"
- value="" style="float:left;width:150px;">
+ value="0" style="float:left;width:150px;">
<input type="hidden" name="HWHNumber" id="HWHNumber" class="layui-input"
value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
@@ -139,7 +139,7 @@
<input type="text" name="HSecManagerName" id="HSecManagerName" readonly
class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID"
- class="layui-input" value="" style="float:left;width:150px;">
+ class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
lay-filter="HSecManagerList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
@@ -154,7 +154,7 @@
<input type="text" name="HKeeperName" id="HKeeperName" readonly
class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input"
- value="" style="float:left;width:150px;">
+ value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
lay-filter="HKeeperList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
@@ -169,7 +169,7 @@
<input type="text" name="HDeptName" id="HDeptName" readonly
class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input"
- value="" style="float:left;width:150px;">
+ value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
lay-filter="Department" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
@@ -1266,6 +1266,12 @@
option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
option.data[rowIndex + i].HUnitCode = checkStatus.data[i].璁￠噺鍗曚綅浠ｇ爜;
option.data[rowIndex + i].HUnitName = checkStatus.data[i].璁￠噺鍗曚綅;
+ option.data[rowIndex + i].HWHID = checkStatus.data[i].HWHID;
+ option.data[rowIndex + i].HWHName = checkStatus.data[i].榛樿浠撳簱;
+ option.data[rowIndex + i].HWHCode = checkStatus.data[i].榛樿浠撳簱浠ｇ爜;
+ option.data[rowIndex + i].HSPID = checkStatus.data[i].HSPID;
+ option.data[rowIndex + i].HSPName = checkStatus.data[i].榛樿浠撲綅;
+ option.data[rowIndex + i].HSPCode = checkStatus.data[i].榛樿浠撲綅浠ｇ爜;
}
table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
}
@@ -1287,6 +1293,12 @@
HUnitID: OptionData.HUnitID,
HUnitCode: OptionData.璁￠噺鍗曚綅浠ｇ爜,
HUnitName: OptionData.璁￠噺鍗曚綅,
+ HWHID : OptionData.HWhID,
+ HWHName : OptionData.榛樿浠撳簱,
+ HWHCode : OptionData.榛樿浠撳簱浠ｇ爜,
+ HSPID : OptionData.HSPID,
+ HSPName : OptionData.榛樿浠撲綅,
+ HSPCode : OptionData.榛樿浠撲綅浠ｇ爜,
HDesignLife: 0, //璁捐瀵垮懡
HLeaveLife: 0, //鍓╀綑瀵垮懡
HQty: 1, //瀹炴敹鏁伴噺
@@ -1585,22 +1597,22 @@
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
var Result = true;
- if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
- layer.msg("浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("楠屾敹鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
- layer.msg("淇濈鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
- layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
+ //if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
+ // layer.msg("浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+ //if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
+ // layer.msg("楠屾敹鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+ //if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
+ // layer.msg("淇濈鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+ //if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
+ // layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
if (typeof (sSubStr) == "undefined" || sSubStr == "") {
layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1613,10 +1625,10 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if (sSubStr[i].HUnitID == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁￠噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
+ //if (sSubStr[i].HUnitID == "") {
+ // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁￠噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
if (sSubStr[i].HWHID == "") {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏀舵枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
index 6e6467f..8f450bc 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
@@ -1791,6 +1791,12 @@
HUnitID: OptionData.HUnitID,
HUnitNumber: OptionData.璁￠噺鍗曚綅浠ｇ爜,
HUnitName: OptionData.璁￠噺鍗曚綅,
+ HWHID: OptionData.褰撳墠浠撳簱ID ? OptionData.褰撳墠浠撳簱ID : 0,
+ HWHName: OptionData.褰撳墠浠撳簱,
+ HWHNumber: OptionData.褰撳墠浠撳簱浠ｇ爜,
+ HSPID: OptionData.褰撳墠浠撲綅ID ? OptionData.褰撳墠浠撲綅ID : 0,
+ HSPName: OptionData.褰撳墠浠撲綅,
+ HSPNumber: OptionData.褰撳墠浠撲綅浠ｇ爜,
HDesignLife: 0, //璁捐瀵垮懡
HLeaveLife: 0, //鍓╀綑瀵垮懡
HQty: 1, //瀹炴敹鏁伴噺
@@ -2196,10 +2202,10 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if (sSubStr[i].HUnitID == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁￠噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
+ //if (sSubStr[i].HUnitID == "") {
+ // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁￠噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
if (sSubStr[i].HQty == "0") {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏁伴噺涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
index 39f596b..6945d84 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
@@ -1468,6 +1468,12 @@
HUnitID: OptionData.HUnitID,
HUnitCode: OptionData.璁￠噺鍗曚綅浠ｇ爜,
HUnitName: OptionData.璁￠噺鍗曚綅,
+ HWHID: OptionData.褰撳墠浠撳簱ID ? OptionData.褰撳墠浠撳簱ID : 0,
+ HWHName: OptionData.褰撳墠浠撳簱,
+ HWHCode: OptionData.褰撳墠浠撳簱浠ｇ爜,
+ HSPID: OptionData.褰撳墠浠撲綅ID ? OptionData.褰撳墠浠撲綅ID : 0,
+ HSPName: OptionData.褰撳墠浠撲綅,
+ HSPCode: OptionData.褰撳墠浠撲綅浠ｇ爜,
HDesignLife: 0, //璁捐瀵垮懡
HLeaveLife: 0, //鍓╀綑瀵垮懡
HQty: 1, //瀹炴敹鏁伴噺
@@ -1837,10 +1843,10 @@
// layer.msg("浠撳簱涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return Result = false;
//}
- if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
- layer.msg("鍙戣揣鍛樹笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
+ //if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
+ // layer.msg("鍙戣揣鍛樹笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
//if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
// layer.msg("閮ㄩ棬涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return Result = false;
--
Gitblit v1.9.1