Эх сурвалжийг харах

修改了油卡跟设备保养

duanxiaoduan 1 жил өмнө
parent
commit
4c224ad91f

+ 8 - 3
src/views/cost/diesel/index.vue

@@ -107,7 +107,7 @@
           <el-button v-if="isDieselModify" type="success" size="mini" @click="handleDieselUpdate(row)">编辑</el-button>
           <!-- <el-button type="primary" size="mini" style="width:70px" @click="handleDosageRecord(row)">用量记录</el-button> -->
           <!-- <el-button v-if="isDieselUpdate" type="success" size="mini" @click="handleDieselUpdate(row)">修改</el-button> -->
-          <!-- <el-button v-if="isDieselDel" type="danger" size="mini" @click="handleDieselDel(row)">删除</el-button> -->
+          <el-button v-if="isDieselDel" type="danger" size="mini" @click="handleDieselDel(row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -892,6 +892,7 @@ export default {
       this.dialogFormVisible = true
       this.temp.empId = ''
       this.temp.departmentId = ''
+      this.temp.oilType = ''
       this.temp.pastureId = this.$store.state.user.pastureid
       this.$nextTick(() => {
         this.$refs['temp'].clearValidate()
@@ -1005,7 +1006,7 @@ export default {
                 duration: 2000
               })
             } else {
-              failproccess(response, this.$notify)
+              failproccess(response.data, this.$notify)
             }
           })
         }
@@ -1090,7 +1091,11 @@ export default {
           this.requestParam.name = 'deleteDiesel'
           this.requestParam.parammaps = {}
           this.requestParam.parammaps['id'] = row.id
-          PostDataByName(this.requestParam).then(() => {
+          let url = 'authdata/diese/off'
+          let data = {
+            id:parseInt(row.id),
+          }
+          postJson(url,data).then(response => {
             this.get_table_data()
             this.dialogFormVisible = false
             this.$notify({

+ 7 - 7
src/views/maintenance/maintain/index.vue

@@ -181,7 +181,7 @@
                 <!-- <el-form-item label="保养人:" prop="upkeepPerson">
                   <el-input ref="upkeepPerson" v-model="seeTemp.upkeepPerson" disabled />
                 </el-form-item> -->
-                <el-form-item label="保养人:" prop="useEmpName">
+                <el-form-item label="机修 :" prop="useEmpName">
                   <el-input ref="useEmpName" v-model="seeTemp.useEmpName" disabled />
                 </el-form-item>
               </el-col>
@@ -194,7 +194,7 @@
                 <!-- <el-form-item label="使用人:" prop="useEmpName">
                   <el-input ref="useEmpName" v-model="seeTemp.useEmpName" disabled />
                 </el-form-item> -->
-                <el-form-item label="使用人:" prop="upkeepPerson">
+                <el-form-item label="保养人:" prop="upkeepPerson">
                   <el-input ref="upkeepPerson" v-model="seeTemp.upkeepPerson" disabled />
                 </el-form-item>
               </el-col>
@@ -1375,10 +1375,10 @@ export default {
         return '审核中'
       } else if (cellValue.SHStatue == 4) {
         return '未通过'
- 
+
       } else if (cellValue.SHStatue == 8) {
         return '未通过'
-    
+
       } else if (cellValue.SHStatue == 7) {
         return '已通过'
       }
@@ -1402,7 +1402,7 @@ export default {
       if (this.seeTemp.SHStatue === 1) {
         this.activeList = [{ title: '保养人审核' }, { title: '机修审核' },   { title: '设备主管审核' }]
         this.active = 0
-        
+
       } else if (this.seeTemp.SHStatue === 2) {
         this.activeList = [{ title: '保养人审核', name: this.seeTemp.upkeepPerson, date: this.seeTemp.finishedTime, status: '', reason: '' }, { title: '机修审核' },  { title: '设备主管审核' }]
         this.active = 1
@@ -1413,7 +1413,7 @@ export default {
       } else if (this.seeTemp.SHStatue === 4) {
         this.active = 2
         this.activeList = [{ title: '保养人审核', name: this.seeTemp.upkeepPerson, date: this.seeTemp.finishedTime, status: '', reason: '' }, { title: '机修审核', date: this.seeTemp.useChargeDate, name: this.seeTemp.useChargePerson, status: 'error', reason: reason }, { title: '设备主管审核' }]
-        
+
 
       } else if (this.seeTemp.SHStatue === 7) {
         this.activeList = [{ title: '保养人审核', name: this.seeTemp.upkeepPerson, date: this.seeTemp.finishedTime, status: '', reason: '' }, { title: '机修审核', date: this.seeTemp.useChargeDate, name: this.seeTemp.useChargePerson, status: '', reason: '', scores: scores },  { title: '设备主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson }]
@@ -1842,7 +1842,7 @@ export default {
               }
 
 
-              
+
 
 
             } else {