diff --git a/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue b/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue index 3729b33..a129af5 100644 --- a/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue +++ b/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue @@ -16,7 +16,7 @@ 导入内容 - + 删除 @@ -37,7 +37,7 @@
@@ -89,7 +89,7 @@ @@ -122,7 +122,7 @@ import addForm from "./components/addForm.vue"; import Model from "./components/model.vue"; import IntelligentParsing from "./components/IntelligentParsing.vue"; import { ElMessage } from "element-plus"; -import { qcckGet } from "@/api/qcckApi.js"; +import { qcckGet ,qcckDelete} from "@/api/qcckApi.js"; import { reactive, ref, onMounted, getCurrentInstance } from "vue"; const { proxy } = getCurrentInstance(); const { D_GS_RQFJ_LX, D_GS_RQFJ_FXDJ, D_BZ_SF, D_GS_RQFJ_FXLB } = proxy.$dict('D_GS_RQFJ_FXDJ',"D_GS_RQFJ_LX","D_GS_RQFJ_FXDJ","D_BZ_SF","D_GS_RQFJ_FXLB"); //获取字典数据 @@ -220,11 +220,12 @@ const getList = () => { }; //获取模型识别列表 -const getModelList = (val) => { +const getModelList = () => { let data = { ...pageData.pageConfiger }; qcckGet(data, "/mosty-gsxt/tbGsxtRqfjRy/selectPage").then((res) => { pageData.tableData2 = res.records || []; pageData.total = res.total; + ids.value = [] }) }; //新增- 编辑 @@ -236,11 +237,21 @@ const intelligent = () => { IntelligentParsingRef.value.init(); }; //删除操作 -const deleteRow = (row) => { - qcckGet({}, "/mosty-gsxt/tbGsxtRqfjNr/closeById/" + row.id).then((res) => { - ElMessage.success("删除成功"); - getList(); - }) +const deleteRow = (id) => { + proxy.$confirm("确定要删除", "警告", {type: "warning"}).then(() => { + qcckGet({}, "/mosty-gsxt/tbGsxtRqfjNr/closeById/" + id).then((res) => { + ElMessage.success("删除成功"); + getList(); + }) + }).catch(() => {}); +}; +const deleteRowBottom = (id) => { + proxy.$confirm("确定要删除", "警告", {type: "warning"}).then(() => { + qcckDelete({}, "/mosty-gsxt/tbGsxtRqfjRy/" + id).then((res) => { + ElMessage.success("删除成功"); + getModelList(); + }) + }).catch(() => {}); }; @@ -263,6 +274,10 @@ const chooseType = (val)=>{ window.open('/mosty-api/mosty-gsxt/tbGsxtRqfjRy/exportRyfjFxjg'); break; case '批量删除': + if(ids.value.length == 0) return ElMessage.warning("请选择对应删除的数据"); + ids.value.forEach(id=>{ + deleteRowBottom(id); + }) break; } } diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue index 1afea48..45dd579 100644 --- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue +++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue @@ -54,10 +54,6 @@
- - - 添加范围模型 -
@@ -66,7 +62,7 @@ {{ it.zdmc }}
-
+
@@ -74,7 +70,7 @@
-
+
@@ -90,14 +86,14 @@
- +
支持png、jpg、pdf文件上传
审批信息
- +
@@ -128,17 +124,19 @@ @@ -184,6 +182,9 @@ const rules = reactive({ bkDx: [{ required: true, message: "请选择布控对象", trigger: "change" }], bkSjKs: [{ required: true, message: "请选择布控开始时间", trigger: "change" }], bkSjJs: [{ required: true, message: "请选择布控结束时间", trigger: "change" }], + czJsdwdm: [{ required: true, message: "请选择处置接收单位", trigger: "change" }], + bkshrSsbmdm: [{ required: true, message: "请选择审核部门", trigger: "change" }], + bksprSsbmdm: [{ required: true, message: "请选择审批部门", trigger: "change" }], }) const tableDate = reactive({ keyCount: 0, @@ -213,6 +214,7 @@ const tableDate = reactive({ { label: "人员标签", prop: "bqList" ,showSolt:true,showOverflowTooltip:true } ] }); +const title = ref('') const disabled = ref(false) // 初始化数据 const init = (type,row) => { @@ -225,7 +227,8 @@ const init = (type,row) => { listQuery.value.bkfqrSsbmmc = getItem("deptId")[0].deptName;; listQuery.value.bkfqrSsbmdm = getItem("deptId")[0].deptCode;; } - disabled.value = type == 'add' ? false : true; + title.value = type == 'add' ? '新增' : type == 'detail' ?'详情':'编辑'; + disabled.value = type == 'detail' ? true :false ; dialogForm.value = true; if(row) tableDate.tableConfiger.haveControls = false; get_bkqy_list(row) @@ -309,15 +312,15 @@ const handleAddPeo = () =>{ // 提交 const submit = () => { - elform.value.validate(() => { + elform.value.validate((validate) => { + if(!validate) return; let params = { ...listQuery.value }; params.bkfj = params.bkfj ? params.bkfj.join(','):''; params.bkdxList = params.bkdxList ? params.bkdxList : []; - params.bkdxList.forEach(item=>{ - item.fjZp = item.fjZp ? item.fjZp.join(',') : '' - }) + params.bkdxList.forEach(item=>{ item.fjZp = item.fjZp ? item.fjZp.join(',') : '' }) loading.value = true; - qcckPost(params, "/mosty-gsxt/tbGsxtBk/save").then((res) => { + let url = title.value == '新增' ? "/mosty-gsxt/tbGsxtBk/save" : "/mosty-gsxt/tbGsxtBk/update"; + qcckPost(params, url).then((res) => { proxy.$message({ type: "success", message: "布控成功" }); emit("change"); loading.value = false; diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue index d1fd587..bec8a0a 100644 --- a/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue +++ b/src/views/backOfficeSystem/IntelligentControl/myControl/index.vue @@ -47,8 +47,9 @@