From 7e56226ae107828749cfe8f6b730bd4342e72d97 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 22 八月 2025 08:25:37 +0800
Subject: [PATCH] 生产领料单维护 添加 获取uri参数 区分进入不同的页面 修改生产领料单-毛尖 生产领料单-羊毛染色页面 移除可能对应页面的其他物料公式判断语句
---
WebTM/WebTM.csproj.user | 2
WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_YangMao.html | 73 +++++++++--------
WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html | 51 +++++++++---
WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_MaoJian.html | 70 +++++++++--------
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 2
5 files changed, 115 insertions(+), 83 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index c2c4c7b..8cc4879 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\WorkBench\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/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index ed1d620..f67953f 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -2267,7 +2267,7 @@
layer.open({
type: 1, // page 灞傜被鍨�
- area: ['500px', '500px'],
+ area: ['500px', 'auto'],
title: '浠锋牸淇℃伅',
shade: 0.6, // 閬僵閫忔槑搴�
shadeClose: 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_MateOutBillEdit_MaoJian.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_MateOutBillEdit_MaoJian.html"
index 8a9cb83..ee9ea36 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_MateOutBillEdit_MaoJian.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_MateOutBillEdit_MaoJian.html"
@@ -71,6 +71,8 @@
id="HBillNo" readonly="readonly" autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
<input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
+ <input id="HMainSourceBillType" name="HMainSourceBillType" type="hidden"
+ value="姣涘皷" />
</div>
</div>
<div class="layui-inline">
@@ -135,8 +137,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瀹㈡埛<label style="color:red"> *
- </label></label>
+ <label class="layui-form-label">瀹㈡埛</label>
<div class="layui-input-inline">
<input class="layui-input" name="HCusName" lay-verify="HCusName"
id="HCusName" readonly="readonly" autocomplete="off">
@@ -901,13 +902,14 @@
for (var i = 0; i < option.data.length; i++) {
var HMaterRuleType = option.data[i].HMaterRuleType;
var HMaterRuleExternType = option.data[i].HMaterRuleExternType;
- if (HMaterRuleType == "鏌撴枡") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
- } else if (HMaterRuleType == "鍔╁墏") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
- } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
- } else if (HMaterRuleExternType == '姣涘皷') {
+ // if (HMaterRuleType == "鏌撴枡") {
+ // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
+ // } else if (HMaterRuleType == "鍔╁墏") {
+ // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
+ // } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
+ // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
+ // } else if (HMaterRuleExternType == '姣涘皷') {
+ if (HMaterRuleExternType == '姣涘皷') {
option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
}
}
@@ -925,13 +927,14 @@
for (var i = 0; i < option.data.length; i++) {
var HMaterRuleType = option.data[i].HMaterRuleType;
var HMaterRuleExternType = option.data[i].HMaterRuleExternType;
- if (HMaterRuleType == "鏌撴枡") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
- } else if (HMaterRuleType == "鍔╁墏") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
- } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
- } else if (HMaterRuleExternType == '姣涘皷') {
+ //if (HMaterRuleType == "鏌撴枡") {
+ // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
+ //} else if (HMaterRuleType == "鍔╁墏") {
+ // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
+ //} else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
+ // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
+ //} else if (HMaterRuleExternType == '姣涘皷') {
+ if (HMaterRuleExternType == '姣涘皷') {
option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
}
}
@@ -1136,13 +1139,14 @@
var HMaterRuleType = obj.data.HMaterRuleType;
var HMaterRuleExternType = obj.data.HMaterRuleExternType;
- if (HMaterRuleType == "鏌撴枡") {
- HQty = dealDoubleToFixed(HRate * HWeight);
- } else if (HMaterRuleType == "鍔╁墏") {
- HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
- } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
- } else if (HMaterRuleExternType == '姣涘皷') {
+ // if (HMaterRuleType == "鏌撴枡") {
+ // HQty = dealDoubleToFixed(HRate * HWeight);
+ // } else if (HMaterRuleType == "鍔╁墏") {
+ // HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
+ // } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
+ // HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
+ // } else if (HMaterRuleExternType == '姣涘皷') {
+ if (HMaterRuleExternType == '姣涘皷') {
HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -1333,8 +1337,8 @@
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: 'HMaterCode', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
- , { field: 'HMaterRuleType', title: '鐗╂枡鍏紡', width: 100 }
- , { field: 'HMaterRuleExternType', title: '鐗╂枡鍏紡2', width: 100 }
+ //, { field: 'HMaterRuleType', title: '鐗╂枡鍏紡', width: 100, type: 'hidden' }
+ , { field: 'HMaterRuleExternType', title: '鐗╂枡鍏紡', width: 100 }
, { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', width: 100 }
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
, { field: 'HUnitCode', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitCode', width: 100, hide: true }
@@ -1739,16 +1743,16 @@
//鏍规嵁鐗╂枡鐨� 鐗╂枡鍏紡 璁＄畻 閲嶉噺
var HWeight = $("#HWeight").val();
var HWaterQty = $("#HWaterQty").val();
- if (option.data[rowIndex + i].HMaterRuleType == "鏌撴枡") {
- option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight);
- } else if (option.data[rowIndex + i].HMaterRuleType == "鍔╁墏") {
- option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001);
- } else if (option.data[rowIndex + i].HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
- } else if (option.data[rowIndex + i].HMaterRuleExternType == "姣涘皷") {
+ // if (option.data[rowIndex + i].HMaterRuleType == "鏌撴枡") {
+ // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight);
+ // } else if (option.data[rowIndex + i].HMaterRuleType == "鍔╁墏") {
+ // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001);
+ // } else if (option.data[rowIndex + i].HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
+ // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
+ // } else if (option.data[rowIndex + i].HMaterRuleExternType == "姣涘皷") {
+ if (option.data[rowIndex + i].HMaterRuleExternType == "姣涘皷") {
option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
}
- debugger
}
table.render(option);
layer.closeAll();
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_MateOutBillEdit_YangMao.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_MateOutBillEdit_YangMao.html"
index 4bf65c9..d1cae05 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_MateOutBillEdit_YangMao.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_MateOutBillEdit_YangMao.html"
@@ -71,6 +71,7 @@
id="HBillNo" readonly="readonly" autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
<input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
+ <input id="HMainSourceBillType" name="HMainSourceBillType" type="hidden" value="缇婃瘺鏌撹壊"/>
</div>
</div>
<div class="layui-inline">
@@ -139,8 +140,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瀹㈡埛<label style="color:red"> *
- </label></label>
+ <label class="layui-form-label">瀹㈡埛</label>
<div class="layui-input-inline">
<input class="layui-input" name="HCusName" lay-verify="HCusName"
id="HCusName" readonly="readonly" autocomplete="off">
@@ -178,7 +178,7 @@
<input type="text" name="HWeight" id="HWeight" class="layui-input"
value=""style="float: left; width: 150px;">
<button type="button" lay-submit="" class="layui-btn"
- lay-filter="btnSearchWeight" style="width:40px;">
+ lay-filter="btnSearchWeight" id="btnSearchWeight" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"
style="margin-left:-9px;"></i>
</button>
@@ -663,7 +663,7 @@
if (checkStatus.data.length !== 1) {
return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
}
- $("#HWeight").val(checkStatus.data[0]['鍏嬮噸'])
+ $("#HWeight").val(checkStatus.data[0]['鍏嬮噸']).trigger('change');
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -744,7 +744,6 @@
if (checkStatus.data.length !== 1) {
return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
}
- debugger
$("#HMaterID").val(checkStatus.data[0]['HItemID'])
$("#HMaterName").val(checkStatus.data[0]['鐗╂枡鍚嶇О'])
$("#HModel").val(checkStatus.data[0]['瑙勬牸鍨嬪彿'])
@@ -994,13 +993,14 @@
for (var i = 0; i < option.data.length; i++) {
var HMaterRuleType = option.data[i].HMaterRuleType;
var HMaterRuleExternType = option.data[i].HMaterRuleExternType;
- if (HMaterRuleType == "鏌撴枡") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
- } else if (HMaterRuleType == "鍔╁墏") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
- } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
- } else if (HMaterRuleExternType == '缇婃瘺') {
+ // if (HMaterRuleType == "鏌撴枡") {
+ // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
+ // } else if (HMaterRuleType == "鍔╁墏") {
+ // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
+ // } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
+ // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
+ // } else if (HMaterRuleExternType == '缇婃瘺') {
+ if (HMaterRuleExternType == '缇婃瘺') {
option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
}
}
@@ -1018,13 +1018,14 @@
for (var i = 0; i < option.data.length; i++) {
var HMaterRuleType = option.data[i].HMaterRuleType;
var HMaterRuleExternType = option.data[i].HMaterRuleExternType;
- if (HMaterRuleType == "鏌撴枡") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
- } else if (HMaterRuleType == "鍔╁墏") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
- } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
- } else if (HMaterRuleExternType == '缇婃瘺') {
+ // if (HMaterRuleType == "鏌撴枡") {
+ // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
+ // } else if (HMaterRuleType == "鍔╁墏") {
+ // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
+ // } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
+ // option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
+ // } else if (HMaterRuleExternType == '缇婃瘺') {
+ if (HMaterRuleExternType == '缇婃瘺') {
option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
}
}
@@ -1228,13 +1229,14 @@
var HQty = 0;
var HMaterRuleType = obj.data.HMaterRuleType;
var HMaterRuleExternType = obj.data.HMaterRuleExternType;
- if (HMaterRuleType == "鏌撴枡") {
- HQty = dealDoubleToFixed(HRate * HWeight);
- } else if (HMaterRuleType == "鍔╁墏") {
- HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
- } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
- } else if (HMaterRuleExternType == '缇婃瘺') {
+ // if (HMaterRuleType == "鏌撴枡") {
+ // HQty = dealDoubleToFixed(HRate * HWeight);
+ // } else if (HMaterRuleType == "鍔╁墏") {
+ // HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
+ // } else if (HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
+ // HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
+ // } else if (HMaterRuleExternType == '缇婃瘺') {
+ if (HMaterRuleExternType == '缇婃瘺') {
HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -1425,8 +1427,8 @@
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: 'HMaterCode', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
- , { field: 'HMaterRuleType', title: '鐗╂枡鍏紡', width: 100 }
- , { field: 'HMaterRuleExternType', title: '鐗╂枡鍏紡2', width: 100 }
+ // , { field: 'HMaterRuleType', title: '鐗╂枡鍏紡', width: 100 }
+ , { field: 'HMaterRuleExternType', title: '鐗╂枡鍏紡', width: 100 }
, { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', width: 100 }
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
, { field: 'HUnitCode', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitCode', width: 100, hide: true }
@@ -1832,13 +1834,14 @@
//鏍规嵁鐗╂枡鐨� 鐗╂枡鍏紡 璁＄畻 閲嶉噺
var HWeight = $("#HWeight").val();
var HWaterQty = $("#HWaterQty").val();
- if (option.data[rowIndex + i].HMaterRuleType == "鏌撴枡") {
- option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight);
- } else if (option.data[rowIndex + i].HMaterRuleType == "鍔╁墏") {
- option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001);
- } else if (option.data[rowIndex + i].HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
- option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
- } else if (option.data[rowIndex + i].HMaterRuleExternType == "缇婃瘺") {
+ // if (option.data[rowIndex + i].HMaterRuleType == "鏌撴枡") {
+ // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight);
+ // } else if (option.data[rowIndex + i].HMaterRuleType == "鍔╁墏") {
+ // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001);
+ // } else if (option.data[rowIndex + i].HMaterRuleType == "鍔╁墏锛堟寜甯冪畻锛�") {
+ // option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
+ // } else if (option.data[rowIndex + i].HMaterRuleExternType == "缇婃瘺") {
+ if (option.data[rowIndex + i].HMaterRuleExternType == "缇婃瘺") {
option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
}
}
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 bd360cb..10e68f5 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"
@@ -269,6 +269,20 @@
</div>
</div>
<script>
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ var params = getUrlVars();
+ var subType = decodeURIComponent(params['subType']) // 鍖哄垎鍗曟嵁绫诲瀷
+ console.log("subType: ", subType)
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -298,7 +312,7 @@
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
//#endregion
- var titleData = ["鍗曟嵁ID", "hsubid", "HDeptID", "鎵撴祮浜哄唴鐮�", "瀹㈡埛鍐呯爜", "涓讳骇鍝佸唴鐮�", "HMaterID", "HUnitID", "浠诲姟鍗曞唴鐮�", "浠诲姟鍗曞瓙鍐呯爜", "宸ュ簭娴佽浆鍗″唴鐮�", "宸ュ簭娴佽浆鍗″瓙鍐呯爜", 'HMaterRuleExternType'];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["鍗曟嵁ID", "hsubid", "HDeptID", "鎵撴祮浜哄唴鐮�", "瀹㈡埛鍐呯爜", "涓讳骇鍝佸唴鐮�", "HMaterID", "HUnitID", "浠诲姟鍗曞唴鐮�", "浠诲姟鍗曞瓙鍐呯爜", "宸ュ簭娴佽浆鍗″唴鐮�", "宸ュ簭娴佽浆鍗″瓙鍐呯爜", 'HMaterRuleExternType', 'HMainSourceBillType'];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//#region 銆愯繃婊ゆ柟妗堛��
//杩囨护鏉′欢鐨刢lass绫�
@@ -792,10 +806,10 @@
if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
var content = '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
- if (data.HMaterRuleExternType) {
- if (data.HMaterRuleExternType == '缇婃瘺') {
+ if (subType) {
+ if (subType == '缇婃瘺鏌撹壊') {
content = '../棰嗘枡鍑哄簱/Kf_MateOutBillEdit_YangMao.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
- } else if (data.HMaterRuleExternType == '姣涘皷') {
+ } else if (subType == '姣涘皷') {
content = '../棰嗘枡鍑哄簱/Kf_MateOutBillEdit_MaoJian.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
}
}
@@ -831,6 +845,9 @@
}
if (HEndDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ }
+ if(subType) {
+ sWhere += " and HMainSourceBillType = N'" + subType + "'"; // 鏍规嵁閫掑叆鍗曟嵁绫诲瀷鐨勪笉鍚岀瓫閫変笉鍚岀殑鍗曟嵁
}
$.ajax({
url: GetWEBURL() + '/Kf_MateOutBill/GetMateOutBillList',
@@ -913,6 +930,15 @@
//#region 鏂板
function set_AddNew() {
+ debugger
+ var content = '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1'
+ if(subType) {
+ if(subType == '缇婃瘺鏌撹壊'){
+ content = '../棰嗘枡鍑哄簱/Kf_MateOutBillEdit_YangMao.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1'
+ }else if(subType == '姣涘皷') {
+ content = '../棰嗘枡鍑哄簱/Kf_MateOutBillEdit_MaoJian.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1'
+ }
+ }
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
@@ -921,7 +947,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
+ content: content,
end: function () {
//鍒锋柊椤甸潰,
/*get_FastQuery(table, option);*/
@@ -939,13 +965,12 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- debugger
var linterid = data[0].hmainid.toString();
var content = '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
- if (data[0].HMaterRuleExternType) {
- if (data[0].HMaterRuleExternType == '缇婃瘺') {
+ if (subType) {
+ if (subType == '缇婃瘺鏌撹壊') {
content = '../棰嗘枡鍑哄簱/Kf_MateOutBillEdit_YangMao.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
- } else if (data[0].HMaterRuleExternType == '姣涘皷') {
+ } else if (subType == '姣涘皷') {
content = '../棰嗘枡鍑哄簱/Kf_MateOutBillEdit_MaoJian.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
}
}
@@ -969,7 +994,7 @@
}
})
} else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鍒讹紒');
}
}
//#endregion
@@ -981,10 +1006,10 @@
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
var content = '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
- if (data[0].HMaterRuleExternType) {
- if (data[0].HMaterRuleExternType == '缇婃瘺') {
+ if (subType) {
+ if (subType == '缇婃瘺鏌撹壊') {
content = '../棰嗘枡鍑哄簱/Kf_MateOutBillEdit_YangMao.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
- } else if (data[0].HMaterRuleExternType == '姣涘皷') {
+ } else if (subType == '姣涘皷') {
content = '../棰嗘枡鍑哄簱/Kf_MateOutBillEdit_MaoJian.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
}
}
--
Gitblit v1.9.1