配件申领单修改

seal-service/src/main/resources/template/js/partsclaim/allpartsclaimlist.js

@@ -8,7 +8,6 @@ layui.config({
     window: 'js/winui.window'
 }).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
-	
 	var $ = layui.$,
 		form = layui.form,
 		table = layui.table;
@@ -18,11 +17,11 @@ layui.config({
 	    elem: '#messageTable',
 	    method: 'post',
 	    url: flowableBasePath + 'sealseservice024',
-	    where: {orderNum: $("#orderNum").val(), applyNum: $("#applyNum").val(), customerName: $("#customerName").val()},
+	    where: getTableParams(),
 	    even: true,
 	    page: true,
-	    limits: [8, 16, 24, 32, 40, 48, 56],
-	    limit: 8,
+		limits: getLimits(),
+		limit: getLimit(),
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
 	        { field: 'orderNum', title: '工单号', align: 'center', width: 220, templet: function (d) {
@@ -37,6 +36,9 @@ layui.config({
 	    ]],
 	    done: function(json) {
 	    	matchingLanguage();
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入工单号，申领单号", function () {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+			});
 	    }
 	});
 	
@@ -49,33 +51,8 @@ layui.config({
         	appDetails(data);
         }
     });
-	
-	form.render();
-	
-	//刷新数据
-	$("body").on("click", "#reloadTable", function() {
-		loadTable();
-	});
-	
-	form.render();
-	
-	form.on('submit(formSearch)', function (data) {
-    	
-        if (winui.verifyForm(data.elem)) {
-        	refreshTable();
-        }
-        return false;
-	});
-    
-    function loadTable() {
-    	table.reloadData("messageTable", {where: {orderNum: $("#orderNum").val(), applyNum: $("#applyNum").val(), customerName: $("#customerName").val()}});
-    }
-    
-    function refreshTable(){
-    	table.reloadData("messageTable", {page: {curr: 1}, where: {orderNum: $("#orderNum").val(), applyNum: $("#applyNum").val(), customerName: $("#customerName").val()}});
-    }
 
-	//工单详情
+	// 工单详情
 	function details(data) {
 		rowId = data.serviceId;
 		_openNewWindows({
@@ -87,7 +64,7 @@ layui.config({
 			}});
 	}
 	
-	//申领单详情
+	// 申领单详情
 	function appDetails(data) {
 		rowId = data.id;
 		_openNewWindows({
@@ -98,6 +75,19 @@ layui.config({
 			callBack: function (refreshCode) {
 			}});
 	}
+
+	form.render();
+	$("body").on("click", "#reloadTable", function() {
+		loadTable();
+	});
+
+	function loadTable() {
+		table.reloadData("messageTable", {where: getTableParams()});
+	}
+
+	function getTableParams() {
+		return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
+	}
 	
     exports('allpartsclaimlist', {});
 });
\ No newline at end of file

seal-service/src/main/resources/template/js/partsclaim/allpartsclaimtoexaminelist.js

@@ -8,22 +8,20 @@ layui.config({
     window: 'js/winui.window'
 }).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
-	
 	var $ = layui.$,
 		form = layui.form,
 		table = layui.table;
 	
-	
 	table.render({
 	    id: 'messageTable',
 	    elem: '#messageTable',
 	    method: 'post',
 	    url: flowableBasePath + 'sealseservice029',
-	    where: {orderNum: $("#orderNum").val(), applyNum: $("#applyNum").val(), customerName: $("#customerName").val()},
+	    where: getTableParams(),
 	    even: true,
 	    page: true,
-	    limits: [8, 16, 24, 32, 40, 48, 56],
-	    limit: 8,
+		limits: getLimits(),
+		limit: getLimit(),
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
 	        { field: 'orderNum', title: '工单号', align: 'center', width: 220, templet: function (d) {
@@ -35,10 +33,13 @@ layui.config({
 	        { field: 'customerName', title: '客户名称', align: 'left', width: 150 },
 	        { field: 'applyUserName', title: '申领人', align: 'center', width: 140 },
 	        { field: 'applyTime', title: '申领时间', align: 'center', width: 140 },
-	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
+	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar' }
 	    ]],
 	    done: function(json) {
 	    	matchingLanguage();
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入工单号，申领单号", function () {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+			});
 	    }
 	});
 	
@@ -54,32 +55,7 @@ layui.config({
         }
     });
 	
-	form.render();
-	
-	//刷新数据
-	$("body").on("click", "#reloadTable", function() {
-		loadTable();
-	});
-	
-	form.render();
-	
-	form.on('submit(formSearch)', function (data) {
-    	
-        if (winui.verifyForm(data.elem)) {
-        	refreshTable();
-        }
-        return false;
-	});
-    
-    function loadTable() {
-    	table.reloadData("messageTable", {where: {orderNum: $("#orderNum").val(), applyNum: $("#applyNum").val(), customerName: $("#customerName").val()}});
-    }
-    
-    function refreshTable(){
-    	table.reloadData("messageTable", {page: {curr: 1}, where: {orderNum: $("#orderNum").val(), applyNum: $("#applyNum").val(), customerName: $("#customerName").val()}});
-    }
-
-	//工单详情
+	// 工单详情
 	function details(data) {
 		rowId = data.serviceId;
 		_openNewWindows({
@@ -91,7 +67,7 @@ layui.config({
 			}});
 	}
 	
-	//申领单详情
+	// 申领单详情
 	function appDetails(data) {
 		rowId = data.id;
 		_openNewWindows({
@@ -103,7 +79,7 @@ layui.config({
 			}});
 	}
 	
-	//申领单审核
+	// 申领单审核
 	function examine(data) {
 		rowId = data.id;
 		_openNewWindows({
@@ -116,6 +92,19 @@ layui.config({
 				loadTable();
 			}});
 	}
+
+	form.render();
+	$("body").on("click", "#reloadTable", function() {
+		loadTable();
+	});
+
+	function loadTable() {
+		table.reloadData("messageTable", {where: getTableParams()});
+	}
+
+	function getTableParams() {
+		return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
+	}
 	
     exports('allpartsclaimtoexaminelist', {});
 });
\ No newline at end of file

seal-service/src/main/resources/template/js/partsclaim/partsclaimdetails.js

@@ -4,19 +4,19 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'jqprint'], function (exports) {
+}).define(['window', 'jquery', 'winui', 'jqprint'], function (exports) {
 	winui.renderColor();
 	layui.use(['form'], function (form) {
 		var index = parent.layer.getFrameIndex(window.name);
 	    var $ = layui.$;
-	    var beanTemplate = $("#beanTemplate").html();
-	    
+
 	    showGrid({
 		 	id: "showForm",
 		 	url: flowableBasePath + "sealseservice028",
-		 	params: {rowId: parent.rowId},
+		 	params: {id: parent.rowId},
+			method: 'GET',
 		 	pagination: false,
-		 	template: beanTemplate,
+		 	template: $("#beanTemplate").html(),
 		 	ajaxSendAfter:function (json) {
 				// 获取当前登录员工信息
 				systemCommonUtil.getSysCurrentLoginUserMation(function (data) {
@@ -29,7 +29,7 @@ layui.config({
 		 	}
 		});
 		
-		//打印
+		// 打印
 		$("body").on("click", "#jprint", function (e) {
 			$("#showForm").jqprint({
 				title: '申领单',

seal-service/src/main/resources/template/js/partsclaim/partsclaimexamine.js

@@ -4,7 +4,7 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui'], function (exports) {
+}).define(['window', 'jquery', 'winui'], function (exports) {
 	winui.renderColor();
 	layui.use(['form'], function (form) {
 		var index = parent.layer.getFrameIndex(window.name);
@@ -13,7 +13,8 @@ layui.config({
 	    showGrid({
 		 	id: "showForm",
 		 	url: flowableBasePath + "sealseservice028",
-		 	params: {rowId: parent.rowId},
+		 	params: {id: parent.rowId},
+			method: 'GET',
 		 	pagination: false,
 		 	template: $("#beanTemplate").html(),
 		 	ajaxSendAfter:function (json) {

seal-service/src/main/resources/template/tpl/partsclaim/allpartsclaimlist.html

@@ -7,36 +7,15 @@
     <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
 </head>
 <body>
-	<div class="txtcenter" style="margin:0 auto;padding-top:10px;">
-	    <form class="layui-form layui-form-pane" action="" autocomplete="off">
-	        <div class="layui-form-item">
-	            <div class="layui-inline">
-	                <label class="layui-form-label">工单号</label>
-	                <div class="layui-input-inline">
-	                    <input type="text" id="orderNum" name="orderNum" placeholder="请输入工单号" class="layui-input" />
-	                </div>
-	                <label class="layui-form-label">申领单号</label>
-	                <div class="layui-input-inline">
-	                    <input type="text" id="applyNum" name="applyNum" placeholder="请输入申领单号" class="layui-input" />
-	                </div>
-	                <label class="layui-form-label">客户</label>
-	                <div class="layui-input-inline">
-	                    <input type="text" id="customerName" name="customerName" placeholder="请输入客户" class="layui-input" />
-	                </div>
-	                <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
-	                <button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
-	            </div>
-	        </div>
-	    </form>
-	</div>
     <div class="winui-toolbar">
         <div class="winui-tool">
-            <button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
         </div>
     </div>
     <div style="margin:auto 10px;">
         <table id="messageTable" lay-filter="messageTable"></table>
     </div>
+
     <script src="../../assets/lib/layui/layui.js"></script>
     <script src="../../assets/lib/layui/custom.js"></script>
     <script type="text/javascript">

seal-service/src/main/resources/template/tpl/partsclaim/allpartsclaimtoexaminelist.html

@@ -7,41 +7,20 @@
     <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
 </head>
 <body>
-	<div class="txtcenter" style="margin:0 auto;padding-top:10px;">
-	    <form class="layui-form layui-form-pane" action="" autocomplete="off">
-	        <div class="layui-form-item">
-	            <div class="layui-inline">
-	                <label class="layui-form-label">工单号</label>
-	                <div class="layui-input-inline">
-	                    <input type="text" id="orderNum" name="orderNum" placeholder="请输入工单号" class="layui-input" />
-	                </div>
-	                <label class="layui-form-label">申领单号</label>
-	                <div class="layui-input-inline">
-	                    <input type="text" id="applyNum" name="applyNum" placeholder="请输入申领单号" class="layui-input" />
-	                </div>
-	                <label class="layui-form-label">客户</label>
-	                <div class="layui-input-inline">
-	                    <input type="text" id="customerName" name="customerName" placeholder="请输入客户" class="layui-input" />
-	                </div>
-	                <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
-	                <button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
-	            </div>
-	        </div>
-	    </form>
-	</div>
     <div class="winui-toolbar">
         <div class="winui-tool">
-            <button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
         </div>
     </div>
     <div style="margin:auto 10px;">
         <table id="messageTable" lay-filter="messageTable"></table>
-        	<script type="text/html" id="tableBar">
-				{{# if(auth('1582382463563')){ }}
-            		<a class="layui-btn layui-btn-xs" lay-event="examine">审核</a>
-				{{# } }}
-        	</script>
+		<script type="text/html" id="tableBar">
+			{{# if(auth('1582382463563')){ }}
+				<a class="layui-btn layui-btn-xs" lay-event="examine">审核</a>
+			{{# } }}
+		</script>
     </div>
+
     <script src="../../assets/lib/layui/layui.js"></script>
     <script src="../../assets/lib/layui/custom.js"></script>
     <script type="text/javascript">

seal-service/src/main/resources/template/tpl/partsclaim/partsclaimdetails.html

@@ -71,8 +71,8 @@
 		                <tbody id="useTable" class="insurance-table">
 							{{#each materials}}
 								<tr>
-									<td>{{depotName}}</td>
-									<td>{{materialName}}</td>
+									<td>{{depotMation.name}}</td>
+									<td>{{materialName}}({{materialModel}})</td>
 									<td>{{unitName}}</td>
 									<td>{{operNum}}</td>
 									<td>{{unitPrice}}</td>

seal-service/src/main/resources/template/tpl/partsclaim/partsclaimexamine.html

@@ -65,8 +65,8 @@
 		                <tbody id="useTable" class="insurance-table">
 							{{#each materials}}
 								<tr>
-									<td>{{depotName}}</td>
-									<td>{{materialName}}</td>
+									<td>{{depotMation.name}}</td>
+									<td>{{materialName}}({{materialModel}})</td>
 									<td>{{unitName}}</td>
 									<td>{{operNum}}</td>
 									<td>{{unitPrice}}</td>