~jhz/KaiShanLAYUI-invalid.git

parent: 0c39036d | 补丁 | 提交 | ignore whitespace

zgq

2021-03-24 908fe0453f4034694ea5a182b4b7b26a07c18354

新增物料设置

1个文件已添加

3个文件已修改

	WebTM/Properties/PublishProfiles/JFTM.pubxml.user	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Gy_Material.html	187 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

@@ -11,10 +11,10 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>03/24/2021 09:17:50</publishTime>
      <publishTime>03/24/2021 09:30:55</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>03/24/2021 09:17:50</publishTime>
      <publishTime>03/24/2021 09:30:55</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -932,7 +932,7 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="views/index.html">
      <publishTime>03/24/2021 09:17:49</publishTime>
      <publishTime>03/24/2021 09:26:04</publishTime>
    </File>
    <File Include="views/senior/echarts/bar.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -1078,6 +1078,9 @@
    <File Include="views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Employee.html">
      <publishTime>03/24/2021 09:02:08</publishTime>
    </File>
    <File Include="views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html">
      <publishTime>03/24/2021 09:30:40</publishTime>
    </File>
    <File Include="views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html">
      <publishTime>03/24/2021 09:17:43</publishTime>
    </File>

 WebTM/WebTM.csproj

@@ -423,6 +423,7 @@
    <Content Include="views\ä»åç®¡ç\ä»åºè°æ¨\Kf_MoveStockBill_Fast.html" />
    <Content Include="views\ä»åç®¡ç\ä»åºè°æ¨\Kf_MoveStockBill_FastList.html" />
    <Content Include="views\å¬å±é¡µé¢\Kf_BarCodeEditDlg.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_Material.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_Warehouse.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_Employee.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_Department.html" />

 WebTM/views/index.html

@@ -202,7 +202,7 @@
                      <dd class="layui-nav-itemed">
                          <a>å¬ç¨åºç¡èµæ</a>
                          <dl class="layui-nav-child">
                              <dd><a lay-href="åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Process.html">ç©æè®¾ç½®</a></dd>
                              <dd><a lay-href="åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html">ç©æè®¾ç½®</a></dd>
                              <dd><a lay-href="åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html">ä»åºè®¾ç½®</a></dd>
                              <dd><a lay-href="åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Employee.html">èåè®¾ç½®</a></dd>
                              <dd><a lay-href="åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Department.html">é¨é¨è®¾ç½®</a></dd>

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

New file
@@ -0,0 +1,187 @@
ï»¿<!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, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span></span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ç©æä»£ç </label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ç©æåç§°</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

                            </div>
                        </div>
                        <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="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>ç¡®è®¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>é©³å</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>è¯¦æ</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>çæéè´§å</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>

                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
            var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
            var sWhere = "";

            var option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                ,height: 'full-50' 
                , page: true
                ,cellMinWidth: 90
                , cols: [[
                    { field: 'éæ©', title: 'éæ©', hide: true }
                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ' }
                    , { field: 'ç©æåç§°', title: 'ç©æåç§°' }
                    , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ' }
                    , { field: 'è®¡éåä½åç§°', title: 'è®¡éåä½åç§°' }
                    , { field: 'HMinPickQty', title: 'HMinPickQty', hide: true }
                    , { field: 'æç»æ è®°', title: 'æç»æ è®°' }
                    , { field: 'ç¦ç¨æ è®°', title: 'ç¦ç¨æ è®°' }
                    , { field: 'ç»ç»åç§°', title: 'ç»ç»åç§°' }
                    , { field: 'HEndFlag', title: 'HEndFlag', hide: true }
                    , { field: 'HStopFlag', title: 'HStopFlag', hide: true }
                    , { field: 'HParentID', title: 'HParentID', hide: true }
                    , { field: 'HUSEORGID', title: 'HUSEORGID', hide: true }
                ]]
            };

            var index = layer.load(0, { shade: false });
            //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
            $.ajax({
                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                url: GetWEBURL() + '/Gy_Material/list',
                type: "GET",
                data: { "sWhere": sWhere },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(index);
                    } else {
                        layer.close(index);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index);
                    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                }
            }); 

            //éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#btnSearch").click();
            });

            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
                    sWhere += " and ç©æä»£ç  like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and ç©æåç§° like '%" + HName + "%'";
                }
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL1() + '/Gy_Material/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.alert("æ¥è¯¢æå", { icon: 1 });
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            });


            //laydate.render({
            //    elem: '#HDate'
            //    , type: 'datetime'
            //    , trigger: 'click'
            //    , format:'yyyy-MM-dd HH:mm'
            //});


            //ä»¥ä¸æ¯layuiæ¨¡å
        });

        


    </script>

