diff --git a/src/views/inventorys/stocktaking.vue b/src/views/inventorys/stocktaking.vue
index 5ffc067..0140474 100644
--- a/src/views/inventorys/stocktaking.vue
+++ b/src/views/inventorys/stocktaking.vue
@@ -2461,7 +2461,7 @@ export default {
'filter[0][key]': 'material_infos_plan_id',
'filter[0][op]': 'eq',
'filter[0][value]': targetPlanId,
- // 'export_fields[inventory.wuzibianma_material_infos_wuzibianma_relation.material_info_type]': '分类',
+ 'export_fields[inventory.wuzibianma_material_infos_wuzibianma_relation.material_info_type]': '分类',
'export_fields[inventory.wuzibianma_material_infos_wuzibianma_relation.fenlei_detail.name]': '所属种类',
'export_fields[inventory.zichanmingcheng]': '物资名称',
'export_fields[inventory.rukupici]': '入库批次',
diff --git a/src/views/maintenance/maintenance_records.vue b/src/views/maintenance/maintenance_records.vue
index bda5c1c..00e9200 100644
--- a/src/views/maintenance/maintenance_records.vue
+++ b/src/views/maintenance/maintenance_records.vue
@@ -238,6 +238,9 @@
@click="viewDetail(scope.row)"
>查看
+
+ 删除
+
{
+ for (var k of res.role) {
+ if (k.name == '系统管理员' || k.name==='应急保障科') {
+ this.canDelete = true
+ }
+ }
+ }).catch(error => {})
+ },
async getList() {
try {
const params = {
@@ -955,6 +972,13 @@ export default {
this.$message.error('获取维护详情失败')
}
},
+ async deleteMaintenance(item) {
+ const res = await deleteOperation({ id: item.id })
+ if (res) {
+ this.$Message.success('删除成功')
+ this.getList()
+ }
+ },
completeMaintenance(item) {
this.showModal = true
this.currentRecord = { ...item }