执法

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

@@ -34,6 +34,8 @@
           <span class="el-icon-document"> {{ file.name }} </span>
         </el-link>
         <div class="ele-upload-list__item-content-action">
+          <el-link :underline="false" @click="handleDelete(index)" type="danger">预览</el-link>
+          <el-link :underline="false" @click="handleDelete(index)" type="danger">下载</el-link>
           <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
         </div>
       </li>

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

@@ -127,12 +127,12 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="上报单位" prop="deptName">
-                <el-input v-model="form.deptName" disabled = "disabled"/>
+                <el-input v-model="form.deptName" :disabled ="disabled"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="上报人" prop="createName">
-                <el-input v-model="form.createName" disabled/>
+                <el-input v-model="form.createName" :disabled = "disabled"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -169,7 +169,7 @@
               <br>
               <el-col :span="24">
                 <el-form-item label="附件" label-width="50px" prop="dataOne">
-                  <fileUpload v-model="dataOne"></fileUpload>
+                  <fileUpload v-model="dataOne" disabled></fileUpload>
                 </el-form-item>
               </el-col>
               <el-col :span="24">
@@ -185,7 +185,7 @@
               <br>
               <el-col :span="24">
                 <el-form-item label="附件" label-width="50px" prop="dataTwo">
-                  <fileUpload v-model="dataTwo"></fileUpload>
+                  <fileUpload v-model="dataTwo" disabled></fileUpload>
                 </el-form-item>
               </el-col>
               <el-col :span="24">
@@ -201,7 +201,7 @@
               <br>
               <el-col :span="24">
                 <el-form-item label="附件" label-width="50px" prop="dataTwo">
-                  <fileUpload v-model="dataThree"></fileUpload>
+                  <fileUpload v-model="dataThree" disabled></fileUpload>
                 </el-form-item>
               </el-col>
               <el-col :span="24">
@@ -225,22 +225,22 @@
         <el-table-column label="操作内容" align="center" prop="content"/>
       </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="type!='1'&&form.state=='state_1'" type="primary" @click="acceptance('state_2')">受理
+        <el-button v-if="update!='update'&&type!='1'&&form.state=='state_1'" type="primary" @click="acceptance('state_2')">受理
         </el-button>
-        <el-button v-if="type!='1'&&form.state=='state_1'" @click="noAcceptance('state_3')">不予受理</el-button>
-        <el-button v-if="type!='1'&&form.state=='state_2'&&this.logNum==0" type="primary"
+        <el-button v-if="update!='update'&&type!='1'&&form.state=='state_1'" @click="noAcceptance('state_3')">不予受理</el-button>
+        <el-button v-if="update!='update'&&type!='1'&&form.state=='state_2'&&this.logNum==0" type="primary"
                    @click="acceptance('state_6')">通 过
         </el-button>
-        <el-button v-if="type!='1'&&form.state=='state_2'&&this.logNum==0" @click="noAcceptance('state_7')">不通过
+        <el-button v-if="update!='update'&&type!='1'&&form.state=='state_2'&&this.logNum==0" @click="noAcceptance('state_7')">不通过
         </el-button>
-        <el-button v-if="type=='update'" @click="acceptance(this.form.state)">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button v-if="update=='update'" type="primary"  @click="acceptance(state,1)">确 定</el-button>
+        <el-button v-if="update=='update'" @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
 
     <el-dialog :title="title" :visible.sync="open1" width="600px" height="500px" class="form-style">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="说明" prop="content">
+        <el-form-item label="说明" prop="describe">
           <el-input type="textarea" v-model="form.content" placeholder="请输入说明"/>
         </el-form-item>
       </el-form>
@@ -253,7 +253,7 @@
 </template>
 
 <script>
-import {listCase, getCase, getCaseLog, updateCase, addCase} from "@/api/lawenforcement/case";
+import {listCase, getCase, getCaseLog, updateCase} 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';
@@ -290,6 +290,7 @@ export default {
       // 总条数
       total: 0,
       type: 0,
+      update:null,
       // 案件表格数据
       caseList: [],
       //日志列表
@@ -300,7 +301,8 @@ export default {
       // 是否显示弹出层
       open: false,
       open1: false,
-      disabled: false,
+      disabled: true,
+      state:null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -419,14 +421,16 @@ export default {
           this.describe2 = response.data.fileList[1].describe
           this.describe3 = response.data.fileList[2].describe
         }
+        this.state = response.data.state
         this.open = true;
         this.title = "修改案件";
-        this.type = 'update';
-        this.disabled = true;
+        this.update = 'update';
+        this.disabled = false;
       });
     },
     /** 详情 */
     handleUpdate(row) {
+      this.disabled = true
       this.getCaseLog(row);
       this.reset();
       const id = row.id || this.ids
@@ -442,13 +446,15 @@ export default {
           this.describe2 = response.data.fileList[1].describe
           this.describe3 = response.data.fileList[2].describe
         }
+        this.update = null;
         this.open = true;
         this.title = "案件详情";
       });
     },
     /** 受理 */
