diff --git a/src/api/longoPeration/CaseIssues.js b/src/api/longoPeration/CaseIssues.js index bb8c1b1..ed69b9d 100644 --- a/src/api/longoPeration/CaseIssues.js +++ b/src/api/longoPeration/CaseIssues.js @@ -26,6 +26,14 @@ }); } +// // 详情接口 +export function patrolProblemRectifyID(id) { + return request({ + url: '/business/patrolProblemRectify/' + id, + method: 'get', + }); +} + // 删除排水防涝--防汛物资 export function FloodPreventionMaterialdelete(id) { return request({ diff --git a/src/api/longoPeration/CaseIssues.js b/src/api/longoPeration/CaseIssues.js index bb8c1b1..ed69b9d 100644 --- a/src/api/longoPeration/CaseIssues.js +++ b/src/api/longoPeration/CaseIssues.js @@ -26,6 +26,14 @@ }); } +// // 详情接口 +export function patrolProblemRectifyID(id) { + return request({ + url: '/business/patrolProblemRectify/' + id, + method: 'get', + }); +} + // 删除排水防涝--防汛物资 export function FloodPreventionMaterialdelete(id) { return request({ diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 634a38d..237b8d4 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -108,7 +108,15 @@ - + @@ -189,7 +197,6 @@ const { patrol_type } = proxy.useDict('patrol_type'); // 巡查类型的字典 const open = ref(false); const opendetails = ref(false); -const multiple = ref(false); const showSearch = ref(true); const case_level = ref([ { @@ -202,18 +209,13 @@ }, { value: '3', label: '整改已完成' }, ]); - const projectTList = ref([]); const ConstructionUnit = ref([]); const loading = ref(true); -const loadingTwo = ref(false); const total = ref(0); -const totaltwo = ref(0); const title = ref(''); const dataList = ref([]); -const dataListTwo = ref([]); const DataList = ref([]); - const AllData = reactive({ publishTime: [], publishTime1: [], @@ -230,50 +232,49 @@ pageNum: 1, pageSize: 10, }, - rules: { - // taskName: [{ required: true, message: '请输入巡查任务名称', trigger: 'blur' }], - // rectifyType: [{ required: true, message: '请输入整改方式', trigger: 'blur' }], - // supervisionWork: [{ required: true, message: '请输入督办事项', trigger: 'blur' }], - // haveProblem: [{ required: true, message: '请输入存在问题', trigger: 'blur' }], - // // fileListToNotice: [{ required: true, message: '请上传整改书', trigger: 'blur' }], - // rectifyTime: [{ required: true, message: '请选择整改时限', trigger: 'blur' }], - // projectCompanyId: [{ required: true, message: '请选择建设单位', trigger: 'blur' }], - // leaderName: [{ required: true, message: '请输入责任领导', trigger: 'blur' }], - // leaderPhone: [ - // { required: true, message: '请输入责任领导电话', trigger: 'blur' }, - // { - // validator: (rule, value) => { - // return new Promise((resolve, reject) => { - // if (!validPhone(value)) { - // reject(Error('手机号格式错误')); - // } else { - // resolve(); - // } - // }); - // }, - // trigger: 'blur', - // }, - // ], - // peopleName: [{ required: true, message: '请输入责任人', trigger: 'blur' }], - // peoplePhone: [ - // { required: true, message: '请输入责任人电话', trigger: 'blur' }, - // { - // validator: (rule, value) => { - // return new Promise((resolve, reject) => { - // if (!validPhone(value)) { - // reject(Error('手机号格式错误')); - // } else { - // resolve(); - // } - // }); - // }, - // trigger: 'blur', - // }, - // ], + taskName: [{ required: true, message: '请输入巡查任务名称', trigger: 'blur' }], + rectifyType: [{ required: true, message: '请输入整改方式', trigger: 'blur' }], + supervisionWork: [{ required: true, message: '请输入督办事项', trigger: 'blur' }], + haveProblem: [{ required: true, message: '请输入存在问题', trigger: 'blur' }], + // fileListToNotice: [{ required: true, message: '请上传整改书', trigger: 'blur' }], + rectifyTime: [{ required: true, message: '请选择整改时限', trigger: 'blur' }], + projectCompanyId: [{ required: true, message: '请选择建设单位', trigger: 'blur' }], + leaderName: [{ required: true, message: '请输入责任领导', trigger: 'blur' }], + leaderPhone: [ + { required: true, message: '请输入责任领导电话', trigger: 'blur' }, + { + validator: (rule, value) => { + return new Promise((resolve, reject) => { + if (!validPhone(value)) { + reject(Error('手机号格式错误')); + } else { + resolve(); + } + }); + }, + trigger: 'blur', + }, + ], + peopleName: [{ required: true, message: '请输入责任人', trigger: 'blur' }], + peoplePhone: [ + { required: true, message: '请输入责任人电话', trigger: 'blur' }, + { + validator: (rule, value) => { + return new Promise((resolve, reject) => { + if (!validPhone(value)) { + reject(Error('手机号格式错误')); + } else { + resolve(); + } + }); + }, + trigger: 'blur', + }, + ], }, }); -const { queryParams, form, rules, queryParamstwo } = toRefs(AllData); +const { queryParams, form, rules } = toRefs(AllData); //搜索 function handleQuery() { @@ -290,9 +291,9 @@ function handlenotice(Val) { title.value = '发布整改通知'; open.value = true; + // form.value = { ...Val }; AllData.NumId = Val.id; - form.value = {}; - multiple.value = false; + // form.value = {}; } // 发布整改取消事件 function cancel() { @@ -312,19 +313,20 @@ function handleDetail(row) { opendetails.value = true; DataList.value = { ...row }; - console.log(DataList.value, 'DataList.value'); + // console.log(DataList.value, 'DataList.value'); } /** 提交按钮 */ + function submitForm() { proxy.$refs['roleRef'].validate(valid => { if (valid) { form.value.id = AllData.NumId; console.log(form.value, 'form.value'); - // patrolProblemRectifyedit(form.value).then(response => { - // proxy.$modal.msgSuccess('发布整改通知单成功'); - // open.value = false; - // getList(); - // }); + patrolProblemRectifyedit(form.value).then(response => { + proxy.$modal.msgSuccess('发布整改通知单成功'); + open.value = false; + getList(); + }); } }); } diff --git a/src/api/longoPeration/CaseIssues.js b/src/api/longoPeration/CaseIssues.js index bb8c1b1..ed69b9d 100644 --- a/src/api/longoPeration/CaseIssues.js +++ b/src/api/longoPeration/CaseIssues.js @@ -26,6 +26,14 @@ }); } +// // 详情接口 +export function patrolProblemRectifyID(id) { + return request({ + url: '/business/patrolProblemRectify/' + id, + method: 'get', + }); +} + // 删除排水防涝--防汛物资 export function FloodPreventionMaterialdelete(id) { return request({ diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 634a38d..237b8d4 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -108,7 +108,15 @@ - + @@ -189,7 +197,6 @@ const { patrol_type } = proxy.useDict('patrol_type'); // 巡查类型的字典 const open = ref(false); const opendetails = ref(false); -const multiple = ref(false); const showSearch = ref(true); const case_level = ref([ { @@ -202,18 +209,13 @@ }, { value: '3', label: '整改已完成' }, ]); - const projectTList = ref([]); const ConstructionUnit = ref([]); const loading = ref(true); -const loadingTwo = ref(false); const total = ref(0); -const totaltwo = ref(0); const title = ref(''); const dataList = ref([]); -const dataListTwo = ref([]); const DataList = ref([]); - const AllData = reactive({ publishTime: [], publishTime1: [], @@ -230,50 +232,49 @@ pageNum: 1, pageSize: 10, }, - rules: { - // taskName: [{ required: true, message: '请输入巡查任务名称', trigger: 'blur' }], - // rectifyType: [{ required: true, message: '请输入整改方式', trigger: 'blur' }], - // supervisionWork: [{ required: true, message: '请输入督办事项', trigger: 'blur' }], - // haveProblem: [{ required: true, message: '请输入存在问题', trigger: 'blur' }], - // // fileListToNotice: [{ required: true, message: '请上传整改书', trigger: 'blur' }], - // rectifyTime: [{ required: true, message: '请选择整改时限', trigger: 'blur' }], - // projectCompanyId: [{ required: true, message: '请选择建设单位', trigger: 'blur' }], - // leaderName: [{ required: true, message: '请输入责任领导', trigger: 'blur' }], - // leaderPhone: [ - // { required: true, message: '请输入责任领导电话', trigger: 'blur' }, - // { - // validator: (rule, value) => { - // return new Promise((resolve, reject) => { - // if (!validPhone(value)) { - // reject(Error('手机号格式错误')); - // } else { - // resolve(); - // } - // }); - // }, - // trigger: 'blur', - // }, - // ], - // peopleName: [{ required: true, message: '请输入责任人', trigger: 'blur' }], - // peoplePhone: [ - // { required: true, message: '请输入责任人电话', trigger: 'blur' }, - // { - // validator: (rule, value) => { - // return new Promise((resolve, reject) => { - // if (!validPhone(value)) { - // reject(Error('手机号格式错误')); - // } else { - // resolve(); - // } - // }); - // }, - // trigger: 'blur', - // }, - // ], + taskName: [{ required: true, message: '请输入巡查任务名称', trigger: 'blur' }], + rectifyType: [{ required: true, message: '请输入整改方式', trigger: 'blur' }], + supervisionWork: [{ required: true, message: '请输入督办事项', trigger: 'blur' }], + haveProblem: [{ required: true, message: '请输入存在问题', trigger: 'blur' }], + // fileListToNotice: [{ required: true, message: '请上传整改书', trigger: 'blur' }], + rectifyTime: [{ required: true, message: '请选择整改时限', trigger: 'blur' }], + projectCompanyId: [{ required: true, message: '请选择建设单位', trigger: 'blur' }], + leaderName: [{ required: true, message: '请输入责任领导', trigger: 'blur' }], + leaderPhone: [ + { required: true, message: '请输入责任领导电话', trigger: 'blur' }, + { + validator: (rule, value) => { + return new Promise((resolve, reject) => { + if (!validPhone(value)) { + reject(Error('手机号格式错误')); + } else { + resolve(); + } + }); + }, + trigger: 'blur', + }, + ], + peopleName: [{ required: true, message: '请输入责任人', trigger: 'blur' }], + peoplePhone: [ + { required: true, message: '请输入责任人电话', trigger: 'blur' }, + { + validator: (rule, value) => { + return new Promise((resolve, reject) => { + if (!validPhone(value)) { + reject(Error('手机号格式错误')); + } else { + resolve(); + } + }); + }, + trigger: 'blur', + }, + ], }, }); -const { queryParams, form, rules, queryParamstwo } = toRefs(AllData); +const { queryParams, form, rules } = toRefs(AllData); //搜索 function handleQuery() { @@ -290,9 +291,9 @@ function handlenotice(Val) { title.value = '发布整改通知'; open.value = true; + // form.value = { ...Val }; AllData.NumId = Val.id; - form.value = {}; - multiple.value = false; + // form.value = {}; } // 发布整改取消事件 function cancel() { @@ -312,19 +313,20 @@ function handleDetail(row) { opendetails.value = true; DataList.value = { ...row }; - console.log(DataList.value, 'DataList.value'); + // console.log(DataList.value, 'DataList.value'); } /** 提交按钮 */ + function submitForm() { proxy.$refs['roleRef'].validate(valid => { if (valid) { form.value.id = AllData.NumId; console.log(form.value, 'form.value'); - // patrolProblemRectifyedit(form.value).then(response => { - // proxy.$modal.msgSuccess('发布整改通知单成功'); - // open.value = false; - // getList(); - // }); + patrolProblemRectifyedit(form.value).then(response => { + proxy.$modal.msgSuccess('发布整改通知单成功'); + open.value = false; + getList(); + }); } }); } diff --git a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue index a4b1bab..4f7c171 100644 --- a/src/views/longoPeration/Patrolmanagement/anjianPopup.vue +++ b/src/views/longoPeration/Patrolmanagement/anjianPopup.vue @@ -38,48 +38,19 @@ - + - - - - - - - + +