更新

src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue

@@ -16,7 +16,7 @@
           <el-button type="primary" size="small" @click="isImport = true">
             <span style="vertical-align: middle">导入内容</span>
           </el-button>
-          <el-button type="danger" size="small" @click="exportData">
+          <el-button type="danger" size="small">
             <el-icon style="vertical-align: middle"><Delete /></el-icon>
             <span style="vertical-align: middle">删除</span>
           </el-button>
@@ -37,7 +37,7 @@
           <template #controls="{ row }">
             <el-link size="small" type="success" @click="handleData('edit', row)">编辑</el-link>
             <el-link size="small" type="primary" @click="handleData('info', row)">查看</el-link>
-            <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
+            <el-link size="small" type="danger" @click="deleteRow(row.id)">删除</el-link>
           </template>
         </MyTable>
         <div class="ww100 flex just-center mt8">
@@ -89,7 +89,7 @@
             </template>
             <!-- 操作 -->
             <template #controls="{ row }">
-              <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
+              <el-link size="small" type="danger" @click="deleteRowBottom(row.id)">删除</el-link>
               <el-link size="small" type="primary" @click="viewDetails(row)">查看</el-link>
             </template>
           </MyTable>
@@ -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) => {
+const deleteRow = (id) => {
-  qcckGet({}, "/mosty-gsxt/tbGsxtRqfjNr/closeById/" + row.id).then((res) => {
+  proxy.$confirm("确定要删除", "警告", {type: "warning"}).then(() => {
-    ElMessage.success("删除成功");
+    qcckGet({}, "/mosty-gsxt/tbGsxtRqfjNr/closeById/" + id).then((res) => {
-    getList();
+      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;
   }
 }

src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue

@@ -54,10 +54,6 @@
             <div class="ww100 relative mb10" style="height: 250px;border: 1px solid #dcdfe6;border-radius: 4px;overflow: hidden;">
                 <div class="absolute mapSearch flex">
                     <MOSTY.Select v-model="listQuery.bkqyList" filterable multiple :dictEnum="bkqyArr" style="width:350px" placeholder="请选择布控范围" clearable />
-                    <el-button type="primary" class="ml10" v-if="!disabled">
-                        <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
-                        <span style="vertical-align: middle">添加范围模型</span>
-                    </el-button>
                 </div>
                 <GdMap></GdMap>
             </div>
@@ -66,7 +62,7 @@
                     <el-button @click="listQuery.bkYz = it.dm" :type="listQuery.bkYz == it.dm ? 'primary':''" v-for="it in props.dic.D_GS_BK_BKYS" :key="it">{{ it.zdmc }}</el-button>
                 </div>
             </el-form-item>
-            <div style="width: 100%;" class="mt10">
+            <div style="width: 100%;" class="mt25">
                 <el-form-item prop="bkSjKs" label="布控开始时间" label-width="120px">
                     <MOSTY.Date v-model="listQuery.bkSjKs" type="datetime" format="YYYY-MM-DD HH:mm:ss" placeholder="请选择布控开始时间" clearable />
                 </el-form-item>
@@ -74,7 +70,7 @@
                     <MOSTY.Date v-model="listQuery.bkSjJs" type="datetime" format="YYYY-MM-DD HH:mm:ss" placeholder="请选择布控结束时间" clearable />
                 </el-form-item>
             </div>
-            <div style="width: 100%;" class="mt10">
+            <div style="width: 100%;" class="mt25">
                 <el-form-item prop="czYq" label="处置要求" >
                     <MOSTY.Select v-model="listQuery.czYq" :dictEnum="props.dic.D_GS_BK_CZYQ" placeholder="请选择处置要求" clearable />
                 </el-form-item>
@@ -90,14 +86,14 @@
             <div style="width: 100%;" class="mt10">
                 <el-form-item prop="bkfj" label="上传附件" style="width: 100%;">
                     <div>
-                        <MOSTY.Upload  :limit="10" v-model="listQuery.bkfj" />
+                        <MOSTY.Upload  :limit="10" :isImg="false" v-model="listQuery.bkfj" />
                         <div>支持png、jpg、pdf文件上传</div>
                     </div>
                 </el-form-item>
             </div>
 
             <div class="smallTitle">审批信息</div>
-            <el-form-item prop="czjsdw" label="处置接收单位" style="width: 100%;">
+            <el-form-item prop="czJsdwdm" label="处置接收单位" label-width="120px" style="width: 100%;">
                 <div class="flex align-center ww100">
                     <MOSTY.Department v-model="listQuery.czJsdwdm" style="width:260px;margin-right: 10px;" placeholder="请选择处置要求" clearable />
                     <el-radio-group v-model="listQuery.czJsdwlx" class="flex align-center">
@@ -128,17 +124,19 @@
                     </el-step>
                     <el-step title="审核确认" >
                         <template #description>
-                            <div class="flex align-center ww100 mt10 mb20 depBox">
+                            <div class="ww100 mt10 mb20 depBox">
-                                 <span class="mr4">审核部门 : </span>
+                                <el-form-item prop="bkshrSsbmdm" label="审核部门：" label-width="100" style="width: 100%;">
-                                 <MOSTY.Department v-model="listQuery.bkshrSsbmdm" clearable :placeholder="listQuery.bkshrSsbmmc ? listQuery.bkshrSsbmmc : '' "  />
+                                    <MOSTY.Department v-model="listQuery.bkshrSsbmdm" clearable :placeholder="listQuery.bkshrSsbmmc ? listQuery.bkshrSsbmmc : '' "  />
+                                </el-form-item>
                             </div>
                         </template>
                     </el-step>
                     <el-step title="审批确认" >
                         <template #description>
-                            <div class="flex align-center ww100 mt10 mb20 depBox">
+                            <div class="ww100 mt10 mb20 depBox">
-                                <span lass="mr4">审批部门 : </span>
+                                <el-form-item prop="bkshrSsbmdm" label="审批部门：" label-width="100" style="width: 100%;">
-                                <MOSTY.Department v-model="listQuery.bksprSsbmdm" clearable :placeholder="listQuery.bksprSsbmmc ? listQuery.bksprSsbmmc : '' "  />
+                                    <MOSTY.Department v-model="listQuery.bksprSsbmdm" clearable :placeholder="listQuery.bksprSsbmmc ? listQuery.bksprSsbmmc : '' "  />
+                                </el-form-item>
                             </div>
                         </template>
                     </el-step>
@@ -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=>{
+    params.bkdxList.forEach(item=>{  item.fjZp = item.fjZp ? item.fjZp.join(',') : '' })
-        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;

src/views/backOfficeSystem/IntelligentControl/myControl/index.vue

@@ -47,8 +47,9 @@
         </template>
           <!-- 操作 -->
           <template #controls="{ row }">
-            <el-link type="primary" size="small" @click="handleAdd('detail',row)">详情</el-link>
             <el-link type="primary" v-if="row.bkZt == '01'" size="small" @click="handleSend(row.id)">送审</el-link>
+            <el-link type="primary" v-if="row.bkZt == '01'" size="small" @click="handleAdd('edit',row)">编辑</el-link>
+            <el-link type="primary" size="small" @click="handleAdd('detail',row)">详情</el-link>
             <el-link type="danger" size="small" @click="handleRow(row.id)">删除</el-link>
           </template>
         </MyTable>