Commit f2bcf79a authored by 上官's avatar 上官

调整 同步

parent a708af0a
......@@ -23,17 +23,7 @@
height: 200%;
/*background-color: #F6F6F6;*/
}
.mark{
position:fixed;
left:0;
top:0;
opacity:.5;
width:100%;
height:100%;
background:#000;
z-index:998;
pointer-events: none; //不能操作
}
.mui-backdrop {position: fixed;top:251px;right: 10px;bottom: 5px;left: 698px;z-index: 998;background-color: rgba(0,0,0,.3);}
......@@ -49,8 +39,8 @@
<div id="left" style=" display: inline-block; width: 30%; ">
<div id="left-1" style="position: absolute; top: 1px;">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" @click="back"></a>
<label style=" text-align: center; position: relative; left: 50px;">今日完成数量:{{number}} </label>
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style=" width: 60px;" @click="back"></a>
<label style=" text-align: center; position: relative; left: 20px;">今日完成数量:{{number}} </label>
</div>
<div id="left-2">
<table class="mui-table" style=" position: relative;top: -432px; ">
......@@ -151,9 +141,6 @@
<button class="mui-icon mui-icon-arrowleft mui-btn-outlined ;" style="border: 0px ; color:royalblue; width: 23%;height: 100%; text-align: left; padding-left:0px ;"
@click="nextday(-1)">
<!-- <a class=" mui-icon mui-icon-arrowleft mui-pull-left" style="border: blue solid 1px; margin-top: 5px" @click="nextday(-1)"></a> -->
<!-- <a class=" mui-icon mui-icon-arrowleft mui-pull-left" style="border: blue solid 1px; margin-left: -15px;margin-top: 5px" @click="nextday(-1)"></a> -->
</button>
<button class="mui-btn-outlined" style="padding-left: 6px; width: 54%;height: 100%; margin-left: -4px" id="selectdate"
......@@ -370,9 +357,7 @@
setTimeout(function(){
plus.nativeUI.closeWaiting();
var ap = document.getElementById("app");
console.log("app::" + ap.style)
ap.style=" display: inline-block";
},200)
......@@ -1079,6 +1064,8 @@
mui('.scroll4').scroll().scrollTo(0,0,100);
}, //selecttime
back: function() {
console.log("back")
mui.back()
// plus.screen.lockOrientation("portrait-primary") //横屏
}
}
......
......@@ -29,15 +29,15 @@
</head>
<body>
<div id="app">
<div id="app" style="display: none;">
<div class="mui-content">
<div id="left" style=" display: inline-block; width: 30%; ">
<div id="left-1" style="position: absolute; top: 1px;">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" @click="back"></a>
<label style=" text-align: center; position: relative; left: 50px;">今日完成数量:{{number}} </label>
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style=" width: 60px;" @click="back"></a>
<label style=" text-align: center; position: relative; left: 20px;">今日完成数量:{{number}} </label>
</div>
<div id="left-2">
<table class="mui-table" style=" position: relative;top: -432px; ">
......@@ -269,7 +269,7 @@
<script src="../dest/js/moment.js"></script>
<script type="text/javascript">
mui.plusReady(function() {
plus.nativeUI.showWaiting()
initPage();
});
......@@ -351,7 +351,11 @@
app.getDataDetail1();
});
setTimeout(function(){
plus.nativeUI.closeWaiting();
var ap = document.getElementById("app");
ap.style=" display: inline-block";
},200)
mui('.mui-scroll-wrapper').scroll({
bounce: false,
......@@ -1064,6 +1068,7 @@
mui('.scroll4').scroll().scrollTo(0,0,100);
}, //selecttime
back: function() {
mui.back()
// plus.screen.lockOrientation("portrait-primary") //横屏
}
}
......
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<title></title>
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
<link href="../dest/css/mui.min.css" rel="stylesheet" />
</head>
<body>
<div id="app">
<div id="left-1" style="background-color: #007AFF; width: 40%; height: 30px; margin-bottom: 1px;">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="color: white; width: 60px;" @click="back"></a>
<label style=" text-align: center; margin-left: 70px; color: white;">成型交接 </label>
</div>
<div id="left-2" style="width: 40%">
<div class="mui-segmented-control" style="">
<a id="n1" class="mui-control-item mui-active" @click="selectDisplay(1)">未交接</a>
<a id="n2" class="mui-control-item " @click="selectDisplay(2)">已交接</a>
</div>
<div id="item1" class="mui-scroll-wrapper scroll1" style=" border: solid #DAE6EF 1px ;height: 503px; background: white; display: inline-block; width: 40%; top: 72px;">
<div class="mui-scroll">
<ul :id="items.IndexID" class="mui-table-view bg" v-for=" items,n in itemsLeft" @click="selectLeft(items)">
<li style=" padding: 2px 15px 0px 15px; margin: 0">
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606;padding: 0; margin: 0;">班组: </p>
<p style="float: left;width: 32%; color: #060606;padding: 0; margin: 0;">{{items.WorkTeam}} </p>
</li>
<li style=" padding: 0px 15px 0px 15px; margin: 0;">
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;"> 货号: </p>
<p style="float: left;width: 40%;color: #1B83FE;padding: 0; margin: 0;">&nbsp;{{items.StyleCode}} </p>
<p style="float: left;width: 12%; color: #060606;padding: 0; margin: 0;">数量: </p>
<p style="float: left;width: 32%; color: red;padding: 0; margin: 0;">{{items.Qty}} </p>
</li>
<li style=" padding: 0px 15px 0px 15px; margin: 0">
<p style="float: left;width: 20%; color: #060606; padding: 0; margin: 0;"> 计划时间: </p>
<p style="float: left;width: 80%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.PlanDate}} </p>
</li>
<li class="mui-table-view-cell" style=" padding: 0px 15px 2px 15px; margin: 0">
<p style="float: left;width: 20%; color: #060606;padding: 0; margin: 0;"> 时报时间: </p>
<p style="float: left;width: 35%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.ReportDate}} </p>
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;">实报人: </p>
<p style="float: left;width: 28%; color: #060606;padding: 0; margin: 0;">{{items.ReportUser}} </p>
</li>
</ul>
</div>
</div>
<div id="item2" class="mui-scroll-wrapper scroll2" :style="display_" style=" border: solid #DAE6EF 1px ;height: 503px; background: white; display: inline-block; width: 40%; top: 72px;">
<div class="mui-scroll">
<ul :id="items.IndexID" class="mui-table-view bg" v-for=" items,n in itemsLeft2" @click="selectLeft(items)">
<li style=" padding: 2px 15px 0px 15px; margin: 0">
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606;padding: 0; margin: 0;">班组: </p>
<p style="float: left;width: 32%; color: #060606;padding: 0; margin: 0;">{{items.WorkTeam}} </p>
</li>
<li style=" padding: 0px 15px 0px 15px; margin: 0">
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;"> 货号: </p>
<p style="float: left;width: 40%;color: #1B83FE;padding: 0; margin: 0;">&nbsp;{{items.StyleCode}} </p>
<p style="float: left;width: 12%; color: #060606;padding: 0; margin: 0;">数量: </p>
<p style="float: left;width: 32%; color: red;padding: 0; margin: 0;">{{items.Qty}} </p>
</li>
<li style=" padding: 0px 15px 0px 15px; margin: 0">
<p style="float: left;width: 20%; color: #060606;padding: 0; margin: 0;"> 计划时间: </p>
<p style="float: left;width: 80%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.PlanDate}} </p>
</li>
<li class="mui-table-view-cell" style=" padding: 0px 15px 2px 15px; margin: 0">
<p style="float: left;width: 20%; color: #060606;padding: 0; margin: 0;"> 时报时间: </p>
<p style="float: left;width: 35%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.ReportDate}} </p>
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;">实报人: </p>
<p style="float: left;width: 28%; color: #060606;padding: 0; margin: 0;">{{items.ReportUser}} </p>
</li>
</ul>
</div>
</div>
</div>
<div id="right " class="mui-pull-right " style=" width: 60%; display: inline-block; position: relative; top: -70px ; ">
<div id="right-1">
<ul class="mui-table-view">
<li class="mui-table-view-cell">
<p style="float: left;width: 16%; color: #060606;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606;">&nbsp;{{itemsDetail.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606;">班组: </p>
<p style="float: left;width: 32%; color: #060606;">{{itemsDetail.WorkTeam}} </p>
</li>
<li class="mui-table-view-cell">
<p style="float: left;width: 16%; color: #060606;"> 货号: </p>
<p style="float: left;width: 40%;color: #1B83FE;">&nbsp;{{itemsDetail.StyleCode}} </p>
<p style="float: left;width: 12%; color: #060606;">颜色: </p>
<p style="float: left;width: 32%; color: #060606;">{{itemsDetail.ColorName}} </p>
</li>
<li class="mui-table-view-cell">
<p style="float: left;width: 16%; color: #060606;"> 数量: </p>
<p style="float: left;width: 40%; color: red;">&nbsp;{{itemsDetail.FinishQty}} </p>
</li>
<li class="mui-table-view-cell">
<p style="float: left;width: 16%; color: #060606;"> 不合格数: </p>
<p style="float: left;width: 40%; color: red;">&nbsp;{{itemsDetail.UnQualifiedQty}} </p>
<p style="float: left;width: 12%; color: #060606;">报废数: </p>
<p style="float: left;width: 32%; color: red;">{{itemsDetail.ScrapQty}} </p>
</li>
<li class="mui-table-view-cell">
<p style="float: left;width: 16%; color: #060606;"> 计划时间: </p>
<p style="float: left;width: 40%; color: #060606;">&nbsp;{{itemsDetail.PlanDate}} </p>
<p style="float: left;width: 12%; color: 060606;">实报时间: </p>
<p style="float: left;width: 32%; color: 060606;">{{itemsDetail.ReportDate}} </p>
</li>
<li class="mui-table-view-cell">
<p style="float: left;width: 16%; color: #060606;"> 实报人: </p>
<p style="float: left;width: 40%; color: #060606;">&nbsp;{{itemsDetail.ReportUser}} </p>
</li>
</ul>
</div>
</div>
<div id="right-2" style="position: absolute; bottom: 1px ; right: 1px; ">
<button type="button" class="mui-btn mui-btn-blue " :disabled="sty1" style=" width: 200px; height: 70px;" @click="selectPerson">人员排班</button>
<button type="button" class="mui-btn mui-btn-blue " :disabled="sty1" style=" width: 200px; height: 70px;" @click="submit">{{submitText}}</button>
</div>
</div>
<script src="../dest/js/mui.min.js"></script>
<script src="../dest/js/vue.min.js"></script>
<script src="../dest/js/public.min.js"></script>
<script type="text/javascript">
mui.plusReady(function() {
initPage();
});
function initPage() {
// plus.screen.lockOrientation("landscape-secondary") //横屏
plus.screen.lockOrientation("landscape-primary") //横屏
app.init();
}
var app = new Vue({
el: '#app',
data: {
displayModel: 1,
IndexID: 0,
itemsLeft: [],
itemsLeft2: [],
itemsDetail: {},
submitModel: 0,
submitText: "确认接收",
nextDetail:{},
},
computed: {
display_: function() {
if (this.displayModel == 1) {
return "display: none "
}
},
sty1: function() {
if (this.IndexID == 0) {
return "disabled"
} else {
return null
}
}
},
methods: {
init: function() {
mui.init();
mui('.mui-scroll-wrapper').scroll({
bounce: false,
indicators: true, //是否显示滚动条
});
this.getData(0)
},
getData: function(n) {
var that = this;
var para = {
ReportType: 2,
State: n,
}
console.log(JSON.stringify(para))
Api.post('/api/vMES/Handover/List', para, function(e) {
console.log("List::" + JSON.stringify(e))
if (n == 0) {
that.itemsLeft = e.items
} else {
that.itemsLeft2 = e.items
}
}, function(b, bb, bbb) {
mui.toast(JSON.stringify(bbb.message))
})
},
selectPerson:function(){
var that = this;
mui.openWindow({
url: 'NeedlecarPBB.html',
id: 'NeedlecarPBB.html',
extras: {
nextDetail :that.nextDetail
}
});
},
selectLeftBack: function(k) {
var bgs = document.getElementsByClassName("bg");
var bf = document.getElementById(k);
for (var i = 0; i < bgs.length; i++) {
bgs[i].style.background = ""
}
if(k!=0){
bf.style.background = "#1DAAEC";
}
},
selectLeft: function(obj) {
this.selectLeftBack(obj.IndexID);
this.IndexID = obj.IndexID;
this.nextDetail = obj;
var that = this;
var para = {
ReportType: 2,
IndexID: this.IndexID,
}
Api.post('/api/vMES/Handover/Index', para, function(e) {
console.log("Index::" + JSON.stringify(e))
if (e.success) {
that.itemsDetail = e.items[0];
}
}, function(b, bb, bbb) {
mui.toast(JSON.stringify(bbb.message))
})
},
selectDisplay: function(n) {
var opt = document.getElementById("item1");
var opt2 = document.getElementById("item2");
var n1 = document.getElementById("n1");
var n2 = document.getElementById("n2");
if (n == 1) {
n1.style.background = "royalblue"
n1.style.color = "white"
n2.style.background = "white"
n2.style.color = "royalblue"
opt.style.display = "inline-block";
opt2.style.display = "none"
this.submitModel = 0;
this.submitText = "确认接收";
this.getData(0)
}
if (n == 2) {
// this.getDataDetail2(2)
n1.style.background = "white"
n1.style.color = "royalblue"
n2.style.background = "royalblue"
n2.style.color = "white"
opt.style.display = "none";
opt2.style.display = "inline-block"
this.submitModel = 1;
this.submitText = "撤回接收";
this.getData(1)
}
},
submit: function() {
var that = this;
var para = {
IndexID: this.IndexID,
}
console.log(JSON.stringify(para))
var html = '/api/vMES/Handover/Receive';
if (this.submitModel == 1) {
html = '/api/vMES/Handover/UnReceive';
}
Api.post(html, para, function(e) {
if (e.success) {
mui.toast("操作成功");
that.selectLeftBack(0);
that.IndexID = 0;
that.nextDetail ={};
that.itemsDetail =[];
that.getData(0);
that.getData(1);
} else {
mui.toast("操作失败: " + e.message);
}
}, function(b, bb, bbb) {
mui.toast("操作失败" + JSON.stringify(bbb.message))
})
},
back: function() {
mui.back();
},
},
})
</script>
</body>
</html>
......@@ -23,8 +23,8 @@
<body>
<div id="app">
<div id="left-1" style="background-color: #007AFF; width: 40%; height: 30px; margin-bottom: 1px;">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="color: white;" @click="back"></a>
<label style=" text-align: center; margin-left: 100px; color: white; position: relative;top: 7px;">我的任务 </label>
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="color: white; width: 60px;" @click="back"></a>
<label style=" text-align: center; margin-left: 70px; color: white; position: relative;top: 7px;">我的任务 </label>
</div>
<div id="left-2" style="width: 40%">
<div id="left-date" style=" border: solid #B6B6B6 1px; ">
......@@ -48,30 +48,30 @@
<li class="mui-table-view-cell">无明细数据.请选择其他日期</li>
</ul>
<ul class="mui-table-view" style="margin-top: 5px;" v-for=" itemsDetail ,n in itemsLeft" @click="nextPage(itemsDetail)">
<li style=" padding: 11px 15px;">
<p style="float: left;width: 16%; color: #060606;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606;">&nbsp;{{itemsDetail.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606;">班组: </p>
<p style="float: left;width: 32%; color: #060606;">{{itemsDetail.WorkTeam}} </p>
<li style=" padding: 0px 15px;">
<p style="float: left;width: 16%; color: #060606; padding: 0; margin: 0;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606; padding: 0; margin: 0;">&nbsp;{{itemsDetail.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606; padding: 0; margin: 0;">班组: </p>
<p style="float: left;width: 32%; color: #060606; padding: 0; margin: 0;">{{itemsDetail.WorkTeam}} </p>
</li>
<li style=" padding: 11px 15px;">
<p style="float: left;width: 16%; color: #060606;"> 货号: </p>
<p style="float: left;width: 40%; color: #007AFF;">&nbsp;{{itemsDetail.StyleCode}} </p>
<p style="float: left;width: 14%; color: #060606;">数量: </p>
<p style="float: left;width: 28%; color: red;">{{itemsDetail.Qty}} </p>
<li style=" padding: 0px 15px;">
<p style="float: left;width: 16%; color: #060606; padding: 0; margin: 0;"> 货号: </p>
<p style="float: left;width: 40%; color: #007AFF; padding: 0; margin: 0;">&nbsp;{{itemsDetail.StyleCode}} </p>
<p style="float: left;width: 14%; color: #060606; padding: 0; margin: 0;">数量: </p>
<p style="float: left;width: 28%; color: red; padding: 0; margin: 0;">{{itemsDetail.Qty}} </p>
</li>
<li style=" padding: 11px 15px;">
<p style="float: left;width: 18%; color: #060606;"> 计划时间: </p>
<p style="float: left;width: 30%; color: #060606;">&nbsp;{{itemsDetail.PlanDate}} </p>
<p style="float: left;width: 18%; color: #060606;"> 完成时间: </p>
<p style="float: left;width: 30%; color: #060606;">&nbsp;{{itemsDetail.OrderDeliveryTime}} </p>
<li style=" padding: 0px 15px;">
<p style="float: left;width: 18%; color: #060606; padding: 0; margin: 0;"> 计划时间: </p>
<p style="float: left;width: 32%; color: #060606; padding: 0; margin: 0;">&nbsp;{{itemsDetail.PlanDate}} </p>
<p style="float: left;width: 18%; color: #060606; padding: 0; margin: 0;"> 完成时间: </p>
<p style="float: left;width: 32%; color: #060606; padding: 0; margin: 0;">&nbsp;{{itemsDetail.OrderDeliveryTime}} </p>
</li>
<li class="mui-table-view-cell">
<p style="float: left;width: 18%; color: darkgray;"> 发布时间: </p>
<p style="float: left;width: 40%; color: darkgray;">&nbsp;{{itemsDetail.CreateDate}} </p>
<p style="float: left;width: 14%; color: darkgray;">发布人: </p>
<p style="float: left;width: 28%; color: darkgray;">{{itemsDetail.PlanMan}} </p>
<li class="mui-table-view-cell" style=" padding: 0px 11px 2px 11px;">
<p style="float: left;width: 18%; color: #060606; padding: 0; margin: 0;"> 发布时间: </p>
<p style="float: left;width: 40%; color: #060606; padding: 0; margin: 0;">&nbsp;{{itemsDetail.CreateDate}} </p>
<p style="float: left;width: 14%; color: #060606; padding: 0; margin: 0;">发布人: </p>
<p style="float: left;width: 28%; color: #060606; padding: 0; margin: 0;">{{itemsDetail.PlanMan}} </p>
</li>
</ul>
</div>
......@@ -83,7 +83,7 @@
<div id="right " class="mui-pull-right " style=" width: 60%; display: inline-block; position: relative; top: -70px ; ">
<div id="right-1">
<table class="mui-table" style="background: #BBBBBB;">
<table class="mui-table" style="background: #289BE5;">
<tbody class="mui-table-view-cell">
<tr style="height: 31px;">
<td style="text-align: center; width: 40%;">工序</td>
......@@ -93,7 +93,7 @@
</tbody>
</table>
<div id=22 class="mui-scroll-wrapper" style=" margin-top: 35px ;height: 452px;">
<div id=22 class="mui-scroll-wrapper" style=" margin-top: 32px ;height: 452px;">
<div class="mui-scroll">
<!--这里放置真实显示的DOM内容-->
<!-- <div id="right-2">dfsfsfs</div> -->
......@@ -443,7 +443,7 @@
},
back: function() {
mui.back()
},
},
})
......
......@@ -11,8 +11,8 @@
<body>
<div id="app">
<div id="left-1" style="background-color: #007AFF; width: 40%; height: 30px; margin-bottom: 1px;">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="color: white;" @click="back"></a>
<label style=" text-align: center; margin-left: 100px; color: white;">车间交接 </label>
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="color: white; width: 60px;" @click="back"></a>
<label style=" text-align: center; margin-left: 70px; color: white;">针车交接 </label>
</div>
<div id="left-2" style="width: 40%">
<div class="mui-segmented-control" style="">
......@@ -25,30 +25,30 @@
<div id="item1" class="mui-scroll-wrapper scroll1" style=" border: solid #DAE6EF 1px ;height: 503px; background: white; display: inline-block; width: 40%; top: 72px;">
<div class="mui-scroll">
<ul :id="items.IndexID" class="mui-table-view bg" v-for=" items,n in itemsLeft" @click="selectLeft(items)">
<li style=" padding: 11px 15px;">
<p style="float: left;width: 16%; color: #060606;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606;">&nbsp;{{items.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606;">班组: </p>
<p style="float: left;width: 32%; color: #060606;">{{items.WorkTeam}} </p>
<li style=" padding: 0px 15px 0px 15px; margin: 0">
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606;padding: 0; margin: 0;">班组: </p>
<p style="float: left;width: 32%; color: #060606;padding: 0; margin: 0;">{{items.WorkTeam}} </p>
</li>
<li style=" padding: 11px 15px;">
<p style="float: left;width: 16%; color: #060606;"> 货号: </p>
<p style="float: left;width: 40%;color: #1B83FE;">&nbsp;{{items.StyleCode}} </p>
<p style="float: left;width: 12%; color: #060606;">数量: </p>
<p style="float: left;width: 32%; color: red;">{{items.Qty}} </p>
<li style=" padding: 0px 15px 0px 15px; margin: 0;">
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;"> 货号: </p>
<p style="float: left;width: 40%;color: #1B83FE;padding: 0; margin: 0;">&nbsp;{{items.StyleCode}} </p>
<p style="float: left;width: 12%; color: #060606;padding: 0; margin: 0;">数量: </p>
<p style="float: left;width: 32%; color: red;padding: 0; margin: 0;">{{items.Qty}} </p>
</li>
<li style=" padding: 11px 15px;">
<p style="float: left;width: 20%; color: #060606;"> 计划时间: </p>
<p style="float: left;width: 80%; color: #060606;">&nbsp;{{items.PlanDate}} </p>
<li style=" padding: 0px 15px 0px 15px; margin: 0">
<p style="float: left;width: 20%; color: #060606; padding: 0; margin: 0;"> 计划时间: </p>
<p style="float: left;width: 80%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.PlanDate}} </p>
</li>
<li class="mui-table-view-cell" style=" padding: 0px 15px 11px 15px;">
<p style="float: left;width: 20%; color: 060606;"> 时报时间: </p>
<p style="float: left;width: 35%; color: 060606;">&nbsp;{{items.ReportDate}} </p>
<p style="float: left;width: 16%; color: 060606;">实报人: </p>
<p style="float: left;width: 28%; color: 060606;">{{items.ReportUser}} </p>
<li class="mui-table-view-cell" style=" padding: 0px 15px 2px 15px; margin: 0">
<p style="float: left;width: 20%; color: #060606;padding: 0; margin: 0;"> 时报时间: </p>
<p style="float: left;width: 35%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.ReportDate}} </p>
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;">实报人: </p>
<p style="float: left;width: 28%; color: #060606;padding: 0; margin: 0;">{{items.ReportUser}} </p>
</li>
</ul>
......@@ -58,30 +58,30 @@
<div id="item2" class="mui-scroll-wrapper scroll2" :style="display_" style=" border: solid #DAE6EF 1px ;height: 503px; background: white; display: inline-block; width: 40%; top: 72px;">
<div class="mui-scroll">
<ul :id="items.IndexID" class="mui-table-view bg" v-for=" items,n in itemsLeft2" @click="selectLeft(items)">
<li style=" padding: 11px 15px;">
<p style="float: left;width: 16%; color: #060606;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606;">&nbsp;{{items.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606;">班组: </p>
<p style="float: left;width: 32%; color: #060606;">{{items.WorkTeam}} </p>
<li style=" padding: 2px 15px 0px 15px; margin: 0">
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606;padding: 0; margin: 0;">班组: </p>
<p style="float: left;width: 32%; color: #060606;padding: 0; margin: 0;">{{items.WorkTeam}} </p>
</li>
<li style=" padding: 11px 15px;">
<p style="float: left;width: 16%; color: #060606;"> 货号: </p>
<p style="float: left;width: 40%;color: #1B83FE;">&nbsp;{{items.StyleCode}} </p>
<p style="float: left;width: 12%; color: #060606;">数量: </p>
<p style="float: left;width: 32%; color: red;">{{items.Qty}} </p>
<li style=" padding: 0px 15px 0px 15px; margin: 0">
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;"> 货号: </p>
<p style="float: left;width: 40%;color: #1B83FE;padding: 0; margin: 0;">&nbsp;{{items.StyleCode}} </p>
<p style="float: left;width: 12%; color: #060606;padding: 0; margin: 0;">数量: </p>
<p style="float: left;width: 32%; color: red;padding: 0; margin: 0;">{{items.Qty}} </p>
</li>
<li style=" padding: 11px 15px;">
<p style="float: left;width: 20%; color: #060606;"> 计划时间: </p>
<p style="float: left;width: 80%; color: #060606;">&nbsp;{{items.PlanDate}} </p>
<li style=" padding: 0px 15px 0px 15px; margin: 0">
<p style="float: left;width: 20%; color: #060606;padding: 0; margin: 0;"> 计划时间: </p>
<p style="float: left;width: 80%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.PlanDate}} </p>
</li>
<li class="mui-table-view-cell" style=" padding: 0px 15px 11px 15px;">
<p style="float: left;width: 20%; color: 060606;"> 时报时间: </p>
<p style="float: left;width: 35%; color: 060606;">&nbsp;{{items.ReportDate}} </p>
<p style="float: left;width: 16%; color: 060606;">实报人: </p>
<p style="float: left;width: 28%; color: 060606;">{{items.ReportUser}} </p>
<li class="mui-table-view-cell" style=" padding: 0px 15px 2px 15px; margin: 0">
<p style="float: left;width: 20%; color: #060606;padding: 0; margin: 0;"> 时报时间: </p>
<p style="float: left;width: 35%; color: #060606;padding: 0; margin: 0;">&nbsp;{{items.ReportDate}} </p>
<p style="float: left;width: 16%; color: #060606;padding: 0; margin: 0;">实报人: </p>
<p style="float: left;width: 28%; color: #060606;padding: 0; margin: 0;">{{items.ReportUser}} </p>
</li>
</ul>
......@@ -337,7 +337,7 @@
},
back: function() {
mui.back();
},
},
})
......
......@@ -9,6 +9,9 @@
<link rel="stylesheet" type="text/css" href="../dest/css/mui.picker.min.css" />
<link rel="stylesheet" type="text/css" href="../dest/css/icons-extra.css" />
<style>
.altrowstable {
border-width: 1px;
/*padding: 2px;*/
......@@ -22,13 +25,65 @@
</head>
<body>
<div id="app">
<div id="left-1" style="background-color: #007AFF; width: 40%; height: 30px; margin-bottom: 1px;">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="color: white;" @click="back"></a>
<label style=" text-align: center; margin-left: 100px; color: white; position: relative;top: 7px;">针车排班表 </label>
<div id="app" class="mui-off-canvas-wrap mui-draggable">
<aside id="offCanvasSide" class="mui-off-canvas-right" style="background: white;">
<div id="offCanvasSideScroll" class="mui-scroll-wrapper" >
<div class="mui-scroll">
<div class="content">
<label>添加人员:</label>
<input type="search" v-model="searchText" placeholder="请输入人员工号或姓名关键字搜索" style="width: 300px;" />
<p style="margin: 10px 15px; display: inline-block;" >
<button type="button" class="mui-btn mui-btn-danger mui-btn-block" @click="searchPerson" style="padding: 5px 20px;width: 100px">搜索</button>
</p>
<p style="margin: 10px 15px; display: inline-block;" >
<button id="offCanvasHide" type="button" class="mui-btn mui-btn-danger mui-btn-block" style="padding: 5px 20px;width: 100px">关闭</button>
</p>
</div>
<div class="" style="">人员列表:</div>
<table class="mui-table">
<tbody class="mui-table-view-cell">
<!-- <td style="text-align: center; border-bottom:1px solid #BBB;">选择</td> -->
<td style="text-align: center; border-bottom:1px solid #BBB;">姓名</td>
<td style="text-align: center; border-bottom:1px solid #BBB;">工种</td>
<td style="text-align: center; border-bottom:1px solid #BBB;">技能等级</td>
</tbody>
</table>
<div class="mui-scroll-wrapper scroll4" style="margin-top: 110px; height: 380px;">
<div class="mui-scroll">
<table class="mui-table">
<tbody class="mui-table-view-cell">
<tr v-for="item ,m in searchPersonList">
<td style="text-align: center; border-bottom:1px solid #BBB; width: 300px;" @click="selectPersonList(item)">
<div class="mui-input-row mui-checkbox mui-left">
<label>{{item.UserName}}</label>
<input :id="'personlist_' +item.UserID" class="che2" name="checkbox1" type="checkbox">
</div>
</td>
<td style="text-align: center; border-bottom:1px solid #BBB;">{{item.WorkType}}</td>
<td style="text-align: center; border-bottom:1px solid #BBB;">{{item.SkillLevel}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<button style="position: relative; right: -531px; top: 510px; width: 100px;" type="button" :disabled="submit2_" class="mui-btn mui-btn-blue mui-btn-block" @tap="submit_2">确定</button>
</div>
</aside>
<div class="mui-inner-wrap" >
<div id="left-1" style="background-color: #007AFF; width: 40%; height: 34px; margin-bottom: 0px;" >
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="color: white; width: 60px; margin-top: 2px;" @click="back"></a>
<label style=" text-align: center; margin-left: 70px; color: white; position: relative;top: 7px;">针车排班表 </label>
</div>
<div id="left-2" style="width: 40%">
<div id="left-date" style=" border: solid #B6B6B6 1px; ">
<div id="left-date" style=" border: solid #B6B6B6 1px; background: #EDF5FA;">
<button class="mui-icon mui-icon-arrowleft mui-btn-outlined ;" style="border: 0px ; color:royalblue; width: 23%;height: 100%; text-align: left; padding-left:0px ;"
@click="nextday(-1)">
......@@ -49,48 +104,47 @@
<li class="mui-table-view-cell">无明细数据.请选择其他日期</li>
</ul>
<ul :id="itemsDetail.IndexID" class="mui-table-view detail_" style="margin-top: 5px;" v-for=" itemsDetail ,n in itemsLeft"
@click="nextPage(itemsDetail,1)">
<li style=" padding: 11px 15px;">
<p style="float: left;width: 16%; color: #060606;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606;">&nbsp;{{itemsDetail.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606;">班组: </p>
<p style="float: left;width: 32%; color: #060606;">{{itemsDetail.WorkTeam}} </p>
@tap="nextPage(itemsDetail,1)">
<li style=" padding: 0px 15px;">
<p style="float: left;width: 16%; color: #060606; padding: 0; margin: 0;"> 指令号: </p>
<p style="float: left;width: 40%; color: #060606; padding: 0; margin: 0;">&nbsp;{{itemsDetail.IndexNo}} </p>
<p style="float: left;width: 12%; color: #060606; padding: 0; margin: 0;">班组: </p>
<p style="float: left;width: 32%; color: #060606; padding: 0; margin: 0;">{{itemsDetail.WorkTeam}} </p>
</li>
<li style=" padding: 11px 15px;">
<p style="float: left;width: 16%; color: #060606;"> 货号: </p>
<p style="float: left;width: 40%; color: #007AFF;">&nbsp;{{itemsDetail.StyleCode}} </p>
<p style="float: left;width: 14%; color: #060606;">数量: </p>
<p style="float: left;width: 28%; color: red;">{{itemsDetail.Qty}} </p>
<li style=" padding: 0px 15px;">
<p style="float: left;width: 16%; color: #060606; padding: 0; margin: 0;"> 货号: </p>
<p style="float: left;width: 40%; color: #007AFF; padding: 0; margin: 0;">&nbsp;{{itemsDetail.StyleCode}} </p>
<p style="float: left;width: 14%; color: #060606; padding: 0; margin: 0;">数量: </p>
<p style="float: left;width: 28%; color: red; padding: 0; margin: 0;">{{itemsDetail.Qty}} </p>
</li>
<li style=" padding: 11px 15px;">
<p style="float: left;width: 18%; color: #060606;"> 计划时间: </p>
<p style="float: left;width: 30%; color: #060606;">&nbsp;{{itemsDetail.PlanDate}} </p>
<p style="float: left;width: 18%; color: #060606;"> 完成时间: </p>
<p style="float: left;width: 30%; color: #060606;">&nbsp;{{itemsDetail.OrderDeliveryTime}} </p>
<li style=" padding: 0px 15px;">
<p style="float: left;width: 18%; color: #060606; padding: 0; margin: 0;"> 计划时间: </p>
<p style="float: left;width: 30%; color: #060606; padding: 0; margin: 0;">&nbsp;{{itemsDetail.PlanDate}} </p>
<p style="float: left;width: 18%; color: #060606; padding: 0; margin: 0;"> 完成时间: </p>
<p style="float: left;width: 30%; color: #060606; padding: 0; margin: 0;">&nbsp;{{itemsDetail.OrderDeliveryTime}} </p>
</li>
<li class="mui-table-view-cell" style=" padding: 0px 15px 11px 15px;">
<p style="float: left;width: 18%; color: darkgray;"> 发布时间: </p>
<p style="float: left;width: 40%; color: darkgray;">&nbsp;{{itemsDetail.CreateDate}} </p>
<p style="float: left;width: 14%; color: darkgray;">发布人: </p>
<p style="float: left;width: 28%; color: darkgray;">{{itemsDetail.PlanMan}} </p>
<p style="float: left;width: 18%; color: #060606; padding: 0; margin: 0;"> 发布时间: </p>
<p style="float: left;width: 40%; color: #060606; padding: 0; margin: 0;">&nbsp;{{itemsDetail.CreateDate}} </p>
<p style="float: left;width: 14%; color: #060606; padding: 0; margin: 0;">发布人: </p>
<p style="float: left;width: 28%; color: #060606; padding: 0; margin: 0;">{{itemsDetail.PlanMan}} </p>
</li>
</ul>
</div>
</div>
</div>
<div id="right " class="mui-pull-right " style=" width: 60%; display: inline-block; position: relative; top: -70px ; ">
<div id="right-1" :style="sty2">
<div id="right-1" :style="sty2" style="margin-top: -2px;">
<table class="mui-table" style="background: #C8C7CC;">
<table class="mui-table" style="background: #9BD3F6; ">
<tbody class="mui-table-view-cell">
<tr>
<td style="text-align: center; width: 25%;">
<div class="mui-input-row mui-checkbox mui-left" @click="selectAll">
<label style="padding:11px 0px 11px 40px ;">全选</label>
<label style="padding:8px 0px 8px 40px ;">全选</label>
<input id="cheAll" name="checkbox1" type="checkbox">
</div>
</td>
......@@ -101,9 +155,7 @@
</tbody>
</table>
<div class="mui-scroll-wrapper" style=" margin-top: 40px ; height: 450px;">
<div class="mui-scroll-wrapper scroll2" style=" margin-top: 32px ; height: 465px; background: white;">
<div class="mui-scroll">
<!--这里放置真实显示的DOM内容-->
<table class="mui-table">
......@@ -114,91 +166,74 @@
<label>&nbsp;</label>
<input :id="item2.IEID" class="che" name="checkbox1" type="checkbox" @click="selectCheck()">
</div>
</td>
<td class="altrowstable" style="text-align: center; width: 40%;">{{item2.IEName}}</td>
<td class="altrowstable" style="text-align: center; width: 15%;">{{item2.TotalQty}}</td>
<td class="altrowstable" style="text-align: center; width: 25%;">
<a @click="selectPerson(item2)" v-if="item2.Workers.length == 0">
<a @tap="selectPerson(item2)" v-if="item2.Workers.length == 0">
<span class="mui-icon-extra mui-icon-extra-addpeople"></span>
</a>
<a @click="selectPerson(item2)" v-else>
<a @tap="selectPerson(item2)" v-else>
<label v-for="k in item2.Workers"> {{k.UserName}}:{{k.Qty}}</label>
</a>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<div id="right-dis " class="mui-pull-right " :style="sty1" style=" width: 60%; position: relative; top: -70px; ">
<table class="mui-table">
<div id="right-dis " class="mui-pull-right " :style="sty1" style=" width: 60%; position: relative; top: -70px; background: white; ">
<table class="mui-table" style="background: white;">
<tbody class="mui-table-view-cell">
<tr style="height: 40px; ">
<td style="text-align: center; border-bottom:1px solid #BBB; width: 300px;">
<tr style="height: 30px; ">
<td style="text-align: center; border-bottom:1px solid #BBB; width: 400px;">
姓名
</td>
<td style="text-align: center; border-bottom:1px solid #BBB;">
数量
</td>
<td style="text-align: center; border-bottom:1px solid #BBB; ">
<button id="offCanvasShow" type="button" class="mui-btn mui-btn-blue mui-btn-outlined">借调人员</button>
</td>
</tr>
</tbody>
</table>
<div class="mui-scroll-wrapper" style="top: 40px; width: 100%; height: 450px;">
<!-- <button id="offCanvasShow" type="button" class="mui-btn mui-btn-primary mui-btn-block" style="border: solid red 1px; padding: 5px;" >
显示侧滑菜单
</button> -->
<div class="mui-scroll-wrapper scroll3" style="top: 34px; width: 100%; height: 460px; background: white;">
<div class="mui-scroll">
<!--这里放置真实显示的DOM内容-->
<div id='list' >
<div id='list'>
<table class="mui-table">
<tbody class="mui-table-view-cell">
<tr v-for="item ,m in PersonList" >
<td style="text-align: center; border-bottom:1px solid #BBB; width: 300px;" @click ="selectChe(item)">
<tr v-for="item ,m in PersonList">
<td style="text-align: center; border-bottom:1px solid #BBB; width: 300px;" @click="selectChe(item)">
<div class="mui-input-row mui-checkbox mui-left">
<label>{{item.UserName}}</label>
<input :id="item.UserID" class="che" name="checkbox1" type="checkbox" >
<input :id="item.UserID" class="che" name="checkbox1" type="checkbox">
</div>
</td>
<td :id="'num_' + item.UserID " style="text-align: center; border-bottom:1px solid #BBB;">0</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<!-- off-canvas backdrop -->
<div class="mui-off-canvas-backdrop"></div>
<div id="right-2" style="position: absolute; bottom: 1px ; right: 1px; ">
<button type="button" class="mui-btn mui-btn-blue " style=" width: 150px; height: 70px;" @click="sop">SOP</button>
<button type="button" class="mui-btn mui-btn-blue " :disabled="selectPL" style="width:150px;height: 70px; " @click="selectPersonAll">批量选员</button>
<button id="submit" type="button" class="mui-btn mui-btn-blue " style=" width: 150px; height: 70px;" @click="submit">提交</button>
</div>
</div>
</div>
<script src="../dest/js/mui.min.js"></script>
......@@ -219,6 +254,7 @@
}
var app = new Vue({
el: '#app',
data: {
......@@ -233,14 +269,17 @@
link: "",
WorkTeamID: 0,
selectList: [],
selectList2:[],
selectList2: [],
selectif_PL: 0,
PersonList:[],
PersonList: [],
sty1: "display: none",
sty2: "",
Workers: [],
finishDis: 0,
searchText:"",
searchPersonList :[],
searchPersonListAfter :[],
sty1:"display: none",
sty2:"",
Workers:[],
finishDis:0,
},
computed: {
......@@ -248,7 +287,6 @@
if (this.displayModel == 1) {
return "display: none "
}
},
selectPL: function() {
if (this.selectif_PL == 0) {
......@@ -257,32 +295,75 @@
return null
}
},
submit2_:function(){
if(this.searchPersonListAfter.length ==0) {
return "disabled";
}
else{
return null ;
}
},
},
methods: {
init: function() {
mui.init();
mui.init({
swipeBack: false,
});
mui('.mui-scroll-wrapper').scroll({
bounce: false,
indicators: true, //是否显示滚动条
scrollX: false, //是否横向滚动
});
var offCanvasWrapper = mui('#app');
var offCanvasSide = document.getElementById("offCanvasSide");
var moveTogether = false;
var classList = offCanvasWrapper[0].classList;
//变换侧滑动画移动效果;
document.getElementById('offCanvasShow').addEventListener('tap', function() {
offCanvasWrapper.offCanvas('show');
});
document.getElementById('offCanvasHide').addEventListener('click', function() {
offCanvasWrapper.offCanvas('close');
});
this.dateTime = moment().format().substring(0, 10);
this.selectDetail = mui.currentWebview.nextDetail;
console.log(this.selectDetail);
if(this.selectDetail === undefined){
if (this.selectDetail === undefined) {
this.getData();
} else {
// var that = this;
// this.itemsLeft = [];
// this.itemsLeft.push(this.selectDetail);
this.nextPage2(this.selectDetail,0)
// setTimeout(function() {
// that.nextPage(that.itemsLeft[0], 1)
// }, 100)
}
else{
var that =this;
this.itemsLeft =[];
this.itemsLeft.push(this.selectDetail );
setTimeout(function(){
that.nextPage(that.itemsLeft[0],1)
},100)
}
},
show:function(){
offCanvasWrapper.offCanvas('show');
},
getData: function() {
var that = this;
......@@ -290,22 +371,50 @@
TaskType: 1,
Date: this.dateTime + " 00:00:00",
}
console.log(JSON.stringify(para))
Api.post('/api/vMES/TaskWork/TaskList', para, function(e) {
console.log("dd" + JSON.stringify(e))
that.itemsLeft = e.items
if(e.items.length > 0){
setTimeout(function(){
that.nextPage(e.items[0],1)
},100)
if (e.items.length > 0) {
setTimeout(function() {
that.nextPage(e.items[0], 1)
}, 100)
}
})
},
searchPerson:function(){
var that = this;
var para = {
text: this.searchText
nextday: function(n) {
}
Api.post('/api/vMES/TaskWork/SearchWorker', para, function(e) {
if (e.success) {
that.searchPersonList = e.items;
console.log("befor"+JSON.stringify(that.searchPersonList))
for (var i = that.searchPersonList.length -1; i >=0; i--) {
for (var j = 0; j < that.PersonList.length; j++) {
if(that.searchPersonList[i].UserID == that.PersonList[j].UserID){
that.searchPersonList.splice(i,1);
break;
}
}
}
console.log("after"+JSON.stringify(that.searchPersonList))
}
},function(b, bb, bbb) {
mui.toast(JSON.stringify(bbb.message))
})
},
nextday: function(n) {
var d = new Date(this.dateTime);
d.setTime(d.getTime() + 24 * 60 * 60 * 1000 * n);
......@@ -318,48 +427,40 @@
this.getData();
mui('.scroll1').scroll().scrollTo(0, 0, 100);
// mui('.scroll2').scroll().scrollTo(0, 0, 100);
// mui('.scroll3').scroll().scrollTo(0, 0, 100);
// mui('.scroll4').scroll().scrollTo(0, 0, 100);
mui('.scroll2').scroll().scrollTo(0, 0, 100);
mui('.scroll3').scroll().scrollTo(0, 0, 100);
mui('.scroll4').scroll().scrollTo(0, 0, 100);
},
selectLeftDetail: function(k) {
var bgs = document.getElementsByClassName("detail_");
var bf = document.getElementById(k);
for (var i = 0; i < bgs.length; i++) {
bgs[i].style.background = ""
bgs[i].style.background = "";
}
bf.style.background = "#1DAAEC";
},
getdataUser: function(o) {
var para={};
if (o === undefined){
para = {
WorkSectionID: 0,
WorkTeamID: this.WorkTeamID,
IndexID : this.IndexID
};
}
else{
para = {
WorkSectionID: o.IEID,
console.log("getdataUser" + this.IndexID);
mui('.scroll3').scroll().scrollTo(0, 0, 100);
mui('.scroll4').scroll().scrollTo(0, 0, 100);
var para = {
// WorkSectionID: 0,
WorkTeamID: this.WorkTeamID,
IndexID : o.IndexID
IndexID: this.IndexID
};
}
var that = this;
console.log("para" + JSON.stringify(para));
var that = this;
console.log(JSON.stringify(para));
Api.post('/api/vMES/TaskWork/TaskWorker', para, function(e) {
if (e.success) {
that.PersonList = e.items;
setTimeout(function(){
setTimeout(function() {
that.initWork()
},100)
}, 100)
}
......@@ -368,109 +469,171 @@
});
},
nextPage: function(o,kk) {
console.log("nextPage" + JSON.stringify(o));
this.sty1 ="display: none";
this.sty2 ="";
submit_2:function(){
this.searchPersonListAfter
if( this.searchPersonListAfter.length == 0){
mui.toast("请勾选人员");
return;
}
if(this.PersonList.length == 0){
mui.toast("请先进入人员选择界面");
return;
}
for (var i = 0; i < this.searchPersonListAfter.length; i++) {
console.log("personlist;;;" + JSON.stringify(this.PersonList))
var temp = {UserID: 0,Code: "",UserName: "",WorkType: "",SkillLevel: ""};
temp.UserID = this.searchPersonListAfter[i].UserID;
temp.Code = this.searchPersonListAfter[i].Code;
temp.UserName = this.searchPersonListAfter[i].UserName;
temp.WorkType = this.searchPersonListAfter[i].WorkType;
this.PersonList.push(temp);
console.log("personlist;;;after" + JSON.stringify(this.PersonList));
for (var j = 0; j < this.searchPersonList.length; j++) {
if(this.searchPersonList[j].UserID == this.searchPersonListAfter[i].UserID){
this.searchPersonList.splice(j,1);
}
}
}
document.getElementById('offCanvasHide').click();
var that = this;
setTimeout(function(){
for (var i = 0; i < that.searchPersonListAfter.length; i++) {
document.getElementById(that.searchPersonListAfter[i].UserID).checked= true;
that.selectList2.push(that.searchPersonListAfter[i].UserID)
}
that.searchPersonListAfter =[];
that.searchPersonList =[];
},200)
},
nextPage: function(o, kk) {
console.log("nextPage");
this.PersonList=[];
this.selectList2 =[];
this.searchPersonList =[];
this.searchPersonListAfter =[];
var che = document.getElementsByClassName("che");
for (var j = 0; j < che.length; j++) {
che[j].checked = false;
}
this.sty1 = "display: none";
this.sty2 = "";
var sub = document.getElementById("submit")
sub.innerHTML = "提交"
if(kk==1){
if (kk == 1) {
this.selectLeftDetail(o.IndexID);
}
var that = this;
this.IndexID = o.IndexID;
this.selectDetail = o;
var para = {
IndexID: o.IndexID
}
console.log("nextpage::" + JSON.stringify(para))
Api.post('/api/vMES/TaskWork/Task', para, function(e) {
console.log("itemsData2::" + JSON.stringify(e.data.IETask))
that.WorkTeamID = e.data.Main.WorkTeamID;
// that.itemsLeft.push(e.data.Main )
that.itemsData2 = e.data.IETask;
that.TotalQty = e.data.Main.Qty;
})
})
mui('.scroll2').scroll().scrollTo(0, 0, 100);
mui('.scroll3').scroll().scrollTo(0, 0, 100);
mui('.scroll4').scroll().scrollTo(0, 0, 100);
},
initWork:function(){
nextPage2: function(o, kk) {
var che = document.getElementsByClassName("che");
console.log("Workers" + JSON.stringify(this.Workers) )
for (var j = 0; j < che.length; j++) {
che[j].checked = false;
}
this.PersonList=[];
this.selectList2 =[];
this.searchPersonList =[];
this.searchPersonListAfter =[];
this.sty1 = "display: none";
this.sty2 = "";
var sub = document.getElementById("submit")
sub.innerHTML = "提交"
if (kk == 1) {
this.selectLeftDetail(o.IndexID);
}
var that = this;
this.IndexID = o.IndexID;
this.selectDetail = o;
var para = {
IndexID: o.IndexID
}
Api.post('/api/vMES/TaskWork/Task', para, function(e) {
console.log(JSON.stringify(e))
that.WorkTeamID = e.data.Main.WorkTeamID;
that.itemsLeft.push(e.data.Main )
that.itemsData2 = e.data.IETask;
that.TotalQty = e.data.Main.Qty;
})
},
initWork: function() {
var che = document.getElementsByClassName("che");
for (var j = 0; j < che.length; j++) {
che[j].checked = false;
}
if(this.Workers.length >0){
if (this.Workers.length > 0) {
for (var i = 0; i < this.Workers.length; i++) {
for (var j = 0; j < che.length; j++) {
if (che[j].id == this.Workers[i].UserID ){
if (che[j].id == this.Workers[i].UserID) {
var xx = document.getElementById("num_" + this.Workers[i].UserID)
xx.innerText = this.Workers[i].Qty
this.finishDis =1;
this.finishDis = 1;
che[j].checked = true;
}
}
}
}
},
selectPerson: function(obj) {
this.searchPersonList = [];
this.selectList = [];
this.selectList.push(obj.IEID)
this.sty1 = "";
this.sty2 ="display: none";
this.sty2 = "display: none";
this.Workers = obj.Workers;
var sub = document.getElementById("submit")
sub.innerHTML = "保存"
this.getdataUser(obj)
// mui.openWindow({
// url: 'person_selectlist_PPB.html',
// id: 'person_selectlist_PPB.html',
//
// extras: {
// WorkSectionID: 1,
// WorkTeamID: that.WorkTeamID,
// Workers: obj.Workers,
// IndexID: that.IndexID
// }
// });
},
selectPersonAll: function() {
this.selectCheck()
this.sty1 = "";
this.sty2 ="display: none";
this.sty2 = "display: none";
this.Workers = [];
var sub = document.getElementById("submit")
sub.innerHTML = "保存"
this.selectif_PL =0;
this.getdataUser()
},
selectAll: function() {
var che = document.getElementsByClassName("che");
var cheAll = document.getElementById("cheAll");
for (var i = 0; i < che.length; i++) {
che[i].checked = cheAll.checked
}
......@@ -496,58 +659,77 @@
}
},
selectChe:function(obj){
selectChe: function(obj) {
var che = document.getElementsByClassName("che");
this.selectList2 =[];
this.selectList2 = [];
for (var i = 0; i < che.length; i++) {
if(che[i].checked )
{
if (che[i].checked) {
this.selectList2.push(che[i].id)
this.finishDis = 1;
}
}
},
selectPersonList: function(obj) {
var ss = document.getElementById( "personlist_" + obj.UserID)
console.log(ss)
if (ss.checked) {
this.searchPersonListAfter.push(obj)
console.log("add ;;;" + JSON.stringify( this.searchPersonListAfter));
}
else{
for (var i = 0; i < this.searchPersonListAfter.length; i++) {
if(this.searchPersonListAfter[i].UserID == obj.UserID){
this.searchPersonListAfter.splice(i,1) ;
console.log("move ;;;" + JSON.stringify( this.searchPersonListAfter));
return ;
}
}
}
},
submit_person: function() {
var tempPara = [];
var tempPara =[];
console.log(JSON.stringify(this.selectList2));
if(this.selectList2.length >0){
if (this.selectList2.length > 0) {
for (var i = 0; i < this.selectList.length; i++) {
for (var j = 0; j < this.selectList2.length; j++) {
var temp = {IEID: 0,UserID: 0};
var temp = {
IEID: 0,
UserID: 0
};
temp.IEID = this.selectList[i];
temp.UserID = this.selectList2[j];
tempPara.push(temp);
}
}
}
if(tempPara.length ==0){
if (tempPara.length == 0) {
mui.toast("请选择派工人员");
return;
}
this.selectList2 =[];
var that = this;
var para = {
IndexID: this.IndexID,
Items: tempPara,
}
Api.post('/api/vMES/TaskWork/Save', para, function(e) {
if (e.success) {
mui.toast("保存成功");
var che = document.getElementsByClassName("che");
for (var j = 0; j < che.length; j++) {
che[j].checked = false;
}
var sub = document.getElementById("submit")
sub.innerHTML = "提交"
that.nextPage(that.selectDetail ,1);
that.nextPage(that.selectDetail, 1);
} else {
......@@ -557,27 +739,23 @@
mui.toast(JSON.stringify(bbb.message))
})
},
sop: function() {
console.log("sop");
this.getLink();
this.getLink();
},
getLink: function() {
console.log("sop");
var that = this;
var para = {
ReportType: 0,
StyleCode: this.selectDetail.StyleCode
}
Api.post('/api/vMES/Sop/StyleSop', para, function(e) {
if (e.success) {
that.link = e.data.Url;
var url_ = "sop.html";
var id_ = "sop.html";
mui.openWindow({
......@@ -587,7 +765,7 @@
style: that.selectDetail.StyleCode,
ReportType: 0,
link: that.link,
parentPage: "NeedlacarPBB.html"
parentPage: "NeedlecarPBB.html"
},
});
......@@ -651,9 +829,9 @@
});
}
mui('.scroll1').scroll().scrollTo(0, 0, 100);
// mui('.scroll2').scroll().scrollTo(0, 0, 100);
// mui('.scroll3').scroll().scrollTo(0, 0, 100);
// mui('.scroll4').scroll().scrollTo(0, 0, 100);
mui('.scroll2').scroll().scrollTo(0, 0, 100);
mui('.scroll3').scroll().scrollTo(0, 0, 100);
mui('.scroll4').scroll().scrollTo(0, 0, 100);
}, //selecttime
changeValue: function(n, k) {
if (isNaN(parseInt(n))) {
......@@ -672,10 +850,9 @@
submit: function() {
var sub = document.getElementById("submit")
if(sub.innerHTML == "保存") {
if (sub.innerHTML == "保存") {
this.submit_person();
}
else{
} else {
var that = this;
var para = {
IndexID: this.IndexID,
......@@ -701,7 +878,7 @@
},
back: function() {
mui.back();
},
},
})
......
......@@ -29,15 +29,15 @@
</head>
<body>
<div id="app">
<div id="app" style="display: none;">
<div class="mui-content">
<div id="left" style=" display: inline-block; width: 30%; ">
<div id="left-1" style="position: absolute; top: 1px;">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" @click="back"></a>
<label style=" text-align: center; position: relative; left: 50px;">今日完成数量:{{number}} </label>
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style=" width: 60px;" @click="back"></a>
<label style=" text-align: center; position: relative; left: 20px;">今日完成数量:{{number}} </label>
</div>
<div id="left-2">
<table class="mui-table" style=" position: relative;top: -432px; ">
......@@ -269,7 +269,7 @@
<script src="../dest/js/moment.js"></script>
<script type="text/javascript">
mui.plusReady(function() {
plus.nativeUI.showWaiting()
initPage();
});
......@@ -353,7 +353,11 @@
});
setTimeout(function(){
plus.nativeUI.closeWaiting();
var ap = document.getElementById("app");
ap.style=" display: inline-block";
},200)
mui('.mui-scroll-wrapper').scroll({
bounce: false,
indicators: true, //是否显示滚动条
......@@ -1057,6 +1061,7 @@
mui('.scroll4').scroll().scrollTo(0,0,100);
}, //selecttime
back: function() {
mui.back()
// plus.screen.lockOrientation("portrait-primary") //横屏
}
}
......
......@@ -76,23 +76,29 @@
</a>
</div>
<div class="application-box" types="工序交接-针车">
<a ids="4" href="javascript:;">
<div class="application-img"><img src="../dest/img/zc.png" alt="工序交接-针车" /></div>
<h3 class="application-tit" title="工序交接-针车">针车交接</h3>
</a>
</div>
<div class="application-box" types="工序交接-成型">
<a ids="3" href="javascript:;">
<div class="application-img"><img src="../dest/img/sz.png" alt="工序交接-针车" /></div>
<h3 class="application-tit" title="工序交接-针车">工序交接-针车</h3>
<div class="application-img"><img src="../dest/img/cx.png" alt="工序交接-成型" /></div>
<h3 class="application-tit" title="工序交接-针车">成型交接</h3>
</a>
</div>
<div class="application-box" types="我的任务">
<a ids="4" href="javascript:;">
<div class="application-img"><img src="../dest/img/sz.png" alt="我的任务" /></div>
<a ids="5" href="javascript:;">
<div class="application-img"><img src="../dest/img/mywork.png" alt="我的任务" /></div>
<h3 class="application-tit" title="我的任务">我的任务</h3>
</a>
</div>
<div class="application-box" types="针车排班表">
<a ids="5" href="javascript:;">
<div class="application-img"><img src="../dest/img/sz.png" alt="针车排班表" /></div>
<a ids="6" href="javascript:;">
<div class="application-img"><img src="../dest/img/bp.png" alt="针车排班表" /></div>
<h3 class="application-tit" title="针车排班表">针车排班表</h3>
</a>
</div>
......@@ -139,7 +145,7 @@
var lisy = Dom.getById('lialist');
var isds = lisy.getElementsByClassName('application-box');
var ucond = Dom.getById('centicon');
var pages = ['Needlecarreport_new','Cutting',"Forming","NeedlecarHandover","MyWork","NeedlecarPBB"];
var pages = ['Needlecarreport_new','Cutting',"Forming","FormingHandover","NeedlecarHandover","MyWork","NeedlecarPBB"];
//var tits = ['色卡档案', '样品企划', '样品客户意见', '款式图片档案', '下单管理', '生产进度表', '消息提醒', '业务审批', '订货主场','针车实报','设置'];
var lab1 = document.getElementsByTagName("a");
var back__first = null;
......@@ -158,6 +164,9 @@
items.push({
Name: "工序交接-针车"
});
items.push({
Name: "工序交接-成型"
});
items.push({
Name: "我的任务"
});
......
......@@ -3,7 +3,7 @@
"id" : "H544710A8", /*应用的标识,创建应用时自动生成,勿手动修改*/
"name" : "飞天兔MES", /*应用名称,程序桌面图标名称*/
"version" : {
"name" : "1.0.0.0", /*应用版本名称*/
"name" : "1.0.0.2", /*应用版本名称*/
"code" : "338"
},
"description" : "飞天兔MES平板版", /*应用描述信息*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment