执法

lawenforcement-ui/src/views/components/FileUpload/index.vue

@@ -15,7 +15,9 @@
       ref="upload"
     >
       <!-- 上传按钮 -->
-      <el-button size="mini" type="primary">选取文件</el-button>
+      <el-button >
+        <img src="../../../assets/fileTypeImage/fileAdd.png"/>
+      </el-button>
       <!-- 上传提示 -->
 <!--      <div class="el-upload__tip" slot="tip" v-if="showTip">
         请上传

lawenforcement-ui/src/views/lawenforcement/case/index.vue

@@ -54,13 +54,6 @@
             v-hasPermi="['lawenforcement:case:query']"
           >详情
           </el-button>
-<!--          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="register(scope.row)"
-          >立案
-          </el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -76,120 +69,130 @@
     <!-- 详情 -->
     <el-dialog :title="title" :visible.sync="open" width="1200px" class="form-style">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <div class="anjianxinxi">
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="案件名称" prop="caseName">
-              <el-input v-model="form.caseName" placeholder="请输入案件名称" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="案件编号" prop="caseNumber">
-              <el-input v-model="form.caseNumber" placeholder="请输入案件编号" disabled/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="处罚对象" prop="punishTarget">
-              <el-select v-model="form.punishTarget" placeholder="请选择处罚对象" filterable disabled>
-                <el-option
-                  v-for="dict in dict.type.lawenforcement_punish_target"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="处罚情形" prop="punishType">
-              <el-select v-model="form.punishType" placeholder="请选择处罚情形" filterable disabled>
-                <el-option
-                  v-for="dict in dict.type.lawenforcement_punish_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="上报单位" prop="deptName">
-              <el-input v-model="form.deptName" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="上报人" prop="createName">
-              <el-input v-model="form.createName" disabled/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="上报时间" prop="createTime">
-              <el-input v-model="form.createTime" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="状态" prop="state">
-              <el-select v-model="form.state" filterable disabled>
-                <el-option
-                  v-for="dict in dict.type.lawenforcement_caseState"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item label="案件描述" prop="describe">
-              <el-input type="textarea" v-model="form.describe" placeholder="请输入案件描述" disabled class="ajms"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        </div>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="案件名称" prop="caseName">
+                <el-input v-model="form.caseName" placeholder="请输入案件名称" disabled/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="案件编号" prop="caseNumber">
+                <el-input v-model="form.caseNumber" placeholder="请输入案件编号" disabled/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="处罚对象" prop="punishTarget">
+                <el-select v-model="form.punishTarget" placeholder="请选择处罚对象" filterable disabled>
+                  <el-option
+                    v-for="dict in dict.type.lawenforcement_punish_target"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="处罚情形" prop="punishType">
+                <el-select v-model="form.punishType" placeholder="请选择处罚情形" filterable disabled>
+                  <el-option
+                    v-for="dict in dict.type.lawenforcement_punish_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="上报单位" prop="deptName">
+                <el-input v-model="form.deptName" disabled/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="上报人" prop="createName">
+                <el-input v-model="form.createName" disabled/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="上报时间" prop="createTime">
+                <el-input v-model="form.createTime" disabled/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="state">
+                <el-select v-model="form.state" filterable disabled>
+                  <el-option
+                    v-for="dict in dict.type.lawenforcement_caseState"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item label="案件描述" prop="describe">
+                <el-input type="textarea" rows="5" v-model="form.describe" placeholder="请输入案件描述" disabled class="ajms"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-col :span="24">
-              <el-card >
-                <div class="form-item-title">1.法制审核机构出具的审核意见书</div>
-                <br>
+            <el-card>
+              <div class="form-item-title">1.法制审核机构出具的审核意见书</div>
+              <br>
+              <el-col :span="12">
                 <el-form-item label="附件" label-width="50px" prop="dataOne">
                   <fileUpload v-model="dataOne"></fileUpload>
                 </el-form-item>
+              </el-col>
+              <el-col :span="12">
                 <el-form-item label="说明" label-width="50px" prop="describe">
-                  <el-input type="textarea" v-model="describe1" disabled/>
+                  <el-input v-model="describe1" disabled/>
                 </el-form-item>
