Skip to content

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

裁断实报，针车实报V2，成型时报V2 优化调整 

针车交接，成型交接等优化调整，
parent 3011faa4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 888 additions and 564 deletions
dest/css/Cutting.css
View file @ 7b03ff0c
......@@ -124,6 +124,7 @@ body {
border-bottom: 1px solid #dadada;
box-sizing: border-box;
overflow: hidden;
position: relative;
}
.complet-detail li {
......@@ -173,11 +174,11 @@ body {
overflow: hidden;
}
.complet-detail li:nth-of-type(3) p {
width: 100%;
.complet-detail li:nth-of-type(3) p:nth-of-type(1) {
width: 50%;
}
.complet-detail li:nth-of-type(3) span:nth-of-type(2) {
.complet-detail li:nth-of-type(3) p:nth-of-type(2) {
width: 100px;
white-space: nowrap;
......@@ -208,7 +209,15 @@ body {
line-height: 40px;
}
.meached{
position: absolute;
top: 18px;
right: 0;
width: 70px;
}
.meached img{
width: 80%;
}
.btn_bottom #n1,
.btn_bottom #n2 {
display: block;
......
dest/css/needlecarHand/needlecarHandover.css
View file @ 7b03ff0c
*{
* {
list-style: none;
padding: 0;
margin: 0;
border: 0;
}
html,body,#app{
html,
body,
#app {
width: 100%;
height: 100%;
overflow: hidden;
}
[v-cloak] {
display: none !important;
}
.redColor{
.redColor {
color: red !important;
display: inline-block;
}
.blueColor{
.blueColor {
color: royalblue !important;
display: inline-block;
}
.need-left{
.need-left {
width: 40%;
float: left;
height: 100%;
}
#left-1{
background-color: #007AFF; height: 30px;width: 100%; margin-bottom: 1px;line-height: 30px;
#left-1 {
background-color: #007AFF;
height: 30px;
width: 100%;
margin-bottom: 1px;
line-height: 30px;
}
#left-2{
#left-2 {
position: relative;
width: 100%;
height:482px;
height: 482px;
margin-top: -15px;
border: 1px solid rgb(218, 230, 239);
background: #FFF;
}
.active{
.active {
background: #efeff4;
}
.marginTop{
.marginTop {
margin-top: 0 !important;
height:515px !important;
}
.mui-scroll{
height: 100%;
padding-bottom: 15px;
box-sizing: border-box;
height: 515px !important;
}
.leftList{
border: solid #DAE6EF 1px ;height: 100%; background: white;
#pullrefresh {
width: 100%;
height: 100%;
overflow-y: scroll;
}
.mui-search #search{
.mui-search #search {
border-radius: 0;
}
#item1 div{
/* padding-bottom: 10px; */
}
.needLeftList{
.needLeftList {
padding: 5px 10px;
height: 93px;
border-bottom: 1px solid #dadada;
box-sizing: border-box;
overflow: hidden;
position: relative;
}
.needLeftList li{
width: 100%;
}
.needLeftList li {
width: 100%;
font-size: 12px;
line-height:20px;
line-height: 20px;
height: 20px;
}
.needLeftList li p{
.needLeftList li p {
width: 50%;
float: left;
color: #000000;
margin: 0;
margin: 0;
}
.needLeftList li span{
.needLeftList li span {
padding-left: 3px;
box-sizing: border-box;
display: block;
font-size: 12px;
float: left;
white-space:nowrap;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.needLeftList li span:nth-of-type(2){
.needLeftList li span:nth-of-type(2) {
padding-left: 1px !important;
}
.needLeftList li:nth-of-type(1) span:nth-of-type(2){
width:100px;
white-space:nowrap;
.needLeftList li:nth-of-type(1) span:nth-of-type(2) {
width: 100px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.needLeftList li:nth-of-type(2) span:nth-of-type(2){
width:100px;
}
.needLeftList li:nth-of-type(2) span:nth-of-type(2) {
width: 100px;
white-space:nowrap;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.needLeftList li:nth-of-type(3) p{
width: 100%;
}
.needLeftList li:nth-of-type(3) span:nth-of-type(2){
width:100px;
}
.needLeftList li:nth-of-type(3) p:nth-of-type(1) {
width: 50%;
}
.needLeftList li:nth-of-type(3) p:nth-of-type(2) {
width: 100px;
white-space:nowrap;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
#item2{
}
#item2 {
/* top: 32px; */
}
#item2 ul{
#item2 ul {
height: 93px;
border-bottom: 1px solid #dadada;
box-sizing: border-box;
}
#item2 ul li{
#item2 ul li {
margin: 0
}
#item2 ul li p{
#item2 ul li p {
text-align: left;
}
.leftState{
position: fixed;bottom: 1px;left: 1px;z-index: 10;width: 40%;background: #fff;
}
#pullrefresh{
width: 100%;
height: 100%;
.leftState {
position: fixed;
bottom: 1px;
left: 1px;
z-index: 10;
width: 40%;
background: #fff;
}
.meached {
position: absolute;
top: 2px;
right: 5px;
width: 70px;
}
.meached img {
width: 90%;
}
.meached{
.confirm {
position: absolute;
top: 18px;
top: 38px;
right: 10px;
width: 70px;
}
.meached img{
.confirm img {
width: 90%;
}
/************/
.need-right{
.need-right {
width: 60%;
float: right;
}
#right {
width: 100%;
width: 100%;
}
#right-2{
position: fixed; bottom: 1px; right: 1px;
#right-2 {
position: fixed;
bottom: 1px;
right: 1px;
}
#right-2 button{
width: 200px; height: 70px;"
#right-2 button {
width: 180px;
height: 70px;
}
#right-1 ul li p{
float: left;color: #060606;
white-space:nowrap;text-overflow: ellipsis;overflow: hidden;
#right-1 ul li p {
float: left;
color: #060606;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
#right-1 .mui-table-view-cell p:nth-of-type(1){
#right-1 .mui-table-view-cell p:nth-of-type(1) {
width: 16%;
}
#right-1 .mui-table-view-cell p:nth-of-type(2){
#right-1 .mui-table-view-cell p:nth-of-type(2) {
width: 40%;
}
#right-1 .mui-table-view-cell p:nth-of-type(3){
#right-1 .mui-table-view-cell p:nth-of-type(3) {
width: 12%;
}
#right-1 .mui-table-view-cell p:nth-of-type(4){
#right-1 .mui-table-view-cell p:nth-of-type(4) {
width: 32%;
}
\ No newline at end of file
dest/js/index/index.js
View file @ 7b03ff0c
......@@ -53,6 +53,7 @@ var minepage_style = {
var checkUrl="http://11wangjp.oss-cn-shanghai.aliyuncs.com/ftt_mes/version.txt";
// 下载wgt文件
var wgtUrl="http://11wangjp.oss-cn-shanghai.aliyuncs.com/ftt_mes/ftt_mes_hot.wgt";
console.log("检测更新地址："+wgtUrl);
function downWgtHot(){
plus.nativeUI.showWaiting("下载补丁文件...");
plus.downloader.createDownload( wgtUrl, {filename:"_doc/update/"}, function(d,status){
......@@ -101,6 +102,8 @@ var minepage_style = {
plus.nativeUI.closeWaiting();
if(xhr.status==200){
console.log("检测更新成功："+xhr.responseText);
var newVer=xhr.responseText;
if(compareVersion(wgtVer,newVer)){
......
dest/js/mes/FormingV2.js
View file @ 7b03ff0c
This diff is collapsed.
dest/js/mes/NeedlecarHandover.js
View file @ 7b03ff0c
This diff is collapsed.
dest/js/mes/NeedlecarreportV2.js
View file @ 7b03ff0c
This diff is collapsed.
dest/js/mes/cutting.js
View file @ 7b03ff0c
This diff is collapsed.
html/Cutting.html
View file @ 7b03ff0c
......@@ -20,22 +20,21 @@
<label>今日产量:{{number}} </label>
</div>
<div id="left-2" class="left-2">
<div class="mui-input-row mui-search" v-show="completeState">
<input id="search" class="mui-input-clear search" placeholder="搜索:指令号,货号" v-model="searchText" type="search"
pattern="\d*" @keyup.enter="goSearch($event)" :disabled="!completeState" @focus.prevent="changePosition()"
<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" :class="{ maeginTop:!completeState}">
<div class="Text">
<div class="left" id="pullrefresh" class="mui-content mui-scroll-wrapper">
<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" :class="{active:cur==index}" v-for="(list,index) in itemsHead" :key="list.IndexID"
@click="getDetailInfor(list.IndexID,index)">
<li>
<p><span>指令号：</span><span>{{list.IndexNo}}</span></p>
<p><span>小组：</span><span>{{list.WorkTeam}}</span></p>
<p><span>订单号：</span><span>{{list.CustomPO}}</span></p>
</li>
<li>
<p><span>货号：</span><span class="blueColor">{{list.StyleCode}}</span></p>
......@@ -43,6 +42,7 @@
</li>
<li>
<p><span>计划时间：</span><span>{{list.PlanDate}}</span></p>
<p><span>小组：</span><span>{{list.WorkTeam}}</span></p>
</li>
<li>
<p><span>预计交期：</span><span>{{list.OrderDeliveryTime}}</span></p>
......@@ -61,7 +61,7 @@
<ul class="complet-detail" v-for="(list,index) in itemsLeft2" :class="{active:cur==index}" @click="getDetailInfor(list.IndexID,index)">
<li>
<p><span>指令号：</span><span>{{list.IndexNo}}</span></p>
<p><span>小组：</span><span>{{list.WorkTeam}}</span></p>
<p><span>订单号：</span><span>{{list.CustomPO}}</span></p>
</li>
<li>
<p><span>货号：</span><span class="blueColor">{{list.StyleCode}}</span></p>
......@@ -69,11 +69,13 @@
</li>
<li>
<p><span>计划时间：</span><span>{{list.PlanDate}}</span></p>
<p><span>小组：</span><span>{{list.WorkTeam}}</span></p>
</li>
<li>
<p><span>预计交期：</span><span>{{list.OrderDeliveryTime}}</span></p>
<p><span>计划人：</span><span>{{list.PlanMan}}</span></p>
</li>
<a class="meached"> <img src="../dest/img/application/haveFinish.png" /></a>
</ul>
</div>
</div>
......@@ -94,8 +96,8 @@
<li class="mui-table-view-cell">
<p> 指令号: </p>
<p>&nbsp;{{rightInfor.IndexNo}} </p>
<p>日期: </p>
<p>{{rightInfor.OrderDeliveryTime}} </p>
<p>订单号: </p>
<p>{{rightInfor.CustomPO}}</p>
</li>
<li class="mui-table-view-cell">
<p> 货号: </p>
......@@ -113,7 +115,7 @@
</div>
<div class="left-submit">
<button type="button" class="mui-btn mui-btn-blue mui-btn-block" :disabled="disable_reportDelete" @click="reportDelete()">撤回实报</button>
<button type="button" class="mui-btn mui-btn-blue mui-btn-block" @click="nextPage(1,0)">品质问题</button>
<button type="button" class="mui-btn mui-btn-blue mui-btn-block" :disabled="disable_reportDelete" @click="nextPage(1,0)">品质问题</button>
</div>
</div>
<div id="right-4">
......
html/CuttingQuality.html
View file @ 7b03ff0c
......@@ -270,7 +270,6 @@
if (this.displayModel == 1) {
return "display: none "
}
}
},
methods: {
......@@ -288,7 +287,6 @@
bounce: false,
indicators: true, //是否显示滚动条
});
this.dateTime = moment().format().substring(0,10)
this.IndexID = mui.currentWebview.IndexID;
......@@ -296,6 +294,8 @@
this.itemsSize = mui.currentWebview.itemsSize;
this.type = mui.currentWebview.type;
this.parentSize = mui.currentWebview.parentSize;
this.ReportType = mui.currentWebview.ReportType;
console.log("类型：：："+this.ReportType);
// this.sizeNum = mui.currentWebview.sizeNum;
var that = this;
setTimeout(function(e){
......
html/FormingHandover.html
View file @ 7b03ff0c
......@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title></title>
<title>原来的成型交接页面成型交接</title>
<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" />
</head>
......@@ -12,7 +12,7 @@
<div id="app">
<div id="left-1" style="background-color: #007AFF; width: 40%; height: 30px; margin-bottom: 1px;">
<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 id="left-2" style="width: 40%">
<div class="mui-segmented-control" style="">
......
html/FormingV2.html
View file @ 7b03ff0c
......@@ -8,7 +8,6 @@
<link href="../dest/css/mui.min.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../dest/css/mui.picker.min.css" />
<link rel="stylesheet" type="text/css" href="../dest/css/Cutting.css" />
</head>
<body>
<div id="app" style=" display:block" v-cloak>
......@@ -21,22 +20,21 @@
<label>今日产量:{{number}} </label>
</div>
<div id="left-2" class="left-2">
<div class="mui-input-row mui-search" v-show="completeState">
<input id="search" class="mui-input-clear search" placeholder="搜索:指令号,货号" v-model="searchText" type="search"
pattern="\d*" @keyup.enter="goSearch($event)" :disabled="!completeState" @focus.prevent="changePosition()"
<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" :class="{ maeginTop:!completeState}">
<div class="Text">
<div class="left" id="pullrefresh" class="mui-content mui-scroll-wrapper">
<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" :class="{active:cur==index}" v-for="(list,index) in itemsHead" :key="list.IndexID"
@click="getDetailInfor(list.IndexID,index)">
<li>
<p><span>指令号：</span><span>{{list.IndexNo}}</span></p>
<p><span>小组：</span><span>{{list.WorkTeam}}</span></p>
<p><span>订单号：</span><span>{{list.CustomPO}}</span></p>
</li>
<li>
<p><span>货号：</span><span class="blueColor">{{list.StyleCode}}</span></p>
......@@ -44,11 +42,17 @@
</li>
<li>
<p><span>计划时间：</span><span>{{list.PlanDate}}</span></p>
<p><span>小组：</span><span>{{list.WorkTeam}}</span></p>
</li>
<li>
<p><span>预计交期：</span><span>{{list.OrderDeliveryTime}}</span></p>
<p><span>计划人：</span><span>{{list.PlanMan}}</span></p>
</li>
<!-- <a id="progress">
<div class="mui-text-center" :data-progress="list.CompleteRatio">
<p class="mui-progressbar mui-progressbar-in"><span></span></p>
</div>
</a> -->
</ul>
</div>
</div>
......@@ -57,7 +61,7 @@
<ul class="complet-detail" v-for="(list,index) in itemsLeft2" :class="{active:cur==index}" @click="getDetailInfor(list.IndexID,index)">
<li>
<p><span>指令号：</span><span>{{list.IndexNo}}</span></p>
<p><span>小组：</span><span>{{list.WorkTeam}}</span></p>
<p><span>订单号：</span><span>{{list.CustomPO}}</span></p>
</li>
<li>
<p><span>货号：</span><span class="blueColor">{{list.StyleCode}}</span></p>
......@@ -65,17 +69,17 @@
</li>
<li>
<p><span>计划时间：</span><span>{{list.PlanDate}}</span></p>
<p><span>小组：</span><span>{{list.WorkTeam}}</span></p>
</li>
<li>
<p><span>预计交期：</span><span>{{list.OrderDeliveryTime}}</span></p>
<p><span>计划人：</span><span>{{list.PlanMan}}</span></p>
</li>
<a class="meached"> <img src="../dest/img/application/haveFinish.png" /></a>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
......@@ -83,7 +87,6 @@
<div id="changePosition" class="mui-segmented-control btn_bottom">
<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>
<div id="right" class="right">
......@@ -93,8 +96,8 @@
<li class="mui-table-view-cell">
<p> 指令号: </p>
<p>&nbsp;{{rightInfor.IndexNo}} </p>
<p>日期: </p>
<p>{{rightInfor.OrderDeliveryTime}} </p>
<p>订单号: </p>
<p>{{rightInfor.CustomPO}}</p>
</li>
<li class="mui-table-view-cell">
<p> 货号: </p>
......
html/NeedlecarHandover.html
View file @ 7b03ff0c
......@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>针车交接</title>
<title>裁断配套确认</title>
<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" />
......@@ -14,24 +14,24 @@
<div class="need-left">
<div id="left-1">
<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 class="mui-input-row mui-search" v-show="completeState">
<input id="search" class="mui-input-clear search" placeholder="搜索:指令号,货号" v-model="searchText" type="search"
pattern="\d*" @keyup.enter="goSearch($event)" :disabled="!completeState" @focus.prevent="changePosition()"
<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 id="left-2" :class="{ marginTop:!completeState}">
<div id="left-2">
<div id="pullrefresh">
<div class="mui-scroll">
<div id="item1" :state="completeState" class="scroll1 leftList maeginTop">
<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)">
<li>
<p><span>指令号：</span><span>{{items.IndexNo}}</span></p>
<p><span>班组：</span><span>{{items.WorkTeam}}</span></p>
<p><span>订单号：</span><span>{{items.CustomPO}}</span></p>
</li>
<li>
<p><span>货号：</span><span class="blueColor">{{items.StyleCode}}</span></p>
......@@ -39,23 +39,26 @@
</li>
<li>
<p><span>计划时间：</span><span>{{items.PlanDate}}</span></p>
<p><span>班组：</span><span>{{items.ToWorkTeam}}</span></p>
</li>
<li>
<p><span>实报时间：</span><span>{{items.ReportDate}}</span></p>
<p><span>实报人：</span><span>{{items.ReportUser}}</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>
</ul>
</div>
</div>
<div id="item2" :state="!completeState" class="scroll2 leftList " :style="display_">
<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"
@click="selectLeft(items,n )">
<li>
<p><span>指令号：</span><span>{{items.IndexNo}}</span></p>
<p><span>班组：</span><span>{{items.WorkTeam}}</span></p>
<p><span>订单号：</span><span>{{items.CustomPO}}</span></p>
</li>
<li>
<p><span>货号：</span><span class="blueColor">{{items.StyleCode}}</span></p>
......@@ -63,12 +66,13 @@
</li>
<li>
<p><span>计划时间：</span><span>{{items.PlanDate}}</span></p>
<p><span>班组：</span><span>{{items.ToWorkTeam}}</span></p>
</li>
<li>
<p><span>实报时间：</span><span>{{items.ReportDate}}</span></p>
<p><span>实报人：</span><span>{{items.ReportUser}}</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>
</ul>
</div>
</div>
......@@ -94,7 +98,6 @@
<p class="blueColor">&nbsp;{{itemsDetail.StyleCode}}</p>
<p>颜色: </p>
<p>{{itemsDetail.ColorName}} </p>
</li>
<li class="mui-table-view-cell">
<p> 数量: </p>
......@@ -122,6 +125,12 @@
<p> 实报人: </p>
<p>&nbsp;{{itemsDetail.ReportUser}} </p>
</li>
<li class="mui-table-view-cell">
<p> 确认人: </p>
<p>&nbsp;{{itemsDetail.ConfirmUserName}} </p>
<p>确认时间: </p>
<p>{{itemsDetail.ConfirmDate}} </p>
</li>
<li class="mui-table-view-cell">
<p> 配套人: </p>
<p>&nbsp;{{itemsDetail.MatchUserName}} </p>
......@@ -134,12 +143,14 @@
<p>交接时间: </p>
<p>{{itemsDetail.CheckDate}} </p>
</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="sty1" @click="selectPerson">人员排班</button> -->
<button type="button" class="mui-btn mui-btn-blue " :disabled="btnCheck" @click="submit">{{submitText}}</button>
</div>
</div>
......
html/NeedlecarreportV2.html
View file @ 7b03ff0c
......@@ -21,22 +21,20 @@
<label>今日产量:{{number}} </label>
</div>
<div id="left-2" class="left-2">
<div class="mui-input-row mui-search" v-show="completeState">
<input id="search" class="mui-input-clear search" placeholder="搜索:指令号,货号" v-model="searchText" type="search"
pattern="\d*" @keyup.enter="goSearch($event)" :disabled="!completeState" @focus.prevent="changePosition()"
@blur.prevent="changePosition1()">
<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" :class="{ maeginTop:!completeState}">
<div class="Text">
<div class="left" id="pullrefresh" class="mui-content mui-scroll-wrapper">
<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" :class="{active:cur==index}" v-for="(list,index) in itemsHead" :key="list.IndexID"
@click="getDetailInfor(list.IndexID,index)">
<li>
<p><span>指令号：</span><span>{{list.IndexNo}}</span></p>
<p><span>小组：</span><span>{{list.WorkTeam}}</span></p>
<p><span>订单号：</span><span>{{list.CustomPO}}</span></p>
</li>
<li>
<p><span>货号：</span><span class="blueColor">{{list.StyleCode}}</span></p>
......@@ -44,11 +42,17 @@
</li>
<li>
<p><span>计划时间：</span><span>{{list.PlanDate}}</span></p>
<p><span>小组：</span><span>{{list.WorkTeam}}</span></p>
</li>
<li>
<p><span>预计交期：</span><span>{{list.OrderDeliveryTime}}</span></p>
<p><span>计划人：</span><span>{{list.PlanMan}}</span></p>
</li>
<!-- <a id="progress">
<div class="mui-text-center" :data-progress="list.CompleteRatio">
<p class="mui-progressbar mui-progressbar-in"><span></span></p>
</div>
</a> -->
</ul>
</div>
</div>
......@@ -57,7 +61,7 @@
<ul class="complet-detail" v-for="(list,index) in itemsLeft2" :class="{active:cur==index}" @click="getDetailInfor(list.IndexID,index)">
<li>
<p><span>指令号：</span><span>{{list.IndexNo}}</span></p>
<p><span>小组：</span><span>{{list.WorkTeam}}</span></p>
<p><span>订单号：</span><span>{{list.CustomPO}}</span></p>
</li>
<li>
<p><span>货号：</span><span class="blueColor">{{list.StyleCode}}</span></p>
......@@ -65,17 +69,17 @@
</li>
<li>
<p><span>计划时间：</span><span>{{list.PlanDate}}</span></p>
<p><span>小组：</span><span>{{list.WorkTeam}}</span></p>
</li>
<li>
<p><span>预计交期：</span><span>{{list.OrderDeliveryTime}}</span></p>
<p><span>计划人：</span><span>{{list.PlanMan}}</span></p>
</li>
<a class="meached"> <img src="../dest/img/application/haveFinish.png" /></a>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
......@@ -83,7 +87,6 @@
<div id="changePosition" class="mui-segmented-control btn_bottom">
<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>
<div id="right" class="right">
......@@ -93,8 +96,8 @@
<li class="mui-table-view-cell">
<p> 指令号: </p>
<p>&nbsp;{{rightInfor.IndexNo}} </p>
<p>日期: </p>
<p>{{rightInfor.OrderDeliveryTime}} </p>
<p>订单号: </p>
<p>{{rightInfor.CustomPO}}</p>
</li>
<li class="mui-table-view-cell">
<p> 货号: </p>
......
html/login.html
View file @ 7b03ff0c
......@@ -44,6 +44,8 @@
<div class="mui-content-padded">
<i id="promptBtn" class="iconfont icon-diannao computed"></i>
<button id='login' class="mui-btn login-btn" data-loading-text="登录中...">登录</button>
</div>
</div>
<div class="alertBox">
......@@ -61,7 +63,9 @@
<script src="../dest/js/mui.min.js" type="text/javascript" charset="utf-8"></script>
<script src="../dest/js/zepto.min.js" type="text/javascript" charset="utf-8"></script>
<script src="../dest/js/app.min.js" type="text/javascript" charset="utf-8"></script>
<script src="../dest/js/public.min.js" type="text/javascript" charset="utf-8"></script>
<script src="../dest/js/login/login.js" type="text/javascript"></script>
</body>
</html>
html/setting.html
View file @ 7b03ff0c
......@@ -17,7 +17,12 @@
<div class="mui-content">
<ul class="mui-table-view" id="setting-list">
<li class="mui-table-view-cell">
<a class="mui-navigate-right" data-href="setting-message.html" data-id="setting-message">
<a class="mui-navigate-right" data-href="changePassWord.html" data-id="changePassWord">
修改密码
</a>
</li>
<li class="mui-table-view-cell">
<a class="mui-navigate-right" data-href="message.html" data-id="message">
新消息通知
</a>
</li>
......
html/sop.html
View file @ 7b03ff0c
......@@ -7,8 +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" />
</head>
<body style="margin: 0; padding: 0; width: 100px;">
<body style="margin: 0; padding: 0; width: 100%;height: 100%;">
<div id="app">
<header @click="backaction" class="mui-bar mui-bar-nav " style="width: 150px !important; background: #DCDCE1; position: relative;left: 810px; " >
<button class="mui-icon mui-icon-arrowleft mui-btn-outlined ;" style=" border: 0px; padding: 0; width: 50px; height: 100%; color: #007AFF;"
......@@ -17,13 +16,10 @@
<!-- <a class="mui-icon mui-icon-left-nav mui-pull-left" onclick="mui.back()"></a> -->
<h1 class="mui-title" >返回</h1>
</header>
<div class=" mui-fullscreen" >
<iframe style=" border-width: 0; "
:src="link"
width="100%" height="571"></iframe>
width="100%" height="100%"></iframe>
</div>
</div>
......
html/work.html
View file @ 7b03ff0c
......@@ -77,27 +77,28 @@
<div class="application-box" types="90032">
<a ids="7" href="javascript:;">
<div class="application-img"><img src="../dest/img/application/zcsb.png" alt="针车实报" /></div>
<h3 class="application-tit" title="针车实报V2">针车实报V2</h3>
<h3 class="application-tit" title="针车实报V2">针车实报</h3>
</a>
</div>
<div class="application-box" types="90033">
<a ids="8" href="javascript:;">
<div class="application-img"><img src="../dest/img/application/zcsb.png" alt="成型实报" /></div>
<h3 class="application-tit" title="成型实报V2">成型实报V2</h3>
<h3 class="application-tit" title="成型实报V2">成型实报</h3>
</a>
</div>
<div class="application-box" types="90028">
<a ids="4" href="javascript:;">
<div class="application-img"><img src="../dest/img/zc.png" alt="工序交接-针车" /></div>
<h3 class="application-tit" title="工序交接-针车">针车交接</h3>
<h3 class="application-tit" title="工序交接-针车">裁断配套确认</h3>
</a>
</div>
<div class="application-box" types="90029">
<a ids="3" href="javascript:;">
<div class="application-img"><img src="../dest/img/cx.png" alt="工序交接-成型" /></div>
<h3 class="application-tit" title="工序交接-针车">成型交接</h3>
<h3 class="application-tit" title="工序交接-针车">针车配套确认</h3>
</a>
</div>
<div class="application-box" types="90030">
......@@ -113,12 +114,13 @@
</a>
</div>
<div class="application-box" types="设置">
<!-- <div class="application-box" types="设置">
<a ids="999" href="javascript:;">
<div class="application-img"><img src="../dest/img/sz.png" alt="设置" /></div>
<h3 class="application-tit" title="设置">设置</h3>
</a>
</div>
</div> -->
</div>
<script src="../dest/js/mui.min.js"></script>
<script src="../dest/js/createView.min.js"></script>
......@@ -143,15 +145,13 @@
})(mui, document)
}
function init() {
mui.init();
var lisy = Dom.getById('lialist');
var isds = lisy.getElementsByClassName('application-box');
var ucond = Dom.getById('centicon');
var pages = ['Needlecarreport_new', 'Cutting', "Forming", "FormingHandover", "NeedlecarHandover", "MyWork","NeedlecarPBB","NeedlecarreportV2","FormingV2"
];
var pages = ['Needlecarreport_new', 'Cutting', "Forming", "NeedleMatch", "NeedlecarHandover",
"MyWork","NeedlecarPBB","NeedlecarreportV2","FormingV2"];
//var tits = ['色卡档案', '样品企划', '样品客户意见', '款式图片档案', '下单管理', '生产进度表', '消息提醒', '业务审批', '订货主场','针车实报','设置'];
var lab1 = document.getElementsByTagName("a");
function onGetDataSuccess(e) {
......@@ -162,9 +162,9 @@
var items = e.items;
console.log(JSON.stringify(items))
//手动在结尾添加了一个设置项目
items.push({
Code: "设置"
});
// items.push({
// Code: "设置"
// });
//console.log(JSON.stringify(items));
......@@ -189,12 +189,8 @@
Dom.open('login.html')
return;
}
}
}
//console.log("GetModuleList::begin" )
Api.post('/api/User/GetModuleList', {}, onGetDataSuccess, onGetDataFailure);
......
manifest.json
View file @ 7b03ff0c
......@@ -3,7 +3,7 @@
"id" : "H544710A8", /*应用的标识，创建应用时自动生成，勿手动修改*/
"name" : "飞天兔MES", /*应用名称，程序桌面图标名称*/
"version" : {
"name" : "1.0.0.90", /*应用版本名称*/
"name" : "1.0.0.97", /*应用版本名称*/
"code" : 338
},
"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