|
|
@@ -57,6 +57,7 @@
|
|
|
<el-button v-if="isRoleEdit" class="success" icon="el-icon-circle-check" @click="handleQuickcompletion">快速完成</el-button>
|
|
|
<el-button v-if="isRoleEdit && ispalyUdYyn" class="success" icon="el-icon-plus" @click="handleGetUd4">云养牛搅拌数据上传</el-button>
|
|
|
<el-button v-if="isRoleEdit && ispalyUdYyn" class="success" icon="el-icon-plus" @click="handleGetUd5">云养牛撒料上传</el-button>
|
|
|
+ <!-- v-if="isRoleEdit && ispalyUdYyn" -->
|
|
|
</div>
|
|
|
<!-- 日执行计划 -->
|
|
|
<div class="table">
|
|
|
@@ -883,15 +884,15 @@
|
|
|
<el-form-item label="时间:" prop="date">
|
|
|
<el-date-picker v-if="sapUpload.dialogStatus != 'udload5' && sapUpload.dialogStatus != 'udload4'" v-model="sapUpload.temp.date" :clearable="false" class="filter-item" type="date" />
|
|
|
<el-date-picker v-else start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
format="yyyy-MM-dd"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
v-model="dateRange"
|
|
|
- :clearable="false"
|
|
|
+ :clearable="false"
|
|
|
:picker-options="pickerOptionsT"
|
|
|
@change="handleDateChange"
|
|
|
class="filter-item" type="daterange" />
|
|
|
-
|
|
|
+
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -948,7 +949,7 @@ export default {
|
|
|
disabledDate: this.disabledDateT
|
|
|
},
|
|
|
pickDateT:'',
|
|
|
-
|
|
|
+
|
|
|
myheight: document.documentElement.clientHeight - 280,
|
|
|
// myheight: 500,
|
|
|
enlargeHeight: document.documentElement.clientHeight - 85 - 165 + 50,
|
|
|
@@ -1303,13 +1304,27 @@ export default {
|
|
|
oneMonthAgo.setDate(today.getDate() - 15)
|
|
|
|
|
|
console.log( today.getTime(),oneMonthAgo.getTime(),'选择日期----2')
|
|
|
- return time.getTime() > today.getTime() || time.getTime() < oneMonthAgo.getTime();
|
|
|
-
|
|
|
+ // return time.getTime() > today.getTime() || time.getTime() < oneMonthAgo.getTime();
|
|
|
+ return time.getTime() > today.getTime()
|
|
|
+
|
|
|
+ },
|
|
|
+ checkDateDifference(date1, date2) {
|
|
|
+ const dateObj1 = new Date(date1);
|
|
|
+ const dateObj2 = new Date(date2);
|
|
|
+ const differenceInMs = Math.abs(dateObj2 - dateObj1);
|
|
|
+ const differenceInDays = differenceInMs / (1000 * 60 * 60 * 24);
|
|
|
+
|
|
|
+ if (differenceInDays > 7) {
|
|
|
+ this.$message.warning('日期范围相隔大于7天,请重新选择!');
|
|
|
+ return false;
|
|
|
+ } else {
|
|
|
+ this.dateRange = [date1, date2]
|
|
|
+ }
|
|
|
},
|
|
|
handleDateChange(value){
|
|
|
console.log(value,'arr')
|
|
|
if (value.length === 2) {
|
|
|
- this.dateRange = [value[0], value[1]]
|
|
|
+ this.checkDateDifference(value[0], value[1])
|
|
|
}
|
|
|
},
|
|
|
udData5() {
|
|
|
@@ -1327,7 +1342,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
async sendRequests(startDate, endDate,url) {
|
|
|
- const start = new Date(startDate);
|
|
|
+ const start = new Date(startDate);
|
|
|
const end = new Date(endDate);
|
|
|
const requests = [];
|
|
|
|
|
|
@@ -3710,12 +3725,12 @@ export default {
|
|
|
this.sapUpload.dialogStatus = 'udload4'
|
|
|
this.sapUpload.dialogFormVisible = true
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
handleGetUd5() {
|
|
|
this.sapUpload.dialogStatus = 'udload5'
|
|
|
this.sapUpload.dialogFormVisible = true
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
udData1() {
|
|
|
this.$refs['sapUpload'].validate((valid) => {
|
|
|
if (valid) {
|