From efc71d59d0f052330b96eb3e64f18bb8e6ae0c9b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期日, 24 四月 2022 16:59:38 +0800
Subject: [PATCH] 提料计划单 编辑
---
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html | 8
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html | 4
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillList.html | 4
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 2
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html | 10
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html | 67 ++++-
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html | 476 +++++++++++++++++++++++++++++++-----------
WebTM/views/index.html | 2
WebTM/views/基础资料/公用基础资料/Gy_Currency.html | 36 +-
WebTM/WebTM.csproj | 1
10 files changed, 440 insertions(+), 170 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8371784..5cd740d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -859,6 +859,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勬墭鍗曠紪杈慭Sc_GroupOrderBillEdit_Fast.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\瑕佹枡璁″垝\JIT_NeedMaterPlanBillEdit.html" />
<Content Include="views\鐢熶骇绠＄悊\瑕佹枡璁″垝\JIT_NeedMaterPlanBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBill.html" />
<Content Include="views\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillList.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index e1a3106..9ebcb57 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -371,7 +371,7 @@
<a>瑕佹枡璁″垝</a>
<dl class="layui-nav-child">
<dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_LiftMaterPlanBillEdit.html">瑕佹枡璁″垝鍗�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html">瑕佹枡璁″垝鍗�</a></dd>
</dl>
</dd>
<dd>
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_Currency.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_Currency.html"
index 95127ad..81eecec 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_Currency.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_Currency.html"
@@ -128,24 +128,24 @@
//#endregion
//#region 鍒濆鍖栬〃鏍�
- $.ajax({
- url: GetWEBURL() + '/Gy_Currency/LoadTree',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (result) {
- var data = result.data;
- //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
- var treeData = LoadTree(data);
- tree.render({
- elem: '#treeCurrency',
- data: treeData,
- id: 'treeId',
- disabled: 'disabled',
- showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
- showLine: false
- });
- }
- });
+ //$.ajax({
+ // url: GetWEBURL() + '/Gy_Currency/LoadTree',
+ // type: "GET",
+ // data: { "sWhere": sWhere },
+ // success: function (result) {
+ // var data = result.data;
+ // //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+ // var treeData = LoadTree(data);
+ // tree.render({
+ // elem: '#treeCurrency',
+ // data: treeData,
+ // id: 'treeId',
+ // disabled: 'disabled',
+ // showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
+ // showLine: false
+ // });
+ // }
+ //});
var option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
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 03b27a2..3921b40 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"
@@ -61,7 +61,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><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_DeleteBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
</div>
</script>
</form>
@@ -118,7 +118,7 @@
case 'set_DeleteBill': set_DeleteBill();
break;
//鍏抽棴
- case 'set_DeleteBill': set_CloseBill();
+ case 'set_CloseBill': set_CloseBill();
break;
};
});
@@ -230,7 +230,7 @@
//鑾峰彇缁勭粐
function Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
- var Organization = '';
+ var Organization = '<option style="color:blue;" value="">缁勭粐</option>';
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
@@ -382,7 +382,7 @@
var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
$.ajax({
- url: GetWEBURL() + '/Cg_PODemandPlanBill/DelPODemandPlanBillList'
+ url: GetWEBURL() + '/Cg_PODemandPlanBill/ClosePODemandPlanBillList'
, type: "GET"
, data: { "HInterID": HInterID, "User": sessionStorage["HUserName"] }
, success: function (result) {
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_LiftMaterPlanBillEdit.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_LiftMaterPlanBillEdit.html"
index 04d5552..9cc139f 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_LiftMaterPlanBillEdit.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_LiftMaterPlanBillEdit.html"
@@ -71,19 +71,17 @@
</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="HSubORGID" name="HSubORGID" id="HSubORGID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HSubORGIDName" name="HSubORGIDName" id="HSubORGIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSubORGID" id="btnHSubORGID" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <label class="layui-form-label" style="width: 85px;">濮斿缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HSubORGID" id="HSubORGID" lay-verify="HSubORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </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;">
- <input type="text" class="layui-input" lay-verify="HAddress " name="HAddress " id="HAddress ">
+ <input type="text" class="layui-input" lay-verify="HAddress" name="HAddress" id="HAddress">
</div>
</div>
</div>
@@ -121,7 +119,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鎻愭枡鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 48px;">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 75px;">
</div>
</div>
<div class="layui-inline">
@@ -202,6 +200,26 @@
</select>
</script>
+ <!--琛屼笅鎷夐�夋嫨(閲囪喘缁勭粐)-->
+ <script type="text/html" id="HPURCHASEORGIDSub">
+ <select name="HPURCHASEORGIDSub" lay-filter="HPURCHASEORGIDSub" id="HPURCHASEORGIDSub{{d.LAY_TABLE_INDEX+1}}">
+ <option value=""></option>
+ <option value="1">钃濇捣瀹炰笟闆嗗洟</option>
+ <option value="100035">钃濇捣閫氳鍏徃</option>
+ <option value="100037">閫氳鍏徃鏈儴</option>
+ <option value="100038">鎵嬫満浜嬩笟閮�</option>
+ <option value="100039">骞虫澘浜嬩笟閮�</option>
+ <option value="100040">钃濇捣鐢靛瓙鍏徃</option>
+ <option value="100041">钃濇捣閿�鍞叕鍙�</option>
+ <option value="100042">棣欐腐閿�鍞叕鍙�</option>
+ <option value="100043">钃濇捣鐢靛瓙鍟嗗姟鏈夐檺鍏徃</option>
+ <option value="100044">钃濇捣闆跺敭杩為攣鍏徃</option>
+ <option value="100045">骞垮窞闂ㄥ簵</option>
+ <option value="100046">娣卞湷闂ㄥ簵</option>
+ <option value="100047">鏉窞鍗庡畯閫氫俊璁惧鏈夐檺鍏徃</option>
+ </select>
+ </script>
+
<!--澶嶉�夋 鍏抽棴鐘舵��-->
<script type="text/html" id="HCloseStatus">
<div class="layui-input-block" style="margin-left: 20px;">
@@ -209,10 +227,10 @@
</div>
</script>
- <!--鏃堕棿 宸ュ崟鐢熶骇鏃ユ湡-->
- <script type="text/html" id="HDayPlanDate">
- <div class="layui-input-block" style="margin-left: 0px;margin-top:-6px;width:100%">
- <input type="date" name="HDayPlanDate" lay-filter="HDayPlanDate" id="HDayPlanDate{{d.LAY_TABLE_INDEX+1}}" class="layui-input">
+ <!--澶嶉�夋 鏄惁鎵嬪伐鍏抽棴-->
+ <script type="text/html" id="HCloseTypeSub">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HCloseTypeSub" lay-filter="HCloseTypeSub" id="HCloseTypeSub{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
</div>
</script>
@@ -231,13 +249,19 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
+ , laydate = layui.laydate
, element = layui.element;
//鍒濆琛ㄦ牸鏁版嵁
var rowdata = [{
- "HSupplierID": "", "HSupplierNumber": "", "HSupplierName": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
- , "HJITMaterGroup": "", "HJITSafeStock": "", "HJITMaterDemand": "", "HJITBatchQty": "", "HDeliveryPeriod": ""
- , "HLeadTime": "", "HLeadTime_Sec": "", "HDeliveryMode": "", "HDeliveryDaysCtrl": "", "HRemark": ""
+ "HLaterReason": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": "", "HUnitIDName": ""
+ , "HErpClsID": "", "HQty": "", "HRemark": "", "HPURCHASEORGID": "", "HStatus": "", "HFixleadTime": ""
+ , "HDayPlanBillNo": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HSourceBillType": "", "HWorkShopID": ""
+ , "HWorkShopIDName": "", "HDayPlanDate": "", "HRelationQty1": "", "HPOOrderInterID": "", "HPOOrderEntryID": "", "HPOOrderBillNo": ""
+ , "HPOOrderBillSEQ": "", "HWWOrderInterID": "", "HWWOrderEntryID": "", "HWWOrderBillNo": "", "HPurchaseDeptID": ""
+ , "HPurchaseDeptIDName": "", "HCloseTypeSub": false, "HCloseMan": "", "HEntryCloseDate": "", "HSendQty": "", "HReciveQty": ""
+ , "HCloseStatus": false, "HRemoveQty": "", "HSeOrderBillNo": "", "HUnReciveQty": "", "HPOOrderBillDate": "", "HPOOrderBillDeliveryDate": ""
+ , "HPOOrderBillRemark": "", "HPOOrderBillNote": ""
}];
//#endregion
@@ -295,44 +319,47 @@
, { field: 'HLaterReason', title: '寤惰繜鍘熷洜', templet: '#HLaterReason', width: 200 }//list
, { field: 'HMaterID', title: 'HMaterID', hide: true }
, { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', edit: 'text', event: "HMaterID" }
- , { field: 'HSupplierName', title: '鐗╂枡鍚嶇О' }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
, { field: 'HUnitID', title: 'HUnitID', hide: true }
, { field: 'HUnitIDName', title: '璁￠噺鍗曚綅', edit: 'text', event: "HUnitID" }
, { field: 'HErpClsID', title: '鐗╂枡灞炴��', templet: '#HErpClsID' }//list
, { field: 'HQty', title: '鏁伴噺', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { field: 'HPURCHASEORGID', title: 'HPURCHASEORGID', hide: true }
- , { field: 'HPURCHASEORGIDName', title: '閲囪喘缁勭粐', edit: 'text', event: "HPURCHASEORGID" }
+ , { field: 'HPURCHASEORGID', title: '閲囪喘缁勭粐', templet: "#HPURCHASEORGIDSub" }
, { field: 'HStatus', title: '鐘舵��', templet: '#HStatus' }//list
, { field: 'HFixleadTime', title: '鎻愬墠鏈�', edit: 'text' }
, { field: 'HDayPlanBillNo', title: '鏃ヨ鍒掑伐鍗曠紪鍙�', edit: 'text' }
- //缂哄皯鏃ヨ鍒掑伐鍗昮id 瀛恑d 鐢熶骇璁㈠崟鍙� 婧愬崟绫诲瀷
+ , { field: 'HSourceInterID', title: '鏃ヨ鍒掑伐鍗旻ID', edit: 'text' }
+ , { field: 'HSourceEntryID', title: '鏃ヨ鍒掑伐鍗旻ENTRYID', width: 200, edit: 'text' }
+ , { field: 'HSourceBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text' }
, { field: 'HWorkShopID', title: 'HWorkShopID', hide: true }
- , { field: 'HWorkShopIDName', title: '鐢熶骇杞﹂棿', edit: 'text', event: "HPURCHASEORGID" }
- , { field: 'HDayPlanDate', title: '宸ュ崟鐢熶骇鏃ユ湡', width: 200, templet: '#HDayPlanDate' }//date
- , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
- , { field: 'HRelationQty1 ', title: '鍙敤閲囪喘鏁伴噺', edit: 'text' }
+ , { field: 'HWorkShopIDName', title: '鐢熶骇杞﹂棿', edit: 'text', event: "HWorkShopID" }
+ , { field: 'HDayPlanDate', title: '宸ュ崟鐢熶骇鏃ユ湡', width: 200, event: 'HDayPlanDate' }//date
+ , { field: 'HRelationQty1', title: '鍙敤閲囪喘鏁伴噺', edit: 'text' }
, { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟鍐呯爜', edit: 'text' }
- , { field: 'HPOOrderEntryID ', title: '閲囪喘璁㈠崟瀛愬唴鐮�', edit: 'text' }
- , { field: 'HPOOrderBillNo ', title: '閲囪喘璁㈠崟鍙�', edit: 'text' }
- , { field: 'HPOOrderBillSEQ ', title: '閲囪喘璁㈠崟琛屽彿', edit: 'text' }
- , { field: 'HWWOrderInterID ', title: '濮斿璁㈠崟鍐呯爜', edit: 'text' }
- , { field: 'HWWOrderEntryID ', title: '濮斿璁㈠崟瀛愬唴鐮�', edit: 'text' }
- , { field: 'HWWOrderBillNo ', title: '濮斿璁㈠崟', edit: 'text' }
- , { field: 'HPurchaseDeptID ', title: 'HPurchaseDeptID', hide: true }
- , { field: 'HPurchaseDeptIDName ', title: '閲囪喘閮ㄩ棬', edit: 'text', event: "HPurchaseDeptID" }
- //琛屽叧闂� 琛屽叧闂棩鏈� 鏄惁鎵嬪伐鍏抽棴
- , { field: 'HSendQty ', title: '閫佽揣鍗曟暟閲�', edit: 'text' }
+ , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', edit: 'text' }
+ , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', edit: 'text' }
+ , { field: 'HPOOrderBillSEQ', title: '閲囪喘璁㈠崟琛屽彿', edit: 'text' }
+ , { field: 'HWWOrderInterID', title: '濮斿璁㈠崟鍐呯爜', edit: 'text' }
+ , { field: 'HWWOrderEntryID', title: '濮斿璁㈠崟瀛愬唴鐮�', edit: 'text' }
+ , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟', edit: 'text' }
+ , { field: 'HPurchaseDeptID', title: 'HPurchaseDeptID', hide: true }
+ , { field: 'HPurchaseDeptIDName', title: '閲囪喘閮ㄩ棬', edit: 'text', event: "HPurchaseDeptID" }
+ , { field: 'HCloseTypeSub', title: '鏄惁鎵嬪伐鍏抽棴', templet: "#HCloseTypeSub" }//ck
+ , { field: 'HCloseMan', title: '琛屽叧闂�', width: 200, edit: 'text' }
+ , { field: 'HEntryCloseDate', title: '琛屽叧闂棩鏈�', width: 200, event: 'HEntryCloseDate' }//date
+ , { field: 'HSendQty', title: '閫佽揣鍗曟暟閲�', edit: 'text' }
, { field: 'HReciveQty', title: '鏀舵枡鏁伴噺', edit: 'text' }
, { field: 'HCloseStatus', title: '鍏抽棴鐘舵��', templet: "#HCloseStatus" }//ck
, { field: 'HRemoveQty', title: '杞Щ鏁伴噺', edit: 'text' }
, { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', edit: 'text' }
- , { field: 'HUnReciveQty ', title: '鏈敹鏂欐暟閲�', edit: 'text' }
- , { field: 'HPOOrderBillDate ', title: '閲囪喘璁㈠崟鍗曟嵁鏃ユ湡', edit: 'text', width: 150 }//date
- , { field: 'HPOOrderBillDeliveryDate ', title: '閲囪喘璁㈠崟浜よ揣鏃ユ湡', edit: 'text', width: 150 } // date
- , { field: 'HPOOrderBillRemark ', title: '閲囪喘璁㈠崟鎽樿', edit: 'text' }
- , { field: 'HPOOrderBillNote ', title: '閲囪喘璁㈠崟琛ㄤ綋澶囨敞', edit: 'text', width: 200 }
+ , { field: 'HUnReciveQty', title: '鏈敹鏂欐暟閲�', edit: 'text' }
+ , { field: 'HPOOrderBillDate', title: '閲囪喘璁㈠崟鍗曟嵁鏃ユ湡', event: "HPOOrderBillDate", width: 200 }//date
+ , { field: 'HPOOrderBillDeliveryDate', title: '閲囪喘璁㈠崟浜よ揣鏃ユ湡', event: "HPOOrderBillDeliveryDate", width: 200 } // date
+ , { field: 'HPOOrderBillRemark', title: '閲囪喘璁㈠崟鎽樿', edit: 'text' }
+ , { field: 'HPOOrderBillNote', title: '閲囪喘璁㈠崟琛ㄤ綋澶囨敞', edit: 'text', width: 200 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
}
@@ -344,11 +371,6 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
- //閫夋嫨濮斿缁勭粐鎸夐挳 鏆傛棤
- form.on('submit(btnHSubORGID)', function () {
- get_btnHSubORGID();
- });
//閫夋嫨渚涘簲鍟嗘寜閽�
form.on('submit(btnHSupplierID)', function () {
@@ -366,39 +388,24 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HSupplierID": "", "HSupplierNumber": "", "HSupplierName": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
- , "HJITMaterGroup": "", "HJITSafeStock": "", "HJITMaterDemand": "", "HJITBatchQty": "", "HDeliveryPeriod": ""
- , "HLeadTime": "", "HLeadTime_Sec": "", "HDeliveryMode": "", "HDeliveryDaysCtrl": "", "HRemark": ""
+ "HLaterReason": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": "", "HUnitIDName": ""
+ , "HErpClsID": "", "HQty": "", "HRemark": "", "HPURCHASEORGID": "", "HStatus": "", "HFixleadTime": ""
+ , "HDayPlanBillNo": "", "HSourceInterID": 0, "HSourceEntryID":0, "HSourceBillNo": "", "HSourceBillType": "", "HWorkShopID": ""
+ , "HWorkShopIDName": "", "HDayPlanDate": "", "HRelationQty1": "", "HPOOrderInterID": "", "HPOOrderEntryID": "", "HPOOrderBillNo": ""
+ , "HPOOrderBillSEQ": "", "HWWOrderInterID": "", "HWWOrderEntryID": "", "HWWOrderBillNo": "", "HPurchaseDeptID": ""
+ , "HPurchaseDeptIDName": "", "HCloseTypeSub": false, "HCloseMan": "", "HEntryCloseDate": "", "HSendQty": "", "HReciveQty": ""
+ , "HCloseStatus": false, "HRemoveQty": "", "HSeOrderBillNo": "", "HUnReciveQty": "", "HPOOrderBillDate": "", "HPOOrderBillDeliveryDate": ""
+ , "HPOOrderBillRemark": "", "HPOOrderBillNote": ""
};
switch (obj.event) {
case 'btn-AddLine':
-
+
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
-
- var date = [];
- for (var i = 1; i <= option.data.length; i++) {
- date.push($('input[name=HDayPlanDate]').eq(i - 1).val())
-
- //寤惰繜鍘熷洜
- $('#HLaterReason' + i + '').find("option[value='" + option.data[i - 1].HLaterReason + "']").attr("selected", true);
- //鐗╂枡灞炴��
- $('#HErpClsID' + i + '').find("option[value='" + option.data[i - 1].HErpClsID + "']").attr("selected", true);
- //鐘舵��
- $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
-
- //鍏抽棴鐘舵��
- if (option.data[i - 1].HCloseStatus) {
- $('#HCloseStatus' + i + '').attr("checked", true);
- }
- }
- form.render('select');
- form.render('checkbox');
table.render(option);
- for (var i = 0; i < date.length; i++) {
- $('#HDayPlanDate' + i+1 + '').val(Format(date[i], "yyyy-MM-dd"))
- }
+ //琛屾暟鎹� 涓嬫媺妗� 澶嶉�夋 鏄剧ず
+ checkRefresh();
break;
case 'btn-CopyLine':
var copydata = JSON.stringify(data);
@@ -415,22 +422,8 @@
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
- for (var i = 1; i <= option.data.length; i++) {
-
- //寤惰繜鍘熷洜
- $('#HLaterReason' + i + '').find("option[value='" + option.data[i - 1].HLaterReason + "']").attr("selected", true);
- //鐗╂枡灞炴��
- $('#HErpClsID' + i + '').find("option[value='" + option.data[i - 1].HErpClsID + "']").attr("selected", true);
- //鐘舵��
- $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
-
- //鍏抽棴鐘舵��
- if (option.data[i - 1].HCloseStatus) {
- $('#HCloseStatus' + i + '').attr("checked", true);
- }
- }
- form.render('select');
- form.render('checkbox');
+ //琛屾暟鎹� 涓嬫媺妗� 澶嶉�夋 鏄剧ず
+ checkRefresh();
}
break;
}
@@ -440,6 +433,79 @@
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ //#region 鏃堕棿鎺т欢 缁戝畾
+
+ var data = obj.data;
+ //鏃ヨ鍒掔敓浜ф棩鏈�
+ if (obj.event == 'HDayPlanDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ checkRefresh();
+ }
+ });
+ }
+
+ //琛屽叧闂棩鏈�
+ if (obj.event == 'HEntryCloseDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ checkRefresh();
+ }
+ });
+ }
+
+ //閲囪喘璁㈠崟鍗曟嵁鏃ユ湡
+ if (obj.event == 'HPOOrderBillDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ checkRefresh();
+ }
+ });
+ }
+
+ //閲囪喘璁㈠崟浜よ揣鏃ユ湡
+ if (obj.event == 'HPOOrderBillDeliveryDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ checkRefresh();
+ }
+ });
+ }
+
+ //#endregion
});
@@ -505,6 +571,19 @@
});
});
+ //琛岄�夋嫨澶勭悊锛堥噰璐粍缁囷級
+ form.on('select(HPURCHASEORGIDSub)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HPURCHASEORGID = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
//鍏抽棴鐘舵��
form.on('checkbox(HCloseStatus)', function (data) {
//鑾峰彇閫変腑鐨勫��
@@ -517,8 +596,18 @@
});
});
- //宸ュ崟鐢熶骇鏃ユ湡
-
+ //鏄惁鎵嬪伐鍏抽棴
+ form.on('checkbox(HCloseTypeSub)', function (data) {
+ //鑾峰彇閫変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HCloseTypeSub = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -526,7 +615,7 @@
//缁勭粐閫夋嫨椤甸潰
function get_Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
- var Organization = '';
+ var Organization = '<option style="color:blue;" value="0">缁勭粐</option>';
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
@@ -537,6 +626,7 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HPURCHASEORGID").append(Organization);
+ $("#HSubORGID").append(Organization);
form.render('select');
}
layer.closeAll("loading");
@@ -554,6 +644,33 @@
vars[hash[0]] = hash[1];
}
return vars;
+ }
+
+ //澶氶�� 鍒锋柊琛ㄦ牸
+ function checkRefresh() {
+ for (var i = 1; i <= option.data.length; i++) {
+ console.log(JSON.stringify(option.data[i - 1]))
+ //寤惰繜鍘熷洜
+ $('#HLaterReason' + i + '').find("option[value='" + option.data[i - 1].HLaterReason + "']").attr("selected", true);
+ //鐗╂枡灞炴��
+ $('#HErpClsID' + i + '').find("option[value='" + option.data[i - 1].HErpClsID + "']").attr("selected", true);
+ //鐘舵��
+ $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
+ //閲囪喘缁勭粐
+ $('#HPURCHASEORGIDSub' + i + '').find("option[value='" + option.data[i - 1].HPURCHASEORGID + "']").attr("selected", true);
+
+ //鍏抽棴鐘舵��
+ if (option.data[i - 1].HCloseStatus) {
+ $('#HCloseStatus' + i + '').attr("checked", true);
+ }
+
+ //鏄惁鎵嬪伐鍏抽棴
+ if (option.data[i - 1].HCloseTypeSub) {
+ $('#HCloseTypeSub' + i + '').attr("checked", true);
+ }
+ }
+ form.render('select');
+ form.render('checkbox');
}
//琛屽唴鍒犻櫎
@@ -626,7 +743,7 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
$("#HSettleCurrId").val(checkStatus.data[0].HItemID);
- $("#HSettleCurrIdName").val(checkStatus.data[0].甯佸埆);
+ $("#HSettleCurrIdName").val(checkStatus.data[0].璐у竵鍚嶇О);
layer.close(index);//鍏抽棴寮圭獥
}
})
@@ -636,37 +753,7 @@
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
- //渚涘簲鍟�
- if (obj.event == "HSupplierID") {
- //鎵撳紑渚涘簲鍟嗗皬绐椾綋
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "渚涘簲鍟嗗垪琛�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html", "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HSupplierID": checkStatus.data[0].HItemID
- , "HSupplierNumber": checkStatus.data[0].HNumber
- , "HSupplierName": checkStatus.data[0].HName
- })
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
//鐗╂枡
if (obj.event == "HMaterID") {
//鎵撳紑鐗╂枡 灏忕獥浣�
@@ -700,6 +787,99 @@
}
})
}
+
+ //璁￠噺鍗曚綅
+ if (obj.event == "HUnitID") {
+ //鎵撳紑璁￠噺鍗曚綅灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../Baseset/鍩虹璧勬枡/Gy_UnitList.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HUnitID": checkStatus.data[0].HItemID
+ , "HUnitIDName": checkStatus.data[0].HName
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鐢熶骇杞﹂棿
+ if (obj.event == "HWorkShopID") {
+ //鎵撳紑鐢熶骇杞﹂棿灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐢熶骇杞﹂棿鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HWorkShopID": checkStatus.data[0].HItemID
+ , "HWorkShopIDName": checkStatus.data[0].HName
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //閲囪喘閮ㄩ棬
+ if (obj.event == "HPurchaseDeptID") {
+ //鎵撳紑閲囪喘閮ㄩ棬灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "閮ㄩ棬鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HPurchaseDeptID": checkStatus.data[0].HItemID
+ , "HPurchaseDeptIDName": checkStatus.data[0].HName
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
return false;
}
@@ -711,7 +891,7 @@
{
var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
$.ajax({
- url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/PODemandPlanConfigBillList",
+ url: GetWEBURL() + "/Cg_PODemandPlanBill/Cg_PODemandPlanBillList",
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (d) {
@@ -720,17 +900,54 @@
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": d.data[0].鍗曟嵁鍙�
, "HInterID": d.data[0].hmainid
- , "HPRDORGID": d.data[0].缁勭粐
+ , "HSubORGID": d.data[0].濮斿缁勭粐
+ , "HAddress": d.data[0].浜よ揣鍦扮偣
+ , "HPURCHASEORGID": d.data[0].涓昏〃閲囪喘缁勭粐
+ , "HSupplierID": d.data[0].HSupplierID
+ , "HSupplierIDName": d.data[0].渚涘簲鍟嗗悕绉�
+ , "HSettleCurrId": d.data[0].HSettleCurrId
+ , "HSettleCurrIdName": d.data[0].缁撶畻甯佸埆
+ , "HDate": Format(new Date(d.data[0].鏃ユ湡),'yyyy-MM-dd')
+ , "HRemark": d.data[0].琛ㄥご澶囨敞
+ , "HExplanation": d.data[0].鎽樿
});
//瀛愯〃 璧嬪��
var rowdata = [{
- "HSupplierID": d.data[0].HSupplierID, "HSupplierNumber": d.data[0].渚涘簲鍟嗕唬鐮�, "HSupplierName": d.data[0].渚涘簲鍟嗗悕绉�, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О, "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
- , "HJITMaterGroup": d.data[0].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[0].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[0].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[0].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[0].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
- , "HLeadTime": d.data[0].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[0].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[0].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[0].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[0].琛ㄤ綋澶囨敞
+ "HLaterReason": d.data[0].寤惰繜鍘熷洜, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О
+ , "HMaterModel": d.data[0].瑙勬牸鍨嬪彿, "HUnitID": d.data[0].HUnitID, "HUnitIDName": d.data[0].璁￠噺鍗曚綅
+ , "HErpClsID": d.data[0].鐗╂枡灞炴��, "HQty": d.data[0].鏁伴噺, "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HPURCHASEORGID": d.data[0].瀛愯〃閲囪喘缁勭粐
+ , "HStatus": d.data[0].鐘舵��, "HFixleadTime": d.data[0].鎻愬墠鏈�
+ , "HDayPlanBillNo": d.data[0].鏃ヨ鍒掑伐鍗曠紪鍙�, "HSourceInterID": d.data[0].婧愬崟ID, "HSourceEntryID": d.data[0].婧愬崟瀛怚D
+ , "HSourceBillNo": d.data[0].婧愬崟鍗曞彿, "HSourceBillType": d.data[0].瀛愭簮鍗曠被鍨�, "HWorkShopID": d.data[0].HWorkShopID
+ , "HWorkShopIDName": d.data[0].杞﹂棿鍚嶇О, "HDayPlanDate": Format(new Date(d.data[0].宸ュ崟鐢熶骇鏃ユ湡), 'yyyy-MM-dd'), "HRelationQty1": d.data[0].鍙敤閲囪喘鏁伴噺
+ , "HPOOrderInterID": d.data[0].閲囪喘璁㈠崟鍐呯爜, "HPOOrderEntryID": d.data[0].閲囪喘璁㈠崟瀛愬唴鐮�, "HPOOrderBillNo": d.data[0].閲囪喘璁㈠崟鍙�
+ , "HPOOrderBillSEQ": d.data[0].閲囪喘璁㈠崟琛屽彿, "HWWOrderInterID": d.data[0].濮斿璁㈠崟鍐呯爜, "HWWOrderEntryID": d.data[0].濮斿璁㈠崟瀛愬唴鐮�
+ , "HWWOrderBillNo": d.data[0].濮斿璁㈠崟鍙�, "HPurchaseDeptID": d.data[0].HPurchaseDeptID, "HPurchaseDeptIDName": d.data[0].閲囪喘閮ㄩ棬
+ , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == "1" ? true : false, "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[0].瀛愬叧闂椂闂�), 'yyyy-MM-dd'), "HSendQty": d.data[0].閫佽揣鍗曟暟閲�
+ , "HReciveQty": d.data[0].鏀舵枡鏁伴噺, "HCloseStatus": d.data[0].鍏抽棴鐘舵�� == "1" ? true : false, "HRemoveQty": d.data[0].杞Щ鏁伴噺, "HSeOrderBillNo": d.data[0].閿�鍞鍗曞彿
+ , "HUnReciveQty": d.data[0].鏈敹鏂欐暟閲�, "HPOOrderBillDate": Format(new Date(d.data[0].閲囪喘璁㈠崟鍗曟嵁鏃ユ湡), 'yyyy-MM-dd'), "HPOOrderBillDeliveryDate": Format(new Date(d.data[0].閲囪喘璁㈠崟浜よ揣鏃ユ湡),'yyyy-MM-dd')
+ , "HPOOrderBillRemark": d.data[0].閲囪喘璁㈠崟鎽樿, "HPOOrderBillNote": d.data[0].閲囪喘璁㈠崟琛ㄤ綋澶囨敞
}];
option.data = rowdata;
table.render(option);
+
+ //鏄惁鎵嬪伐鍏抽棴
+ if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
+ $('#HCloseTypeSub1').attr("checked", true);
+ }
+
+ //鍏抽棴鐘舵��
+ if (d.data[0].鍏抽棴鐘舵�� == "1") {
+ $('#HCloseStatus1').attr("checked", true);
+ }
+ form.render('checkbox');
+
+ //寤惰繜鍘熷洜
+ $('#HLaterReason1').find("option[value='" + d.data[0].寤惰繜鍘熷洜 + "']").attr("selected", true);
+ $('#HErpClsID1').find("option[value='" + d.data[0].鐗╂枡灞炴�� + "']").attr("selected", true);
+ $('#HPURCHASEORGIDSub1').find("option[value='" + d.data[0].瀛愯〃閲囪喘缁勭粐 + "']").attr("selected", true);
+ $('#HStatus1').find("option[value='" + d.data[0].鐘舵�� + "']").attr("selected", true);
form.render('select');
}
})
@@ -743,6 +960,11 @@
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
+ //鍒濆鍖栧叧闂椂闂�(绌哄�肩姸鎬佷笅 璧嬪��)
+ if (table.cache["mainTable"][i].HEntryCloseDate == "") {
+ table.cache["mainTable"][i].HEntryCloseDate = "1900-01-01 00:00:00.000"
+ }
+
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
num.push(table.cache["mainTable"][i])
}
@@ -752,11 +974,11 @@
var sSubStr = JSON.stringify(num);
var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
-
+
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/AddPODemandPlanConfigBillList",
+ url: GetWEBURL() + "/Cg_PODemandPlanBill/AddPODemandPlanBillList",
async: true,
data: { "sMainSub": sMainSub },
dataType: "json",
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
index 78b7281..4f93be1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
@@ -520,9 +520,9 @@
</script>
<!--澶嶉�夋 閿佸畾鏍囪-->
- <script type="text/html" id="HLockedSu">
+ <script type="text/html" id="HLockedSub">
<div class="layui-input-block" style="margin-left: 20px;">
- <input type="checkbox" name="HLockedSu" lay-filter="HLockedSu" id="HLockedSu{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ <input type="checkbox" name="HLockedSub" lay-filter="HLockedSub" id="HLockedSub{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
</div>
</script>
@@ -629,12 +629,12 @@
, { field: 'HBTimes', title: '寮�濮嬫椂闂�', event: "HBTimes" }//datetime
, { field: 'HETimes', title: '缁撴潫鏃堕棿', event: "HETimes"}//datetime
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { field: 'HDateSub', title: '鎺掍骇鏃ユ湡' }//datetime
+ , { field: 'HDateSub', title: '鎺掍骇鏃ユ湡', event: "HDateSub" }//datetime
, { field: 'HCloseMan', title: '琛屽叧闂�', edit: 'text' }
, { field: 'HEntryCloseDate', title: '琛屽叧闂棩鏈�', event: "HEntryCloseDate" }//datetime
, { field: 'HCloseTypeSub', title: '鏄惁鎵嬪伐鍏抽棴', templet: '#HCloseTypeSub' }//check
, { field: 'HColumn', title: 'Excel鍒楀ご', edit: 'text' }
- , { field: 'HLockedSub', title: '閿佸畾鏍囪', templet: '#HLockedSu' }//check
+ , { field: 'HLockedSub', title: '閿佸畾鏍囪', templet: '#HLockedSub' }//check
, { field: 'HComplete', title: '鏄惁榻愬', edit: 'text' }
, { field: 'HStatusTag', title: '鐘舵�佹爣璁�', templet: '#HStatusTag' }//check
, { field: 'HIsHandModify', title: '鎵嬪伐淇敼鏍囪', templet: '#HIsHandModify' }//check
@@ -803,6 +803,23 @@
}
});
}
+
+ //鎺掍骇鏃ユ湡
+ if (obj.event == 'HDateSub') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ checkRefresh();
+ }
+ });
+ }
//琛屽叧闂棩鏈�
if (obj.event == 'HEntryCloseDate') {
@@ -827,13 +844,13 @@
//#region 澶嶉�夋
//閿佸畾鏍囪
- form.on('checkbox(HLockedSu)', function (data) {
+ form.on('checkbox(HLockedSub)', function (data) {
//鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
var elem = data.othis.parents('tr');
var dataindex = elem.attr("data-index");
$.each(option.data, function (index, value) {
if (value.LAY_TABLE_INDEX == dataindex) {
- value.HLockedSu = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ value.HLockedSub = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
}
});
});
@@ -1123,11 +1140,10 @@
//澶氶�� 鍒锋柊琛ㄦ牸
function checkRefresh() {
for (var i = 1; i <= option.data.length; i++) {
- //$('#HProcType' + i + '').find("option[value='" + option.data[i - 1].HProcType + "']").attr("selected", true);
//閿佸畾鏍囪
- if (option.data[i - 1].HLockedSu) {
- $('#HLockedSu' + i + '').attr("checked", true);
+ if (option.data[i - 1].HLockedSub) {
+ $('#HLockedSub' + i + '').attr("checked", true);
}
//鐘舵�佹爣璁�
if (option.data[i - 1].HStatusTag) {
@@ -1295,15 +1311,36 @@
//瀛愯〃 璧嬪��
var rowdata = [{
- "HMasterDate": d.data[0].鏃ヨ鍒掔敓浜ф棩鏈�, "HQty": d.data[0].瀛愭棩璁″垝鏁伴噺, "HRptFinishQty": d.data[0].姹囨姤瀹屾垚鏁伴噺
- ,"HTimes": d.data[0].鍓╀綑宸ユ椂, "HUseTimes": d.data[0].鍗犵敤宸ユ椂, "HBTimes": d.data[0].寮�濮嬫椂闂�, "HETimes": d.data[0].缁撴潫鏃堕棿,
- "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HDateSub": d.data[0].鎺掍骇鏃ユ湡, "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate": d.data[0].瀛愬叧闂椂闂�
- , "HCloseTypeSub": false, "HColumn": d.data[0].Excel鍒楀ご, "HLockedSub": false, "HComplete": d.data[0].鏄惁榻愬
- ,"HStatusTag": false, "HIsHandModify": false
+ "HMasterDate": Format(new Date(d.data[0].鏃ヨ鍒掔敓浜ф棩鏈�), "yyyy-MM-dd"), "HQty": d.data[0].瀛愭棩璁″垝鏁伴噺, "HRptFinishQty": d.data[0].姹囨姤瀹屾垚鏁伴噺
+ , "HTimes": d.data[0].鍓╀綑宸ユ椂, "HUseTimes": d.data[0].鍗犵敤宸ユ椂, "HBTimes": Format(new Date(d.data[0].寮�濮嬫椂闂�), "yyyy-MM-dd"), "HETimes": Format(new Date(d.data[0].缁撴潫鏃堕棿), "yyyy-MM-dd")
+ , "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HDateSub": Format(new Date(d.data[0].鎺掍骇鏃ユ湡), "yyyy-MM-dd"), "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate":Format(new Date(d.data[0].瀛愬叧闂椂闂�), "yyyy-MM-dd")
+ , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == 0 ? false : true, "HColumn": d.data[0].Excel鍒楀ご, "HLockedSub": d.data[0].瀛愰攣瀹氭爣璁� == 0 ? false : true, "HComplete": d.data[0].鏄惁榻愬
+ , "HStatusTag": d.data[0].鐘舵�佹爣璁� == 0 ? false : true, "HIsHandModify": d.data[0].鎵嬪伐淇敼鏍囪 == 0 ? false : true
}];
+
option.data = rowdata;
table.render(option);
- form.render('select');
+
+ //鏄惁鎵嬪伐鍏抽棴
+ if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
+ $('#HCloseTypeSub1').attr("checked", true);
+ }
+
+ //閿佸畾鏍囪
+ if (d.data[0].瀛愰攣瀹氭爣璁� == "1") {
+ $('#HLockedSub1').attr("checked", true);
+ }
+
+ //鐘舵�佹爣璁�
+ if (d.data[0].鐘舵�佹爣璁� == "1") {
+ $('#HStatusTag1').attr("checked", true);
+ }
+
+ //鎵嬪伐淇敼鏍囪
+ if (d.data[0].鎵嬪伐淇敼鏍囪 == "1") {
+ $('#HIsHandModify1').attr("checked", true);
+ }
+ form.render('checkbox');
}
})
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
index c03ba5e..89dc3c5 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -61,7 +61,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><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_DeleteBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
</div>
</script>
</form>
@@ -118,7 +118,7 @@
case 'set_DeleteBill': set_DeleteBill();
break;
//鍏抽棴
- case 'set_DeleteBill': set_CloseBill();
+ case 'set_CloseBill': set_CloseBill();
break;
};
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
new file mode 100644
index 0000000..125a5a8
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
@@ -0,0 +1,10 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title></title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
index 750bd74..a259375 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
@@ -61,7 +61,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><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_DeleteBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
</div>
</script>
</form>
@@ -118,7 +118,7 @@
case 'set_DeleteBill': set_DeleteBill();
break;
//鍏抽棴
- case 'set_DeleteBill': set_CloseBill();
+ case 'set_CloseBill': set_CloseBill();
break;
};
});
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index e72cacc..2ccb217 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -1359,7 +1359,7 @@
}];
option.data = rowdata;
table.render(option);
-
+
if (d.data[0].濮斿鏍囪) {
$('#HSupFlag1').attr("checked", true);
}
--
Gitblit v1.9.1