From fee5a335de05c5162ef754bfe80b6de39f4e8b69 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 12 三月 2024 11:19:52 +0800
Subject: [PATCH] 其他应收单增加 数量和单价

---
 WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html |  134 ++++++++++++++++++++++++++++++--------------
 1 files changed, 92 insertions(+), 42 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
index 7532ab3..821503d 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
@@ -33,7 +33,7 @@
                         <div class="layui-card-header">
                             <div class="layui-btn-group">
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
-                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                                <<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Exit" id="Exit">閫�鍑�</button>
                             </div>
                         </div>
                         <div class="layui-card-body">
@@ -71,19 +71,19 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">璁惧缂栧彿</label>
+                                                <label class="layui-form-label">璁惧缂栧彿<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HEquipFileNo" id="HEquipFileNo">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">璁惧鍚嶇О</label>
+                                                <label class="layui-form-label">璁惧鍚嶇О<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HName" id="HName">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">璁惧瑙勬牸</label>
+                                                <label class="layui-form-label">璁惧瑙勬牸<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HModel" id="HModel">
                                                 </div>
@@ -97,7 +97,7 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">璁惧浠g爜</label>
+                                                <label class="layui-form-label">璁惧浠g爜<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HEquipFileNumber" id="HEquipFileNumber">
                                                 </div>
@@ -122,20 +122,30 @@
                                                     </button>
                                                 </div>
                                             </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐢熶骇璧勬簮</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float:left;width:150px;">
+                                                    <input type="hidden" class="layui-input" name="HSourceID" id="HSourceID" value="0" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceList" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">瀵瑰簲ERP鐗╂枡</label>
+                                                <label class="layui-form-label">瀵瑰簲ERP鐗╂枡<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="float:left;width:150px;">
-                                                    <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="float:left;width:150px;">
+                                                    <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="float:left;width:150px;">
                                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                     </button>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">璁惧鍒嗙被</label>
+                                                <label class="layui-form-label">璁惧鍒嗙被<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HEquipFileTypeName" id="HEquipFileTypeName" style="float:left;width:150px;">
                                                     <input type="hidden" class="layui-input" name="HEquipFileTypeID" id="HEquipFileTypeID" style="float:left;width:150px;">
@@ -145,7 +155,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">鍗曚綅</label>
+                                                <label class="layui-form-label">鍗曚綅<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="float:left;width:150px;">
                                                     <input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" style="float:left;width:150px;">
@@ -156,7 +166,7 @@
                                             </div>
 
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">渚涘簲鍟�</label>
+                                                <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HSellSupName" id="HSellSupName" style="float:left;width:150px;">
                                                     <input type="hidden" class="layui-input" name="HSellSupID" id="HSellSupID" style="float:left;width:150px;">
@@ -168,7 +178,7 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">浣跨敤閮ㄩ棬</label>
+                                                <label class="layui-form-label">浣跨敤閮ㄩ棬<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="float:left;width:150px;">
                                                     <input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" style="float:left;width:150px;">
@@ -178,7 +188,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">浣跨敤璐熻矗浜�</label>
+                                                <label class="layui-form-label">浣跨敤璐熻矗浜�<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HUseEmpName" id="HUseEmpName" style="float:left;width:150px;">
                                                     <input type="hidden" class="layui-input" name="HUseEmpID" id="HUseEmpID" style="float:left;width:150px;">
@@ -188,7 +198,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">缁存姢璐熻矗浜�</label>
+                                                <label class="layui-form-label">缁存姢璐熻矗浜�<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" class="layui-input" name="HRepairEmpName" id="HRepairEmpName" style="float:left;width:150px;" y>
                                                     <input type="hidden" class="layui-input" name="HRepairEmpID" id="HRepairEmpID" style="float:left;width:150px;">
@@ -212,7 +222,7 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鍑哄巶鏃ユ湡</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="date" class="layui-input" name="HOutComDate" id="HOutComDate" style="padding-left: 32px; width:185px;">
+                                                    <input type="date" class="layui-input" name="HOutComDate" id="HOutComDate" style="padding-left: 32px;">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
@@ -255,8 +265,8 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">璁惧鐘舵��</label>
-                                                <div class="layui-input-block">
+                                                <label class="layui-form-label">璁惧鐘舵��<label style="color:red"> * </label></label>
+                                                <div class="layui-input-block" style="margin-left: 125px;width:55%;">
                                                     <select name="HStatus" lay-filter="aihao" id="HStatus">
                                                         <option value="绌洪棽" selected="selected">绌洪棽</option>
                                                         <option value="鍗犵敤">鍗犵敤</option>
@@ -268,7 +278,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    </div>
+                                </div>
                                 <!--鍏朵粬淇℃伅-->
                                 <!--<div class="layui-tab-content">
                                     <div class="layui-tab-item layui-show">
@@ -381,6 +391,7 @@
                 , util = layui.util
                 ;
             var sBillType = "3308";
+            $("#HMakeSupID").val(0);
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -407,8 +418,15 @@
             form.on('submit(Saver)', function (data) {//鎻愪氦
                 set_btnSave(data);
             })
