Browse Source

修改结束时间字段

jiangbiao 3 years ago
parent
commit
a4abe98c00

+ 1 - 1
ui/src/views/approve/approveDetail/specMaintenance-detail.vue

@@ -530,7 +530,7 @@
       },
       },
       downloadAction: process.env.VUE_APP_BASE_API +'/sems/approve/exportPDF',
       downloadAction: process.env.VUE_APP_BASE_API +'/sems/approve/exportPDF',
       approveOption: [],
       approveOption: [],
-      devTypeOption: [{dictValue:1,dictLabel:'工业炉'},{dictValue:2,dictLabel:'压缩机'},{},{}],
+      devTypeOption: [{dictValue:1,dictLabel:'工业炉'},{dictValue:2,dictLabel:'压缩机'},{dictValue:3,dictLabel:'管件'},{dictValue:4,dictLabel:'泵'}],
       belong: '',
       belong: '',
       fileList: [],
       fileList: [],
     };
     };

+ 1 - 1
ui/src/views/intact/approve/tapprove-maintenance-add.vue

@@ -619,7 +619,7 @@
         reUrls: null,
         reUrls: null,
         status: 0,
         status: 0,
         creattime: null,
         creattime: null,
-        endtime: null,
+        enddate: null,
         processId: null,
         processId: null,
         govDate: null,
         govDate: null,
         delayDate: null,
         delayDate: null,

+ 5 - 5
ui/src/views/intact/approve/tapprove-maintenance-his.vue

@@ -11,9 +11,9 @@
           <span>{{ parseTime(scope.row.creattime, '{y}-{m}-{d}') }}</span>
           <span>{{ parseTime(scope.row.creattime, '{y}-{m}-{d}') }}</span>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column :label="$t('结束时间')" align="center" prop="endtime" width="100">
+      <el-table-column :label="$t('结束时间')" align="center" prop="enddate" width="100">
         <template slot-scope="scope">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endtime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.enddate, '{y}-{m}-{d}') }}</span>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <el-table-column :label="$t('操作')" align="center"  width="120" class-name="small-padding fixed-width">
       <el-table-column :label="$t('操作')" align="center"  width="120" class-name="small-padding fixed-width">
@@ -78,7 +78,7 @@ export default {
       // 是否显示弹出层
       // 是否显示弹出层
       open: false,
       open: false,
       // 设备类型:字典
       // 设备类型:字典
-      devTypeOptions: [{dictValue:1,dictLabel:'工业炉'},{dictValue:2,dictLabel:'压缩机'},{},{}],
+      devTypeOptions: [{dictValue:1,dictLabel:'工业炉'},{dictValue:2,dictLabel:'压缩机'},{dictValue:3,dictLabel:'管件'},{dictValue:4,dictLabel:'泵'}],
       // 审批类型字典
       // 审批类型字典
       approveTypeOptions: [{dictValue:1,dictLabel:'维修'}],
       approveTypeOptions: [{dictValue:1,dictLabel:'维修'}],
       statusOptions: [],
       statusOptions: [],
@@ -110,7 +110,7 @@ export default {
         reUrls: null,
         reUrls: null,
         status: null,
         status: null,
         creattime: null,
         creattime: null,
-        endtime: null,
+        enddate: null,
         processId: null,
         processId: null,
         govDate: null,
         govDate: null,
         delayDate: null,
         delayDate: null,
@@ -212,7 +212,7 @@ export default {
         reUrls: null,
         reUrls: null,
         status: 0,
         status: 0,
         creattime: null,
         creattime: null,
-        endtime: null,
+        enddate: null,
         processId: null,
         processId: null,
         govDate: null,
         govDate: null,
         delayDate: null,
         delayDate: null,