浏览代码

共享状态查询

maxiaoxiao 9 月之前
父节点
当前提交
24a1a527ea

+ 6 - 0
src/router/index.js

@@ -95,6 +95,12 @@ export const constantRoutes = [{
             import('@/views/LandscapeProject/index.vue'),
             import('@/views/LandscapeProject/index.vue'),
         hidden: true
         hidden: true
     },
     },
+    {
+        path: '/LandConsolidation',
+        component: () =>
+            import('@/views/LandConsolidation/index.vue'),
+        hidden: true
+    },
     {
     {
         path: '/farmlandProtection',
         path: '/farmlandProtection',
         component: () =>
         component: () =>

+ 3 - 1
src/views/ResourceShare/sharedLocation/config.js

@@ -20,7 +20,9 @@ export const FormConfig = [
       }
       }
     },
     },
     {
     {
-      span: 2
+      label: '共享状态:',
+      prop: 'sharestate',
+      span: 5,
     },
     },
     {
     {
       prop: 'action',
       prop: 'action',

+ 20 - 2
src/views/ResourceShare/sharedLocation/index.vue

@@ -3,7 +3,7 @@
     <div class="innerContainer" v-drag>
     <div class="innerContainer" v-drag>
       <custom-form ref="formRef" :model="model" :config="formConfig">
       <custom-form ref="formRef" :model="model" :config="formConfig">
         <template #type>
         <template #type>
-          <el-select v-model="model.type" placeholder="申请状态">
+          <el-select v-model="model.type" placeholder="申请状态" clearable>
             <el-option
             <el-option
               v-for="item in servicetype"
               v-for="item in servicetype"
               :key="item.dictValue"
               :key="item.dictValue"
@@ -13,6 +13,17 @@
             </el-option>
             </el-option>
           </el-select>
           </el-select>
         </template>
         </template>
+        <template #sharestate>
+          <el-select v-model="model.sharestate" placeholder="共享状态" clearable>
+            <el-option
+              v-for="item in yesorno"
+              :key="item.code"
+              :label="item.value"
+              :value="item.code"
+            >
+            </el-option>
+          </el-select>
+        </template>
         <template #action>
         <template #action>
           <!-- v-hasPermi="['monitor:job:add']" -->
           <!-- v-hasPermi="['monitor:job:add']" -->
           <el-button size="mini" @click="getTableData">查询</el-button>
           <el-button size="mini" @click="getTableData">查询</el-button>
@@ -78,6 +89,7 @@ export default {
         endTime: "",
         endTime: "",
         sj: ["", ""],
         sj: ["", ""],
         type: "",
         type: "",
+        sharestate: "",
         state: null,
         state: null,
         year: null,
         year: null,
       },
       },
@@ -85,6 +97,10 @@ export default {
       cloumn: TableHeader,
       cloumn: TableHeader,
       servicetype: [],
       servicetype: [],
       sertypeMap: {},
       sertypeMap: {},
+      yesorno: [
+        { code: "0", value: "是" },
+        { code: "1", value: "否" },
+      ],
       table: { data: [], total: 0 },
       table: { data: [], total: 0 },
     };
     };
   },
   },
@@ -98,9 +114,10 @@ export default {
       // this.model.pageSize = page.size;
       // this.model.pageSize = page.size;
       this.model.startTime = this.model.sj[0];
       this.model.startTime = this.model.sj[0];
       this.model.endTime = this.model.sj[1];
       this.model.endTime = this.model.sj[1];
+      console.log(this.model, "--");
       let res = await listZyml(this.model);
       let res = await listZyml(this.model);
       res.data.forEach((a) => {
       res.data.forEach((a) => {
-        a.checked = a.sharestate == 1;
+        a.checked = a.sharestate == 0;
       });
       });
       this.table = {
       this.table = {
         data: handleTree(res.data, "bsm", "pbsm"),
         data: handleTree(res.data, "bsm", "pbsm"),
@@ -113,6 +130,7 @@ export default {
         endTime: "",
         endTime: "",
         sj: ["", ""],
         sj: ["", ""],
         type: "",
         type: "",
+        sharestate: "",
         state: null,
         state: null,
         year: null,
         year: null,
         // pageNum: 1,
         // pageNum: 1,