Skip to content

M
MES_PAD
Commit 2c27e3cf authored by 王文琼's avatar 王文琼
Browse files
Options

base

parent 6f87e2a8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3772 additions and 152 deletions
dest/js/mes/CuttingDispatch.js 0 → 100644
View file @ 2c27e3cf
This diff is collapsed.
dest/js/mes/FormingDispatch.js 0 → 100644
View file @ 2c27e3cf
This diff is collapsed.
dest/js/mes/GropDispatch.js 0 → 100644
View file @ 2c27e3cf
This diff is collapsed.
dest/js/mes/NeedleMatch.js
View file @ 2c27e3cf
...@@ -780,9 +780,11 @@ var app = new Vue({ ...@@ -780,9 +780,11 @@ var app = new Vue({
var d = new Date(this.dateTime); var d = new Date(this.dateTime);
d.setTime(d.getTime() + 24 * 60 * 60 * 1000 * n); d.setTime(d.getTime() + 24 * 60 * 60 * 1000 * n);
if (d.getDate().toString().length == 1) { if (d.getDate().toString().length == 1) {
this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-0" + d.getDate(); //this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-0" + d.getDate();
this.dateTime = moment(d).format("YYYY-MM-DD")
} else { } else {
this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate(); //this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate();
this.dateTime = moment(d).format("YYYY-MM-DD")
} }
var para = { var para = {
ReportType: this.ReportType, ReportType: this.ReportType,
......
dest/js/mes/NeedlecarHandover.js
View file @ 2c27e3cf
This diff is collapsed.
html/Forming.html
View file @ 2c27e3cf
...@@ -965,9 +965,11 @@ ...@@ -965,9 +965,11 @@
var d = new Date(this.dateTime); var d = new Date(this.dateTime);
d.setTime(d.getTime() + 24 * 60 * 60 * 1000 * n); d.setTime(d.getTime() + 24 * 60 * 60 * 1000 * n);
if (d.getDate().toString().length == 1) { if (d.getDate().toString().length == 1) {
this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-0" + d.getDate(); //this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-0" + d.getDate();
this.dateTime = moment(d).format("YYYY-MM-DD")
} else { } else {
this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate(); //this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate();
this.dateTime = moment(d).format("YYYY-MM-DD")
} }
this.getData(); this.getData();
......
html/MyWork.html
View file @ 2c27e3cf
...@@ -265,9 +265,11 @@ ...@@ -265,9 +265,11 @@
var d = new Date(this.dateTime); var d = new Date(this.dateTime);
d.setTime(d.getTime() + 24 * 60 * 60 * 1000 * n); d.setTime(d.getTime() + 24 * 60 * 60 * 1000 * n);
if (d.getDate().toString().length == 1) { if (d.getDate().toString().length == 1) {
this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-0" + d.getDate(); //this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-0" + d.getDate();
this.dateTime = moment(d).format("YYYY-MM-DD")
} else { } else {
this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate(); //this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate();
this.dateTime = moment(d).format("YYYY-MM-DD")
} }
this.getData(); this.getData();
......
html/NeedlecarPBB.html
View file @ 2c27e3cf
...@@ -426,9 +426,11 @@ ...@@ -426,9 +426,11 @@
var d = new Date(this.dateTime); var d = new Date(this.dateTime);
d.setTime(d.getTime() + 24 * 60 * 60 * 1000 * n); d.setTime(d.getTime() + 24 * 60 * 60 * 1000 * n);
if (d.getDate().toString().length == 1) { if (d.getDate().toString().length == 1) {
this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-0" + d.getDate(); //this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-0" + d.getDate();
this.dateTime = moment(d).format("YYYY-MM-DD")
} else { } else {
this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate(); //this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate();
this.dateTime = moment(d).format("YYYY-MM-DD")
} }
this.getData(); this.getData();
......
html/Needlecarreport_new.html
View file @ 2c27e3cf
...@@ -958,9 +958,11 @@ ...@@ -958,9 +958,11 @@
var d = new Date(this.dateTime); var d = new Date(this.dateTime);
d.setTime(d.getTime() + 24 * 60 * 60 * 1000 * n); d.setTime(d.getTime() + 24 * 60 * 60 * 1000 * n);
if (d.getDate().toString().length == 1) { if (d.getDate().toString().length == 1) {
this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-0" + d.getDate(); //this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-0" + d.getDate();
this.dateTime = moment(d).format("YYYY-MM-DD")
} else { } else {
this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate(); //this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate();
this.dateTime = moment(d).format("YYYY-MM-DD")
} }
this.getData(); this.getData();
......
html/approval-finish.html 0 → 100644
View file @ 2c27e3cf
This diff is collapsed.
html/approval-pending.html 0 → 100644
View file @ 2c27e3cf
<!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" />
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link href="../dest/css/mui.min.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../dest/css/approval/approval.css"/>
</head>
<body>
<header class="mui-bar mui-bar-nav">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
<h1 class="mui-title">待处理任务</h1>
</header>
<div class=" mui-content mui-scroll-wrapper" id="content">
<div class="mui-scroll">
<ul id="task-list" class="task-list"></ul>
</div>
</div>
<template id="task-list-tpl">
{%_.each(items,function(item){%}
<li data-id="{%=item.doc_id%}" data-flow="{%=item.data_in_flow%}" data-txtid="{%=item.auditing_text_id%}">
<div class="task-item">
<div class="task-item-info">
<span class="item-person">{%=item.apply_person%}</span>
<span class="item-name mui-ellipsis">{%=item.doc_no_name%}</span>
</div>
<div class="task-item-info mt22">
<span class="item-order-number mui-ellipsis">
{%=item.doc_no%}
</span>
<span class="item-time ">
{%=item.apply_date%}
</span>
</div>
</div>
</li>
{%})%}
</template>
<script src="html5plus://ready"></script>
<script src="../dest/js/mui.min.js" ></script>
<script src="../dest/js/createView.min.js"></script>
<script src="../dest/js/mui.pullToRefresh.min.js" ></script>
<script src="../dest/js/mui.pullToRefresh.material.min.js" ></script>
<script src="../dest/js/underscore.min.js" ></script>
<script type="text/javascript">
mui.init();
var state = JSON.parse(localStorage.getItem("$state")) || {};
var token = state.token || '';
var URL = state.host || '';
var _self;
var w;
var page_index = 0;
var deceleration = mui.os.ios?0.003:0.0009;
var isNoData = false;
var isScroll = true;
var listTpl = document.getElementById("task-list-tpl");
var list = document.getElementById("task-list");
mui('.mui-scroll-wrapper').scroll({
bounce: false,
indicators: true, //是否显示滚动条
deceleration:deceleration
});
function plusReady() {
_self = plus.webview.currentWebview();
w = plus.nativeUI.showWaiting();
getData();
mui("#task-list").on('tap','li',function(){
var docId = this.getAttribute("data-id").trim();
var flow = this.getAttribute("data-flow").trim();
var txtId= this.getAttribute("data-txtid").trim();
mui.openWindow({
url:'task-approved.html',
id:'task-approved.html',
extras:{
url:'task-approved.html',
id:'task-approved',
docId:docId,
flowType:_self.flowType,
flowName:_self.flowName,
flow:flow,
txtId:txtId
}
});
});
}
if(window.plus) {
plusReady();
} else {
document.addEventListener('plusready',plusReady,false);
}
mui("#content .mui-scroll").pullToRefresh({
down: {
callback: function() {
var self = this;
setTimeout(function() {
getData(self);
}, 1000);
}
},
up: {
callback: function() {
var self = this;
setTimeout(function() {
addData(self);
self.endPullUpToRefresh(isNoData);
}, 1000);
},
contentinit: '上拉显示更多', //可以上拉提示信息
contentdown: '加载完成', //上拉结束提示信息
contentrefresh: '正在加载...',//上拉进行中提示信息
contentnomore: '没有更多数据了'//上拉无更多信息时提示信息
}
});
window.addEventListener('updateData',function(event){
var id = event.detail.id;
var li = list.querySelectorAll("li");
for(var i = 0,l = li.length; i < l; i += 1){
var docId = li[i].getAttribute("data-id").trim();
if(id == docId){
list.removeChild(li[i]);
}
}
})
// 初始数据
function getData(obj){
page_index = 1;
isNoData = false;
mui.ajax(URL+"/api/VF/GetWaitAuditingVFlowDataByType",{
data:{
"flow_type":_self.flowType,
"page_index":1,
"page_size":10,
"token":token
},
dataType:'json',
type:'POST',
headers:{'Content-Type':'application/json'},
success:function(result){
var isSuccess = result.success;
var code = result.code;
if(isSuccess==true){
w.close();
document.querySelector(".mui-pull-bottom-tips").style.display ='block';
if (result.total_count<=10) {isNoData = true;}
if(obj){
obj.endPullDownToRefresh(isNoData);
obj.refresh(true);
}
var tplHtml = _.template(listTpl.innerHTML);
list.innerHTML = tplHtml(result);
}else{
w.close();
if(code == "3"){
againData();
}else{
isNoData = true;
if(obj){
obj.endPullDownToRefresh(true);
obj.refresh(true);
}
}
}
},error:function(){
w.close();
reloadWvLoad();
console.log("error");
}
});
}
// 上滑加载数据
function addData(obj){
if(!isNoData){
if(isScroll){
isScroll = false;
page_index++;
var data = {
"flow_type":_self.flowType,
"page_index":page_index,
"page_size":10,
"token":token
}
mui.ajax(URL+"/api/VF/GetWaitAuditingVFlowDataByType",{
data:data,
dataType:'json',
type:'POST',
headers:{'Content-Type':'application/json'},
success:function(result){
var isSuccess = result.success;
if(isSuccess==true){
w.close();
document.querySelector(".mui-pull-bottom-tips").style.display ='block';
if (result.total_count<=page_index*10) {isNoData = true;}
var tplHtml = _.template(listTpl.innerHTML);
appendHtml(list,tplHtml(result));
isScroll = true;
}else{
w.close();
console.log("false");
}
},error:function(){
w.close();
reloadWvLoad();
console.log("error");
}
});
}
}
}
</script>
</body>
</html>
\ No newline at end of file
html/approval.html 0 → 100644
View file @ 2c27e3cf
<!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" />
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link href="../dest/css/mui.min.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../dest/css/approval/approval.css"/>
</head>
<body>
<header class="mui-bar mui-bar-nav">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
<h1 class="mui-title">任务</h1>
</header>
<div class="mui-content">
<ul class="mui-table-view" id="task-type">
<li class="mui-table-view-cell">
<a href="javascript:void(0)" data-href="task-pending.html" data-id="task-pending" data-text="待处理任务">
<span class="approval-icon-pending"></span>
<span class="approval-business-tit">所有待处理任务</span>
</a>
</li>
<li class="mui-table-view-cell">
<a href="javascript:void(0)" data-href="task-finish.html" data-id="task-finish" data-text="已处理任务">
<span class="approval-icon-finish"></span>
<span class="approval-business-tit">所有已处理任务</span>
</a>
</li>
</ul>
<div class="mui-slider ">
<div class=" mui-segmented-control task-oreder-tit">
<a class="mui-control-item mui-active" href="#pending-order">待处理任务类型</a>
<a class="mui-control-item" href="#finish-order">已处理任务类型</a>
</div>
<div id="task-order">
<div id="pending-order" class="mui-control-content mui-active">
<div id="pending-scroll" class="mui-scroll-wrapper"><div class="mui-scroll"></div></div>
</div>
<div id="finish-order" class=" mui-control-content">
<div id="finish-scroll" class="mui-scroll-wrapper"><div class="mui-scroll"></div></div>
</div>
</div>
</div>
</div>
<template id="task-oreder-tab">
<ul class="mui-table-view approval-table-view">
{%_.each(items,function(i){%}
<li class="mui-table-view-cell">
<a class="mui-navigate-right" data-type="{%=i.type_id%}" data-name="{%=i.type_name%}">
<span class="approval-icon-order"></span>
{%if(status){%}
<span class="approva-oreder-tit" data-id="task-finish">{%=i.type_name%}</span>
{%}else{%}
<span class="approva-oreder-tit" data-id="task-pending">{%=i.type_name%}&#40;{%=i.count%}&#41;</span>
{%}%}
</a>
</li>
{%})%}
</ul>
</template>
<script src="html5plus://ready"></script>
<script src="../dest/js/mui.min.js"></script>
<script src="../dest/js/underscore.min.js" ></script>
<script src="../dest/js/createView.min.js" ></script>
<script src="../dest/js/mui.pullToRefresh.min.js"></script>
<script src="../dest/js/mui.pullToRefresh.material.min.js"></script>
<script type="text/javascript">
mui.init({swipeBack: false});
var state = JSON.parse(localStorage.getItem("$state")) || {};
var token = state.token || '';
var URL = state.host || '';
var deceleration = mui.os.ios?0.003:0.0009;
var page_style ={
top:'0px',
bottom:'0px'
};
var w,timer;
var taskTabTpl = document.getElementById("task-oreder-tab");
var pendingTask = document.getElementById("pending-scroll");
var finishTask = document.getElementById("finish-scroll");
mui('.mui-scroll-wrapper').scroll({
bounce: false,
indicators: false,
deceleration:deceleration
});
if(window.plus){
plusReady();
}else{
document.addEventListener('plusready',plusReady,false);
}
window.addEventListener('reloadData',function(){
clearTimeout(timer);
getPendingData();
})
function plusReady(){
w=plus.nativeUI.showWaiting('',{padlock:true});
getPendingData();
mui.each(document.querySelectorAll('.mui-scroll'), function(index, pullRefreshEl) {
mui(pullRefreshEl).pullToRefresh({
down: {
callback: function() {
var self = this;
setTimeout(function() {
clearTimeout(timer);
getPendingData();
var parentId = self.element.parentNode.id;
switch(parentId){
case "pending-scroll":
break;
case "finish-scroll":
break;
default:
return;
}
self.endPullDownToRefresh();
}, 1000);
}
}
});
});
mui("#task-order").on("tap","a",function(){
var flowType = this.getAttribute("data-type");
flowType = parseInt(flowType);
var flowName = this.getAttribute("data-name").trim();
var selfId = this.lastElementChild.getAttribute("data-id").trim();
var selfUrl,title;
if(!selfId){
return;
}
switch(selfId){
case "task-pending":
selfUrl = "task-pending.html";
title = '待处理任务';
break;
case "task-finish":
selfUrl = "task-finish.html";
title = '已处理任务';
break;
}
mui.openWindow({
url:selfUrl,
id:selfUrl,
extras:{
url:selfUrl,
flowType:flowType,
flowName:flowName
},
});
});
}
//待处理任务数据
function getPendingData(){
mui.ajax({
type:"POST",
url:URL+"/api/VF/GetWaitAuditingVFlowTypes",
data:{"token": token},
dataType:'json',
timeout:6000,
headers:{'Content-Type':'application/json'},
success:function(result){
var isSuccess = result.success;
var code = result.code;
if(isSuccess==true){
w.close();
var tplHtml = _.template(taskTabTpl.innerHTML);
pendingTask.childNodes[0].innerHTML = tplHtml(result);
result.status = true;
finishTask.childNodes[0].innerHTML = tplHtml(result);
timer = setTimeout(getPendingData,60000);
}else{
w.close();
if(code == "3"){
againData();
}
}
},
error:function(xhr,type,errorThrown){
reloadWvLoad();
}
});
}
</script>
</body>
</html>
\ No newline at end of file
html/work.html
View file @ 2c27e3cf
...@@ -64,6 +64,15 @@ ...@@ -64,6 +64,15 @@
<h3 class="application-tit" :title="list.Name">{{list.Name}}</h3> <h3 class="application-tit" :title="list.Name">{{list.Name}}</h3>
</a> </a>
</div> </div>
<!-- <div class="application-box"
@click="goNext(90044)"
>
<a href="javascript:;">
<div class="application-img"><img /></div>
<h3 class="application-tit" >前期配套</h3>
</a>
</div> -->
<!-- <div class="application-box" types="设置"> <!-- <div class="application-box" types="设置">
<a ids="999" href="javascript:;"> <a ids="999" href="javascript:;">
...@@ -128,6 +137,7 @@ ...@@ -128,6 +137,7 @@
{code:'90037',name:'NeedleDispatch'}, {code:'90037',name:'NeedleDispatch'},
{code:'90038',name:'CuttingDispatch'}, {code:'90038',name:'CuttingDispatch'},
{code:'90039',name:'FormingDispatch'}, {code:'90039',name:'FormingDispatch'},
{code:'90044',name:'GropDispatch'},
], ],
......
manifest.json
View file @ 2c27e3cf
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"id" : "H544710A8", /*应用的标识，创建应用时自动生成，勿手动修改*/ "id" : "H544710A8", /*应用的标识，创建应用时自动生成，勿手动修改*/
"name" : "飞天兔MES", /*应用名称，程序桌面图标名称*/ "name" : "飞天兔MES", /*应用名称，程序桌面图标名称*/
"version" : { "version" : {
"name" : "1.0.9", /*应用版本名称*/ "name" : "1.0.13", /*应用版本名称*/
"code" : 338 "code" : 338
}, },
"description" : "飞天兔MES平板版", /*应用描述信息*/ "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