Skip to content

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

实报，配套，搜索栏优化，增加异常说明编辑框

parent 7a8a27d5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 961 additions and 590 deletions
dest/css/Cutting.css
View file @ db4c8148
......@@ -62,6 +62,7 @@ body {
width: 30%;
height: 100%;
display: block;
}
.left-1 {
......@@ -85,6 +86,32 @@ body {
padding-top: 35px;
}
.select{
height: 36px;
width: 100%;
clear: both;
overflow: hidden;
}
.select-left{
width: 80px;
height: 33px;
float: left;
border: 1px solid #c8c7cc;
}
.select-left select{
background-color: rgba(0,0,0,.1);
padding: 0;
padding-left:5px;
text-align: center;
height: 33px;
margin: 0;
border-radius:0 ;
}
.mui-search{
width: calc(100% - 80px);
float: right;
}
.mui-search input[type=search] {
border-radius: 0;
}
......@@ -95,9 +122,11 @@ body {
background: #fff;
position: relative;
/* display: none; */
margin-top: -18px;
/* margin-top: -18px;
overflow-y: scroll;
*/
width: 100%;
clear: both;
}
.Text1 {
......@@ -114,10 +143,6 @@ body {
height: 481px;
}
.mui-scroll {
overflow-y: scroll;
}
.complet-detail {
padding: 5px 0;
height: 93px;
......@@ -337,7 +362,7 @@ body {
/*********/
#pullrefresh {
width: 100%;
overflow-y: scroll;
}
/**整单完工弹出样式**/
.mui-popup{
......
dest/css/needlecarHand/needlecarHandover.css
View file @ db4c8148
......@@ -44,8 +44,8 @@ body,
#left-2 {
position: relative;
width: 100%;
height: 482px;
margin-top: -15px;
height: 492px;
margin-top: -3px;
border: 1px solid rgb(218, 230, 239);
background: #FFF;
}
......@@ -65,10 +65,58 @@ body,
overflow-y: scroll;
}
.select{
height: 36px;
width: 100%;
clear: both;
overflow: hidden;
}
.select-left{
width: 80px;
height: 33px;
float: left;
border: 1px solid #c8c7cc;
}
.select-left select{
background-color: rgba(0,0,0,.1);
padding: 0;
padding-left:5px;
text-align: center;
height: 33px;
margin: 0;
border-radius:0 ;
}
.mui-search{
width: calc(100% - 80px);
float: right;
}
.mui-search #search {
border-radius: 0;
}
.pickerData {
width: calc(100% - 80px);
float: right;
border-radius: 3px;
text-align: center;
}
.pickerData .mui-icon {
border: 0px;
color: royalblue;
}
.pickerData .mui-icon:last-of-type {
float: right;
}
#selectdate {
border: 0;
width: calc(100% - 105px);
height: 36px;
}
.needLeftList {
padding: 5px 10px;
height: 93px;
......@@ -236,3 +284,12 @@ body,
#right-1 .mui-table-view-cell p:nth-of-type(4) {
width: 32%;
}
.mui-table-view-cell{
padding: 9px 15px;
}
.mui-table-view-cell textarea{
width: 82%;
float: left;
}
dest/js/mes/FormingV2.js
View file @ db4c8148
This diff is collapsed.
dest/js/mes/NeedleMatch.js
View file @ db4c8148
......@@ -51,6 +51,31 @@ var app = new Vue({
cur: '0',
currentObj: -1,
listType: 0, // 0 未交接 1已交接
descript: '', //异常描述
searchData: [{
id: '0',
name: '指令号'
},
{
id: '1',
name: '订单号'
},
{
id: '2',
name: '货号'
},
{
id: '3',
name: '班组'
},
{
id: '4',
name: '计划配送'
}
],
current: '', //搜索选中
dateTime: "", //日期
isData: false, //搜索的时候 是否选中了日期
},
computed: {
display_: function() {
......@@ -81,6 +106,10 @@ var app = new Vue({
},
},
created() {
//如果没有这句代码，select中初始化会是空白的，默认选中就无法实现
this.current = this.searchData[0].id;
},
methods: {
init: function() {
mui.init({
......@@ -130,7 +159,8 @@ var app = new Vue({
PageSize: params.pageSize,
PageIndex: params.pageIndex,
ReportType: params.ReportType,
State: params.State
State: params.State,
SearchType: app.current
};
//console.log("canshu:" + JSON.stringify(para));
//console.log("之前的数据:" + arr);
......@@ -163,7 +193,8 @@ var app = new Vue({
SearchText: app.searchText,
PageSize: params.pageSize,
PageIndex: params.pageIndex,
ReportType: params.ReportType
ReportType: params.ReportType,
SearchType: app.current
};
Api.post(url, para, function(e) {
......@@ -197,6 +228,17 @@ var app = new Vue({
app.searchText = '';
app.getData(0);
});
this.dateTime = moment().format().substring(0, 10);
mui('body').on('tap','.mui-dtpicker #queding' ,function(){
var para = {
ReportType: app.ReportType,
SearchText: app.dateTime,
PageSize: 20,
PageIndex: 1,
SearchType: app.current
};
app.searchDetail(para);
})
},
getData: function(n) {
var that = this;
......@@ -204,10 +246,12 @@ var app = new Vue({
ReportType: this.ReportType,
State: n,
PageSize: 20,
PageIndex: 1
PageIndex: 1,
SearchType: 0
}
// console.log(JSON.stringify(para));
that.searchText = '';
Api.post('/api/vMES/Handover/List', para, function(e) {
//console.log("TTTTTTTTTTTTTTTTTT List::" + JSON.stringify(para))
if (n == 0) {
......@@ -274,14 +318,48 @@ var app = new Vue({
var para = {
ReportType: this.ReportType,
SearchText: that.searchText,
PageSize: 10,
PageIndex: 1
PageSize: 20,
PageIndex: 1,
SearchType: this.current
};
//console.log("搜索文本：" + JSON.stringify(para));
console.log("搜索文本：" + JSON.stringify(para));
if (event.keyCode == "13") {
document.activeElement.blur(); //收起虚拟键盘
if (that.searchText == '') return;
this.searchDetail(para);
event.preventDefault(); // 阻止默认事件---阻止页面刷新
//that.searchText = '';
}
},
changeSearchType: function() {
console.log("11111111111111111111:" + this.current);
if (this.current == '4') {
this.isData = true;
var para = {
ReportType: this.ReportType,
SearchText: this.dateTime,
PageSize: 20,
PageIndex: 1,
SearchType: this.current
};console.log("eee：：" + JSON.stringify(para))
} else {
this.isData = false;
var para = {
ReportType: this.ReportType,
SearchText: this.searchText,
PageSize: 20,
PageIndex: 1,
SearchType: this.current
};console.log("vvvv：：" + JSON.stringify(para))
}
this.searchDetail(para);
},
searchDetail: function(para) {
console.log("搜索参数：：" + JSON.stringify(para));
var that = this;
if (that.completeState) {
Api.post('/api/vMES/Handover/Search', para, function(e) {
//console.log("eee：：" + JSON.stringify(e))
......@@ -322,12 +400,7 @@ var app = new Vue({
});
}
event.preventDefault(); // 阻止默认事件---阻止页面刷新
//that.searchText = '';
}
},
selectDisplay: function(n) {
this.listType = n;
var opt = document.getElementById("item1");
......@@ -350,13 +423,15 @@ var app = new Vue({
matched: function() {
var that = this;
var para = {
IndexID: this.IndexID
IndexID: this.IndexID,
ExceptionDes: this.descript
}
console.log("111111111:" + this.IndexID);
Api.post('/api/vMES/Handover/Match', para, function(e) {
if (e.success) {
mui.toast("配套成功! ");
//that.getData(0);
that.descript = '';
console.log(JSON.stringify(e.data))
playVoice("cg.mp3");
console.log("配套suoyi:" + that.cur);
......@@ -376,12 +451,14 @@ var app = new Vue({
cutConfirm: function() {
var that = this;
var para = {
IndexID: this.IndexID
IndexID: this.IndexID,
ExceptionDes: this.descript,
}
console.log("2222:" + this.IndexID);
Api.post('/api/vMES/Handover/Confirm', para, function(e) {
if (e.success) {
mui.toast("确认成功! ");
that.descript = '';
//that.getData(0);
playVoice("cg.mp3");
console.log("裁断确认索引:" + that.cur);
......@@ -402,17 +479,21 @@ var app = new Vue({
},
submit: function() {
var that = this;
var para = {
IndexID: this.IndexID,
}
console.log(JSON.stringify(para))
var html = '';
if (this.submitModel == 1) {
html = '/api/vMES/Handover/UnCheck';
var para = {
IndexID: this.IndexID,
}
} else {
html = '/api/vMES/Handover/Check'
var para = {
IndexID: this.IndexID,
ExceptionDes: this.descript
}
}
Api.post(html, para, function(e) {
......@@ -427,6 +508,7 @@ var app = new Vue({
console.log("长度111111111：" + JSON.stringify(ReceiveArr[ReceiveArr.length - 1]) + ":::" + ReceiveArr[
ReceiveArr.length - 1].IsConfirm + that.cur + ":::" + that.currentObj);
refresh(ReceiveArr);
that.descript = '';
} else {
var UnReceiveArr = that.itemsLeft2;
refresh(UnReceiveArr);
......@@ -455,7 +537,7 @@ var app = new Vue({
that.itemsDetail = leftArr[leftArr.length - 1];
that.IndexID = leftArr[leftArr.length - 1].IndexID;
}
that.selectLeft(that.itemsDetail,that.cur);
that.selectLeft(that.itemsDetail, that.cur);
}
}
playVoice("cg.mp3");
......@@ -511,7 +593,56 @@ var app = new Vue({
btn2.style.display = "none";
}
}
},
selecttime: function() {
var that = this;
var _self = document.getElementById("selectdate")
if (_self.picker) {
_self.picker.show(function(rs) {
_self.innerText = rs.text
_self.picker.dispose();
_self.picker = null;
});
} else {
var optionsJson = _self.getAttribute('data-options') || '{}';
var options = JSON.parse(optionsJson);
var id = _self.getAttribute('id');
/*
* 首次显示时实例化组件
* 示例为了简洁，将 options 放在了按钮的 dom 上
* 也可以直接通过代码声明 optinos 用于实例化 DtPicker
*/
_self.picker = new mui.DtPicker(options);
_self.picker.show(function(rs) {
_self.innerText = rs.text;
that.dateTime = rs.text;
_self.picker.dispose();
_self.picker = null;
});
}
},
nextday: function(n) {
var d = new Date(this.dateTime);
d.setTime(d.getTime() + 24 * 60 * 60 * 1000 * n);
if (d.getDate().toString().length == 1) {
this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-0" + d.getDate();
} else {
this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate();
}
var para = {
ReportType: this.ReportType,
SearchText: this.dateTime,
PageSize: 20,
PageIndex: 1,
SearchType: this.current
};
this.searchDetail(para);
},
},
})
dest/js/mes/NeedlecarHandover.js
View file @ db4c8148
......@@ -51,6 +51,32 @@ var app = new Vue({
cur: '0',
currentObj: -1,
listType: 0, // 0 未交接 1已交接
descript: '', //异常描述
descript: '', //异常描述
searchData: [{
id: '0',
name: '指令号'
},
{
id: '1',
name: '订单号'
},
{
id: '2',
name: '货号'
},
{
id: '3',
name: '班组'
},
{
id: '4',
name: '计划配送'
}
],
current: '', //搜索选中
dateTime: "", //日期
isData: false, //搜索的时候 是否选中了日期
},
computed: {
display_: function() {
......@@ -81,6 +107,10 @@ var app = new Vue({
},
},
created() {
//如果没有这句代码，select中初始化会是空白的，默认选中就无法实现
this.current = this.searchData[0].id;
},
methods: {
init: function() {
mui.init({
......@@ -130,7 +160,8 @@ var app = new Vue({
PageSize: params.pageSize,
PageIndex: params.pageIndex,
ReportType: params.ReportType,
State: params.State
State: params.State,
SearchType: app.current
};
//console.log("canshu:" + JSON.stringify(para));
//console.log("之前的数据:" + arr);
......@@ -163,7 +194,8 @@ var app = new Vue({
SearchText: app.searchText,
PageSize: params.pageSize,
PageIndex: params.pageIndex,
ReportType: params.ReportType
ReportType: params.ReportType,
SearchType: app.current
};
Api.post(url, para, function(e) {
......@@ -192,11 +224,22 @@ var app = new Vue({
indicators: true, //是否显示滚动条
});
this.getData(0);
this.dateTime = moment().format().substring(0, 10);
mui(".mui-icon-clear")[0].addEventListener('tap', function() {
document.activeElement.blur(); //收起虚拟键盘
app.searchText = '';
app.getData(0);
});
mui('body').on('tap','.mui-dtpicker #queding' ,function(){
var para = {
ReportType: app.ReportType,
SearchText: app.dateTime,
PageSize: 20,
PageIndex: 1,
SearchType: app.current
};
app.searchDetail(para);
})
},
getData: function(n) {
var that = this;
......@@ -204,7 +247,8 @@ var app = new Vue({
ReportType: this.ReportType,
State: n,
PageSize: 20,
PageIndex: 1
PageIndex: 1,
SearchType: 0
}
// console.log(JSON.stringify(para));
that.searchText = '';
......@@ -215,7 +259,7 @@ var app = new Vue({
that.itemsLeft = e.items;
that.itemsDetail = e.items[0];
that.IndexID = e.items[0].IndexID;
console.log("getData:未交接：" + JSON.stringify(that.itemsLeft));
console.log("getData:未交接：" + JSON.stringify(that.itemsDetail));
} else {
that.itemsLeft = []
that.itemsDetail = [];
......@@ -274,20 +318,56 @@ var app = new Vue({
var para = {
ReportType: this.ReportType,
SearchText: that.searchText,
PageSize: 10,
PageIndex: 1
PageSize: 20,
PageIndex: 1,
SearchType: this.current
};
//console.log("搜索文本：" + JSON.stringify(para));
console.log("搜索文本：" + JSON.stringify(para));
if (event.keyCode == "13") {
document.activeElement.blur(); //收起虚拟键盘
if (that.searchText == '') return;
this.searchDetail(para);
event.preventDefault(); // 阻止默认事件---阻止页面刷新
//that.searchText = '';
}
},
changeSearchType: function() {
console.log("11111111111111111111:" + this.current);
if (this.current == '4') {
this.isData = true;
var para = {
ReportType: this.ReportType,
SearchText: this.dateTime,
PageSize: 20,
PageIndex: 1,
SearchType: this.current
};
console.log("eee：：" + JSON.stringify(para))
} else {
this.isData = false;
var para = {
ReportType: this.ReportType,
SearchText: this.searchText,
PageSize: 20,
PageIndex: 1,
SearchType: this.current
};
console.log("vvvv：：" + JSON.stringify(para))
}
this.searchDetail(para);
},
searchDetail: function(para) {
console.log("搜索参数：：" + JSON.stringify(para));
var that = this;
if (that.completeState) {
Api.post('/api/vMES/Handover/Search', para, function(e) {
//console.log("eee：：" + JSON.stringify(e))
if (e.success) {
var data = e.items.length;
console.log("搜索未完成：：" + e.items.length)
console.log("搜索：：" + e.items.length)
if (data > 0) {
that.itemsLeft = e.items;
that.itemsDetail = e.items[0];
......@@ -322,12 +402,7 @@ var app = new Vue({
});
}
event.preventDefault(); // 阻止默认事件---阻止页面刷新
//that.searchText = '';
}
},
selectDisplay: function(n) {
this.listType = n;
var opt = document.getElementById("item1");
......@@ -350,13 +425,16 @@ var app = new Vue({
matched: function() {
var that = this;
var para = {
IndexID: this.IndexID
IndexID: this.IndexID,
ExceptionDes: this.descript
}
console.log("111111111:" + this.IndexID);
Api.post('/api/vMES/Handover/Match', para, function(e) {
console.log("111111111:" + JSON.stringify(para));
if (e.success) {
mui.toast("配套成功! ");
//that.getData(0);
that.descript = '';
console.log(JSON.stringify(e.data))
playVoice("cg.mp3");
console.log("配套suoyi:" + that.cur);
......@@ -376,14 +454,17 @@ var app = new Vue({
cutConfirm: function() {
var that = this;
var para = {
IndexID: this.IndexID
IndexID: this.IndexID,
ExceptionDes: this.descript
}
console.log("2222:" + this.IndexID);
Api.post('/api/vMES/Handover/Confirm', para, function(e) {
console.log("2222:" + JSON.stringify(para));
if (e.success) {
mui.toast("确认成功! ");
//that.getData(0);
playVoice("cg.mp3");
that.descript = '';
console.log("裁断确认索引:" + that.cur);
console.log(JSON.stringify(e.data.ConfirmDate));
that.itemsDetail.ConfirmUserName = e.data.ConfirmUserName;
......@@ -402,20 +483,25 @@ var app = new Vue({
},
submit: function() {
var that = this;
var para = {
IndexID: this.IndexID,
}
console.log(JSON.stringify(para))
var html = '';
if (this.submitModel == 1) {
html = '/api/vMES/Handover/UnCheck';
var para = {
IndexID: this.IndexID,
}
} else {
html = '/api/vMES/Handover/Check'
var para = {
IndexID: this.IndexID,
ExceptionDes: this.descript
}
}
console.log("sssssss22:" + JSON.stringify(para));
Api.post(html, para, function(e) {
console.log(JSON.stringify(para));
if (e.success) {
//that.selectLeftBack(0);
//that.IndexID = 0;
......@@ -427,8 +513,10 @@ var app = new Vue({
console.log("长度111111111：" + JSON.stringify(ReceiveArr[ReceiveArr.length - 1]) + ":::" + ReceiveArr[
ReceiveArr.length - 1].IsConfirm + that.cur + ":::" + that.currentObj);
refresh(ReceiveArr);
that.descript = '';
} else {
var UnReceiveArr = that.itemsLeft2;
refresh(UnReceiveArr);
console.log("长度22222222：" + JSON.stringify(UnReceiveArr[UnReceiveArr.length - 1]));
......@@ -455,7 +543,7 @@ var app = new Vue({
that.itemsDetail = leftArr[leftArr.length - 1];
that.IndexID = leftArr[leftArr.length - 1].IndexID;
}
that.selectLeft(that.itemsDetail,that.cur);
that.selectLeft(that.itemsDetail, that.cur);
}
}
playVoice("cg.mp3");
......@@ -511,7 +599,63 @@ var app = new Vue({
btn2.style.display = "none";
}
}
},
selecttime: function() {
var that = this;
var _self = document.getElementById("selectdate");
var oldData = this.dateTime;
var newData;
if (_self.picker) {
_self.picker.show(function(rs) {
_self.innerText = rs.text;
_self.picker.dispose();
_self.picker = null;
newData = rs.text;
});
} else {
var optionsJson = _self.getAttribute('data-options') || '{}';
var options = JSON.parse(optionsJson);
var id = _self.getAttribute('id');
/*
* 首次显示时实例化组件
* 示例为了简洁，将 options 放在了按钮的 dom 上
* 也可以直接通过代码声明 optinos 用于实例化 DtPicker
*/
_self.picker = new mui.DtPicker(options);
_self.picker.show(function(rs) {
_self.innerText = rs.text;
that.dateTime = rs.text;
_self.picker.dispose();
_self.picker = null;
newData = rs.text;
});
}
console.log("之前日期："+oldData +"之后日期："+newData);
},
nextday: function(n) {
var d = new Date(this.dateTime);
d.setTime(d.getTime() + 24 * 60 * 60 * 1000 * n);
if (d.getDate().toString().length == 1) {
this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-0" + d.getDate();
} else {
this.dateTime = d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate();
}
var para = {
ReportType: this.ReportType,
SearchText: this.dateTime,
PageSize: 20,
PageIndex: 1,
SearchType: this.current
};
this.searchDetail(para);
},
},
})
dest/js/mes/NeedlecarreportV2.js
View file @ db4c8148
......@@ -69,6 +69,24 @@ var app = new Vue({
return false;
}),
appdis: 0,
searchData: [{
id: '0',
name: '指令号'
},
{
id: '1',
name: '订单号'
},
{
id: '2',
name: '货号'
},
{
id: '3',
name: '班组'
}
],
current: '', //搜索选中
},
computed: {
......@@ -92,14 +110,10 @@ var app = new Vue({
}
},
},
// mounted:function(){
// this.$nextTick(function(){
// mui('#progress .mui-text-center').each(function() {
// console.log(this.getAttribute("data-progress"));
// mui(this).progressbar({progress:this.getAttribute("data-progress")}).show()
// })
// })
// },
created() {
//如果没有这句代码，select中初始化会是空白的，默认选中就无法实现
this.current = this.searchData[0].id;
},
methods: {
init: function() { //初始化
mui.init({
......@@ -112,8 +126,8 @@ var app = new Vue({
callback: function() {
var reUnfinished = document.getElementById("theOne").getAttribute("state");
var reFinished = document.getElementById("theTow").getAttribute("state");
var UnfinishedUrl = '/api/vMES/ProductionReportV2/ToDo';
var FinishedUrl = '/api/vMES/ProductionReportV2/Done';
// var UnfinishedUrl = '/api/vMES/ProductionReportV2/ToDo';
// var FinishedUrl = '/api/vMES/ProductionReportV2/Done';
var searchUrl = '/api/vMES/ProductionReportV2/Search';
var searchDoneUrl = '/api/vMES/ProductionReportV2/SearchDone';
//console.log("未完成" + reUnfinished)
......@@ -124,88 +138,21 @@ var app = new Vue({
if (app.searchText != "") {
searchPull(searchUrl, UnfinishedData, app.paramUnDoSeach);
} else {
pullupRefresh(UnfinishedUrl, UnfinishedData, app.paramUnDo);
pullupRefresh(searchUrl, UnfinishedData, app.paramUnDo);
}
} else if (reFinished) { //已完成
if (app.searchText != "") {
searchPull(searchDoneUrl, FinishedUrlData, app.paramDoneSeach);
} else {
pullupRefresh(FinishedUrl, FinishedUrlData, app.paramDone);
pullupRefresh(searchDoneUrl, FinishedUrlData, app.paramDone);
}
}
}
},
}
});
function pullupRefresh(url, arr, params) {
//console.log("加载前1" + arr);
setTimeout(function() {
var para = {
PageSize: params.pageSize,
PageIndex: params.pageIndex,
ReportType: params.ReportType,
};
//console.log("canshu:" + JSON.stringify(para));
//console.log("之前的数据:" + arr);
Api.post(url, para, function(e) { //2.没数据 提示 但是可以一直发请求只不过传回来是空
if (e.success) {
//console.log("111:" + JSON.stringify(e.items));
var data = e.items;
if (e.items.length > 0) {
params.pageIndex++;
}
for (var i = 0; i < data.length; i++) {
arr.push(data[i]);
console.log("changdu2222222:" + arr.length);
}
}
}, function(b, bb, bbb) {
mui.toast(JSON.stringify(bbb.message))
});
mui('#pullrefresh').pullRefresh().endPullupToRefresh(); //参数为true代表没有更多数据了。
mui('#pullrefresh').pullRefresh().refresh(true);
//mui('#pullrefresh').pullRefresh().disablePullupToRefresh();
}, 1000);
}
function searchPull(url, arr, params) {
setTimeout(function() {
var para = {
searchText: app.searchText,
PageSize: params.pageSize,
PageIndex: params.pageIndex,
ReportType: params.ReportType,
};
Api.post(url, para, function(e) {
if (e.success) {
//console.log("111:" + JSON.stringify(e.items));
var data = e.items;
if (e.items.length > 0) {
params.pageIndex++;
}
for (var i = 0; i < data.length; i++) {
arr.push(data[i]);
}
//console.log("canshuqq:" + JSON.stringify(para));
}
}, function(b, bb, bbb) {
mui.toast(JSON.stringify(bbb.message))
});
mui('#pullrefresh').pullRefresh().endPullupToRefresh();
mui('#pullrefresh').pullRefresh().refresh(true);
}, 1000);
}
window.addEventListener('back', function(e) {
var that = this;
// app.getData();
......@@ -238,11 +185,13 @@ var app = new Vue({
var para = {
ReportType: that.ReportType,
PageSize: that.datalen,
PageIndex: that.unPagenum
PageIndex: that.unPagenum,
SearchType:'0',
SearchText:'',
};
//console.log("lalla" + JSON.stringify(para));
that.cur = 0;
Api.post('/api/vMES/ProductionReportV2/ToDo', para, function(e) {
Api.post('/api/vMES/ProductionReportV2/Search', para, function(e) {
console.log("one :::;" + JSON.stringify(e.items.length))
console.log("getData：" + JSON.stringify(e.items[0]))
//console.log("点击之前"+JSON.stringify(that.rightInfor))
......@@ -320,11 +269,13 @@ var app = new Vue({
var para = {
PageSize: that.datalen,
PageIndex: that.unPagenum,
ReportType: that.ReportType
ReportType: that.ReportType,
SearchType:'0',
SearchText:'',
};
that.searchText = '';
that.disable_reportDelete = "disabled";
Api.post('/api/vMES/ProductionReportV2/ToDo', para, function(e) {
Api.post('/api/vMES/ProductionReportV2/Search', para, function(e) {
that.cur = 0;
if (e.items.length > 0) {
that.itemsHead = e.items;
......@@ -346,12 +297,14 @@ var app = new Vue({
var para = {
PageSize: that.datalen,
PageIndex: that.pagenum,
ReportType: that.ReportType
ReportType: that.ReportType,
SearchType:'0',
SearchText:'',
};
//console.log("do para " + JSON.stringify(para))
that.disable_reportDelete = null;
that.searchText = '';
Api.post('/api/vMES/ProductionReportV2/Done', para, function(e) {
Api.post('/api/vMES/ProductionReportV2/SearchDone', para, function(e) {
console.log("已完成" + JSON.stringify(para))
var data = e.items.length;
if (data > 0) {
......@@ -380,12 +333,33 @@ var app = new Vue({
SearchText: that.searchText,
PageSize: 20,
PageIndex: that.pagenum,
ReportType: that.ReportType
ReportType: that.ReportType,
SearchType:that.current,
};
if (event.keyCode == "13") {
document.activeElement.blur(); //收起虚拟键盘
if (that.searchText == '') return;
console.log(this.completeState);
console.log(this.completeState + JSON.stringify(para));
this.searchDetail(para);
event.preventDefault(); // 阻止默认事件---阻止页面刷新
//that.searchText = '';
}
},
changeSearchType:function(){
var that = this;
var para = {
SearchText: that.searchText,
PageSize: 20,
PageIndex: that.pagenum,
ReportType: that.ReportType,
SearchType:that.current,
};
this.searchDetail(para);
},
searchDetail:function(para){
var that = this;
if (this.completeState) { //true 是未完成的搜索 false是已完成的搜索
Api.post('/api/vMES/ProductionReportV2/Search', para, function(e) {
console.log("现在是未完成的搜索！");
......@@ -424,9 +398,6 @@ var app = new Vue({
mui.toast(JSON.stringify(res.message))
});
}
event.preventDefault(); // 阻止默认事件---阻止页面刷新
//that.searchText = '';
}
},
getTatolNum: function() { //今日产量
var that = this;
......
dest/js/mes/cutting.js
View file @ db4c8148
This diff is collapsed.
html/Cutting.html
View file @ db4c8148
......@@ -20,16 +20,48 @@
<label>今日产量:{{number}} </label>
</div>
<div id="left-2" class="left-2">
<div class="select">
<div class="mui-input-row mui-search">
<input id="search" class="mui-input-clear search" placeholder="搜索:指令号,货号,订单号" v-model="searchText" type="search"
<input id="search" class="mui-input-clear search" placeholder="搜索"v-model="searchText" type="search"
pattern="\d*" @keyup.enter="goSearch($event)" @focus.prevent="changePosition()"
@blur.prevent="changePosition1()">
</div>
<div class="select-left">
<select v-model="current" @change="changeSearchType" >
<option :value="item.id" v-for="item in searchData">{{item.name}}</option>
</select>
</div>
</div>
<!-- <div class="mui-input-row mui-search">
<input id="search" class="mui-input-clear search" placeholder="搜索:指令号,货号,订单号" v-model="searchText" type="search"
pattern="\d*" @keyup.enter="goSearch($event)" @focus.prevent="changePosition()"
@blur.prevent="changePosition1()">
</div> -->
<div class="Text">
<div class="left" id="pullrefresh" class="mui-content mui-scroll-wrapper">
<div id="pullrefresh" class="mui-content">
<div class="mui-scroll">
<div id="theOne" :state="completeState" v-show="completeState">
<div class="mui-table-view mui-table-view-chevron">
<!-- <ul class="complet-detail" style="background: red;">
<li>
<p><span>指令号：</span><span>吧吧吧吧吧吧吧v</span></p>
<p><span>订单号：</span><span>橱窗橱窗错错错错错错错</span></p>
</li>
<li>
<p><span>货号：</span><span class="blueColor">反反复复付付付付付</span></p>
<p><span>数量：</span><span class="redColor">男男女女</span></p>
</li>
<li>
<p><span>计划时间：</span><span>版本版本不不</span></p>
<p><span>小组：</span><span>5555</span></p>
</li>
<li>
<p><span>预计交期：</span><span>66666</span></p>
<p><span>计划人：</span><span>77777777</span></p>
</li>
</ul> -->
<ul class="complet-detail" :class="{active:cur==index}" v-for="(list,index) in itemsHead" :key="list.IndexID"
@click="getDetailInfor(list.IndexID,index)">
<li>
......@@ -192,6 +224,7 @@
<script src="../dest/js/vue.min.js"> </script>
<script src="../dest/js/moment.js"></script>
<script src="../js/mui.pullToRefresh.js"></script>
<script src="../dest/js/mes/pullupRefresh.js"></script>
<script src="../dest/js/mes/playVoice.js"></script>
<script src="../dest/js/mes/cutting.js"></script>
......
html/FormingHandover.html
View file @ db4c8148
......@@ -16,11 +16,8 @@
</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">
......
html/FormingV2.html
View file @ db4c8148
......@@ -20,11 +20,23 @@
<label>今日产量:{{number}} </label>
</div>
<div id="left-2" class="left-2">
<div class="select">
<div class="mui-input-row mui-search">
<input id="search" class="mui-input-clear search" placeholder="搜索:指令号,货号,订单号" v-model="searchText" type="search"
<input id="search" class="mui-input-clear search" placeholder="搜索"v-model="searchText" type="search"
pattern="\d*" @keyup.enter="goSearch($event)" @focus.prevent="changePosition()"
@blur.prevent="changePosition1()">
</div>
<div class="select-left">
<select v-model="current" @change="changeSearchType">
<option :value="item.id" v-for="item in searchData">{{item.name}}</option>
</select>
</div>
</div>
<!-- <div class="mui-input-row mui-search">
<input id="search" class="mui-input-clear search" placeholder="搜索:指令号,货号,订单号" v-model="searchText" type="search"
pattern="\d*" @keyup.enter="goSearch($event)" @focus.prevent="changePosition()"
@blur.prevent="changePosition1()">
</div> -->
<div class="Text">
<div class="left" id="pullrefresh" class="mui-content mui-scroll-wrapper">
<div class="mui-scroll">
......@@ -192,6 +204,7 @@
<script src="../dest/js/vue.min.js"> </script>
<script src="../dest/js/moment.js"></script>
<script src="../js/mui.pullToRefresh.js"></script>
<script src="../dest/js/mes/pullupRefresh.js"></script>
<script src="../dest/js/mes/playVoice.js"></script>
<script src="../dest/js/mes/FormingV2.js"></script>
......
html/NeedleMatch.html
View file @ db4c8148
......@@ -7,6 +7,7 @@
<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" />
<link href="../dest/css/needlecarHand/needlecarHandover.css" rel="stylesheet" />
<link href="../dest/css/mui.picker.min.css" rel="stylesheet" />
</head>
<body>
......@@ -16,10 +17,22 @@
<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 class="mui-input-row mui-search">
<input id="search" class="mui-input-clear search" placeholder="搜索:指令号,货号,订单号" v-model="searchText" type="search"
pattern="\d*" @keyup.enter="goSearch($event)" @focus.prevent="changePosition()"
@blur.prevent="changePosition1()">
<div class="select">
<div class="mui-input-row mui-search" v-show="!isData">
<input id="search" class="mui-input-clear search" placeholder="搜索" v-model="searchText" type="search" pattern="\d*"
@keyup.enter="goSearch($event)" @focus.prevent="changePosition()" @blur.prevent="changePosition1()">
</div>
<div id="1" class="pickerData" v-show="isData">
<button class="mui-icon mui-icon-arrowleft mui-btn-outlined ;" @click="nextday(-1)"></button>
<button class="mui-btn-outlined" id="selectdate" data-options='{"type":"date"}' name="shipdate" @click="selecttime()">{{dateTime}}</button>
<button class="mui-icon mui-icon-arrowright mui-btn-outlined " @click="nextday(1)"></button>
</div>
<div class="select-left">
<select v-model="current" @change="changeSearchType">
<option :value="item.id" v-for="item in searchData">{{item.name}}</option>
</select>
</div>
</div>
<div id="left-2">
<div id="pullrefresh">
......@@ -45,8 +58,8 @@
<p><span>实报时间：</span><span>{{items.ReportDate}}</span></p>
<p><span>计划配送：</span><span>{{items.PlanDistribution}}</span></p>
</li>
<a class="meached" v-show = "items.IsMatch"> <img src="../dest/img/application/meached.png" /></a>
<a class="confirm" v-show = "items.IsConfirm"> <img src="../dest/img/application/haveSure.png" /></a>
<a class="meached" v-show="items.IsMatch"> <img src="../dest/img/application/meached.png" /></a>
<a class="confirm" v-show="items.IsConfirm"> <img src="../dest/img/application/haveSure.png" /></a>
</ul>
......@@ -73,7 +86,7 @@
<p><span>实报时间：</span><span>{{items.ReportDate}}</span></p>
<p><span>计划配送：</span><span>{{items.PlanDistribution}}</span></p>
</li>
<a class="meached" v-show = "items.IsMatch"> <img src="../dest/img/application/haveHandover.png" /></a>
<a class="meached" v-show="items.IsMatch"> <img src="../dest/img/application/haveHandover.png" /></a>
</ul>
</div>
</div>
......@@ -90,7 +103,7 @@
<div id="right-1">
<ul class="mui-table-view">
<li class="mui-table-view-cell">
<p > 指令号: </p>
<p> 指令号: </p>
<p style="float: left;width: 40%; color: #060606;white-space:nowrap;text-overflow: ellipsis;overflow: hidden;">&nbsp;{{itemsDetail.IndexNo}}
</p>
</li>
......@@ -145,13 +158,17 @@
<p>交接时间: </p>
<p>{{itemsDetail.CheckDate}} </p>
</li>
<li class="mui-table-view-cell">
<p> 异常说明: </p>
<textarea @focus.prevent="changePosition()" @blur.prevent="changePosition1()" v-model="descript" :disabled="!completeState"
:placeholder="itemsDetail.ExceptionDes"></textarea>
</li>
</ul>
</div>
</div>
<div id="right-2">
<button type="button" class="mui-btn mui-btn-blue " :disabled="btnConfirm" @click="cutConfirm" >面部确认</button>
<button type="button" class="mui-btn mui-btn-blue " :disabled="btnMatch" @click="matched" >成型配套确认</button>
<button type="button" class="mui-btn mui-btn-blue " :disabled="btnConfirm" @click="cutConfirm">面部确认</button>
<button type="button" class="mui-btn mui-btn-blue " :disabled="btnMatch" @click="matched">成型配套确认</button>
<button type="button" class="mui-btn mui-btn-blue " :disabled="btnCheck" @click="submit">{{submitText}}</button>
</div>
</div>
......@@ -159,7 +176,10 @@
<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 src="../dest/js/moment.js"></script>
<script src="../dest/js/mes/mui.picker.js"></script>
<script src="../dest/js/mes/playVoice.js"></script>
<script src="../dest/js/mes/NeedleMatch.js"></script>
</body>
......
html/NeedlecarHandover.html
View file @ db4c8148
......@@ -7,8 +7,9 @@
<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" />
<link href="../dest/css/needlecarHand/needlecarHandover.css" rel="stylesheet" />
</head>
<link href="../dest/css/mui.picker.min.css" rel="stylesheet" />
</head>
<body>
<div id="app" v-cloak>
<div class="need-left">
......@@ -16,10 +17,21 @@
<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 class="mui-input-row mui-search">
<input id="search" class="mui-input-clear search" placeholder="搜索:指令号,货号,订单号" v-model="searchText" type="search"
pattern="\d*" @keyup.enter="goSearch($event)" @focus.prevent="changePosition()"
@blur.prevent="changePosition1()">
<div class="select">
<div class="mui-input-row mui-search" v-show="!isData">
<input id="search" class="mui-input-clear search" placeholder="搜索" v-model="searchText" type="search" pattern="\d*"
@keyup.enter="goSearch($event)" @focus.prevent="changePosition()" @blur.prevent="changePosition1()">
</div>
<div id="1" class="pickerData" v-show="isData">
<button class="mui-icon mui-icon-arrowleft mui-btn-outlined ;" @click="nextday(-1)"></button>
<button class="mui-btn-outlined" id="selectdate" data-options='{"type":"date"}' name="shipdate" @click="selecttime()">{{dateTime}}</button>
<button class="mui-icon mui-icon-arrowright mui-btn-outlined " @click="nextday(1)"></button>
</div>
<div class="select-left">
<select v-model="current" @change="changeSearchType">
<option :value="item.id" v-for="item in searchData">{{item.name}}</option>
</select>
</div>
</div>
<div id="left-2">
<div id="pullrefresh">
......@@ -45,8 +57,8 @@
<p><span>实报时间：</span><span>{{items.ReportDate}}</span></p>
<p><span>计划配送：</span><span>{{items.PlanDistribution}}</span></p>
</li>
<a class="meached" v-show = "items.IsMatch"> <img src="../dest/img/application/meached.png" /></a>
<a class="confirm" v-show = "items.IsConfirm"> <img src="../dest/img/application/haveSure.png" /></a>
<a class="meached" v-show="items.IsMatch"> <img src="../dest/img/application/meached.png" /></a>
<a class="confirm" v-show="items.IsConfirm"> <img src="../dest/img/application/haveSure.png" /></a>
</ul>
</div>
......@@ -72,7 +84,7 @@
<p><span>实报时间：</span><span>{{items.ReportDate}}</span></p>
<p><span>计划配送：</span><span>{{items.PlanDistribution}}</span></p>
</li>
<a class="meached" v-show = "items.IsMatch"> <img src="../dest/img/application/haveHandover.png" /></a>
<a class="meached" v-show="items.IsMatch"> <img src="../dest/img/application/haveHandover.png" /></a>
</ul>
</div>
</div>
......@@ -89,7 +101,7 @@
<div id="right-1">
<ul class="mui-table-view">
<li class="mui-table-view-cell">
<p > 指令号: </p>
<p> 指令号: </p>
<p style="float: left;width: 40%; color: #060606;white-space:nowrap;text-overflow: ellipsis;overflow: hidden;">&nbsp;{{itemsDetail.IndexNo}}
</p>
</li>
......@@ -143,13 +155,17 @@
<p>交接时间: </p>
<p>{{itemsDetail.CheckDate}} </p>
</li>
<li class="mui-table-view-cell">
<p> 异常说明: </p>
<textarea @focus.prevent="changePosition()" @blur.prevent="changePosition1()" v-model="descript" :disabled="!completeState"
:placeholder="itemsDetail.ExceptionDes"></textarea>
</li>
</ul>
</div>
</div>
<div id="right-2">
<button type="button" class="mui-btn mui-btn-blue " :disabled="btnConfirm" @click="cutConfirm" >裁断确认</button>
<button type="button" class="mui-btn mui-btn-blue " :disabled="btnMatch" @click="matched" >针车配套</button>
<button type="button" class="mui-btn mui-btn-blue " :disabled="btnConfirm" @click="cutConfirm">裁断确认</button>
<button type="button" class="mui-btn mui-btn-blue " :disabled="btnMatch" @click="matched">针车配套</button>
<button type="button" class="mui-btn mui-btn-blue " :disabled="btnCheck" @click="submit">{{submitText}}</button>
</div>
......@@ -160,6 +176,8 @@
<script src="../dest/js/vue.min.js"></script>
<script src="../dest/js/public.min.js"></script>
<script src="../dest/js/mes/playVoice.js"></script>
<script src="../dest/js/moment.js"></script>
<script src="../dest/js/mes/mui.picker.js"></script>
<script src="../dest/js/mes/NeedlecarHandover.js"></script>
......
html/NeedlecarreportV2.html
View file @ db4c8148
......@@ -21,9 +21,21 @@
<label>今日产量:{{number}} </label>
</div>
<div id="left-2" class="left-2">
<div class="mui-input-row mui-search">
<!-- <div class="mui-input-row mui-search">
<input id="search" class="mui-input-clear search" placeholder="搜索:指令号,货号,订单号" v-model="searchText" type="search"
pattern="\d*" @keyup.enter="goSearch($event)" @focus.prevent="changePosition()" @blur.prevent="changePosition1()">
</div> -->
<div class="select">
<div class="mui-input-row mui-search">
<input id="search" class="mui-input-clear search" placeholder="搜索"v-model="searchText" type="search"
pattern="\d*" @keyup.enter="goSearch($event)" @focus.prevent="changePosition()"
@blur.prevent="changePosition1()">
</div>
<div class="select-left">
<select v-model="current" @change="changeSearchType">
<option :value="item.id" v-for="item in searchData">{{item.name}}</option>
</select>
</div>
</div>
<div class="Text">
<div class="left" id="pullrefresh" class="mui-content mui-scroll-wrapper">
......@@ -192,6 +204,7 @@
<script src="../dest/js/vue.min.js"> </script>
<script src="../dest/js/moment.js"></script>
<script src="../js/mui.pullToRefresh.js"></script>
<script src="../dest/js/mes/pullupRefresh.js"></script>
<script src="../dest/js/mes/playVoice.js"></script>
<script src="../dest/js/mes/NeedlecarreportV2.js"></script>
......
html/work.html
View file @ db4c8148
......@@ -31,7 +31,7 @@
}
.application-tit {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-weight: 400;
......@@ -44,7 +44,7 @@
border-radius: 8px;
}
.application-box {
display: none;
display: block;
}
</style>
</head>
......
index.html
View file @ db4c8148
......@@ -20,7 +20,6 @@
font-size: 30px;
margin:3px 0 -5px;
}
.mui-bar-tab .mui-tab-item .icon~.mui-tab-label {
font-size: 12px;
display: block;
......
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