Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MES_PAD
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
MES_PAD
Commits
6f87e2a8
Commit
6f87e2a8
authored
Apr 08, 2019
by
王文琼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
youhua
parent
04b66a86
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
154 additions
and
131 deletions
+154
-131
NeedleDispatch.js
dest/js/mes/NeedleDispatch.js
+120
-105
NeedlecarHandover.js
dest/js/mes/NeedlecarHandover.js
+5
-5
Cutting.html
html/Cutting.html
+0
-1
NeedleDispatch.html
html/NeedleDispatch.html
+24
-16
work.html
html/work.html
+4
-3
manifest.json
manifest.json
+1
-1
No files found.
dest/js/mes/NeedleDispatch.js
View file @
6f87e2a8
This diff is collapsed.
Click to expand it.
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,38 +77,46 @@
...
@@ -77,38 +77,46 @@
<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>
</table>
</table>
</div>
</div>
...
@@ -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"
...
@@ -65,7 +64,7 @@
...
@@ -65,7 +64,7 @@
<h3
class=
"application-tit"
:title=
"list.Name"
>
{{list.Name}}
</h3>
<h3
class=
"application-tit"
:title=
"list.Name"
>
{{list.Name}}
</h3>
</a>
</a>
</div>
</div>
<!-- <div class="application-box" types="设置">
<!-- <div class="application-box" types="设置">
<a ids="999" href="javascript:;">
<a ids="999" href="javascript:;">
<div class="application-img"><img src="../dest/img/sz.png" alt="设置" /></div>
<div class="application-img"><img src="../dest/img/sz.png" alt="设置" /></div>
...
@@ -127,10 +126,12 @@
...
@@ -127,10 +126,12 @@
{
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平板版"
,
/*应用描述信息*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment