From b0a47811ab80b107e085bc1db575f583b0696922 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 22 九月 2023 15:41:21 +0800
Subject: [PATCH] 物料：表格单选框改为复选框 生产领料单：更改选择物料时访问的弹窗页面，重量根据新的物料重新计算 生产领料单列表：相关操作后的刷新操作由页面刷新变为根据过滤条件查询，列设置最后一列不能设置问题修正
---
WebTM/views/Baseset/基础资料/Gy_MaterialList.html | 2 +-
WebTM/views/领料发货/领料出库/Kf_MateOutBillLEdit.html | 13 +++++++++++--
WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html | 21 +++++++++++----------
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 2 +-
4 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 9b939bf..568cb88 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -4737,7 +4737,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html">
- <publishTime>09/22/2023 14:02:53</publishTime>
+ <publishTime>09/22/2023 15:25:25</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">
<publishTime>09/22/2023 14:35:16</publishTime>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
index a170435..2457413 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
@@ -59,7 +59,7 @@
, data: []
, cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
, cols: [[
- { type: 'radio' }
+ { type: 'checkbox' }
, { field: 'HItemID', title: '鐗╂枡ID', hide: true }
, { field: 'HNumber', title: '鐗╂枡浠ｇ爜' }
, { field: 'HName', title: '鐗╂枡鍚嶇О', sort: true }
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
index 8e768ce..0172096 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
@@ -1361,7 +1361,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/PartInformation.html', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1394,8 +1394,17 @@
option.data[rowIndex + i].HDesignLife = 0;
option.data[rowIndex + i].HLeaveLife = 0;
- option.data[rowIndex + i].HQty = 1;
option.data[rowIndex + i].HMoney = 0;
+
+
+ //鏍规嵁鐗╂枡鐨� 鐗╂枡鍏紡 璁＄畻 閲嶉噺
+ var HWeight = $("#HWeight").val();
+ var HWaterQty = $("#HWaterQty").val();
+ if (option.data[rowIndex + i].HMaterRuleType == "鏌撴枡") {
+ option.data[rowIndex + i].HQty = option.data[rowIndex + i].HRate * HWeight;
+ } else if (option.data[rowIndex + i].HMaterRuleType == "鍔╁墏") {
+ option.data[rowIndex + i].HQty = option.data[rowIndex + i].HRate * HWaterQty;
+ }
}
table.render(option);
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
index 44cfc2c..3a3c930 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
@@ -206,7 +206,7 @@
case 'btn-print': get_PrintReport();
break;
//鍒锋柊
- case 'get_Refresh': set_Refresh();
+ case 'btn-reload': set_Refresh();
break;
//瀹℃牳鎸夐挳 锛�0:瀹℃牳銆�1:鍙嶅鏍革級
case 'btn-Audit':
@@ -546,7 +546,8 @@
content: '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
end: function () {
//鍒锋柊椤甸潰,
- get_FastQuery(table, option);
+ /*get_FastQuery(table, option);*/
+ $("#btnSearch").trigger('click');
},
success: function (layero, index) {
@@ -573,7 +574,8 @@
, content: '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
, resize: false,
end: function () {
- get_FastQuery(table, option);
+ //get_FastQuery(table, option);
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -603,7 +605,8 @@
, content: '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
, resize: false,
end: function () {
- get_FastQuery(table, option);
+ //get_FastQuery(table, option);
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -670,10 +673,8 @@
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
-
} else {
layer.alert(result.code + result.Message, { icon: 5 });
}
@@ -737,7 +738,7 @@
//#region 鍒锋柊
function set_Refresh() {
- $("#btnSearch").click();
+ $("#btnSearch").trigger('click');
}
//#endregion
@@ -968,7 +969,7 @@
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["title"] + ",";
}
@@ -1008,7 +1009,7 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length - 2; i++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
var dataCols = dataCol[i].split('|');
//闅愯棌鍒�
if (dataCols[1] == 1) {
--
Gitblit v1.9.1