Merge branch 'master' of http://42.192.7.176:3000/suojin/lab-ops-ui-web

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">

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: []

src/views/device/deviceSystem.vue

@@ -203,7 +203,7 @@
             <el-table-column label="巡检内容" prop="checkContent"></el-table-column>
             <el-table-column label="工艺要求" prop="craft">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.craft" placeholder="工艺要求"></el-input>
+                <el-input v-model="scope.row.craft" placeholder="工艺要求" :disabled="viewType == 'view'"></el-input>
               </template>
             </el-table-column>
             <el-table-column label="巡检周期" prop="period">
@@ -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>