|  | @@ -194,8 +194,8 @@
 | 
	
		
			
				|  |  |              </el-form-item>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  |            <el-col :span="8">
 | 
	
		
			
				|  |  | -            <el-form-item label="当前时间:" prop="DATE">
 | 
	
		
			
				|  |  | -              <el-date-picker v-model="temp.DATE" type="date" placeholder="当前时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd" disabled style="width:100%;" />
 | 
	
		
			
				|  |  | +            <el-form-item label="当前时间:" prop="date">
 | 
	
		
			
				|  |  | +              <el-date-picker v-model="temp.date" type="date" placeholder="当前时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd" disabled style="width:100%;" />
 | 
	
		
			
				|  |  |              </el-form-item>
 | 
	
		
			
				|  |  |            </el-col>
 | 
	
		
			
				|  |  |          </el-row>
 | 
	
	
		
			
				|  | @@ -547,7 +547,7 @@ export default {
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |        let data = {
 | 
	
		
			
				|  |  | -        name:"getPastureSumDayWater",
 | 
	
		
			
				|  |  | +        name:"getPastureSumDayElec",
 | 
	
		
			
				|  |  |          parammaps:{
 | 
	
		
			
				|  |  |            startTime: this.getChart7Parm.parammaps.startTime || parseTime(new Date(), '{y}-{m}'),
 | 
	
		
			
				|  |  |            endTime: this.getChart7Parm.parammaps.endTime || parseTime(new Date(), '{y}-{m}'),
 | 
	
	
		
			
				|  | @@ -984,7 +984,7 @@ export default {
 | 
	
		
			
				|  |  |        this.temp.note = ''
 | 
	
		
			
				|  |  |        this.temp.employeId = ''
 | 
	
		
			
				|  |  |        this.temp.employeName = ''
 | 
	
		
			
				|  |  | -      this.temp.DATE = parseTime(new Date(), '{y}-{m}-{d}')
 | 
	
		
			
				|  |  | +      this.temp.date = parseTime(new Date(), '{y}-{m}-{d}')
 | 
	
		
			
				|  |  |        this.temp.inputDatetime = parseTime(new Date(), '{y}-{m}-{d}')
 | 
	
		
			
				|  |  |        this.temp.typeName = ''
 | 
	
		
			
				|  |  |        this.temp.assTypeId = ''
 | 
	
	
		
			
				|  | @@ -1142,10 +1142,12 @@ export default {
 | 
	
		
			
				|  |  |        })
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      form_edit(row) {
 | 
	
		
			
				|  |  | +      console.log(row,'编剧')
 | 
	
		
			
				|  |  |        this.temp = Object.assign({}, row) // copy obj
 | 
	
		
			
				|  |  |        // if (this.temp.endAmount !== '' && this.temp.endAmount !== undefined && this.temp.endAmount !== null && this.temp.aAmount !== '' && this.temp.aAmount !== undefined && this.temp.aAmount !== null) {
 | 
	
		
			
				|  |  |        //   this.$set(this.temp, 'consumption', parseFloat(this.temp.endAmount) - parseFloat(this.temp.aAmount))
 | 
	
		
			
				|  |  |        // }
 | 
	
		
			
				|  |  | +      this.temp.date = row.dateFormat;
 | 
	
		
			
				|  |  |        this.dialogStatus = 'update'
 | 
	
		
			
				|  |  |        this.dialogFormVisible = true
 | 
	
		
			
				|  |  |        this.$nextTick(() => {
 |