-              </el-card>
-            </el-col>
-            <el-col :span="24">
-              <el-card>
-                <div class="form-item-title">2.落实行政处罚裁量基准和包容审慎监管执法“四张清单”相关材料</div>
+              </el-col>
+            </el-card>
+          </el-col>
+          <el-col :span="24">
+            <el-card>
+              <div class="form-item-title">2.落实行政处罚裁量基准和包容审慎监管执法“四张清单”相关材料</div>
+              <br>
+              <el-col :span="12">
                 <el-form-item label="附件" label-width="50px" prop="dataTwo">
                   <fileUpload v-model="dataTwo"></fileUpload>
                 </el-form-item>
+              </el-col>
+              <el-col :span="12">
                 <el-form-item label="说明" label-width="50px" prop="describe">
-                  <el-input type="textarea" v-model="describe2" disabled/>
+                  <el-input v-model="describe2" disabled/>
                 </el-form-item>
-              </el-card>
-            </el-col>
-            <el-col :span="24">
-              <el-card>
-                <div class="form-item-title">3.落实行政处罚裁量基准和包容审慎监管执法“四张清单”相关材料</div>
+              </el-col>
+            </el-card>
+          </el-col>
+          <el-col :span="24">
+            <el-card>
+              <div class="form-item-title">3.落实行政处罚裁量基准和包容审慎监管执法“四张清单”相关材料</div>
+              <br>
+              <el-col :span="12">
                 <el-form-item label="附件" label-width="50px" prop="dataTwo">
                   <fileUpload v-model="dataThree"></fileUpload>
                 </el-form-item>
+              </el-col>
+              <el-col :span="12">
                 <el-form-item label="说明" label-width="50px" prop="describe">
-                  <el-input type="textarea" v-model="describe3" disabled/>
+                  <el-input v-model="describe3" disabled/>
                 </el-form-item>
-              </el-card>
-            </el-col>
+              </el-col>
+            </el-card>
           </el-col>
         </el-row>
       </el-form>
@@ -228,18 +231,6 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
-
-    <!--立案-->
-    <el-dialog :visible.sync="dialogVisible" :title="title" width="1200px" class="form-style">
-      <register @send-ok="sendOk" ref="register" :caseNumber="caseName"/>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-
   </div>
 </template>
 
@@ -269,7 +260,6 @@ export default {
 
       // 遮罩层
       loading: true,
-      dialogVisible: false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -335,22 +325,6 @@ export default {
         this.loading = false;
       });
     },
