MES-WEB-LayUI.git

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

wtt

7 天以前 f52be2c6ff5ccfd54b2aaa4ea3fee1a2dc969b50

三升排产页面报表添加过滤，pda添加返回链接

5个文件已修改

	WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/报工平台_PDA/IpadIndex_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html	34 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/Éú²ú¹ÜÀí/ÈýÉýÅÅ²ú/JIT_DayPlanPlatForm.html

@@ -5,13 +5,14 @@
    <title>çäº§è®¡åæäº§</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
    <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 src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <!--<script src="../../../layuiadmin/soulTable.slim.js"></script>-->
    <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
@@ -1382,26 +1383,27 @@
            columns.push({ type: 'checkbox', fixed: 'left'});
            columns.push({ type: 'numbers', field: 'åºå·', title: 'åºå·'});
            columns.push({ field: 'åæ®å·', title: 'åæ®å·', hide: true});
            columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150});
            columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;' });
            columns.push({ field: 'å®¢æ·è®¢åå·', title: 'å®¢æ·è®¢åå·', width: 150, style: 'background-color: #f9f9f9;' });
            columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150 });
            columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', width: 150});
            columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150});
            columns.push({ field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 150 });
            columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150, edit: 'text' });
            columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150 });//0
            columns.push({ field: 'è®¡åæ°é', title: 'çäº§è®¢åæ°é', width: 150 });//0
            columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150 });//0
            columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150, filter: true, sort: true});
            columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;', filter: true, sort: true });
            columns.push({ field: 'å®¢æ·è®¢åå·', title: 'å®¢æ·è®¢åå·', width: 150, style: 'background-color: #f9f9f9;', filter: true, sort: true });
            columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150, filter: true, sort: true });
            columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', width: 150, filter: true, sort: true});
            columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, filter: true, sort: true});
            columns.push({ field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 150, filter: true, sort: true });
            columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150, edit: 'text', filter: true, sort: true });
            columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150, filter: true, sort: true });//0
            columns.push({ field: 'è®¡åæ°é', title: 'çäº§è®¢åæ°é', width: 150, filter: true, sort: true });//0
            columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150, filter: true, sort: true });//0
            columns.push({ field: 'ä»æ¥ä¹åæ¥è®¡åæ°é', title: 'ä»æ¥ä¹åæ¥è®¡åæ°é', width: 150 });//0
            columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>" });
            columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate" });
            columns.push({ field: 'è®¢åå¯ææ°é', title: 'è®¢åå¯ææ°é', width: 150 });
            columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text' });
            columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é' });
            columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text' });
            columns.push({ field: 'çäº§èµæº', title: 'çäº§èµæº', width: 150, edit: 'text', event: "HSourceID" });
            columns.push({ field: 'æä½å·¥', title: 'æä½å·¥', width: 150, edit: 'text', event: "HEmpID" });
            columns.push({ field: 'çäº§è®¢åæ¥æ', title: 'çäº§è®¢åæ¥æ', width: 150, templet: "<div>{{d.çäº§è®¢åæ¥æ ==null ?'':layui.util.toDateString(d.çäº§è®¢åæ¥æ, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
            columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
            columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", filter: true, sort: true });
            columns.push({ field: 'è®¢åå¯ææ°é', title: 'è®¢åå¯ææ°é', width: 150, filter: true, sort: true});
            columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text', filter: true, sort: true });
            columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é', filter: true, sort: true });
            columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text', filter: true, sort: true });
            columns.push({ field: 'çäº§èµæº', title: 'çäº§èµæº', width: 150, edit: 'text', event: "HSourceID", filter: true, sort: true });
            columns.push({ field: 'æä½å·¥', title: 'æä½å·¥', width: 150, edit: 'text', event: "HEmpID", filter: true, sort: true });

            var dateColumns = setInit_columnsData();
            var HArrangeProductDayQty = $("#HArrangeProductDayQty").val() * 1;
@@ -1985,7 +1987,7 @@
            if (HICMOBillNo_ICMO) {
                sWhere_ICMO += " and (å®¢æ·è®¢åå· like '%" + HICMOBillNo_ICMO + "%' or åæ®å· like '%" + + HICMOBillNo_ICMO + "%')";
            }
            sWhere_ICMO += " and ç¶æ like '%å¼å·¥%' or ç¶æ like '%è®¡åç¡®è®¤%'";
            sWhere_ICMO += " and (ç¶æ like '%å¼å·¥%' or ç¶æ like '%è®¡åç¡®è®¤%')";
            get_Display2(sWhere_ICMO);
            sWhere_ICMO = ""//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
        }

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Æ½Ì¨_PDA/IpadIndex_PDA.html

@@ -1240,7 +1240,7 @@
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: 'çäº§ç®¡ç/å¼å¸¸åé¦å/Sc_MESExecptFeedBackBillType.html',
                content: '../../çäº§ç®¡ç/å¼å¸¸åé¦å/Sc_MESExecptFeedBackBillType.html',
                end: function () {

                },

 WebTM/views/Éú²ú¹ÜÀí/ÈÕ¼Æ»®±¨±í/ReportMOMaterReadysBillList.html

@@ -446,7 +446,8 @@
                    , { field: 'ç»ç»åç§°', title: 'ç»ç»åç§°', width: 120, sort: true, filter: true }
                    , { field: 'çäº§è½¦é´åç§°', title: 'çäº§è½¦é´åç§°', sort: true, filter: true  }
                    , { field: 'çäº§èµæºåç§°', title: 'çäº§èµæºåç§°', width: 100, sort: true, filter: true }
                    , { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', sort: true, filter: true  }
                    , { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', sort: true, filter: true }
                    , { field: 'å®¢æ·è®¢åå·', title: 'å®¢æ·è®¢åå·', sort: true, filter: true }
                    , { field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', sort: true, filter: true  }
                    , { field: 'FCOLUMN9', title: 'çµå/åç/åºæ¿', sort: true, filter: true }
                    , { field: 'è®¢åäº¤æ', title: 'è®¢åäº¤æ', templet: "<div>{{d.è®¢åäº¤æ ==null ?'':layui.util.toDateString(d.è®¢åäº¤æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } }
@@ -643,25 +644,18 @@
                    if (result.count == 1) {
                        data = result.data;

                        option.data = data;

                        //å·æ°è¡¨æ ¼æ°æ®
                        DisPlay_HideColumn();

                        ins = table.render(option);

                        data.forEach((item) => {
                            for (let itemobj in item) {
                                if (item[itemobj] == null) {
                                    item[itemobj] = "";
                                }
                                if (item[itemobj].length > 0) {  // åè®¾åæ®µåä¸ºfield
                                    item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                                    item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                                }
                            }
                        });

                        table.exportFile(ins.config.id, data, "xls");
                        table.exportFile('mainTable', data, "xls");

                        layer.close(ajaxLoad);
                    } else {

 WebTM/views/Éú²ú¹ÜÀí/ÈÕ¼Æ»®±¨±í/ReportPODemandPlanBillList.html

@@ -5,13 +5,14 @@
    <title>ææè®¡åæ¥è¡¨(éè´è®¢åç»´åº¦)</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <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 src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <!--<script src="../../../layuiadmin/soulTable.slim.js"></script>-->
    <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
@@ -204,20 +205,21 @@
        function set_InitGrid() {
            var columns = [];
        
            columns.push({ type: 'checkbox', fixed: 'left', sort: true});
            columns.push({ field: 'ç»ç»', title: 'éè´ç»ç»', sort: true});
            columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', sort: true});
            columns.push({ field: 'è§æ ¼åå·', title: 'ç©æè§æ ¼', sort: true});
            columns.push({ field: 'ä¾åºå', title: 'ä¾åºå', sort: true});
            columns.push({ field: 'FSUMQTY', title: 'åè®¡', sort: true});
            columns.push({ field: 'HPOOrderBillNo', title: 'éè´è®¢åå·', sort: true});
            columns.push({ field: 'HSeOrderBillNo', title: 'éå®è®¢åå·', sort: true});
            columns.push({ field: 'HPOOrderBillRemark', title: 'æè¦', sort: true });
            columns.push({ field: 'HPOOrderBillNote', title: 'å¤æ³¨', sort: true});
            columns.push({ field: 'éè´å', title: 'éè´å', sort: true});
            columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', sort: true});
            columns.push({ field: 'è®¡éåä½åç§°', title: 'è®¡éåä½', sort: true});
            columns.push({ field: 'TQSUM', title: 'æææææ°é', sort: true, totalRow: true});
            columns.push({ type: 'checkbox', fixed: 'left', sort: true, filter: true});
            columns.push({ field: 'ç»ç»', title: 'éè´ç»ç»', sort: true, filter: true});
            columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', sort: true, filter: true});
            columns.push({ field: 'è§æ ¼åå·', title: 'ç©æè§æ ¼', sort: true, filter: true});
            columns.push({ field: 'ä¾åºå', title: 'ä¾åºå', sort: true, filter: true});
            columns.push({ field: 'FSUMQTY', title: 'åè®¡', sort: true, filter: true });
            columns.push({ field: 'HPOOrderBillNo', title: 'éè´è®¢åå·', sort: true, filter: true });
            columns.push({ field: 'å®¢æ·è®¢åå·', title: 'å®¢æ·è®¢åå·', sort: true, filter: true });
            columns.push({ field: 'HSeOrderBillNo', title: 'éå®è®¢åå·', sort: true, filter: true});
            columns.push({ field: 'HPOOrderBillRemark', title: 'æè¦', sort: true, filter: true });
            columns.push({ field: 'HPOOrderBillNote', title: 'å¤æ³¨', sort: true, filter: true});
            columns.push({ field: 'éè´å', title: 'éè´å', sort: true, filter: true});
            columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', sort: true, filter: true});
            columns.push({ field: 'è®¡éåä½åç§°', title: 'è®¡éåä½', sort: true, filter: true});
            columns.push({ field: 'TQSUM', title: 'æææææ°é', sort: true, totalRow: true, filter: true});
         
            //è·åä¸¤ä¸ªææä¹é´çç¸å·®
            var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//å¼å§æ¶é´
@@ -252,7 +254,7 @@
                }
            }
          
            columns.push({ field: 'ææè®¡ååè®¡', title: 'ææè®¡ååè®¡' });
            columns.push({ field: 'ææè®¡ååè®¡', title: 'ææè®¡ååè®¡', filter: true });

            option = {
                elem: '#mainTable'

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕÂ·Ïß/Gy_RoutingBill.html

@@ -2627,7 +2627,7 @@
                        $.ajax({
                            url: GetWEBURL() + '/Gy_Process/list',
                            type: "GET", 
                            data: { "sWhere": sWhere, "user": 'ç¿æ¶æ¶'},
                            data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                            async: false,
                            success: function (data1) {
                                if (data1.count == 1) {

			@@ -5,13 +5,14 @@
			<title>çäº§è®¡åæäº§</title>
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
			<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 src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<!--<script src="../../../layuiadmin/soulTable.slim.js"></script>-->
			<script src="../../../layuiadmin/SetColumn.js"></script>
			</head>
			<body>
			@@ -1382,26 +1383,27 @@
			columns.push({ type: 'checkbox', fixed: 'left'});
			columns.push({ type: 'numbers', field: 'åºå·', title: 'åºå·'});
			columns.push({ field: 'åæ®å·', title: 'åæ®å·', hide: true});
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150});
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;' });
			columns.push({ field: 'å®¢æ·è®¢åå·', title: 'å®¢æ·è®¢åå·', width: 150, style: 'background-color: #f9f9f9;' });
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150 });
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', width: 150});
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150});
			columns.push({ field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 150 });
			columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150, edit: 'text' });
			columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150 });//0
			columns.push({ field: 'è®¡åæ°é', title: 'çäº§è®¢åæ°é', width: 150 });//0
			columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150 });//0
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150, filter: true, sort: true});
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;', filter: true, sort: true });
			columns.push({ field: 'å®¢æ·è®¢åå·', title: 'å®¢æ·è®¢åå·', width: 150, style: 'background-color: #f9f9f9;', filter: true, sort: true });
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150, filter: true, sort: true });
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', width: 150, filter: true, sort: true});
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, filter: true, sort: true});
			columns.push({ field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 150, filter: true, sort: true });
			columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150, edit: 'text', filter: true, sort: true });
			columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150, filter: true, sort: true });//0
			columns.push({ field: 'è®¡åæ°é', title: 'çäº§è®¢åæ°é', width: 150, filter: true, sort: true });//0
			columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150, filter: true, sort: true });//0
			columns.push({ field: 'ä»æ¥ä¹åæ¥è®¡åæ°é', title: 'ä»æ¥ä¹åæ¥è®¡åæ°é', width: 150 });//0
			columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>" });
			columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate" });
			columns.push({ field: 'è®¢åå¯ææ°é', title: 'è®¢åå¯ææ°é', width: 150 });
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text' });
			columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é' });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text' });
			columns.push({ field: 'çäº§èµæº', title: 'çäº§èµæº', width: 150, edit: 'text', event: "HSourceID" });
			columns.push({ field: 'æä½å·¥', title: 'æä½å·¥', width: 150, edit: 'text', event: "HEmpID" });
			columns.push({ field: 'çäº§è®¢åæ¥æ', title: 'çäº§è®¢åæ¥æ', width: 150, templet: "<div>{{d.çäº§è®¢åæ¥æ ==null ?'':layui.util.toDateString(d.çäº§è®¢åæ¥æ, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
			columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
			columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", filter: true, sort: true });
			columns.push({ field: 'è®¢åå¯ææ°é', title: 'è®¢åå¯ææ°é', width: 150, filter: true, sort: true});
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text', filter: true, sort: true });
			columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é', filter: true, sort: true });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text', filter: true, sort: true });
			columns.push({ field: 'çäº§èµæº', title: 'çäº§èµæº', width: 150, edit: 'text', event: "HSourceID", filter: true, sort: true });
			columns.push({ field: 'æä½å·¥', title: 'æä½å·¥', width: 150, edit: 'text', event: "HEmpID", filter: true, sort: true });

			var dateColumns = setInit_columnsData();
			var HArrangeProductDayQty = $("#HArrangeProductDayQty").val() * 1;
			@@ -1985,7 +1987,7 @@
			if (HICMOBillNo_ICMO) {
			sWhere_ICMO += " and (å®¢æ·è®¢åå· like '%" + HICMOBillNo_ICMO + "%' or åæ®å· like '%" + + HICMOBillNo_ICMO + "%')";
			}
			sWhere_ICMO += " and ç¶æ like '%å¼å·¥%' or ç¶æ like '%è®¡åç¡®è®¤%'";
			sWhere_ICMO += " and (ç¶æ like '%å¼å·¥%' or ç¶æ like '%è®¡åç¡®è®¤%')";
			get_Display2(sWhere_ICMO);
			sWhere_ICMO = ""//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}

			@@ -1240,7 +1240,7 @@
			shift: 2,
			area: ['100%', '100%'],
			maxmin: true,
			content: 'çäº§ç®¡ç/å¼å¸¸åé¦å/Sc_MESExecptFeedBackBillType.html',
			content: '../../çäº§ç®¡ç/å¼å¸¸åé¦å/Sc_MESExecptFeedBackBillType.html',
			end: function () {

			},

			@@ -446,7 +446,8 @@
			, { field: 'ç»ç»åç§°', title: 'ç»ç»åç§°', width: 120, sort: true, filter: true }
			, { field: 'çäº§è½¦é´åç§°', title: 'çäº§è½¦é´åç§°', sort: true, filter: true }
			, { field: 'çäº§èµæºåç§°', title: 'çäº§èµæºåç§°', width: 100, sort: true, filter: true }
			, { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', sort: true, filter: true }
			, { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', sort: true, filter: true }
			, { field: 'å®¢æ·è®¢åå·', title: 'å®¢æ·è®¢åå·', sort: true, filter: true }
			, { field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', sort: true, filter: true }
			, { field: 'FCOLUMN9', title: 'çµå/åç/åºæ¿', sort: true, filter: true }
			, { field: 'è®¢åäº¤æ', title: 'è®¢åäº¤æ', templet: "<div>{{d.è®¢åäº¤æ ==null ?'':layui.util.toDateString(d.è®¢åäº¤æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } }
			@@ -643,25 +644,18 @@
			if (result.count == 1) {
			data = result.data;

			option.data = data;

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			ins = table.render(option);

			data.forEach((item) => {
			for (let itemobj in item) {
			if (item[itemobj] == null) {
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});

			table.exportFile(ins.config.id, data, "xls");
			table.exportFile('mainTable', data, "xls");

			layer.close(ajaxLoad);
			} else {

			@@ -5,13 +5,14 @@
			<title>ææè®¡åæ¥è¡¨(éè´è®¢åç»´åº¦)</title>
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<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 src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<!--<script src="../../../layuiadmin/soulTable.slim.js"></script>-->
			<script src="../../../layuiadmin/SetColumn.js"></script>
			</head>
			<body>
			@@ -204,20 +205,21 @@
			function set_InitGrid() {
			var columns = [];

			columns.push({ type: 'checkbox', fixed: 'left', sort: true});
			columns.push({ field: 'ç»ç»', title: 'éè´ç»ç»', sort: true});
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', sort: true});
			columns.push({ field: 'è§æ ¼åå·', title: 'ç©æè§æ ¼', sort: true});
			columns.push({ field: 'ä¾åºå', title: 'ä¾åºå', sort: true});
			columns.push({ field: 'FSUMQTY', title: 'åè®¡', sort: true});
			columns.push({ field: 'HPOOrderBillNo', title: 'éè´è®¢åå·', sort: true});
			columns.push({ field: 'HSeOrderBillNo', title: 'éå®è®¢åå·', sort: true});
			columns.push({ field: 'HPOOrderBillRemark', title: 'æè¦', sort: true });
			columns.push({ field: 'HPOOrderBillNote', title: 'å¤æ³¨', sort: true});
			columns.push({ field: 'éè´å', title: 'éè´å', sort: true});
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', sort: true});
			columns.push({ field: 'è®¡éåä½åç§°', title: 'è®¡éåä½', sort: true});
			columns.push({ field: 'TQSUM', title: 'æææææ°é', sort: true, totalRow: true});
			columns.push({ type: 'checkbox', fixed: 'left', sort: true, filter: true});
			columns.push({ field: 'ç»ç»', title: 'éè´ç»ç»', sort: true, filter: true});
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', sort: true, filter: true});
			columns.push({ field: 'è§æ ¼åå·', title: 'ç©æè§æ ¼', sort: true, filter: true});
			columns.push({ field: 'ä¾åºå', title: 'ä¾åºå', sort: true, filter: true});
			columns.push({ field: 'FSUMQTY', title: 'åè®¡', sort: true, filter: true });
			columns.push({ field: 'HPOOrderBillNo', title: 'éè´è®¢åå·', sort: true, filter: true });
			columns.push({ field: 'å®¢æ·è®¢åå·', title: 'å®¢æ·è®¢åå·', sort: true, filter: true });
			columns.push({ field: 'HSeOrderBillNo', title: 'éå®è®¢åå·', sort: true, filter: true});
			columns.push({ field: 'HPOOrderBillRemark', title: 'æè¦', sort: true, filter: true });
			columns.push({ field: 'HPOOrderBillNote', title: 'å¤æ³¨', sort: true, filter: true});
			columns.push({ field: 'éè´å', title: 'éè´å', sort: true, filter: true});
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', sort: true, filter: true});
			columns.push({ field: 'è®¡éåä½åç§°', title: 'è®¡éåä½', sort: true, filter: true});
			columns.push({ field: 'TQSUM', title: 'æææææ°é', sort: true, totalRow: true, filter: true});

			//è·åä¸¤ä¸ªææä¹é´çç¸å·®
			var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//å¼å§æ¶é´
			@@ -252,7 +254,7 @@
			}
			}

			columns.push({ field: 'ææè®¡ååè®¡', title: 'ææè®¡ååè®¡' });
			columns.push({ field: 'ææè®¡ååè®¡', title: 'ææè®¡ååè®¡', filter: true });

			option = {
			elem: '#mainTable'

			@@ -2627,7 +2627,7 @@
			$.ajax({
			url: GetWEBURL() + '/Gy_Process/list',
			type: "GET",
			data: { "sWhere": sWhere, "user": 'ç¿æ¶æ¶'},
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
			async: false,
			success: function (data1) {
			if (data1.count == 1) {