From d095a8bed7048e94089ae936fc780bd1633fb4b9 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 18 三月 2022 15:37:23 +0800
Subject: [PATCH] 完善
---
WebTM/views/车间管理/叫料管理/Jl_CallGoodsBillMain.html | 147 ++++++++++++++++++++++++++++++++----------------
WebTM/views/车间管理/叫料管理/叫料退料单/Jl_CallGoodsBillBackMain.html | 4 +
2 files changed, 101 insertions(+), 50 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
index b1f62df..8de023b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
@@ -38,7 +38,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <label class="layui-form-label">閿�鍞鍗曞彿</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
</div>
@@ -47,49 +47,40 @@
<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-colla-content">
- <div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
+ <div class="layui-colla-content" style="margin-left: 4%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <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="text" class="layui-input" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </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="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
+ </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="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
+ </div>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="MaterialCode" id="MaterialCode" style="width:190px;">
- </div>
- </div>
- <!--<hr />-->
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="MaterialName" id="MaterialName" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="SpecificationModel" id="SpecificationModel" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍙戞枡浠撳簱</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="Warehouse" id="Warehouse" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">婧愬崟鍗曞彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="width:190px;">
- </div>
- </div>
-
- <div class="layui-inline">
- <label class="layui-form-label">鍒跺崟浜�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="Hmaker" id="Hmaker" style="width:190px;">
+ <div class="layui-row" style="margin-top:10px;">
+ <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="text" class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
</div>
</div>
</div>
@@ -176,6 +167,16 @@
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
+
+ //閫夋嫨鐗╂枡
+ form.on('submit(btnMaterial)', function (data) {
+ btnMaterial();
+ })
+
+ //閫夋嫨鐢熶骇杞﹂棿
+ form.on('submit(btnHDept)', function (data) {
+ btnHDept();
+ })
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -254,14 +255,12 @@
function set_ClearQuery() {
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
- $("#HBillNo").val("");//鍗曟嵁鍙�
- $("#HDeptID").val("");//閮ㄩ棬
- $("#MaterialCode").val("");//鐗╂枡浠ｇ爜
+ $("#HBillNo").val("");//閿�鍞鍗曞彿
+ $("#MaterialNumber").val("");//鐗╂枡浠ｇ爜
$("#MaterialName").val("");//鐗╂枡鍚嶇О
- $("#SpecificationModel").val("");//瑙勬牸鍨嬪彿
- $("#Warehouse").val("");//鍙戞枡浠撳簱
- $("#HSourceBillNo").val("");//婧愬崟鍗曞彿
- $("#Hmaker").val("");//鍒跺崟浜�
+ $("#MaterialID").val("");//鐗╂枡id
+ $("#MaterialModel").val("");//瑙勬牸鍨嬪彿
+ $("#HDeptName").val("");//鐢熶骇杞﹂棿
$("#btnSearch").click();//鍒锋柊
sWhere = "";
@@ -380,6 +379,56 @@
}
}
+ //閫夋嫨鐗╂枡
+ function btnMaterial() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#MaterialName").val(checkStatus.data[0].HName);//鐗╂枡鍚嶇О
+ $("#MaterialModel").val(checkStatus.data[0].HModel);//鐗╂枡瑙勬牸鍨嬪彿
+ $("#MaterialNumber").val(checkStatus.data[0].HNumber);//鐗╂枡浠ｇ爜
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //閫夋嫨鐢熶骇杞﹂棿
+ function btnHDept() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HDeptName").val(checkStatus.data[0].HName);//閮ㄩ棬鍚嶇О
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/Jl_CallGoodsBillBackMain.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/Jl_CallGoodsBillBackMain.html"
index 457dfc0..94e6b61 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/Jl_CallGoodsBillBackMain.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/Jl_CallGoodsBillBackMain.html"
@@ -107,7 +107,7 @@
<label class="layui-form-label">浠撳簱鎺ユ敹</label>
<div class="layui-input-block" style="margin-left: 120px;width: 184px;">
<select name="HCKStatus" lay-verify="HCKStatus" id="HCKStatus">
- <option value="鍏ㄩ儴">鍏ㄩ儴</option>
+ <option value="鍏ㄩ儴" >鍏ㄩ儴</option>
<option value="宸叉帴鏀�">宸叉帴鏀�</option>
<option value="鏈帴鏀�">鏈帴鏀�</option>
</select>
@@ -348,6 +348,8 @@
$("#MaterialModel").val("");//瑙勬牸鍨嬪彿
$("#HDeptName").val("");//鐢熶骇杞﹂棿
$("#ProcMul").val("");//宸ユ
+ $("#HPZStatus").val("鍏ㄩ儴");//鍝佽川纭
+ $("#HCKStatus").val("鍏ㄩ儴");//浠撳簱鎺ユ敹
$("#btnSearch").click();//鍒锋柊
sWhere = "";
--
Gitblit v1.9.1