完善

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

@@ -82,6 +82,7 @@ export default {
       reset:true,
       //选中的执法部门信息
       selectedDepts:[],
+      deptCache:[],
       //选中的执法人员
       selectedUserList:[],
       //主办人
@@ -91,6 +92,7 @@ export default {
   methods: {
     /** 对选执法部门回调函数，根据选中的执法部门id集合，获取对应的人员列表 */
     handleDeptSelectionChange(selectedIds) {
+      this.deptCache = selectedIds
       if (selectedIds.length > 0) {
         getUserListByDeptId(selectedIds).then(res => {
           //选中的部门中所有的执法人员信息
@@ -126,12 +128,16 @@ export default {
     },
     /** 派发工单提交 */
     handleDispatch() {
+      if(this.deptCache.length == 0){
+        this.$modal.msgWarning("请选择执法部门");
+        return
+      }
       if (this.distributeData.personList.length==0){
-        this.$modal.msgSuccess("请选择人员");
+        this.$modal.msgWarning("请选择执法人员");
         return
       }
       if (this.distributeData.mainPerson==null){
-        this.$modal.msgSuccess("请选择主办人员");
+        this.$modal.msgWarning("请选择主办人员");
         return
       }
       // 处理派发逻辑，这里可以写你的逻辑，比如保存数据或者提交请求

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

@@ -74,8 +74,9 @@
             size="mini" type="text" icon="el-icon-paper-plus" @click="showBindDeviceDialog(scope.row)">
             绑定设备
           </el-button>
-          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
-                       v-hasPermi="['system:role:edit']">
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']"
+                       v-if="(scope.row.recordStatus === 'lawenforcement_type_2' || scope.row.recordStatus === 'lawenforcement_type_5') && scope.row.isRegister ==='0'
+                               || (scope.row.createMethod === 4 && scope.row.recordStatus === 'lawenforcement_type_1')">
             <span class="el-dropdown-link">
               <i class="el-icon-d-arrow-right el-icon--right"></i>更多
             </span>

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

@@ -565,7 +565,10 @@
                     and lr.record_status in ('lawenforcement_type_1', 'lawenforcement_type_3')
                 </if>
                 <if test="recordStatus == 'lawenforcement_type_6'">
-                    and lr.record_status = #{recordStatus}
+                    and lr.record_status in ('lawenforcement_type_4','lawenforcement_type_6')
+                </if>
+                <if test="recordStatus == 'lawenforcement_type_2'">
+                    and lr.record_status in ('lawenforcement_type_2','lawenforcement_type_5')
                 </if>
             </if>
         </where>