From 858157d907e6615d11d98eebf6e29645c845f7db Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Fri, 24 Jan 2025 10:54:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/order/logDialog.vue        | 2 +-
 src/views/businessManagement/ordinary.vue | 5 +++--
 src/views/device/deviceSystem.vue         | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/order/logDialog.vue b/src/components/order/logDialog.vue
index bf5239c..32a32d4 100644
--- a/src/components/order/logDialog.vue
+++ b/src/components/order/logDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog title="流程信息查看" :visible.sync="infoDialog" :append-to-body="true" width="70%" @close="closeDialog" :close-on-click-modal="false">
-    <div>
+    <div style="height: 500px;overflow-y: auto;">
       <div class="el-card is-hover-shadow">
         <div class="el-card__body">
           <div class="row-bg el-row el-row--flex">
diff --git a/src/views/businessManagement/ordinary.vue b/src/views/businessManagement/ordinary.vue
index 0374f3a..629134c 100644
--- a/src/views/businessManagement/ordinary.vue
+++ b/src/views/businessManagement/ordinary.vue
@@ -400,7 +400,7 @@
                   <td style="padding: 10px 0px 10px 200px; font-size: 14px;color: #909399;font-weight: 600;">折扣:</td>
                   <td>
                     <el-input v-model="discount" controls-position="right" @input="handleInput" @change="changeDiscount"
-                      :disabled="dialogType == 'view'">
+                      :disabled="dialogType == 'view' || dialogType == 'repairupload'">
                       <template slot="append">折</template>
                     </el-input>
                   </td>
@@ -600,7 +600,7 @@
         <div
           v-show="repairForm.status == 403 || repairForm.status == 103 || repairForm.status == 104 || repairForm.status == 202 || repairForm.status == 203 || repairForm.status == 204 || repairForm.status == 400">
           <el-form-item label="维修完成图片" prop="signaturePerson" v-if="repairForm.status == 103">
-            <el-upload action="/api/blade-resource/oss/endpoint/put-file" list-type="picture-card" :headers="headers"
+            <el-upload action="/api/blade-resource/oss/endpoint/put-file" list-type="picture-card" :headers="headers" :disabled="dialogType == 'view'"
               accept=".jpeg,.jpg,.png,.pdf" :file-list="completeImgList" :on-success="handleSuccess"
               :on-remove="handleRemove">
               <i class="el-icon-plus"></i>
@@ -1403,6 +1403,7 @@ export default {
               unit: item.unit,
               number: item.materialCount,
               price: item.materialPrice,
+              materialName:item.materialName,
               unifiedQuotation: item.materialPrice / item.materialCount,
               productId: '',
               productList: []
diff --git a/src/views/device/deviceSystem.vue b/src/views/device/deviceSystem.vue
index d2b1130..8dea1ae 100644
--- a/src/views/device/deviceSystem.vue
+++ b/src/views/device/deviceSystem.vue
@@ -247,7 +247,7 @@
                   <span v-if="scope.row.repairPerson == ''">-</span>
                   <span v-else>
                     <el-select placeholder="请选择维修人员" :disabled="true" v-model="scope.row.repairPerson" size="small">
-                      <el-option v-for="item in repairPersonList" :key="item.id" :label="item.name"
+                      <el-option v-for="item in repairPersonList" :key="item.id" :label="item.realName"
                         :value="item.id"></el-option>
                     </el-select>
                   </span>
@@ -277,7 +277,7 @@
                   <span v-if="scope.row.repairPerson == ''">-</span>
                   <span v-else>
                     <el-select placeholder="请选择维修人员" :disabled="true" v-model="scope.row.servicemanName" size="small">
-                      <el-option v-for="item in repairPersonList" :key="item.id" :label="item.name"
+                      <el-option v-for="item in repairPersonList" :key="item.id" :label="item.realName"
                         :value="item.id"></el-option>
                     </el-select>
                   </span>