From 50ceb8be38852f1a32825a7d172bd9a4d4db241d Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 24 二月 2026 16:19:33 +0800
Subject: [PATCH] 1
---
WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBillList.html | 13 +
WebTM/WebTM.csproj.user | 4
WebTM/views/车间管理/单品过站_小卫/Cj_BlueToothBarCodePrint.html | 7
WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBill.html | 13 +
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 12 +
WebTM/views/成本管理/费用单引入/CB_CostAccounting.html | 373 ++++++++++++++++++++++++++++++++++++++++++++++
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_UnbindList.html | 23 ++
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_generateSNCode.html | 7
WebTM/WebTM.csproj | 5
WebTM/views/基础资料/成本基础资料/Add_Edit_Gy_CostAverageType.html | 8
10 files changed, 436 insertions(+), 29 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 629feac..cd93407 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -204,9 +204,13 @@
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBackBill_CheckList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBackBill_Check_PDA.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Car.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CostCenter.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CostItem.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Driver.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ItemMoney.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CarList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CostCenter.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CostItem.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DriverList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Cg_ContractTransportBillEdit.html" />
<Content Include="views\鍖呰鍑哄叆搴撴槑缁哱Kf_PackStockDetailQuery.html" />
@@ -662,6 +666,7 @@
<Content Include="views\鎴愭湰绠＄悊\鎴愭湰璐圭敤鍗昞CB_ItemMoneyBillList.html" />
<Content Include="views\鎴愭湰绠＄悊\鎴愭湰璐圭敤鍗昞CB_ItemMoneyBillEdit.html" />
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_CostProjectImport.html" />
+ <Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_CostAccounting.html" />
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBillImport.html" />
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBill_Excel.html" />
<Content Include="views\鏉＄爜鏄庣粏\Kf_MateOutBillList_CodeDetail.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 1eb74aa..2df3c36 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -5,9 +5,9 @@
<NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
- <NameOfLastUsedPublishProfile>D:\鏅轰簯LMes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\SWETM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\GitHub\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostAverageType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostAverageType.html"
index d0afbdf..08e4533 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostAverageType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostAverageType.html"
@@ -40,8 +40,8 @@
lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
lay-filter="Cancel">閫�鍑�</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button"
- lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button"
+ lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>-->
</div>
</div>
<div class="layui-form-item" style="padding-top: 10px;">
@@ -373,9 +373,9 @@
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data[0];
- var IsHStopflag = data.绂佺敤鏍囪;
+ var IsHStopflag = data.绂佺敤鏍囧織;
//绂佺敤鏍囪
- if (IsHStopflag) {
+ if (IsHStopflag=="Y") {
$("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
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_CostAccounting.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_CostAccounting.html"
new file mode 100644
index 0000000..2c58820
--- /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_CostAccounting.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_CostAccounting";
+ 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/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
index 156939b..38ff811 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
@@ -424,11 +424,11 @@
</div>
<!--琛ㄤ綋淇℃伅-->
- <div class="layui-tab layui-tab-card">
+ <div class="layui-tab layui-tab-card" lay-filter="bottomTable">
<ul class="layui-tab-title">
- <li class="layui-this">妫�楠岄」鐩�</li>
- <li>鎶芥牱妫�楠�</li>
- <li>妫�娴嬪��</li>
+ <li lay-id="1" class="layui-this">妫�楠岄」鐩�</li>
+ <li lay-id="2">鎶芥牱妫�楠�</li>
+ <li lay-id="3">妫�娴嬪��</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -1740,7 +1740,10 @@
} else {
isFristClick = false;
}
-
+ //鑷姩璺宠浆鍒版娴嬪�奸〉绛�
+ if (sessionStorage["OrganizationID"] != "100007") {
+ element.tabChange('bottomTable', '3'); //璺宠浆椤电
+ }
});
//琛屽唴浜嬩欢--妫�楠岄」鐩�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 7e132f5..c722d6c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -304,11 +304,11 @@
</div>
</div>
<!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
- <div class="layui-tab layui-tab-card">
+ <div class="layui-tab layui-tab-card" lay-filter="bottomTable">
<ul class="layui-tab-title">
- <li class="layui-this">妫�楠岄」鐩�</li>
- <li>鎶芥牱妫�楠�</li>
- <li>妫�娴嬪��</li>
+ <li lay-id="1" class="layui-this">妫�楠岄」鐩�</li>
+ <li lay-id="2">鎶芥牱妫�楠�</li>
+ <li lay-id="3">妫�娴嬪��</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -3167,6 +3167,10 @@
} else {
isFristClick = false;
}
+ //鑷姩璺宠浆鍒版娴嬪�奸〉绛�
+ if (sessionStorage["OrganizationID"] != "100007") {
+ element.tabChange('bottomTable', '3'); //璺宠浆椤电
+ }
});
//#endregion
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
index 3c3f8f1..ac14e7f 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
@@ -447,11 +447,11 @@
</div>
</div>
<!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
- <div class="layui-tab layui-tab-card">
+ <div class="layui-tab layui-tab-card" lay-filter="bottomTable">
<ul class="layui-tab-title">
- <li class="layui-this">妫�楠岄」鐩�</li>
- <li>鎶芥牱妫�楠�</li>
- <li>妫�娴嬪��</li>
+ <li lay-id="1" class="layui-this">妫�楠岄」鐩�</li>
+ <li lay-id="2">鎶芥牱妫�楠�</li>
+ <li lay-id="3">妫�娴嬪��</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -3536,7 +3536,10 @@
} else {
isFristClick = false;
}
-
+ //鑷姩璺宠浆鍒版娴嬪�奸〉绛�
+ if (sessionStorage["OrganizationID"] != "100007") {
+ element.tabChange('bottomTable', '3'); //璺宠浆椤电
+ }
});
//#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.html"
index 9cff162..ceefd52 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.html"
@@ -67,7 +67,7 @@
<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="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;">
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;" placeholder="璇烽�夋嫨钃濈墮鐗╂枡淇℃伅">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -395,6 +395,11 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+ var materName = checkStatus.data[0].鐗╂枡鍚嶇О;
+ if (!materName || materName.indexOf('钃濈墮') === -1) {
+ layer.msg('璇烽�夋嫨钃濈墮鐗╂枡锛佺墿鏂欏悕绉颁腑蹇呴』鍖呭惈"钃濈墮"瀛楁牱', { icon: 5 });
+ return; // 涓嶅叧闂脊绐楋紝璁╃敤鎴烽噸鏂伴�夋嫨
+ }
//鑾峰彇鏁版嵁
$("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
$("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
index f0587ca..463601d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_UnbindList.html"
@@ -547,8 +547,17 @@
sWhere += " and 宸ュ崟缂栧彿 like '%" + HICMOBillNo + "%'";
}
+ //if (HBarcode_SN) {
+ // sWhere += " and DSN like '%" + HBarcode_SN + "%'";
+ //}
if (HBarcode_SN) {
- sWhere += " and DSN like '%" + HBarcode_SN + "%'";
+ HBarcode_SN = HBarcode_SN.replace(/锛�/g, ',')
+ .split(',')
+ .map(item => `'${item.trim()}'`)
+ .join(',');
+
+ console.log("澶勭悊缁撴灉:", HBarcode_SN);
+ sWhere += " and DSN in (" + HBarcode_SN + ")";
}
if (HBarcode_ZB) {
sWhere += "and 鏍堟澘鐮� like '%" + HBarcode_ZB + "%'";
@@ -556,12 +565,12 @@
if (HBarcode_ZX) {
sWhere += "and 涓鐮� like '%" + HBarcode_ZX + "%'";
}
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) >= '" + HDate + "'";
- }
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) <= '" + HDate1 + "'";
- }
+ //if (HDate) {
+ // sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) >= '" + HDate + "'";
+ //}
+ //if (HDate1) {
+ // sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) <= '" + HDate1 + "'";
+ //}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
index 5f01e8f..d027989 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
@@ -335,7 +335,12 @@
if (event.keyCode == 13) {
var HBarCode = $('#HBarCode_SN').val();
if (event.keyCode == 13) {
-
+ if (HBarCode.length !== 20) {
+ layer.msg("鏉＄爜闀垮害蹇呴』涓�20浣嶏紒褰撳墠闀垮害锛�" + HBarCode.length, { icon: 5 });
+ $("#HBarCode_SN").val("");
+ $("#HBarCode_SN").focus();
+ return false;
+ }
if (!checkHSNAndDate(HBarCode)) {
return
}
--
Gitblit v1.9.1