From 77c0e4b04d60d6ab6d24a4932ab70115e6a3e2fd Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 21 二月 2022 10:09:43 +0800
Subject: [PATCH] 雅琪诺报工台台调整参数
---
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 5
WebTM/views/生产管理/报工台工序/防错/Sc_Add_MaterToSourceStepBillList.html | 19
WebTM/views/生产管理/报工台工序/停工/Sc_Add_MESStopStepWorkBillList.html | 19
WebTM/views/IpadStepIndex.html | 260 +++++++-------
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 238 ++++++++++---
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 19
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList.html | 38 +
WebTM/views/生产管理/报工台工序/返工/Sc_Add_MESReturnStepWorkBillList.html | 19
WebTM/views/生产管理/报工台工序/完工/Sc_Add_MESEndStepWorkBillList.html | 19
WebTM/views/PublicPage/HSourceReportHtml.html | 341 ++++++++++++++++++
WebTM/views/生产管理/报工台工序/开工/Sc_Add_MESBeginStepWorkBillList.html | 20
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 5
WebTM/views/生产管理/报工台工序/产量汇报/Sc_Add_ProductReportStepBillList.html | 19
WebTM/WebTM.csproj | 1
14 files changed, 770 insertions(+), 252 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index df7c020..af0a381 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -124,6 +124,7 @@
<Content Include="views\PublicPage\PeopleInformation.html" />
<Content Include="views\PublicPage\PowerInformation.html" />
<Content Include="views\PublicPage\PurchOrder.html" />
+ <Content Include="views\PublicPage\HSourceReportHtml.html" />
<Content Include="views\PublicPage\transfer.html" />
<Content Include="views\ReportHtml.html" />
<Content Include="views\test\testRenderAutomationList.html" />
diff --git a/WebTM/views/IpadStepIndex.html b/WebTM/views/IpadStepIndex.html
index 38c0809..6c8dd64 100644
--- a/WebTM/views/IpadStepIndex.html
+++ b/WebTM/views/IpadStepIndex.html
@@ -554,25 +554,25 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType+'',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -594,25 +594,26 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_Add_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_Add_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_Add_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -634,25 +635,26 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -674,25 +676,26 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_Add_MESStopStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_Add_MESStopStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_Add_MESStopStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -710,30 +713,31 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=&workcode=' + workcode + '&HSourceID=' + HSourceID1 + '&HSourceName=' + HSourceName1 + '&HICMOInterID=' + HICMOInterID + '&HICMOEntryID=' + HICMOEntryID + '&HMaker=' + sessionStorage["HUserName"] + '&Czybm=' + sessionStorage["Czybm"] + '&HSourceInterID=' + HSourceInterID + '&HSourceBillType=' + HSourceBillType + '&HProcID=' + HProcID+'',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- var data = [];
- data.push({
- "workcode": workcode,
- "HSourceID": HSourceID1,
- "HSourceName": HSourceName1,
- "HICMOInterID": HICMOInterID,
- "HICMOEntryID": HICMOEntryID,
- "HMaker": sessionStorage["HUserName"], //sessionStorage["HUserName"]
- "Czybm": sessionStorage["Czybm"],
- //"HEmpID": "0", //sessionStorage["HEmpID"]
- "HSourceInterID": HSourceInterID,
- "HSourceBillType": HSourceBillType,
- "HProcID": HProcID
- });
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ //success: function (dom, index) {
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // var data = [];
+ // data.push({
+ // "workcode": workcode,
+ // "HSourceID": HSourceID1,
+ // "HSourceName": HSourceName1,
+ // "HICMOInterID": HICMOInterID,
+ // "HICMOEntryID": HICMOEntryID,
+ // "HMaker": sessionStorage["HUserName"], //sessionStorage["HUserName"]
+ // "Czybm": sessionStorage["Czybm"],
+ // //"HEmpID": "0", //sessionStorage["HEmpID"]
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceBillType": HSourceBillType,
+ // "HProcID": HProcID
+ // });
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -755,24 +759,25 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/杩斿伐/Sc_Add_MESReturnStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/杩斿伐/Sc_Add_MESReturnStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/杩斿伐/Sc_Add_MESReturnStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ //success: function (dom, index) {
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -790,25 +795,26 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_Add_MaterToSourceStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_Add_MaterToSourceStepBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_Add_MaterToSourceStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
@@ -852,26 +858,26 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
-
- content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html?OperationType=2&linterid=&HSouceBillType=&HBillType=' + HBillType + '&HSourceInterID=' + HSourceInterID + '&HSourceEntryID=' + HSourceEntryID + '&HSourceBillNo=' + HSourceBillNo + '&HSourceBillType=' + HSourceBillType + '',
+ //content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
- success: function (dom, index) {
- var data = [];
- data.push({
- "HBillType": HBillType,
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
- });
+ //success: function (dom, index) {
+ // var data = [];
+ // data.push({
+ // "HBillType": HBillType,
+ // "HSourceInterID": HSourceInterID,
+ // "HSourceEntryID": HSourceEntryID,
+ // "HSourceBillNo": HSourceBillNo,
+ // "HSourceBillType": HSourceBillType
+ // });
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
- },
+ // //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ // var iframe = window['layui-layer-iframe' + index];
+ // //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ // iframe.edit(data);
+ //},
});
}
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
new file mode 100644
index 0000000..3d5f779
--- /dev/null
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -0,0 +1,341 @@
+锘�<!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>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</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="HBillNo" id="HBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="PartNumber" id="PartNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="PartName" id="PartName" style="width:190px;">
+ </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 class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="layTable" lay-filter="layTable"></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-add-1"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload" style="display:none;"><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" style="display:none;"><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" style="display:none;"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details" style="display:none;"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate" style="display:none;"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" style="display:none;"><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 src="../../layuiadmin/PubCustom.js"></script>
+ <script>
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = decodeURI(params[params[2]]);//婧愬崟绫诲瀷
+ console.log(HSouceBillType);
+ }
+ var cols_arr = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
+ var table = null;
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ // #region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var resultTableHead = []; //鑾峰彇鍒楄〃澶村瓧娈佃嚜瀹氫箟鍒楁暟缁�
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ //鍒濆鍖栬〃鍗曟彃浠�
+ //set_InitFrom();
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鍗�
+
+ }
+ else if (OperationType == 3) {//鏈夋簮鍗�
+ set_ClearBill(sWhere, HSouceBillType);
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+
+ };
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery(HSouceBillType);
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒濆鍖栬〃鍗�
+ function set_InitFrom() {
+ laydate.render({
+ elem: '#HBeginDate'
+ });
+ laydate.render({
+ elem: '#HEndDate'
+ });
+ }
+ //#endregion
+
+ // #region 鍒濆鍖栫晫闈�
+ function set_ClearBill(sWhere, HSouceBillType) {
+ resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
+ //鍒濆鏌ヨ
+ get_Display(sWhere, HSouceBillType);
+
+ }
+
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sWhere, HSouceBillType) {
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
+ type: "GET",
+ data: { "page": 1, "limit": 50, "sWhere": sWhere, "HSouceBillType": HSouceBillType, "HOrgID": linterid },
+ async: false,
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ success: function (data1) {
+ console.log(data1);
+ for (var key in data1.list) {
+ resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ set_InitGrid(sWhere);
+ }, error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid(sWhere) {
+ //濉厖琛ㄦ牸澶存暟缁�
+ var data = resultTableHead;
+ cols_arr[0] = [];
+ cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].name.substr(0, 1) == 'H') {
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'Int32':
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true,width:130 };
+ break;
+ //Decimal
+ case 'Decimal':
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 150};
+ break;
+ default:
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200};
+ }
+ }
+ }
+ //濉厖琛ㄦ牸鏁版嵁
+ table.render({
+ elem: '#layTable',
+ url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
+ //toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+ title: '' + HSouceBillType + '',
+ cols: cols_arr, //濉厖琛ㄦ牸澶存暟鎹�,
+ id: 'layTable', //琛ㄦ牸id
+ where: { sWhere: sWhere, HSouceBillType: HSouceBillType, HOrgID: linterid }, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+ page: true, //寮�鍚垎椤�
+ totalRow: true, //寮�鍚悎璁�
+ limit: 50, //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+ limits: [50, 500, 2000, 20000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
+ method: 'get', //鎻愪氦鏂瑰紡
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ height:600,
+ response: {
+ statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+ },
+ done: function (res) { //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+ layer.close(layer.index); //杩斿洖鏁版嵁鍏抽棴loading
+ }
+ });
+ }
+ //endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery(HSouceBillType) {
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁缂栧彿
+ var PartNumber = $("#PartNumber").val();//鐗╂枡缂栫爜
+ var PartName = $("#PartName").val();//鐗╂枡鍚嶇О
+
+ switch (HSouceBillType) {
+ case '鐢熶骇璁㈠崟':
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (PartNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + PartNumber + "%'";
+ }
+ if (PartName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
+ return sWhere;
+ break;
+ case '鐢熶骇姹囨姤鍗�':
+ return sWhere;
+ break;
+ case '閲囪喘璁㈠崟':
+ return sWhere;
+ break;
+ case '鏀舵枡閫氱煡鍗�':
+ return sWhere;
+ break;
+ case '濮斿璁㈠崟':
+ return sWhere;
+ break;
+ case '閫�璐ч�氱煡鍗�':
+ return sWhere;
+ break;
+ case '鍏朵粬鍏ュ簱鍗�':
+ return sWhere;
+ break;
+ case '鐩存帴璋冩嫧鍗�':
+ return sWhere;
+ break;
+ case '閲囪喘閫�鏂欏崟':
+ return sWhere;
+ break;
+ case '鐢熶骇閫�鏂欏崟':
+ return sWhere;
+ break;
+ case '缁勮鎷嗗嵏鍗�':
+ return sWhere;
+ break;
+ }
+ set_ClearBill(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#PartNumber").val("");//鐗╂枡缂栫爜
+ $("#PartName").val("");//鐗╂枡鍚嶇О
+ get_FastQuery(HSouceBillType);
+ sWhere = "";
+ }
+ //#endregion
+
+ //#endregion
+
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 2d80867..eea490c 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -22,7 +22,9 @@
margin-right: 0px;
}
/*end*/
-
+ .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+ margin-left:35%;
+ }
</style>
</head>
<body>
@@ -55,9 +57,7 @@
<label class="layui-form-label">缁勭粐</label>
<div class="layui-input-inline">
<select name="HOrgID" id="HOrgID" lay-filter="HOrgID" class="layui-input" value="" style="float:left;width:150px">
- <option value="1">渚涘簲鍟�</option>
- <option value="2">瀹㈡埛</option>
- <option value="3">杞﹂棿閮ㄩ棬</option>
+
</select>
</div>
</div>
@@ -65,9 +65,7 @@
<label class="layui-form-label">宸ュ巶浠ｇ爜</label>
<div class="layui-input-inline">
<select name="HWorksNumber" id="HWorksNumber" lay-filter="HWorksNumber" class="layui-input" value="" style="float:left;width:150px">
- <option value="1">渚涘簲鍟�</option>
- <option value="2">瀹㈡埛</option>
- <option value="3">杞﹂棿閮ㄩ棬</option>
+
</select>
</div>
</div>
@@ -83,9 +81,17 @@
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
<select name="HSourceBillType" id="HSourceBillType" lay-filter="HSourceBillType" class="layui-input" value="" style="float:left;width:150px">
- <option value="1">渚涘簲鍟�</option>
- <option value="2">瀹㈡埛</option>
- <option value="3">杞﹂棿閮ㄩ棬</option>
+ <option value="1">鐢熶骇璁㈠崟</option>
+ <option value="2">鐢熶骇姹囨姤鍗�</option>
+ <option value="3">閲囪喘璁㈠崟</option>
+ <option value="4">鏀舵枡閫氱煡鍗�</option>
+ <option value="5">濮斿璁㈠崟</option>
+ <option value="6">閫�璐ч�氱煡鍗�</option>
+ <option value="7">鍏朵粬鍏ュ簱鍗�</option>
+ <option value="8">鐩存帴璋冩嫧鍗�</option>
+ <option value="9">閲囪喘閫�鏂欏崟</option>
+ <option value="10">鐢熶骇閫�鏂欏崟</option>
+ <option value="11">缁勮鎷嗗嵏鍗�</option>
</select>
</div>
</div>
@@ -93,8 +99,7 @@
<label class="layui-form-label">閫夊崟鍙�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSourceBillNo" id="HSourceBillNo" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceBillNoList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -103,9 +108,7 @@
<label class="layui-form-label">鏉＄爜绫诲瀷</label>
<div class="layui-input-inline">
<select name="HBarCodeType" id="HBarCodeType" lay-filter="HBarCodeType" class="layui-input" value="" style="float:left;width:150px">
- <option value="1">渚涘簲鍟�</option>
- <option value="2">瀹㈡埛</option>
- <option value="3">杞﹂棿閮ㄩ棬</option>
+
</select>
</div>
</div>
@@ -141,6 +144,14 @@
</script>
<script type="text/html" id="xuhao">
{{d.LAY_TABLE_INDEX+1}}
+ </script>
+ <script type="text/html" id="switchTpl">
+ <!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
+ <input type="checkbox" name="checkbox" lay-skin="primary" lay-filter="HGiveAwayFlag">
+ </script>
+ <script type="text/html" id="switchTp2">
+ <!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
+ <input type="checkbox" name="checkbox" lay-skin="primary" lay-filter="HGiveAwayFlag">
</script>
</form>
</div>
@@ -190,6 +201,12 @@
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
+ //鍔犺浇缁勭粐鏁版嵁
+ set_HOrg();
+ //鍔犺浇宸ュ巶浠ｇ爜鏁版嵁
+ set_HWorksNumber();
+ //鍔犺浇鏉＄爜绫诲瀷鏁版嵁
+ set_HBarCodeType();
//鍒濆鍖栬〃鏍�
set_InitGrid();
set_CountGrid();
@@ -229,56 +246,72 @@
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
});
//涓嬫媺妗嗕簨浠堕�夋嫨瑙﹀彂
- form.on('select(HSupTypeID)', function (data) {
- $("#HSupID").val("");
- $("#HSupName").val("");
+ form.on('select(HSourceBillType)', function (data) {
+ $("#HSourceBillNo").val("");
});
function getSupType() {
- var type = $("#HSupTypeID").val();
- console.log(type)
+ var type = $("#HSourceBillType").val();
switch (type) {
case '1':
- return "SupplierInformation";
+ return "鐢熶骇璁㈠崟";
break;
case '2':
- return "CustomerInformation";
+ return "鐢熶骇姹囨姤鍗�";
break;
case '3':
- return "DeptInformation";
+ return "閲囪喘璁㈠崟";
+ break;
+ case '4':
+ return "鏀舵枡閫氱煡鍗�";
+ break;
+ case '5':
+ return "濮斿璁㈠崟";
+ break;
+ case '6':
+ return "閫�璐ч�氱煡鍗�";
+ break;
+ case '7':
+ return "鍏朵粬鍏ュ簱鍗�";
+ break;
+ case '8':
+ return "鐩存帴璋冩嫧鍗�";
+ break;
+ case '9':
+ return "閲囪喘閫�鏂欏崟";
+ break;
+ case '10':
+ return "鐢熶骇閫�鏂欏崟";
+ break;
+ case '11':
+ return "缁勮鎷嗗嵏鍗�";
break;
}
}
- //琛ㄥご淇℃伅寰�鏉ュ崟浣嶅脊绐�
- form.on('submit(HSupList)', function () {
- debugger;
- if ($("#HSupTypeID").val() == 0 || $("#HSupTypeID").val() == null) {
- return layer.msg('璇烽�夋嫨寰�鏉ョ被鍨�');
+ //琛ㄥご淇℃伅婧愬崟淇℃伅寮圭獥
+ form.on('submit(HSourceBillNoList)', function () {
+ if ($("#HSourceBillType").val() == 0 || $("#HSourceBillType").val() == null) {
+ return layer.msg('璇烽�夋嫨鍗曟嵁绫诲瀷');
}
+ //鑾峰彇缁勭粐ID
+ var SetHOrgID = $("#HOrgID").find("option:selected").val();
//椤甸潰灞�-鑷畾涔�
- var url = '../../PublicPage/' + getSupType() + '.html';
+ var url = '../../PublicPage/HSourceReportHtml.html?OperationType=3&linterid=' + SetHOrgID + '&HSouceBillType=' + getSupType() + '';
+ url = encodeURI(url);
//alert(url);
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '寰�鏉ュ崟浣嶅垪琛�',
+ title: '' + getSupType()+'鍒楄〃',
closeBtn: 1,
shift: 2,
- area: ['80%', '80%'],
+ area: ['95%', '80%'],
maxmin: true,
content: [url, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- $("#HSupName").val(checkStatus.data[0].HName);
- $("#HSupID").val(checkStatus.data[0].HItemID);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -302,7 +335,80 @@
elem: '#HDate'
});
}
- //鍒濆鍖栨槑缁嗚〃鏍�
+
+ //鑾峰彇缁勭粐
+ function set_HOrg() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ form.render('select');
+ }
+ $('#HOrgID').find("option[value=" + result.data[0].ID + "]").attr("selected", true);
+ form.render('select') //鍐嶆娓叉煋
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //鑾峰彇宸ュ巶浠ｇ爜
+ function set_HWorksNumber()
+ {
+ //鑾峰彇宸ュ巶浠ｇ爜
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_BarCode/GetHWorksNumberBill",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.list;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + i + '">' + data[i] + '</option>';
+ }
+ $("#HWorksNumber").append(Organization);
+ form.render('select');
+ if (result.list[0] != "" && result.list[0] != null)
+ {
+ $('#HWorksNumber').find("option[value=" + result.list[0] + "]").attr("selected", true);
+ form.render('select') //鍐嶆娓叉煋
+ }
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //鑾峰彇鏉＄爜绫诲瀷
+ function set_HBarCodeType()
+ {
+ //鑾峰彇鏉＄爜绫诲瀷浠ｇ爜
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_BarCode/GetHBarCodeTypeBill",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.list;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + i+ '">' + data[i] + '</option>';
+ }
+ $("#HBarCodeType").append(Organization);
+ form.render('select');
+ }
+ $('#HBarCodeType').find("option[value=" + result.list[0]+ "]").attr("selected", true);
+ form.render('select') //鍐嶆娓叉煋
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //鍒濆鍖栫墿鏂欎俊鎭〃鏍�
function set_InitGrid() {
columns = [
{ type: 'checkbox', fixed: 'left' }
@@ -321,7 +427,7 @@
, { field: 'HUnitCode', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitCode', width: 100 }
, { field: 'HUnitName', title: '璁￠噺鍗曚綅', edit: 'text', width: 100 }
, { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
- , { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', edit: 'text', width: 100 }
+ , { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
, { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100 }
, { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', width: 100 }
, { field: 'HBQty', title: '绠辨暟', edit: 'text', width: 100 }
@@ -347,28 +453,39 @@
}
};
}
- //鍒濆姹囨�讳俊鎭�
+ //鍒濆鏉＄爜淇℃伅琛ㄦ牸
function set_CountGrid() {
//琛ㄥご
columns = [
{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
- , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
- , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100 }
- , { field: 'hwhid1', title: 'HWHID', edit: 'text', width: 100, hide: true }
- , { field: '鏀舵枡浠撳簱浠ｇ爜', title: '鏀舵枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
- , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 120 }
- , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+ , { field: '閫夋嫨', title: '閫夋嫨', width: 100 }
+ , { field: 'HBarCode', title: '鏉＄爜缂栧彿', width: 100 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: 'HAuxPropNumber', title: '杈呭姪灞炴�т唬鐮�', width: 100 }
+ , { field: 'HAuxPropName', title: '杈呭姪灞炴��', event: 'HWHCode', width: 120 }
+ , { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 120, templet: '#switchTpl', unresize: false }
+ , { field: 'HUnitCode', title: '璁￠噺鍗曚綅浠ｇ爜', width: 120 }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 120 }
+ , { field: 'HQty', title: '鏁伴噺', width: 120 }
+ , { field: 'HDate', title: '杩涙枡鏃ユ湡', width: 120 }
+ , { field: 'HCusNumber', title: '瀹㈡埛浠ｇ爜', width: 120 }
+ , { field: 'HCusName', title: '瀹㈡埛', width: 120 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 120 }
+ , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 120 }
+ , { field: 'HRemark', title: '澶囨敞', width: 120 }
+ , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 120 }
+ , { field: 'HShowDate', title: '鏃ユ湡', width: 100 }
+ , { field: 'HInnerBillNo', title: '鍐呴儴閲囪喘璁㈠崟鍙�', width: 100 }
+ , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
];
option1 = {
id: 'mainTable1'
, elem: '#mainTable1'
, height: 500
- , page: true
+ , page: false
, limit: 500
, cellMinWidth: 120
, height: 650
@@ -380,11 +497,20 @@
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
- option.data = [{ "HSourceInterID": 0, "HSourceEntryID": 0,"HSourceBillNo":"", "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+ option.data = [{
+ "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
+ , "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
+ , "HQty": 0, "HMinQty": 0, "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
+ }];
table.render(option);
}
+
function set_AddFNew1() {
- option1.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+ option1.data = [{
+ "HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
+ , "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
+ , "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
+ }];
table.render(option1);
}
//鏃ユ湡鏍煎紡鍖�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index ecc28c3..a4df095 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -363,16 +363,21 @@
var linterid = params[params[1]];//婧愬崟id
var HEntryID = params[params[2]];//婧愬崟瀛恑d
var HSBillType = params[params[3]];//婧愬崟绫诲瀷
+ var HBillType = params[params[3]];
+ var HSourceInterID = params[params[4]];
+ var HSourceEntryID = params[params[5]];
+ var HSourceBillNo = params[params[6]];
+ var HSourceBillType = params[params[7]];
}
- var edit = function (data) {
- HBillType = data[0].HBillType;
- HMainSourceInterID = data[0].HSourceInterID;
- HMainSourceEntryID = data[0].HSourceEntryID;
- HMainSourceBillNo = data[0].HSourceBillNo;
- HMainSourceBillType = data[0].HSourceBillType;
+ //var edit = function (data) {
+ // HBillType = data[0].HBillType;
+ // HMainSourceInterID = data[0].HSourceInterID;
+ // HMainSourceEntryID = data[0].HSourceEntryID;
+ // HMainSourceBillNo = data[0].HSourceBillNo;
+ // HMainSourceBillType = data[0].HSourceBillType;
- }
+ //}
layui.config({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
index 64e9779..fcf68d9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
@@ -372,16 +372,21 @@
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HBillType = params[params[3]];
+ var HSourceInterID = params[params[4]];
+ var HSourceEntryID = params[params[5]];
+ var HSourceBillNo = params[params[6]];
+ var HSourceBillType = params[params[7]];
}
- var edit = function (data) {
- HBillType = data[0].HBillType;
- HSourceInterID = data[0].HSourceInterID;
- HSourceEntryID = data[0].HSourceEntryID;
- HSourceBillNo = data[0].HSourceBillNo;
- HSourceBillType = data[0].HSourceBillType;
+ //var edit = function (data) {
+ // HBillType = data[0].HBillType;
+ // HSourceInterID = data[0].HSourceInterID;
+ // HSourceEntryID = data[0].HSourceEntryID;
+ // HSourceBillNo = data[0].HSourceBillNo;
+ // HSourceBillType = data[0].HSourceBillType;
- }
+ //}
layui.config({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html"
index 98059a8..c42e5ec 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html"
@@ -131,18 +131,18 @@
var HSourceBillType = ""; //婧愬崟绫诲瀷
var HProcID = ""; //宸ュ簭ID
var SchWhere = ""; //鎸夐挳鏌ヨ鍙傛暟
- var edit = function (data) {
- workcode = data[0].workcode;
- HSourceID = data[0].HSourceID;
- HSourceName = data[0].HSourceName;
- HICMOInterID = data[0].HICMOInterID;
- HICMOEntryID = data[0].HICMOEntryID;
- HMaker = data[0].HMaker;
- Czybm = data[0].Czybm;
- HSourceInterID = data[0].HSourceInterID;
- HSourceBillType = data[0].HSourceBillType;
- HProcID = data[0].HProcID;
- }
+ //var edit = function (data) {
+ // workcode = data[0].workcode;
+ // HSourceID = data[0].HSourceID;
+ // HSourceName = data[0].HSourceName;
+ // HICMOInterID = data[0].HICMOInterID;
+ // HICMOEntryID = data[0].HICMOEntryID;
+ // HMaker = data[0].HMaker;
+ // Czybm = data[0].Czybm;
+ // HSourceInterID = data[0].HSourceInterID;
+ // HSourceBillType = data[0].HSourceBillType;
+ // HProcID = data[0].HProcID;
+ //}
//鑾峰彇椤甸潰璺宠浆鍙傛暟 //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
var params = get_UrlVars();
if (typeof (params[params[0]]) == "undefined") {
@@ -150,7 +150,17 @@
} else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
- var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HSBillType = params[params[2]];//婧愬崟绫诲瀷
+ var workcode = params[params[3]];
+ var HSourceID = params[params[4]];
+ var HSourceName = params[params[5]];
+ var HICMOInterID = params[params[6]];
+ var HICMOEntryID = params[params[7]];
+ var HMaker = params[params[8]];
+ var Czybm = params[params[9]];
+ var HSourceInterID = params[params[10]];
+ var HSourceBillType = params[params[11]];
+ var HProcID = params[params[12]];
}
@@ -320,7 +330,7 @@
table.render(option);
} else {
- layer.close(index);
+
layer.alert(data1.code + data1.Message, { icon: 5 });
}
sWhere = "";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html"
index 1fb7470..d48faad 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html"
@@ -346,16 +346,21 @@
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HBillType = params[params[3]];
+ var HSourceInterID = params[params[4]];
+ var HSourceEntryID = params[params[5]];
+ var HSourceBillNo = params[params[6]];
+ var HSourceBillType = params[params[7]];
}
- var edit = function (data) {
- HBillType = data[0].HBillType;
- HSourceInterID = data[0].HSourceInterID;
- HSourceEntryID = data[0].HSourceEntryID;
- HSourceBillNo = data[0].HSourceBillNo;
- HSourceBillType = data[0].HSourceBillType;
+ //var edit = function (data) {
+ // HBillType = data[0].HBillType;
+ // HSourceInterID = data[0].HSourceInterID;
+ // HSourceEntryID = data[0].HSourceEntryID;
+ // HSourceBillNo = data[0].HSourceBillNo;
+ // HSourceBillType = data[0].HSourceBillType;
- }
+ //}
layui.config({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_Add_MESEndStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_Add_MESEndStepWorkBillList.html"
index 3573b74..8f16cc3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_Add_MESEndStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_Add_MESEndStepWorkBillList.html"
@@ -326,16 +326,21 @@
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HBillType = params[params[3]];
+ var HSourceInterID = params[params[4]];
+ var HSourceEntryID = params[params[5]];
+ var HSourceBillNo = params[params[6]];
+ var HSourceBillType = params[params[7]];
}
- var edit = function (data) {
- HBillType = data[0].HBillType;
- HSourceInterID = data[0].HSourceInterID;
- HSourceEntryID = data[0].HSourceEntryID;
- HSourceBillNo = data[0].HSourceBillNo;
- HSourceBillType = data[0].HSourceBillType;
+ //var edit = function (data) {
+ // HBillType = data[0].HBillType;
+ // HSourceInterID = data[0].HSourceInterID;
+ // HSourceEntryID = data[0].HSourceEntryID;
+ // HSourceBillNo = data[0].HSourceBillNo;
+ // HSourceBillType = data[0].HSourceBillType;
- }
+ //}
layui.config({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
index 0428426..3106419 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
@@ -89,7 +89,6 @@
<button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="a_href" id="a_href">瀵煎嚭</button>
</div>
</div>
@@ -334,16 +333,21 @@
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HBillType = params[params[3]];
+ var HSourceInterID = params[params[4]];
+ var HSourceEntryID = params[params[5]];
+ var HSourceBillNo = params[params[6]];
+ var HSourceBillType = params[params[7]];
}
- var edit = function (data) {
- HBillType = data[0].HBillType;
- HSourceInterID = data[0].HSourceInterID;
- HSourceEntryID = data[0].HSourceEntryID;
- HSourceBillNo = data[0].HSourceBillNo;
- HSourceBillType = data[0].HSourceBillType;
+ //var edit = function (data) {
+ // HBillType = data[0].HBillType;
+ // HSourceInterID = data[0].HSourceInterID;
+ // HSourceEntryID = data[0].HSourceEntryID;
+ // HSourceBillNo = data[0].HSourceBillNo;
+ // HSourceBillType = data[0].HSourceBillType;
- }
+ //}
layui.config({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
index 3b5ce2e..ca1fe47 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
@@ -345,16 +345,21 @@
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HBillType = params[params[3]];
+ var HSourceInterID = params[params[4]];
+ var HSourceEntryID = params[params[5]];
+ var HSourceBillNo = params[params[6]];
+ var HSourceBillType = params[params[7]];
}
- var edit = function (data) {
- HBillType = data[0].HBillType;
- HSourceInterID = data[0].HSourceInterID;
- HSourceEntryID = data[0].HSourceEntryID;
- HSourceBillNo = data[0].HSourceBillNo;
- HSourceBillType = data[0].HSourceBillType;
+ //var edit = function (data) {
+ // HBillType = data[0].HBillType;
+ // HSourceInterID = data[0].HSourceInterID;
+ // HSourceEntryID = data[0].HSourceEntryID;
+ // HSourceBillNo = data[0].HSourceBillNo;
+ // HSourceBillType = data[0].HSourceBillType;
- }
+ //}
layui.config({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html"
index 388d301..548f243 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html"
@@ -366,16 +366,21 @@
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HBillType = params[params[3]];
+ var HSourceInterID = params[params[4]];
+ var HSourceEntryID = params[params[5]];
+ var HSourceBillNo = params[params[6]];
+ var HSourceBillType = params[params[7]];
}
- var edit = function (data) {
- HBillType = data[0].HBillType;
- HSourceInterID = data[0].HSourceInterID;
- HSourceEntryID = data[0].HSourceEntryID;
- HSourceBillNo = data[0].HSourceBillNo;
- HSourceBillType = data[0].HSourceBillType;
+ //var edit = function (data) {
+ // HBillType = data[0].HBillType;
+ // HSourceInterID = data[0].HSourceInterID;
+ // HSourceEntryID = data[0].HSourceEntryID;
+ // HSourceBillNo = data[0].HSourceBillNo;
+ // HSourceBillType = data[0].HSourceBillType;
- }
+ //}
layui.config({
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index 7c46755..b86aa84 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -846,8 +846,7 @@
if (sBarCode != "") {
$('#HBarCode').val("");
}
- $.ajax(
- {
+ $.ajax({
type: "Get",
url: GetWEBURL() + "/ProductIn/Delete_Json",
async: true,
@@ -921,8 +920,8 @@
type: "GET",
data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
success: function (result) {
- playSound1();
if (result.count == 1) {
+ playSound1();
if (result.data.HBarType == '浠撳簱鏉＄爜') {
$("#HWHNAME").val(result.data.HWhName);
$("#HWHID").val(result.data.HWhID);
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index 0a35707..57e9058 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -526,7 +526,8 @@
}
else {
element.tabChange('tab-POStockInBill', '1');
- var pFocus = $("#HSourceBillNo");
+ //var pFocus = $("#HSourceBillNo");
+ var pFocus = $("#HBarCode");
pFocus.focus();
pFocus.select();
}
@@ -903,7 +904,7 @@
$("#HBillType").val("鎵嬪伐褰曞叆");
}
$("#HNote").val(";鐗╂枡鏉＄爜");
- element.tabChange('tab-POStockInBill', '3');
+ element.tabChange('tab-POStockInBill', '4');
}
}
--
Gitblit v1.9.1