Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/washingApplication/slickWash.scss
===================================================================
diff -u -r24896 -r24901
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/washingApplication/slickWash.scss (.../slickWash.scss) (revision 24896)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/washingApplication/slickWash.scss (.../slickWash.scss) (revision 24901)
@@ -43,7 +43,7 @@
@mixin addBadTitle{
width: 100%;
height: 30px;
- font-size: 17px;
+ font-size: 14px;
background-color: $mainHeadColor;
font-weight: bold;
padding:5px 5px;
@@ -148,7 +148,7 @@
//slickGrid表格
.addModal, .updateModal{
@mixin addUpdateTitle2{
- font-size: 17px;
+ font-size: 14px;
background-color: $modalTitleFontColor;
font-weight: bold;
padding:5px 5px;
@@ -158,8 +158,12 @@
}
@mixin addUpdateliSI{
width: 180px;
- padding: 0 0;
height: 26px;
+
+ border-radius: 4px;
+ border: 1px solid #ccc;
+ padding-left: 10px;
+ color: #555;
}
.modal{
&-dialog{
@@ -196,6 +200,10 @@
li{
height: 40px;
select{
+ border-radius: 4px;
+ border: 1px solid #ccc;
+ padding-left: 10px;
+ color: #555;
@include addUpdateliSI;
}
input{
@@ -475,7 +483,7 @@
@mixin kmTitle{
width: 100%;
height: 30px;
- font-size: 17px;
+ font-size: 14px;
background-color: $modalSecondTitleColor;
font-weight: bold;
padding:5px 5px;
@@ -541,10 +549,6 @@
}
}
&-title{
- width: 100%;
- height: 30px;
- margin:10px 0 10px 0;
- font-size: 17px;
@include kmTitle;
ul{
list-style: none;
@@ -724,10 +728,7 @@
color: $funColor;
}
&-full-button{
- background: $commonButtonBack;
- border-color: #ffffff;
- background-size: 20px 34px;
- color: #ffffff;
+ @extend .dx-btn-primary;
}
}
#myModal2{
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryManagementApplication/slickDM.js
===================================================================
diff -u -r24896 -r24901
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryManagementApplication/slickDM.js (.../slickDM.js) (revision 24896)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryManagementApplication/slickDM.js (.../slickDM.js) (revision 24901)
@@ -134,7 +134,9 @@
}
];
-var searchWordsGroup;
+//搜索
+var searchWords="";
+var searchWordsGroup=[];
//今日时间
var myDate = new Date();
myDate.toLocaleTimeString()
@@ -190,22 +192,22 @@
}
}
}
-
//bt分页
function btexeData(num, type,sendLimit) {
btsetloadData(num);
btloadpage();
var sendOffset = num*sendLimit-1;
- mainTable(sendOffset,sendLimit,searchWordsGroup);
+ $("#pageOffset").val(sendOffset);
+ mainTable(sendOffset,searchWordsGroup);
$("#loadstate").val("has");
}
function btsetloadData(num) {
$("#PageCount").val(num);
}
-
+
function btloadpage() {
- var myPageCount = parseInt($("#PageCount").val());
+ var myPageCount = parseInt($("#dataCount").val());
var myPageSize = parseInt($("#PageSize").val());
$("#pageTotal").html(myPageCount);
$("#pageSingle").html(myPageSize);
@@ -224,17 +226,16 @@
page: '
{{page}}',
onPageChange: function (num, type) {
if (type == "change") {
-
btexeData(num, type,sendLimit);
}
}
});
}
-
$(window).resize(function () {
$(".bottomContain").css("top",pagePositionHeight()-40);
});
//分页条的高度计算
+
function pagePositionHeight(){
var parentHead = window.parent.$(".head-index");
var navbar = window.parent.$(".content-index");
@@ -247,22 +248,14 @@
checkboxSelector = new Slick.CheckboxSelectColumn({
cssClass: "slick-cell-checkboxsel"
});
-
DMColumns.unshift(checkboxSelector.getColumnDefinition());
-
//主表的渲染
-function mainTable(setOffset,setLimit,setFilters){
+function mainTable(setOffset,setFilters){
+ var setLimit= parseInt($("#pageAmount").val()) ;
var temp = {
limit: setLimit, //页面大小
offset: setOffset, //页码
- filters : [
- {
- columnLabel: "depart",
- propFullName: "",
- value: "院前科",
- operator: "like"
- }
- ],
+ filters : setFilters,
gridId: "com.forgon.disinfectsystem.invoice.findInvoiceList",
sorters : [
{
@@ -272,7 +265,6 @@
}
]
};
-
$.ajax({
url:"/disinfectSystem/grid/gridController/getGrid.mhtml",
type:"post",
@@ -290,28 +282,58 @@
}));
//复选框 end
attachAutoResizeDataGrid(DMGrid, "DMGrid", "DMGridContainer");
+
$("#PageSize").val(res.limit);
+ $("#dataCount").val(res.total);
var loadstate = $("#loadstate").val();
if(loadstate=="hason"){
btsetloadData(res.total);
btloadpage();
}
}
});
-
}
//主表刷新
function mainTableRefresh(){
mainTable(0,10,0)
}
+//主表搜索
+$("#mainNav-shop-search").keyup(function(e){
+ if(e.which=="13"){
+ searchWords = $("#mainNav-shop-search").val();
+ var columns = DMColumns;
+ for(var i=0;i
";
+ }
+ else{
+ return "";
+ }
+ },
+ },
+ {
+ name : '责任人',
+ field : 'personInCharge',
+ id : 'personInCharge',
+
+ },
+ {
+ name : '回收科室',
+ field : 'recyclingDept',
+ id : 'recyclingDept',
+
+ },
+ {
+ name : '回收时间',
+ field : 'recyclingTime',
+ id : 'recyclingTime',
+
+ }
+ ];
//自适应
var DATAGRID_MIN_HEIGHT = 180;
var DATAGRID_MIN_WIDTH = 300;
var DATAGRID_BOTTOM_PADDING = 20;
//搜索
var searchWords="";
var searchWordsGroup = [];
-
//今日时间
var myDate = new Date();
myDate.toLocaleTimeString()
var today = myDate.getFullYear()+"-"+myDate.getMonth()+"-"+myDate.getDate()+" "+myDate.toLocaleTimeString();
-
function attachAutoResizeDataGrid(grid, gridId, gridContainerId) {
var gridDomElm = $('#' + gridId);
if (!gridDomElm || typeof gridDomElm.offset() === "undefined") {
@@ -282,20 +336,15 @@
var parentHead = window.parent.$(".head-index");
var navbar = window.parent.$(".content-index");
var parentHeadIf = window.parent.$(".content-index-toggle-off");
-
var pageHeight = $(window).height() - parentHead.height() - navbar.height();
return pageHeight;
}
-
//父子表
-
var percentCompleteThreshold = 0;
var searchString = "";
-
function percentCompleteSort(a, b) {
return a["percentComplete"] - b["percentComplete"];
}
-
function requiredFieldValidator(value) {
if(value == null || value == undefined || !value.length){
return{
@@ -310,9 +359,7 @@
};
}
}
-
function TaskNameFormatter(row, cell, value, columnDef, dataContext){
-
if(value == null || value == undefined || dataContext === undefined){
return "";
}
@@ -334,20 +381,18 @@
// console.log("value:"+value+";"+"indent:"+dataContext.indent);
if(dataContext.indent==0){
if(dataContext._collapsed==true){
- return spacer + " " + value;
+ return spacer + " " + value;
}
else{
- return spacer + " " + value;
+ return spacer + " " + value;
}
}
else{
return spacer + "" + value;
}
}
-
function myFilter(item) {
-
if(item.parent != null){
var parent = loadData[item.parent];
while(parent){
@@ -408,6 +453,7 @@
//主表
function mainTable(setOffset, setFilters){
+ //将备份列重新返还给columns
columns = mainTableColumns;
var setLimit= parseInt($("#pageAmount").val()) ;
var temp = {
@@ -427,6 +473,7 @@
data = [];
for (var i = 0; i < res.rows.length; i++) {
var dataOB = {
+ id : res.rows[i].id,
tousseName: i,
serialNumber: res.rows[i].serialNumber,
operator: res.rows[i].operator,
@@ -443,7 +490,9 @@
data.push(dataOB);
}
dataView = new Slick.Data.DataView({ inlineFilters: true });
+
$("#PageSize").val(res.limit);
+ $("#dataCount").val(res.total);
var loadstate = $("#loadstate").val();
if(loadstate=="hason"){
btsetloadData(res.total);
@@ -460,7 +509,6 @@
}));
grid.registerPlugin(checkboxSelector);
//复选框 end
-
//自适应
attachAutoResizeDataGrid(grid, "myGrid", "gridContainer");
//creatScreen(mainTableColumns, "mainViewColumnsArrButton");
@@ -488,8 +536,7 @@
searchWords = $("#mainNav-shop-search").val();
for(var i=0;i 0){
+ for(var j=0; j < childrens.length; j++){
+ var k = (loadData[tempId] = {});
+ k["id"] = tempId;
+ k["indent"] = 1;
+ k["parent"] = parentId;
+
+ k["containerName"]=childrens[j].name;
+ k["amount"]=childrens[j].amount;
+
+ k["recyclingTime"]=childrens[j].recyclingTime;
+ k["recyclingDept"]=childrens[j].recyclingDept;
+ tempId ++;
+ }
+ }
+ }
+ dataView.beginUpdate();
+ dataView.setItems(loadData);
+ dataView.setFilter(myFilter);
+ dataView.endUpdate();
+ }
+ //修改或获取清洗记录的ajax之后的方法
+ function updateCleanAfterAjax(){
+ dataView = new Slick.Data.DataView({ inlineFilters: true });
+ updateCleanBasketgrid = new Slick.Grid("#updateCleanBasketGrid", dataView, updateBasketColumns, addCleanBasketOption);
+ dataView.onRowsChanged.subscribe(function (e, args) {
+ updateCleanBasketgrid.invalidateRows(args.rows);
+ updateCleanBasketgrid.render();
+ });
+
+ dataView.onRowCountChanged.subscribe(function (e, args) {
+ updateCleanBasketgrid.updateRowCount();
+ updateCleanBasketgrid.render();
+ });
+
+ updateCleanBasketgrid.onCellChange.subscribe(function (e, args) {
+ dataView.updateItem(args.item.id, args.item);
+ });
+
+ updateCleanBasketgrid.onClick.subscribe(function (e, args) {
+ if($(e.target).hasClass("toggle")){
+ var item = dataView.getItem(args.row);
+ if(item){
+ if(!item._collapsed){
+ item._collapsed = true;
+ }
+ else{
+ item._collapsed = false;
+ }
+ dataView.updateItem(item.id, item);
+ }
+ e.stopImmediatePropagation();
+ }
+ });
+ //自适应
+ attachAutoResizeDataGrid(updateCleanBasketgrid, "updateCleanBasketGrid", "updateCleanBasketContainer");
+
+ }
//添加清洗扫描条码是否重复的判断
function addCleanCodeVerification(){
var VCode = $("#addCleanGetCode").val();
@@ -632,18 +759,18 @@
data:{barcode:$("#addCleanGetCode").val()},
success:function(res){
addItem = res;
- /* {
- id:"new"+(Math.round(Math.random()*10000)),
- name : res.name,
- amount : res.amount,
- barcode : res.barcode,
- handle : res.handle,
- personInCharge : res.personInCharge,
- recyclingDept : res.recyclingDept,
- recyclingTime : res.recyclingTime,
- content : res.content,
- };
- */
+ /* {
+ id:"new"+(Math.round(Math.random()*10000)),
+ name : res.name,
+ amount : res.amount,
+ barcode : res.barcode,
+ handle : res.handle,
+ personInCharge : res.personInCharge,
+ recyclingDept : res.recyclingDept,
+ recyclingTime : res.recyclingTime,
+ content : res.content,
+ };
+ */
BasketData.push(addItem);
addCleanBaskets(BasketData);
$("#addCleanGetCodeArr").val(JSON.stringify(BasketData));
@@ -705,11 +832,23 @@
type: "post",
dataType: "json",
data:{
+ classifyBasketIds: null,
+ cleanParameter: null,
+ conCurrent: null,
cycleCounter : 0,
+
disinfectIdentification :$("#addCleanDisinfectIdentification").val(),
disinfectProgram :$("#addCleanDisinfectProgram").val(),
- endDateStr :$("#addCleanOrgWashEndTime").val(),
+ endDateStr :$("#addCleanOrgWashEndTime").val(),
+ id :0,
+ materialData: "[]",
+ //materialData: $('#addCleanGetCodeArr').val(),
operator :$("#addCleanOperator").val(),
+ personInCharge:null,
+ personInChargeCode:null,
+ position:null,
+ serialNumber:null,
+
startDateStr :$("#addCleanStartDateStr").val(),
serialNumber : "",
classifyBasketInfo :$('#addCleanGetCodeArr').val()
@@ -724,7 +863,7 @@
window.alert(result.message);
$("#addModal").modal('hide');
- mainTable(0,10,searchWordsGroup);
+ mainTable(0,searchWordsGroup);
},
error:function(result){
@@ -736,18 +875,15 @@
btsetloadData(num);
btloadpage();
var sendOffset = num*sendLimit-1;
- //$("#pageAmount").val(sendLimit);
$("#pageOffset").val(sendOffset);
mainTable(sendOffset,searchWordsGroup);
$("#loadstate").val("has");
-
}
function btsetloadData(num){
$("#PageCount").val(num);
}
-
function btloadpage() {
- var myPageCount = parseInt($("#PageCount").val());
+ var myPageCount = parseInt($("#dataCount").val());
var myPageSize = parseInt($("#PageSize").val());
$("#pageTotal").html(myPageCount);
$("#pageSingle").html(myPageSize);
@@ -766,7 +902,6 @@
page: '{{page}}',
onPageChange: function (num, type) {
if (type == "change") {
-
btexeData(num, type,sendLimit);
}
}
@@ -779,11 +914,32 @@
});
//变更页面显示数据条数
function changePageAmount(amount){
- var offset = parseInt($("#pageOffset").val()) ;
+ var offset = parseInt($("#pageOffset").val());
$("#dataAmountCurrent").html(amount);
$("#pageAmount").val(amount);
+ //显示单页条数
+ $("#pageTotal").html(amount);
+ //单页条数
+ $("#PageSize").val(amount);
+ //判断是否更改按钮的数量的根据——hason
+ $("#loadstate").val("hason");
mainTable(0,searchWordsGroup);
}
+ //获取清洗记录进行修改
+ function UpdateCleanList(basketId,sealNum,disfin,dispro,startTime,endTime){
+ $.ajax({
+ url:"/disinfectSystem/washAndDisinfect/washAndDisinfectRecordController/findWashMaterialByWashId.mhtml",
+ type:"post",
+ dataType:"json",
+ data:{id:basketId},
+ success:function(res){
+ //BasketData.push(addItem);
+ updateCleanBaskets(res);
+ },
+ });
+ updateCleanAfterAjax();
+
+ }
$(function(){
mainTable(0,searchWordsGroup);
$('#addCleanStartDateStr').datetimepicker('setStartDate', today);
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/deliveryManagementApplication/deliveryManagementApplication.jsp
===================================================================
diff -u -r24885 -r24901
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/deliveryManagementApplication/deliveryManagementApplication.jsp (.../deliveryManagementApplication.jsp) (revision 24885)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/deliveryManagementApplication/deliveryManagementApplication.jsp (.../deliveryManagementApplication.jsp) (revision 24901)
@@ -36,100 +36,103 @@
-
-
-