From 550e401cd64dff2fc3cae9fa26da5f8bdba7a14a Mon Sep 17 00:00:00 2001
From: pengwei <pengwei6411@163.com>
Date: Mon, 7 Jul 2025 17:19:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:1=E3=80=81=E6=8A=BD=E6=A3=80=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=BF=85=E5=A1=AB=E9=A1=B9=202=E3=80=81=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=9D=A3=E5=AF=9F=E4=BA=BA=E5=91=98=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=203=E3=80=81=E6=8A=BD=E6=A3=80=E4=BA=BA=E5=91=98=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=204=E3=80=81=E6=8A=BD=E6=A3=80=E4=BA=BA=E6=95=B0=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=8F=A0=E5=8A=A0=E2=80=9C=E8=A2=AB=E6=8A=BD=E6=A3=80?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E2=80=9D=E5=A1=AB=E5=86=99=E7=9A=84=E4=BA=BA?=
 =?UTF-8?q?=E6=95=B0=205=E3=80=81=E5=8D=95=E9=80=89=E6=A1=86=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=8F=96=E6=B6=88=206=E3=80=81=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=9C=89=E4=B8=80=E6=9D=A1=E8=A2=AB=E6=8A=BD=E6=A3=80=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobileSupervise/police-sampling.vue       | 279 ++++++++++++++++++
 src/components/police-picker.vue              |  71 ++++-
 src/views/mobileSupervise/Inspection.vue      |   5 +-
 src/views/mobileSupervise/Sampling.vue        | 190 +++++++++---
 4 files changed, 484 insertions(+), 61 deletions(-)
 create mode 100644 src/components/mobileSupervise/police-sampling.vue

