MES-WEB-LayUI.git

parent: d45da632 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

yxj

2022-11-16 f79d8772bc1dc61debe6c3cc50eedc9a0b681dde

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

1个文件已删除

8个文件已修改

1个文件已添加

	WebTM/views/Baseset/基础资料/Gy_UnitGroup.html	103 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/index.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Department.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html	124 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Unit.html	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Add_Edit_Xt_ORGANIZATIONSList.html	58 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html	45 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Gy_Unit.html	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Xt_ORGANIZATIONSList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/生产基础资料/Gy_SOPBill.html	976 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_UnitGroup.html

New file
@@ -0,0 +1,103 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>è®¡éåä½ç»åè¡¨</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card">
            <!--<div class="layui-card-header"></div>-->
            <div class="layui-card-body" style="padding: 15px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">è¿æ»¤å</label>
                            <div class="layui-input-inline">
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="è¯·è¾å¥è¿æ»¤å" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">å¿«éæ¥è¯¢</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">è¿å</button>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <table class="layui-hide" id="mainTable"></table>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;

            form.on('submit(HQuery)', function () {//éæ©åä½
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val());
            });
            form.on('submit(FH)', function () {//éæ©åä½
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                var checkStatus = table.checkStatus('mainTable')
                 , data = checkStatus.data;
                parent.GetHUnitGroupNameValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            RoadQuery($('#Value').val());
            table.render({
                elem: '#mainTable'
                // , url: '/demo/table/user/'
               , data: []
              , cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
              , cols: [[
                  { type: 'radio' }
                , { field: 'HItemID', width: 150, title: 'åä½ç»ID', hide: true }
                  , { field: 'è®¡éåä½ç»ä»£ç ', width: 150, title: 'è®¡éåä½ç»ä»£ç ' }
                  , { field: 'è®¡éåä½ç»', width: 150, title: 'è®¡éåä½ç»', sort: true }
              ]]
              , page: true
            });
            ///å è½½æ¾ç¤ºæ°æ®
            function RoadQuery(Where) {
                var Value = Where;
                if (Value == null) {
                    Value = '';
                }
                $.ajax({
                    type: "get",
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
                    url: GetWEBURL() + "/Web/GetUnitGroupList_Json",
                    async: true,
                    data: { "Unit": Value },
                    //data: { "Value": Value },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false
                            , done: function (index, res) {

                            }
                        });
                    },
                    error: function (result) {
                        console.log(result);
                        //layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
                    }
                });
            };
        });
    </script>

</body>
</html>

 WebTM/views/index.html

@@ -938,7 +938,8 @@
                                        <dd><a lay-href="åºç¡èµæ/çäº§åºç¡èµæ/Gy_BadReason.html">ä¸è¯åå åè¡¨</a></dd>
                                        <dd><a lay-href="åºç¡èµæ/åºç¡èµæ/Gy_ConkReasonList.html">æéåå åè¡¨</a></dd>
                                        <dd><a lay-href="åºç¡èµæ/çäº§åºç¡èµæ/Gy_SOPBillList.html">ä½ä¸æå¯¼ä¹¦ç»´æ¤</a></dd>
                                        <dd><a lay-href="åºç¡èµæ/çäº§åºç¡èµæ/Gy_SOPBill.html">ä½ä¸æå¯¼ä¹¦</a></dd>
                                        <dd><a lay-href="åºç¡èµæ/çäº§åºç¡èµæ/Gy_SOPBillEdit.html">ä½ä¸æå¯¼ä¹¦ç¼è¾</a></dd>
                                        <dd><a href="Gy_SOPBill.html" target="main_self_frame">ä½ä¸æå¯¼ä¹¦</a></dd>
                                    </dl>
                                </dd>
                                <dd>

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Add_Edit_Gy_Department.html

