MES-WEB-LayUI.git

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

wtt

2024-10-08 7d88000ed19beab7b7411d7b64fd5e7e9916da2d

4个文件已修改

	WebTM/WebTM.csproj.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/公共页面/Kf_SourceBillEditDlg_PDA.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/质量报表/QC_EquipMentCollectionTechParam.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html	42 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj.user

@@ -3,7 +3,7 @@
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/views/¹«¹²Ò³Ãæ/Kf_SourceBillEditDlg_PDA.html

@@ -46,6 +46,14 @@
                                <input type="text" name="HMater" id="HMater" lay-verify="HMater" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:60px;padding-left:0px;">å³èé¡¹</label>
                            </div>
                            <div class="layui-col-xs9">
                                <input type="text" name="HCustom" id="HCustom" lay-verify="HCustom" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                            </div>
                        </div>
                        <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
                            <button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">æ¥è¯¢</button>
                            <button type="button" lay-submit="" lay-filter="cmdOK" class="layui-btn" id="cmdOK">è¿å</button>
@@ -93,6 +101,7 @@
            var HMaker = sessionStorage["HUserName"]
            var HSourceBillNo = "";
            var HMater = "";
            var HCustom = "";
            var listOption = [];
            var columns = "";
            var HModName = "Kf_SourceBillEditDlg_PDA";
@@ -186,6 +195,7 @@
            form.on('submit(cmdQuery)', function () {
                HSourceBillNo = $("#HSourceBillNo").val();
                HMater = $("#HMater").val();
                HCustom = $("#HCustom").val();
                //æ¾ç¤ºç©æåè¡¨ä¿¡æ¯
                DisBillEntryList();
            });
@@ -223,7 +233,7 @@
                    type: "GET",
                    url: GetWEBURL() + '/WEBSController/GetSourceBillList_Json',
                    async: true,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                    data: { "HBillType": HBillType, "HSourceBillType": HSourceBillType, "HStockOrgID": HStockOrgID, "HSourceBillNo": HSourceBillNo, "HMater": HMater },
                    data: { "HBillType": HBillType, "HSourceBillType": HSourceBillType, "HStockOrgID": HStockOrgID, "HSourceBillNo": HSourceBillNo, "HMater": HMater, "HCustom": HCustom },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            var data = [];

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_EquipMentCollectionTechParam.html