diff --git a/src/components/mobileSupervise/police-sampling.vue b/src/components/mobileSupervise/police-sampling.vue
new file mode 100644
index 0000000..03a5687
--- /dev/null
+++ b/src/components/mobileSupervise/police-sampling.vue
@@ -0,0 +1,279 @@
+<template>
+    <div class="flex gap">
+<!--        <el-tag type="info" effect="plain" closable v-for="(item, index) in modelValue" :key="item" @close="handleRemove(index)">{{ item.name }}</el-tag>-->
+        <el-button type="primary" plain @click="show = true">
+            <template #icon>
+                <icon name="el-icon-Plus" style="width: 8px" />
+            </template>
+          补充抽检人员
+        </el-button>
+    </div>
+    <el-dialog title="选择警员" v-model="show" width="60vw" top="5vh">
+        <div style="min-height: 70vh">
+            <el-row :gutter="20">
+                <el-col :span="6">
+                    <el-scrollbar max-height="70vh">
+                        <el-tree
+                            :data="treeData"
+                            :props="{ label: 'shortName', value: 'id' }"
+                            :default-expanded-keys="['12630']"
+                            node-key="id"
+                            @node-click="handleSelectDepart"
+                        />
+                    </el-scrollbar>
+                </el-col>
+                <el-col :span="18">
+                    <header class="flex between mb-20">
+                        <el-form class="flex gap wrap">
+                            <el-input
+                                placeholder="警员姓名"
+                                v-model="query.name"
+                                clearable
+                                style="width: 190px"
+                            />
+                            <el-input
+                                placeholder="请输入"
+                                v-model="query.empNo"
+                                clearable
+                                style="width: 190px"
+                            />
+                            <el-input
+                                placeholder="身份证号码"
+                                v-model="query.idCode"
+                                clearable
+                                style="width: 190px"
+                            />
+                        </el-form>
+                        <el-button type="primary" @click="getList">查询</el-button>
+                    </header>
+                    <div class="table-container">
+                        <el-table
+                            ref="ableRef"
+                            :data="polices"
+                            row-key="id"
+                            max-height="890px"
+                            @selection-change="selectionChange"
+                            v-loading="loading"
+                        >
+                            <el-table-column type="selection" width="55" />
+                            <el-table-column
+                                label="姓名"
+                                prop="name"
+                                width="90"
+                            />
+                            <el-table-column
+                                label="警号"
+                                prop="empNo"
+                                width="100"
+                                show-overflow-tooltip
+                            />
+                            <el-table-column
+                                label="人员属性"
+                                width="120"
+                                align="center"
+                            >
+                                <template #default="{ row }">
+                                    <span>{{
+                                        getDictLable(
+                                            dict.personType,
+                                            row.personType
+                                        )
+                                    }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                label="职位"
+                                width="120"
+                                align="center"
+                            >
+                                <template #default="{ row }">
+                                    <span v-if="row.position">
+                                        <span v-if="row.level === 0"
+                                            >局领导{{ row.position }}</span
+                                        >
+                                        <span v-if="row.level === 2"
+                                            >二级机构{{ row.position }}</span
+                                        >
+                                        <span v-if="row.level === 3"
+                                            >三机机构{{ row.position }}</span
+                                        >
+                                        <span v-if="row.level === 4"
+                                            >四机机构{{ row.position }}</span
+                                        >
+                                    </span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                label="机构名称"
+                                prop="departShortName"
+                                width="200"
+                            />
+                        </el-table>
+                    </div>
+                    <div class="flex end mt-8">
+                        <el-pagination
+                            @size-change="getList"
+                            @current-change="getList"
+                            :page-sizes="[10, 20]"
+                            v-model:page-size="query.size"
+                            v-model:current-page="query.current"
+                            layout="total, sizes, prev, pager, next"
+                            :total="total"
+                        >
+                        </el-pagination>
+                    </div>
+                    <div class="flex gap mt-10 wrap v-center">
+                        <span>已选警员：</span>
+                        <el-tag
+                            v-for="(item, index) in checkPolices"
+                            :key="item"
+                            closable
+                            @close="handleRemove(index)"
+                            >{{ item.name }}</el-tag
+                        >
+                    </div>
+                </el-col>
+            </el-row>
+        </div>
+        <footer class="flex end">
+            <el-button @click="show = false">取消</el-button>
+            <el-button type="primary" @click="submit">确定</el-button>
+        </footer>
+    </el-dialog>
+</template>
+<script setup>
+import { departTreeList } from "@/api/system/depart";
+import { listPolice } from "@/api/system/police";
+import useCatchStore from "@/stores/modules/catch";
+import { getDictLable } from "@/utils/util";
+import feedback from "@/utils/feedback";
+
+const catchSotre = useCatchStore();
+const dict = catchSotre.getDicts(["personType"]);
+
+const props = defineProps({
+    modelValue: {
+        type: Array,
+        default: []
+    },
+    departId: {
+        type: String
+    },
+  samplingNum:{
+      type:Number,
+      default:10
+  }
+});
+
+const emit = defineEmits(['update:modelValue'])
+
+const show = ref(false);
+const query = ref({
+  current:1,
+    departBranch: true
+
+});
+watch(() => props.departId, (val) => {
+    query.value.departId = val;
+    getList()
+})
+const total = ref(0);
+const ableRef =ref(null)
+const treeData = catchSotre.getDepartsAll();
+const polices = ref([]);
+const loading = ref(false)
+function getList() {
+    loading.value = true
+    listPolice(query.value).then((data) => {
+        polices.value = data.records;
+        console.log('polices',polices)
+        setCheckFun(data.records)
+        total.value = data.total;
+        loading.value = false
+    });
+}
+
+
+const setCheckFun =(row)=>{
+  console.log('checkPolices.value',checkPolices.value)
+  row.forEach((s)=>{
+    let data =checkPolices.value.find(x=>
+        x.empNo === s.empNo
+    )
+    if(data){
+      nextTick(()=>{
+        ableRef.value.toggleRowSelection(s, true);
+      })
+    }
+  })
+}
+
+
+const checkPolices = ref([]);
+const checkPolicesMap =ref([])
+function selectionChange(selectionRows) {
+
+
+  if( checkPolicesMap.value['key'+query.value.current]){
+    let data = checkPolicesMap.value['key'+query.value.current];
+    checkPolicesMap.value['key'+query.value.current]=getCheckData(data,selectionRows);
+  }else{
+    checkPolicesMap.value['key'+query.value.current] =getCheckData([],selectionRows);
+  }
+  checkPolices.value=[]
+  for (let key in checkPolicesMap.value){
+    checkPolices.value=checkPolices.value.concat(checkPolicesMap.value[key])
+  }
+
+}
+
+const getCheckData = (data,selectionRows) =>{
+  selectionRows.forEach(item => {
+
+    if (data.findIndex(o => o.empNo === item.empNo) === -1) {
+      data.push({
+        name:    item.name,
+        empNo: item.empNo,
+        idCode: item.idCode,
+        isLeader:item.position,
+        deptId :item.orgId
+      })
+    }
+  })
+  data.forEach((s,i)=>{
+    if (selectionRows.findIndex(o => o.empNo === s.empNo) === -1){
+      data.splice(i,1)
+    }
+  })
+  return data;
+}
+
+
+function handleSelectDepart(node) {
+    query.value.departId = node.id;
+    getList();
+}
+
+function handleRemove(index) {
+    checkPolices.value.splice(index, 1)
+    emit('update:modelValue', checkPolices.value)
+}
+
+function submit() {
+    emit('update:modelValue', checkPolices.value)
+    show.value = false
+}
+watch(()=>props.modelValue,()=>{
+  checkPolices.value=props.modelValue
+},{deep:true,immediate:true})
+
+
+onMounted(() => {
+    getList();
+});
+</script>
+<style lang="scss">
+.el-tree-node.is-current > .el-tree-node__content {
+    background-color: #e8e9f3;
+}
+</style>
diff --git a/src/components/police-picker.vue b/src/components/police-picker.vue
index aceede9..70eed03 100644
--- a/src/components/police-picker.vue
+++ b/src/components/police-picker.vue
@@ -47,6 +47,7 @@
                     </header>
                     <div class="table-container">
                         <el-table
+                            ref="ableRef"
                             :data="polices"
                             row-key="id"
                             max-height="890px"
@@ -162,14 +163,16 @@ const emit = defineEmits(['update:modelValue'])
 
 const show = ref(false);
 const query = ref({
+  current:1,
     departBranch: true
+
 });
 watch(() => props.departId, (val) => {
     query.value.departId = val;
     getList()
 })
 const total = ref(0);
-
+const ableRef =ref(null)
 const treeData = catchSotre.getDepartsAll();
 const polices = ref([]);
 const loading = ref(false)
@@ -178,27 +181,69 @@ function getList() {
     listPolice(query.value).then((data) => {
         polices.value = data.records;
         console.log('polices',polices)
+        setCheckFun(data.records)
         total.value = data.total;
         loading.value = false
     });
 }
 
-const checkPolices = ref([]);
 
+const setCheckFun =(row)=>{
+
+  row.forEach((s)=>{
+    let data =checkPolices.value.find(x=>{
+      return  JSON.stringify(x) === JSON.stringify({
+        name:    s.name,
+        empNo: s.empNo,
+        idCode: s.idCode
+      })
+    });
+    if(data){
+      nextTick(()=>{
+        ableRef.value.toggleRowSelection(s, true);
+      })
+    }
+  })
+}
+
+
+const checkPolices = ref([]);
+const checkPolicesMap =ref([])
 function selectionChange(selectionRows) {
-    selectionRows.forEach(item => {
-        if (checkPolices.value.findIndex(o => o.empNo === item.empNo) === -1) {
-            checkPolices.value.push({
-                name: item.name,
-                empNo: item.empNo,
-                idCode: item.idCode
-            })
-        } else {
-
-        }
-    })
+  if( checkPolicesMap.value['key'+query.value.current]){
+    let data = checkPolicesMap.value['key'+query.value.current];
+    checkPolicesMap.value['key'+query.value.current]=getCheckData(data,selectionRows);
+  }else{
+    checkPolicesMap.value['key'+query.value.current] =getCheckData([],selectionRows);
+  }
+  checkPolices.value=[]
+  for (let key in checkPolicesMap.value){
+    checkPolices.value=checkPolices.value.concat(checkPolicesMap.value[key])
+  }
+}
+
+const getCheckData = (data,selectionRows) =>{
+  selectionRows.forEach(item => {
+    if (data.findIndex(o => o.empNo === item.empNo) === -1) {
+      data.push({
+        name: item.name,
+        empNo: item.empNo,
+        idCode: item.idCode
+      })
+    }
+  })
+  data.forEach((s,i)=>{
+    if (selectionRows.findIndex(o => o.empNo === s.empNo) === -1){
+      data.splice(i,1)
+    }
+  })
+  return data;
 }
 
+
+
+
+
 function handleSelectDepart(node) {
     query.value.departId = node.id;
     getList();
diff --git a/src/views/mobileSupervise/Inspection.vue b/src/views/mobileSupervise/Inspection.vue
index fba8ee1..2fbc03c 100644
--- a/src/views/mobileSupervise/Inspection.vue
+++ b/src/views/mobileSupervise/Inspection.vue
@@ -1603,6 +1603,7 @@ async function submit() {
   getList();
   form.value = {
     files: [],
+    supervisionType :'日常督察',
     supRiskDtoList:[]
   };
 }
@@ -1622,10 +1623,10 @@ const getTaskType = (val) => {
 
 
 function handleShowAdd() {
-  form.value.supervisionType = '日常督察'
   show.value = true;
   form.value = {
     files: [],
+    supervisionType :'日常督察',
     supRiskDtoList:[]
   };
 }
@@ -1943,7 +1944,7 @@ watch(()=>form.value.supRiskDtoList,(newVal)=>{
  * 获取重点督察人员表单
  * */
 watch(()=>activeRow.value.supRiskDtoList,(newVal)=>{
-  if(activeRow.value.supRiskDtoList.length > 0){
+  if(activeRow.value.supRiskDtoList && activeRow.value.supRiskDtoList.length > 0){
     getRiskDataTableSubmit();
   }
 
diff --git a/src/views/mobileSupervise/Sampling.vue b/src/views/mobileSupervise/Sampling.vue
index 60e1b85..b1674c2 100644
--- a/src/views/mobileSupervise/Sampling.vue
+++ b/src/views/mobileSupervise/Sampling.vue
@@ -1,11 +1,12 @@
 <script setup>
 import useCatchStore from "@/stores/modules/catch";
-import  {selectListData,getSamplingPoliceData,addOrUpData} from '@/api/mobileSupervision/Sampling'
+import {addOrUpData, getSamplingPoliceData, selectListData} from '@/api/mobileSupervision/Sampling'
 import feedback from "@/utils/feedback";
-import {timeFormat,getDictLable} from "@/utils/util";
-
+import {getDictLable, timeFormat} from "@/utils/util";
+import policeSampling from '@/components/mobileSupervise/police-sampling.vue'
 import {getDepartProfile} from "@/api/sensitivePerception/profileDepart";
 import {BASE_PATH} from "@/api/request";
+
 const loading = ref(false)
 const policeLoading =ref(false)
 const total =ref(10)
@@ -61,9 +62,14 @@ let query = ref({
 //编辑弹窗显示状态码
 let editShow = ref(false)
 let detailShow =ref(false)
-
+let editForm = ref(null)
 let editData = ref({
-  samplingObjectList:null
+  samplingObjectList:[
+    {
+      deptId:null,
+      value:null
+    }
+  ]
 })
 const reset =()=>{
   query.value={
@@ -88,6 +94,14 @@ const getList = ()=>{
 //打开创建人员抽检弹窗
 const editFun = ()=>{
   editShow.value =!editShow.value
+ editData.value={
+    samplingObjectList:[
+      {
+        deptId:null,
+        value:null
+      }
+    ]
+  }
 }
 //打开详情窗口
 const getDataDetail =(row)=>{
@@ -131,16 +145,14 @@ const delSamplingObjectFun =(key) =>{
  * 重新生成抽检对象名单
  * */
 const getSamplingPolices =async ()=>{
+  await editForm.value.validate();
   policeLoading.value=true
   if(computedData(editData.value)  < 0 || computedData(editData.value) > 0){
     feedback.msgWarning("【被抽检对象抽检总人数】 和 【抽检人数】不吻合")
   }else{
-    const res = await  getSamplingPoliceData(editData.value)
-    editData.value.samplingPolices = res;
+    editData.value.samplingPolices = await getSamplingPoliceData(editData.value);
+    policeLoading.value=false
   }
-
-  policeLoading.value=false
-
 }
 
 /**
@@ -159,6 +171,13 @@ const computedData = (data)=>{
   return  (data.samplingNum?data.samplingNum:0) - one;
 }
 
+watch(()=>editData.value.samplingObjectList,()=>{
+  editData.value.samplingNum =  editData.value.samplingObjectList.reduce((accumulator, currentValue) => {
+    return accumulator + ( currentValue.value?currentValue.value:0);
+  },0)
+},{deep:true,immediate:true})
+
+
 //获取单位为简称
 const getDepartShortNameFun = async(val)=>{
   const res = await getDepartProfile(val)
@@ -172,9 +191,13 @@ const getDepartShortNameFun = async(val)=>{
  * 提交表单
  * */
 const handleSumbit =async ()=>{
+  await editForm.value.validate();
   if(computedData(editData.value)  < 0 || computedData(editData.value) > 0){
     feedback.msgWarning("【被抽检对象抽检总人数】 和 【抽检人数】不吻合")
-  }else{
+  }else if(editData.value.samplingPolices.length > editData.value.samplingNum ){
+    feedback.msgWarning("【被抽检总人数】 和 【抽检人数】不吻合")
+  }
+  else{
     const res = await  addOrUpData(editData.value)
     editShow.value=false
     feedback.msgSuccess("操作成功");
@@ -203,6 +226,19 @@ const handleExport = async ()=>{
   window.open(`${BASE_PATH}/sampling/export/samplingPoling?` + new URLSearchParams(data).toString())
 }
 
+const handleChange =(val,key)=>{
+  console.log(`val:${val},key:${key}`)
+}
+
+const handleRadioClick = (val,key)=>{
+  if(editData.value[key] === val){
+    editData.value[key] = null
+  }else {
+    editData.value[key]=val;
+  }
+}
+
+
 onMounted(()=>{
   getList()
 })
@@ -379,19 +415,25 @@ onMounted(()=>{
       </div>
     </main>
 
-    <el-dialog v-model="editShow" title="创建人员抽检" width="900px">
-      <el-form ref="editForm">
+    <el-dialog  v-model="editShow" title="创建人员抽检" width="900px">
+      <el-form ref="editForm" :model="editData">
           <el-row :gutter="20">
             <el-col :span="24">
-              <el-form-item label="抽检名称">
-                <el-input v-model="editData.samplingName" style="width: 100%"></el-input>
+              <el-form-item :rules="{
+                        required: true,
+                        message: '请填写抽检名称',
+                    }" label="抽检名称" prop="samplingName">
+                <el-input    v-model="editData.samplingName" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="督察类型">
-                <el-select  v-model="editData.inspectorType">
+              <el-form-item :rules="{
+                        required: true,
+                        message: '请选择督察类型',
+                    }"  label="督察类型" prop="inspectorType">
+                <el-select   v-model="editData.inspectorType">
                   <el-option v-for="(item,key) in dict.inspectorType"
                              :value="item.dictValue"
                              :label="item.dictLabel"
@@ -412,31 +454,42 @@ onMounted(()=>{
           </div>
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="年龄范围">
+              <el-form-item :rules="{
+                        required: true,
+                        message: '请补充年龄',
+                    }" prop="ageMin" label="年龄范围">
                 <el-row :gutter="20">
                   <el-col :span="11">
-                    <el-input-number v-model="editData.ageMin" controls-position="right" placeholder="开始年龄"></el-input-number>
+                    <el-input-number   v-model="editData.ageMin" controls-position="right" placeholder="开始年龄"></el-input-number>
                   </el-col>
                   <el-col :span="2">至</el-col>
                   <el-col :span="11">
-                    <el-input-number v-model="editData.ageMax" controls-position="right" placeholder="结束年龄"></el-input-number>
+                    <el-input-number
+
+                        v-model="editData.ageMax" controls-position="right" placeholder="结束年龄"></el-input-number>
                   </el-col>
                 </el-row>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="性别">
-                <el-radio-group v-model="editData.gender">
-                  <el-radio value="1" label="男"></el-radio>
-                  <el-radio value="2" label="女"></el-radio>
+              <el-form-item label="性别" prop="gender">
+                <el-radio-group
+                    v-model="editData.gender" >
+                  <el-radio @click.native.prevent ="handleRadioClick('1','gender')" value="1" label="男"></el-radio>
+                  <el-radio @click.native.prevent ="handleRadioClick('2','gender')"  value="2" label="女"></el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="人员属性">
-                <el-checkbox-group v-model="editData.personnelTypeArray">
+              <el-form-item label="人员属性" :rules="{
+                        required: true,
+                        message: '请选择人员属性',
+                    }" prop="personnelTypeArray">
+                <el-checkbox-group v-model="editData.personnelTypeArray"
+
+                >
                   <el-checkbox v-for="(item,key) in dict.personType"
                                :value="item.dictValue"
                                :label="item.dictLabel"
@@ -447,8 +500,8 @@ onMounted(()=>{
             <el-col :span="12">
               <el-form-item label="是否存在违反六项规定情节">
                 <el-radio-group v-model="editData.drinkAlcohol">
-                  <el-radio value="1" label="是"></el-radio>
-                  <el-radio value="2" label="否"></el-radio>
+                  <el-radio @click.native.prevent ="handleRadioClick('1','drinkAlcohol')" value="1" label="是"></el-radio>
+                  <el-radio @click.native.prevent ="handleRadioClick('1','drinkAlcohol')" value="2" label="否"></el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -460,25 +513,48 @@ onMounted(()=>{
           </div>
           <el-row :gutter="20">
             <el-col :span="12">
-             <el-form-item label="抽检人数">
-               <el-input-number v-model="editData.samplingNum"  style="width: 70%" placeholder="请输入抽检人数" :controls-position="'right'"></el-input-number>人
+             <el-form-item :rules="{
+                        required: true,
+                        message: '请输入抽检人数',
+                    }" label="抽检人数" prop="samplingNum">
+               <el-input-number   v-model="editData.samplingNum"  style="width: 70%" placeholder="请输入抽检人数" :controls-position="'right'"></el-input-number>人
              </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="领导人数">
-                <el-input-number v-model="editData.leadersNumber" style="width: 70%" placeholder="请输入领导人数" :controls-position="'right'"></el-input-number>人
+              <el-form-item  :rules="{
+                        required: true,
+                        message: '请输入领导人数',
+                    }" label="领导人数" prop="leadersNumber">
+                <el-input-number
+
+                    v-model="editData.leadersNumber" style="width: 70%" placeholder="请输入领导人数" :controls-position="'right'"></el-input-number>人
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="民警比率">
-                <el-input-number v-model="editData.policeRatio" style="width: 70%" placeholder="请输入民警比率" :controls-position="'right'"></el-input-number>%
+              <el-form-item
+                  :rules="{
+                        required: true,
+                        message: '请输入民警比率',
+                    }"
+                  prop="policeRatio"
+                  label="民警比率">
+                <el-input-number
+
+                    v-model="editData.policeRatio" style="width: 70%" placeholder="请输入民警比率" :controls-position="'right'"></el-input-number>%
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="辅警比率">
-                <el-input-number v-model="editData.assistRatio" style="width: 70%" placeholder="请输入辅警比率" :controls-position="'right'"></el-input-number>%
+              <el-form-item label="辅警比率"
+                            :rules="{
+                                required: true,
+                                message: '请输入民警比率',
+                            }"
+                            prop="assistRatio"
+              >
+                <el-input-number
+                    v-model="editData.assistRatio" style="width: 70%" placeholder="请输入辅警比率" :controls-position="'right'"></el-input-number>%
               </el-form-item>
             </el-col>
           </el-row>
@@ -536,17 +612,34 @@ onMounted(()=>{
           <el-card shadow="never" style="background-color: #F9FAFF">
             <el-row :gutter="20" style="margin-bottom: 10px" v-for="(item,key) in editData.samplingObjectList" :key="key">
               <el-col :span="14">
-                <depart-tree-select
-                    :size="'large'"
-                    placeholder="请选择案件管辖单位"
-                    v-model="item.deptId"
-                />
+                <el-form-item
+                    label="案件管辖单位"
+                    :prop="`samplingObjectList[${key}].deptId`"
+                               :rules="{
+                                required: true,
+                                message: '请选择案件管辖单位',
+                            }"
+                >
+                  <depart-tree-select
+                      :size="'large'"
+                      placeholder="请选择案件管辖单位"
+                      v-model="item.deptId"
+                  />
+                </el-form-item>
               </el-col>
               <el-col :span="6">
                 <div class="flex " style="align-items: center">
-                  <div style="padding-right: 10px">人数</div>
                   <div>
-                    <el-input-number  v-model="item.value" size="large" :controls="false" placeholder="请输入人数" />
+                    <el-form-item
+                        label="人数"
+                        :prop="`samplingObjectList[${key}].value`"
+                        :rules="{
+                                required: true,
+                                message: '请输入人数',
+                            }"
+                    >
+                      <el-input-number v-model="item.value" size="large" :controls="false" placeholder="请输入人数" />
+                    </el-form-item>
                   </div>
                 </div>
               </el-col>
@@ -568,8 +661,14 @@ onMounted(()=>{
             <div>
               <h5>抽检对象名单<span></span></h5>
             </div>
-            <div>
-              <el-button @click="getSamplingPolices">重新生成抽检对象</el-button>
+            <div style="display: flex;align-items: center">
+
+              <div  style="margin-left: 5px">
+                <el-button @click="getSamplingPolices">重新生成抽检对象</el-button>
+              </div>
+             <div>
+               <police-sampling :samplingNum="editData.samplingNum" v-model="editData.samplingPolices" />
+             </div>
             </div>
           </div>
           <el-card shadow="never" style="background-color: #F9FAFF;min-height: 50px" v-loading="policeLoading">
@@ -700,7 +799,6 @@ onMounted(()=>{
             <el-col :span="12">
               <el-form-item label="时间范围">
                 <span v-if="editData.samplingTime">{{ `${timeFormat(editData.samplingTime[0]) } 至 ${timeFormat(editData.samplingTime[1]) }` }}</span>
-
               </el-form-item>
             </el-col>
             <el-col :span="12">