Merge pull request 'projects/mesxc-dy' (#239) from projects/mesxc-dy into projects/mesxc-test

Reviewed-on: #239

src/views/equipment/base/repair/CustomDialogForm.vue

@@ -6,41 +6,58 @@
 -->
 
 <template>
-  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="disabled" class="drawer"
+  <!-- <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="disabled" class="drawer"
-    custom-class="mes-drawer" size="50%" @closed="$emit('destroy')">
+    custom-class="mes-drawer" size="50%" @closed="$emit('destroy')"> -->
+  <el-dialog
+  :visible.sync="visible"
+  width="50%"
+  :before-close="closed">
     <small-title slot="title" :no-padding="true">
-      {{ disabled ? '查看详情' : !dataForm.maintenanceStatus ? '修改' : '完成' }}
+      详情
+      <!-- {{ disabled ? '查看详情' : !dataForm.maintenanceStatus ? '修改' : '完成' }} -->
     </small-title>
     <div class="drawer-body flex">
       <div class="drawer-body__content">
         <div>
           <el-row :gutter="20">
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="blodTip">故障发生时间</div>
               <div class="lightTip">{{ parseTime(dataForm.faultTime) }}</div>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="blodTip">故障级别</div>
               <div class="lightTip">{{ getDictDataLabel('fault-level', dataForm.faultLevel) }}</div>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="blodTip">故障类型</div>
               <div class="lightTip">{{ getDictDataLabel('fault-type', dataForm.faultType) }}</div>
             </el-col>
-          </el-row>
+            <el-col :span="6">
-          <el-row :gutter="20">
-            <el-col :span="8">
               <div class="blodTip">维修工</div>
               <div class="lightTip">{{ dataForm.repairman }}</div>
             </el-col>
-            <el-col :span="8">
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="6">
               <div class="blodTip">联系方式</div>
               <div class="lightTip">{{ dataForm.repairmanPhone }}</div>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="blodTip">维修方式</div>
               <div class="lightTip">{{ getDictDataLabel('repair-mode', dataForm.repairMode) }}</div>
             </el-col>
+            <el-col :span="6">
+              <div class="blodTip">创建时间</div>
+              <div class="lightTip">{{ parseTime(dataForm.createTime) }}</div>
+            </el-col>
+            <el-col :span="6">
+              <div class="blodTip">创建人</div>
+              <div class="lightTip">{{ dataForm.creator }}</div>
+            </el-col>
+          </el-row>
+          <el-row>
+            <div class="blodTip">备注</div>
+            <div class="lightTip">{{ dataForm.remark }}</div>
           </el-row>
           <el-row>
             <div class="blodTip">维修附件</div>
@@ -55,20 +72,6 @@
             </div>
             <p v-else>暂无附件</p>
           </el-row>
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <div class="blodTip">创建时间</div>
-              <div class="lightTip">{{ parseTime(dataForm.createTime) }}</div>
-            </el-col>
-            <el-col :span="8">
-              <div class="blodTip">创建人</div>
-              <div class="lightTip">{{ dataForm.creator }}</div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <div class="blodTip">备注</div>
-              <div class="lightTip">{{ dataForm.remark }}</div>
-          </el-row>
         </div>
         <!-- <el-divider style="margin-top: -10px" />
         <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
@@ -143,13 +146,17 @@
           </el-row>
         </el-form> -->
 
-        <div v-if="!disabled" class="drawer-body__footer">
+        <!-- <div v-if="!disabled" class="drawer-body__footer">
           <el-button style="" @click="goback()">取消</el-button>
           <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-        </div>
+        </div> -->
       </div>
     </div>
-  </el-drawer>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取 消</el-button>
+    </span>
+  </el-dialog>
+  <!-- </el-drawer> -->
 </template>
 
 <script>
@@ -254,6 +261,9 @@ export default {
   },
   mounted() { },
   methods: {
+    closed() {
+      this.$emit('destroy')
+    },
     setFileName(val) {
       this.fileName = val
     },
@@ -373,7 +383,7 @@ export default {
 .drawer-body__content {
   flex: 1;
   /* background: #eee; */
-  padding: 20px 30px;
+  padding: 5px 10px;
   overflow-y: auto;
 }