src/views/pageCode/checkLand/config.js

@@ -45,7 +45,7 @@ export const sdlist = {
     { name: "举证中图斑", pro: "WYDC" },
     { name: "已举证图斑", pro: "WYTJ" },
     { name: "外业退回图斑", pro: "WYQR", ctype: "red" },
-    { name: "县级审核退回图斑", pro: "XJTJ", ctype: "red" },
+    { name: "省市县级审核退回图斑", pro: "XJTJ", ctype: "red" },
   ],
   XJ: [
     { name: "待审核", pro: "XJDSH" },
@@ -68,12 +68,22 @@ export const sdlist = {
 export const countparm = {
   normal: {
     all: null,
-    SJXF: [{ auditflowStep: "SJXF" }],
+    SJXF: [
+      { auditflowStep: "SJXF" },
+      { auditflowStep: "WYQR", successType: "1" },
+      { auditflowStep: "XJTJ", successType: "1" },
+      { auditflowStep: "SJTJ", successType: "1" },
+      { auditflowStep: "SJJTJ", successType: "1" }
+    ],
     WYFF: [{ auditflowStep: "WYFF" }],
     WYDC: [{ auditflowStep: "WYDC" }],
     WYTJ: [{ auditflowStep: "WYTJ" }],
-    XJSH: [{ auditflowStep: "WYQR", successType: "1" }],
-    XJTJ: [{ auditflowStep: "XJTJ", successType: "1" }],
+    WYQR: [{ auditflowStep: "WYQR", successType: "1" }],
+    XJTJ: [
+      { auditflowStep: "XJTJ", successType: "1" },
+      { auditflowStep: "SJTJ", successType: "1" },
+      { auditflowStep: "SJJTJ", successType: "1" }
+    ],
   },
   XJ: {
     XJDSH: [

src/views/pageCode/checkLand/index.vue

@@ -3,7 +3,7 @@
     <customForm ref="formRef" :model="queryParams" :config="FormConfig">
       <template #region>
         <el-tree-select
-          v-model="queryParams.decideType"
+          v-model="queryParams.xzqdm"
           :data="deptList"
           :props="{
             value: 'id',

src/views/pageCode/dataEntry/index.vue

@@ -1,6 +1,21 @@
 <template>
   <div class="app-container">
     <customForm ref="formRef" :model="queryParams" :config="FormConfig">
+      <template #region>
+        <el-tree-select
+          v-model="queryParams.xzqdm"
+          :data="deptList"
+          :props="{
+            value: 'id',
+            label: 'label',
+            children: 'children',
+          }"
+          value-key="id"
+          default-expanded-keys
+          check-strictly
+          style="width: 200px"
+        />
+      </template>
       <template #time>
         <el-date-picker
           v-model="queryParams.time"
@@ -124,6 +139,7 @@
 </template>
   
   <script setup name="Dkdb">
+import { userDept } from "@/api/system/dept";
 import { listDkdb, adddb, issueDkdb } from "@/api/rsmonitoring/dataEntry";
 const { proxy } = getCurrentInstance();
 import { FormConfig, TableHeader } from "./config";
@@ -141,6 +157,7 @@ const total = ref(0);
 const title = ref("");
 
 const data = reactive({
+  deptList: [],
   form: { dataType: "1", shppath: "" },
   queryParams: {
     pageNum: 1,
@@ -151,8 +168,13 @@ const data = reactive({
   },
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const { deptList, queryParams, form, rules } = toRefs(data);
 
+function getDrpt() {
+  userDept({}).then((response) => {
+    deptList.value = response.data;
+  });
+}
 /** 查询地块基本信息（DKdb）列表 */
 function getList(pages) {
   loading.value = true;
@@ -248,6 +270,7 @@ function Issued(row) {
     this.getList();
   });
 }
+getDrpt();
 getList();
 </script>
   

src/views/pageCode/statistic/progress/index.vue

@@ -310,11 +310,6 @@ function setCount(key, data) {
   countData.value[`${key}mj`] = data.dq.countSum;
   countData.value[`${key}zb`] = data.zb;
 }
-// function getDrpt() {
-//   userDept({}).then((response) => {
-//     // deptList.value = response.data;
-//   });
-// }
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1;