@@ -286,6 +286,7 @@

            //#region ä¿åæ¹æ³
            function set_SaveBill(data) {
                data.field.HUseOrgID = sessionStorage["OrganizationID"];
                var sMainStr = JSON.stringify(data.field);
                if (!$("#HNumber").val()) {
                    layer.msg("è¯·è¾å¥é¨é¨ä»£ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Add_Edit_Gy_Material.html

@@ -12,12 +12,15 @@
        .layui-form-label {
            width: 85px;
        }

        .layui-form-item .layui-input-inline {
            width: 50%;
        }

        .layui-inline {
            width: 290px;
        }

        .layui-form-item .layui-inline {
            margin-right: 0px;
        }
@@ -32,11 +35,10 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">å¤å¶</button>
                                <button type="button" id="addnew-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">æ°å¢</button>
                                <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Copy">å¤å¶</button>
                                <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 type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">é¢è§</button>
                                <!--<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">é¢è§</button>-->

                            </div>
                        </div>
@@ -94,22 +96,22 @@
                                                        </div>
                                                    </div>
                                                    <!--<div class="layui-inline">
        <label class="layui-form-label">ä¸»è®¡éåä½ï¼</label>
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
            <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
            <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
            </button>
        </div>
    </div>-->
                                                        <label class="layui-form-label">ä¸»è®¡éåä½ï¼</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
                                                            <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                            </button>
                                                        </div>
                                                    </div>-->
                                                </div>

                                                <div class="layui-inline">
                                                    <!--<label class="layui-form-label"> è®¡éåä½ç»ï¼</label>
    <div class="layui-input-inline">
        <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
    </div>-->
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
                                                    </div>-->
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">è®¡éåä½ç»</label>
                                                        <div class="layui-input-inline">
@@ -174,9 +176,9 @@

                                                <div class="layui-inline">
                                                    <!--<label class="layui-form-label"> é»è®¤ä»åºï¼</label>
    <div class="layui-input-inline">
        <input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
    </div>-->
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
                                                    </div>-->
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">é»è®¤ä»åº</label>
                                                        <div class="layui-input-inline">
@@ -230,9 +232,9 @@
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <!--<label class="layui-form-label"> è¾å©è®¡éåä½ï¼</label>
    <div class="layui-input-inline">
        <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
    </div>-->
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
                                                    </div>-->
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">è¾å©è®¡éåä½</label>
                                                        <div class="layui-input-inline">
@@ -250,8 +252,8 @@
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" value="0">
                                                        <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT">
            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
        </button>-->
                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                        </button>-->
                                                        <!--<input id="HDormID" name="HDormID" type="hidden" />-->
                                                    </div>
                                                </div>
@@ -346,19 +348,19 @@
                                                    </div>
                                                </div>

                                                 <div class="layui-inline">
                                                     <label class="layui-form-label"> è±æè§æ ¼ï¼</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HEngModel" lay-verify="HEngModel" id="HEngModel" autocomplete="off">
                                                     </div>
                                                 </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> è±æè§æ ¼ï¼</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HEngModel" lay-verify="HEngModel" id="HEngModel" autocomplete="off">
                                                    </div>
                                                </div>

                                                 <div class="layui-inline">
                                                     <label class="layui-form-label"> è¾å©å±æ§ï¼</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
                                                     </div>
                                                 </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> è¾å©å±æ§ï¼</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
@@ -557,6 +559,7 @@
                                , "HUnitID": data.ä¸»è®¡éåä½
                                , "HUnitName": data.ä¸»è®¡éåä½åç§°
                                , "HUnitGroupID": data.è®¡éåä½ç»
                                , "HUnitGroupName": data.è®¡éåä½ç»åç§°
                                , "HSubjoin": data.éå å±æ§1
                                , "HSubjoin2": data.éå å±æ§2
                                , "HColor": data.é¢è²
@@ -589,7 +592,7 @@
                                , "HEndFlag": data.æç»æ è®°
                                , "HStopFlag": data.ç¦ç¨æ è®°
                            });

                            console.log($('#HUnitGroupID').val());
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
                        }
@@ -604,12 +607,36 @@
                var sMainStr = JSON.stringify(data.field);
                //var sSubStr = JSON.stringify(table.cache['mainTable']);
                //var sMainSub = sMainStr + ';' + sSubStr;
                if ($("#HNumber").val() == 0) {
                    layer.msg("è¯·éæ©ç©æä»£ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if ($("#HName").val() == 0) {
                    layer.msg("è¯·éæ©ç©æåç§°ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if ($("#HUnitName").val() == 0) {
                    layer.msg("è¯·éæ©ä¸»è®¡éåä½ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if ($("#HUnitGroupName").val() == 0) {
                    layer.msg("è¯·éæ©è®¡éåä½ç»ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if ($("#HWhName").val() == 0) {
                    layer.msg("è¯·éæ©é»è®¤ä»åºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if ($("#HSecUnitName").val() == 0) {
                    layer.msg("è¯·éæ©è¾å©è®¡éåä½ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "Gy_Material/SaveGy_MaterialList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                        async: true,
                        data: { "msg": sMainStr + ';' + sessionStorage["HUserName"]},
                        data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æéªè¯æåäºï¼
@@ -630,6 +657,12 @@
                        }
                    });
            });

            //å¤å¶æé®
            form.on('submit(Copy)', function (data) {
                $('#HNumber').val('');
            }); 

            function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });

@@ -647,7 +680,7 @@
                $("#UnitType").val(1);
                layer.open({
                    type: 2
                    , area: ['666px', '666px']
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'åä½åè¡¨'
                    , shade: 0.6 //é®ç½©éæåº¦
                    , maxmin: true //åè®¸å¨å±æå°å
@@ -664,7 +697,7 @@
                $("#UnitType").val(2);
                layer.open({
                    type: 2
                    , area: ['666px', '666px']
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'åä½åè¡¨'
                    , shade: 0.6 //é®ç½©éæåº¦
                    , maxmin: true //åè®¸å¨å±æå°å
@@ -679,15 +712,15 @@


            //éæ©è®¡éåä½ç»
            form.on('submit(HUnitGroupList)', function () {//éæ©å·¥ç§
            form.on('submit(HUnitGroupList)', function () {//éæ©è®¡éåä½ç»
                layer.open({
                    type: 2
                    , area: ['666px', '666px']
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'å·¥ç§åè¡¨'
                    , shade: 0.6 //é®ç½©éæåº¦
                    , maxmin: true //åè®¸å¨å±æå°å
                    , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                    , content: ['../../../views/Baseset/åºç¡èµæ/Gy_WorkTypeList.html', 'yes']
                    , content: ['../../../views/Baseset/åºç¡èµæ/Gy_UnitGroup.html', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -699,7 +732,7 @@
            form.on('submit(HWhList)', function () {//éæ©å·¥ç§
                layer.open({
                    type: 2
                    , area: ['666px', '666px']
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'ä»åºåè¡¨'
                    , shade: 0.6 //é®ç½©éæåº¦
                    , maxmin: true //åè®¸å¨å±æå°å
@@ -727,6 +760,11 @@
            $("#HWhName").val(obj[0].HName);
            $("#HWhID").val(obj[0].HItemID);
        }
        //è¿åè®¡éåä½ç»
        function GetHUnitGroupNameValue(obj) {
            $("#HUnitGroupName").val(obj[0].è®¡éåä½ç»);
            $("#HUnitGroupID").val(obj[0].HItemID);
        }
        //è¿åè®¡éåä½
        function GetHUnitNameValue(obj) {
            if ($("#UnitType").val() == 1) {

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Add_Edit_Gy_Unit.html

@@ -193,7 +193,7 @@
            var shijian = year + "-" + month + "-" + day;

            //å¤ææ¯å¦æ°å¢
            if (hID == null || hID == 0) {
            if (hID == 1) {
                //id new
                $("#HItemID").val(0);
            }
@@ -372,12 +372,24 @@
                var sMainStr = JSON.stringify(data.field);
                //var sSubStr = JSON.stringify(table.cache['mainTable']);
                //var sMainSub = sMainStr + ';' + sSubStr;
                if (!$("#HNumber").val()) {
                    layer.msg("è¯·è¾å¥ä»£ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if (!$("#HName").val()) {
                    layer.msg("è¯·è¾å¥åç§°ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if (!$("#HRate").val()) {
                    layer.msg("è¯·è¾å¥æ¢ç®æ¯ä¾ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "SaveGy_UnitList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                        async: true,
                        data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] },
                        data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æéªè¯æåäºï¼

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Add_Edit_Xt_ORGANIZATIONSList.html

@@ -13,6 +13,8 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

    <style>
        .layui-form-item .layui-inline {
            margin-top: 5px;
@@ -52,10 +54,10 @@
                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                            <div class="layui-inline">
                                <label class="layui-form-label">æ¥æ</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HMakeTime" id="HMakeTime" autocomplete="off">
                                <div class="layui-input-block">
                                    <input type="date" class="layui-input" name="HMakeTime" id="HMakeTime" style="width:190px;">
                                </div>
                            </div>
                        </div>
@@ -110,6 +112,8 @@

            //#region è¿å¥é¡µé¢å³å è½½

            $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
            var ItemID;
            //å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
            get_LoginIs();

@@ -124,7 +128,26 @@
            }
            //å¤ææä½ç±»å
            if (OperationType == 1) {//æ æºåæ°å¢
                $("#HItemID").val(0);
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "Xt_ORGANIZATIONS/GetMaxHItemID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    async: true,
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æéªè¯æåäºï¼
                            $("#HItemID").val(data.data[0].Column1 + 1);  //è·åæå¤§HItemID å¹¶ä¸+1
                            ItemID = data.data[0].Column1 + 1;
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        layer.alert("éè¯¯:" + err, { icon: 5 });
                        console.log("Reason" + sMainStr);
                    }
                });                
            }
            else if (OperationType == 3) {//ç¼è¾
                $("#HItemID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
@@ -200,12 +223,18 @@
            function RoadBillMain(linterid) {
                //æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
                var ajaxLoad = layer.load();

                $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));

                $.ajax({
                    url: GetWEBURL() + "Xt_ORGANIZATIONS/list",
                    url: GetWEBURL() + "Xt_ORGANIZATIONS/cx",
                    type: "GET",
                    data: {
                        "sWhere": "and HItemID=" + linterid
                    },
                    //data: {
                    //    "sWhere": linterid,
                    //    "user": sessionStorage["HUserName"],
                    //    "Organization": sessionStorage["Organization"]
                    //},
                    data: { "HInterID": linterid },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data[0];
@@ -218,10 +247,12 @@
                                "HNumber": data.ç»ç»ä»£ç 
                                , "HItemID": data.HItemID
                                , "HName": data.ç»ç»åç§°
                                , "HMakeTime": data.æ¥æ
                                //, "HMakeTime": data.æ¥æ
                                , "HStopflag": data.ç¦ç¨æ è®°
                                , "HRemark": data.å¤æ³¨
                            });
                            $("#HMakeTime").val(Format(data.æ¥æ, "yyyy-MM-dd"));

                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
@@ -237,19 +268,24 @@

            //#region ä¿åæ¹æ³
            function set_SaveBill(data) {
                if (data.field.HStopflag) {
                    data.field.HStopflag = 1
                } else  {
                    data.field.HStopflag = 0
                }
                var sMainStr = JSON.stringify(data.field);
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Xt_ORGANIZATIONS/ModifyByID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    async: true,
                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] + ';' + OperationType},
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æéªè¯æåäºï¼
                            layer.msg(data.Message, { icon: 1 });
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                            //ä¿ååæµè§
                            ReRoadBillMain();
                            //ReRoadBillMain();
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Gy_Employee_Add_Edit_.html

@@ -13,6 +13,8 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

    <style>
        .layui-form-item .layui-inline {
            margin-top: 5px;
@@ -91,7 +93,8 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">åºçå¹´æ</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HBirthDay" id="HBirthDay" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <!--<input class="layui-input" name="HBirthDay" id="HBirthDay" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">-->
                                                <input type="date" class="layui-input" name="HBirthDay" id="HBirthDay" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -100,7 +103,6 @@
                                                <input type="text" name="HAge" id="HAge" lay-verify="HAge" autocomplete="off" class="layui-input">
                                            </div>
                                        </div>

                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -212,7 +214,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">æ¯ä¸æ¶é´</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HGradDate" id="HGradDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HGradDate" id="HGradDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -346,13 +348,13 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">è¿åæ¥æ</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HInComDate" id="HInComDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HInComDate" id="HInComDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </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="HRelDate" id="HRelDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HRelDate" id="HRelDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -379,13 +381,13 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">åä¿æ¥æ</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HInsuranceDate" id="HInsuranceDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HInsuranceDate" id="HInsuranceDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </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="HContractEDate" id="HContractEDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HContractEDate" id="HContractEDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                    </div>
@@ -393,7 +395,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">ååå¼å§æ¥æ</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HContractBDate" id="HContractBDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HContractBDate" id="HContractBDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -405,7 +407,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">ç¦»èæ¥æ</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HDimissionDate" id="HDimissionDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HDimissionDate" id="HDimissionDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                    </div>
@@ -413,7 +415,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">æä½è¯å°ææ¥</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HStayCardEDate" id="HStayCardEDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HStayCardEDate" id="HStayCardEDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -766,7 +768,17 @@
            else {
                layer.alert("æªç¥æä½ç±»åï¼", { icon: 5 });
            }
            //$("#HGradDate").val(Format(2022-11-06, "yyyy-MM-dd"));

            $("#HAge").val(0);
            $("#HGradDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HInComDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HInsuranceDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HContractEDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HContractBDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HContractYear").val(0);
            $("#HDimissionDate").val(Format(9999-13-01, "yyyy-MM-dd"));
            $("#HStayCardEDate").val(Format(9999-13-01, "yyyy-MM-dd"));
        //#endregion


@@ -1189,12 +1201,25 @@
            }
            //#region ä¿åæ¹æ³
            function set_SaveBill(data) {
                data.field.HUseOrgID = sessionStorage["OrganizationID"];
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = "";
                if (!AllowLoadData(sSubStr))//æ°æ®éªè¯
                {
                    return false;
                }
                if ($("#HDeptName").val() == 0) {
                    layer.msg("è¯·éæ©é¨é¨ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if ($("#HGroupName").val() == 0) {
                    layer.msg("è¯·éæ©çç»ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                if ($("#HCTPrjName").val() == 0) {
                    layer.msg("è¯·éæ©æ ¸ç®æ¹å¼ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return;
                }
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_Employee/ModifyByID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Gy_Unit.html

@@ -74,6 +74,7 @@
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <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="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
@@ -243,6 +244,9 @@
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    //æ°å¢
                    case 'set_AddNew': set_AddNew();
                        break;
                    case 'btn-getCheckData':
                        var data = checkStatus.data;
                        layer.alert(JSON.stringify(data));
@@ -313,6 +317,19 @@
                };
            });

            //#region æ°å¢
            function set_AddNew() {
                layer.open({
                    type: 2
                    , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
                    , area: ['100%', '100%']
                    , title: 'è®¡éåä½-æ°å¢'
                    , shift: 0//å¼¹åºå¨ç»
                    , content: '../å¬ç¨åºç¡èµæ/Add_Edit_Gy_Unit.html?OperationType=1&linterid=&HSouceBillType='
                })
            }
            //#endregion

            //#region å¿«éè¿æ»¤
            function get_FastQuery() {
                var HNumber = $("#HNumber").val();

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Xt_ORGANIZATIONSList.html

@@ -378,7 +378,7 @@
                        var wait = layer.load();
                        //é»è¾å é¤æ¹æ³
                        $.ajax({
                            url: GetWEBURL() + 'DeltetGy_WorkCenter',
                            url: GetWEBURL() + 'DeltetXt_ORGANIZATIONSList',
                            type: "GET",
                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
                            success: function (result) {

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_SOPBill.html

File was deleted

New file
			@@ -0,0 +1,103 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>è®¡éåä½ç»åè¡¨</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-card">
			<!--<div class="layui-card-header"></div>-->
			<div class="layui-card-body" style="padding: 15px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤å</label>
			<div class="layui-input-inline">
			<input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="è¯·è¾å¥è¿æ»¤å" class="layui-input">
			</div>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">å¿«éæ¥è¯¢</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">è¿å</button>
			</div>
			</div>
			</form>
			</div>
			</div>
			</div>
			<table class="layui-hide" id="mainTable"></table>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script>
			layui.use(['table', 'form', 'layer'], function () {
			var table = layui.table
			, form = layui.form
			, layer = layui.layer;

			form.on('submit(HQuery)', function () {//éæ©åä½
			//var sMainStr = JSON.stringify(table.cache['mainTable']);
			RoadQuery($('#Value').val());
			});
			form.on('submit(FH)', function () {//éæ©åä½
			//var sMainStr = JSON.stringify(table.cache['mainTable']);
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			parent.GetHUnitGroupNameValue(data);
			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			});
			RoadQuery($('#Value').val());
			table.render({
			elem: '#mainTable'
			// , url: '/demo/table/user/'
			, data: []
			, cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
			, cols: [[
			{ type: 'radio' }
			, { field: 'HItemID', width: 150, title: 'åä½ç»ID', hide: true }
			, { field: 'è®¡éåä½ç»ä»£ç ', width: 150, title: 'è®¡éåä½ç»ä»£ç ' }
			, { field: 'è®¡éåä½ç»', width: 150, title: 'è®¡éåä½ç»', sort: true }
			]]
			, page: true
			});
			///å è½½æ¾ç¤ºæ°æ®
			function RoadQuery(Where) {
			var Value = Where;
			if (Value == null) {
			Value = '';
			}
			$.ajax({
			type: "get",
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
			url: GetWEBURL() + "/Web/GetUnitGroupList_Json",
			async: true,
			data: { "Unit": Value },
			//data: { "Value": Value },
			success: function (result) {
			ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
			table.reload('mainTable', {
			data: ajaxReturnData
			, height: 'full-10'
			, loading: false
			, done: function (index, res) {

			}
			});
			},
			error: function (result) {
			console.log(result);
			//layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
			}
			});
			};
			});
			</script>

			</body>
			</html>

			@@ -938,7 +938,8 @@
			<dd><a lay-href="åºç¡èµæ/çäº§åºç¡èµæ/Gy_BadReason.html">ä¸è¯åå åè¡¨</a></dd>
			<dd><a lay-href="åºç¡èµæ/åºç¡èµæ/Gy_ConkReasonList.html">æéåå åè¡¨</a></dd>
			<dd><a lay-href="åºç¡èµæ/çäº§åºç¡èµæ/Gy_SOPBillList.html">ä½ä¸æå¯¼ä¹¦ç»´æ¤</a></dd>
			<dd><a lay-href="åºç¡èµæ/çäº§åºç¡èµæ/Gy_SOPBill.html">ä½ä¸æå¯¼ä¹¦</a></dd>
			<dd><a lay-href="åºç¡èµæ/çäº§åºç¡èµæ/Gy_SOPBillEdit.html">ä½ä¸æå¯¼ä¹¦ç¼è¾</a></dd>
			<dd><a href="Gy_SOPBill.html" target="main_self_frame">ä½ä¸æå¯¼ä¹¦</a></dd>
			</dl>
			</dd>
			<dd>

			@@ -286,6 +286,7 @@

			//#region ä¿åæ¹æ³
			function set_SaveBill(data) {
			data.field.HUseOrgID = sessionStorage["OrganizationID"];
			var sMainStr = JSON.stringify(data.field);
			if (!$("#HNumber").val()) {
			layer.msg("è¯·è¾å¥é¨é¨ä»£ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });

			@@ -12,12 +12,15 @@
			.layui-form-label {
			width: 85px;
			}

			.layui-form-item .layui-input-inline {
			width: 50%;
			}

			.layui-inline {
			width: 290px;
			}

			.layui-form-item .layui-inline {
			margin-right: 0px;
			}
			@@ -32,11 +35,10 @@
			<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
			<div class="layui-card-header">
			<div class="layui-btn-group">
			<button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">å¤å¶</button>
			<button type="button" id="addnew-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">æ°å¢</button>
			<button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Copy">å¤å¶</button>
			<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 type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">é¢è§</button>
			<!--<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">é¢è§</button>-->

			</div>
			</div>
			@@ -94,22 +96,22 @@
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">ä¸»è®¡éåä½ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
			<input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>-->
			<label class="layui-form-label">ä¸»è®¡éåä½ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
			<input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>-->
			</div>

			<div class="layui-inline">
			<!--<label class="layui-form-label"> è®¡éåä½ç»ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
			</div>-->
			<div class="layui-input-inline">
			<input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">è®¡éåä½ç»</label>
			<div class="layui-input-inline">
			@@ -174,9 +176,9 @@

			<div class="layui-inline">
			<!--<label class="layui-form-label"> é»è®¤ä»åºï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
			</div>-->
			<div class="layui-input-inline">
			<input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">é»è®¤ä»åº</label>
			<div class="layui-input-inline">
			@@ -230,9 +232,9 @@
			<div class="layui-row">
			<div class="layui-inline">
			<!--<label class="layui-form-label"> è¾å©è®¡éåä½ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
			</div>-->
			<div class="layui-input-inline">
			<input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">è¾å©è®¡éåä½</label>
			<div class="layui-input-inline">
			@@ -250,8 +252,8 @@
			<div class="layui-input-inline">
			<input class="layui-input" name="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" value="0">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>-->
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>-->
			<!--<input id="HDormID" name="HDormID" type="hidden" />-->
			</div>
			</div>
			@@ -346,19 +348,19 @@
			</div>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label"> è±æè§æ ¼ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HEngModel" lay-verify="HEngModel" id="HEngModel" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label"> è±æè§æ ¼ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HEngModel" lay-verify="HEngModel" id="HEngModel" autocomplete="off">
			</div>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label"> è¾å©å±æ§ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label"> è¾å©å±æ§ï¼</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
			</div>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			@@ -557,6 +559,7 @@
			, "HUnitID": data.ä¸»è®¡éåä½
			, "HUnitName": data.ä¸»è®¡éåä½åç§°
			, "HUnitGroupID": data.è®¡éåä½ç»
			, "HUnitGroupName": data.è®¡éåä½ç»åç§°
			, "HSubjoin": data.éå å±æ§1
			, "HSubjoin2": data.éå å±æ§2
			, "HColor": data.é¢è²
			@@ -589,7 +592,7 @@
			, "HEndFlag": data.æç»æ è®°
			, "HStopFlag": data.ç¦ç¨æ è®°
			});

			console.log($('#HUnitGroupID').val());
			} else {
			layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			@@ -604,12 +607,36 @@
			var sMainStr = JSON.stringify(data.field);
			//var sSubStr = JSON.stringify(table.cache['mainTable']);
			//var sMainSub = sMainStr + ';' + sSubStr;
			if ($("#HNumber").val() == 0) {
			layer.msg("è¯·éæ©ç©æä»£ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HName").val() == 0) {
			layer.msg("è¯·éæ©ç©æåç§°ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HUnitName").val() == 0) {
			layer.msg("è¯·éæ©ä¸»è®¡éåä½ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HUnitGroupName").val() == 0) {
			layer.msg("è¯·éæ©è®¡éåä½ç»ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HWhName").val() == 0) {
			layer.msg("è¯·éæ©é»è®¤ä»åºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HSecUnitName").val() == 0) {
			layer.msg("è¯·éæ©è¾å©è®¡éåä½ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "Gy_Material/SaveGy_MaterialList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "msg": sMainStr + ';' + sessionStorage["HUserName"]},
			data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			@@ -630,6 +657,12 @@
			}
			});
			});

			//å¤å¶æé®
			form.on('submit(Copy)', function (data) {
			$('#HNumber').val('');
			});

			function f_alert(sMsg) {
			layer.alert(sMsg, { icon: 5 });

			@@ -647,7 +680,7 @@
			$("#UnitType").val(1);
			layer.open({
			type: 2
			, area: ['666px', '666px']
			, area: ['90%', '90%']//å¤§å°
			, title: 'åä½åè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			@@ -664,7 +697,7 @@
			$("#UnitType").val(2);
			layer.open({
			type: 2
			, area: ['666px', '666px']
			, area: ['90%', '90%']//å¤§å°
			, title: 'åä½åè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			@@ -679,15 +712,15 @@


			//éæ©è®¡éåä½ç»
			form.on('submit(HUnitGroupList)', function () {//éæ©å·¥ç§
			form.on('submit(HUnitGroupList)', function () {//éæ©è®¡éåä½ç»
			layer.open({
			type: 2
			, area: ['666px', '666px']
			, area: ['90%', '90%']//å¤§å°
			, title: 'å·¥ç§åè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_WorkTypeList.html', 'yes']
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_UnitGroup.html', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -699,7 +732,7 @@
			form.on('submit(HWhList)', function () {//éæ©å·¥ç§
			layer.open({
			type: 2
			, area: ['666px', '666px']
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä»åºåè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			@@ -727,6 +760,11 @@
			$("#HWhName").val(obj[0].HName);
			$("#HWhID").val(obj[0].HItemID);
			}
			//è¿åè®¡éåä½ç»
			function GetHUnitGroupNameValue(obj) {
			$("#HUnitGroupName").val(obj[0].è®¡éåä½ç»);
			$("#HUnitGroupID").val(obj[0].HItemID);
			}
			//è¿åè®¡éåä½
			function GetHUnitNameValue(obj) {
			if ($("#UnitType").val() == 1) {

			@@ -193,7 +193,7 @@
			var shijian = year + "-" + month + "-" + day;

			//å¤ææ¯å¦æ°å¢
			if (hID == null \|\| hID == 0) {
			if (hID == 1) {
			//id new
			$("#HItemID").val(0);
			}
			@@ -372,12 +372,24 @@
			var sMainStr = JSON.stringify(data.field);
			//var sSubStr = JSON.stringify(table.cache['mainTable']);
			//var sMainSub = sMainStr + ';' + sSubStr;
			if (!$("#HNumber").val()) {
			layer.msg("è¯·è¾å¥ä»£ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if (!$("#HName").val()) {
			layer.msg("è¯·è¾å¥åç§°ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if (!$("#HRate").val()) {
			layer.msg("è¯·è¾å¥æ¢ç®æ¯ä¾ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "SaveGy_UnitList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] },
			data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼

			@@ -13,6 +13,8 @@
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

			<style>
			.layui-form-item .layui-inline {
			margin-top: 5px;
			@@ -52,10 +54,10 @@
			<input class="layui-input" name="HName" id="HName" autocomplete="off">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HMakeTime" id="HMakeTime" autocomplete="off">
			<div class="layui-input-block">
			<input type="date" class="layui-input" name="HMakeTime" id="HMakeTime" style="width:190px;">
			</div>
			</div>
			</div>
			@@ -110,6 +112,8 @@

			//#region è¿å¥é¡µé¢å³å è½½

			$("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
			var ItemID;
			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			get_LoginIs();

			@@ -124,7 +128,26 @@
			}
			//å¤ææä½ç±»å
			if (OperationType == 1) {//æ æºåæ°å¢
			$("#HItemID").val(0);
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "Xt_ORGANIZATIONS/GetMaxHItemID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			$("#HItemID").val(data.data[0].Column1 + 1); //è·åæå¤§HItemID å¹¶ä¸+1
			ItemID = data.data[0].Column1 + 1;
			}
			else {
			layer.alert(data.Message, { icon: 5 });
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			layer.alert("éè¯¯:" + err, { icon: 5 });
			console.log("Reason" + sMainStr);
			}
			});
			}
			else if (OperationType == 3) {//ç¼è¾
			$("#HItemID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
			@@ -200,12 +223,18 @@
			function RoadBillMain(linterid) {
			//æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
			var ajaxLoad = layer.load();

			$("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));

			$.ajax({
			url: GetWEBURL() + "Xt_ORGANIZATIONS/list",
			url: GetWEBURL() + "Xt_ORGANIZATIONS/cx",
			type: "GET",
			data: {
			"sWhere": "and HItemID=" + linterid
			},
			//data: {
			// "sWhere": linterid,
			// "user": sessionStorage["HUserName"],
			// "Organization": sessionStorage["Organization"]
			//},
			data: { "HInterID": linterid },
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data[0];
			@@ -218,10 +247,12 @@
			"HNumber": data.ç»ç»ä»£ç
			, "HItemID": data.HItemID
			, "HName": data.ç»ç»åç§°
			, "HMakeTime": data.æ¥æ
			//, "HMakeTime": data.æ¥æ
			, "HStopflag": data.ç¦ç¨æ è®°
			, "HRemark": data.å¤æ³¨
			});
			$("#HMakeTime").val(Format(data.æ¥æ, "yyyy-MM-dd"));

			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			@@ -237,19 +268,24 @@

			//#region ä¿åæ¹æ³
			function set_SaveBill(data) {
			if (data.field.HStopflag) {
			data.field.HStopflag = 1
			} else {
			data.field.HStopflag = 0
			}
			var sMainStr = JSON.stringify(data.field);
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "Xt_ORGANIZATIONS/ModifyByID", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
			data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] + ';' + OperationType},
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { icon: 1 });
			$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
			//ä¿ååæµè§
			ReRoadBillMain();
			//ReRoadBillMain();
			}
			else {
			layer.alert(data.Message, { icon: 5 });

			@@ -74,6 +74,7 @@
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<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="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			@@ -243,6 +244,9 @@
			table.on('toolbar(mainTable)', function (obj) {
			var checkStatus = table.checkStatus(obj.config.id);
			switch (obj.event) {
			//æ°å¢
			case 'set_AddNew': set_AddNew();
			break;
			case 'btn-getCheckData':
			var data = checkStatus.data;
			layer.alert(JSON.stringify(data));
			@@ -313,6 +317,19 @@
			};
			});

			//#region æ°å¢
			function set_AddNew() {
			layer.open({
			type: 2
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['100%', '100%']
			, title: 'è®¡éåä½-æ°å¢'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../å¬ç¨åºç¡èµæ/Add_Edit_Gy_Unit.html?OperationType=1&linterid=&HSouceBillType='
			})
			}
			//#endregion

			//#region å¿«éè¿æ»¤
			function get_FastQuery() {
			var HNumber = $("#HNumber").val();

			@@ -378,7 +378,7 @@
			var wait = layer.load();
			//é»è¾å é¤æ¹æ³
			$.ajax({
			url: GetWEBURL() + 'DeltetGy_WorkCenter',
			url: GetWEBURL() + 'DeltetXt_ORGANIZATIONSList',
			type: "GET",
			data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
			success: function (result) {