From 75147b60b0d326488cde5cefc364ec7f91064a30 Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Thu, 11 Aug 2022 19:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/dv/repair/index.vue |  7 +++++++
 src/views/mes/dv/repair/line.vue  | 22 ++++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/views/mes/dv/repair/index.vue b/src/views/mes/dv/repair/index.vue
index 06246c4..31e6799 100644
--- a/src/views/mes/dv/repair/index.vue
+++ b/src/views/mes/dv/repair/index.vue
@@ -264,6 +264,11 @@
           </el-col>          
         </el-row>
       </el-form>
+      <el-divider v-if="form.repairId !=null" content-position="center">维修内容</el-divider>
+      <el-card shadow="always" v-if="form.repairId !=null" class="box-card">
+        <Repairline ref="line" :repairId="form.issueId" :optType="optType"></Repairline>    
+      </el-card>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" v-if="form.status =='PREPARE' && optType !='view'" @click="submitForm">提 交</el-button>
         <el-button type="primary" v-if="form.status == 'APPROVING' && optType !='view'" @click="finish">完成维修</el-button> 
@@ -277,10 +282,12 @@
 
 <script>
 import { listRepair, getRepair, delRepair, addRepair, updateRepair } from "@/api/mes/dv/repair";
+import Repairline from './line.vue'
 
 export default {
   name: "Repair",
   dicts: ['mes_repair_result', 'mes_order_status'],
+  components: {Repairline},
   data() {
     return {
       autoGenFlag:false,
diff --git a/src/views/mes/dv/repair/line.vue b/src/views/mes/dv/repair/line.vue
index 6b32665..980d15b 100644
--- a/src/views/mes/dv/repair/line.vue
+++ b/src/views/mes/dv/repair/line.vue
@@ -9,7 +9,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['dv:repairline:add']"
+          v-hasPermi="['mes:dv:repair:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -20,7 +20,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['dv:repairline:remove']"
+          v-hasPermi="['mes:dv:repair:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -29,8 +29,14 @@
     <el-table v-loading="loading" :data="repairlineList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="项目名称" align="center" prop="subjectName" />
-      <el-table-column label="故障描述" align="center" prop="malfunction" />
-      <el-table-column label="故障描述资源" align="center" prop="malfunctionUrl" />
+      <el-table-column label="故障描述" align="center" prop="malfunction" >
+        <template slot-scope="scope">
+          <el-input type="textarea">{{scope.row.malfunction}}</el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="故障描述资源" align="center" prop="malfunctionUrl" >
+        
+      </el-table-column>
       <el-table-column label="维修情况" align="center" prop="repairDes" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -39,14 +45,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['dv:repairline:edit']"
+            v-hasPermi="['mes:dv:repair:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['dv:repairline:remove']"
+            v-hasPermi="['mes:dv:repair:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -70,10 +76,10 @@
           <el-input v-model="form.malfunction" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="故障描述资源" prop="malfunctionUrl">
-          <el-input v-model="form.malfunctionUrl" placeholder="请输入故障描述资源" />
+          <el-input type="textarea" v-model="form.malfunctionUrl" placeholder="请输入故障描述资源" />
         </el-form-item>
         <el-form-item label="维修情况" prop="repairDes">
-          <el-input v-model="form.repairDes" type="textarea" placeholder="请输入内容" />
+          <el-input  v-model="form.repairDes" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">