Commit fe4a0393 authored by 上官's avatar 上官

针车实报, 针车品检

parent 139084fe
...@@ -129,5 +129,14 @@ ...@@ -129,5 +129,14 @@
<arguments>1.0-name-matches-false-false-node_modules</arguments> <arguments>1.0-name-matches-false-false-node_modules</arguments>
</matcher> </matcher>
</filter> </filter>
<filter>
<id>1540005426717</id>
<name></name>
<type>26</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-node_modules</arguments>
</matcher>
</filter>
</filteredResources> </filteredResources>
</projectDescription> </projectDescription>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<thead class="mui-table-view"> <thead class="mui-table-view">
<tr> <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> <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> </tr>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<div id="right" style=" display: inline-block; width: 69%; "> <div id="right" style=" display: inline-block; width: 69%; ">
<div id="right-2" style=""> <div id="right-2" style=" position: relative;top:2px">
<div style="border: solid #DAE6EF 1px ; display: inline-block; width: 80%;"> <div style="border: solid #DAE6EF 1px ; display: inline-block; width: 80%;">
<ul class="mui-table-view"> <ul class="mui-table-view">
<li class="mui-table-view-cell"> <li class="mui-table-view-cell">
...@@ -105,16 +105,16 @@ ...@@ -105,16 +105,16 @@
</div> </div>
</div> </div>
<div id="right-3" style="border: solid #DAE6EF 1px ;"> <div id="right-3" style="border: solid #DAE6EF 1px ;position: relative;top : -10px">
<table class="mui-table "> <table class="mui-table ">
<tbody class="mui-table-view-cell"> <tbody class="mui-table-view-cell">
<tr> <tr style=" height: 50px">
<td class="altrowstable" style="background: white;" >尺码:</td> <td class="altrowstable" style="background: white;height: 50px" >尺码:</td>
<td class="altrowstable" 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%;" class="mui-btn mui-btn-blue mui-btn-outlined" >{{itemdef}}</button> <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" v-for="itemd,isize in itemsSize" > <td class="altrowstable" style=" height: 50px" v-for="itemd,isize in itemsSize" >
<button class="bg" :style="stylebg(isize)" style="width: 100%" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectSize(itemd)">{{itemd}}</button> <button class="bg" :style="stylebg(isize)" style="width: 100%;height: 50px" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectSize(itemd)">{{itemd}}</button>
</td> </td>
</tr> </tr>
...@@ -122,14 +122,14 @@ ...@@ -122,14 +122,14 @@
</table> </table>
<table class="mui-table "> <table class="mui-table ">
<tbody class="mui-table-view-cell"> <tbody class="mui-table-view-cell">
<tr> <tr style=" height: 50px">
<td class="altrowstable" style="background: white;">完工数量:</td> <td class="altrowstable" style="background: white;height: 50px">完工数量:</td>
<td class="altrowstable"><button style="width: 100%;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(1)">1</button></td> <td class="altrowstable"><button style="width: 100%; height: 50px" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(1)">1</button></td>
<td class="altrowstable"><button style="width: 100%;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(2)">2</button></td> <td class="altrowstable"><button style="width: 100%; height: 50px" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(2)">2</button></td>
<td class="altrowstable"><button style="width: 100%;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(3)">3</button></td> <td class="altrowstable"><button style="width: 100%; height: 50px" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(3)">3</button></td>
<td class="altrowstable"><button style="width: 100%;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(4)">4</button></td> <td class="altrowstable"><button style="width: 100%; height: 50px" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(4)">4</button></td>
<td class="altrowstable"><button style="width: 100%;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(5)">5</button></td> <td class="altrowstable"><button style="width: 100%; height: 50px" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(5)">5</button></td>
<td class="altrowstable"><button style="width: 100%;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(10)">10</button></td> <td class="altrowstable"><button style="width: 100%; height: 50px" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(10)">10</button></td>
<td class="altrowstable"> <td class="altrowstable">
<input style="width: 100% ;height: 100%; text-align: center;color: red; border-style:none;" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" v-model="qty" :value="qty" <input style="width: 100% ;height: 100%; text-align: center;color: red; border-style:none;" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" v-model="qty" :value="qty"
:onchange="changeValue()" /> :onchange="changeValue()" />
......
...@@ -48,12 +48,12 @@ ...@@ -48,12 +48,12 @@
<thead class="mui-table-view"> <thead class="mui-table-view">
<tr> <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> <th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">数量</th>
</tr> </tr>
</thead> </thead>
<tbody class="mui-table-view-cell"> <tbody class="mui-table-view-cell">
<tr :id="'ReportID_'+item.ReportID" class="Report" v-for=" item in itemsLeft" @tap="selectReport(item)"> <tr :id="'ReportID_'+item.ReportID" class="Report" v-for=" item in itemsLeft" @tap="selectReport(item.ReportID)">
<td align="center">{{item.Date}}</td> <td align="center">{{item.Date}}</td>
<td align="center">{{item.IndexNo}}</td> <td align="center">{{item.IndexNo}}</td>
<td align="center">{{item.Qty}}</td> <td align="center">{{item.Qty}}</td>
...@@ -72,26 +72,25 @@ ...@@ -72,26 +72,25 @@
<div id="right" style=" display: inline-block; width: 69%; "> <div id="right" style=" display: inline-block; width: 69%; ">
<div id="right-1" style=" "> <div id="right-1" style=" ">
<div style="border: solid #007AFF 1px ; display: inline-block; width: 12%; position: relative;top: -22px; height: 38px;"> <div style="border: solid #DCDCE1 1px ; display: inline-block; width: 10%; position: relative;top: -20px; height: 38px;">
<button style="text-align: center;border-style:none; width: 100%;height: 100%; background: white;">指令号:</button> <button style="text-align: center;border-style:none; width: 100%;height: 100%; background: white;">指令号:</button>
</div> </div>
<div class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted" style="border: solid #007AFF 1px ; display: inline-block; width: 66%; "> <div class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted" style=" display: inline-block; width: 66%; position: relative;top: 1px;">
<div class="mui-scroll"> <div class="mui-scroll">
<a :id="'Index_' + i" class="mui-control-item mui-active Index" style="border: solid #7495F9 1px;" v-for="itemh,i in itemsHead" v-if="i==0" @tap="selectIndex(itemh.IndexID)"> <a :id="'Index_' + itemh.IndexID" class="mui-control-item Index mui-active" style="background:#02C1ED ;" v-for="itemh,i in itemsHead" v-if= "i == 0" @tap="selectIndex(itemh.IndexID)">
{{itemh.IndexNo}} {{itemh.IndexNo}}
</a> </a>
<a :id="'Index_' + i" class="mui-control-item Index" style="border: solid #7495F9 1px;" v-for="itemh,i in itemsHead" v-if="i != 0" @tap="selectIndex(itemh.IndexID)"> <a :id="'Index_' + itemh.IndexID" class="mui-control-item Index" style="" v-for="itemh,i in itemsHead" v-if= "i != 0" @tap="selectIndex(itemh.IndexID)">
{{itemh.IndexNo}} {{itemh.IndexNo}}
</a> </a>
</div> </div>
</div> </div>
<div style="border: solid #007AFF 1px ; display: inline-block; width: 20% ;position: relative;top: -22px; height: 38px; "> <div style="border: solid #DCDCE1 1px ; display: inline-block; width: 22% ;position: relative;top: -20px; height: 38px; ">
<a class=" mui-icon mui-icon-left-nav mui-pull-left" @tap="nextday(-1)"></a>
<button style="width: 100%;height: 100%;" id="selectdate" data-options='{"type":"date"}' name="shipdate" @tap="selecttime()">{{dateTime}}</button> <button style=" width: 60%;height: 100%;" id="selectdate" data-options='{"type":"date"}' name="shipdate" @tap="selecttime()">{{dateTime}}</button>
<a class=" mui-icon mui-icon-arrowright mui-pull-right" style="" @tap="nextday(1)"></a>
</div> </div>
</div> </div>
<div id="right-2" style=""> <div id="right-2" style="">
...@@ -126,16 +125,16 @@ ...@@ -126,16 +125,16 @@
</div> </div>
</div> </div>
<div id="right-3" style="border: solid #DAE6EF 1px ;"> <div id="right-3" style="border: solid #DAE6EF 1px ; position: relative; top: -15px;">
<table class="mui-table "> <table class="mui-table ">
<tbody class="mui-table-view-cell"> <tbody class="mui-table-view-cell">
<tr> <tr style="height: 50px;" >
<td class="altrowstable" style="background: white;" >尺码:</td> <td class="altrowstable" style="background: white;height: 50px;" >尺码:</td>
<td class="altrowstable" 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%;" class="mui-btn mui-btn-blue mui-btn-outlined" >{{itemdef}}</button> <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" v-for="itemd,isize in itemsSize" > <td class="altrowstable" style = "height: 50px;"v-for="itemd,isize in itemsSize" >
<button class="bg" :style="stylebg(isize)" style="width: 100%" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectSize(itemd)">{{itemd}}</button> <button class="bg" :style="stylebg(isize)" style="width: 100% ;height: 50px" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectSize(itemd)">{{itemd}}</button>
</td> </td>
</tr> </tr>
...@@ -143,19 +142,19 @@ ...@@ -143,19 +142,19 @@
</table> </table>
<table class="mui-table "> <table class="mui-table ">
<tbody class="mui-table-view-cell"> <tbody class="mui-table-view-cell">
<tr> <tr style="height: 50px;">
<td class="altrowstable" style="background: white;">完工数量:</td> <td class="altrowstable" style="background: white;">完工数量:</td>
<td class="altrowstable"><button style="width: 100%;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(1)">1</button></td> <td class="altrowstable"><button style="width: 100%; height:50px; border-color: #DCDCE1" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(1)">1</button></td>
<td class="altrowstable"><button style="width: 100%;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(2)">2</button></td> <td class="altrowstable"><button style="width: 100%; height:50px; border-color: #DCDCE1" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(2)">2</button></td>
<td class="altrowstable"><button style="width: 100%;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(3)">3</button></td> <td class="altrowstable"><button style="width: 100%; height:50px; border-color: #DCDCE1" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(3)">3</button></td>
<td class="altrowstable"><button style="width: 100%;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(4)">4</button></td> <td class="altrowstable"><button style="width: 100%; height:50px; border-color: #DCDCE1" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(4)">4</button></td>
<td class="altrowstable"><button style="width: 100%;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(5)">5</button></td> <td class="altrowstable"><button style="width: 100%; height:50px; border-color: #DCDCE1" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(5)">5</button></td>
<td class="altrowstable"><button style="width: 100%;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(10)">10</button></td> <td class="altrowstable"><button style="width: 100%; height:50px; border-color: #DCDCE1" type="button" class="mui-btn mui-btn-blue mui-btn-outlined" @tap="selectNumber(10)">10</button></td>
<td class="altrowstable"> <td class="altrowstable">
<input style="width: 100% ;height: 100%; text-align: center;color: red; border-style:none;" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" v-model="qty" :value="qty" <input style="width: 100% ;height: 100%; text-align: center;color: red; border-style:none;" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" v-model="qty" :value="qty"
:onchange="changeValue()" /> :onchange="changeValue()" />
</td> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -175,7 +174,7 @@ ...@@ -175,7 +174,7 @@
</tr> </tr>
</thead> </thead>
</table> </table>
<div class="mui-scroll-wrapper " style=" display: inline-block; width: 55.4%; left: 30.4%; top: 330px;"> <div class="mui-scroll-wrapper " style=" display: inline-block; width: 55.4%; left: 30.4%; top: 360px;">
<div class="mui-scroll"> <div class="mui-scroll">
<table class="mui-table "> <table class="mui-table ">
<tbody class="mui-table-view-cell"> <tbody class="mui-table-view-cell">
...@@ -193,7 +192,7 @@ ...@@ -193,7 +192,7 @@
</div> </div>
</div> </div>
<div style=" display: inline-block; position: absolute;bottom: 10px; width: 12%; right: 15px;"> <div style=" display: inline-block; position: absolute;bottom: 10px; width: 12%; right: 15px;">
<button type="button" class="mui-btn mui-btn-blue mui-btn-block" :disabled="disable_save_button" @tap="submit">提交</button> <button type="button" class="mui-btn mui-btn-blue mui-btn-block" :disabled="disable_save_button_C" @tap="submit">提交</button>
</div> </div>
...@@ -226,6 +225,7 @@ ...@@ -226,6 +225,7 @@
qty: 0, qty: 0,
size: 0, size: 0,
dateTime: "", dateTime: "",
dateTimeFull :new Date(),
items: [11, 21, 31, 14, 15, 11, 21, 31, 14, 15, 11, 21, 31, 14, 15, 11, 21, 31, 14, 15, 11, 21, 31, 14, 15, 11, items: [11, 21, 31, 14, 15, 11, 21, 31, 14, 15, 11, 21, 31, 14, 15, 11, 21, 31, 14, 15, 11, 21, 31, 14, 15, 11,
21, 31, 14, 15, 11, 21, 31, 14, 15, 11, 21, 31, 14, 15, 21, 31, 14, 15, 11, 21, 31, 14, 15, 11, 21, 31, 14, 15,
], ],
...@@ -241,12 +241,23 @@ ...@@ -241,12 +241,23 @@
15, 11, 21, 31, 14, 15, 11, 21, 31, 14, 15, 11, 21, 31, 14, 15, 15, 11, 21, 31, 14, 15, 11, 21, 31, 14, 15, 11, 21, 31, 14, 15,
], ],
IndexID: 0, IndexID: 0,
disable_save_button: 'disabled', // disable_save_button: 'disabled',
disable_reportDelete: 'disabled', disable_reportDelete: 'disabled',
disable_qq:null, disable_qq:null,
ReportID: 0 ReportID: 0,
Model:0,
},
computed:{
disable_save_button_C :function(){
if(this.size !=0 && this.qty !=0 && this.IndexID !=0 && this.Model == 0 ){
return null;
}
else {
return 'disabled' ;
}
},
}, },
methods: { methods: {
init: function() { init: function() {
mui.init(); mui.init();
...@@ -255,7 +266,7 @@ ...@@ -255,7 +266,7 @@
indicators: true, //是否显示滚动条 indicators: true, //是否显示滚动条
}); });
this.dateTime = new Date().toLocaleDateString(); this.dateTime = new Date().toLocaleDateString();
console.log(this.dateTime)
this.dateTime = this.dateTime.replace("/", "-") this.dateTime = this.dateTime.replace("/", "-")
this.dateTime = this.dateTime.replace("/", "-") this.dateTime = this.dateTime.replace("/", "-")
...@@ -272,16 +283,12 @@ ...@@ -272,16 +283,12 @@
Date: tempdate Date: tempdate
}; };
console.log(JSON.stringify(para));
Api.post('/api/vMES/ProductionReport/ProductIndexNo', para, function(e) { Api.post('/api/vMES/ProductionReport/ProductIndexNo', para, function(e) {
console.log(JSON.stringify(e));
that.itemsHead = e.items; that.itemsHead = e.items;
if (e.items.length > 0) { if (e.items.length > 0) {
console.log(e.items.length)
that.itemsDetail = e.items[0]; that.itemsDetail = e.items[0];
that.IndexID = e.items[0].IndexID; that.IndexID = e.items[0].IndexID;
that.getDataDetail1(); that.getDataDetail1();
that.getDataDetail2(); that.getDataDetail2();
...@@ -307,18 +314,15 @@ ...@@ -307,18 +314,15 @@
getDataDetail1: function() { getDataDetail1: function() {
var that = this; var that = this;
var para = { var para = {
IndexID: this.IndexID, IndexID: this.IndexID,
}; };
// console.log(JSON.stringify(para));
Api.post('/api/vMES/ProductionReport/ProductIndexNoDetail', para, function(e) { Api.post('/api/vMES/ProductionReport/ProductIndexNoDetail', para, function(e) {
console.log("sdfadf" + JSON.stringify(e)); console.log("eeee:::" +JSON.stringify(e))
that.itemsDetail = e.data; that.itemsDetail = e.data;
that.itemsDetail1 = e.data.ReportDetail; that.itemsDetail1 = e.data.ReportDetail;
that.itemsSize = e.data.SizeName; that.itemsSize = e.data.SizeName;
that.size = e.data.SizeName[0]; that.size = e.data.SizeName[0];
//that.SizeQtyA();
}); });
}, },
getDataDetail2: function() { getDataDetail2: function() {
...@@ -330,11 +334,9 @@ ...@@ -330,11 +334,9 @@
PageSize: 200, PageSize: 200,
PageIndex: 1, PageIndex: 1,
}; };
// console.log(JSON.stringify(para));
Api.post('/api/vMES/ProductionReport/Report', para, function(e) { Api.post('/api/vMES/ProductionReport/Report', para, function(e) {
console.log(JSON.stringify(e));
that.itemsLeft = e.items; that.itemsLeft = e.items;
}); });
}, },
getTatolNum: function() { getTatolNum: function() {
...@@ -343,31 +345,27 @@ ...@@ -343,31 +345,27 @@
ReportType: 1, ReportType: 1,
Date: this.dateTime + " 00:00:00", Date: this.dateTime + " 00:00:00",
}; };
// console.log(JSON.stringify(para));
Api.post('/api/vMES/ProductionReport/TotalQty', para, function(e) { Api.post('/api/vMES/ProductionReport/TotalQty', para, function(e) {
console.log("sdfadf" + JSON.stringify(e));
that.number = e.data; that.number = e.data;
}); });
}, },
reportDelete: function() { reportDelete: function() {
var that = this; var that = this;
var para = { var para = {
ReportID: this.ReportID, ReportID: this.ReportID,
}; };
// console.log(JSON.stringify(para));
Api.post('/api/vMES/ProductionReport/Delete', para, function(e) { Api.post('/api/vMES/ProductionReport/Delete', para, function(e) {
if(e.success){ if(e.success){
that.disable_reportDelete = 'disabled' that.disable_reportDelete = 'disabled'
that.size = 0; that.size = 0;
that.qty = 0; that.qty = 0;
that.selectSize(0); that.selectSize(0);
that.selectReport(0)
that.getDataDetail1(); //获取列表尺码对应数量 that.getDataDetail1(); //获取列表尺码对应数量
that.getTatolNum(); //获取今日完成数量 that.getTatolNum(); //获取今日完成数量
that.getDataDetail2(); //获取左边列表明细 that.getDataDetail2(); //获取左边列表明细
that.Model =0 ;
mui.toast("撤回成功") mui.toast("撤回成功")
} }
else{ else{
...@@ -376,6 +374,33 @@ ...@@ -376,6 +374,33 @@
}); });
}, },
getDataByReportID:function(){
var that = this;
var para = {
ReportID: this.ReportID,
};
Api.post('/api/vMES/ProductionReport/ReportIndexNoDetail', para, function(e) {
if(e.success){
that.itemsDetail = e.data;
that.itemsSize =e.data.SizeName;
that.itemsDetail1 = e.data.ReportDetail ;
that.size = e.data.ReportSizeName;
that.qty = e.data.ReportQty;
that.selectSize(e.data.ReportSizeName);
}
else{
mui.toast("获取明细失败:" + e.message)
}
});
},
SizeQtyA: function() { SizeQtyA: function() {
for (var i = 0; i < this.itemsSize.length; i++) { for (var i = 0; i < this.itemsSize.length; i++) {
...@@ -383,12 +408,9 @@ ...@@ -383,12 +408,9 @@
size: this.itemsSize[i], size: this.itemsSize[i],
qty: 0 qty: 0
} }
console.log("tempa:::" + JSON.stringify(tempa))
this.SizeQty.push(tempa); this.SizeQty.push(tempa);
} }
console.log("SizeQty:::" + JSON.stringify(this.SizeQty))
}, },
submit: function() { submit: function() {
if (!this.checkValue()) { if (!this.checkValue()) {
...@@ -399,28 +421,50 @@ ...@@ -399,28 +421,50 @@
SizeName: this.size, SizeName: this.size,
Qty: this.qty, Qty: this.qty,
} }
console.log(JSON.stringify(para))
var that = this; var that = this;
Api.post('/api/vMES/ProductionReport/Save', para, function(e) { Api.post('/api/vMES/ProductionReport/Save', para, function(e) {
if (e.success) { if (e.success) {
that.disable_save_button = 'disabled' // that.disable_save_button = 'disabled'
that.size = 0; that.size = 0;
that.qty = 0; that.qty = 0;
that.selectSize(0); that.selectSize(0);
that.getDataDetail1(); //获取列表尺码对应数量 that.getDataDetail1(); //获取列表尺码对应数量
that.getTatolNum(); //获取今日完成数量 that.getTatolNum(); //获取今日完成数量
that.getDataDetail2(); //获取左边列表明细 that.getDataDetail2(); //获取左边列表明细
mui.toast("提交成功"); mui.toast("提交成功");
} else { } else {
mui.toast("提交失败: " + e.success.message);
mui.toast("提交失败: " + e.message);
} }
}); }, function(b, bb, bbb) {
mui.toast(JSON.stringify(bbb.message))
});
}, },
selectIndex:function(idx){ selectIndex:function(idx){
var indxx = document.getElementsByClassName("Index");
if (this.Model == 1) {
setTimeout(function() {
for (var i = 0; i < indxx.length; i++) {
indxx[i].className ="mui-control-item Index"
}
}, 50);
return;
}
var indx = document.getElementById("Index_" + idx)
for (var i = 0; i < indxx.length; i++) {
indxx[i].style.background ="";
}
indx.style.background = "#02C1ED";
this.IndexID = idx this.IndexID = idx
if(this.IndexID != 0){ if(this.IndexID != 0){
...@@ -447,9 +491,9 @@ ...@@ -447,9 +491,9 @@
}, },
selectReport: function(obj) { selectReport: function(obj) {
var op = document.getElementById("ReportID_" + obj.ReportID) var op = document.getElementById("ReportID_" + obj)
this.ReportID = obj.ReportID; this.ReportID = obj;
if (this.ReportID != 0) { if (this.ReportID != 0) {
this.disable_reportDelete = null; this.disable_reportDelete = null;
} }
...@@ -458,19 +502,23 @@ ...@@ -458,19 +502,23 @@
for (var i = 0; i < reportele.length; i++) { for (var i = 0; i < reportele.length; i++) {
reportele[i].style.background = "" reportele[i].style.background = ""
} }
op.style.background = "#02C1ED"; if(obj != 0){
op.style.background = "#02C1ED";
this.Model =1 ;
this.getDataByReportID();
}
}, },
changeValue: function() { changeValue: function() {
console.log(this.size)
if (isNaN(parseInt(this.qty))) { if (isNaN(parseInt(this.qty))) {
this.qty = 0; this.qty = 0;
this.disable_save_button = 'disabled'; // this.disable_save_button = 'disabled';
} }
if (parseInt(this.qty) > 0) { if (parseInt(this.qty) > 0) {
this.qty = parseInt(this.qty); this.qty = parseInt(this.qty);
this.disable_save_button = null; // this.disable_save_button = null;
} }
}, },
...@@ -488,16 +536,19 @@ ...@@ -488,16 +536,19 @@
mui.toast("订单号不正确") mui.toast("订单号不正确")
return false; return false;
} else { } else {
console.log(this.size);
return true; return true;
} }
}, },
selectNumber: function(n) { selectNumber: function(n) {
if (this.Model == 1) {
return;
}
this.qty = isNaN(parseInt(this.qty)) ? 0 + parseInt(n) : parseInt(this.qty) + parseInt(n); this.qty = isNaN(parseInt(this.qty)) ? 0 + parseInt(n) : parseInt(this.qty) + parseInt(n);
console.log(this.qty )
}, },
selectSize: function(n) { selectSize: function(n) {
console.log("selectSize" + n)
var bg = document.getElementsByClassName("bg"); var bg = document.getElementsByClassName("bg");
for (var i = 0; i < bg.length; i++) { for (var i = 0; i < bg.length; i++) {
...@@ -507,14 +558,23 @@ ...@@ -507,14 +558,23 @@
} }
} }
if(n==0){ if(n!=0 ){
this.size = n;
bg[0].style.background = "#02C1ED" console.log(this.size);
// bg[0].style.background = "#02C1ED"
} }
this.size = n;
},
nextday:function(n){
console.log(n)
var d = new Date(this.dateTime);
d.setTime(d.getTime()+24*60*60*1000*n);
var s = d.getFullYear()+"-" + (d.getMonth()+1) + "-" + d.getDate();
this.dateTime = s;
}, },
stylebg: function(n) { stylebg: function(n) {
if (n == 0) { if (n == 0) {
...@@ -572,7 +632,8 @@ ...@@ -572,7 +632,8 @@
* rs.h 时,用法同年 * rs.h 时,用法同年
* rs.i 分(minutes 的第二个字母),用法同年 * rs.i 分(minutes 的第二个字母),用法同年
*/ */
_self.innerText = rs.text console.log(rs.value)
_self.innerText = rs.text;
that.dateTime = rs.text; that.dateTime = rs.text;
that.getData(); that.getData();
...@@ -592,7 +653,6 @@ ...@@ -592,7 +653,6 @@
} }
}, //selecttime }, //selecttime
back: function() { back: function() {
console.log("back");
plus.screen.lockOrientation("portrait-primary") //横屏 plus.screen.lockOrientation("portrait-primary") //横屏
} }
} }
......
...@@ -54,12 +54,25 @@ ...@@ -54,12 +54,25 @@
<body> <body>
<div class="application" id="lialist"> <div class="application" id="lialist">
<div class="application-box" types="针车实报"> <div class="application-box" types="针车实报">
<a ids="9" href="javascript:;"> <a ids="0" 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> <h3 class="application-tit" title="针车实报">针车实报</h3>
</a> </a>
</div> </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="2" 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="设置"> <div class="application-box" types="设置">
<a ids="999" href="javascript:;"> <a ids="999" href="javascript:;">
...@@ -87,7 +100,8 @@ ...@@ -87,7 +100,8 @@
$.plusReady(function() { $.plusReady(function() {
plus.navigator.closeSplashscreen() plus.navigator.closeSplashscreen()
plus.screen.lockOrientation("portrait-primary") // plus.screen.lockOrientation("portrait-primary")
plus.screen.lockOrientation("landscape-secondary") //横屏
init(); init();
}); });
...@@ -102,7 +116,7 @@ ...@@ -102,7 +116,7 @@
var lisy = Dom.getById('lialist'); var lisy = Dom.getById('lialist');
var isds = lisy.getElementsByClassName('application-box'); var isds = lisy.getElementsByClassName('application-box');
var ucond = Dom.getById('centicon'); var ucond = Dom.getById('centicon');
var pages = ['application-material', 'application-sample', 'application-comments', 'application-stylefile', 'application-order', 'application-progress', 'message', 'task', 'app_order_meeting_home','Needlecarreport']; var pages = ['Needlecarreport_new','Cutting',"Forming"];
//var tits = ['色卡档案', '样品企划', '样品客户意见', '款式图片档案', '下单管理', '生产进度表', '消息提醒', '业务审批', '订货主场','针车实报','设置']; //var tits = ['色卡档案', '样品企划', '样品客户意见', '款式图片档案', '下单管理', '生产进度表', '消息提醒', '业务审批', '订货主场','针车实报','设置'];
var lab1 = document.getElementsByTagName("a"); var lab1 = document.getElementsByTagName("a");
var back__first = null; var back__first = null;
......
...@@ -92,9 +92,6 @@ ...@@ -92,9 +92,6 @@
}, },
"NativeObj" : { "NativeObj" : {
"description" : "原生对象" "description" : "原生对象"
},
"Push" : {
"description" : "管理推送消息插件"
} }
}, },
"plus" : { "plus" : {
...@@ -117,13 +114,7 @@ ...@@ -117,13 +114,7 @@
"signature" : "Sk9JTiBVUyBtYWlsdG86aHIyMDEzQGRjbG91ZC5pbw==", /*可选,保留给应用签名,暂不使用*/ "signature" : "Sk9JTiBVUyBtYWlsdG86aHIyMDEzQGRjbG91ZC5pbw==", /*可选,保留给应用签名,暂不使用*/
"distribute" : { "distribute" : {
"plugins" : { "plugins" : {
"push" : { "push" : {},
"igexin" : {
"appid" : "eLaKA1zcbK9OuOrMmygBU3",
"appkey" : "dPPbnscWQ37jfU4Zys3OV3",
"appsecret" : "y8rfTVvqMz5kYDM62HgiR9"
}
},
"speech" : { "speech" : {
"ifly" : {} "ifly" : {}
} }
...@@ -174,7 +165,7 @@ ...@@ -174,7 +165,7 @@
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
] ]
}, },
"orientation" : [ "portrait-primary" ], /*应用支持的方向,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" : { "icons" : {
"ios" : { "ios" : {
"prerendered" : true, /*应用图标是否已经高亮处理,在iOS6及以下设备上有效*/ "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