@@ -448,7 +448,7 @@
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                                formatter: '{c}'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
@@ -470,7 +470,7 @@
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                                formatter: '{c}'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
@@ -492,7 +492,7 @@
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}%'
                                formatter: '{c}'
                            },
                            tooltip: {
                                valueFormatter: function (value) {

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷×ª/MES_StationOutBill_PDA.html

@@ -803,21 +803,12 @@
                                        toolbar: '#toolbarDemo'
                                        , where: { HProcExchHinteID: HProcExchHinteID }
                                        , cols: [[
                                            { type: 'numbers', title: 'åºå·', totalRow: true }
                                            , { field: 'HOrderProcNO', title: 'è®¢åè·è¸ªå·', edit: 'text' }
                                            , { field: 'hbillno', title: 'æµè½¬å¡å·', hide: true }
                                            , { field: 'HICMOBillNo', title: 'çäº§è®¢åå·', edit: 'text' }
                                            , { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
                                            , { field: 'äº§ååç§°', title: 'äº§ååç§°', edit: 'text' }
                                            , { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é' }
                                            , { field: 'æµæ°´å·', title: 'æµæ°´å·', edit: 'text' }
                                            , { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°' }
                                            , { field: 'å·¥ä½ä¸å¿', title: 'å·¥ä½ä¸å¿' }
                                            , { field: 'æ¯å¦å§å¤', title: 'æ¯å¦å§å¤', edit: 'text' }
                                            , { field: 'ä¾åºå', title: 'ä¾åºå' }
                                            , { field: 'è®¡åæ°é', title: 'è®¡åæ°é' }
                                            , { field: 'è¿ç«æ°é', title: 'è¿ç«æ°é', edit: 'text' }
                                            , { field: 'åºç«æ°é', title: 'åºç«æ°é' }
                                            { field: 'æµæ°´å·', title: 'æµæ°´å·', hide: true }
                                            , { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 180 }
                                            , { field: 'åºç«æ°é', title: 'åºç«æ°é', width: 90 }
                                            , { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é', width: 100 }
                                            , { field: 'å·¥èºåæ°', title: 'å·¥èºåæ°', hide: true }
                                            , { field: 'è¿ç«æ°é', title: 'è¿ç«æ°é', hide: true }
                                        ]]
                                        , height: 500
                                    }
@@ -885,21 +876,12 @@
                                        toolbar: '#toolbarDemo'
                                        , where: { HProcExchHinteID: HProcExchHinteID }
                                        , cols: [[
                                            { type: 'numbers', title: 'åºå·', totalRow: true }
                                            , { field: 'HOrderProcNO', title: 'è®¢åè·è¸ªå·', edit: 'text' }
                                            , { field: 'hbillno', title: 'æµè½¬å¡å·', hide: true }
                                            , { field: 'HICMOBillNo', title: 'çäº§è®¢åå·', edit: 'text' }
                                            , { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
                                            , { field: 'äº§ååç§°', title: 'äº§ååç§°', edit: 'text' }
                                            , { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é' }
                                            , { field: 'æµæ°´å·', title: 'æµæ°´å·', edit: 'text' }
                                            , { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°' }
                                            , { field: 'å·¥ä½ä¸å¿', title: 'å·¥ä½ä¸å¿' }
                                            , { field: 'æ¯å¦å§å¤', title: 'æ¯å¦å§å¤', edit: 'text' }
                                            , { field: 'ä¾åºå', title: 'ä¾åºå' }
                                            , { field: 'è®¡åæ°é', title: 'è®¡åæ°é' }
                                            , { field: 'è¿ç«æ°é', title: 'è¿ç«æ°é', edit: 'text' }
                                            , { field: 'åºç«æ°é', title: 'åºç«æ°é' }
                                            { field: 'æµæ°´å·', title: 'æµæ°´å·', hide: true }
                                            , { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 180 }
                                            , { field: 'åºç«æ°é', title: 'åºç«æ°é', width: 90 }
                                            , { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é', width: 100 }
                                            , { field: 'å·¥èºåæ°', title: 'å·¥èºåæ°', hide: true }
                                            , { field: 'è¿ç«æ°é', title: 'è¿ç«æ°é', hide: true }
                                        ]]
                                        , height: 500
                                    }

			@@ -3,7 +3,7 @@
			<PropertyGroup>
			<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
			<ProjectView>ProjectFiles</ProjectView>
			<LastActiveSolutionConfig>Debug\|Any CPU</LastActiveSolutionConfig>
			<LastActiveSolutionConfig>Release\|Any CPU</LastActiveSolutionConfig>
			<UseIISExpress>true</UseIISExpress>
			<Use64BitIISExpress />
			<IISExpressSSLPort />

			@@ -46,6 +46,14 @@
			<input type="text" name="HMater" id="HMater" lay-verify="HMater" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">å³èé¡¹</label>
			</div>
			<div class="layui-col-xs9">
			<input type="text" name="HCustom" id="HCustom" lay-verify="HCustom" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
			</div>
			</div>
			<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
			<button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">æ¥è¯¢</button>
			<button type="button" lay-submit="" lay-filter="cmdOK" class="layui-btn" id="cmdOK">è¿å</button>
			@@ -93,6 +101,7 @@
			var HMaker = sessionStorage["HUserName"]
			var HSourceBillNo = "";
			var HMater = "";
			var HCustom = "";
			var listOption = [];
			var columns = "";
			var HModName = "Kf_SourceBillEditDlg_PDA";
			@@ -186,6 +195,7 @@
			form.on('submit(cmdQuery)', function () {
			HSourceBillNo = $("#HSourceBillNo").val();
			HMater = $("#HMater").val();
			HCustom = $("#HCustom").val();
			//æ¾ç¤ºç©æåè¡¨ä¿¡æ¯
			DisBillEntryList();
			});
			@@ -223,7 +233,7 @@
			type: "GET",
			url: GetWEBURL() + '/WEBSController/GetSourceBillList_Json',
			async: true, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HBillType": HBillType, "HSourceBillType": HSourceBillType, "HStockOrgID": HStockOrgID, "HSourceBillNo": HSourceBillNo, "HMater": HMater },
			data: { "HBillType": HBillType, "HSourceBillType": HSourceBillType, "HStockOrgID": HStockOrgID, "HSourceBillNo": HSourceBillNo, "HMater": HMater, "HCustom": HCustom },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = [];

			@@ -448,7 +448,7 @@
			type: 'line',
			label: {
			show: true,
			formatter: '{c}%'
			formatter: '{c}'
			},
			tooltip: {
			valueFormatter: function (value) {
			@@ -470,7 +470,7 @@
			type: 'line',
			label: {
			show: true,
			formatter: '{c}%'
			formatter: '{c}'
			},
			tooltip: {
			valueFormatter: function (value) {
			@@ -492,7 +492,7 @@
			type: 'line',
			label: {
			show: true,
			formatter: '{c}%'
			formatter: '{c}'
			},
			tooltip: {
			valueFormatter: function (value) {

			@@ -803,21 +803,12 @@
			toolbar: '#toolbarDemo'
			, where: { HProcExchHinteID: HProcExchHinteID }
			, cols: [[
			{ type: 'numbers', title: 'åºå·', totalRow: true }
			, { field: 'HOrderProcNO', title: 'è®¢åè·è¸ªå·', edit: 'text' }
			, { field: 'hbillno', title: 'æµè½¬å¡å·', hide: true }
			, { field: 'HICMOBillNo', title: 'çäº§è®¢åå·', edit: 'text' }
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', edit: 'text' }
			, { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é' }
			, { field: 'æµæ°´å·', title: 'æµæ°´å·', edit: 'text' }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°' }
			, { field: 'å·¥ä½ä¸å¿', title: 'å·¥ä½ä¸å¿' }
			, { field: 'æ¯å¦å§å¤', title: 'æ¯å¦å§å¤', edit: 'text' }
			, { field: 'ä¾åºå', title: 'ä¾åºå' }
			, { field: 'è®¡åæ°é', title: 'è®¡åæ°é' }
			, { field: 'è¿ç«æ°é', title: 'è¿ç«æ°é', edit: 'text' }
			, { field: 'åºç«æ°é', title: 'åºç«æ°é' }
			{ field: 'æµæ°´å·', title: 'æµæ°´å·', hide: true }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 180 }
			, { field: 'åºç«æ°é', title: 'åºç«æ°é', width: 90 }
			, { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é', width: 100 }
			, { field: 'å·¥èºåæ°', title: 'å·¥èºåæ°', hide: true }
			, { field: 'è¿ç«æ°é', title: 'è¿ç«æ°é', hide: true }
			]]
			, height: 500
			}
			@@ -885,21 +876,12 @@
			toolbar: '#toolbarDemo'
			, where: { HProcExchHinteID: HProcExchHinteID }
			, cols: [[
			{ type: 'numbers', title: 'åºå·', totalRow: true }
			, { field: 'HOrderProcNO', title: 'è®¢åè·è¸ªå·', edit: 'text' }
			, { field: 'hbillno', title: 'æµè½¬å¡å·', hide: true }
			, { field: 'HICMOBillNo', title: 'çäº§è®¢åå·', edit: 'text' }
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', edit: 'text' }
			, { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é' }
			, { field: 'æµæ°´å·', title: 'æµæ°´å·', edit: 'text' }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°' }
			, { field: 'å·¥ä½ä¸å¿', title: 'å·¥ä½ä¸å¿' }
			, { field: 'æ¯å¦å§å¤', title: 'æ¯å¦å§å¤', edit: 'text' }
			, { field: 'ä¾åºå', title: 'ä¾åºå' }
			, { field: 'è®¡åæ°é', title: 'è®¡åæ°é' }
			, { field: 'è¿ç«æ°é', title: 'è¿ç«æ°é', edit: 'text' }
			, { field: 'åºç«æ°é', title: 'åºç«æ°é' }
			{ field: 'æµæ°´å·', title: 'æµæ°´å·', hide: true }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 180 }
			, { field: 'åºç«æ°é', title: 'åºç«æ°é', width: 90 }
			, { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é', width: 100 }
			, { field: 'å·¥èºåæ°', title: 'å·¥èºåæ°', hide: true }
			, { field: 'è¿ç«æ°é', title: 'è¿ç«æ°é', hide: true }
			]]
			, height: 500
			}