|
|
@@ -80,7 +80,7 @@
|
|
|
@change="rowChange(scope.column.data)">
|
|
|
</el-date-picker>
|
|
|
<div v-else>
|
|
|
- <p v-if="scope.column.data.delivery === 0 ">不管控交期</p>
|
|
|
+ <p v-if="scope.column.data.delivery == 0 ">不管控交期</p>
|
|
|
<p v-else>{{scope.column.data.needdate}}</p>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -532,31 +532,7 @@ export default {
|
|
|
},
|
|
|
pickerOptions1: {
|
|
|
async disabledDate(time) {
|
|
|
- let newDate = new Date()
|
|
|
- newDate = newDate.setDate(newDate.getDate() + 3)
|
|
|
- console.log(newDate,'日期获取')
|
|
|
- console.log(new Date(newDate),'日期转化')
|
|
|
- let year = new Date(newDate).getFullYear()
|
|
|
- let month = new Date(newDate).getMonth() + 1
|
|
|
- let day = new Date(newDate).getDate()
|
|
|
- console.log(year + '-' + month + '-' + day)
|
|
|
- let param = {
|
|
|
- "id":20221215165504,
|
|
|
- "content":{
|
|
|
- "isExport":0,
|
|
|
- "isnext":'0',
|
|
|
- "pageNumber":1,
|
|
|
- "pageSize":100,
|
|
|
- "where":{
|
|
|
- "begindate":year + '-' + month + '-' + day,
|
|
|
- "enddate":year + '-' + month + '-' + day
|
|
|
- }
|
|
|
- },
|
|
|
- }
|
|
|
- const res = await this.$api.requested(param)
|
|
|
- console.log(res,'结果')
|
|
|
-
|
|
|
- return time.getTime() < newDate;
|
|
|
+ return time.getTime() < new Date().getTime();
|
|
|
},
|
|
|
},
|
|
|
pickerOptions: {
|