-
-
+            //閫�鍑烘寜閽�
+            form.on('submit(Exit)', function () {
+                if (linterid == undefined) {
+                    Pub_Close(2);
+                }
+                else {
+                    Pub_Close(1);
+                }
+            })
             //璁惧淇濆吇瑙勭▼
             form.on('submit(HEquipMaintainRuleInterList)', function () {
                 //椤甸潰灞�-鑷畾涔�
@@ -482,7 +500,44 @@
                     }
                 });
             });
+            //鐢熶骇璧勬簮
+            form.on('submit(HSourceList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐢熶骇璧勬簮',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSourceID").val(checkStatus.data[0].HItemID);
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
 
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            
+            
             //瀵瑰簲Erp鐗╂枡
             form.on('submit(HMaterList)', function () {
                 //椤甸潰灞�-鑷畾涔�
@@ -503,6 +558,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
+                        $("#HName").val(checkStatus.data[0].HName);
                         $("#HMaterNumber").val(checkStatus.data[0].HNumber);
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -847,7 +903,7 @@
                         $("#HUnitName").val(d.data[0].鍗曚綅);
                         $("#HEquipFileTypeID").val(d.data[0].HEquipFileTypeID);
                         $("#HEquipFileTypeName").val(d.data[0].璁惧绫诲瀷);
-                        $("#HOutComDate").val(d.data[0].璁惧鍑哄巶鏃ユ湡);
+                        $("#HOutComDate").val(formatDate(d.data[0].璁惧鍑哄巶鏃ユ湡));
                         $("#HSellSupID").val(d.data[0].HSellSupID);
                         $("#HSellSupName").val(d.data[0].渚涘簲鍟�);
                         $("#HMakeSupID").val(d.data[0].HMakeSupID);
@@ -859,8 +915,8 @@
                         $("#HRepairEmpID").val(d.data[0].HRepairEmpID);
                         $("#HRepairEmpName").val(d.data[0].缁存姢璐熻矗浜�);
                         $("#HAddress").val(d.data[0].瀹夎鍦扮偣);
-                        $("#HSetupDate").val(d.data[0].瀹夎鏃ユ湡);
-                        $("#HStartupDate").val(d.data[0].杩愯寮�濮嬫棩鏈�);
+                        $("#HSetupDate").val(formatDate(d.data[0].瀹夎鏃ユ湡));
+                        $("#HStartupDate").val(formatDate(d.data[0].杩愯寮�濮嬫棩鏈�));
                         $("#HStatus").val(d.data[0].褰撳墠鐘舵��);
                         $("#HEquipDotCheckRuleInterID").val(d.data[0].HEquipDotCheckRuleInterID);
                         $("#HEquipDotCheckRuleInterName").val(d.data[0].榛樿鐐规瑙勭▼);
@@ -869,7 +925,9 @@
                         $("#HProNum").val(d.data[0].宸ョ▼缂栫爜);
                         $("#HWorkArea").val(d.data[0].浜у湴);
                         $("#HLogo").val(d.data[0].鍝佺墝);
-
+                        $("#HSourceID").val(d.data[0].HSourceID);
+                        $("#HSourceName").val(d.data[0].HSourceName);
+                        form.render("select");
                     }
                 });
             }
@@ -911,13 +969,13 @@
                         dataType: "json",
                         success: function (data) {
                             if (data.count == 1) {
-                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                layer.msg(data.Message, { time: 1 * 10000, icon: 1 }, function () {
                                     if (linterid == undefined) {
                                         $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                                        location.reload();
                                     }
                                     else {
-                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                                        location.reload();
                                     }
                                 });
                             }
@@ -946,10 +1004,10 @@
                                 layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                     if (linterid == undefined) {
                                         $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                                        location.reload();
                                     }
                                     else {
-                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                                        location.reload();
                                     }
 
                                 });
@@ -965,15 +1023,6 @@
                 }
             }
 
-            //閫�鍑烘寜閽�
-            form.on('submit(Exit)', function () {
-                if (linterid == undefined) {
-                    Pub_Close(2);
-                }
-                else {
-                    Pub_Close(1);
-                }
-            })
         });
 
         function AllowLoadData() {  //闈炵┖楠岃瘉
@@ -981,7 +1030,7 @@
             if ($("#HEquipFileNo").val() == '' || $("#HEquipFileNo").val() == null) {
                 layer.msg("璁惧缂栧彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
-            } 
+            }
             if ($("#HEquipFileNumber").val() == '' || $("#HEquipFileNumber").val() == null) {
                 layer.msg("璁惧浠g爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
@@ -994,10 +1043,11 @@
                 layer.msg("璁惧瑙勬牸涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
             }
-            if ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
-                layer.msg("璇烽�夋嫨瀵瑰簲ERP鐗╂枡锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
+            //鍑礉涓嶉渶瑕�
+            //if ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
+            //    layer.msg("璇烽�夋嫨瀵瑰簲ERP鐗╂枡锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return Result = false;
+            //}
             if ($("#HEquipFileTypeID").val() == '' || $("#HEquipFileTypeID").val() == null) {
                 layer.msg("璇烽�夋嫨璁惧鍒嗙被锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;

--
Gitblit v1.9.1