From 1ef036314d7f55293f21d2f9fb1020a0e4eccfa8 Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Wed, 14 Aug 2024 17:37:34 +0800
Subject: [PATCH] 1

---
 src/assets/style/common.scss                    | 14 +++++++-------
 src/views/baseCaseHandling/Form.vue             |  2 +-
 src/views/basePrincipalResponsibility/index.vue |  2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss
index 99192bb..79fa24d 100644
--- a/src/assets/style/common.scss
+++ b/src/assets/style/common.scss
@@ -80,11 +80,11 @@ a {
   }
 }
 
-.NCC-dialog.NCC-dialog_center {
-  .NCC-dialog-content {
-    padding: 20px 50px 0 !important;
-    margin: 0 !important;
-    width: 100%;
-  }
-}
+// .NCC-dialog.NCC-dialog_center {
+//   .NCC-dialog-content {
+//     padding: 20px 50px 0 !important;
+//     margin: 0 !important;
+//     width: 100%;
+//   }
+// }
 
diff --git a/src/views/baseCaseHandling/Form.vue b/src/views/baseCaseHandling/Form.vue
index 5e2da4a..c047866 100644
--- a/src/views/baseCaseHandling/Form.vue
+++ b/src/views/baseCaseHandling/Form.vue
@@ -88,7 +88,7 @@
             <el-input type="textarea" v-model="dataForm.punishmentContent" placeholder="请输入处罚内容" clearable maxlength="200" :disabled="formType"/>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if="isSHILevel && (formType || dataForm.state == '592592999649641733')">
+        <el-col :span="24" v-if="(formType && isSHILevel) || dataForm.state == '592592999649641733'">
           <el-form-item label="执法方式" prop="enforceType">
             <el-radio-group v-model="dataForm.enforceType">
               <el-radio :label="'1'">柔性执法</el-radio>
diff --git a/src/views/basePrincipalResponsibility/index.vue b/src/views/basePrincipalResponsibility/index.vue
index 9df59ea..3df6745 100644
--- a/src/views/basePrincipalResponsibility/index.vue
+++ b/src/views/basePrincipalResponsibility/index.vue
@@ -78,6 +78,7 @@
               <el-table-column
                 prop="creatorTime"
                 label="创建时间"
+                :formatter="ncc.tableDateFormat"
                 align="left"
                 show-overflow-tooltip
               />
@@ -89,6 +90,7 @@
               />
               <el-table-column
                 prop="lastModifyTime"
+                :formatter="ncc.tableDateFormat"
                 label="修改时间"
                 align="left"
                 show-overflow-tooltip
--
libgit2 0.21.4