From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
index 3d4cdc1..1dc2390 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
@@ -291,10 +291,10 @@
:scroll="{x:true}"
:columns="columns"
:dataSource="dataSource"
- :pagination="ipagination"
:loading="loading"
- @change="handleTableChange"
+ :pagination="false"
>
+ <!-- @change="handleTableChange" -->
<template
slot="photo"
slot-scope="text,record"
@@ -378,11 +378,11 @@
},
width: 50,
},
- {
- title: '閮ㄤ綅',
- align: 'center',
- dataIndex: 'location'
- },
+ // {
+ // title: '閮ㄤ綅',
+ // align: 'center',
+ // dataIndex: 'location'
+ // },
{
title: '鐐规椤圭洰',
align: 'center',
@@ -408,12 +408,12 @@
// align: 'center',
// dataIndex: 'inspectionTool'
// },
- {
- title: '绀烘剰鍥�',
- align: "center",
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' },
- },
+ // {
+ // title: '绀烘剰鍥�',
+ // align: "center",
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' },
+ // },
],
title: "鎿嶄綔",
visible: false,
@@ -633,7 +633,7 @@
this.inspectionStandardId = record.id;
this.form.setFieldsValue({ inspectionStandardId: record.id, inspectionStandardNum: record.num + "/" + record.version });
this.form.setFieldsValue({ equipmentId: record.equipmentId, equipmentName: record.equipmentNum + "/" + record.equipmentName });
- this.form.setFieldsValue({ assignMode: record.assignMode, teamId: record.teamId, teamName: record.teamName });
+ this.form.setFieldsValue({ assignMode: "1", teamId: record.teamId, teamName: record.teamName });
this.form.setFieldsValue({ effectiveTime: null, inspectionCycleId: null, unit: null });
this.getInspectionCycles(record.id)
if ("3" == record.assignMode) {
--
Gitblit v1.9.3