Skip to content

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

youhua

parent 04b66a86
Show whitespace changes
Inline Side-by-side
Showing with 154 additions and 131 deletions
dest/js/mes/NeedleDispatch.js
View file @ 6f87e2a8
...@@ -86,60 +86,58 @@ var app = new Vue({ ...@@ -86,60 +86,58 @@ var app = new Vue({
PersonList: [], PersonList: [],
all: false, //全选 all: false, //全选
WorkTeamID: 0, //班组 WorkTeamID: 0, //班组
//isAward: 0, //是否发包 SureisAward: 0, //是否发包
Workers: [], Workers: [],
ReportType:1, ReportType: 1,
isData: false, //是否显示搜索 isData: false, //是否显示搜索
dateTime2: 0, dateTime2: 0,
workTimeData:[], workTimeData: [],
currentWorkTime:'',//班组 currentWorkTime: '', //班组
isWorkTeam:false, isWorkTeam: false,
}, },
computed: { computed: {
isAward: function() { isAward: function() {
if(MenuAction.checkAction('90037','Update')){ if (MenuAction.checkAction('90037', 'Update')) {
if (this.itemsData2.length != 0) { if (!this.SureisAward) {
return "disabled" return "disabled"
}else{ } else {
return null return null
} }
}else{ } else {
if (this.itemsData2.length != 0) {
return "disabled" return "disabled"
}
} }
}, },
isAward1: function() { isAward1: function() {
if(MenuAction.checkAction('90037','Delete')){ if (MenuAction.checkAction('90037', 'Delete')) {
if (this.itemsData2.length == 0) { if (this.SureisAward) {
return "disabled" return "disabled"
}else{ } else {
return null return null
} }
}else{ } else {
if (this.itemsData2.length != 0) {
return "disabled" return "disabled"
}
} }
}, },
selectPL: function() { selectPL: function() {
if(MenuAction.checkAction('90037','Update')){ if (MenuAction.checkAction('90037', 'Update')) {
if (this.selectList.length > 1) { if (this.selectList.length > 1) {
return null return null
} else { } else {
return "disabled" return "disabled"
} }
}else{ } else {
return "disabled" return "disabled"
} }
}, },
saveChange: function() { saveChange: function() {
if(MenuAction.checkAction('90037','Update')){ if (MenuAction.checkAction('90037', 'Update')) {
return null return null
}else{ } else {
return "disabled" return "disabled"
} }
...@@ -148,39 +146,40 @@ var app = new Vue({ ...@@ -148,39 +146,40 @@ var app = new Vue({
}, },
created: function() { created: function() {
//如果没有这句代码，select中初始化会是空白的，默认选中就无法实现 //如果没有这句代码，select中初始化会是空白的，默认选中就无法实现
this.current =(JSON.parse(localStorage.getItem('NeedDispatchSelect'))== null||'' ) ? this.searchData[0].id : JSON.parse(localStorage.getItem('NeedDispatchSelect')); this.current = (JSON.parse(localStorage.getItem('NeedDispatchSelect')) == null || '') ? this.searchData[0].id :
JSON.parse(localStorage.getItem('NeedDispatchSelect'));
this.dateTime = moment().format("YYYY-MM"); this.dateTime = moment().format("YYYY-MM");
this.dateTime1 = moment().format("YYYY-MM-DD"); this.dateTime1 = moment().format("YYYY-MM-DD");
this.dateTime2 = moment().format("YYYY-MM-DD"); this.dateTime2 = moment().format("YYYY-MM-DD");
if(this.current=='3'||this.current=='4'){ if (this.current == '3' || this.current == '4') {
this.isData = true; this.isData = true;
this.isWorkTeam = false; this.isWorkTeam = false;
}else if(this.current=='5'){ } else if (this.current == '5') {
this.isWorkTeam = true; this.isWorkTeam = true;
this.isData = false; this.isData = false;
}else{ } else {
this.isWorkTeam = false; this.isWorkTeam = false;
this.isData = false; this.isData = false;
} }
this.getWorkTime(); this.getWorkTime();
}, },
mounted: function() { mounted: function() {
if (localStorage.getItem('data')) { if (localStorage.getItem('ZCdata')) {
console.log(localStorage.getItem('data')); console.log(localStorage.getItem('ZCdata'));
this.showStyleName = JSON.parse(localStorage.getItem('data')).showIndexNo; this.showStyleName = JSON.parse(localStorage.getItem('ZCdata')).showStyleName;
this.showIndexNo = JSON.parse(localStorage.getItem('data')).showIndexNo; this.showIndexNo = JSON.parse(localStorage.getItem('ZCdata')).showIndexNo;
this.showCustomPO = JSON.parse(localStorage.getItem('data')).showCustomPO; this.showCustomPO = JSON.parse(localStorage.getItem('ZCdata')).showCustomPO;
this.showStyleCode = JSON.parse(localStorage.getItem('data')).showStyleCode; this.showStyleCode = JSON.parse(localStorage.getItem('ZCdata')).showStyleCode;
this.showColor = JSON.parse(localStorage.getItem('data')).showColor; this.showColor = JSON.parse(localStorage.getItem('ZCdata')).showColor;
this.showTotalCount = JSON.parse(localStorage.getItem('data')).showTotalCount; this.showTotalCount = JSON.parse(localStorage.getItem('ZCdata')).showTotalCount;
this.showPrice = JSON.parse(localStorage.getItem('data')).showPrice; this.showPrice = JSON.parse(localStorage.getItem('ZCdata')).showPrice;
this.showTotalMoney = JSON.parse(localStorage.getItem('data')).showTotalMoney; this.showTotalMoney = JSON.parse(localStorage.getItem('ZCdata')).showTotalMoney;
this.showMatchDate = JSON.parse(localStorage.getItem('data')).showMatchDate; this.showMatchDate = JSON.parse(localStorage.getItem('ZCdata')).showMatchDate;
this.showConfirmDate = JSON.parse(localStorage.getItem('data')).showConfirmDate; this.showConfirmDate = JSON.parse(localStorage.getItem('ZCdata')).showConfirmDate;
this.showZCPlanBeginDate = JSON.parse(localStorage.getItem('data')).showZCPlanBeginDate; this.showZCPlanBeginDate = JSON.parse(localStorage.getItem('ZCdata')).showZCPlanBeginDate;
this.showZCPlanDeliveryDate = JSON.parse(localStorage.getItem('data')).showZCPlanDeliveryDate; this.showZCPlanDeliveryDate = JSON.parse(localStorage.getItem('ZCdata')).showZCPlanDeliveryDate;
this.showPlanDate = JSON.parse(localStorage.getItem('data')).showPlanDate; this.showPlanDate = JSON.parse(localStorage.getItem('ZCdata')).showPlanDate;
this.showFinishDate = JSON.parse(localStorage.getItem('data')).showFinishDate; this.showFinishDate = JSON.parse(localStorage.getItem('ZCdata')).showFinishDate;
} }
}, },
...@@ -196,9 +195,9 @@ var app = new Vue({ ...@@ -196,9 +195,9 @@ var app = new Vue({
callback: function() { callback: function() {
var Url = '/api/vMES/ZCProductionPlan/List'; var Url = '/api/vMES/ZCProductionPlan/List';
var dataList = app.itemsList; var dataList = app.itemsList;
if(app.current == '4'||app.current == '3'||app.current == '5'){ if (app.current == '4' || app.current == '3' || app.current == '5') {
searchPull(Url, dataList, app.paramSearch); searchPull(Url, dataList, app.paramSearch);
}else{ } else {
if (app.searchText != "") { if (app.searchText != "") {
searchPull(Url, dataList, app.paramSearch); searchPull(Url, dataList, app.paramSearch);
} else { } else {
...@@ -254,12 +253,12 @@ var app = new Vue({ ...@@ -254,12 +253,12 @@ var app = new Vue({
indicators: true, //是否显示滚动条,默认是true indicators: true, //是否显示滚动条,默认是true
}); });
}, 1000); }, 1000);
app.changefontsize();
} }
function searchPull(url, arr, params) { function searchPull(url, arr, params) {
setTimeout(function() { setTimeout(function() {
if(app.current == '4'||app.current == '3'){ if (app.current == '4' || app.current == '3') {
var para = { var para = {
searchText: app.dateTime2, searchText: app.dateTime2,
PageSize: params.pageSize, PageSize: params.pageSize,
...@@ -267,7 +266,7 @@ var app = new Vue({ ...@@ -267,7 +266,7 @@ var app = new Vue({
Date: app.dateTime, Date: app.dateTime,
SearchType: app.current, SearchType: app.current,
}; };
}else if(app.current == '5'){ } else if (app.current == '5') {
var para = { var para = {
searchText: app.currentWorkTime, searchText: app.currentWorkTime,
PageSize: params.pageSize, PageSize: params.pageSize,
...@@ -275,7 +274,7 @@ var app = new Vue({ ...@@ -275,7 +274,7 @@ var app = new Vue({
Date: app.dateTime, Date: app.dateTime,
SearchType: app.current, SearchType: app.current,
}; };
}else{ } else {
var para = { var para = {
searchText: app.searchText, searchText: app.searchText,
PageSize: params.pageSize, PageSize: params.pageSize,
...@@ -312,18 +311,18 @@ var app = new Vue({ ...@@ -312,18 +311,18 @@ var app = new Vue({
mui('#pullrefresh').pullRefresh().endPullupToRefresh(); mui('#pullrefresh').pullRefresh().endPullupToRefresh();
mui('#pullrefresh').pullRefresh().refresh(true); mui('#pullrefresh').pullRefresh().refresh(true);
}, 1000); }, 1000);
app.changefontsize();
} }
mui('.mui-scroll-wrapper').scroll({ mui('.mui-scroll-wrapper').scroll({
bounce: false, bounce: false,
indicators: true, //是否显示滚动条 indicators: true, //是否显示滚动条
}); });
this.getData();
this.dateTime = moment().format("YYYY-MM"); this.dateTime = moment().format("YYYY-MM");
this.dateTime1 = moment().format("YYYY-MM-DD"); this.dateTime1 = moment().format("YYYY-MM-DD");
this.dateTime2 = moment().format("YYYY-MM-DD"); this.dateTime2 = moment().format("YYYY-MM-DD");
console.log("shijian" + this.dateTime2); console.log("shijian" + this.dateTime2);
mui("mui-search").on('tap', '.mui-icon-clear', function() { mui(".mui-icon-clear")[0].addEventListener('tap', function() {
document.activeElement.blur(); //收起虚拟键盘 document.activeElement.blur(); //收起虚拟键盘
app.searchText = ''; app.searchText = '';
app.getData(0); app.getData(0);
...@@ -331,7 +330,8 @@ var app = new Vue({ ...@@ -331,7 +330,8 @@ var app = new Vue({
document.getElementsByClassName('mui-inner-wrap')[0].addEventListener('drag', function(event) { document.getElementsByClassName('mui-inner-wrap')[0].addEventListener('drag', function(event) {
event.stopPropagation(); event.stopPropagation();
}); });
if(app.current == '4'||app.current == '3'){ this.getData();
if (app.current == '4' || app.current == '3') {
var para = { var para = {
SearchText: this.dateTime2, SearchText: this.dateTime2,
PageSize: 20, PageSize: 20,
...@@ -340,7 +340,7 @@ var app = new Vue({ ...@@ -340,7 +340,7 @@ var app = new Vue({
Date: this.dateTime, Date: this.dateTime,
}; };
this.searchDetail(para); this.searchDetail(para);
}else if(app.current == '5'){ } else if (app.current == '5') {
var para = { var para = {
SearchText: this.currentWorkTime, SearchText: this.currentWorkTime,
PageSize: 20, PageSize: 20,
...@@ -348,9 +348,9 @@ var app = new Vue({ ...@@ -348,9 +348,9 @@ var app = new Vue({
SearchType: this.current, SearchType: this.current,
Date: this.dateTime, Date: this.dateTime,
}; };
console.log("vvvvvvvvvvvvvvv:"+JSON.stringify(para)) console.log("vvvvvvvvvvvvvvv:" + JSON.stringify(para))
this.searchDetail(para); this.searchDetail(para);
}else{ } else {
this.getData(); this.getData();
} }
}, },
...@@ -373,10 +373,10 @@ var app = new Vue({ ...@@ -373,10 +373,10 @@ var app = new Vue({
that.Summary = e.data.Summary; that.Summary = e.data.Summary;
that.itemsList = e.data.items; that.itemsList = e.data.items;
that.tittle = e.data.Title; that.tittle = e.data.Title;
//console.log(JSON.stringify(e.data.Title)); //console.log(JSON.stringify(e.data));
that.changecolor(); that.changecolor();
that.changefontsize();
} }
}, function(xhr, type, res) { }, function(xhr, type, res) {
mui.toast(JSON.stringify(res.message)) mui.toast(JSON.stringify(res.message))
...@@ -393,16 +393,35 @@ var app = new Vue({ ...@@ -393,16 +393,35 @@ var app = new Vue({
} }
} }
} }
},
changefontsize: function() {
var len = document.getElementsByClassName("changeFontSize");
var size = 16;
for (var i = 0; i < len.length; i++) {
var fontLen = len[i].innerHTML.length;
for (size = 16; size > 10; size--) {
if (size * fontLen < len[i].offsetWidth || size == 11) {
len[i].style.fontSize = size + "px";
break
}
}
}
}, },
closeRight: function() { closeRight: function() {
var offCanvasWrapper = mui('#app'); var offCanvasWrapper = mui('#app');
offCanvasWrapper.offCanvas('close'); offCanvasWrapper.offCanvas('close');
//location.reload();
this.getData();
mui('#pullrefresh').scroll().scrollTo(0,1000,10);
}, },
showColumn: function() { showColumn: function() {
this.show = true; this.show = true;
}, },
change: function(n) { change: function(n) {
//alert(n) //alert(n)
this.changefontsize();
switch (n) { switch (n) {
case 0: case 0:
this.showStyleName = !this.showStyleName; this.showStyleName = !this.showStyleName;
...@@ -453,8 +472,8 @@ var app = new Vue({ ...@@ -453,8 +472,8 @@ var app = new Vue({
escChange: function() { escChange: function() {
var that = this; var that = this;
this.show = false; this.show = false;
if (JSON.parse(window.localStorage.getItem("data"))) { if (JSON.parse(window.localStorage.getItem("ZCdata"))) {
window.localStorage.removeItem("data"); window.localStorage.removeItem("ZCdata");
console.log(111111111111) console.log(111111111111)
} }
if (!window.localStorage) { if (!window.localStorage) {
...@@ -480,16 +499,16 @@ var app = new Vue({ ...@@ -480,16 +499,16 @@ var app = new Vue({
var d = JSON.stringify(data); var d = JSON.stringify(data);
console.log(d); console.log(d);
storage.setItem("data", d); storage.setItem("ZCdata", d);
console.log("ssssss" + storage.data); console.log("ssssss" + storage.ZCdata);
//console.log( JSON.parse(window.localStorage.getItem("data")).showIndexNo ); //console.log( JSON.parse(window.localStorage.getItem("data")).showIndexNo );
} }
}, },
getWorkTime:function(){ getWorkTime: function() {
var that = this; var that = this;
var para={ var para = {
ReportType:that.ReportType, ReportType: that.ReportType,
} }
Api.post('/api/vMES/ProductionReportV2/ListWorkTeam', para, function(e) { Api.post('/api/vMES/ProductionReportV2/ListWorkTeam', para, function(e) {
//console.log("eee：：" + JSON.stringify(e.items)) //console.log("eee：：" + JSON.stringify(e.items))
...@@ -498,7 +517,7 @@ var app = new Vue({ ...@@ -498,7 +517,7 @@ var app = new Vue({
console.log("搜索：：" + e.items.length) console.log("搜索：：" + e.items.length)
if (data > 0) { if (data > 0) {
that.workTimeData = e.items; that.workTimeData = e.items;
that.currentWorkTime=that.workTimeData[0]; that.currentWorkTime = that.workTimeData[0];
console.log("eee：：" + JSON.stringify(that.workTimeData[0])) console.log("eee：：" + JSON.stringify(that.workTimeData[0]))
} }
} }
...@@ -540,7 +559,7 @@ var app = new Vue({ ...@@ -540,7 +559,7 @@ var app = new Vue({
SearchText: this.dateTime2, SearchText: this.dateTime2,
}; };
} else if(this.current == '5'){ } else if (this.current == '5') {
this.isData = false; this.isData = false;
this.isWorkTeam = true; this.isWorkTeam = true;
...@@ -549,9 +568,9 @@ var app = new Vue({ ...@@ -549,9 +568,9 @@ var app = new Vue({
PageSize: this.PageSize, PageSize: this.PageSize,
PageIndex: this.PageIndex, PageIndex: this.PageIndex,
SearchType: this.current, SearchType: this.current,
SearchText: this.searchText, SearchText: this.currentWorkTime,
}; };
}else { } else {
this.isData = false; this.isData = false;
this.isWorkTeam = false; this.isWorkTeam = false;
var para = { var para = {
...@@ -565,7 +584,7 @@ var app = new Vue({ ...@@ -565,7 +584,7 @@ var app = new Vue({
window.localStorage.setItem("NeedDispatchSelect", JSON.stringify(this.current)); window.localStorage.setItem("NeedDispatchSelect", JSON.stringify(this.current));
this.searchDetail(para); this.searchDetail(para);
}, },
changeWorkTime:function(){ changeWorkTime: function() {
var para = { var para = {
Date: this.dateTime, Date: this.dateTime,
...@@ -580,17 +599,17 @@ var app = new Vue({ ...@@ -580,17 +599,17 @@ var app = new Vue({
searchDetail: function(para) { searchDetail: function(para) {
console.log("搜索参数：：" + JSON.stringify(para)); console.log("搜索参数：：" + JSON.stringify(para));
var that = this; var that = this;
that.paramSearch={ that.paramSearch = {
pageIndex: 2, pageIndex: 2,
pageSize: 20 pageSize: 20
} }
that.paramList= { that.paramList = {
pageIndex: 2, pageIndex: 2,
pageSize: 20 pageSize: 20
} }
console.log(JSON.stringify(that.paramSearch)); console.log(JSON.stringify(that.paramSearch));
// var s=document.getElementById("sDetail"); // var s=document.getElementById("sDetail");
// s.scrollTo(0, 0); // s.scrollTo(0, 0);
//console.log(s.innerHTML); //console.log(s.innerHTML);
//location.reload() ; //location.reload() ;
//that.itemsList=[]; //that.itemsList=[];
...@@ -599,11 +618,12 @@ var app = new Vue({ ...@@ -599,11 +618,12 @@ var app = new Vue({
Api.post('/api/vMES/ZCProductionPlan/List', para, function(e) { Api.post('/api/vMES/ZCProductionPlan/List', para, function(e) {
if (e.success) { if (e.success) {
var data = e.data.items.length; var data = e.data.items.length;
console.log("搜索：：" + JSON.stringify(e.data.items)) console.log("搜索：：" + data)
if (data > 0) { if (data > 0) {
that.Summary = e.data.Summary; that.Summary = e.data.Summary;
that.itemsList = e.data.items; that.itemsList = e.data.items;
that.changecolor(); that.changecolor();
that.changefontsize();
} else { } else {
that.itemsList = []; that.itemsList = [];
mui.toast("没有对应的数据哦！"); mui.toast("没有对应的数据哦！");
...@@ -767,22 +787,13 @@ var app = new Vue({ ...@@ -767,22 +787,13 @@ var app = new Vue({
console.log(JSON.stringify(para)); console.log(JSON.stringify(para));
Api.post('/api/vMES/ZCProductionPlan/Save', para, function(e) { Api.post('/api/vMES/ZCProductionPlan/Save', para, function(e) {
if (e.success) { if (e.success) {
//that.isAward = false; that.SureisAward = false;
that.IndexID = e.data.IndexID; that.IndexID = e.data.IndexID;
console.log(JSON.stringify(that.IndexID)); console.log(JSON.stringify(that.IndexID));
that.getDetailList(that.IndexID); that.getDetailList(that.IndexID);
that.playVoice("cg.mp3"); that.playVoice("cg.mp3");
var url_ = "blank.html";
var id_ = "blank.html";
mui.openWindow({
url: url_,
id: id_,
extras: {
parentPage: "NeedleDispatch.html"
},
});
window.location.reload();
} }
}, function(xhr, type, res) { }, function(xhr, type, res) {
mui.toast(JSON.stringify(res.message)) mui.toast(JSON.stringify(res.message))
...@@ -805,9 +816,9 @@ var app = new Vue({ ...@@ -805,9 +816,9 @@ var app = new Vue({
that.IndexID = item.IndexID; that.IndexID = item.IndexID;
console.log(item.IndexID) console.log(item.IndexID)
that.getDetailList(that.IndexID); that.getDetailList(that.IndexID);
//that.isAward = false; that.SureisAward = false;
} else { } else {
//that.isAward = true; that.SureisAward = true;
mui.toast("该订单未发包！"); mui.toast("该订单未发包！");
that.itemsData2 = []; that.itemsData2 = [];
} }
...@@ -853,12 +864,13 @@ var app = new Vue({ ...@@ -853,12 +864,13 @@ var app = new Vue({
Api.post('/api/vMES/ZCProductionPlan/Revoke', para, function(e) { Api.post('/api/vMES/ZCProductionPlan/Revoke', para, function(e) {
if (e.success) { if (e.success) {
mui.toast("撤销成功！"); mui.toast("撤销成功！");
//that.isAward = true; that.SureisAward = true;
that.itemsData2 = []; that.itemsData2 = [];
that.playVoice("cg.mp3"); that.playVoice("cg.mp3");
} }
}, function(xhr, type, res) { }, function(xhr, type, res) {
mui.toast(JSON.stringify(res.message)) mui.toast(JSON.stringify(res.message))
console.log(JSON.stringify(res.message))
that.playVoice("sb.mp3"); that.playVoice("sb.mp3");
}) })
} }
...@@ -985,7 +997,7 @@ var app = new Vue({ ...@@ -985,7 +997,7 @@ var app = new Vue({
var that = this; var that = this;
var para = { var para = {
ReportType: 0, ReportType: that.ReportType,
StyleCode: this.StyleCode StyleCode: this.StyleCode
} }
console.log(JSON.stringify(para)) console.log(JSON.stringify(para))
...@@ -1000,7 +1012,7 @@ var app = new Vue({ ...@@ -1000,7 +1012,7 @@ var app = new Vue({
id: id_, id: id_,
extras: { extras: {
style: that.selectDetail.StyleCode, style: that.selectDetail.StyleCode,
ReportType: 2, ReportType: that.ReportType,
link: that.link, link: that.link,
parentPage: "NeedleDispatch.html" parentPage: "NeedleDispatch.html"
}, },
...@@ -1022,6 +1034,7 @@ var app = new Vue({ ...@@ -1022,6 +1034,7 @@ var app = new Vue({
var para = { var para = {
IndexID: this.IndexID, IndexID: this.IndexID,
} }
Api.post('/api/vMES/TaskWork/Submit', para, function(e) { Api.post('/api/vMES/TaskWork/Submit', para, function(e) {
if (e.success) { if (e.success) {
that.playVoice("cg.mp3"); that.playVoice("cg.mp3");
...@@ -1031,6 +1044,8 @@ var app = new Vue({ ...@@ -1031,6 +1044,8 @@ var app = new Vue({
that.itemsData2.forEach(function(item) { that.itemsData2.forEach(function(item) {
item.status = false; item.status = false;
}) })
window.location.reload();
} else { } else {
that.playVoice("sb.mp3"); that.playVoice("sb.mp3");
mui.toast("提交失败: " + e.message); mui.toast("提交失败: " + e.message);
......
dest/js/mes/NeedlecarHandover.js
View file @ 6f87e2a8
...@@ -301,11 +301,11 @@ var app = new Vue({ ...@@ -301,11 +301,11 @@ var app = new Vue({
this.dateTime = moment().format().substring(0, 10); this.dateTime = moment().format().substring(0, 10);
// mui(".mui-icon-clear")[0].addEventListener('tap', function() { mui(".mui-icon-clear")[0].addEventListener('tap', function() {
// document.activeElement.blur(); //收起虚拟键盘 document.activeElement.blur(); //收起虚拟键盘
// app.searchText = ''; app.searchText = '';
// app.getData(0); app.getData(0);
// }); });
mui('body').on('tap','.mui-dtpicker #queding' ,function(){ mui('body').on('tap','.mui-dtpicker #queding' ,function(){
var para = { var para = {
ReportType: app.ReportType, ReportType: app.ReportType,
......
html/Cutting.html
View file @ 6f87e2a8
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<body> <body>
<div id="app" style=" display:block" v-cloak> <div id="app" style=" display:block" v-cloak>
<div class="mui-content"> <div class="mui-content">
<div id="left" class="left"> <div id="left" class="left">
<div id="left-1" class="left-1"> <div id="left-1" class="left-1">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" @click="back"></a> <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" @click="back"></a>
......
html/NeedleDispatch.html
View file @ 6f87e2a8
...@@ -77,36 +77,44 @@ ...@@ -77,36 +77,44 @@
<tbody class=" sDetail " id="sDetail"> <tbody class=" sDetail " id="sDetail">
<tr v-for="(item,index) in itemsList" :key="index" @tap="showDetail(item)"> <tr v-for="(item,index) in itemsList" :key="index" @tap="showDetail(item)">
<td :style="{color:'rgb('+item.StyleName_1+')',background:'rgb('+ item.StyleName_2 +')' }" <td :style="{color:'rgb('+item.StyleName_1+')',background:'rgb('+ item.StyleName_2 +')' }"
v-show="showStyleName" class="bwidth text-overflow" >{{item.StyleName}}</td> v-show="showStyleName" class="bwidth text-overflow changeFontSize " >{{item.StyleName}}</td>
<td :style="{color:'rgb('+item.CustomPO_1+')',background:'rgb('+ item.CustomPO_2 +')' }" <td :style="{color:'rgb('+item.CustomPO_1+')',background:'rgb('+ item.CustomPO_2 +')' }"
v-show="showCustomPO" class="bwidth text-overflow">{{item.CustomPO}}</td> v-show="showCustomPO" class="bwidth text-overflow changeFontSize ">{{item.CustomPO}}</td>
<td :style="{color:'rgb('+item.IndexNo_1+')',background:'rgb('+ item.IndexNo_2 +')' }" <td :style="{color:'rgb('+item.IndexNo_1+')',background:'rgb('+ item.IndexNo_2 +')' }"
v-show="showIndexNo" class="bwidth text-overflow">{{item.IndexNo}}</td> v-show="showIndexNo" class="bwidth text-overflow changeFontSize ">{{item.IndexNo}}</td>
<td :style="{color:'rgb('+item.StyleCode_1+')',background:'rgb('+ item.StyleCode_2 +')' }" <td :style="{color:'rgb('+item.StyleCode_1+')',background:'rgb('+ item.StyleCode_2 +')' }"
v-show="showStyleCode" class="bwidth text-overflow">{{item.StyleCode}}</td> v-show="showStyleCode" class="bwidth text-overflow changeFontSize">{{item.StyleCode}}</td>
<td :style="{color:'rgb('+item.ColorName_1+')',background:'rgb('+ item.ColorName_2 +')' }" <td :style="{color:'rgb('+item.ColorName_1+')',background:'rgb('+ item.ColorName_2 +')' }"
v-show="showColor" class="swidth text-overflow">{{item.ColorName}}</td> v-show="showColor" class="swidth text-overflow changeFontSize ">{{item.ColorName}}</td>
<td :style="{color:'rgb('+item.TotalCount_1+')',background:'rgb('+ item.TotalCount_2 +')' }" <td :style="{color:'rgb('+item.TotalCount_1+')',background:'rgb('+ item.TotalCount_2 +')' }"
v-show="showTotalCount" class="swidth text-overflow">{{item.TotalCount}}</td> v-show="showTotalCount" class="swidth text-overflow changeFontSize ">{{item.TotalCount}}</td>
<td :style="{color:'rgb('+item.Price_1+')',background:'rgb('+ item.Price_2 +')' }" <td :style="{color:'rgb('+item.Price_1+')',background:'rgb('+ item.Price_2 +')' }"
v-show="showPrice" class="swidth text-overflow">{{item.Price}}</td> v-show="showPrice" class="swidth text-overflow changeFontSize ">{{item.Price}}</td>
<td :style="{color:'rgb('+item.TotalMoney_1+')',background:'rgb('+ item.TotalMoney_2 +')' }" <td :style="{color:'rgb('+item.TotalMoney_1+')',background:'rgb('+ item.TotalMoney_2 +')' }"
v-show="showTotalMoney" class="swidth text-overflow">{{item.TotalMoney}}</td> v-show="showTotalMoney" class="swidth text-overflow changeFontSize ">{{item.TotalMoney}}</td>
<td :style="{color:'rgb('+item.MatchDate_1+')',background:'rgb('+ item.MatchDate_2 +')' }" <td :style="{color:'rgb('+item.MatchDate_1+')',background:'rgb('+ item.MatchDate_2 +')' }"
v-show="showMatchDate" class="bwidth text-overflow">{{item.MatchDate}}</td> v-show="showMatchDate" class="bwidth text-overflow changeFontSize ">{{item.MatchDate}}</td>
<td :style="{color:'rgb('+item.ConfirmDate_1+')',background:'rgb('+ item.ConfirmDate_2 +')' }" <td :style="{color:'rgb('+item.ConfirmDate_1+')',background:'rgb('+ item.ConfirmDate_2 +')' }"
v-show="showConfirmDate" class="bwidth text-overflow">{{item.ConfirmDate}}</td> v-show="showConfirmDate" class="bwidth text-overflow changeFontSize ">{{item.ConfirmDate}}</td>
<td :style="{color:'rgb('+item.ZCPlanBeginDate_1+')',background:'rgb('+ item.ZCPlanBeginDate_2 +')' }" <td :style="{color:'rgb('+item.ZCPlanBeginDate_1+')',background:'rgb('+ item.ZCPlanBeginDate_2 +')' }"
v-show="showZCPlanBeginDate" class="bwidth text-overflow">{{item.ZCPlanBeginDate}}</td> v-show="showZCPlanBeginDate" class="bwidth text-overflow changeFontSize ">{{item.ZCPlanBeginDate}}</td>
<td :style="{color:'rgb('+item.ZCPlanDeliveryDate_1+')',background:'rgb('+ item.ZCPlanDeliveryDate_2 +')' }" <td :style="{color:'rgb('+item.ZCPlanDeliveryDate_1+')',background:'rgb('+ item.ZCPlanDeliveryDate_2 +')' }"
v-show="showZCPlanDeliveryDate" class="bwidth text-overflow">{{item.ZCPlanDeliveryDate}}</td> v-show="showZCPlanDeliveryDate" class="bwidth text-overflow changeFontSize ">{{item.ZCPlanDeliveryDate}}</td>
<td :style="{color:'rgb('+item.PlanDate_1+')',background:'rgb('+ item.PlanDate_2 +')' }" <td :style="{color:'rgb('+item.PlanDate_1+')',background:'rgb('+ item.PlanDate_2 +')' }"
v-show="showPlanDate" class="bwidth text-overflow">{{item.PlanDate}}</td> v-show="showPlanDate" class="bwidth text-overflow changeFontSize ">{{item.PlanDate}}</td>
<td :style="{color:'rgb('+item.FinishDate_1+')',background:'rgb('+ item.FinishDate_2 +')' }" <td :style="{color:'rgb('+item.FinishDate_1+')',background:'rgb('+ item.FinishDate_2 +')' }"
v-show="showFinishDate" class="bwidth text-overflow">{{item.FinishDate}}</td> v-show="showFinishDate" class="bwidth text-overflow changeFontSize ">{{item.FinishDate}}</td>
</tr> </tr>
<!-- <tr @tap="showDetail(item)"> <!-- <tr @tap="showDetail(item)">
<td class="bwidth text-overflow">bbbbbbbbbbb</td> <td class="bwidth text-overflow">bbbbbbbbbbb</td>
<td class="bwidth text-overflow">bbbbbbbbbbb</td>
<td class="bwidth text-overflow">bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb</td>
<td class="bwidth text-overflow">bbbbbbbbbbb</td>
<td class="bwidth text-overflow">bbbbbbbbbbb</td>
<td class="bwidth text-overflow">bbbbbbbbbbb</td>
<td class="bwidth text-overflow">bbbbbbbbbbb</td>
<td class="bwidth text-overflow">bbbbbbbbbbb</td>
<td class="bwidth text-overflow">bbbbbbbbbbb</td>
</tr> --> </tr> -->
</tbody> </tbody>
...@@ -209,7 +217,7 @@ ...@@ -209,7 +217,7 @@
<div class="top-btn"> <div class="top-btn">
<!-- <span @tap="getDetailData" >发包</span> <!-- <span @tap="getDetailData" >发包</span>
<span @tap="revokeData" >撤销</span> --> <span @tap="revokeData" >撤销</span> -->
<button :disabled="isAward" type="button" class="mui-btn mui-btn-blue " @tap="getDetailData">发包</button> <button :disabled="isAward" type="button" class="mui-btn mui-btn-blue " @tap="getDetailData">上线</button>
<button :disabled="isAward1" type="button" class="mui-btn mui-btn-blue " @tap="revokeData">撤销</button> <button :disabled="isAward1" type="button" class="mui-btn mui-btn-blue " @tap="revokeData">撤销</button>
</div> </div>
</div> </div>
......
html/work.html
View file @ 6f87e2a8
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
} */ } */
</style> </style>
</head> </head>
<body> <body>
<div class="application" id="lialist" v-cloak> <div class="application" id="lialist" v-cloak>
<div class="application-box" <div class="application-box"
...@@ -127,9 +126,11 @@ ...@@ -127,9 +126,11 @@
{code:'90030',name:'MyWork'}, {code:'90030',name:'MyWork'},
{code:'90031',name:'NeedlecarPBB'}, {code:'90031',name:'NeedlecarPBB'},
{code:'90037',name:'NeedleDispatch'}, {code:'90037',name:'NeedleDispatch'},
{code:'90038',name:'CuttingDispatch'},
{code:'90039',name:'FormingDispatch'},
],
],
}, },
computed: { computed: {
......
manifest.json
View file @ 6f87e2a8
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"id" : "H544710A8", /*应用的标识，创建应用时自动生成，勿手动修改*/ "id" : "H544710A8", /*应用的标识，创建应用时自动生成，勿手动修改*/
"name" : "飞天兔MES", /*应用名称，程序桌面图标名称*/ "name" : "飞天兔MES", /*应用名称，程序桌面图标名称*/
"version" : { "version" : {
"name" : "1.0.1.21", /*应用版本名称*/ "name" : "1.0.9", /*应用版本名称*/
"code" : 338 "code" : 338
}, },
"description" : "飞天兔MES平板版", /*应用描述信息*/ "description" : "飞天兔MES平板版", /*应用描述信息*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment