Skip to content

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

优化实报，针车派工单

parent ace52c26
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1384 additions and 410 deletions
dest/css/Cutting.css
View file @ c1f4a48a
......@@ -358,7 +358,9 @@ clear: both;
font-weight: normal;
background-color: #E2E2E9;
}
.mui-table-view1{
background: #fff;
}
/*********/
#pullrefresh {
width: 100%;
......
dest/js/index/index.js
View file @ c1f4a48a
......@@ -52,9 +52,9 @@ var getSubInfoById = function(infoList, id) {
var wgtVer = null;
var t = (new Date()).valueOf();
var checkUrl = "http://11wangjp.oss-cn-shanghai.aliyuncs.com/ftt_mes/version.txt?data=" + t;
var checkUrl = "http://11wangjp.oss-cn-shanghai.aliyuncs.com/ftt_mes_test/version.txt?data=" + t;
// 下载wgt文件
var wgtUrl = "http://11wangjp.oss-cn-shanghai.aliyuncs.com/ftt_mes/ftt_mes_hot.wgt";
var wgtUrl = "http://11wangjp.oss-cn-shanghai.aliyuncs.com/ftt_mes_test/ftt_mes_hot.wgt";
console.log("检测更新地址：" + checkUrl);
function downWgtHot() {
......
dest/js/mes/FormingV2.js
View file @ c1f4a48a
......@@ -444,10 +444,10 @@ var app = new Vue({
reportDelete: function() { //
var that = this;
var para = {
ReportID: this.IndexID,
IndexID: this.IndexID,
};
console.log(JSON.stringify(para)); //如果列表为空，弹出提示没有可以撤回的时报
Api.post('/api/vMES/ProductionReport/Delete', para, function(e) {
Api.post('/api/vMES/ProductionReportV2/Delete', para, function(e) {
if (e.success) {
//console.log(JSON.stringify(e));
that.createZhezhao(-1)
......@@ -464,7 +464,7 @@ var app = new Vue({
var delIndexNoIndx = -1;
for (var i = 0; i < doneIndexArr.length; i++) {
//console.log("比对的id:" + doneIndexArr[i].IndexID);
if (doneIndexArr[i].IndexID == para.ReportID) {
if (doneIndexArr[i].IndexID == para.IndexID) {
delIndexNoIndx = i;
break;
}
......
dest/js/mes/NeedleDispatch.js 0 → 100644
View file @ c1f4a48a
This diff is collapsed.
dest/js/mes/NeedlecarreportV2.js
View file @ c1f4a48a
......@@ -443,10 +443,10 @@ var app = new Vue({
reportDelete: function() { //
var that = this;
var para = {
ReportID: this.IndexID,
IndexID: this.IndexID,
};
console.log(JSON.stringify(para)); //如果列表为空，弹出提示没有可以撤回的时报
Api.post('/api/vMES/ProductionReport/Delete', para, function(e) {
Api.post('/api/vMES/ProductionReportV2/Delete', para, function(e) {
if (e.success) {
//console.log(JSON.stringify(e));
that.createZhezhao(-1)
......@@ -463,7 +463,7 @@ var app = new Vue({
var delIndexNoIndx = -1;
for (var i = 0; i < doneIndexArr.length; i++) {
//console.log("比对的id:" + doneIndexArr[i].IndexID);
if (doneIndexArr[i].IndexID == para.ReportID) {
if (doneIndexArr[i].IndexID == para.IndexID) {
delIndexNoIndx = i;
break;
}
......
dest/js/mes/cutting.js
View file @ c1f4a48a
......@@ -24,29 +24,29 @@ var app = new Vue({
paramUnDo: {
pageIndex: 2,
pageSize: 10,
ReportType:0
ReportType: ''
},
paramDone: {
pageIndex: 2,
pageSize: 10,
ReportType: 0
ReportType: ''
},
paramUnDoSeach: {
pageIndex: 2,
pageSize: 10,
ReportType: 0
ReportType: ''
},
paramDoneSeach: {
pageIndex: 2,
pageSize: 10,
ReportType:0
ReportType: ''
},
itemsHead: [], //未完成和搜索左侧数组
itemsLeft: [],
itemsLeft2: [], //已完成左侧数组
itemsSize: [],
SizeQty: [],
ReportType: 0,
ReportType: '',
IndexID: 0,
rightInfor: [], //右侧详情
cur: 0, //点击选中当前状态
......@@ -128,8 +128,8 @@ var app = new Vue({
var reFinished = document.getElementById("theTow").getAttribute("state");
// var UnfinishedUrl = '/api/vMES/ProductionReportV2/ToDo';
// var FinishedUrl = '/api/vMES/ProductionReportV2/Done';
var searchUrl = '/api/vMES/ProductionReportV2/Search';
var searchDoneUrl = '/api/vMES/ProductionReportV2/SearchDone';
var searchUrl = '/api/vMES/CutOffProductionReport/Search';
var searchDoneUrl = '/api/vMES/CutOffProductionReport/SearchDone';
//console.log("未完成" + reUnfinished)
//console.log("已完成" + reFinished)
var UnfinishedData = app.itemsHead;
......@@ -192,8 +192,8 @@ var app = new Vue({
};
//console.log("lalla" + JSON.stringify(para));
that.cur = 0;
Api.post('/api/vMES/ProductionReportV2/Search', para, function(e) {
console.log("one :::;" + JSON.stringify(e.items.length))
Api.post('/api/vMES/CutOffProductionReport/Search', para, function(e) {
console.log("one :::;" + JSON.stringify(para))
console.log("getData：" + JSON.stringify(e.items[0]))
//console.log("点击之前"+JSON.stringify(that.rightInfor))
if (e.items.length > 0) {
......@@ -236,7 +236,7 @@ var app = new Vue({
ReportType: that.ReportType
};
that.ReportID = idInfor;
Api.post('/api/vMES/ProductionReportV2/Detail', para, function(e) {
Api.post('/api/vMES/CutOffProductionReport/Detail', para, function(e) {
if (e.success) {
that.rightInfor = e.data;
console.log("点击之后" + JSON.stringify(that.rightInfor))
......@@ -276,7 +276,7 @@ var app = new Vue({
};
that.searchText = '';
that.disable_reportDelete = "disabled";
Api.post('/api/vMES/ProductionReportV2/Search', para, function(e) {
Api.post('/api/vMES/CutOffProductionReport/Search', para, function(e) {
that.cur = 0;
if (e.items.length > 0) {
that.itemsHead = e.items;
......@@ -305,7 +305,7 @@ var app = new Vue({
//console.log("do para " + JSON.stringify(para))
that.disable_reportDelete = null;
that.searchText = '';
Api.post('/api/vMES/ProductionReportV2/SearchDone', para, function(e) {
Api.post('/api/vMES/CutOffProductionReport/SearchDone', para, function(e) {
console.log("已完成" + JSON.stringify(para))
var data = e.items.length;
if (data > 0) {
......@@ -360,7 +360,7 @@ var app = new Vue({
searchDetail: function(para) {
var that = this;
if (this.completeState) { //true 是未完成的搜索 false是已完成的搜索
Api.post('/api/vMES/ProductionReportV2/Search', para, function(e) {
Api.post('/api/vMES/CutOffProductionReport/Search', para, function(e) {
console.log("现在是未完成的搜索！"+ JSON.stringify(para));
var data = e.items.length;
if (data > 0) {
......@@ -380,8 +380,8 @@ var app = new Vue({
mui.toast(JSON.stringify(res.message))
});
} else {
Api.post('/api/vMES/ProductionReportV2/SearchDone', para, function(e) {
console.log("现在是以111111完成的搜索！"+ JSON.stringify(para));
Api.post('/api/vMES/CutOffProductionReport/SearchDone', para, function(e) {
console.log("现在是以111111完成的搜索！"+ JSON.stringify(para)+e.items[0].IndexID);
var data = e.items.length;
if (data > 0) {
that.itemsLeft2 = e.items;
......@@ -442,10 +442,10 @@ var app = new Vue({
reportDelete: function() { //
var that = this;
var para = {
ReportID: this.IndexID,
IndexID: this.IndexID,
};
console.log(JSON.stringify(para)); //如果列表为空，弹出提示没有可以撤回的时报
Api.post('/api/vMES/ProductionReport/Delete', para, function(e) {
Api.post('/api/vMES/CutOffProductionReport/Delete', para, function(e) {
if (e.success) {
//console.log(JSON.stringify(e));
that.createZhezhao(-1)
......@@ -462,7 +462,7 @@ var app = new Vue({
var delIndexNoIndx = -1;
for (var i = 0; i < doneIndexArr.length; i++) {
//console.log("比对的id:" + doneIndexArr[i].IndexID);
if (doneIndexArr[i].IndexID == para.ReportID) {
if (doneIndexArr[i].IndexID == para.IndexID) {
delIndexNoIndx = i;
break;
}
......
dest/js/public.min.js
View file @ c1f4a48a
......@@ -59,9 +59,15 @@ var Api = {
var host = context.host;
data = data || {};
data.token = context.token;
error = error || this.__defaultErrorHandlder;
Log.log("web request:" + host + url + ' data:' + JSON.stringify(data));
mui.ajax(host + url, {
error = error || this.__defaultErrorHandlder;
var ts = (new Date()).valueOf();
url = host + url;
url += url.indexOf('?') > 0 ? ("&ts=" + ts) :("?ts=" + ts);
Log.log("web request:" + url+ JSON.stringify(data));
mui.ajax(url, {
type: 'POST',
data: data,
dataType: 'json',
......
dest/js/update.min.js
View file @ c1f4a48a
......@@ -2,7 +2,7 @@
(function($){
var t = (new Date()).valueOf();
var wgtVer = null,
checkUrl = "http://11wangjp.oss-cn-shanghai.aliyuncs.com/ftt_mes",
checkUrl = "http://11wangjp.oss-cn-shanghai.aliyuncs.com/ftt_mes_test",
localDir="update",
update_json_android='android.json',
update_json_ios = 'ios.json',
......
html/Cutting.html
View file @ c1f4a48a
......@@ -14,7 +14,6 @@
<div class="mui-content">
<div id="left" class="left">
<div id="left-1" class="left-1">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" @click="back"></a>
<label>今日产量:{{number}} </label>
......@@ -90,7 +89,7 @@
</div>
<div id="theTow" :state="!completeState" v-show="!completeState">
<div class="mui-table-view1 mui-table-view-chevron">
<ul class="complet-detail" v-for="(list,index) in itemsLeft2" :class="{active:cur==index}" @click="getDetailInfor(list.IndexID,index)">
<ul :class="{active:cur==index}" class="complet-detail" v-for="(list,index) in itemsLeft2" @click="getDetailInfor(list.IndexID,index)">
<li>
<p><span>指令号：</span><span>{{list.IndexNo}}</span></p>
<p><span>订单号：</span><span>{{list.CustomPO}}</span></p>
......
html/NeedlecarPBB.html
View file @ c1f4a48a
This diff is collapsed.
html/work.html
View file @ c1f4a48a
......@@ -75,30 +75,30 @@
</a>
</div>
<div class="application-box" types="90032">
<a ids="7" href="javascript:;">
<div class="application-img"><img src="../dest/img/application/zcsb.png" alt="针车实报" /></div>
<h3 class="application-tit" title="针车实报V2">针车实报</h3>
</a>
</div>
<div class="application-box" types="90033">
<a ids="8" href="javascript:;">
<div class="application-img"><img src="../dest/img/application/zcsb.png" alt="成型实报" /></div>
<h3 class="application-tit" title="成型实报V2">成型实报</h3>
</a>
</div>
<a ids="7" href="javascript:;">
<div class="application-img"><img src="../dest/img/application/zcsb.png" alt="针车实报" /></div>
<h3 class="application-tit" title="针车实报V2">针车实报</h3>
</a>
</div>
<div class="application-box" types="90033">
<a ids="8" href="javascript:;">
<div class="application-img"><img src="../dest/img/application/zcsb.png" alt="成型实报" /></div>
<h3 class="application-tit" title="成型实报V2">成型实报</h3>
</a>
</div>
<div class="application-box" types="90028">
<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="90029">
<a ids="3" href="javascript:;">
<div class="application-img"><img src="../dest/img/cx.png" alt="工序交接-成型" /></div>
<h3 class="application-tit" title="工序交接-针车">针车配套确认</h3>
<h3 class="application-tit" title="工序交接-成型">针车配套确认</h3>
</a>
</div>
<div class="application-box" types="90030">
......@@ -113,8 +113,12 @@
<h3 class="application-tit" title="针车排班表">针车排班表</h3>
</a>
</div>
<div class="application-box" types="90037">
<a ids="9" href="javascript:;">
<div class="application-img"><img src="../dest/img/bp.png" alt="针车派工单" /></div>
<h3 class="application-tit" title="针车派工单">针车派工单</h3>
</a>
</div>
<!-- <div class="application-box" types="设置">
<a ids="999" href="javascript:;">
<div class="application-img"><img src="../dest/img/sz.png" alt="设置" /></div>
......@@ -145,29 +149,31 @@
})(mui, document)
}
function init() {
mui.init();
var lisy = Dom.getById('lialist');
var isds = lisy.getElementsByClassName('application-box');
var ucond = Dom.getById('centicon');
var pages = ['Needlecarreport_new', 'Cutting', "Forming", "NeedleMatch", "NeedlecarHandover",
"MyWork","NeedlecarPBB","NeedlecarreportV2","FormingV2"];
var pages = ['Needlecarreport_new', 'Cutting', "Forming", "NeedleMatch", "NeedlecarHandover",
"MyWork", "NeedlecarPBB", "NeedlecarreportV2", "FormingV2","NeedleDispatch"
];
//var tits = ['色卡档案', '样品企划', '样品客户意见', '款式图片档案', '下单管理', '生产进度表', '消息提醒', '业务审批', '订货主场','针车实报','设置'];
var lab1 = document.getElementsByTagName("a");
function onGetDataSuccess(e) {
//console.log("GetModuleList::" + JSON.stringify(e))
var isSuccess = e.success;
if (isSuccess) {
var items = e.items;
console.log(JSON.stringify(items))
//console.log(JSON.stringify(items))
//手动在结尾添加了一个设置项目
// items.push({
// Code: "设置"
// });
// items.push({
// Code: "设置"
// });
//console.log(JSON.stringify(items));
console.log(JSON.stringify(items));
for (var i = 0; i < items.length; i++) {
for (var j = 0; j < isds.length; j++) {
......@@ -192,7 +198,7 @@
}
}
//console.log("GetModuleList::begin" )
Api.post('/api/User/GetModuleList', {}, onGetDataSuccess, onGetDataFailure);
Api.post('/api/User/GetModuleListV2', {}, onGetDataSuccess, onGetDataFailure);
mui(".application-box").on('tap', 'a', function() {
......
manifest.json
View file @ c1f4a48a
{
"@platforms" : [ "android", "iPhone", "iPad" ],
"id" : "H544710A8", /*应用的标识，创建应用时自动生成，勿手动修改*/
"name" : "飞天兔MES", /*应用名称，程序桌面图标名称*/
"id" : "H544710A8T", /*应用的标识，创建应用时自动生成，勿手动修改*/
"name" : "飞天兔MES_test", /*应用名称，程序桌面图标名称*/
"version" : {
"name" : "1.0.1.2", /*应用版本名称*/
"name" : "1.0.1.16", /*应用版本名称*/
"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