Commit b8a980ba by yucheng.jiang

建页面

parent ae10f107
...@@ -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/'
}, },
/** /**
......
...@@ -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;
} }
......
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