From 1a3bf0e0f8049252040d833304ba6776cd9e1927 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 25 四月 2024 17:13:39 +0800
Subject: [PATCH] 1.以下基础资料 测试并完善功能； 供应商，职员，物料，客户，班组 （测试必录项目，新增，修改，删除，审核，反审核 等功能，有图片预览的 完善图片预览以及上传功能） 2.客户 增加字段 领用人 HMateOutEmp varchar(100) 生产班组 增加 字段 劳务单位 HCompName varchar(200)
---
WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html | 77 +++++++++++++++++++++++++++++++++++---
WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html | 11 ++++-
WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html | 8 +++
3 files changed, 86 insertions(+), 10 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
index 3753e30..4156093 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
@@ -71,7 +71,12 @@
<input class="layui-input" name="HBarCodeForBase" lay-verify="HBarCodeForBase" id="HBarCodeForBase">
</div>
</div>
-
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍔冲姟鍗曚綅</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCompName" lay-verify="HCompName" id="HCompName">
+ </div>
+ </div>
<div class="layui-row">
<div class="layui-col-xs8 layui-inline">
<label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
@@ -294,6 +299,7 @@
, "HDeptID": data.HDeptID
, "HHelpCode": data.鍔╄鐮�
, "HBarCodeForBase": data.鏉＄爜缂栧彿
+ ,"HCompName":data.鍔冲姟鍗曚綅
, "HProcID": data.HProcID
, "HProcName": data.宸ュ簭
, "HStopflag": data.绂佺敤鏍囪
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
index 13f9840..0fec9f0 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
@@ -46,20 +46,20 @@
<div class="layui-inline">
<label class="layui-form-label">鍒涘缓缁勭粐</label>
<div class="layui-input-inline" style="margin-right: 0px;width: 100px;">
- <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�" readonly="readonly" style="width: 134%;">
- <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="1" autocomplete="off" class="layui-input" >
+ <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="" readonly="readonly" style="width: 134%;">
+ <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="0" autocomplete="off" class="layui-input" >
</div>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT" style=" margin-left: 36px; width: 42px; padding: 0 10px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID_BT" style=" margin-left: 36px; width: 42px; padding: 0 10px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
<div class="layui-inline">
<label class="layui-form-label">浣跨敤缁勭粐</label>
<div class="layui-input-inline" style="margin-right: 0px; width: 100px;">
- <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�" readonly="readonly" style="width: 134%;">
- <input type="hidden" name="HUseOrgID" id="HUseOrgID" lay-verify="HUseOrgID" value="1" autocomplete="off" class="layui-input">
+ <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="" readonly="readonly" style="width: 134%;">
+ <input type="hidden" name="HUseOrgID" id="HUseOrgID" lay-verify="HUseOrgID" value="0" autocomplete="off" class="layui-input">
</div>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT" style=" margin-left: 36px; width: 42px; padding: 0 10px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID_BT" style=" margin-left: 36px; width: 42px; padding: 0 10px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -577,6 +577,14 @@
window.location.reload();
$("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
});
+ //鍒涘缓缁勭粐
+ form.on('submit(HCreateOrgID_BT)', function () {
+ HCreateOrgID_BT();
+ });
+ //浣跨敤缁勭粐
+ form.on('submit(HUseOrgID_BT)', function () {
+ HUseOrgID_BT();
+ });
//#endregion
@@ -603,6 +611,10 @@
},
success: function (d) {
ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+ $("#HCreateOrgID").val(d.data[0].HCREATEORGID);
+ $("#HCreateOrg").val(d.data[0].鍒涘缓缁勭粐);
+ $("#HUseOrgID").val(d.data[0].HUSEORGID);
+ $("#HUseOrg").val(d.data[0].浣跨敤缁勭粐);
$("#HNumber").val(d.data[0].缂栫爜);
$("#HHelpCode").val(d.data[0].鍔╄鐮�);
$("#HShortName").val(d.data[0].绠�绉�);
@@ -631,7 +643,7 @@
$("#HRemark").val(d.data[0].澶囨敞);
$("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
$("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囧織);//true:閫変腑 false:涓嶉�変腑
- $('#HMaterClass').find("option[value='" + data[0].渚涜揣鏉愭枡绫诲埆 + "']").attr("selected", true);
+ $('#HMaterClass').find("option[value='" + d.data[0].渚涜揣鏉愭枡绫诲埆 + "']").attr("selected", true);
form.render('select');
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
@@ -698,6 +710,57 @@
return true;
}
}
+
+ //鑾峰彇鍒涘缓缁勭粐
+ function HCreateOrgID_BT() {
+ //鑾峰彇鍒涘缓缁勭粐鍒�
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '缁勭粐鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HCreateOrg").val(checkStatus.data[0].缁勭粐鍚嶇О);
+ $("#HCreateOrgID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //鑾峰彇浣跨敤缁勭粐
+ function HUseOrgID_BT() {
+ //鑾峰彇浣跨敤缁勭粐鍒�
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '缁勭粐鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HUseOrg").val(checkStatus.data[0].缁勭粐鍚嶇О);
+ $("#HUseOrgID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
//#endregion
});
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
index 01d79ec..2c012ef 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
@@ -90,9 +90,15 @@
<input type="text" name="HRemark" id="HRemark" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">棰嗙敤浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMateOutEmp" id="HMateOutEmp" lay-verify="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
<div class="layui-row">
<div class="layui-col-xs8 layui-inline">
- <label class="layui-form-label" >鍒涘缓缁勭粐*</label>
+ <label class="layui-form-label">鍒涘缓缁勭粐*</label>
<div class="layui-input-inline" style="margin-bottom: -15px;">
<div class="layui-form">
<div class="layui-form-item" style="width: 265%;">
@@ -106,7 +112,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs8 layui-inline">
- <label class="layui-form-label" >浣跨敤缁勭粐*</label>
+ <label class="layui-form-label">浣跨敤缁勭粐*</label>
<div class="layui-input-inline" style="margin-bottom: -15px;">
<div class="layui-form">
<div class="layui-form-item" style="width: 265%;">
@@ -790,6 +796,7 @@
$("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囧織);//true:閫変腑 false:涓嶉�変腑
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
$("#HRemark").val(d.data[0].澶囨敞);
+ $("#HMateOutEmp").val(d.data[0].棰嗙敤浜�);
$("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
$("#HSSName").val(d.data[0].缁撶畻鏂瑰紡);
$("#HSSID").val(d.data[0].缁撶畻鏂瑰紡ID);
--
Gitblit v1.9.1