-    //立案
-    register(row) {
-      this.dialogVisible = true;
-      this.title = "立案";
-      this.caseName = row.caseName;
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs.register.submitForm();
-    },
-    sendOk() {
-      debugger
-      this.dialogVisible = false;
-      this.getList();
-      this.$refs.register.reset();
-    },
     // 按部门查看日志
     getCaseLog(row) {
       this.form.deptId = this.$store.state.user.dept.deptId;
@@ -363,8 +337,7 @@ export default {
     cancel() {
       this.open = false;
       this.open1 = false;
-      this.dialogVisible = false;
-      this.$refs.register.reset()
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -419,7 +392,7 @@ export default {
         this.form = response.data;
         this.logList = response.data.logList
         let fileList = response.data.fileList;
-        if(fileList.length > 0){
+        if (fileList.length > 0) {
           this.dataOne = response.data.fileList[0].attachPath
           this.dataTwo = response.data.fileList[1].attachPath
           this.dataThree = response.data.fileList[2].attachPath
@@ -474,72 +447,85 @@ export default {
 </script>
 <style>
 .el-link.el-link--default {
-    color: #606266;
-    width: 200px;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    text-align: left;
-    display: block;
+  color: #606266;
+  width: 200px;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  text-align: left;
+  display: block;
 }
-.form-item-title{
-    font-size: 14px;
-    font-weight: bold;
-    width: 100%;
-    border-bottom: solid 1px #ccc;
-    padding:15px 20px;
-    border-left: solid 4px #2b64c1;
+
+.form-item-title {
+  font-size: 14px;
+  font-weight: bold;
+  width: 100%;
+  border-bottom: solid 1px #ccc;
+  padding: 15px 20px;
+  border-left: solid 4px #2b64c1;
 }
-.el-table--fit{
+
+.el-table--fit {
   margin: 10px 0 0 0;
 }
-.el-dialog__header{
+
+.el-dialog__header {
   background: #f5f7f9;
 }
+
 /* .anjianxinxi{
   background: #f5f5f5;
 } */
-.el-dialog{
+.el-dialog {
   height: 820px;
   overflow: hidden;
 }
-.el-dialog__body{
+
+.el-dialog__body {
   height: 700px;
   overflow-y: auto;
 }
-.el-form-item{
+
+.el-form-item {
   display: flex;
 }
-.el-form-item__label{
+
+.el-form-item__label {
   font-weight: normal;
   width: 100px !important;
   text-align: center !important;
-  padding:0 !important;
+  padding: 0 !important;
 }
-.el-form-item__content{
+
+.el-form-item__content {
   margin: 0 !important;
 }
-.el-input.is-disabled .el-input__inner,.el-input--medium .el-input__inner {
-    background-color: #fff !important;
-    width: 440px;
-    border-radius: 0px;
+
+.el-input.is-disabled .el-input__inner, .el-input--medium .el-input__inner {
+  background-color: #fff !important;
+  width: 440px;
+  border-radius: 0px;
 }
+
 .el-textarea.is-disabled .el-textarea__inner {
-    background-color: #fff !important;
-    width: 1000px;
-    height: auto;
-    resize: none;
+  background-color: #fff !important;
+  width: 1000px;
+  height: auto;
+  resize: none;
 }
-.ajms .el-textarea__inner{
+
+.ajms .el-textarea__inner {
   background-color: #fff !important;
-    width: 1023px !important;
-    height: auto;
-    resize: none;
+  width: 1023px !important;
+  height: auto;
+  resize: none;
 }
-.el-card__body{
+
+.el-card__body {
   padding: 0 !important;
 }
-.el-card{
+
+.el-card {
   margin: 0 0 20px 0;
 }
 

lawenforcement-ui/src/views/lawenforcement/record/index.vue

@@ -326,13 +326,8 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="dialogVisibleLiAn" :title="title" width="1200px" class="form-style">
-      <register @send-ok="sendOk" ref="register" :caseNumber="recordId"/>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFormLiAn">确 定</el-button>
-        <el-button @click="cancelLiAn">取 消</el-button>
-      </div>
-    </el-dialog>
+<!--    立案-->
+    <register ref="register" :caseNumber="recordId" :dialogVisibleLiAn = "dialogVisibleLiAn" :title = "title"/>
   </div>
 </template>
 
@@ -706,18 +701,6 @@ export default {
       this.title = "立案";
       this.recordId = row.id;
     },
-    sendOk() {
-      this.dialogVisibleLiAn = false;
-      this.$refs.register.reset();
-    },
-    submitFormLiAn() {
-      this.$refs.register.submitForm();
-    },
-    cancelLiAn() {
-      this.dialogVisibleLiAn = false;
-      this.$refs.register.reset()
-    },
-
   },
   watch: {
     dialogVisible(newVal) {

lawenforcement-ui/src/views/lawenforcement/register/index.vue

@@ -2,72 +2,76 @@
   <div class="app-container">
 
     <!-- 立案 -->
-    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="案件名称" prop="caseName">
-            <el-input v-model="form.caseName" placeholder="请输入案件名称"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="案件编号" prop="caseNumber">
-            <el-input v-model="caseNumber" placeholder="请输入案件编号" disabled/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="处罚对象" prop="punishTarget">
-            <el-select v-model="form.punishTarget" placeholder="请选择处罚对象" filterable>
-              <el-option
-                v-for="dict in dict.type.lawenforcement_punish_target"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="处罚情形" prop="punishType">
-            <el-select v-model="form.punishType" placeholder="请选择处罚情形" filterable>
-              <el-option
-                v-for="dict in dict.type.lawenforcement_punish_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="24">
-          <el-form-item label="案件描述" prop="describe">
-            <el-input type="textarea" v-model="form.describe" placeholder="请输入案件描述"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="24">
-          <el-col :span="8">
-            <el-card style="height: 350px;">
+    <el-dialog :visible.sync="dialogVisibleLiAn" :title="title" width="1200px" class="form-style">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="案件名称" prop="caseName">
+              <el-input v-model="form.caseName" placeholder="请输入案件名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="案件编号" prop="caseNumber">
+              <el-input v-model="caseNumber" placeholder="请输入案件编号" disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="处罚对象" prop="punishTarget">
+              <el-select v-model="form.punishTarget" placeholder="请选择处罚对象" filterable>
+                <el-option
+                  v-for="dict in dict.type.lawenforcement_punish_target"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="处罚情形" prop="punishType">
+              <el-select v-model="form.punishType" placeholder="请选择处罚情形" filterable>
+                <el-option
+                  v-for="dict in dict.type.lawenforcement_punish_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="案件描述" prop="describe">
+              <el-input type="textarea" v-model="form.describe" placeholder="请输入案件描述" class="ajms"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-card>
               <div class="form-item-title">1.法制审核机构出具的审核意见书</div>
               <br>
+              <el-col :span="12">
               <el-form-item label="附件" label-width="50px" prop="dataOne">
-                <fileUpload :fileType = "fileType" :limit = "1" v-model="form.dataOne" :setFileName="setDataOne"
+                <fileUpload :fileType="fileType" :limit="1" v-model="form.dataOne" :setFileName="setDataOne"
                             :removeFileName="removeDataOne"></fileUpload>
               </el-form-item>
+              </el-col>
+              <el-col :span="12">
               <el-form-item label="说明" label-width="50px" prop="describeOne">
-                <el-input type="textarea" v-model="form.describeOne" placeholder="请输入材料说明"/>
+                <el-input v-model="form.describeOne" placeholder="请输入材料说明"/>
               </el-form-item>
+              </el-col>
             </el-card>
           </el-col>
-          <el-col :span="8">
-            <el-card style="height: 350px;">
+          <el-col :span="24">
+            <el-card>
               <div class="form-item-title">2.落实行政处罚裁量基准和包容审慎监管执法“四张清单”相关材料</div>
               <el-form-item label="附件" label-width="50px" prop="dataTwo">
-                <fileUpload :fileType = "fileType" v-model="form.dataTwo" :setFileName="setDataTwo"
+                <fileUpload :fileType="fileType" v-model="form.dataTwo" :setFileName="setDataTwo"
                             :removeFileName="removeDataTwo"></fileUpload>
               </el-form-item>
               <el-form-item label="说明" label-width="50px" prop="describeTwo">
@@ -75,11 +79,11 @@
               </el-form-item>
             </el-card>
           </el-col>
-          <el-col :span="8">
-            <el-card style="height: 350px;">
+          <el-col :span="24">
+            <el-card>
               <div class="form-item-title">3.落实行政处罚裁量基准和包容审慎监管执法“四张清单”相关材料</div>
               <el-form-item label="附件" label-width="50px" prop="dataThree">
-                <fileUpload :fileType = "fileType" v-model="form.dataThree" :setFileName="setDataThree"
+                <fileUpload :fileType="fileType" v-model="form.dataThree" :setFileName="setDataThree"
                             :removeFileName="removeDataThree"></fileUpload>
               </el-form-item>
               <el-form-item label="说明" label-width="50px" prop="describeThree">
@@ -87,9 +91,13 @@
               </el-form-item>
             </el-card>
           </el-col>
-        </el-col>
-      </el-row>
-    </el-form>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -99,7 +107,7 @@ import fileUpload from '@/views/components/FileUpload/index.vue';
 
 export default {
   components: {fileUpload},
-  props:['caseNumber'],
+  props: ['caseNumber','dialogVisibleLiAn','title'],
   name: "register",
   dicts: ['lawenforcement_punish_target', 'lawenforcement_punish_type'],
   data() {
@@ -119,7 +127,8 @@ export default {
       fileNamesOne: null,
       fileNamesTwo: null,
       fileNamesThree: null,
-      fileType: ['pdf','jpg','jpeg','png'],
+      fileType: ['pdf', 'jpg', 'jpeg', 'png'],
+      dialogVisibleLiAn: false,
       describeList: [],
       // 案件表格数据
       caseList: [],
@@ -166,31 +175,37 @@ export default {
           {required: true, message: "案件描述不能为空", trigger: "blur"}
         ],
         describeOne: [
-          {validator: (rule, value, callback) => {
-            if (value || this.form.dataOne) {
-              callback();
-            } else {
-              callback(new Error('请上传文件或填写说明'));
-            }
-          }, trigger: "blur"}
+          {
+            validator: (rule, value, callback) => {
+              if (value || this.form.dataOne) {
+                callback();
+              } else {
+                callback(new Error('请上传文件或填写说明'));
+              }
+            }, trigger: "blur"
+          }
         ],
         describeTwo: [
-          {validator: (rule, value, callback) => {
-            if (value || this.form.dataTwo) {
-              callback();
-            } else {
-              callback(new Error('请上传文件或填写说明'));
-            }
-          }, trigger: "blur"}
+          {
+            validator: (rule, value, callback) => {
+              if (value || this.form.dataTwo) {
+                callback();
+              } else {
+                callback(new Error('请上传文件或填写说明'));
+              }
+            }, trigger: "blur"
+          }
         ],
         describeThree: [
-          {validator: (rule, value, callback) => {
-            if (value || this.form.dataThree) {
-              callback();
-            } else {
-              callback(new Error('请上传文件或填写说明'));
-            }
-          }, trigger: "blur"}
+          {
+            validator: (rule, value, callback) => {
+              if (value || this.form.dataThree) {
+                callback();
+              } else {
+                callback(new Error('请上传文件或填写说明'));
+              }
+            }, trigger: "blur"
+          }
         ],
       }
     };
@@ -236,8 +251,8 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.dialogVisible = false;
-      this.reset();
+      this.dialogVisibleLiAn = this.dialogVisibleLiAn;
+      this.$parent.reset();
     },
     // 表单重置
     reset() {
@@ -307,9 +322,9 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.form.caseNumber = this.caseNumber
-          if (this.fileNamesOne != null)this.form.fileNamesOne = this.fileNamesOne;
-          if (this.fileNamesTwo != null)this.form.fileNamesTwo = this.fileNamesTwo;
-          if (this.fileNamesThree != null)this.form.fileNamesThree = this.fileNamesThree;
+          if (this.fileNamesOne != null) this.form.fileNamesOne = this.fileNamesOne;
+          if (this.fileNamesTwo != null) this.form.fileNamesTwo = this.fileNamesTwo;
+          if (this.fileNamesThree != null) this.form.fileNamesThree = this.fileNamesThree;
           if (this.form.id != null) {
             updateCase(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -347,3 +362,88 @@ export default {
   }
 };
 </script>
+<style>
+.el-link.el-link--default {
+  color: #606266;
+  width: 200px;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  text-align: left;
+  display: block;
+}
+
+.form-item-title {
+  font-size: 14px;
+  font-weight: bold;
+  width: 100%;
+  border-bottom: solid 1px #ccc;
+  padding: 15px 20px;
+  border-left: solid 4px #2b64c1;
+}
+
+.el-table--fit {
+  margin: 10px 0 0 0;
+}
+
+.el-dialog__header {
+  background: #f5f7f9;
+}
+
+/* .anjianxinxi{
+  background: #f5f5f5;
+} */
+.el-dialog {
+  height: 820px;
+  overflow: hidden;
+}
+
+.el-dialog__body {
+  height: 700px;
+  overflow-y: auto;
+}
+
+.el-form-item {
+  display: flex;
+}
+
+.el-form-item__label {
+  font-weight: normal;
+  width: 100px !important;
+  text-align: center !important;
+  padding: 0 !important;
+}
+
+.el-form-item__content {
+  margin: 0 !important;
+}
+
+.el-input.is-disabled .el-input__inner, .el-input--medium .el-input__inner {
+  background-color: #fff !important;
+  width: 440px;
+  border-radius: 0px;
+}
+
+.el-textarea.is-disabled .el-textarea__inner {
+  background-color: #fff !important;
+  width: 1000px;
+  height: auto;
+  resize: none;
+}
+
+.ajms .el-textarea__inner {
+  background-color: #fff !important;
+  width: 1023px !important;
+  height: auto;
+  resize: none;
+}
+
+.el-card__body {
+  padding: 0 !important;
+}
+
+.el-card {
+  margin: 0 0 20px 0;
+}
+
+</style>

src/main/java/com/sooka/sponest/lawenforcement/lawCase/service/impl/LawenforcementCaseServiceImpl.java

@@ -53,12 +53,14 @@ public class LawenforcementCaseServiceImpl extends BaseService implements ILawen
         attach.setBusId(id);
         List<LawenforcementAttach> fileList = lawenforcementAttachMapper.selectLawenforcementAttachList(attach);
         for (LawenforcementAttach file : fileList) {
-            StringBuilder newDiles = new StringBuilder();
-            String fileurl = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey(DataConstants.DOWNLOAD_URL).getData();
-            String filename = file.getFileName();
-            String group = file.getAttachPath().substring(0, file.getAttachPath().indexOf('/'));
-            newDiles.append(fileurl).append("Download?fileName=").append(filename).append("&&group=").append(group).append("&&path=").append(file.getAttachPath().substring(file.getAttachPath().indexOf('/') + 1)).append("+").append(filename);
-            file.setAttachPath(newDiles.toString());
+            if (StringUtils.isNotEmpty(file.getAttachPath())) {
+                StringBuilder newDiles = new StringBuilder();
+                String fileurl = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey(DataConstants.DOWNLOAD_URL).getData();
+                String filename = file.getFileName();
+                String group = file.getAttachPath().substring(0, file.getAttachPath().indexOf('/'));
+                newDiles.append(fileurl).append("Download?fileName=").append(filename).append("&&group=").append(group).append("&&path=").append(file.getAttachPath().substring(file.getAttachPath().indexOf('/') + 1)).append("+").append(filename);
+                file.setAttachPath(newDiles.toString());
+            }
         }
         lawenforcementCase.setLogList(logList);
         lawenforcementCase.setFileList(fileList);
@@ -113,7 +115,7 @@ public class LawenforcementCaseServiceImpl extends BaseService implements ILawen
             LawenforcementAttach centerdataTFile = new LawenforcementAttach();
             centerdataTFile.setBusId(lawenforcementCase.getId());
             centerdataTFile.setFileName(lawenforcementCase.getFileNamesOne());
-            String fileUrl = getString(lawenforcementCase.getDataOne());
+            String fileUrl = lawenforcementCase.getDataOne()==null? null :getString(lawenforcementCase.getDataOne());
             centerdataTFile.setAttachPath(fileUrl);
             centerdataTFile.setAttachSorts(1L);
             centerdataTFile.setDescribe(lawenforcementCase.getDescribeOne());
@@ -126,7 +128,7 @@ public class LawenforcementCaseServiceImpl extends BaseService implements ILawen
             LawenforcementAttach centerdataTFile = new LawenforcementAttach();
             centerdataTFile.setBusId(lawenforcementCase.getId());
             centerdataTFile.setFileName(lawenforcementCase.getFileNamesTwo());
-            String fileUrl = getString(lawenforcementCase.getDataTwo());
+            String fileUrl = lawenforcementCase.getDataTwo()==null?null: getString(lawenforcementCase.getDataTwo());
             centerdataTFile.setAttachPath(fileUrl);
             centerdataTFile.setAttachSorts(2L);
             centerdataTFile.setDescribe(lawenforcementCase.getDescribeTwo());
@@ -139,7 +141,7 @@ public class LawenforcementCaseServiceImpl extends BaseService implements ILawen
             LawenforcementAttach centerdataTFile = new LawenforcementAttach();
             centerdataTFile.setBusId(lawenforcementCase.getId());
             centerdataTFile.setFileName(lawenforcementCase.getFileNamesThree());
-            String fileUrl = getString(lawenforcementCase.getDataThree());
+            String fileUrl = lawenforcementCase.getDataThree()==null?null: getString(lawenforcementCase.getDataThree());
             centerdataTFile.setAttachPath(fileUrl);
             centerdataTFile.setAttachSorts(3L);
             centerdataTFile.setDescribe(lawenforcementCase.getDescribeThree());
@@ -183,7 +185,7 @@ public class LawenforcementCaseServiceImpl extends BaseService implements ILawen
         lawenforcementCaseLog.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         lawenforcementCaseLog.setDeptName(SecurityUtils.getLoginUser().getSysUser().getDeptNames());
         lawenforcementCaseLog.setCaseId(lawenforcementCase.getId());
-        lawenforcementCaseLog.setState(lawenforcementCase.getState());
+        lawenforcementCaseLog.setState(lawenforcementCase.getState().equals("state_5")?"state_6":lawenforcementCase.getState());
         lawenforcementCaseLog.setContent(lawenforcementCase.getContent());
         int inserted = lawenforcementCaseLogMapper.insertLawenforcementCaseLog(lawenforcementCaseLog);
         if (lawenforcementCase.getState().equals("state_5")){

src/main/resources/mapper/lawenforcement/LawenforcementCaseLogMapper.xml

@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getLogByCaseId" parameterType="String" resultMap="LawenforcementCaseLogResult">
         <include refid="selectLawenforcementCaseLogVo"/>
-        where case_id = #{id} order by create_time desc
+        where case_id = #{id} and state = 'state_6' order by create_time desc
     </select>
 
     <select id="getCaseLog" parameterType="LawenforcementCase" resultType="java.lang.Integer">