From 4f45413fc39e7692984aff0a0e762c01020e70b8 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 15 七月 2025 16:06:06 +0800
Subject: [PATCH] 物料，工程项目细节修改，pda委外工序接收单优化
---
WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill_PDA.html | 27 +++++---
WebTM/views/项目管理/工程项目/PM_ProjectBill.html | 111 ++++++++++++++++++------------------
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 4
3 files changed, 75 insertions(+), 67 deletions(-)
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_Material.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_Material.html"
index 0bbc180..292cc1a 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_Material.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_Material.html"
@@ -259,8 +259,8 @@
<div class="layui-row" style="padding:10px 0">
<div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
<div id="TreeTable" class="demo-tree demo-tree-box"
- style="width:99.5%;height:calc(45vh);overflow-y:auto"></div>
- <div style="width:99.5%;height:calc(35vh);position: relative;">
+ style="width:99.5%;height:calc(65vh);overflow-y:auto"></div>
+ <div style="width:99.5%;height:calc(25vh);position: relative;">
<!--//杞挱鍥�-->
<div class="layui-carousel" id="test1" style="position:absolute;">
<!--閫忔槑搴� opacity: 0.2-->
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_PDA.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_PDA.html"
index e61d36a..6d47137 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_PDA.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_PDA.html"
@@ -60,7 +60,7 @@
<div class="layui-row">
<label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鏉″舰鐮�</label>
<div class="layui-input-block" style="margin-left: 120px;width:46%;">
- <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProcExch" id="btnSearchProcExch" style="padding: 0 10px;float: left;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style=""></i>
</button>
@@ -156,7 +156,7 @@
<label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="" id="">
+ <input type="hidden" name="HMaterID" id="HMaterID">
</div>
</div>
<div class="layui-inline">
@@ -241,7 +241,8 @@
<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" name="HEmpID" id="HEmpID">
+ <input type="text" class="layui-input" name="HEmp" id="HEmp" style="" readonly>
+ <input type="hidden" value="0" name="HEmpID" id="HEmpID">
</div>
</div>
<div class="layui-inline">
@@ -307,6 +308,7 @@
<button type="button" class="buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
</div>
<!--闅愯棌瀛楁-->
+ <input type="hidden" name="eventType" id="eventType" value="Add">
<input type="hidden" name="lngBillKey" id="lngBillKey">
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
<input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
@@ -332,8 +334,10 @@
//鍒濆鍩烘湰淇℃伅璧嬪��
$("#HStationOutTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
- $("#HEmpID").val(sessionStorage["Czybm"]);
+ $("#HEmpID").val(sessionStorage["HEmpID"]);
$("#HEmp").val(sessionStorage["HUserName"]);
+ $("#HGroupID").val(sessionStorage["HGroupID"]);
+ $("#HGroup").val(sessionStorage["HGroup"]);
$("#HMaker").val(sessionStorage["HUserName"]);
//娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
var HProcExchBillNoFlag = false;
@@ -368,7 +372,7 @@
}
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHProcNo_KeyDown",
type: "GET",
data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
success: function (result) {
@@ -379,7 +383,9 @@
"HProcName": data.宸ュ簭,
"HProcID": data.HProcID,
"HCenterName": data.宸ヤ綔涓績,
- "HCenterID": data.HCenterID
+ "HCenterID": data.HCenterID,
+ "HSupID": data.HSupID,
+ "HSup": data.渚涘簲鍟�
});
$("#HProcNo").attr("readonly", "readonly");
$("#HProcNo").css("background-color", "#efefef4d");
@@ -414,6 +420,7 @@
form.on('submit(Saver)', function (data) {//鎻愪氦
//var tableData = data.field;
var oMain = data.field;
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
type: "POST",
@@ -473,8 +480,8 @@
"HQty": 0,
"HPieceQty": data.鐢熶骇鏁伴噺,
"HPlanQty": data.鐢熶骇鏁伴噺,
- "lngBillSubKey": data.HSubID,
- "lngBillKey": data.HMainID,
+ "lngBillSubKey": data.hsubid,
+ "lngBillKey": data.hmainid,
"HProcExchBillNo": data.鍗曟嵁鍙�,
"HICMOQty": data.浠诲姟鍗曟暟閲�,
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
@@ -487,8 +494,8 @@
"HSup": data.渚涘簲鍟�,
"HSourceID": data.HSourceID,
"HSource": data.鐢熶骇璧勬簮,
- "HGroupID": data.HGroupID,
- "HGroup": data.鐝粍,
+ //"HGroupID": data.HGroupID,
+ //"HGroup": data.鐝粍,
"HDeptID": sessionStorage["HDeptID"],
"HDept": sessionStorage["HDept"]
});
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
index d25a50b..17141b7 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
@@ -847,61 +847,7 @@
</div>
- <div class="layui-card layui-bg-gray">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">寮�濮嬪叧闃�鏃堕棿</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="datetime-local" step="1" class="layui-input" name="HBeginCloseValveTime" lay-verify="HBeginCloseValveTime" id="HBeginCloseValveTime">
- </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="datetime-local" step="1" class="layui-input" name="HEndCloseValveTime" lay-verify="HEndCloseValveTime" id="HEndCloseValveTime">
- </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="number" class="layui-input" name="HCloseValveQty" lay-verify="HCloseValveQty" id="HCloseValveQty" value="0">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">寮�濮嬪紑闃�鏃堕棿</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="datetime-local" step="1" class="layui-input" name="HBeginOpenValveTime" lay-verify="HBeginOpenValveTime" id="HBeginOpenValveTime">
- </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="datetime-local" step="1" class="layui-input" name="HEndOpenValveTime" lay-verify="HEndOpenValveTime" id="HEndOpenValveTime">
- </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="number" class="layui-input" name="HOpenValveQty" lay-verify="HOpenValveQty" id="HOpenValveQty" value="0">
- </div>
- </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" name="HValveWorkEmp" lay-verify="HValveWorkEmp" id="HValveWorkEmp">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">澶囨敞锛堥檮灞為」鐩級</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <textarea type="text" class="layui-textarea" name="HTaskRemark" lay-verify="HTaskRemark" id="HTaskRemark"></textarea>
- </div>
- </div>
- </div>
+
<div class="layui-card layui-bg-gray">
<div class="layui-row">
<div class="layui-inline">
@@ -1006,6 +952,61 @@
</div>
</div>
<div class="layui-card layui-bg-gray">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">寮�濮嬪叧闃�鏃堕棿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="datetime-local" step="1" class="layui-input" name="HBeginCloseValveTime" lay-verify="HBeginCloseValveTime" id="HBeginCloseValveTime">
+ </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="datetime-local" step="1" class="layui-input" name="HEndCloseValveTime" lay-verify="HEndCloseValveTime" id="HEndCloseValveTime">
+ </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="number" class="layui-input" name="HCloseValveQty" lay-verify="HCloseValveQty" id="HCloseValveQty" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">寮�濮嬪紑闃�鏃堕棿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="datetime-local" step="1" class="layui-input" name="HBeginOpenValveTime" lay-verify="HBeginOpenValveTime" id="HBeginOpenValveTime">
+ </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="datetime-local" step="1" class="layui-input" name="HEndOpenValveTime" lay-verify="HEndOpenValveTime" id="HEndOpenValveTime">
+ </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="number" class="layui-input" name="HOpenValveQty" lay-verify="HOpenValveQty" id="HOpenValveQty" value="0">
+ </div>
+ </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" name="HValveWorkEmp" lay-verify="HValveWorkEmp" id="HValveWorkEmp">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">澶囨敞锛堥檮灞為」鐩級</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <textarea type="text" class="layui-textarea" name="HTaskRemark" lay-verify="HTaskRemark" id="HTaskRemark"></textarea>
+ </div>
+ </div>
+ </div>
+ <div class="layui-card layui-bg-gray">
</div>
</div>
--
Gitblit v1.9.1