diff --git a/src/api/mobileSupervision/taskProblem.ts b/src/api/mobileSupervision/taskProblem.ts index ce4dd4a..3746f1b 100644 --- a/src/api/mobileSupervision/taskProblem.ts +++ b/src/api/mobileSupervision/taskProblem.ts @@ -12,4 +12,18 @@ export function getTaskProblem(id) { return request.get({ url: '/task/problem/' + id }); -} \ No newline at end of file +} + + +export function delTaskProblem(id){ + return request.del({ + url:`/task/problem/${id}` + }) +} + + +export function upProblemState(id){ + return request.put({ + url:`/task/problem/${id}` + }) +} diff --git a/src/components/police-picker.vue b/src/components/police-picker.vue index 43d7a25..10591f5 100644 --- a/src/components/police-picker.vue +++ b/src/components/police-picker.vue @@ -178,6 +178,8 @@ watch(() => props.departId, (val) => { query.value.departId = val; getList() }) + + const total = ref(0); const ableRef = ref(null) const treeData = catchSotre.getDepartsAll(); @@ -209,6 +211,12 @@ const setCheckFun = (row) => { const checkPolices = ref([]); +watch(()=>props.modelValue,(val)=>{ + console.log('val',val) + checkPolices.value =val; + getList(); +},{immediate:true,deep:true}) + const changeCheck = (row)=>{ let checkIndex =checkPolices.value.map(s=>s.empNo); if(row.isCheck){ @@ -231,13 +239,17 @@ function handleSelectDepart(node) { } function handleRemove(index) { - polices.value.forEach(s=>{ - if(s.empNo == checkPolices.value[index].empNo){ - s.isCheck =false - } - }) - checkPolices.value.splice(index, 1) + if(polices.value.length >0){ + console.log('s',polices.value) + console.log('checkPolices.value[index]',checkPolices.value) + polices.value.forEach(s=>{ + if(s.empNo == checkPolices.value[index].empNo){ + s.isCheck =false + } + }) + } + checkPolices.value.splice(index, 1) emit('update:modelValue', checkPolices.value) } @@ -250,6 +262,8 @@ function submit() { show.value = false } + + onMounted(() => { getList(); }); diff --git a/src/views/mobileSupervise/Inspection.vue b/src/views/mobileSupervise/Inspection.vue index 9885b0b..7fad276 100644 --- a/src/views/mobileSupervise/Inspection.vue +++ b/src/views/mobileSupervise/Inspection.vue @@ -118,6 +118,9 @@ type="primary" link @click="showSupervise(row)" >督察情况 + + 编辑 + - - + 下发 @@ -1198,7 +1201,7 @@ @@ -1243,7 +1246,8 @@ width="140" show-overflow-tooltip /> - + + @@ -1505,7 +1509,12 @@
- {{ activeRowData.peoples }} + + + + {{item.name}} + +
@@ -1644,7 +1653,7 @@ @@ -1820,34 +1829,6 @@ - - - - - - -
- 取消 - 确认 -
- @@ -1886,7 +1867,8 @@ import {disabledDate} from "@/utils/util"; let cardContent = ref() const catchStore = useCatchStore(); -const dict = catchStore.getDicts(["supervisionType","policeType","suspectProblem", "approvalFlow","distributionFlow","personnelTypeArray", "inspectorType", "personType","businessType", "controlLevel", "controlType"]); +const dict = catchStore.getDicts(["supervisionType","policeType","suspectProblem", "approvalFlow","distributionFlow","personnelTypeArray", "inspectorType", "personType","businessType", "controlLevel","distributionState", "controlType"]); + const fileListData = ref([]); const list = ref([]); @@ -2005,6 +1987,10 @@ async function submit() { feedback.msgSuccess("发布成功"); show.value = false; getList(); +} + +//关闭弹窗的回调函数（清空） +const addColse =()=>{ form.value = { files: [], supervisionType: '日常督察', @@ -2051,6 +2037,51 @@ const activeRow = ref({ supRiskDtoList: [] }); +const editLoading = ref(false) +const editTable =async (row)=>{ + console.log('row',row.taskType) + show.value = true; + editLoading.value = true; + try { + const res = await getTaskManagementDetail(row.id); + console.log('res',res) + form.value = res; + if(res.files){ + form.value.files = JSON.parse(res.files) + } + if (res.samplingTarget == '自定义人员' && res.samplingIds) { + + getSamplingList() + delete samplingQuery.value.ids + } + if (res.selfOrgs) { + getDepartByIdsFun(res.selfOrgs) + } else { + slofOrgList.value = [] + } + showRiskDataTable.value=true + editLoading.value = false; + } catch (e) { + editLoading.value = false; + } +} +const tableRef =ref() +function setCheck() { + + if( form.value.samplingIds && form.value.samplingIds.length > 0){ + let idList = form.value.samplingIds; + samplingList.value.forEach(item => { + if (form.value.samplingIds && idList.indexOf(item.id) >= 0) { + nextTick(() => { + tableRef.value.toggleRowSelection(item, true); + }) + } + }) + } +} + + + /** * 显示督察任务详情 * */ @@ -2063,7 +2094,7 @@ async function handleShowDetail(row) { if(res.files){ activeRow.value.files = JSON.parse(res.files) } - if (res.samplingTarget == '自定义人员') { + if (res.samplingTarget == '自定义人员' && res.samplingIds) { samplingQuery.value.ids = res.samplingIds; getSamplingList() delete samplingQuery.value.ids @@ -2209,7 +2240,7 @@ const handSupRiskCard = async (row)=>{ * 重点督察人员前端列表 * */ const getRiskDataTableSubmit = () => { - filterDataTable.value = form.value.supRiskDtoList.length > 0 ? form.value.supRiskDtoList : activeRow.value.supRiskDtoList + filterDataTable.value = (form.value.supRiskDtoList && form.value.supRiskDtoList.length > 0) ? form.value.supRiskDtoList : activeRow.value.supRiskDtoList //管控级别 if (riskDataQuery.value.controlLevel) { filterDataTable.value = filterDataTable.value.filter(s => s.controlLevel.includes(riskDataQuery.value.controlLevel)); @@ -2377,6 +2408,7 @@ function getSamplingList() { samplingloading.value = true selectListData(samplingQuery.value).then((res) => { samplingList.value = res.records; + setCheck(); samplingTotal.value = res.total; samplingloading.value = false }) @@ -2468,25 +2500,23 @@ const departs = catchStore.getDepartsAll(); //任务分发 const distributeShow = ref(false) -const editDepartShow =ref(false) const issueForm = ref({}) const issueLoading = ref(false) const formRefs =ref(); //六项规定督察下发问题 const issueMatterFun =(row,key)=>{ - console.log('row',row) switch (key){ - case "sdzc": + case "selfexamination": issueForm.value.problemVo = row break; - case "rcdc": + case "inspection": issueForm.value.problemVo = row break; - case "lxgddc": + case "testing_alcohol": issueForm.value.taskId = row.taskId; issueForm.value.empNo =row.empNo; break; - case "zdrydc": + case "risk_personal": issueForm.value.supRecordId =row.id break; } @@ -2509,16 +2539,16 @@ const handleSubmitTask =async ()=>{ feedback.msgSuccess("下发成功"); distributeShow.value = false; switch (issueForm.value.tableKey){ - case "sdzc": + case "selfexamination": getSelfexaminationProblemFun(); break; - case "rcdc": + case "inspection": getProblems(); break; - case "lxgddc": + case "testing_alcohol": getTestingAlcoholPeople(); break; - case "zdrydc": + case "risk_personal": getTaskSupDataFun(); break; } @@ -2567,9 +2597,13 @@ const getRiskDataTableList = (val) => { * 获取重点督察人员表单 * */ watch(() => form.value.supRiskDtoList, (newVal) => { - if (form.value.supRiskDtoList.length > 0) { + if (form.value.supRiskDtoList && form.value.supRiskDtoList.length > 0) { getRiskDataTableSubmit(); } + if(!activeRow.value.supRiskDtoList || activeRow.value.supRiskDtoList.length == 0){ + riskDataTotal.value = 0; + riskDataTable.value =[]; + } }, {immediate: true, deep: true}) /** @@ -2589,7 +2623,7 @@ watch(departs, () => { watch(() => form.value.specialType, (newVal) => { if (newVal === '六项规定督察') { - form.value.samplingTarget = '1' + form.value.samplingTarget = '自定义人员' } }, {immediate: true}) diff --git a/src/views/mobileSupervise/TaskProblem.vue b/src/views/mobileSupervise/TaskProblem.vue index 8622dae..5ceee8d 100644 --- a/src/views/mobileSupervise/TaskProblem.vue +++ b/src/views/mobileSupervise/TaskProblem.vue @@ -58,8 +58,17 @@
+ + + + + +
- + @@ -149,7 +167,11 @@
- {{ activeRow.peoples }} + + + {{item.name}} + +
@@ -169,15 +191,173 @@
+ + + + + + + +
+
+ +
+
+

指定具体办理单位 指将问题分派给哪个单位办理。

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + {{ item.dictLabel }} + + + + + {{ item.dictLabel + }}{{ item.remark ? `(${item.remark})` : "" }} + +
+

+ 三级审核　在问题提交办结时，需经过“所队—>二级机构—>市局”三级审核，通过后方可办结； +

+

+ 二级审核　在问题提交办结时，仅需经过“所队—>二级机构”两级审核，通过后即可办结； +

+
+ + + + + +
+ 确认下发 +
+ + \ No newline at end of file +