Skip to content

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

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

parent 7a8a27d5
Expand all Hide 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 { ...@@ -62,6 +62,7 @@ body {
width: 30%; width: 30%;
height: 100%; height: 100%;
display: block; display: block;
} }
.left-1 { .left-1 {
...@@ -85,6 +86,32 @@ body { ...@@ -85,6 +86,32 @@ body {
padding-top: 35px; 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] { .mui-search input[type=search] {
border-radius: 0; border-radius: 0;
} }
...@@ -95,9 +122,11 @@ body { ...@@ -95,9 +122,11 @@ body {
background: #fff; background: #fff;
position: relative; position: relative;
/* display: none; */ /* display: none; */
margin-top: -18px; /* margin-top: -18px;
overflow-y: scroll; overflow-y: scroll;
*/
width: 100%;
clear: both;
} }
.Text1 { .Text1 {
...@@ -114,10 +143,6 @@ body { ...@@ -114,10 +143,6 @@ body {
height: 481px; height: 481px;
} }
.mui-scroll {
overflow-y: scroll;
}
.complet-detail { .complet-detail {
padding: 5px 0; padding: 5px 0;
height: 93px; height: 93px;
...@@ -337,7 +362,7 @@ body { ...@@ -337,7 +362,7 @@ body {
/*********/ /*********/
#pullrefresh { #pullrefresh {
width: 100%; width: 100%;
overflow-y: scroll;
} }
/**整单完工弹出样式**/ /**整单完工弹出样式**/
.mui-popup{ .mui-popup{
......
dest/css/needlecarHand/needlecarHandover.css
View file @ db4c8148
...@@ -44,8 +44,8 @@ body, ...@@ -44,8 +44,8 @@ body,
#left-2 { #left-2 {
position: relative; position: relative;
width: 100%; width: 100%;
height: 482px; height: 492px;
margin-top: -15px; margin-top: -3px;
border: 1px solid rgb(218, 230, 239); border: 1px solid rgb(218, 230, 239);
background: #FFF; background: #FFF;
} }
...@@ -65,10 +65,58 @@ body, ...@@ -65,10 +65,58 @@ body,
overflow-y: scroll; 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 { .mui-search #search {
border-radius: 0; 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 { .needLeftList {
padding: 5px 10px; padding: 5px 10px;
height: 93px; height: 93px;
...@@ -236,3 +284,12 @@ body, ...@@ -236,3 +284,12 @@ body,
#right-1 .mui-table-view-cell p:nth-of-type(4) { #right-1 .mui-table-view-cell p:nth-of-type(4) {
width: 32%; 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
This diff is collapsed.
dest/js/mes/NeedlecarHandover.js
View file @ db4c8148
This diff is collapsed.
dest/js/mes/NeedlecarreportV2.js
View file @ db4c8148
...@@ -69,6 +69,24 @@ var app = new Vue({ ...@@ -69,6 +69,24 @@ var app = new Vue({
return false; return false;
}), }),
appdis: 0, appdis: 0,
searchData: [{
id: '0',
name: '指令号'
},
{
id: '1',
name: '订单号'
},
{
id: '2',
name: '货号'
},
{
id: '3',
name: '班组'
}
],
current: '', //搜索选中
}, },
computed: { computed: {
...@@ -92,14 +110,10 @@ var app = new Vue({ ...@@ -92,14 +110,10 @@ var app = new Vue({
} }
}, },
}, },
// mounted:function(){ created() {
// this.$nextTick(function(){ //如果没有这句代码，select中初始化会是空白的，默认选中就无法实现
// mui('#progress .mui-text-center').each(function() { this.current = this.searchData[0].id;
// console.log(this.getAttribute("data-progress")); },
// mui(this).progressbar({progress:this.getAttribute("data-progress")}).show()
// })
// })
// },
methods: { methods: {
init: function() { //初始化 init: function() { //初始化
mui.init({ mui.init({
...@@ -112,8 +126,8 @@ var app = new Vue({ ...@@ -112,8 +126,8 @@ var app = new Vue({
callback: function() { callback: function() {
var reUnfinished = document.getElementById("theOne").getAttribute("state"); var reUnfinished = document.getElementById("theOne").getAttribute("state");
var reFinished = document.getElementById("theTow").getAttribute("state"); var reFinished = document.getElementById("theTow").getAttribute("state");
var UnfinishedUrl = '/api/vMES/ProductionReportV2/ToDo'; // var UnfinishedUrl = '/api/vMES/ProductionReportV2/ToDo';
var FinishedUrl = '/api/vMES/ProductionReportV2/Done'; // var FinishedUrl = '/api/vMES/ProductionReportV2/Done';
var searchUrl = '/api/vMES/ProductionReportV2/Search'; var searchUrl = '/api/vMES/ProductionReportV2/Search';
var searchDoneUrl = '/api/vMES/ProductionReportV2/SearchDone'; var searchDoneUrl = '/api/vMES/ProductionReportV2/SearchDone';
//console.log("未完成" + reUnfinished) //console.log("未完成" + reUnfinished)
...@@ -124,88 +138,21 @@ var app = new Vue({ ...@@ -124,88 +138,21 @@ var app = new Vue({
if (app.searchText != "") { if (app.searchText != "") {
searchPull(searchUrl, UnfinishedData, app.paramUnDoSeach); searchPull(searchUrl, UnfinishedData, app.paramUnDoSeach);
} else { } else {
pullupRefresh(UnfinishedUrl, UnfinishedData, app.paramUnDo); pullupRefresh(searchUrl, UnfinishedData, app.paramUnDo);
} }
} else if (reFinished) { //已完成 } else if (reFinished) { //已完成
if (app.searchText != "") { if (app.searchText != "") {
searchPull(searchDoneUrl, FinishedUrlData, app.paramDoneSeach); searchPull(searchDoneUrl, FinishedUrlData, app.paramDoneSeach);
} else { } 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) { window.addEventListener('back', function(e) {
var that = this; var that = this;
// app.getData(); // app.getData();
...@@ -238,11 +185,13 @@ var app = new Vue({ ...@@ -238,11 +185,13 @@ var app = new Vue({
var para = { var para = {
ReportType: that.ReportType, ReportType: that.ReportType,
PageSize: that.datalen, PageSize: that.datalen,
PageIndex: that.unPagenum PageIndex: that.unPagenum,
SearchType:'0',
SearchText:'',
}; };
//console.log("lalla" + JSON.stringify(para)); //console.log("lalla" + JSON.stringify(para));
that.cur = 0; 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("one :::;" + JSON.stringify(e.items.length))
console.log("getData：" + JSON.stringify(e.items[0])) console.log("getData：" + JSON.stringify(e.items[0]))
//console.log("点击之前"+JSON.stringify(that.rightInfor)) //console.log("点击之前"+JSON.stringify(that.rightInfor))
...@@ -320,11 +269,13 @@ var app = new Vue({ ...@@ -320,11 +269,13 @@ var app = new Vue({
var para = { var para = {
PageSize: that.datalen, PageSize: that.datalen,
PageIndex: that.unPagenum, PageIndex: that.unPagenum,
ReportType: that.ReportType ReportType: that.ReportType,
SearchType:'0',
SearchText:'',
}; };
that.searchText = ''; that.searchText = '';
that.disable_reportDelete = "disabled"; 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; that.cur = 0;
if (e.items.length > 0) { if (e.items.length > 0) {
that.itemsHead = e.items; that.itemsHead = e.items;
...@@ -346,12 +297,14 @@ var app = new Vue({ ...@@ -346,12 +297,14 @@ var app = new Vue({
var para = { var para = {
PageSize: that.datalen, PageSize: that.datalen,
PageIndex: that.pagenum, PageIndex: that.pagenum,
ReportType: that.ReportType ReportType: that.ReportType,
SearchType:'0',
SearchText:'',
}; };
//console.log("do para " + JSON.stringify(para)) //console.log("do para " + JSON.stringify(para))
that.disable_reportDelete = null; that.disable_reportDelete = null;
that.searchText = ''; 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)) console.log("已完成" + JSON.stringify(para))
var data = e.items.length; var data = e.items.length;
if (data > 0) { if (data > 0) {
...@@ -380,54 +333,72 @@ var app = new Vue({ ...@@ -380,54 +333,72 @@ var app = new Vue({
SearchText: that.searchText, SearchText: that.searchText,
PageSize: 20, PageSize: 20,
PageIndex: that.pagenum, PageIndex: that.pagenum,
ReportType: that.ReportType ReportType: that.ReportType,
SearchType:that.current,
}; };
if (event.keyCode == "13") { if (event.keyCode == "13") {
document.activeElement.blur(); //收起虚拟键盘 document.activeElement.blur(); //收起虚拟键盘
if (that.searchText == '') return; if (that.searchText == '') return;
console.log(this.completeState); console.log(this.completeState + JSON.stringify(para));
if (this.completeState) { //true 是未完成的搜索 false是已完成的搜索 this.searchDetail(para);
Api.post('/api/vMES/ProductionReportV2/Search', para, function(e) {
console.log("现在是未完成的搜索！");
var data = e.items.length;
if (data > 0) {
that.itemsHead = e.items;
console.log("未完成的搜索111");
that.rightInfor = e.items[0];
that.itemsDetail = e.items[0];
that.cur = 0;
} else {
that.itemsHead = [];
that.rightInfor = [];
that.itemsDetail = [];
that.cur = 0;
}
}, function(xhr, type, res) {
mui.toast(JSON.stringify(res.message))
});
} else {
Api.post('/api/vMES/ProductionReportV2/SearchDone', para, function(e) {
console.log("现在是以111111完成的搜索！");
var data = e.items.length;
if (data > 0) {
that.itemsLeft2 = e.items;
that.rightInfor = e.items[0];
that.itemsDetail = e.items[0];
that.cur = 0;
} else {
that.itemsLeft2 = [];
that.rightInfor = [];
that.itemsDetail = [];
that.cur = 0;
}
}, function(xhr, type, res) {
mui.toast(JSON.stringify(res.message))
});
}
event.preventDefault(); // 阻止默认事件---阻止页面刷新 event.preventDefault(); // 阻止默认事件---阻止页面刷新
//that.searchText = ''; //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("现在是未完成的搜索！");
var data = e.items.length;
if (data > 0) {
that.itemsHead = e.items;
console.log("未完成的搜索111");
that.rightInfor = e.items[0];
that.itemsDetail = e.items[0];
that.cur = 0;
} else {
that.itemsHead = [];
that.rightInfor = [];
that.itemsDetail = [];
that.cur = 0;
}
}, function(xhr, type, res) {
mui.toast(JSON.stringify(res.message))
});
} else {
Api.post('/api/vMES/ProductionReportV2/SearchDone', para, function(e) {
console.log("现在是以111111完成的搜索！");
var data = e.items.length;
if (data > 0) {
that.itemsLeft2 = e.items;
that.rightInfor = e.items[0];
that.itemsDetail = e.items[0];
that.cur = 0;
} else {
that.itemsLeft2 = [];
that.rightInfor = [];
that.itemsDetail = [];
that.cur = 0;
}
}, function(xhr, type, res) {
mui.toast(JSON.stringify(res.message))
});
}
},
getTatolNum: function() { //今日产量 getTatolNum: function() { //今日产量
var that = this; var that = this;
var para = { var para = {
......
dest/js/mes/cutting.js
View file @ db4c8148
This diff is collapsed.
html/Cutting.html
View file @ db4c8148
...@@ -20,16 +20,48 @@ ...@@ -20,16 +20,48 @@
<label>今日产量:{{number}} </label> <label>今日产量:{{number}} </label>
</div> </div>
<div id="left-2" class="left-2"> <div id="left-2" class="left-2">
<div class="mui-input-row mui-search"> <div class="select">
<input id="search" class="mui-input-clear search" placeholder="搜索:指令号,货号,订单号" v-model="searchText" type="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()" pattern="\d*" @keyup.enter="goSearch($event)" @focus.prevent="changePosition()"
@blur.prevent="changePosition1()"> @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>
<!-- <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="Text">
<div class="left" id="pullrefresh" class="mui-content mui-scroll-wrapper"> <div id="pullrefresh" class="mui-content">
<div class="mui-scroll"> <div class="mui-scroll">
<div id="theOne" :state="completeState" v-show="completeState"> <div id="theOne" :state="completeState" v-show="completeState">
<div class="mui-table-view mui-table-view-chevron"> <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" <ul class="complet-detail" :class="{active:cur==index}" v-for="(list,index) in itemsHead" :key="list.IndexID"
@click="getDetailInfor(list.IndexID,index)"> @click="getDetailInfor(list.IndexID,index)">
<li> <li>
...@@ -192,6 +224,7 @@ ...@@ -192,6 +224,7 @@
<script src="../dest/js/vue.min.js"> </script> <script src="../dest/js/vue.min.js"> </script>
<script src="../dest/js/moment.js"></script> <script src="../dest/js/moment.js"></script>
<script src="../js/mui.pullToRefresh.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/playVoice.js"></script>
<script src="../dest/js/mes/cutting.js"></script> <script src="../dest/js/mes/cutting.js"></script>
......
html/FormingHandover.html
View file @ db4c8148
...@@ -16,11 +16,8 @@ ...@@ -16,11 +16,8 @@
</div> </div>
<div id="left-2" style="width: 40%"> <div id="left-2" style="width: 40%">
<div class="mui-segmented-control" style=""> <div class="mui-segmented-control" style="">
<a id="n1" class="mui-control-item mui-active" @click="selectDisplay(1)">未交接</a> <a id="n1" class="mui-control-item mui-active" @click="selectDisplay(1)">未交接</a>
<a id="n2" class="mui-control-item " @click="selectDisplay(2)">已交接</a> <a id="n2" class="mui-control-item " @click="selectDisplay(2)">已交接</a>
</div> </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 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"> <div class="mui-scroll">
......
html/FormingV2.html
View file @ db4c8148
...@@ -20,11 +20,23 @@ ...@@ -20,11 +20,23 @@
<label>今日产量:{{number}} </label> <label>今日产量:{{number}} </label>
</div> </div>
<div id="left-2" class="left-2"> <div id="left-2" class="left-2">
<div class="mui-input-row mui-search"> <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="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()" pattern="\d*" @keyup.enter="goSearch($event)" @focus.prevent="changePosition()"
@blur.prevent="changePosition1()"> @blur.prevent="changePosition1()">
</div> </div> -->
<div class="Text"> <div class="Text">
<div class="left" id="pullrefresh" class="mui-content mui-scroll-wrapper"> <div class="left" id="pullrefresh" class="mui-content mui-scroll-wrapper">
<div class="mui-scroll"> <div class="mui-scroll">
...@@ -192,6 +204,7 @@ ...@@ -192,6 +204,7 @@
<script src="../dest/js/vue.min.js"> </script> <script src="../dest/js/vue.min.js"> </script>
<script src="../dest/js/moment.js"></script> <script src="../dest/js/moment.js"></script>
<script src="../js/mui.pullToRefresh.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/playVoice.js"></script>
<script src="../dest/js/mes/FormingV2.js"></script> <script src="../dest/js/mes/FormingV2.js"></script>
......
html/NeedleMatch.html
View file @ db4c8148
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" /> <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/mui.min.css" rel="stylesheet" />
<link href="../dest/css/needlecarHand/needlecarHandover.css" rel="stylesheet" /> <link href="../dest/css/needlecarHand/needlecarHandover.css" rel="stylesheet" />
<link href="../dest/css/mui.picker.min.css" rel="stylesheet" />
</head> </head>
<body> <body>
...@@ -16,10 +17,22 @@ ...@@ -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> <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> <label style=" text-align: center; margin-left: 70px; color: white;">针车配套确认</label>
</div> </div>
<div class="mui-input-row mui-search">
<input id="search" class="mui-input-clear search" placeholder="搜索:指令号,货号,订单号" v-model="searchText" type="search" <div class="select">
pattern="\d*" @keyup.enter="goSearch($event)" @focus.prevent="changePosition()" <div class="mui-input-row mui-search" v-show="!isData">
@blur.prevent="changePosition1()"> <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>
<div id="left-2"> <div id="left-2">
<div id="pullrefresh"> <div id="pullrefresh">
...@@ -28,7 +41,7 @@ ...@@ -28,7 +41,7 @@
<div class="mui-table-view mui-table-view-chevron"> <div class="mui-table-view mui-table-view-chevron">
<ul :id="items.IndexID" :class="{active:cur==n}" class="mui-table-view bg needLeftList" v-for=" (items,n) in itemsLeft" <ul :id="items.IndexID" :class="{active:cur==n}" class="mui-table-view bg needLeftList" v-for=" (items,n) in itemsLeft"
@click="selectLeft(items,n)"> @click="selectLeft(items,n)">
<li> <li>
<p><span>指令号：</span><span>{{items.IndexNo}}</span></p> <p><span>指令号：</span><span>{{items.IndexNo}}</span></p>
<p><span>订单号：</span><span>{{items.CustomPO}}</span></p> <p><span>订单号：</span><span>{{items.CustomPO}}</span></p>
...@@ -45,18 +58,18 @@ ...@@ -45,18 +58,18 @@
<p><span>实报时间：</span><span>{{items.ReportDate}}</span></p> <p><span>实报时间：</span><span>{{items.ReportDate}}</span></p>
<p><span>计划配送：</span><span>{{items.PlanDistribution}}</span></p> <p><span>计划配送：</span><span>{{items.PlanDistribution}}</span></p>
</li> </li>
<a class="meached" v-show = "items.IsMatch"> <img src="../dest/img/application/meached.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> <a class="confirm" v-show="items.IsConfirm"> <img src="../dest/img/application/haveSure.png" /></a>
</ul> </ul>
</div> </div>
</div> </div>
<div id="item2" :state="!completeState" class="scroll2 leftList " :style="display_"> <div id="item2" :state="!completeState" class="scroll2 leftList " :style="display_">
<div class="mui-table-view mui-table-view-chevron"> <div class="mui-table-view mui-table-view-chevron">
<ul :id="items.IndexID" :class="{active:cur==n}" class="mui-table-view bg needLeftList" v-for=" items,n in itemsLeft2" <ul :id="items.IndexID" :class="{active:cur==n}" class="mui-table-view bg needLeftList" v-for=" items,n in itemsLeft2"
@click="selectLeft(items,n )"> @click="selectLeft(items,n )">
<li> <li>
<p><span>指令号：</span><span>{{items.IndexNo}}</span></p> <p><span>指令号：</span><span>{{items.IndexNo}}</span></p>
<p><span>订单号：</span><span>{{items.CustomPO}}</span></p> <p><span>订单号：</span><span>{{items.CustomPO}}</span></p>
...@@ -73,7 +86,7 @@ ...@@ -73,7 +86,7 @@
<p><span>实报时间：</span><span>{{items.ReportDate}}</span></p> <p><span>实报时间：</span><span>{{items.ReportDate}}</span></p>
<p><span>计划配送：</span><span>{{items.PlanDistribution}}</span></p> <p><span>计划配送：</span><span>{{items.PlanDistribution}}</span></p>
</li> </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> </ul>
</div> </div>
</div> </div>
...@@ -90,7 +103,7 @@ ...@@ -90,7 +103,7 @@
<div id="right-1"> <div id="right-1">
<ul class="mui-table-view"> <ul class="mui-table-view">
<li class="mui-table-view-cell"> <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 style="float: left;width: 40%; color: #060606;white-space:nowrap;text-overflow: ellipsis;overflow: hidden;">&nbsp;{{itemsDetail.IndexNo}}
</p> </p>
</li> </li>
...@@ -145,21 +158,28 @@ ...@@ -145,21 +158,28 @@
<p>交接时间: </p> <p>交接时间: </p>
<p>{{itemsDetail.CheckDate}} </p> <p>{{itemsDetail.CheckDate}} </p>
</li> </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> </ul>
</div> </div>
</div> </div>
<div id="right-2"> <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="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="btnMatch" @click="matched">成型配套确认</button>
<button type="button" class="mui-btn mui-btn-blue " :disabled="btnCheck" @click="submit">{{submitText}}</button> <button type="button" class="mui-btn mui-btn-blue " :disabled="btnCheck" @click="submit">{{submitText}}</button>
</div> </div>
</div> </div>
</div> </div>
<script src="../dest/js/mui.min.js"></script> <script src="../dest/js/mui.min.js"></script>
<script src="../dest/js/vue.min.js"></script> <script src="../dest/js/vue.min.js"></script>
<script src="../dest/js/public.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/playVoice.js"></script>
<script src="../dest/js/mes/NeedleMatch.js"></script> <script src="../dest/js/mes/NeedleMatch.js"></script>
</body> </body>
......
html/NeedlecarHandover.html
View file @ db4c8148
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" /> <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/mui.min.css" rel="stylesheet" />
<link href="../dest/css/needlecarHand/needlecarHandover.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> <body>
<div id="app" v-cloak> <div id="app" v-cloak>
<div class="need-left"> <div class="need-left">
...@@ -16,10 +17,21 @@ ...@@ -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> <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> <label style=" text-align: center; margin-left: 70px; color: white;">裁断配套确认</label>
</div> </div>
<div class="mui-input-row mui-search"> <div class="select">
<input id="search" class="mui-input-clear search" placeholder="搜索:指令号,货号,订单号" v-model="searchText" type="search" <div class="mui-input-row mui-search" v-show="!isData">
pattern="\d*" @keyup.enter="goSearch($event)" @focus.prevent="changePosition()" <input id="search" class="mui-input-clear search" placeholder="搜索" v-model="searchText" type="search" pattern="\d*"
@blur.prevent="changePosition1()"> @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>
<div id="left-2"> <div id="left-2">
<div id="pullrefresh"> <div id="pullrefresh">
...@@ -28,7 +40,7 @@ ...@@ -28,7 +40,7 @@
<div class="mui-table-view mui-table-view-chevron"> <div class="mui-table-view mui-table-view-chevron">
<ul :id="items.IndexID" :class="{active:cur==n}" class="mui-table-view bg needLeftList" v-for=" (items,n) in itemsLeft" <ul :id="items.IndexID" :class="{active:cur==n}" class="mui-table-view bg needLeftList" v-for=" (items,n) in itemsLeft"
@click="selectLeft(items,n)"> @click="selectLeft(items,n)">
<li> <li>
<p><span>指令号：</span><span>{{items.IndexNo}}</span></p> <p><span>指令号：</span><span>{{items.IndexNo}}</span></p>
<p><span>订单号：</span><span>{{items.CustomPO}}</span></p> <p><span>订单号：</span><span>{{items.CustomPO}}</span></p>
...@@ -45,17 +57,17 @@ ...@@ -45,17 +57,17 @@
<p><span>实报时间：</span><span>{{items.ReportDate}}</span></p> <p><span>实报时间：</span><span>{{items.ReportDate}}</span></p>
<p><span>计划配送：</span><span>{{items.PlanDistribution}}</span></p> <p><span>计划配送：</span><span>{{items.PlanDistribution}}</span></p>
</li> </li>
<a class="meached" v-show = "items.IsMatch"> <img src="../dest/img/application/meached.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> <a class="confirm" v-show="items.IsConfirm"> <img src="../dest/img/application/haveSure.png" /></a>
</ul> </ul>
</div> </div>
</div> </div>
<div id="item2" :state="!completeState" class="scroll2 leftList " :style="display_"> <div id="item2" :state="!completeState" class="scroll2 leftList " :style="display_">
<div class="mui-table-view mui-table-view-chevron"> <div class="mui-table-view mui-table-view-chevron">
<ul :id="items.IndexID" :class="{active:cur==n}" class="mui-table-view bg needLeftList" v-for=" items,n in itemsLeft2" <ul :id="items.IndexID" :class="{active:cur==n}" class="mui-table-view bg needLeftList" v-for=" items,n in itemsLeft2"
@click="selectLeft(items,n )"> @click="selectLeft(items,n )">
<li> <li>
<p><span>指令号：</span><span>{{items.IndexNo}}</span></p> <p><span>指令号：</span><span>{{items.IndexNo}}</span></p>
<p><span>订单号：</span><span>{{items.CustomPO}}</span></p> <p><span>订单号：</span><span>{{items.CustomPO}}</span></p>
...@@ -72,7 +84,7 @@ ...@@ -72,7 +84,7 @@
<p><span>实报时间：</span><span>{{items.ReportDate}}</span></p> <p><span>实报时间：</span><span>{{items.ReportDate}}</span></p>
<p><span>计划配送：</span><span>{{items.PlanDistribution}}</span></p> <p><span>计划配送：</span><span>{{items.PlanDistribution}}</span></p>
</li> </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> </ul>
</div> </div>
</div> </div>
...@@ -89,7 +101,7 @@ ...@@ -89,7 +101,7 @@
<div id="right-1"> <div id="right-1">
<ul class="mui-table-view"> <ul class="mui-table-view">
<li class="mui-table-view-cell"> <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 style="float: left;width: 40%; color: #060606;white-space:nowrap;text-overflow: ellipsis;overflow: hidden;">&nbsp;{{itemsDetail.IndexNo}}
</p> </p>
</li> </li>
...@@ -143,15 +155,19 @@ ...@@ -143,15 +155,19 @@
<p>交接时间: </p> <p>交接时间: </p>
<p>{{itemsDetail.CheckDate}} </p> <p>{{itemsDetail.CheckDate}} </p>
</li> </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> </ul>
</div> </div>
</div> </div>
<div id="right-2"> <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="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="btnMatch" @click="matched">针车配套</button>
<button type="button" class="mui-btn mui-btn-blue " :disabled="btnCheck" @click="submit">{{submitText}}</button> <button type="button" class="mui-btn mui-btn-blue " :disabled="btnCheck" @click="submit">{{submitText}}</button>
</div> </div>
</div> </div>
...@@ -160,6 +176,8 @@ ...@@ -160,6 +176,8 @@
<script src="../dest/js/vue.min.js"></script> <script src="../dest/js/vue.min.js"></script>
<script src="../dest/js/public.min.js"></script> <script src="../dest/js/public.min.js"></script>
<script src="../dest/js/mes/playVoice.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> <script src="../dest/js/mes/NeedlecarHandover.js"></script>
......
html/NeedlecarreportV2.html
View file @ db4c8148
...@@ -21,9 +21,21 @@ ...@@ -21,9 +21,21 @@
<label>今日产量:{{number}} </label> <label>今日产量:{{number}} </label>
</div> </div>
<div id="left-2" class="left-2"> <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" <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()"> 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>
<div class="Text"> <div class="Text">
<div class="left" id="pullrefresh" class="mui-content mui-scroll-wrapper"> <div class="left" id="pullrefresh" class="mui-content mui-scroll-wrapper">
...@@ -192,6 +204,7 @@ ...@@ -192,6 +204,7 @@
<script src="../dest/js/vue.min.js"> </script> <script src="../dest/js/vue.min.js"> </script>
<script src="../dest/js/moment.js"></script> <script src="../dest/js/moment.js"></script>
<script src="../js/mui.pullToRefresh.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/playVoice.js"></script>
<script src="../dest/js/mes/NeedlecarreportV2.js"></script> <script src="../dest/js/mes/NeedlecarreportV2.js"></script>
......
html/work.html
View file @ db4c8148
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
} }
.application-tit { .application-tit {
overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
font-weight: 400; font-weight: 400;
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
border-radius: 8px; border-radius: 8px;
} }
.application-box { .application-box {
display: none; display: block;
} }
</style> </style>
</head> </head>
......
index.html
View file @ db4c8148
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
font-size: 30px; font-size: 30px;
margin:3px 0 -5px; margin:3px 0 -5px;
} }
.mui-bar-tab .mui-tab-item .icon~.mui-tab-label { .mui-bar-tab .mui-tab-item .icon~.mui-tab-label {
font-size: 12px; font-size: 12px;
display: block; 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