Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
Laisi_AutoMES2
Overview
Overview
Details
Activity
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
jiawei.su
Laisi_AutoMES2
Commits
b8a980ba
Commit
b8a980ba
authored
Jan 19, 2021
by
yucheng.jiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
建页面
parent
ae10f107
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
29 deletions
+31
-29
index.js
Html/src/config/index.js
+1
-1
beat.vue
Html/src/view/cnc/set/beat.vue
+30
-28
associateProduct.vue
Html/src/view/fms/associate/associateProduct.vue
+0
-0
accountInfo.vue
Html/src/view/fms/config/accountInfo.vue
+0
-0
typeMaintenance.vue
Html/src/view/fms/config/typeMaintenance.vue
+0
-0
storageInfoQuery.vue
Html/src/view/wms/whStatusQuery/storageInfoQuery.vue
+0
-0
No files found.
Html/src/config/index.js
View file @
b8a980ba
...
@@ -27,7 +27,7 @@ export default {
...
@@ -27,7 +27,7 @@ export default {
*/
*/
publicPath
:
{
publicPath
:
{
dev
:
'http://
localhost:8105
/'
,
dev
:
'http://
172.8.10.173/apis
/'
,
pro
:
'apis/'
pro
:
'apis/'
},
},
/**
/**
...
...
Html/src/view/cnc/set/beat.vue
View file @
b8a980ba
...
@@ -189,14 +189,14 @@
...
@@ -189,14 +189,14 @@
</div>
</div>
<div
class=
"filter"
>
<div
class=
"filter"
>
<label>
<label>
<
i>
*
</i
>
<
!-- <i>*</i> --
>
{{this.$t('1049')}}:
{{this.$t('1049')}}:
</label>
</label>
<DatePicker
type=
"date"
v-model=
"addobj.start_time"
class=
"searchInput"
></DatePicker>
<DatePicker
type=
"date"
v-model=
"addobj.start_time"
class=
"searchInput"
></DatePicker>
</div>
</div>
<div
class=
"filter"
>
<div
class=
"filter"
>
<label>
<label>
<
i>
*
</i
>
<
!-- <i>*</i> --
>
{{this.$t('1050')}}:
{{this.$t('1050')}}:
</label>
</label>
<DatePicker
type=
"date"
v-model=
"addobj.end_time"
class=
"searchInput"
></DatePicker>
<DatePicker
type=
"date"
v-model=
"addobj.end_time"
class=
"searchInput"
></DatePicker>
...
@@ -304,14 +304,14 @@
...
@@ -304,14 +304,14 @@
</div>
</div>
<div
class=
"filter"
>
<div
class=
"filter"
>
<label>
<label>
<
i>
*
</i
>
<
!-- <i>*</i> --
>
{{this.$t('1049')}}:
{{this.$t('1049')}}:
</label>
</label>
<DatePicker
type=
"date"
v-model=
"editobj.start_time"
class=
"searchInput"
></DatePicker>
<DatePicker
type=
"date"
v-model=
"editobj.start_time"
class=
"searchInput"
></DatePicker>
</div>
</div>
<div
class=
"filter"
>
<div
class=
"filter"
>
<label>
<label>
<
i>
*
</i
>
<
!-- <i>*</i> --
>
{{this.$t('1050')}}:
{{this.$t('1050')}}:
</label>
</label>
<DatePicker
type=
"date"
v-model=
"editobj.end_time"
class=
"searchInput"
></DatePicker>
<DatePicker
type=
"date"
v-model=
"editobj.end_time"
class=
"searchInput"
></DatePicker>
...
@@ -512,6 +512,8 @@ export default {
...
@@ -512,6 +512,8 @@ export default {
page
:
this
.
page
,
page
:
this
.
page
,
pagesize
:
this
.
pagesize
,
pagesize
:
this
.
pagesize
,
};
};
this
.
detailobj
=
{};
this
.
selectids
=
[];
axios
axios
.
request
({
.
request
({
url
:
"/cnc/BeatAllocation/ShowBeatAllocation"
,
url
:
"/cnc/BeatAllocation/ShowBeatAllocation"
,
...
@@ -712,18 +714,18 @@ export default {
...
@@ -712,18 +714,18 @@ export default {
this
.
$Message
.
error
(
this
.
$t
(
"950156"
));
this
.
$Message
.
error
(
this
.
$t
(
"950156"
));
return
false
;
return
false
;
}
}
if
(
//
if (
this
.
addobj
.
start_time
===
""
||
//
this.addobj.start_time === "" ||
this
.
addobj
.
start_time
===
undefined
//
this.addobj.start_time === undefined
)
{
//
) {
this
.
$Message
.
error
(
this
.
$t
(
"9000127"
));
//
this.$Message.error(this.$t("9000127"));
return
false
;
//
return false;
}
//
}
if
(
this
.
addobj
.
end_time
===
""
||
this
.
addobj
.
end_time
===
undefined
)
{
//
if (this.addobj.end_time === "" || this.addobj.end_time === undefined) {
this
.
$Message
.
error
(
this
.
$t
(
"9000128"
));
//
this.$Message.error(this.$t("9000128"));
return
false
;
//
return false;
}
//
}
if
(
this
.
addobj
.
start_time
>
this
.
addobj
.
end_time
)
{
if
(
this
.
addobj
.
start_time
&&
this
.
addobj
.
end_time
&&
this
.
addobj
.
start_time
>
this
.
addobj
.
end_time
)
{
this
.
$Message
.
error
(
this
.
$t
(
"100218"
));
this
.
$Message
.
error
(
this
.
$t
(
"100218"
));
return
false
;
return
false
;
}
}
...
@@ -852,18 +854,18 @@ export default {
...
@@ -852,18 +854,18 @@ export default {
this
.
$Message
.
error
(
this
.
$t
(
"950156"
));
this
.
$Message
.
error
(
this
.
$t
(
"950156"
));
return
false
;
return
false
;
}
}
if
(
//
if (
this
.
editobj
.
start_time
===
""
||
//
this.editobj.start_time === "" ||
this
.
editobj
.
start_time
===
undefined
//
this.editobj.start_time === undefined
)
{
//
) {
this
.
$Message
.
error
(
this
.
$t
(
"9000127"
));
//
this.$Message.error(this.$t("9000127"));
return
false
;
//
return false;
}
//
}
if
(
this
.
editobj
.
end_time
===
""
||
this
.
editobj
.
end_time
===
undefined
)
{
//
if (this.editobj.end_time === "" || this.editobj.end_time === undefined) {
this
.
$Message
.
error
(
this
.
$t
(
"9000128"
));
//
this.$Message.error(this.$t("9000128"));
return
false
;
//
return false;
}
//
}
if
(
this
.
editobj
.
start_time
>
this
.
editobj
.
end_time
)
{
if
(
this
.
editobj
.
start_time
&&
this
.
editobj
.
end_time
&&
this
.
editobj
.
start_time
>
this
.
editobj
.
end_time
)
{
this
.
$Message
.
error
(
this
.
$t
(
"100218"
));
this
.
$Message
.
error
(
this
.
$t
(
"100218"
));
return
false
;
return
false
;
}
}
...
...
Html/src/view/fms/associate/associateProduct.vue
0 → 100644
View file @
b8a980ba
Html/src/view/fms/config/accountInfo.vue
0 → 100644
View file @
b8a980ba
Html/src/view/fms/config/typeMaintenance.vue
0 → 100644
View file @
b8a980ba
Html/src/view/wms/whStatusQuery/storageInfoQuery.vue
0 → 100644
View file @
b8a980ba
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