From a4a4d43f664123258d969bb623d93c10b3fa1d3a Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期六, 26 七月 2025 12:51:20 +0800
Subject: [PATCH] 1
---
WebTM/views/公共页面/Kf_BarCodeEditDlg.html | 2
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html | 18 +
WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html | 4
WebTM/views/基础资料/公用基础资料/Gy_InspectInstruMent.html | 1
WebTM/views/质量管理/车间自检单/QC_Add_Edit_WorkSelfCheckBill.html | 254 +++++++++++++++++++-
WebTM/Download/WMS软件安装包.apk | 0
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html | 1
WebTM/WebTM.csproj | 1
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA_XiaBao.html | 347 ++++++++++++++++++++--------
WebTM/views/质量管理/车间自检单/QC_WorkSelfCheckBillList.html | 50 ++--
10 files changed, 537 insertions(+), 141 deletions(-)
diff --git "a/WebTM/Download/WMS\350\275\257\344\273\266\345\256\211\350\243\205\345\214\205.apk" "b/WebTM/Download/WMS\350\275\257\344\273\266\345\256\211\350\243\205\345\214\205.apk"
new file mode 100644
index 0000000..2833cb6
--- /dev/null
+++ "b/WebTM/Download/WMS\350\275\257\344\273\266\345\256\211\350\243\205\345\214\205.apk"
Binary files differ
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index fd55ac4..b14205c 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -138,6 +138,7 @@
<Content Include="layuiadmin\layui\font\iconfont.woff" />
<Content Include="layuiadmin\layui\font\iconfont.woff2" />
<Content Include="layuiadmin\json\Test.json" />
+ <Content Include="Download\WMS杞欢瀹夎鍖�.apk" />
<None Include="Properties\PublishProfiles\JFTM.pubxml" />
<Content Include="layuiadmin\layui\images\device.png" />
<Content Include="layuiadmin\layui\images\erro.png" />
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
index f395961..6eeb4cd 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
@@ -83,7 +83,6 @@
<li lay-id="2" style="padding:1px;">琛ㄥご淇℃伅</li>
<li lay-id="3" style="padding:1px;">鐗╂枡淇℃伅</li>
<li lay-id="4" style="padding:1px;">鏉＄爜淇℃伅</li>
- <li lay-id="5" style="padding:1px;">涓嬫灦淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--閫夋嫨婧愬崟-->
@@ -409,15 +408,6 @@
</div>
</div>
</div>
- <!--涓嬫灦淇℃伅-->
- <div class="layui-tab-item">
- <div class="layui-row">
- <div class="layui-col-xs12">
- <div class="layui-form-item" style="padding:0px;margin:0px"></div>
- <table class="layui-hide" id="FIFOList-table" lay-filter="FIFOList-table"></table>
- </div>
- </div>
- </div>
</div>
</div>
<div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
@@ -476,7 +466,6 @@
var HSourceFlag = false //鏄惁宸叉壂鐮佹爣蹇�
var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var listOption = [];
- var FIFOListOption = [];
var columns = "";
var HModName = "Kf_MoveStockBill_PDA_XiaBao";
var ModRightName = "CE_MoveStock2"; //妯″潡鏉冮檺鍙傛暟
@@ -612,8 +601,6 @@
]];
listOption.data = data;
table.render(listOption);
- FIFOListOption.data = data;
- table.render(FIFOListOption);
//鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
var pFocus = $("#HBarCode");
@@ -684,32 +671,6 @@
, cellMinWidth: 90
, limit: 200
};
-
- //涓嬫灦淇℃伅
- FIFOListOption = {
- elem: '#FIFOList-table'
- //, toolbar: '#toolbarDemo'
- , cellMinWidth: 90
- , limit: 3000
- , totalRow: true
- , cols: [[
- { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
- , { field: 'HQtyMust', title: '涓嬫灦鏁伴噺', width: 90 }
- , { field: 'HWhName', title: '浠撳簱', width: 150 }
- , { field: 'HSPName', title: '浠撲綅', width: 150 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HMaterID', title: 'HMaterID', width: 150, hide: true }
- , { field: 'HBatchNo', title: '鎵瑰彿', width: 150 }
- , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
- , { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- }
}
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -1664,7 +1625,7 @@
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板','鍏抽棴'],
btn2: function () {
if (OperationType == 2) {
- parent.location.href = "../../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBillList_PDA.html";
+ parent.location.href = "../../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBillList_PDA_XiaBao.html";
}
else {
parent.location.href = "../../../views/index_Mobile.html";
@@ -1920,26 +1881,93 @@
element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '3');
$("#HBarCode").select();
$("#HBarCode").focus();
- //璋冨叆璋冨嚭缁勭粐涓庣櫥鍏ョ粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヨ皟鍑轰粨搴撲粨浣嶆暟鎹�
- if (HStockInOrgID != HStockOrgID) {
+ //璋冨叆缁勭粐涓庣晫闈㈡墍閫夎皟鍏ョ粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヤ粨搴撲粨浣嶆暟鎹紝閲嶆柊璧嬪��
+ if (HStockInOrgID != $('#HStockInOrgID').val()) {
$("#HWHID").val("0");
- $("#HWHName").val("");
- $("#HStockPlaceID").val("0");
- $("#HStockPlaceName").val("");
- $("#HStockPlaceName").removeAttr("disabled");
- $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
- $("#HWHName").select();
- $("#HWHName").focus();
+ if (result.data.hWhIDField != 0) {
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HWHName").val(result.data.hWhNameField);
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ if (result.data.hSPFlagField == 0) {
+ $("#HStockPlaceName").attr("disabled", "disabled");
+ $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
+ else {
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
}
- if (HStockOutOrgID != HStockOrgID) {
+ else {
+ //鐣岄潰涓婃湭閫変粨搴擄紝婧愬崟涓婃湁浠撳簱锛屽彇婧愬崟浠撳簱鏄剧ず鍦ㄧ晫闈笂
+ if (sHWHID == 0 && result.data.hWhIDField != 0) {
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HWHName").val(result.data.hWhNameField);
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ if (result.data.hSPFlagField == 0) {
+ $("#HStockPlaceName").attr("disabled", "disabled");
+ $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
+ }
+ //璋冨嚭缁勭粐涓庣晫闈㈡墍閫夎皟鍑虹粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍑轰粨搴撲粨浣嶆暟鎹紝閲嶆柊璧嬪��
+ if (HStockOutOrgID != $('#HStockOutOrgID').val()) {
$("#HSCWHID").val("0");
- $("#HSCWHName").val("");
- $("#HOutStockPlaceID").val("0");
- $("#HOutStockPlaceName").val("");
- $("#HOutStockPlaceName").removeAttr("disabled");
- $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
- $("#HSCWHName").select();
- $("#HSCWHName").focus();
+ if (result.data.hSCWhIDField != 0) {
+ $("#HSCWHID").val(result.data.hSCWhIDField);
+ $("#HSCWHName").val(result.data.hSCWhNameField);
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ if (result.data.hSCSPFlagField == 0) {
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
+ else {
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ }
+ }
+ else {
+ //鐣岄潰涓婃湭閫変粨搴擄紝婧愬崟涓婃湁浠撳簱锛屽彇婧愬崟浠撳簱鏄剧ず鍦ㄧ晫闈笂
+ if (sHSCWHID == 0 && result.data.hSCWhIDField != 0) {
+ $("#HSCWHID").val(result.data.hSCWhIDField);
+ $("#HSCWHName").val(result.data.hSCWhNameField);
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ if (result.data.hSCSPFlagField == 0) {
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
}
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
@@ -2208,26 +2236,93 @@
//瀹㈡埛涓嶅彲缂栬緫
$("#HSupName").attr("disabled", "disabled");
$('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
- //璋冨叆璋冨嚭缁勭粐涓庣櫥鍏ョ粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヨ皟鍑轰粨搴撲粨浣嶆暟鎹�
- if (HStockInOrgID != HStockOrgID) {
+ //璋冨叆缁勭粐涓庣晫闈㈡墍閫夎皟鍏ョ粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヤ粨搴撲粨浣嶆暟鎹紝閲嶆柊璧嬪��
+ if (HStockInOrgID != $('#HStockInOrgID').val()) {
$("#HWHID").val("0");
- $("#HWHName").val("");
- $("#HStockPlaceID").val("0");
- $("#HStockPlaceName").val("");
- $("#HStockPlaceName").removeAttr("disabled");
- $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
- $("#HWHName").select();
- $("#HWHName").focus();
+ if (result.data.hWhIDField != 0) {
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HWHName").val(result.data.hWhNameField);
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ if (result.data.hSPFlagField == 0) {
+ $("#HStockPlaceName").attr("disabled", "disabled");
+ $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
+ else {
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
}
- if (HStockOutOrgID != HStockOrgID) {
+ else {
+ //鐣岄潰涓婃湭閫変粨搴擄紝婧愬崟涓婃湁浠撳簱锛屽彇婧愬崟浠撳簱鏄剧ず鍦ㄧ晫闈笂
+ if (sHWHID == 0 && result.data.hWhIDField != 0) {
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HWHName").val(result.data.hWhNameField);
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ if (result.data.hSPFlagField == 0) {
+ $("#HStockPlaceName").attr("disabled", "disabled");
+ $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
+ }
+ //璋冨嚭缁勭粐涓庣晫闈㈡墍閫夎皟鍑虹粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍑轰粨搴撲粨浣嶆暟鎹紝閲嶆柊璧嬪��
+ if (HStockOutOrgID != $('#HStockOutOrgID').val()) {
$("#HSCWHID").val("0");
- $("#HSCWHName").val("");
- $("#HOutStockPlaceID").val("0");
- $("#HOutStockPlaceName").val("");
- $("#HOutStockPlaceName").removeAttr("disabled");
- $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
- $("#HSCWHName").select();
- $("#HSCWHName").focus();
+ if (result.data.hSCWhIDField != 0) {
+ $("#HSCWHID").val(result.data.hSCWhIDField);
+ $("#HSCWHName").val(result.data.hSCWhNameField);
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ if (result.data.hSCSPFlagField == 0) {
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
+ else {
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ }
+ }
+ else {
+ //鐣岄潰涓婃湭閫変粨搴擄紝婧愬崟涓婃湁浠撳簱锛屽彇婧愬崟浠撳簱鏄剧ず鍦ㄧ晫闈笂
+ if (sHSCWHID == 0 && result.data.hSCWhIDField != 0) {
+ $("#HSCWHID").val(result.data.hSCWhIDField);
+ $("#HSCWHName").val(result.data.hSCWhNameField);
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ if (result.data.hSCSPFlagField == 0) {
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
}
element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '3');
}
@@ -2270,26 +2365,93 @@
//瀹㈡埛涓嶅彲缂栬緫
$("#HSupName").attr("disabled", "disabled");
$('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
- //璋冨叆璋冨嚭缁勭粐涓庣晫闈㈡墍閫夌粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヨ皟鍑轰粨搴撲粨浣嶆暟鎹�
+ //璋冨叆缁勭粐涓庣晫闈㈡墍閫夎皟鍏ョ粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヤ粨搴撲粨浣嶆暟鎹紝閲嶆柊璧嬪��
if (HStockInOrgID != $('#HStockInOrgID').val()) {
$("#HWHID").val("0");
- $("#HWHName").val("");
- $("#HStockPlaceID").val("0");
- $("#HStockPlaceName").val("");
- $("#HStockPlaceName").removeAttr("disabled");
- $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
- $("#HWHName").select();
- $("#HWHName").focus();
+ if (result.data.hWhIDField != 0) {
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HWHName").val(result.data.hWhNameField);
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ if (result.data.hSPFlagField == 0) {
+ $("#HStockPlaceName").attr("disabled", "disabled");
+ $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
+ else {
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
}
+ else {
+ //鐣岄潰涓婃湭閫変粨搴擄紝婧愬崟涓婃湁浠撳簱锛屽彇婧愬崟浠撳簱鏄剧ず鍦ㄧ晫闈笂
+ if (sHWHID == 0 && result.data.hWhIDField != 0) {
+ $("#HWHID").val(result.data.hWhIDField);
+ $("#HWHName").val(result.data.hWhNameField);
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ if (result.data.hSPFlagField == 0) {
+ $("#HStockPlaceName").attr("disabled", "disabled");
+ $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
+ }
+ //璋冨嚭缁勭粐涓庣晫闈㈡墍閫夎皟鍑虹粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍑轰粨搴撲粨浣嶆暟鎹紝閲嶆柊璧嬪��
if (HStockOutOrgID != $('#HStockOutOrgID').val()) {
$("#HSCWHID").val("0");
- $("#HSCWHName").val("");
- $("#HOutStockPlaceID").val("0");
- $("#HOutStockPlaceName").val("");
- $("#HOutStockPlaceName").removeAttr("disabled");
- $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
- $("#HSCWHName").select();
- $("#HSCWHName").focus();
+ if (result.data.hSCWhIDField != 0) {
+ $("#HSCWHID").val(result.data.hSCWhIDField);
+ $("#HSCWHName").val(result.data.hSCWhNameField);
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ if (result.data.hSCSPFlagField == 0) {
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
+ else {
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ }
+ }
+ else {
+ //鐣岄潰涓婃湭閫変粨搴擄紝婧愬崟涓婃湁浠撳簱锛屽彇婧愬崟浠撳簱鏄剧ず鍦ㄧ晫闈笂
+ if (sHSCWHID == 0 && result.data.hSCWhIDField != 0) {
+ $("#HSCWHID").val(result.data.hSCWhIDField);
+ $("#HSCWHName").val(result.data.hSCWhNameField);
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ if (result.data.hSCSPFlagField == 0) {
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
}
HStockInOrgID = $('#HStockInOrgID').val()
HStockOutOrgID = $('#HStockOutOrgID').val()
@@ -2388,13 +2550,6 @@
listOption.totalRow = true;
table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(listOption);
- if (result.data.FIFOlist.length != 0) {
- if (result.data.FIFOlist[0].HMaterID != 0) {
- FIFOListOption.data = result.data.FIFOlist;
- table.cache['FIFOList-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
- table.render(FIFOListOption);
- }
- }
//鏉＄爜淇℃伅
$("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
diff --git "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_BarCodeEditDlg.html" "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_BarCodeEditDlg.html"
index d2987aa..8239fa3 100644
--- "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_BarCodeEditDlg.html"
+++ "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_BarCodeEditDlg.html"
@@ -221,7 +221,7 @@
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
type: "GET",
- url: GetWEBURL() + "Kf_BarCodeEditDlg/DeltetBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Kf_BarCodeEditDlg/DeltetBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": HInterID, "HBarCode": HBarCode, "HBillType": sBillType },
success: function (result) {
if (result.count == 1) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMent.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMent.html"
index ed30b17..526229b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMent.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMent.html"
@@ -773,6 +773,7 @@
data.push(obj.data);
parent.GetInspectInstruMentValue(data);
var index = parent.layer.getFrameIndex(window.name);
+ console.log("1");
parent.layer.close(index);
});
//#endregion
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
index b351851..c65a7ad 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
@@ -168,6 +168,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill"><i class="layui-icon layui-icon-logout"></i>鍙嶅叧闂�</button>
</div>
@@ -244,6 +245,10 @@
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
break;
};
});
@@ -345,6 +350,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
+ , title: "鎻愭枡璁″垝鍗�"
, page: true
, cellMinWidth: 90
, totalRow: true
@@ -765,7 +771,17 @@
})
}
}
-
+ function get_Export() {
+ var data = option.data
+ data.forEach((item) => {
+ // 濡傛灉鏌愪釜瀛楁鐨勫�煎お闀匡紝闇�瑕佸幓闄ゆ崲琛岀
+ if (item.瑙勬牸鍨嬪彿.length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item.瑙勬牸鍨嬪彿 = item.瑙勬牸鍨嬪彿.replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item.瑙勬牸鍨嬪彿 = item.瑙勬牸鍨嬪彿.replace(/[,]+/g, '锛�'); // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+ }
+ });
+ table.exportFile('mainTable', data, "xls");
+ }
//#region 鏂板
function set_AddNew() {
layer.open({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
index 0362d9d..a625e67 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
@@ -457,6 +457,7 @@
}
if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replace(/[,]+/g, '锛�'); // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
}
}
});
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
index b9ee951..3053268 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
@@ -52,6 +52,7 @@
<div style="z-index: 1;">
<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-SIP" id="btn-SIP">SIP鏌ョ湅</button>
</div>
@@ -148,9 +149,9 @@
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMaterName" id="HMaterName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="text" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
- <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;">
+ <!--<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>
+ </button>-->
</div>
</div>
<div class="layui-inline">
@@ -192,6 +193,7 @@
</button>
</div>
</div>
+
</div>
<div class="layui-row">
<div class="layui-inline" style="width: 45%;">
@@ -595,6 +597,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
<!--闅愯棌瀛楁-->
@@ -645,7 +648,7 @@
//1.妫�楠岄」鐩〃浣撴暟鎹�煎瓨鍌紝鍊熺敤鐐瑰嚮琛屼簨浠讹紝褰撳垏鎹㈣鏃舵妸涓婃鎵�鍦ㄨ鐨勬暟鎹瓨鍒皁ption.data涓婏紱
//杩欎釜鎬濊矾浼氭湁涓棶棰橈紝鏈�鍚庝竴娆＄偣鍑荤殑閭ｈ鏁版嵁灏嗕笉浼氬湪鍘昏Е鍙戠偣鍑昏浜嬩欢瀛樺偍鍊硷紝鐩墠鎯冲埌鐨勬槸鍦ㄦ墽琛屼繚瀛樻柟娉曟椂鍦ㄦ妸鏈�鍚庣偣鍑荤殑閭ｄ竴琛屾暟鎹瓨鍏ption.data涓�
-
+ var OptionData = [];
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -677,6 +680,7 @@
var UnRightQty_isFied = 0; //鐢ㄤ簬鍒ゆ柇鏄惁鍚堟牸//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
var editIndex = 0;//缂栬緫涓嬫爣
var SampleNum = [];//鏍锋湰鏁伴噺
+ var HModName = "QC_Add_Edit_WorkSelfCheckBill";
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "7518";
@@ -1056,6 +1060,10 @@
form.render('select');
}
break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
}
});
//#endregion
@@ -1081,6 +1089,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+ console.log("1");
$("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
$("#HProcID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -1288,17 +1297,57 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- var HResult = checkStatus.data[0].榛樿缁撹 == "鍚堟牸" ? 1 : 2
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- 妫�楠岄」鐩�: checkStatus.data[0].鍚嶇О
- , HQCCheckItemID: checkStatus.data[0].HItemID
- , HResult: HResult
- });
- $('#HResult' + rowIndex + '').find("option[value='" + HResult + "']").attr("selected", true);
- form.render('select');
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ if (checkStatus.data.length === 1) {
+ var HResult = checkStatus.data[0].榛樿缁撹 == "鍚堟牸" ? 1 : 2
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ 妫�楠岄」鐩�: checkStatus.data[0].鍚嶇О
+ , 妫�楠岄」鐩唬鐮�: checkStatus.data[0].浠ｇ爜
+ , HQCCheckItemID: checkStatus.data[0].HItemID
+ , HResult: HResult
+ });
+ $('#HResult' + rowIndex + '').find("option[value='" + HResult + "']").attr("selected", true);
+ form.render('select');
+ layer.close(layer.index);
+ }
+ else {
+ //(澶氶�夎)
+ //灏嗗師鏈夎〃浣撴暟鎹啓鍏ユ暟缁�
+ var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ if (tableBak[i]["HQCCheckItemID"] != 0 && tableBak[i]["妫�楠岄」鐩�"] != "" && tableBak[i]["HResult"] != undefined && tableBak[i]["HResult"] != null) {
+ buttonArr.push(tableBak[i]); //濡傛灉鍏抽敭瀛楁涓嶄负绌猴紝鍒欏皢涔嬪墠鐨勬暟鎹瓨鍌�
+ }
+ }
+ //灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ buttonArr.push({
+ "妫�楠岄」鐩�": checkStatus.data[i].鍚嶇О, "妫�楠岄」鐩唬鐮�": checkStatus.data[i].浠ｇ爜, "HQCCheckItemID": checkStatus.data[i].HItemID, "HResult": 1,
+ "HInspectInstruMentID": "0", "妫�楠屼华鍣ㄤ唬鐮�": "", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "",
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
+ "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
+ "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+ });
+ }
+
+ table.reload("mainTable", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+ //瀹屾垚鏍囪
+ if (option.data[i - 1].HKeyInspect) {
+ $('#HKeyInspect' + i + '').attr("checked", true);
+ }
+ }
+ form.render('select');
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
}
+
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
@@ -1331,7 +1380,8 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
- 妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
+ 妫�楠屼华鍣ㄤ唬鐮�: checkStatus.data[0].妫�楠屼华鍣ㄤ唬鐮�
+ , 妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
, HInspectInstruMentID: checkStatus.data[0].HItemID
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -1341,7 +1391,16 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ 妫�楠屼华鍣ㄤ唬鐮�: OptionData[0].妫�楠屼华鍣ㄤ唬鐮�,
+ 妫�楠屼华鍣�: OptionData[0].妫�楠屼华鍣ㄥ悕绉�,
+ HInspectInstruMentID: OptionData[0].HItemID
+ });
+ OptionData = [];
+ }
}
});
}
@@ -1497,6 +1556,11 @@
form.on('submit(btnSave)', function (data) {
set_SaveBill(data);
});
+ //#region 瀹℃牳鎸夐挳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(0);
+ });
+ //#endregion
//淇濆瓨
function set_SaveBill(data) {
@@ -2310,6 +2374,7 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//鍒濆鍖栫鐢ㄥ鏍告寜閽�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
@@ -3897,9 +3962,155 @@
}
+ //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 瀛愯〃1锛氭樉绀哄垪鏁版嵁
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ async: false,
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["HQCCheckItemID", "HInspectInstruMentID"];
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ if (dataCol.length <= i) {
+ break;
+ }
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] += "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
//浠ヤ笂涓簂ayui妯″潡
});
-
+
+ //#region 瀹℃牳鏁版嵁
+ function set_CheckBill() {
+ var InterID = $("#HInterID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/QC_WorkSelfCheckBill/AuditQC_WorkSelfCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);// 绂佺敤瀹℃牳鎸夐挳
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
function GetGySource(obj) { //鐢熶骇璧勬簮
$("#HSourceName").val(obj[0].鐢熶骇璧勬簮鍚嶇О);
$("#HSourceID").val(obj[0].HItemID);
@@ -3940,6 +4151,19 @@
$("#HShiftsName").val(obj[0].鐝鍚嶇О);
$("#HShiftsID").val(obj[0].HInterID);
}
+ //宸ュ簭
+ function GetProcessValue(obj) {
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(obj[0].HItemID);
+ }
+ //妫�楠岄」鐩�
+ function GetCheckItemValue(obj) {
+ OptionData = obj;
+ }
+ //妫�楠屼华鍣�
+ function GetInspectInstruMentValue(obj) {
+ OptionData = obj;
+ }
</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/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillList.html"
index 06bd6df..89f2d38 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillList.html"
@@ -52,26 +52,24 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HDate2" id="HDate2">
</div>
</div>
- <div class="layui-row" style="margin-top:10px;margin-left:5%;">
- <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 ForFilteringSchemes" name="HBillNo" id="HBillNo">
- </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 ForFilteringSchemes" name="HBillNo" id="HBillNo">
</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="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </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>
+ <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="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </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-inline" style="margin-left:5px;">
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
@@ -164,12 +162,12 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -184,19 +182,19 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -211,7 +209,7 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -287,7 +285,7 @@
//杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
//妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
- window.HModuleName = "搴撳瓨妫�楠屽崟缁存姢";
+ window.HModuleName = "杞︽鑷缁存姢";
//鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
window.HDefaultFilter = "";
//閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
@@ -347,7 +345,7 @@
case 'btn-Delete':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].鍗曟嵁鐘舵�� == "鍒涘缓") {
var InterID = data[0].hmainid.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
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 e3e1fc5..8735bc4 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"
@@ -383,8 +383,8 @@
<input type="hidden" name="eventType" id="eventType" value="Add">
<input type="hidden" name="HPrice_BHS" id="HPrice_BHS" value="0"><!--涓嶅惈绋庡崟浠�-->
<input type="hidden" name="HMoney_BHS" id="HMoney_BHS" value="0"><!--涓嶅惈绋庨噾棰�-->
- <input type="hidden" name="HGroup" id="HGroup"><!--鐢熶骇鐝粍-->
- <input type="hidden" name="HGroupID" id="HGroupID" value="0"><!--鐢熶骇鐝粍-->
+ <!--<input type="hidden" name="HGroup" id="HGroup">--><!--鐢熶骇鐝粍-->
+ <!--<input type="hidden" name="HGroupID" id="HGroupID" value="0">--><!--鐢熶骇鐝粍-->
<input type="hidden" name="HInnerBillNo" id="HInnerBillNo"><!--閫佽揣鍗曞彿-->
<input type="hidden" name="HPlanPieceQty" id="HPlanPieceQty" value="0"><!--鍙戝嚭浠舵暟-->
<input type="hidden" name="HBadPNL" id="HBadPNL" value="0"><!--鎶ュ簾浠舵暟-->
--
Gitblit v1.9.1