执法

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

@@ -157,29 +157,36 @@
           <el-col :span="24">
             <el-col :span="8">
               <el-card style="height: 350px;">
-                <el-form-item prop="dataOne">
-                  <div class="form-item-title">1.法制审核机构出具的审核意见书</div>
+                <div class="form-item-title">1.法制审核机构出具的审核意见书</div>
+                <br>
+                <el-form-item label="附件" label-width="50px" prop="dataOne">
                   <fileUpload v-model="dataOne"></fileUpload>
                 </el-form-item>
-                <el-form-item label="说明" prop="describe">
-                  <el-input type="textarea" v-model="form.describe" placeholder="请输入案件描述" disabled/>
+                <el-form-item label="说明" label-width="50px" prop="describe">
+                  <el-input type="textarea" v-model="describe1" disabled/>
                 </el-form-item>
               </el-card>
             </el-col>
             <el-col :span="8">
               <el-card style="height: 350px;">
-                <el-form-item prop="dataTwo">
-                  <div class="form-item-title">2.落实行政处罚裁量基准和包容审慎监管执法“四张清单”相关材料</div>
+                <div class="form-item-title">2.落实行政处罚裁量基准和包容审慎监管执法“四张清单”相关材料</div>
+                <el-form-item label="附件" label-width="50px" prop="dataTwo">
                   <fileUpload v-model="dataTwo"></fileUpload>
                 </el-form-item>
+                <el-form-item label="说明" label-width="50px" prop="describe">
+                  <el-input type="textarea" v-model="describe2" disabled/>
+                </el-form-item>
               </el-card>
             </el-col>
             <el-col :span="8">
               <el-card style="height: 350px;">
-                <el-form-item prop="dataTwo">
-                  <div class="form-item-title">3.落实行政处罚裁量基准和包容审慎监管执法“四张清单”相关材料</div>
+                <div class="form-item-title">3.落实行政处罚裁量基准和包容审慎监管执法“四张清单”相关材料</div>
+                <el-form-item label="附件" label-width="50px" prop="dataTwo">
                   <fileUpload v-model="dataThree"></fileUpload>
                 </el-form-item>
+                <el-form-item label="说明" label-width="50px" prop="describe">
+                  <el-input type="textarea" v-model="describe3" disabled/>
+                </el-form-item>
               </el-card>
             </el-col>
           </el-col>
@@ -224,7 +231,7 @@
 
     <!--立案-->
     <el-dialog :visible.sync="dialogVisible" :title="title" width="1200px" class="form-style">
-      <register @send-ok="sendOk" ref="register"  :caseNumber = "caseName"/>
+      <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>
@@ -239,6 +246,7 @@
 import {listCase, getCase, getCaseLog, updateCase, addCase} from "@/api/lawenforcement/case";
 import register from "@/views/lawenforcement/register/index.vue";
 import form from "element-ui/packages/form";
+import fileUpload from '@/views/components/FileUpload/index.vue';
 
 export default {
   name: "Case",
@@ -247,13 +255,16 @@ export default {
       return form
     }
   },
-  components: {register},
+  components: {register, fileUpload},
   dicts: ['lawenforcement_punish_target', 'lawenforcement_punish_type', 'lawenforcement_caseState'],
   data() {
     return {
-      dataOne:null,
-      dataTwo:null,
-      dataThree:null,
+      dataOne: null,
+      dataTwo: null,
+      dataThree: null,
+      describe1: null,
+      describe2: null,
+      describe3: null,
 
       // 遮罩层
       loading: true,
@@ -264,7 +275,7 @@ export default {
       single: true,
       // 非多个禁用
       multiple: true,
-      caseName:"",
+      caseName: "",
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -333,7 +344,7 @@ export default {
     submitForm() {
       this.$refs.register.submitForm();
     },
-    sendOk(){
+    sendOk() {
       debugger
       this.dialogVisible = false;
       this.getList();
@@ -343,9 +354,6 @@ export default {
     getCaseLog(row) {
       this.form.deptId = this.$store.state.user.dept.deptId;
       this.form.id = row.id;
-      console.log(row)
-      console.log(this.$store.state.user.dept.deptId)
-      console.log(this.$store.state.user.dept.deptId)
       getCaseLog(this.form).then(response => {
         this.logNum = response.data;
       });
@@ -410,6 +418,11 @@ export default {
         this.form = response.data;
         this.logList = response.data.logList
         this.dataOne = response.data.fileList[0].attachPath
+        this.dataTwo = response.data.fileList[1].attachPath
+        this.dataThree = response.data.fileList[2].attachPath
+        this.describe1 = response.data.fileList[0].describe
+        this.describe2 = response.data.fileList[1].describe
+        this.describe3 = response.data.fileList[2].describe
         this.open = true;
         this.title = "案件详情";
       });

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

@@ -52,36 +52,37 @@
         <el-col :span="24">
           <el-col :span="8">
             <el-card style="height: 350px;">
-              <el-form-item prop="dataOne">
-                <div class="form-item-title">1.法制审核机构出具的审核意见书</div>
+              <div class="form-item-title">1.法制审核机构出具的审核意见书</div>
+              <br>
+              <el-form-item label="附件" label-width="50px" prop="dataOne">
                 <fileUpload :fileType = "fileType" :limit = "1" v-model="form.dataOne" :setFileName="setDataOne"
                             :removeFileName="removeDataOne"></fileUpload>
               </el-form-item>
-              <el-form-item label="说明" prop="describeOne">
+              <el-form-item label="说明" label-width="50px" prop="describeOne">
                 <el-input type="textarea" v-model="form.describeOne" placeholder="请输入材料说明"/>
               </el-form-item>
             </el-card>
           </el-col>
           <el-col :span="8">
             <el-card style="height: 350px;">
-              <el-form-item prop="dataTwo">
-                <div class="form-item-title">2.落实行政处罚裁量基准和包容审慎监管执法“四张清单”相关材料</div>
+              <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"
                             :removeFileName="removeDataTwo"></fileUpload>
               </el-form-item>
-              <el-form-item label="说明" prop="describeTwo">
+              <el-form-item label="说明" label-width="50px" prop="describeTwo">
                 <el-input type="textarea" v-model="form.describeTwo" placeholder="请输入材料说明"/>
               </el-form-item>
             </el-card>
           </el-col>
           <el-col :span="8">
             <el-card style="height: 350px;">
-              <el-form-item prop="dataThree">
-                <div class="form-item-title">3.落实行政处罚裁量基准和包容审慎监管执法“四张清单”相关材料</div>
+              <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"
                             :removeFileName="removeDataThree"></fileUpload>
               </el-form-item>
-              <el-form-item label="说明" prop="describeThree">
+              <el-form-item label="说明" label-width="50px" prop="describeThree">
                 <el-input type="textarea" v-model="form.describeThree" placeholder="请输入材料说明"/>
               </el-form-item>
             </el-card>

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

@@ -54,18 +54,11 @@ public class LawenforcementCaseServiceImpl extends BaseService implements ILawen
         List<LawenforcementAttach> fileList = lawenforcementAttachMapper.selectLawenforcementAttachList(attach);
         for (LawenforcementAttach file : fileList) {
             StringBuilder newDiles = new StringBuilder();
-            String suffix = file.getAttachPath().substring(file.getAttachPath().lastIndexOf(".")+1);
-            if (suffix.equals("pdf")){
-                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());
-            }else {
-                String fileUrl = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey(DataConstants.FILE_URL).getData();
-                newDiles.append(fileUrl).append(file.getAttachPath());
-                file.setAttachPath(newDiles.toString());
-            }
+            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);