Commit a708af0a authored by 上官's avatar 上官

调整 同步

parent 9bb68c5a
......@@ -23,14 +23,27 @@
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);}
</style>
</head>
<body>
<div id="app">
<div></div>
<div id="app" style=" display:none">
<div class="mui-content">
<div id="left" style=" display: inline-block; width: 30%; ">
......@@ -194,7 +207,7 @@
<tr>
<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">尺码</th>
<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">数量</th>
<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">合格数</th>
<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">完工数</th>
<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">不合格数</th>
</tr>
</thead>
......@@ -255,8 +268,6 @@
</div>
</div>
</div>
</div>
......@@ -269,7 +280,9 @@
<script src="../dest/js/moment.js"></script>
<script type="text/javascript">
mui.plusReady(function() {
// plus.nativeUI.closeWaiting();
plus.nativeUI.showWaiting()
// mui.currentWebview.show();
initPage();
});
......@@ -308,6 +321,7 @@
displayModel:1,
zhezhao :1, //
mask_: mui.createMask(function(e){return false;}),
appdis:0,
},
computed: {
disable_save_button_C: function() {
......@@ -338,12 +352,14 @@
else{
return null
}
}
},
},
methods: {
init: function() {
mui.init();
mui.init();
window.addEventListener('back', function(e) {
var that = this;
......@@ -351,15 +367,22 @@
app.getDataDetail1();
});
setTimeout(function(){
plus.nativeUI.closeWaiting();
var ap = document.getElementById("app");
console.log("app::" + ap.style)
ap.style=" display: inline-block";
},200)
mui('.mui-scroll-wrapper').scroll({
bounce: false,
indicators: true, //是否显示滚动条
});
this.dateTime = moment().format().substring(0,10)
this.today = this.dateTime;
this.getData();
this.getData();
},
getData: function() {
var that = this;
......
......@@ -77,11 +77,11 @@
<div class="mui-scroll">
<table class="mui-table">
<tbody class="mui-table-view-cell">
<tr :id="'ReportID_'+item.ReportID" class="Report" v-for=" item in itemsLeft2" @click="selectReport2(item.ReportID)">
<td align="center">{{item.Date}}</td>
<td align="center">{{item.IndexNo}}</td>
<td align="center">{{item.Qty}}</td>
<td align="center">{{item.ProcessingType==1?"返修" :"报废"}}</td>
<tr :id="'ReportID2_'+item.ReportID" class="Report" v-for=" item in itemsLeft2" @click="selectReport2(item.ReportID)">
<td align="center" style="width: 20%">{{item.Date}}</td>
<td align="center" style="width: 50%">{{item.IndexNo}}</td>
<td align="center" style="width: 15%">{{item.Qty}}</td>
<td align="center" style="width: 15%">{{item.ProcessingType==1?"返修" :"报废"}}</td>
</tbody>
</tr>
</table>
......@@ -130,11 +130,9 @@
<tbody class="mui-table-view-cell">
<tr style=" height: 50px">
<td class="altrowstable" style="background: white;height: 50px; text-align: center;">尺码:</td>
<td class="altrowstable" style=" height: 50px" v-for="itemdef in itemsSizeDef" v-if="itemsSize.length ==0">
<button class="bg" type="button" style="width: 100%;height: 50px" class="mui-btn mui-btn-blue mui-btn-outlined">{{itemdef}}</button>
</td>
<td class="altrowstable" style=" height: 50px" v-for="itemd,isize in itemsSize">
<button class="bg" :style="stylebg(itemd)" style="width: 100%;height: 50px; border:0px ;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined"
<button class="bg" style="width: 100%;height: 50px; border:0px ;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined"
@click="selectSize(itemd)">{{itemd}}</button>
</td>
</tr>
......@@ -181,8 +179,9 @@
6</button>
<button style=" width: 85px;height: 65px; margin-right: -5px;margin-bottom: -1px;font-size: 25px" @click="selectNumber(7)">
7</button>
<button style=" width: 85px;height: 65px; margin-right: -5px;margin-bottom: -1px;font-size: 25px" @clicl="selectNumber(8)">
8</button>
<button style=" width: 85px;height: 65px; margin-right: -5px;margin-bottom: -1px;font-size: 25px" @click="selectNumber(8)">
8</button>
<button style=" width: 85px;height: 65px; margin-bottom: -1px;font-size: 25px" @click="selectNumber(9)"> 9</button>
<button style=" width: 85px;height: 65px; margin-right: -5px;font-size: 25px" @click="selectNumber(0)"> 0</button>
<button class="mui-btn-blue" style=" width: 170px;height: 65px; " @click="submit" :disabled="disable_save_button2">
......@@ -298,6 +297,10 @@
this.type = mui.currentWebview.type;
this.parentSize = mui.currentWebview.parentSize;
// this.sizeNum = mui.currentWebview.sizeNum;
var that = this;
setTimeout(function(e){
that.selectSize(that.parentSize)
},200)
this.getDataInit();
},
getDataInit: function() {
......@@ -643,8 +646,8 @@
}
},
selectReport2: function(obj) {
var op = document.getElementById("ReportID_" + obj)
var op = document.getElementById("ReportID2_" + obj)
this.ReportID = obj;
if (this.ReportID != 0) {
this.disable_reportDelete = null;
......@@ -744,6 +747,9 @@
return false;
}
else if (this.qty > this.sizeNum[i].Qty - this.sizeNum[i].UnQualifiedQty){
console.log(this.qty)
console.log(this.sizeNum[i].Qty)
console.log(this.sizeNum[i].UnQualifiedQty)
this.qty = 0;
mui.toast("不合格数量不能大于总数,请重新输入")
return false;
......@@ -762,6 +768,7 @@
},
selectNumber: function(n) {
if (this.Model == 1) {
return;
}
......@@ -786,20 +793,7 @@
},
stylebg: function(k) {
if (this.type == 1) {
return
} else if (this.type == 2) {
if (k == this.parentSize) {
this.size = this.parentSize
return {
"background": "#02C1ED"
}
}
}
},
back: function() {
mui.back();
......
......@@ -194,7 +194,7 @@
<tr>
<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">尺码</th>
<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">数量</th>
<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">合格数</th>
<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">完工数</th>
<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">不合格数</th>
</tr>
</thead>
......
......@@ -77,11 +77,11 @@
<div class="mui-scroll">
<table class="mui-table">
<tbody class="mui-table-view-cell">
<tr :id="'ReportID_'+item.ReportID" class="Report" v-for=" item in itemsLeft2" @click="selectReport2(item.ReportID)">
<td align="center">{{item.Date}}</td>
<td align="center">{{item.IndexNo}}</td>
<td align="center">{{item.Qty}}</td>
<td align="center">{{item.ProcessingType==1?"返修" :"报废"}}</td>
<tr :id="'ReportID2_'+item.ReportID" class="Report" v-for=" item in itemsLeft2" @click="selectReport2(item.ReportID)">
<td align="center" style="width: 20% ">{{item.Date}}</td>
<td align="center" style="width: 50% ">{{item.IndexNo}}</td>
<td align="center" style="width: 15% ">{{item.Qty}}</td>
<td align="center" style="width: 15% ">{{item.ProcessingType==1?"返修" :"报废"}}</td>
</tbody>
</tr>
</table>
......@@ -130,11 +130,11 @@
<tbody class="mui-table-view-cell">
<tr style=" height: 50px">
<td class="altrowstable" style="background: white;height: 50px; text-align: center;">尺码:</td>
<td class="altrowstable" style=" height: 50px" v-for="itemdef in itemsSizeDef" v-if="itemsSize.length ==0">
<!-- <td class="altrowstable" style=" height: 50px" v-for="itemdef in itemsSizeDef" v-if="itemsSize.length ==0">
<button class="bg" type="button" style="width: 100%;height: 50px" class="mui-btn mui-btn-blue mui-btn-outlined">{{itemdef}}</button>
</td>
</td> -->
<td class="altrowstable" style=" height: 50px" v-for="itemd,isize in itemsSize">
<button class="bg" :style="stylebg(itemd)" style="width: 100%;height: 50px; border:0px ;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined"
<button class="bg" style="width: 100%;height: 50px; border:0px ;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined"
@click="selectSize(itemd)">{{itemd}}</button>
</td>
</tr>
......@@ -181,7 +181,7 @@
6</button>
<button style=" width: 85px;height: 65px; margin-right: -5px;margin-bottom: -1px;font-size: 25px" @click="selectNumber(7)">
7</button>
<button style=" width: 85px;height: 65px; margin-right: -5px;margin-bottom: -1px;font-size: 25px" @clicl="selectNumber(8)">
<button style=" width: 85px;height: 65px; margin-right: -5px;margin-bottom: -1px;font-size: 25px" @click="selectNumber(8)">
8</button>
<button style=" width: 85px;height: 65px; margin-bottom: -1px;font-size: 25px" @click="selectNumber(9)"> 9</button>
<button style=" width: 85px;height: 65px; margin-right: -5px;font-size: 25px" @click="selectNumber(0)"> 0</button>
......@@ -241,7 +241,7 @@
itemsLeft2: [], //单款实报
itemsSize: [],
SizeQty: [],
itemsSizeDef: [40, 41, 42, 43, 44, 45, 46],
type: 1,
parentSize: 0,
IndexID: 0,
......@@ -257,6 +257,7 @@
}),
ReportType: 2,
sizeNum: [], //尺码与数量
},
computed: {
......@@ -297,11 +298,16 @@
this.itemsSize = mui.currentWebview.itemsSize;
this.type = mui.currentWebview.type;
this.parentSize = mui.currentWebview.parentSize;
this.once_ = mui.currentWebview.itemsSize.length;
// this.sizeNum = mui.currentWebview.sizeNum;
var that = this;
setTimeout(function(e){
that.selectSize(that.parentSize)
},200)
this.getDataInit();
},
getDataInit: function() {
this.getsizeNum()
this.getDataDetail1();
this.getDataDetail2(1);
......@@ -375,7 +381,7 @@
if (n == 1) {
Api.post('/api/vMES/InspectionReport/Report', para, function(e) {
console.log("itemsLeft::" + JSON.stringify(e))
that.itemsLeft = e.items;
});
......@@ -645,7 +651,7 @@
}
},
selectReport2: function(obj) {
var op = document.getElementById("ReportID_" + obj)
var op = document.getElementById("ReportID2_" + obj)
this.ReportID = obj;
if (this.ReportID != 0) {
......@@ -719,6 +725,7 @@
}
},
checkValue: function() {
console.log(this.size)
//数量不正确
if (isNaN(parseInt(this.qty)) || parseInt(this.qty) <= 0) {
mui.toast("数量不正确")
......@@ -747,6 +754,11 @@
return false;
}
else if (this.qty > this.sizeNum[i].Qty - this.sizeNum[i].UnQualifiedQty){
console.log(this.sizeNum[i].SizeName)
console.log(this.size)
console.log(this.qty)
console.log(this.sizeNum[i].Qty)
console.log(this.sizeNum[i].UnQualifiedQty)
this.qty = 0;
mui.toast("不合格数量不能大于总数,请重新输入")
return false;
......@@ -776,7 +788,8 @@
selectSize: function(n) {
var bg = document.getElementsByClassName("bg");
console.log(bg.length )
for (var i = 0; i < bg.length; i++) {
bg[i].style.background = ""
if (bg[i].innerHTML == n) {
......@@ -784,25 +797,29 @@
}
}
this.size = n;
console.log("size " +this.size);
},
stylebg: function(k) {
if (this.type == 1) {
return
} else if (this.type == 2) {
if (k == this.parentSize) {
this.size = this.parentSize
return {
"background": "#02C1ED"
}
}
}
},
// stylebg: function(k) {
// if (this.type == 1) {
// console.log(this.size)
// return
// } else if (this.type == 2 ) {
// if (k == this.parentSize) {
//
// this.size = this.parentSize
// console.log(this.size)
// return {
// "background": "#02C1ED"
//
// }
// }
// }
//
// },
back: function() {
mui.back();
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -77,11 +77,11 @@
<div class="mui-scroll">
<table class="mui-table">
<tbody class="mui-table-view-cell">
<tr :id="'ReportID_'+item.ReportID" class="Report" v-for=" item in itemsLeft2" @click="selectReport2(item.ReportID)">
<td align="center">{{item.Date}}</td>
<td align="center">{{item.IndexNo}}</td>
<td align="center">{{item.Qty}}</td>
<td align="center">{{item.ProcessingType==1?"返修" :"报废"}}</td>
<tr :id="'ReportID2_'+item.ReportID" class="Report" v-for=" item in itemsLeft2" @click="selectReport2(item.ReportID)">
<td align="center" style="width: 20% ">{{item.Date}}</td>
<td align="center" style="width: 50% ">{{item.IndexNo}}</td>
<td align="center" style="width: 15% ">{{item.Qty}}</td>
<td align="center" style="width: 15% ">{{item.ProcessingType==1?"返修" :"报废"}}</td>
</tbody>
</tr>
</table>
......@@ -130,11 +130,9 @@
<tbody class="mui-table-view-cell">
<tr style=" height: 50px">
<td class="altrowstable" style="background: white;height: 50px; text-align: center;">尺码:</td>
<td class="altrowstable" style=" height: 50px" v-for="itemdef in itemsSizeDef" v-if="itemsSize.length ==0">
<button class="bg" type="button" style="width: 100%;height: 50px" class="mui-btn mui-btn-blue mui-btn-outlined">{{itemdef}}</button>
</td>
<td class="altrowstable" style=" height: 50px" v-for="itemd,isize in itemsSize">
<button class="bg" :style="stylebg(itemd)" style="width: 100%;height: 50px; border:0px ;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined"
<button class="bg" style="width: 100%;height: 50px; border:0px ;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined"
@click="selectSize(itemd)">{{itemd}}</button>
</td>
</tr>
......@@ -181,7 +179,7 @@
6</button>
<button style=" width: 85px;height: 65px; margin-right: -5px;margin-bottom: -1px;font-size: 25px" @click="selectNumber(7)">
7</button>
<button style=" width: 85px;height: 65px; margin-right: -5px;margin-bottom: -1px;font-size: 25px" @clicl="selectNumber(8)">
<button style=" width: 85px;height: 65px; margin-right: -5px;margin-bottom: -1px;font-size: 25px" @click="selectNumber(8)">
8</button>
<button style=" width: 85px;height: 65px; margin-bottom: -1px;font-size: 25px" @click="selectNumber(9)"> 9</button>
<button style=" width: 85px;height: 65px; margin-right: -5px;font-size: 25px" @click="selectNumber(0)"> 0</button>
......@@ -298,6 +296,10 @@
this.type = mui.currentWebview.type;
this.parentSize = mui.currentWebview.parentSize;
// this.sizeNum = mui.currentWebview.sizeNum;
var that = this;
setTimeout(function(e){
that.selectSize(that.parentSize)
},200)
this.getDataInit();
},
getDataInit: function() {
......@@ -642,7 +644,7 @@
}
},
selectReport2: function(obj) {
var op = document.getElementById("ReportID_" + obj)
var op = document.getElementById("ReportID2_" + obj)
this.ReportID = obj;
if (this.ReportID != 0) {
......@@ -786,20 +788,7 @@
},
stylebg: function(k) {
if (this.type == 1) {
return
} else if (this.type == 2) {
if (k == this.parentSize) {
this.size = this.parentSize
return {
"background": "#02C1ED"
}
}
}
},
back: function() {
mui.back();
......
......@@ -194,7 +194,7 @@
<tr>
<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">尺码</th>
<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">数量</th>
<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">合格数</th>
<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">完工数</th>
<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">不合格数</th>
</tr>
</thead>
......
......@@ -32,7 +32,7 @@
}
.application-tit {
overflow: hidden;
/* overflow: hidden; */
white-space: nowrap;
text-overflow: ellipsis;
font-weight: 400;
......@@ -55,28 +55,51 @@
<div class="application" id="lialist">
<div class="application-box" types="针车实报" >
<a ids="0" href="javascript:;">
<div class="application-img" ><img src="../dest/img/application/zcsb.png" alt="针车实报" /></div>
<h3 class="application-tit" title="针车实报">针车实报</h3>
</a>
</div>
<div class="application-box" types="裁断实报">
<a ids="1" href="javascript:;">
<div class="application-img"><img src="../dest/img/application/zcsb.png" alt="裁断实报" /></div>
<h3 class="application-tit" title="裁断实报">裁断实报</h3>
</a>
</div>
<div class="application-box" types="针车实报" >
<a ids="0" href="javascript:;">
<div class="application-img" ><img src="../dest/img/application/zcsb.png" alt="针车实报" /></div>
<h3 class="application-tit" title="针车实报">针车实报</h3>
</a>
</div>
<div class="application-box" types="成型实报">
<a ids="2" href="javascript:;">
<div class="application-img"><img src="../dest/img/application/zcsb.png" alt="成型实报" /></div>
<div class="application-img"><img src="../dest/img/application/zcsb.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>
</a>
</div>
<div class="application-box" types="我的任务">
<a ids="4" href="javascript:;">
<div class="application-img"><img src="../dest/img/sz.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>
<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/application/settings.png" alt="设置" /></div>
<div class="application-img"><img src="../dest/img/sz.png" alt="设置" /></div>
<h3 class="application-tit" title="设置">设置</h3>
</a>
</div>
......@@ -116,7 +139,7 @@
var lisy = Dom.getById('lialist');
var isds = lisy.getElementsByClassName('application-box');
var ucond = Dom.getById('centicon');
var pages = ['Needlecarreport_new','Cutting',"Forming"];
var pages = ['Needlecarreport_new','Cutting',"Forming","NeedlecarHandover","MyWork","NeedlecarPBB"];
//var tits = ['色卡档案', '样品企划', '样品客户意见', '款式图片档案', '下单管理', '生产进度表', '消息提醒', '业务审批', '订货主场','针车实报','设置'];
var lab1 = document.getElementsByTagName("a");
var back__first = null;
......@@ -132,6 +155,16 @@
items.push({
Name: "设置"
});
items.push({
Name: "工序交接-针车"
});
items.push({
Name: "我的任务"
});
items.push({
Name: "针车排班表"
});
//console.log(JSON.stringify(items));
......@@ -161,7 +194,7 @@
}
console.log("need get module list ")
Api.post('/api/User/GetModuleList',null,onGetDataSuccess,onGetDataFailure);
......
......@@ -165,7 +165,12 @@
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
]
},
"orientation" : ["portrait-primary","portrait-secondary","landscape-primary","landscape-secondary"], /*应用支持的方向,portrait-primary:竖屏正方向;portrait-secondary:竖屏反方向;landscape-primary:横屏正方向;landscape-secondary:横屏反方向*/
"orientation" : [
"portrait-primary",
"portrait-secondary",
"landscape-primary",
"landscape-secondary"
], /*应用支持的方向,portrait-primary:竖屏正方向;portrait-secondary:竖屏反方向;landscape-primary:横屏正方向;landscape-secondary:横屏反方向*/
"icons" : {
"ios" : {
"prerendered" : true, /*应用图标是否已经高亮处理,在iOS6及以下设备上有效*/
......
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