Browse Source

fit:优化功能点

main
pengwei 5 months ago
parent
commit
c83a74b9fc
  1. 2
      src/components/negative/add.vue
  2. 13
      src/views/mobileSupervise/Inspection.vue
  3. 74
      src/views/work/Query.vue

2
src/components/negative/add.vue

@ -714,8 +714,6 @@ watch(()=>reportData.value,(val)=>{
form.value.reportId = val; form.value.reportId = val;
} }
},{deep:true,immediate:true}) },{deep:true,immediate:true})
const reportQuery = ref({ const reportQuery = ref({
current: 1, current: 1,
size: 100, size: 100,

13
src/views/mobileSupervise/Inspection.vue

@ -248,7 +248,6 @@
:auto-upload="true" :auto-upload="true"
:show-file-list="false" :show-file-list="false"
v-model:file-list="fileListData" v-model:file-list="fileListData"
:on-success="managementSuccess" :on-success="managementSuccess"
:on-progress="managementProgress" :on-progress="managementProgress"
accept="application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" accept="application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
@ -1463,7 +1462,7 @@
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
<!-- 重点人员督察情况-->
<el-dialog title="重点人员督察情况" v-model="superviseRiskShow" width="80vw" style="height:80vh"> <el-dialog title="重点人员督察情况" v-model="superviseRiskShow" width="80vw" style="height:80vh">
<div class="superviseRiskCards"> <div class="superviseRiskCards">
<div class="risk_left"> <div class="risk_left">
@ -1801,6 +1800,7 @@ const taskSupTotal = ref(0)
const taskSupData = ref([]) const taskSupData = ref([])
const taskLoading = ref(false) const taskLoading = ref(false)
const riskDataCards = ref(null) const riskDataCards = ref(null)
const changeCardIndex = ref(0)
const showSupervise = async (row) => { const showSupervise = async (row) => {
const res = await getTaskManagementDetail(row.id); const res = await getTaskManagementDetail(row.id);
// //
@ -1814,11 +1814,9 @@ const showSupervise = async (row) => {
const taskSupert = await getTaskSuprt(taskSupQuery.value); const taskSupert = await getTaskSuprt(taskSupQuery.value);
taskSupTotal.value = taskSupert.total; taskSupTotal.value = taskSupert.total;
taskSupData.value = taskSupert.records; taskSupData.value = taskSupert.records;
console.log('taskSupData',taskSupData.value)
} }
superviseRiskShow.value = true; superviseRiskShow.value = true;
} }
/** /**
* 获取重点人员督察记录列表 * 获取重点人员督察记录列表
* */ * */
@ -1833,7 +1831,6 @@ const getTaskSupDataFun = async () => {
taskLoading.value = false; taskLoading.value = false;
} }
} }
const changeCardIndex = ref(0)
/** /**
* 点击重点人员 * 点击重点人员
* */ * */
@ -1850,9 +1847,6 @@ const handSupRiskCard = async (row,index)=>{
taskLoading.value = false; taskLoading.value = false;
} }
} }
/** /**
* 重点督察人员前端列表 * 重点督察人员前端列表
* */ * */
@ -2096,11 +2090,12 @@ const addSelfArray = () => {
const temperancLoading = ref(false); const temperancLoading = ref(false);
//
const managementSuccess = async (val) => { const managementSuccess = async (val) => {
form.value.userList = val.data; form.value.userList = val.data;
temperancLoading.value = false; temperancLoading.value = false;
} }
//
const managementProgress = async (val) => { const managementProgress = async (val) => {
temperancLoading.value = true; temperancLoading.value = true;
} }

74
src/views/work/Query.vue

@ -631,10 +631,25 @@
trigger: ['blur'], trigger: ['blur'],
}" }"
> >
<el-input <!-- <el-input-->
placeholder="请输入" <!-- placeholder="请输入"-->
v-model="formData.reportNumber" <!-- v-model="formData.reportNumber"-->
<!-- />-->
<el-select v-model="reportData"
filterable
remote
reserve-keyword
placeholder="请选择通报期数"
:remote-method="getReportListDataFun"
:loading="reportLoading"
>
<el-option
v-for="(item,id) in reportList"
:key="id"
:label="item.reportName"
:value="item.id"
/> />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -780,6 +795,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="督察报告附件" v-if="reportFiles?.length > 0">
<file-list v-model:files="reportFiles" :removeEnable="false" />
</el-form-item>
<el-form-item <el-form-item
label="事情简要描述" label="事情简要描述"
prop="thingDesc" prop="thingDesc"
@ -824,6 +842,8 @@ import { ProcessingStatus } from "@/enums/flowEnums";
import { ProblemSources_XFTS, ProblemSources } from "@/enums/dictEnums"; import { ProblemSources_XFTS, ProblemSources } from "@/enums/dictEnums";
import useCatchStore from "@/stores/modules/catch"; import useCatchStore from "@/stores/modules/catch";
import {computed, watch} from "vue";
import {getListData} from "@/api/superviseReport/superviseReport";
const catchStore = useCatchStore(); const catchStore = useCatchStore();
const dict = catchStore.getDicts([ const dict = catchStore.getDicts([
@ -997,6 +1017,54 @@ function handleSpotCheck(row) {
} }
const remainingTimeFlag = ref(true); const remainingTimeFlag = ref(true);
const reportData = ref(null)
watch(()=>reportData.value,(val)=>{
if(val){
formData.value.reportNumber = reportList.value.find(s=>s.id == val).reportName;
formData.value.reportId = val;
}
},{deep:true,immediate:true})
const reportQuery = ref({
current: 1,
size: 100,
departBranch:false
})
const reportList = ref([]);
const reportLoading = ref(false);
const getReportListDataFun =async (val=null)=>{
reportLoading.value=true;
try{
if(val){
reportQuery.value.reportName = val;
}else{
reportQuery.value.reportName =null;
}
const res = await getListData(reportQuery.value);
reportList.value=res.records;
console.log('reportList.value',reportList.value)
reportLoading.value=false;
}catch (e){
reportLoading.value=false;
}
}
const reportFiles = computed(()=> {
if( formData.value.reportNumber){
let data= reportList.value.find(s=>s.id === formData.value.reportId);
data = data?data:reportList.value.find(s=>s.reportNumber === formData.value.reportNumber);
console.log('data',data)
return data?.files;
}else{
return []
}
})
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep() { :deep() {

Loading…
Cancel
Save