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

src/views/businessManagement/ordinary.vue

@@ -598,7 +598,7 @@
         </div>
         <!-- 维修人员  上传维修完成图片列表 403 104 202 203 204 400-->
         <div
-          v-show="repairForm.status == 403 || repairForm.status == 103 || repairForm.status == 104 || repairForm.status == 202 || repairForm.status == 203 || repairForm.status == 204 || repairForm.status == 400">
+          v-show="repairForm.status == 403 || repairForm.status == 103 || repairForm.status == 104 || repairForm.status == 202 || repairForm.status == 203 || repairForm.status == 204">
           <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" :disabled="dialogType == 'view'"
               accept=".jpeg,.jpg,.png,.pdf" :file-list="completeImgList" :on-success="handleSuccess"
@@ -2146,7 +2146,7 @@ export default {
         this.addForm = {
           ...this.addForm,
           isNeedMaterials: 2,
-          customerOpinion: '',
+          // customerOpinion: '',
           planCompleteTime: ''
         }
         this.dialogVisible = true

src/views/labManagement/components/addDialog.vue

@@ -11,7 +11,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="单位名称" prop="unitNam" v-if="title == '查看' || title == '编辑'">
-          <el-input v-model="addForm.unitName" disabled></el-input>
+          <el-input  style="width:98%" v-model="addForm.unitName" disabled></el-input>
         </el-form-item>
       </div>
       <div>
@@ -39,7 +39,7 @@
           </div>
         </el-form-item> -->
         <el-form-item label="巡检配置">
-          <el-table :data="addForm.tableData" border style="width: 100%" :span-method="objectSpanMethod"
+          <el-table :data="addForm.tableData" border style="width: 98%" :span-method="objectSpanMethod"
             v-loading="isLoad">
             <el-table-column width="50" align="center">
               <template slot="header" slot-scope="scope">