执法

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

@@ -1,7 +1,7 @@
 <template>
   <el-dialog :visible.sync="fillFormDialog" title="填报" width="800px" @close="closeDialogFillForm" class="form-style">
     <div style="padding:20px 30px;">
-      <el-form>
+      <el-form ref="form" :model="form" :rules="rules">
         <el-form-item label="任务名称" prop="jobName" class="xinzengRw">
           <el-input style="width: 80%" v-model="form.jobName" placeholder="请输入任务名称"/>
         </el-form-item>
@@ -12,8 +12,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="说明" label-width="68px" prop="describe"  class="xinzengRw">
-            <el-input v-model="form.describe" placeholder="请输入材料说明" maxlength = "255"/>
+          <el-form-item label="说明" label-width="68px" prop="describe" class="xinzengRw">
+            <el-input v-model="form.describe" placeholder="请输入材料说明" maxlength="255"/>
           </el-form-item>
         </el-col>
       </el-form>
@@ -34,9 +34,14 @@ export default {
   data() {
     return {
       form: {},
+      rules: {
+        describe: [
+          {required: true, message: "说明不能为空", trigger: "blur"}
+        ],
+      },
       fileType: ['pdf', 'jpg', 'jpeg', 'png'],
       limit: 1,
-      isShowTip:false,
+      isShowTip: false,
     }
   },
   props: {
@@ -63,41 +68,45 @@ export default {
       }
     }
   },
-  methods:{
+  methods: {
     /** 设置文件名 */
-    setFileName(fileName){
+    setFileName(fileName) {
       this.form.attachName = fileName;
     },
     /** 移除文件名 */
-    removeFile(){
+    removeFile() {
       this.form.attachPath = null;
       this.form.attachName = null;
     },
     /** 关闭填报弹窗 */
-    closeDialogFillForm(){
+    closeDialogFillForm() {
       this.fillFormDialog = false
     },
     /** 填报提交事件 */
     submitFormFill() {
-      recordFillForm(this.form).then(res=>{
-        this.fillFormDialog = false
-        this.$modal.msgSuccess("填报成功");
-        this.$emit("get-list")
-      })
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          recordFillForm(this.form).then(res => {
+            this.fillFormDialog = false
+            this.$modal.msgSuccess("填报成功");
+            this.$emit("get-list")
+          })
+        }
+      });
     },
   },
   watch: {
     fillFormRecordId: {
       handler(newVal) {
         if (newVal) {
-          this.form.recordId=newVal
+          this.form.recordId = newVal
         }
       },
       immediate: true,
     },
-    fillFormRecordName:{
-      handler(newVal){
-        if(newVal){
+    fillFormRecordName: {
+      handler(newVal) {
+        if (newVal) {
           this.form.jobName = newVal
         }
       },
@@ -112,10 +121,12 @@ export default {
   width: 670px !important;
   border-radius: 0px;
 }
-.xinzeng  .el-form-item--medium .el-form-item__label  {
+
+.xinzeng .el-form-item--medium .el-form-item__label {
   width: 130px !important;
 }
-.tbfj .el-form-item__label{
+
+.tbfj .el-form-item__label {
   width: 68px !important;
 }
 </style>

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

@@ -80,10 +80,12 @@
               <i class="el-icon-d-arrow-right el-icon--right"></i>更多
             </span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="register" icon="el-icon-edit" v-hasPermi="['lawenforcement:record:edit']">
+              <el-dropdown-item v-if="(scope.row.recordStatus === 'lawenforcement_type_2' || scope.row.recordStatus === 'lawenforcement_type_5') && scope.row.isRegister ==='0'"
+                command="register" icon="el-icon-edit" v-hasPermi="['lawenforcement:record:edit']">
                 立案
               </el-dropdown-item>
-              <el-dropdown-item command="fillForm" icon="el-icon-edit" v-hasPermi="['lawenforcement:record:edit']">
+              <el-dropdown-item v-if="(scope.row.recordStatus === 'lawenforcement_type_2' || scope.row.recordStatus === 'lawenforcement_type_5') && scope.row.isRegister ==='0'"
+                command="fillForm" icon="el-icon-edit" v-hasPermi="['lawenforcement:record:edit']">
                 填报
               </el-dropdown-item>
               <el-dropdown-item

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

@@ -156,7 +156,7 @@ public class LawenforcementCaseServiceImpl extends BaseService implements ILawen
             centerdataTFile.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
             lawenforcementAttachMapper.insertLawenforcementAttach(centerdataTFile);
         }
-        recordMapper.updateRecordState(lawenforcementCase.getCaseNumber(), "lawenforcement_type_8");
+        recordMapper.updateRecordState(lawenforcementCase.getCaseNumber(), "1");
 
         return inserted;
     }

src/main/java/com/sooka/sponest/lawenforcement/record/domain/LawenforcementRecord.java

@@ -272,6 +272,8 @@ public class LawenforcementRecord{
     //执法人集合
     private List<LawenforcementUser> personList;
 
+    private String isRegister;//是否立案填报（1：立案；2：填报）
+
 
     @Override
     public String toString() {

src/main/java/com/sooka/sponest/lawenforcement/record/mapper/LawenforcementRecordMapper.java

@@ -106,7 +106,7 @@ public interface LawenforcementRecordMapper {
 
     void addRecordLog(LawenforcementRecordLog recordLog);
 
-    void updateRecordState(@Param("id") String id, @Param("recordStatus") String recordStatus);
+    void updateRecordState(@Param("id") String id, @Param("isRegister") String isRegister);
 
     int recordFillForm(LawenforcementFillFormBO bo);
 

src/main/java/com/sooka/sponest/lawenforcement/record/service/impl/LawenforcementRecordServiceImpl.java

@@ -255,7 +255,7 @@ public class LawenforcementRecordServiceImpl implements ILawenforcementRecordSer
         bo.setCreateBy(SecurityUtils.getUserId().toString());
         bo.setCreateName(SecurityUtils.getUsername());
         bo.setCreateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-        recordMapper.updateRecordState(bo.getRecordId(), "lawenforcement_type_7");
+        recordMapper.updateRecordState(bo.getRecordId(), "2");
         return recordMapper.recordFillForm(bo);
     }
 

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

@@ -49,6 +49,7 @@
         <result property="deviceId" column="device_id"/>
         <result property="deviceName" column="device_name"/>
         <result property="recordStatus" column="record_status"/>
+        <result property="isRegister" column="is_register"/>
         <collection property="personList" resultMap="LawenforcementUserResult"/>
     </resultMap>
 
@@ -198,7 +199,8 @@
                is_cross_dept,
                device_id,
                device_name,
-               record_status
+               record_status,
+               is_register
         from lawenforcement_record
     </sql>
 
@@ -267,7 +269,7 @@
         <include refid="selectLawenforcementRecordVo"/>
         <where>
             <if test="jobName != null  and jobName != ''">and job_name like concat('%', #{jobName}, '%')</if>
-            <if test="recordStatus != null adn recordStatus != ''">
+            <if test="recordStatus != null and recordStatus != ''">
                 and record_status = #{recordStatus}
             </if>
         </where>
@@ -481,7 +483,7 @@
     </insert>
 
     <update id="updateRecordState">
-        update lawenforcement_record set record_status = #{recordStatus}
+        update lawenforcement_record set is_register = #{isRegister}
         where id = #{id}
     </update>
 
@@ -613,4 +615,4 @@
         where id = #{id}
     </update>
 
-</mapper>
+</mapper>