-    acceptance(state) {
+    acceptance(state,type) {
       this.form.state = state;
+      this.form.type = type;
       updateCase(this.form).then(response => {
         if (state == 'state_2') {
           this.$modal.msgSuccess("受理成功");

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

@@ -54,13 +54,13 @@
             <el-card>
               <div class="form-item-title">1.法制审核机构出具的审核意见书</div>
               <br>
-              <el-col :span="12">
+              <el-col :span="24">
                 <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-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="说明" label-width="50px" prop="describeOne">
                   <el-input v-model="form.describeOne" placeholder="请输入材料说明" maxlength = "255"/>
                 </el-form-item>
@@ -71,13 +71,13 @@
             <el-card>
               <div class="form-item-title">2.落实行政处罚裁量基准和包容审慎监管执法“四张清单”相关材料</div>
               <br>
-              <el-col :span="12">
+              <el-col :span="24">
                 <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-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="说明" label-width="50px" prop="describeTwo">
                   <el-input v-model="form.describeTwo" placeholder="请输入材料说明" maxlength = "255"/>
                 </el-form-item>
@@ -88,13 +88,13 @@
             <el-card>
               <div class="form-item-title">3.落实行政处罚裁量基准和包容审慎监管执法“四张清单”相关材料</div>
               <br>
-              <el-col :span="12">
+              <el-col :span="24">
                 <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-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="说明" label-width="50px" prop="describeThree">
                   <el-input v-model="form.describeThree" placeholder="请输入材料说明" maxlength = "255"/>
                 </el-form-item>
@@ -381,12 +381,7 @@ export default {
 <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 {
@@ -432,6 +427,7 @@ export default {
 
 .el-form-item__content {
   margin: 0 !important;
+  line-height:0!important;
 }
 
 .el-input.is-disabled .el-input__inner, .el-input--medium .el-input__inner {
@@ -461,5 +457,24 @@ export default {
 .el-card {
   margin: 0 0 20px 0;
 }
-
+.el-form-item--medium .el-form-item__content .upload-file{
+  display: flex;
+  align-items:center ;
+}
+.el-dialog__body .el-button--medium{
+  padding: 0 !important;
+  width: 40px;
+  height: 40px;
+  margin: 0 20px 0 0 !important;
+}
+.el-dialog__body .el-button--medium img{
+  width: 100%;
+  height: 100%;
+}
+.el-upload-list{
+  width: 930px ;
+}
+.upload-file-list .ele-upload-list__item-content{
+  padding: 0 10px;
+}
 </style>

src/main/java/com/sooka/sponest/lawenforcement/lawCase/domain/LawenforcementCase.java

@@ -102,6 +102,8 @@ public class LawenforcementCase extends BaseBusinessEntity {
     private String describeTwo;
     private String describeThree;
 
+    private String type;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

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

@@ -184,17 +184,19 @@ public class LawenforcementCaseServiceImpl extends BaseService implements ILawen
      */
     @Override
     public int updateLawenforcementCase(LawenforcementCase lawenforcementCase) {
-        LawenforcementCaseLog lawenforcementCaseLog = new LawenforcementCaseLog();
-        lawenforcementCaseLog.setId(IdUtils.simpleUUID());
-        lawenforcementCaseLog.setCreateBy(SecurityUtils.getUserId().toString());
-        lawenforcementCaseLog.setCreateTime(DateUtils.getNowDate());
-        lawenforcementCaseLog.setCreateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
-        lawenforcementCaseLog.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
-        lawenforcementCaseLog.setDeptName(SecurityUtils.getLoginUser().getSysUser().getDeptNames());
-        lawenforcementCaseLog.setCaseId(lawenforcementCase.getId());
-        lawenforcementCaseLog.setState(lawenforcementCase.getState());
-        lawenforcementCaseLog.setContent(lawenforcementCase.getContent());
-        int inserted = lawenforcementCaseLogMapper.insertLawenforcementCaseLog(lawenforcementCaseLog);
+        if (StringUtils.isEmpty(lawenforcementCase.getType())){
+            LawenforcementCaseLog lawenforcementCaseLog = new LawenforcementCaseLog();
+            lawenforcementCaseLog.setId(IdUtils.simpleUUID());
+            lawenforcementCaseLog.setCreateBy(SecurityUtils.getUserId().toString());
+            lawenforcementCaseLog.setCreateTime(DateUtils.getNowDate());
+            lawenforcementCaseLog.setCreateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
+            lawenforcementCaseLog.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+            lawenforcementCaseLog.setDeptName(SecurityUtils.getLoginUser().getSysUser().getDeptNames());
+            lawenforcementCaseLog.setCaseId(lawenforcementCase.getId());
+            lawenforcementCaseLog.setState(lawenforcementCase.getState());
+            lawenforcementCaseLog.setContent(lawenforcementCase.getContent());
+            lawenforcementCaseLogMapper.insertLawenforcementCaseLog(lawenforcementCaseLog);
+        }
         if (lawenforcementCase.getState().equals("state_6")){
             List<LawenforcementCaseLog> logList = lawenforcementCaseLogMapper.getLogByCaseId(lawenforcementCase.getId());
             long count = logList.stream().filter(obj -> obj.getState().equals("state_6")).count();
@@ -203,9 +205,9 @@ public class LawenforcementCaseServiceImpl extends BaseService implements ILawen
                 lawenforcementCase.setUpdateBy(SecurityUtils.getUserId());
                 lawenforcementCase.setUpdateTime(DateUtils.getNowDate());
                 lawenforcementCase.setUpdateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
-                return lawenforcementCaseMapper.updateLawenforcementCase(lawenforcementCase);
+                lawenforcementCaseMapper.updateLawenforcementCase(lawenforcementCase);
             }
-            return inserted;
+            return 1;
         }else {
             lawenforcementCase.setState(lawenforcementCase.getState().equals("state_7")?"state_4": lawenforcementCase.getState());
             lawenforcementCase.setUpdateBy(SecurityUtils.getUserId());