</body>
</html>

			@@ -11,10 +11,10 @@
			<publishTime>03/23/2021 14:14:38</publishTime>
			</File>
			<File Include="bin/WebTM.dll">
			<publishTime>03/24/2021 09:17:50</publishTime>
			<publishTime>03/24/2021 09:30:55</publishTime>
			</File>
			<File Include="bin/WebTM.pdb">
			<publishTime>03/24/2021 09:17:50</publishTime>
			<publishTime>03/24/2021 09:30:55</publishTime>
			</File>
			<File Include="layuiadmin/config.js">
			<publishTime>03/23/2021 14:14:38</publishTime>
			@@ -932,7 +932,7 @@
			<publishTime>03/23/2021 14:14:38</publishTime>
			</File>
			<File Include="views/index.html">
			<publishTime>03/24/2021 09:17:49</publishTime>
			<publishTime>03/24/2021 09:26:04</publishTime>
			</File>
			<File Include="views/senior/echarts/bar.html">
			<publishTime>03/23/2021 14:14:38</publishTime>
			@@ -1078,6 +1078,9 @@
			<File Include="views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Employee.html">
			<publishTime>03/24/2021 09:02:08</publishTime>
			</File>
			<File Include="views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html">
			<publishTime>03/24/2021 09:30:40</publishTime>
			</File>
			<File Include="views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html">
			<publishTime>03/24/2021 09:17:43</publishTime>
			</File>

			@@ -423,6 +423,7 @@
			<Content Include="views\ä»åç®¡ç\ä»åºè°æ¨\Kf_MoveStockBill_Fast.html" />
			<Content Include="views\ä»åç®¡ç\ä»åºè°æ¨\Kf_MoveStockBill_FastList.html" />
			<Content Include="views\å¬å±é¡µé¢\Kf_BarCodeEditDlg.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_Material.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_Warehouse.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_Employee.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_Department.html" />

			@@ -202,7 +202,7 @@
			<dd class="layui-nav-itemed">
			<a>å¬ç¨åºç¡èµæ</a>
			<dl class="layui-nav-child">
			<dd><a lay-href="åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Process.html">ç©æè®¾ç½®</a></dd>
			<dd><a lay-href="åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html">ç©æè®¾ç½®</a></dd>
			<dd><a lay-href="åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html">ä»åºè®¾ç½®</a></dd>
			<dd><a lay-href="åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Employee.html">èåè®¾ç½®</a></dd>
			<dd><a lay-href="åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Department.html">é¨é¨è®¾ç½®</a></dd>

New file
			@@ -0,0 +1,187 @@
			ï»¿<!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, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>

			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span></span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HNumber" id="HNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æåç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HName" id="HName">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

			</div>
			</div>
			<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="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>ç¡®è®¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>é©³å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>è¯¦æ</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>çæéè´§å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>

			</div>
			</script>
			</form>
			</div>
			</div>
			</div>
			</div>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			var sWhere = "";

			var option = {
			elem: '#mainTable'
			//, toolbar: '#toolbarDemo'
			,height: 'full-50'
			, page: true
			,cellMinWidth: 90
			, cols: [[
			{ field: 'éæ©', title: 'éæ©', hide: true }
			, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ' }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°' }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ' }
			, { field: 'è®¡éåä½åç§°', title: 'è®¡éåä½åç§°' }
			, { field: 'HMinPickQty', title: 'HMinPickQty', hide: true }
			, { field: 'æç»æ è®°', title: 'æç»æ è®°' }
			, { field: 'ç¦ç¨æ è®°', title: 'ç¦ç¨æ è®°' }
			, { field: 'ç»ç»åç§°', title: 'ç»ç»åç§°' }
			, { field: 'HEndFlag', title: 'HEndFlag', hide: true }
			, { field: 'HStopFlag', title: 'HStopFlag', hide: true }
			, { field: 'HParentID', title: 'HParentID', hide: true }
			, { field: 'HUSEORGID', title: 'HUSEORGID', hide: true }
			]]
			};

			var index = layer.load(0, { shade: false });
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL() + '/Gy_Material/list',
			type: "GET",
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.close(index);
			} else {
			layer.close(index);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(index);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			$("#HNumber").val("");
			$("#HName").val("");
			$("#btnSearch").click();
			});

			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			var HNumber = $("#HNumber").val();
			var HName = $("#HName").val();
			if (HNumber) {
			sWhere += " and ç©æä»£ç like '%" + HNumber + "%'";
			}
			if (HName) {
			sWhere += " and ç©æåç§° like '%" + HName + "%'";
			}
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL1() + '/Gy_Material/list',
			type: "GET",
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			});


			//laydate.render({
			// elem: '#HDate'
			// , type: 'datetime'
			// , trigger: 'click'
			// , format:'yyyy-MM-dd HH:mm'
			//});


			//ä»¥ä¸æ¯layuiæ¨¡å
			});




			</script>

			</body>
			</html>