From 844dafd1f4c2e24573a64dd4c45bed37fe1b25ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Thu, 22 Sep 2022 17:32:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E4=B8=9A=E6=89=A7=E6=B3=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/lawEnforcement/index.js               | 111 ++++++++++
 src/router/index.js                           |  13 +-
 src/views/lawEnforcement/basis/basis.vue      | 103 +++++++--
 .../lawEnforcement/basis/basisDetail.vue      | 100 +++++++++
 .../caseAllocation/caseAllocation.vue         | 153 ++++---------
 .../lawEnforcement/caseQuery/caseQuery.vue    | 137 +++---------
 .../lawEnforcement/supervise/enterprise.vue   | 163 +++++---------
 .../supervise/enterpriseDetail.vue            |  60 +++---
 .../supervise/enterpriseRelation.vue          | 134 +++---------
 .../lawEnforcement/supervise/individual.vue   | 145 ++++---------
 .../supervise/individualDetail.vue            |  76 +++----
 .../supervise/individualRelation.vue          | 137 +++---------
 src/views/lawEnforcement/trace/feed.vue       | 121 ++++++-----
 src/views/lawEnforcement/trace/feedDetail.vue |  42 +---
 src/views/lawEnforcement/trace/fertilizer.vue | 123 ++++++-----
 .../lawEnforcement/trace/fertilizerDetail.vue |  53 ++---
 src/views/lawEnforcement/trace/pesticides.vue | 203 +++++++++++++-----
 .../lawEnforcement/trace/pesticidesDetail.vue |  70 ++----
 src/views/lawEnforcement/trace/product.vue    | 117 ++++++----
 .../lawEnforcement/trace/productDetail.vue    |  47 ++--
 src/views/lawEnforcement/trace/seed.vue       | 121 +++++++----
 src/views/lawEnforcement/trace/seedDetail.vue |  54 ++---
 src/views/lawEnforcement/trace/veterinary.vue | 124 ++++++-----
 .../lawEnforcement/trace/veterinaryDetail.vue |  47 ++--
 .../icon/individual_icon_04.png               | Bin 0 -> 1493 bytes
 25 files changed, 1197 insertions(+), 1257 deletions(-)
 create mode 100644 src/views/lawEnforcement/basis/basisDetail.vue
 create mode 100644 static/images/lawEnforcement/icon/individual_icon_04.png

diff --git a/src/api/lawEnforcement/index.js b/src/api/lawEnforcement/index.js
index 2938291a..cc52b2eb 100644
--- a/src/api/lawEnforcement/index.js
+++ b/src/api/lawEnforcement/index.js
@@ -390,3 +390,114 @@ export function updatePersonal(data) {
     data: data
   })
 }
+// 查询农业执法-监管对象(个体户)列表
+export function listPersonal(query) {
+  return request({
+    url: '/enforce/personal/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询农业执法-监管对象(个体户)详细
+export function getPersonal(id) {
+  return request({
+    url: '/enforce/personal/get/' + id,
+    method: 'get'
+  })
+}
+// 查询农业执法-监管对象(企业)列表
+export function listCompany(query) {
+  return request({
+    url: '/enforce/company/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询农业执法-监管对象(企业)详细
+export function getCompany(id) {
+  return request({
+    url: '/enforce/company/get/' + id,
+    method: 'get'
+  })
+}
+// 根据deptId查询所在地区
+export function getDeptName(id) {
+  return request({
+    url: '/system/dept/get/' + id,
+    method: 'get'
+  })
+}
+// 执法依据列表查询
+export function getNewsList(query) {
+  return request({
+    url: '/enforce/website/newsList',
+    method: 'get',
+    params: query
+  })
+}
+// 查询农用品管理列表
+export function listProduct(query) {
+  return request({
+    url: '/enforce/product/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询种子信息列表
+export function listSeed(query) {
+  return request({
+    url: '/enforce/seed/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询肥料信息列表
+export function listFertilizer(query) {
+  return request({
+    url: '/enforce/fertilizer/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询兽药信息列表
+export function listGmp(query) {
+  return request({
+    url: '/enforce/gmp/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询兽药信息列表
+export function listFeed(query) {
+  return request({
+    url: '/enforce/feed/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询农产品信息列表
+export function listAgri(query) {
+  return request({
+    url: '/enforce/agri/list',
+    method: 'get',
+    params: query
+  })
+}
+// 执法依据类型
+export function enforceNewsType(query) {
+  return request({
+    url: '/enforce/website/data/type/enforce_news_type/002',
+    method: 'get',
+    params: query
+  })
+}
+// 查询案件勘察列表
+export function listSurvey(query) {
+  return request({
+    url: '/enforce/survey/list',
+    method: 'get',
+    params: query
+  })
+}
+
+
diff --git a/src/router/index.js b/src/router/index.js
index 54ced445..75b05afc 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3459,8 +3459,8 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseHistory'], resolve)
   },
   { ////农业执法（新）-- 查看登记
-    path: '/lawEnforcement/caseDetail',
-    name: 'lawEnforcementCaseDetail',
+    path: '/lawEnforcement/caseDetailNew',
+    name: 'lawEnforcementCaseDetailNew',
     meta: {
       title: '查看登记',
       hidden: true,
@@ -3665,6 +3665,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/lawEnforcement/basis/basis'], resolve)
   },
+  { ////农业执法（新）-- 执法依据
+    path: '/lawEnforcement/basisDetail',
+    name: 'lawEnforcementBasisDetail',
+    meta: {
+      title: '查看执法依据',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/lawEnforcement/basis/basisDetail'], resolve)
+  },
   { ////农业执法（新）-- 种子扫描
     path: '/lawEnforcement/retrospectDetail',
     name: 'lawEnforcementRetrospectDetail',
diff --git a/src/views/lawEnforcement/basis/basis.vue b/src/views/lawEnforcement/basis/basis.vue
index f24aded2..81fe504a 100644
--- a/src/views/lawEnforcement/basis/basis.vue
+++ b/src/views/lawEnforcement/basis/basis.vue
@@ -10,52 +10,116 @@
       <van-popover
         v-model="showPopover"
         trigger="click"
-        :actions="actions"
+        :actions="enforceNewsTypeOptions"
         placement="bottom-start"
+        @select="popChange"
       >
         <template #reference>
           <div class="select_box">
-            <p>全部</p>
+            <p>{{popValue}}</p>
             <van-icon name="arrow-down" color="#1D6FE9" />
           </div>
         </template>
       </van-popover>
       <div class="search">
-        <input type="text" placeholder="请输入执法依据名称" />
-        <img src="../../../../static/images/lawEnforcement/new/index_icon_04.png">
+        <input type="text" v-model="searchInput" placeholder="请输入执法依据名称" />
+        <img src="../../../../static/images/lawEnforcement/new/index_icon_04.png" @click="goSearch">
       </div>
     </div>
 
     <div class="main_box">
-      <div class="peopleList">
-        <van-row v-for="(item,index) in 10" :key="index" >
-          <van-col :span="24">
-            <img src="../../../../static/images/lawEnforcement/icon/record_icon_03.png"/>
-            <p>指定管辖通知书</p>
-          </van-col>
-        </van-row>
-      </div>
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="getList"
+      >
+        <div class="peopleList">
+          <van-row v-for="(item,index) in list" :key="index" @click="$router.push({name:'lawEnforcementBasisDetail',query: {content:item}})" >
+            <van-col :span="24">
+              <img src="../../../../static/images/lawEnforcement/icon/record_icon_03.png"/>
+              <p>{{item.title}}</p>
+            </van-col>
+          </van-row>
+        </div>
+      </van-list>
     </div>
 
   </div>
 </template>
 
 <script>
-  import { getScheme } from "@/api/lawEnforcement/index";
+  import { getNewsList , enforceNewsType } from "@/api/lawEnforcement/index";
   export default {
     name: "programmeDetail",
     data() {
       return {
         showPopover: false,
         // 通过 actions 属性来定义菜单选项
-        actions: [{ text: '全部' }, { text: '法律' }, { text: '行政法规' }, { text: '地方性法规' }, { text: '部门规章' }],
+        enforceNewsTypeOptions: [],
+        loading: false,
+        finished: false,
+        searchInput:'',
+        queryParams: {
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
+          number: "002",
+          deptId: null,
+          title:''
+        },
+        list:[],
+        popValue:'执法依据'
       };
     },
     created() {
-
+      enforceNewsType().then(response => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.enforceNewsTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+      });
     },
     methods: {
-
+      getList(){
+        var _this = this;
+        getNewsList(_this.queryParams).then(response => {
+          response.rows.map(res=>{
+            // res.businessType = res.businessType == '' ? '' : this.selectDictLabel(this.businessTypeOptions, res.businessType);
+            this.list.push(res);
+          })
+          if(this.list.length >= response.total){
+            this.finished = true;
+            return;
+          }else{
+            this.loading = false;
+            this.queryParams.pageNum += 1 ;
+          }
+        });
+      },
+      popChange(action,index){
+        console.log(action,index)
+        this.popValue = action.text;
+        this.queryParams.number = action.value;
+        this.list = [];
+        this.queryParams.pageNum = 1 ;
+        this.finished = false;
+        this.loading = false;
+        this.getList();
+      },
+      goSearch(){
+        if (this.searchInput == ''){
+          location.reload()
+        }
+        this.list = [];
+        this.finished = false;
+        this.loading = false;
+        this.queryParams.title = this.searchInput;
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
     },
   }
 </script>
@@ -87,6 +151,13 @@
       display: flex;
       justify-content: space-around;
       align-items: center;
+      p{
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 1;
+        word-break: break-all;
+        overflow: hidden;
+      }
     }
     .search{
       background: #ffffff;
diff --git a/src/views/lawEnforcement/basis/basisDetail.vue b/src/views/lawEnforcement/basis/basisDetail.vue
new file mode 100644
index 00000000..48d2cc69
--- /dev/null
+++ b/src/views/lawEnforcement/basis/basisDetail.vue
@@ -0,0 +1,100 @@
+<template>
+  <div class="app-container">
+    <div class="header_main">
+      查看执法依据
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
+    <div class="jg"></div>
+
+    <p class="title">{{content.title}}</p>
+    <p class="tit">来源：{{content.source}} <span>发布时间：{{content.newsTime}}</span></p>
+    <div id="content" v-html="content.content"></div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "programmeDetail",
+    data() {
+      return {
+        content:{}
+      };
+    },
+    created() {
+      this.content = this.$route.query.content;
+    },
+    methods: {
+
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 0 0 0.2rem;
+    background: #ffffff;
+  }
+  .jg{
+    height: 116px;
+  }
+  .header_main{
+    height: 116px;
+    background: url('../../../../static/images/lawEnforcement/new/list_head.png') no-repeat;
+    background-size: 100% 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    font-size: 36px;
+    line-height: 116px;
+    text-align: center;
+    color: #fff;
+    z-index: 999;
+    .return_btn{
+      width: 24px;
+      height: 43.2px;
+      background: url('../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+      background-size: 20px 36px;
+      position: absolute;
+      left: 38px;
+      top: 36px;
+    }
+    .add_btn{
+      width: 56.4px;
+      height: 40.8px;
+      background: url('../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+      background-size: 47px 34px;
+      position: absolute;
+      right: 38px;
+      top: 36px;
+    }
+  }
+  .title{
+    text-align: center;
+    font-size: .6rem;
+    margin-top: 20PX;
+    font-weight: bold;
+  }
+  .tit{
+    text-align: center;
+    font-size: .35rem;
+    margin-top: 20PX;
+    span{
+      margin-left: 10PX;
+      color: #666666;
+    }
+  }
+  #content /deep/{
+    padding: 20PX 3%;
+    p{
+      line-height: .7rem;
+      font-size: .35rem;
+    }
+    h3{
+      font-size: .4rem;
+    }
+    img{
+      width: 100%;
+    }
+  }
+</style>
diff --git a/src/views/lawEnforcement/caseAllocation/caseAllocation.vue b/src/views/lawEnforcement/caseAllocation/caseAllocation.vue
index fe179b37..f4a22e76 100644
--- a/src/views/lawEnforcement/caseAllocation/caseAllocation.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseAllocation.vue
@@ -8,27 +8,27 @@
       <div class="search_box">
         <img src="../../../../static/images/lawEnforcement/new/list_icon_02.png" @click="$router.push({name:'lawEnforcementCaseHistory'})"/>
         <div class="search">
-          <input type="text" placeholder="请输入案件名称" />
-          <img src="../../../../static/images/lawEnforcement/new/index_icon_04.png">
+          <input type="text" v-model="searchInput" placeholder="请输入案件名称" />
+          <img src="../../../../static/images/lawEnforcement/new/index_icon_04.png" @click="goSearch">
         </div>
 <!--        <img src="../../../../static/images/lawEnforcement/new/list_icon_03.png"/>-->
       </div>
 
-
       <van-list
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
+        @load="getList"
         >
-        <van-swipe-cell v-for="(item,index) in 10" :key="index">
-          <van-cell title="关于徐胜峰在禁渔期内收购非法捕捞渔获..." center :to="{name:'lawEnforcementCaseDetail', query: {id:item.id}}">
+        <van-swipe-cell v-for="(item,index) in list" :key="index">
+          <van-cell :title="item.caseName" center :to="{name:'lawEnforcementCaseDetailNew', query: {cantent:item}}">
             <template #icon>
               <van-icon name="../../../../static/images/lawEnforcement/new/list_icon_01.png" size="20" color="#FF4646" style="margin-right: 10px;" />
             </template>
             <template #label>
-              <p>上级交办</p>
-              <p>第一中队</p>
-              <p>2021-09-07</p>
+              <p>{{item.caseSource}}</p>
+              <p>第{{item.belongTeam}}</p>
+              <p>{{item.surveyStartTime}}</p>
             </template>
           </van-cell>
           <template #right>
@@ -47,131 +47,68 @@
 </template>
 
 <script>
-  import { financePublicList,openRemove } from "@/api/sunVillage_info/fixedAssets";
-  import Cookies from "js-cookie";
-  import request from '@/utils/request'
+  import { listSurvey } from "@/api/lawEnforcement/index";
   export default {
     name: "caseAllocation",
     data() {
       return {
-        applicationList:[],
-        applicationListSecond:[],
-        assetStatusOptions:[],
-        auditStatus:[],
         loading: false,
         finished: false,
-        show: false,
-        showTab: false,
-        fileList:[],
-        listLength:'0',
         searchInput:'',
         queryParams:{
-          pageNum:1,
-          pageSize:10,
-          orderByColumn:'createTime',
-          isAsc:'desc',
-          year:'2022',
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
+          caseName: null,
+          caseProgress: "2",
+          title:"",
         },
-        uploadFiles1:[],
-        projectId:'',
-        projectIndex:'',
-        showBtn:true,
+        list:[],
+        belongTeamOptions:[],
+        caseSourceOptions:[],
       };
     },
     created() {
-
+      this.getDicts("case_source").then(response => {
+        this.caseSourceOptions = response.data;
+      });
+      this.getDicts("team_category").then(response => {
+        this.belongTeamOptions = response.data;
+      });
     },
     methods: {
       getList(){
         var _this = this;
-        financePublicList(_this.queryParams).then(response => {
-          _this.listLength = response.total;
+        listSurvey(_this.queryParams).then(response => {
           response.rows.map(res=>{
-            _this.applicationList.push(res);
+            res.caseSource = res.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, res.caseSource);
+            res.belongTeam = res.belongTeam == '' ? '' : this.selectDictLabel(this.belongTeamOptions, res.belongTeam);
+            this.list.push(res);
           })
-          if(_this.applicationList.length >= response.total){
-            _this.finished = true;
+          console.log(this.list.length)
+          if(this.list.length >= response.total){
+            this.finished = true;
             return;
           }else{
-            _this.loading = false;
-            _this.queryParams.pageNum += 1 ;
+            this.loading = false;
+            this.queryParams.pageNum += 1 ;
           }
-
         });
       },
-      tabClick(year){
-        this.queryParams.year = year ;
-        this.applicationList = [];
-        this.getList();
-      },
-      tabShow(){
-        this.showTab = !this.showTab;
-      },
-      /** 删除按钮操作 */
-      handleDelete(row,index) {
-        let assetStatus = row.assetStatus ? row.assetStatus : data[0].assetStatus;
-        if (assetStatus === '2' || assetStatus === '3') {
-          this.$notify({
-            message: "不允许删除已出售或已报废的资产",
-            type: "warning",
-          });
-          return;
-        }
-        let useType = row.useType;
-        if(useType == 3) {
-          this.$notify({
-            message: "出租或出借的资产不允许删除",
-            type: "warning",
-          });
-          return ;
+      goSearch(){
+        if (this.searchInput == ''){
+          location.reload()
         }
-        const ids = row.id || this.ids;
-
-        this.$dialog.alert(
-          {
-            message:'是否确认删除固定资产?',
-            title:"警告",
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-          }
-        )
-          .then(function () {
-            return delPermanent(ids);
-          })
-          .then(() => {
-            this.applicationList.splice(index, 1);
-            this.$notify({ type: 'success', message: '删除成功' });
-          });
-      },
-      goAdd(){
-        this.$router.push('/sunVillage_info/list_finance_add')
-      },
-      goDetail(id){
-        this.$router.push({path:'/sunVillage_info/list_finance_detail',query: {id:id,type:'finance'}})
-      },
-      goRanking(id,time){
-        this.$router.push({path:'/sunVillage_info/list_finance_ranking',query: {id:id,time:time}})
-      },
-      goEdit(id){
-        this.$router.push({path:'/sunVillage_info/list_finance_edit',query: {id:id,type:'finance'}})
+        this.list = [];
+        this.loading = false;
+        this.finished = false;
+        this.queryParams.title = this.searchInput;
+        this.queryParams.pageNum = 1 ;
+        this.getList();
       },
-      goRemove(id){
-        this.$dialog.alert({
-          title: '提示',
-          message: '确认删除？',
-          showCancelButton:true,
-        })
-          .then(() => {
-            openRemove(id).then(response => {
-              this.$notify({ type: 'success', message: '删除成功' });
-              this.getList()
-            });
-          })
-          .catch(() => {
-            // on cancel
-          });
-
-      }
     },
   }
 </script>
diff --git a/src/views/lawEnforcement/caseQuery/caseQuery.vue b/src/views/lawEnforcement/caseQuery/caseQuery.vue
index 4ebc0698..2b3f25a2 100644
--- a/src/views/lawEnforcement/caseQuery/caseQuery.vue
+++ b/src/views/lawEnforcement/caseQuery/caseQuery.vue
@@ -7,8 +7,8 @@
       <div style="height: 58px;"></div>
       <div class="search_box">
         <div class="search">
-          <input type="text" placeholder="请输入案件名称" />
-          <img src="../../../../static/images/lawEnforcement/new/index_icon_04.png">
+          <input type="text" v-model="searchInput" placeholder="请输入案件名称" />
+          <img src="../../../../static/images/lawEnforcement/new/index_icon_04.png" @click="goSearch">
         </div>
       </div>
 
@@ -16,12 +16,13 @@
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
+        @load="getList"
         >
-        <van-swipe-cell v-for="(item,index) in 10" :key="index">
-          <van-cell title="关于徐胜峰在禁渔期内收购非法捕捞渔获..." :to="{name:'lawEnforcementCaseDetail', query: {id:item.id}}">
+        <van-swipe-cell v-for="(item,index) in list" :key="index">
+          <van-cell :title="item.caseName" :to="{name:'lawEnforcementCaseDetail', query: {id:item.id}}">
             <template #label>
-              <p>埇桥农 罚（2022）2号</p>
-              <p>勘察</p>
+              <p>{{item.caseNumPart1}}农 {{item.caseNumPart2}} [{{item.caseNumPart3}}] {{item.caseNum}}号</p>
+              <p>{{item.caseProgress}}</p>
             </template>
           </van-cell>
           <template #right>
@@ -37,49 +38,43 @@
 </template>
 
 <script>
-  import { financePublicList,openRemove } from "@/api/sunVillage_info/fixedAssets";
-  import Cookies from "js-cookie";
-  import request from '@/utils/request'
+  import { listCase } from "@/api/lawEnforcement/index";
   export default {
     name: "caseAllocation",
     data() {
       return {
-        applicationList:[],
-        applicationListSecond:[],
-        assetStatusOptions:[],
-        auditStatus:[],
         loading: false,
         finished: false,
-        show: false,
-        showTab: false,
-        fileList:[],
-        listLength:'0',
         searchInput:'',
-        queryParams:{
-          pageNum:1,
-          pageSize:10,
-          orderByColumn:'createTime',
-          isAsc:'desc',
-          year:'2022',
+        caseQueryParams:{
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
+          caseName: null
         },
-        uploadFiles1:[],
-        projectId:'',
-        projectIndex:'',
-        showBtn:true,
+        list:[]
       };
     },
     created() {
-
+      this.getDicts("case_node").then(response => {
+        this.caseProgressOptions = response.data;
+      });
+      this.getDicts("case_source").then(response => {
+        this.caseSourceOptions = response.data;
+      });
     },
     methods: {
       getList(){
         var _this = this;
-        financePublicList(_this.queryParams).then(response => {
-          _this.listLength = response.total;
+        listCase(_this.caseQueryParams).then(response => {
           response.rows.map(res=>{
-            _this.applicationList.push(res);
+            res.caseProgress = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
+            _this.list.push(res);
           })
-          if(_this.applicationList.length >= response.total){
+          if(_this.list.length >= response.total){
             _this.finished = true;
             return;
           }else{
@@ -89,79 +84,15 @@
 
         });
       },
-      tabClick(year){
-        this.queryParams.year = year ;
-        this.applicationList = [];
-        this.getList();
-      },
-      tabShow(){
-        this.showTab = !this.showTab;
-      },
-      /** 删除按钮操作 */
-      handleDelete(row,index) {
-        let assetStatus = row.assetStatus ? row.assetStatus : data[0].assetStatus;
-        if (assetStatus === '2' || assetStatus === '3') {
-          this.$notify({
-            message: "不允许删除已出售或已报废的资产",
-            type: "warning",
-          });
-          return;
+      goSearch(){
+        if (this.searchInput == ''){
+          location.reload()
         }
-        let useType = row.useType;
-        if(useType == 3) {
-          this.$notify({
-            message: "出租或出借的资产不允许删除",
-            type: "warning",
-          });
-          return ;
-        }
-        const ids = row.id || this.ids;
-
-        this.$dialog.alert(
-          {
-            message:'是否确认删除固定资产?',
-            title:"警告",
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-          }
-        )
-          .then(function () {
-            return delPermanent(ids);
-          })
-          .then(() => {
-            this.applicationList.splice(index, 1);
-            this.$notify({ type: 'success', message: '删除成功' });
-          });
-      },
-      goAdd(){
-        this.$router.push('/sunVillage_info/list_finance_add')
-      },
-      goDetail(id){
-        this.$router.push({path:'/sunVillage_info/list_finance_detail',query: {id:id,type:'finance'}})
-      },
-      goRanking(id,time){
-        this.$router.push({path:'/sunVillage_info/list_finance_ranking',query: {id:id,time:time}})
-      },
-      goEdit(id){
-        this.$router.push({path:'/sunVillage_info/list_finance_edit',query: {id:id,type:'finance'}})
+        this.list = [];
+        this.caseQueryParams.caseName = this.searchInput;
+        this.caseQueryParams.pageNum = 1 ;
+        this.getList();
       },
-      goRemove(id){
-        this.$dialog.alert({
-          title: '提示',
-          message: '确认删除？',
-          showCancelButton:true,
-        })
-          .then(() => {
-            openRemove(id).then(response => {
-              this.$notify({ type: 'success', message: '删除成功' });
-              this.getList()
-            });
-          })
-          .catch(() => {
-            // on cancel
-          });
-
-      }
     },
   }
 </script>
diff --git a/src/views/lawEnforcement/supervise/enterprise.vue b/src/views/lawEnforcement/supervise/enterprise.vue
index 03565b8a..bd84d177 100644
--- a/src/views/lawEnforcement/supervise/enterprise.vue
+++ b/src/views/lawEnforcement/supervise/enterprise.vue
@@ -7,8 +7,8 @@
       <div class="jg"></div>
       <div class="search_box">
         <div class="search">
-          <input type="text" placeholder="请输入企业名称" />
-          <img src="../../../../static/images/lawEnforcement/new/index_icon_04.png">
+          <input type="text" v-model="searchInput" placeholder="请输入企业名称" />
+          <img src="../../../../static/images/lawEnforcement/new/index_icon_04.png" @click="goSearch">
         </div>
       </div>
 
@@ -16,29 +16,31 @@
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
+        @load="getList"
         >
-        <van-swipe-cell v-for="(item,index) in 10" :key="index">
+        <van-swipe-cell v-for="(item,index) in list" :key="index">
           <van-cell :to="{name:'lawEnforcementEnterpriseDetail', query: {id:item.id}}">
             <template #title>
-              <p style="font-size: 0.4rem;">宿州市宏丰发展农资有限公司</p>
+              <p style="font-size: 0.4rem;">{{item.companyName}}</p>
               <div class="cellTit">
-                <p>陈建南<i></i></p>
+                <p>{{item.legalName}}</p>
+<!--                <i class="man"></i>-->
                 <p>信用代码</p>
-                <p>92341302MA2Q95JX82</p>
+                <p>{{item.uniformCode}}</p>
               </div>
             </template>
             <template #label>
               <div class="cellLabel">
                 <img src="../../../../static/images/lawEnforcement/icon/individual_icon_01.png"/>
-                <p>342201199106191412</p>
-                <p><i></i>15314031621</p>
+                <p>{{item.businessType}}</p>
+                <p><i></i>{{item.phone}}</p>
               </div>
             </template>
           </van-cell>
           <template #right>
             <van-row>
               <van-col>
-                <van-button square type="info" :to="{name:'lawEnforcementIndividualRelation', query: {id:item.id}}" class="delete-button" >关联<br/>案件</van-button>
+                <van-button square type="info" :to="{name:'lawEnforcementEnterpriseRelation', query: {id:item.id}}" class="delete-button" >关联<br/>案件</van-button>
               </van-col>
             </van-row>
           </template>
@@ -48,131 +50,62 @@
 </template>
 
 <script>
-  import { financePublicList,openRemove } from "@/api/sunVillage_info/fixedAssets";
-  import Cookies from "js-cookie";
-  import request from '@/utils/request'
+  import { listCompany } from "@/api/lawEnforcement/index";
   export default {
     name: "caseAllocation",
     data() {
       return {
-        applicationList:[],
-        applicationListSecond:[],
-        assetStatusOptions:[],
-        auditStatus:[],
         loading: false,
         finished: false,
-        show: false,
-        showTab: false,
-        fileList:[],
-        listLength:'0',
         searchInput:'',
-        queryParams:{
-          pageNum:1,
-          pageSize:10,
-          orderByColumn:'createTime',
-          isAsc:'desc',
-          year:'2022',
+        queryParams: {
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
+          companyName: null,
+          legalName: null,
+          uniformCode: null,
         },
-        uploadFiles1:[],
-        projectId:'',
-        projectIndex:'',
-        showBtn:true,
+        list:[]
       };
     },
     created() {
-
+      this.getDicts("business_type").then(response => {
+        this.businessTypeOptions = response.data;
+      });
     },
     methods: {
       getList(){
         var _this = this;
-        financePublicList(_this.queryParams).then(response => {
-          _this.listLength = response.total;
+        listCompany(_this.queryParams).then(response => {
           response.rows.map(res=>{
-            _this.applicationList.push(res);
+            res.businessType = res.businessType == '' ? '' : this.selectDictLabel(this.businessTypeOptions, res.businessType);
+            this.list.push(res);
           })
-          if(_this.applicationList.length >= response.total){
-            _this.finished = true;
+          console.log(this.list.length)
+          if(this.list.length >= response.total){
+            this.finished = true;
             return;
           }else{
-            _this.loading = false;
-            _this.queryParams.pageNum += 1 ;
+            this.loading = false;
+            this.queryParams.pageNum += 1 ;
           }
-
         });
       },
-      tabClick(year){
-        this.queryParams.year = year ;
-        this.applicationList = [];
-        this.getList();
-      },
-      tabShow(){
-        this.showTab = !this.showTab;
-      },
-      /** 删除按钮操作 */
-      handleDelete(row,index) {
-        let assetStatus = row.assetStatus ? row.assetStatus : data[0].assetStatus;
-        if (assetStatus === '2' || assetStatus === '3') {
-          this.$notify({
-            message: "不允许删除已出售或已报废的资产",
-            type: "warning",
-          });
-          return;
-        }
-        let useType = row.useType;
-        if(useType == 3) {
-          this.$notify({
-            message: "出租或出借的资产不允许删除",
-            type: "warning",
-          });
-          return ;
+      goSearch(){
+        if (this.searchInput == ''){
+          location.reload()
         }
-        const ids = row.id || this.ids;
-
-        this.$dialog.alert(
-          {
-            message:'是否确认删除固定资产?',
-            title:"警告",
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-          }
-        )
-          .then(function () {
-            return delPermanent(ids);
-          })
-          .then(() => {
-            this.applicationList.splice(index, 1);
-            this.$notify({ type: 'success', message: '删除成功' });
-          });
-      },
-      goAdd(){
-        this.$router.push('/sunVillage_info/list_finance_add')
-      },
-      goDetail(id){
-        this.$router.push({path:'/sunVillage_info/list_finance_detail',query: {id:id,type:'finance'}})
-      },
-      goRanking(id,time){
-        this.$router.push({path:'/sunVillage_info/list_finance_ranking',query: {id:id,time:time}})
-      },
-      goEdit(id){
-        this.$router.push({path:'/sunVillage_info/list_finance_edit',query: {id:id,type:'finance'}})
+        this.list = [];
+        this.loading = false;
+        this.finished = false;
+        this.queryParams.companyName = this.searchInput;
+        this.queryParams.pageNum = 1 ;
+        this.getList();
       },
-      goRemove(id){
-        this.$dialog.alert({
-          title: '提示',
-          message: '确认删除？',
-          showCancelButton:true,
-        })
-          .then(() => {
-            openRemove(id).then(response => {
-              this.$notify({ type: 'success', message: '删除成功' });
-              this.getList()
-            });
-          })
-          .catch(() => {
-            // on cancel
-          });
-
-      }
     },
   }
 </script>
@@ -254,11 +187,17 @@
         display: inline-block;
         width: 10PX;
         height: 10PX;
-        background: url("../../../../static/images/lawEnforcement/icon/individual_icon_03.png") no-repeat center;
-        background-size: 10PX 10PX;
         margin-top: 5px;
         margin-left: 5px;
       }
+      .man{
+        background: url("../../../../static/images/lawEnforcement/icon/individual_icon_03.png") no-repeat center;
+        background-size: 10PX 10PX;
+      }
+      .wman{
+        background: url("../../../../static/images/lawEnforcement/icon/individual_icon_04.png") no-repeat center;
+        background-size: 10PX 10PX;
+      }
     }
     &:nth-child(2){
       color: #B4B0B0;
diff --git a/src/views/lawEnforcement/supervise/enterpriseDetail.vue b/src/views/lawEnforcement/supervise/enterpriseDetail.vue
index 38a2006b..61126875 100644
--- a/src/views/lawEnforcement/supervise/enterpriseDetail.vue
+++ b/src/views/lawEnforcement/supervise/enterpriseDetail.vue
@@ -6,58 +6,46 @@
     </div>
     <div class="jg"></div>
     <div class="main_box">
-      <van-cell title="企业名称" :border="false" value="企业名称" />
-      <van-cell title="法人/负责人" :border="false" value="法人/负责人" />
-      <van-cell title="所在地区" :border="false" value="所在地区" />
-      <van-cell title="统一社会信用代码" :border="false" value="统一社会信用代码" />
-      <van-cell title="手机号码" :border="false" value="手机号码" />
-      <van-cell title="企业分支机构" :border="false" value="企业分支机构" />
-      <van-cell title="详细地址" :border="false" value="详细地址" />
-      <van-cell title="企业投资人" :border="false" value="企业投资人" />
-      <van-cell title="详细地址" :border="false" value="详细地址" />
-      <van-cell title="经营类别" :border="false" value="经营类别" />
-      <van-cell title="经营方式" :border="false" value="经营范围" />
-      <van-cell title="经营范围" :border="false" value="统一社会信用代码" />
+      <van-cell title="企业名称" :border="false" v-model="form.companyName" />
+      <van-cell title="法人/负责人" :border="false" v-model="form.legalName" />
+      <van-cell title="所在地区" :border="false" v-model="form.deptId" />
+      <van-cell title="统一社会信用代码" :border="false" v-model="form.uniformCode" />
+      <van-cell title="手机号码" :border="false" v-model="form.phone" />
+      <van-cell title="企业分支机构" :border="false" v-model="form.companyBranch" />
+      <van-cell title="企业投资人" :border="false" v-model="form.investor" />
+      <van-cell title="详细地址" :border="false" v-model="form.address" />
+      <van-cell title="经营类别" :border="false" v-model="form.businessType" />
+      <van-cell title="经营方式" :border="false" v-model="form.businessMode" />
+      <van-cell title="经营范围" :border="false" v-model="form.businessScope" />
     </div>
     <p class="submitButton" @click="$router.push({name:'lawEnforcementEnterpriseRelation'})">关联案件</p>
   </div>
 </template>
 
 <script>
-  import { getScheme } from "@/api/lawEnforcement/index";
+  import { getCompany } from "@/api/lawEnforcement/index";
   export default {
     name: "programmeDetail",
     data() {
       return {
-        showBankType:false,
-        showPayeeType:false,
-        showPicker:false,
         form:{},
-
-        bankType:'',
-        payeeType:'',
-        value:'',
-
-        bankTypeOptions:[],
-        payeeTypeOptions:[],
-        tEnforceSchemeHandlerList:[],
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
-
-        activeNames: ['1'],
-        activeNames1: ['1'],
-        activeNames2: ['1'],
       };
     },
     created() {
-      // this.getDictionaries()
+      this.getDicts("business_type").then(response => {
+        this.businessTypeOptions = response.data;
+      });
+      this.getDetail(this.$route.query.id)
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
-          this.form = response.data;
-        });
+      getDetail(id){
+        var that = this;
+        setTimeout(function () {
+          getCompany(id).then(response => {
+            response.data.businessType = response.data.businessType == '' ? '' : that.selectDictLabel(that.businessTypeOptions, response.data.businessType);
+            that.form = response.data;
+          });
+        },1000)
       },
       goBack(){
         window.history.go(-1)
diff --git a/src/views/lawEnforcement/supervise/enterpriseRelation.vue b/src/views/lawEnforcement/supervise/enterpriseRelation.vue
index 21978971..54587ece 100644
--- a/src/views/lawEnforcement/supervise/enterpriseRelation.vue
+++ b/src/views/lawEnforcement/supervise/enterpriseRelation.vue
@@ -6,24 +6,25 @@
         </div>
       <div class="jg"></div>
 
-      <div class="search_box">
-        <p><span>宿州市宏丰发展农资有限公司</span>关联案件</p>
+      <div class="search_box" v-if="list.length>0">
+        <p><span>{{list[0].name}}</span>关联案件</p>
       </div>
 
       <van-list
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
+        @load="getList"
         >
-        <van-swipe-cell v-for="(item,index) in 10" :key="index">
+        <van-swipe-cell v-for="(item,index) in list" :key="index">
           <van-cell center :to="{name:'lawEnforcementTaskDetail', query: {id:item.id}}">
             <template #title>
-              <span>张磊未经指定定点从事生猪屠宰活动案</span>
+              <span>{{item.caseName}}</span>
             </template>
             <template #label>
               <div class="label">
                 <p>投诉案件</p>
-                <p>立案</p>
+                <p>{{item.caseProgress}}</p>
               </div>
             </template>
           </van-cell>
@@ -33,49 +34,45 @@
 </template>
 
 <script>
-  import { financePublicList,openRemove } from "@/api/sunVillage_info/fixedAssets";
-  import Cookies from "js-cookie";
-  import request from '@/utils/request'
+  import { listCase } from "@/api/lawEnforcement/index";
   export default {
     name: "caseAllocation",
     data() {
       return {
-        applicationList:[],
-        applicationListSecond:[],
-        assetStatusOptions:[],
-        auditStatus:[],
         loading: false,
         finished: false,
-        show: false,
-        showTab: false,
-        fileList:[],
-        listLength:'0',
-        searchInput:'',
-        queryParams:{
-          pageNum:1,
-          pageSize:10,
-          orderByColumn:'createTime',
-          isAsc:'desc',
-          year:'2022',
+        caseQueryParams:{
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
+          bodyId: null,  //个体户ID
+          type: "2"
         },
-        uploadFiles1:[],
-        projectId:'',
-        projectIndex:'',
-        showBtn:true,
+        list:[]
       };
     },
     created() {
-
+      this.getDicts("case_node").then(response => {
+        this.caseProgressOptions = response.data;
+      });
+      this.getDicts("case_source").then(response => {
+        this.caseSourceOptions = response.data;
+      });
+      this.caseQueryParams.bodyId = this.$route.query.id;
     },
     methods: {
       getList(){
         var _this = this;
-        financePublicList(_this.queryParams).then(response => {
-          _this.listLength = response.total;
+        listCase(_this.caseQueryParams).then(response => {
           response.rows.map(res=>{
-            _this.applicationList.push(res);
+            res.caseProgress = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
+            res.caseSource = res.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, res.caseSource);
+            _this.list.push(res);
           })
-          if(_this.applicationList.length >= response.total){
+          if(_this.list.length >= response.total){
             _this.finished = true;
             return;
           }else{
@@ -85,79 +82,6 @@
 
         });
       },
-      tabClick(year){
-        this.queryParams.year = year ;
-        this.applicationList = [];
-        this.getList();
-      },
-      tabShow(){
-        this.showTab = !this.showTab;
-      },
-      /** 删除按钮操作 */
-      handleDelete(row,index) {
-        let assetStatus = row.assetStatus ? row.assetStatus : data[0].assetStatus;
-        if (assetStatus === '2' || assetStatus === '3') {
-          this.$notify({
-            message: "不允许删除已出售或已报废的资产",
-            type: "warning",
-          });
-          return;
-        }
-        let useType = row.useType;
-        if(useType == 3) {
-          this.$notify({
-            message: "出租或出借的资产不允许删除",
-            type: "warning",
-          });
-          return ;
-        }
-        const ids = row.id || this.ids;
-
-        this.$dialog.alert(
-          {
-            message:'是否确认删除固定资产?',
-            title:"警告",
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-          }
-        )
-          .then(function () {
-            return delPermanent(ids);
-          })
-          .then(() => {
-            this.applicationList.splice(index, 1);
-            this.$notify({ type: 'success', message: '删除成功' });
-          });
-      },
-      goAdd(){
-        this.$router.push('/sunVillage_info/list_finance_add')
-      },
-      goDetail(id){
-        this.$router.push({path:'/sunVillage_info/list_finance_detail',query: {id:id,type:'finance'}})
-      },
-      goRanking(id,time){
-        this.$router.push({path:'/sunVillage_info/list_finance_ranking',query: {id:id,time:time}})
-      },
-      goEdit(id){
-        this.$router.push({path:'/sunVillage_info/list_finance_edit',query: {id:id,type:'finance'}})
-      },
-      goRemove(id){
-        this.$dialog.alert({
-          title: '提示',
-          message: '确认删除？',
-          showCancelButton:true,
-        })
-          .then(() => {
-            openRemove(id).then(response => {
-              this.$notify({ type: 'success', message: '删除成功' });
-              this.getList()
-            });
-          })
-          .catch(() => {
-            // on cancel
-          });
-
-      }
     },
   }
 </script>
diff --git a/src/views/lawEnforcement/supervise/individual.vue b/src/views/lawEnforcement/supervise/individual.vue
index 139dcfae..40dbc2c3 100644
--- a/src/views/lawEnforcement/supervise/individual.vue
+++ b/src/views/lawEnforcement/supervise/individual.vue
@@ -7,8 +7,8 @@
       <div style="height: 58px;"></div>
       <div class="search_box">
         <div class="search">
-          <input type="text" placeholder="请输入商户姓名" />
-          <img src="../../../../static/images/lawEnforcement/new/index_icon_04.png">
+          <input type="text" v-model="searchInput" placeholder="请输入商户姓名" />
+          <img src="../../../../static/images/lawEnforcement/new/index_icon_04.png" @click="goSearch">
         </div>
       </div>
 
@@ -16,21 +16,23 @@
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
-        >
-        <van-swipe-cell v-for="(item,index) in 10" :key="index">
+        @load="getList"
+      >
+        <van-swipe-cell v-for="(item,index) in list" :key="index">
           <van-cell :to="{name:'lawEnforcementIndividualDetail', query: {id:item.id}}">
             <template #title>
               <div class="cellTit">
-                <p>陈建南<i></i></p>
+                <p>{{item.name}}</p>
+<!--                <i></i>-->
                 <p>信用代码</p>
-                <p>92341302MA2Q95JX82</p>
+                <p>{{item.uniformCode}}</p>
               </div>
             </template>
             <template #label>
               <div class="cellLabel">
                 <img src="../../../../static/images/lawEnforcement/icon/individual_icon_01.png"/>
-                <p>342201199106191412</p>
-                <p><i></i>15314031621</p>
+                <p>{{item.cardNum}}</p>
+                <p><i></i>{{item.phone}}</p>
               </div>
             </template>
           </van-cell>
@@ -47,35 +49,24 @@
 </template>
 
 <script>
-  import { financePublicList,openRemove } from "@/api/sunVillage_info/fixedAssets";
-  import Cookies from "js-cookie";
-  import request from '@/utils/request'
+  import { listPersonal } from "@/api/lawEnforcement/index";
   export default {
     name: "caseAllocation",
     data() {
       return {
-        applicationList:[],
-        applicationListSecond:[],
-        assetStatusOptions:[],
-        auditStatus:[],
         loading: false,
         finished: false,
-        show: false,
-        showTab: false,
-        fileList:[],
-        listLength:'0',
         searchInput:'',
-        queryParams:{
-          pageNum:1,
-          pageSize:10,
-          orderByColumn:'createTime',
-          isAsc:'desc',
-          year:'2022',
+        queryParams: {
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
+          name: null,
         },
-        uploadFiles1:[],
-        projectId:'',
-        projectIndex:'',
-        showBtn:true,
+        list:[]
       };
     },
     created() {
@@ -83,95 +74,31 @@
     },
     methods: {
       getList(){
-        var _this = this;
-        financePublicList(_this.queryParams).then(response => {
-          _this.listLength = response.total;
+        listPersonal(this.queryParams).then(response => {
           response.rows.map(res=>{
-            _this.applicationList.push(res);
+            this.list.push(res);
           })
-          if(_this.applicationList.length >= response.total){
-            _this.finished = true;
+          console.log(this.list.length)
+          if(this.list.length >= response.total){
+            this.finished = true;
             return;
           }else{
-            _this.loading = false;
-            _this.queryParams.pageNum += 1 ;
+            this.loading = false;
+            this.queryParams.pageNum += 1 ;
           }
-
         });
       },
-      tabClick(year){
-        this.queryParams.year = year ;
-        this.applicationList = [];
-        this.getList();
-      },
-      tabShow(){
-        this.showTab = !this.showTab;
-      },
-      /** 删除按钮操作 */
-      handleDelete(row,index) {
-        let assetStatus = row.assetStatus ? row.assetStatus : data[0].assetStatus;
-        if (assetStatus === '2' || assetStatus === '3') {
-          this.$notify({
-            message: "不允许删除已出售或已报废的资产",
-            type: "warning",
-          });
-          return;
+      goSearch(){
+        if (this.searchInput == ''){
+          location.reload()
         }
-        let useType = row.useType;
-        if(useType == 3) {
-          this.$notify({
-            message: "出租或出借的资产不允许删除",
-            type: "warning",
-          });
-          return ;
-        }
-        const ids = row.id || this.ids;
-
-        this.$dialog.alert(
-          {
-            message:'是否确认删除固定资产?',
-            title:"警告",
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-          }
-        )
-          .then(function () {
-            return delPermanent(ids);
-          })
-          .then(() => {
-            this.applicationList.splice(index, 1);
-            this.$notify({ type: 'success', message: '删除成功' });
-          });
-      },
-      goAdd(){
-        this.$router.push('/sunVillage_info/list_finance_add')
-      },
-      goDetail(id){
-        this.$router.push({path:'/sunVillage_info/list_finance_detail',query: {id:id,type:'finance'}})
-      },
-      goRanking(id,time){
-        this.$router.push({path:'/sunVillage_info/list_finance_ranking',query: {id:id,time:time}})
-      },
-      goEdit(id){
-        this.$router.push({path:'/sunVillage_info/list_finance_edit',query: {id:id,type:'finance'}})
+        this.list = [];
+        this.loading = false;
+        this.finished = false;
+        this.queryParams.name = this.searchInput;
+        this.queryParams.pageNum = 1 ;
+        this.getList();
       },
-      goRemove(id){
-        this.$dialog.alert({
-          title: '提示',
-          message: '确认删除？',
-          showCancelButton:true,
-        })
-          .then(() => {
-            openRemove(id).then(response => {
-              this.$notify({ type: 'success', message: '删除成功' });
-              this.getList()
-            });
-          })
-          .catch(() => {
-            // on cancel
-          });
-
-      }
     },
   }
 </script>
diff --git a/src/views/lawEnforcement/supervise/individualDetail.vue b/src/views/lawEnforcement/supervise/individualDetail.vue
index 011df4f5..41337544 100644
--- a/src/views/lawEnforcement/supervise/individualDetail.vue
+++ b/src/views/lawEnforcement/supervise/individualDetail.vue
@@ -6,60 +6,60 @@
     </div>
     <div style="height: 58px;"></div>
     <div class="main_box">
-      <van-cell title="姓名" :border="false" value="姓名" />
-      <van-cell title="性别" :border="false" value="性别" />
-      <van-cell title="身份证号" :border="false" value="身份证号" />
-      <van-cell title="民族" :border="false" value="民族" />
-      <van-cell title="出生日期" :border="false" value="出生日期" />
-      <van-cell title="手机号码" :border="false" value="手机号码" />
-      <van-cell title="工作单位及职务" :border="false" value="工作单位及职务" />
-      <van-cell title="所在地区" :border="false" value="所在地区" />
-      <van-cell title="详细地址" :border="false" value="详细地址" />
-      <van-cell title="经营类别" :border="false" value="经营类别" />
-      <van-cell title="经营范围" :border="false" value="经营范围" />
-      <van-cell title="统一社会信用代码" :border="false" value="统一社会信用代码" />
-      <van-cell title="字号名称" :border="false" value="字号名称 " />
+      <van-cell title="姓名" :border="false" v-model="form.name" />
+      <van-cell title="性别" :border="false" v-model="form.sex" />
+      <van-cell title="身份证号" :border="false" v-model="form.cardNum" />
+      <van-cell title="民族" :border="false" v-model="form.nation" />
+      <van-cell title="出生日期" :border="false" v-model="form.birthday" />
+      <van-cell title="手机号码" :border="false" v-model="form.phone" />
+      <van-cell title="工作单位及职务" :border="false" v-model="form.companyPosition" />
+      <van-cell title="所在地区" :border="false" v-model="form.deptId" />
+      <van-cell title="详细地址" :border="false" v-model="form.address" />
+      <van-cell title="经营类别" :border="false" v-model="form.businessType" />
+      <van-cell title="经营范围" :border="false" v-model="form.businessScope" />
+      <van-cell title="统一社会信用代码" :border="false" v-model="form.uniformCode" />
+      <van-cell title="字号名称" :border="false" v-model="form.zihao " />
     </div>
 
-    <p class="submitButton" @click="$router.push({name:'lawEnforcementIndividualRelation'})">关联案件</p>
+    <p class="submitButton" @click="$router.push({name:'lawEnforcementIndividualRelation', query: {id:form.id}})">关联案件</p>
   </div>
 </template>
 
 <script>
-  import { getScheme } from "@/api/lawEnforcement/index";
+  import { getPersonal , getDeptName } from "@/api/lawEnforcement/index";
   export default {
     name: "programmeDetail",
     data() {
       return {
-        showBankType:false,
-        showPayeeType:false,
-        showPicker:false,
         form:{},
-
-        bankType:'',
-        payeeType:'',
-        value:'',
-
-        bankTypeOptions:[],
-        payeeTypeOptions:[],
-        tEnforceSchemeHandlerList:[],
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
-
-        activeNames: ['1'],
-        activeNames1: ['1'],
-        activeNames2: ['1'],
       };
     },
     created() {
-      // this.getDictionaries()
+      this.getDicts("sex").then(response => {
+        this.sexOptions = response.data;
+      });
+      this.getDicts("nationality").then(response => {
+        this.nationOptions = response.data;
+      });
+      this.getDicts("business_type").then(response => {
+        this.businessTypeOptions = response.data;
+      });
+      this.getDetail(this.$route.query.id)
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
-          this.form = response.data;
-        });
+      getDetail(id){
+        var that = this;
+        setTimeout(function () {
+          getPersonal(id).then(response => {
+            response.data.sex = response.data.sex == '' ? '' : that.selectDictLabel(that.sexOptions, response.data.sex);
+            response.data.nation = response.data.nation == '' ? '' :  that.selectDictLabel(that.nationOptions, response.data.nation);
+            response.data.businessType = response.data.businessType == '' ? '' : that.selectDictLabel(that.businessTypeOptions, response.data.businessType);
+            getDeptName(response.data.deptId).then(res => {
+              response.data.deptId = res.data.deptName
+            });
+            that.form = response.data;
+          });
+        },1000)
       },
       goBack(){
         window.history.go(-1)
diff --git a/src/views/lawEnforcement/supervise/individualRelation.vue b/src/views/lawEnforcement/supervise/individualRelation.vue
index 716e7759..45810822 100644
--- a/src/views/lawEnforcement/supervise/individualRelation.vue
+++ b/src/views/lawEnforcement/supervise/individualRelation.vue
@@ -6,24 +6,25 @@
         </div>
       <div class="jg"></div>
 
-      <div class="search_box">
-        <p><span>张雷</span>关联案件</p>
+      <div class="search_box" v-if="list.length>0">
+        <p><span>{{list[0].name}}</span>关联案件</p>
       </div>
 
       <van-list
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
+        @load="getList"
         >
-        <van-swipe-cell v-for="(item,index) in 10" :key="index">
+        <van-swipe-cell v-for="(item,index) in list" :key="index">
           <van-cell center :to="{name:'lawEnforcementTaskDetail', query: {id:item.id}}">
             <template #title>
-              <span>张磊未经指定定点从事生猪屠宰活动案</span>
+              <span>{{item.caseName}}</span>
             </template>
             <template #label>
               <div class="label">
-                <p>投诉案件</p>
-                <p>立案</p>
+                <p>{{item.caseSource}}</p>
+                <p>{{item.caseProgress}}</p>
               </div>
             </template>
           </van-cell>
@@ -33,131 +34,55 @@
 </template>
 
 <script>
-  import { financePublicList,openRemove } from "@/api/sunVillage_info/fixedAssets";
-  import Cookies from "js-cookie";
-  import request from '@/utils/request'
+  import { listCase } from "@/api/lawEnforcement/index";
   export default {
     name: "caseAllocation",
     data() {
       return {
-        applicationList:[],
-        applicationListSecond:[],
-        assetStatusOptions:[],
-        auditStatus:[],
         loading: false,
         finished: false,
-        show: false,
-        showTab: false,
-        fileList:[],
-        listLength:'0',
-        searchInput:'',
-        queryParams:{
-          pageNum:1,
-          pageSize:10,
-          orderByColumn:'createTime',
-          isAsc:'desc',
-          year:'2022',
+        caseQueryParams:{
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
+          bodyId: null,  //个体户ID
+          type: "1"
         },
-        uploadFiles1:[],
-        projectId:'',
-        projectIndex:'',
-        showBtn:true,
+        list:[]
       };
     },
     created() {
-
+      console.log(this.$route.query.id)
+      this.getDicts("case_node").then(response => {
+        this.caseProgressOptions = response.data;
+      });
+      this.getDicts("case_source").then(response => {
+        this.caseSourceOptions = response.data;
+      });
+      this.caseQueryParams.bodyId = this.$route.query.id;
     },
     methods: {
       getList(){
         var _this = this;
-        financePublicList(_this.queryParams).then(response => {
-          _this.listLength = response.total;
+        listCase(_this.caseQueryParams).then(response => {
           response.rows.map(res=>{
-            _this.applicationList.push(res);
+            res.caseProgress = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
+            res.caseSource = res.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, res.caseSource);
+            _this.list.push(res);
           })
-          if(_this.applicationList.length >= response.total){
+          if(_this.list.length >= response.total){
             _this.finished = true;
             return;
           }else{
             _this.loading = false;
             _this.queryParams.pageNum += 1 ;
           }
-
         });
       },
-      tabClick(year){
-        this.queryParams.year = year ;
-        this.applicationList = [];
-        this.getList();
-      },
-      tabShow(){
-        this.showTab = !this.showTab;
-      },
-      /** 删除按钮操作 */
-      handleDelete(row,index) {
-        let assetStatus = row.assetStatus ? row.assetStatus : data[0].assetStatus;
-        if (assetStatus === '2' || assetStatus === '3') {
-          this.$notify({
-            message: "不允许删除已出售或已报废的资产",
-            type: "warning",
-          });
-          return;
-        }
-        let useType = row.useType;
-        if(useType == 3) {
-          this.$notify({
-            message: "出租或出借的资产不允许删除",
-            type: "warning",
-          });
-          return ;
-        }
-        const ids = row.id || this.ids;
-
-        this.$dialog.alert(
-          {
-            message:'是否确认删除固定资产?',
-            title:"警告",
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-          }
-        )
-          .then(function () {
-            return delPermanent(ids);
-          })
-          .then(() => {
-            this.applicationList.splice(index, 1);
-            this.$notify({ type: 'success', message: '删除成功' });
-          });
-      },
-      goAdd(){
-        this.$router.push('/sunVillage_info/list_finance_add')
-      },
-      goDetail(id){
-        this.$router.push({path:'/sunVillage_info/list_finance_detail',query: {id:id,type:'finance'}})
-      },
-      goRanking(id,time){
-        this.$router.push({path:'/sunVillage_info/list_finance_ranking',query: {id:id,time:time}})
-      },
-      goEdit(id){
-        this.$router.push({path:'/sunVillage_info/list_finance_edit',query: {id:id,type:'finance'}})
-      },
-      goRemove(id){
-        this.$dialog.alert({
-          title: '提示',
-          message: '确认删除？',
-          showCancelButton:true,
-        })
-          .then(() => {
-            openRemove(id).then(response => {
-              this.$notify({ type: 'success', message: '删除成功' });
-              this.getList()
-            });
-          })
-          .catch(() => {
-            // on cancel
-          });
 
-      }
     },
   }
 </script>
diff --git a/src/views/lawEnforcement/trace/feed.vue b/src/views/lawEnforcement/trace/feed.vue
index 65d486bb..05229723 100644
--- a/src/views/lawEnforcement/trace/feed.vue
+++ b/src/views/lawEnforcement/trace/feed.vue
@@ -9,32 +9,41 @@
     <div class="main">
 
       <div class="main_box">
-        <van-field v-model="value" :border="false" label="饲料许可证号" placeholder="请输入饲料许可证号" input-align="right" />
-        <van-field v-model="value" :border="false" label="生产厂家" placeholder="请输入生产厂家" input-align="right" />
-        <van-field v-model="value" :border="false" label="商品名称" placeholder="请输入商品名称" input-align="right" />
-        <van-field v-model="value" :border="false" label="产品通用名称" placeholder="请输入产品通用名称" input-align="right" />
+        <van-field v-model="queryParams.recordCode" :border="false" label="饲料许可证号" placeholder="请输入饲料许可证号" input-align="right" />
+        <van-field v-model="queryParams.factory" :border="false" label="生产厂家" placeholder="请输入生产厂家" input-align="right" />
+        <van-field v-model="queryParams.productGoodsName" :border="false" label="商品名称" placeholder="请输入商品名称" input-align="right" />
+        <van-field v-model="queryParams.productName" :border="false" label="产品通用名称" placeholder="请输入产品通用名称" input-align="right" />
       </div>
 
-      <p class="submitButton">立即查询</p>
+      <p class="submitButton" @click="goSubmit">立即查询</p>
 
-      <div class="list_box" v-for="(item,index) in 10" :key="index">
-        <van-cell center :to="{name:'lawEnforcementFeedDetail', query: {id:item.id}}">
-          <template #title>
-            <div class="tt">
-              <span>添加剂预混合饲料</span>
-              <span>3年</span>
-            </div>
-            <div class="first">
-              <span>鲁饲预(2015)07025</span>
-              <span>维生素预混合饲料</span>
-            </div>
-          </template>
-          <template #label>
-            <div class="label">
-              <p>佛山市银辉作物科学有限公司</p>
-            </div>
-          </template>
-        </van-cell>
+      <div class="scroll_box">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="getList"
+        >
+          <div class="list_box" v-for="(item,index) in list" :key="index">
+            <van-cell center :to="{name:'lawEnforcementFeedDetail', query: {content:item}}">
+              <template #title>
+                <div class="tt">
+                  <span>{{item.productName}}</span>
+                  <span>{{item.effectivePeriod}}</span>
+                </div>
+                <div class="first">
+                  <span>{{item.recordCode}}</span>
+                  <span>{{item.productGoodsName}}</span>
+                </div>
+              </template>
+              <template #label>
+                <div class="label">
+                  <p>{{item.factory}}</p>
+                </div>
+              </template>
+            </van-cell>
+          </div>
+        </van-list>
       </div>
 
     </div>
@@ -43,43 +52,53 @@
 </template>
 
 <script>
-  import { getScheme } from "@/api/lawEnforcement/index";
+  import { listFeed } from "@/api/lawEnforcement/index";
   export default {
     name: "programmeDetail",
     data() {
       return {
-        showBankType:false,
-        showPayeeType:false,
-        showPicker:false,
+        loading: false,
+        finished: false,
         form:{},
-
-        bankType:'',
-        payeeType:'',
         value:'',
-
-        bankTypeOptions:[],
-        payeeTypeOptions:[],
-        tEnforceSchemeHandlerList:[],
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
-
-        activeNames: ['1'],
-        activeNames1: ['1'],
-        activeNames2: ['1'],
+        queryParams: {
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
+          recordCode: null,   // 查询参数-饲料许可证号
+          factory: null,  // 生产厂家
+          productGoodsName: null, // 商品名称
+          productName: null,  // 通用名称
+        },
+        list:[],
       };
     },
     created() {
       // this.getDictionaries()
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
-          this.form = response.data;
+      getList(){
+        var _this = this;
+        listFeed(_this.queryParams).then(response => {
+          response.rows.map(res=>{
+            this.list.push(res);
+          })
+          console.log(this.list.length)
+          if(this.list.length >= response.total){
+            this.finished = true;
+            return;
+          }else{
+            this.loading = false;
+            this.queryParams.pageNum += 1 ;
+          }
         });
       },
-      goBack(){
-        window.history.go(-1)
+      goSubmit(){
+        this.list = [];
+        this.getList();
       }
     },
   }
@@ -93,8 +112,14 @@
 
   }
   .main{
-    position: relative;
-    top: -150PX;
+    position: absolute;
+    width: 100%;
+    top: 88PX;
+  }
+  .scroll_box{
+    height: calc(100vh - 100px - 200PX - 100PX);
+    overflow: hidden;
+    overflow-y: scroll;
   }
   /deep/ .van-cell{
     padding-bottom: 0;
diff --git a/src/views/lawEnforcement/trace/feedDetail.vue b/src/views/lawEnforcement/trace/feedDetail.vue
index 8bf60c19..77bdd38c 100644
--- a/src/views/lawEnforcement/trace/feedDetail.vue
+++ b/src/views/lawEnforcement/trace/feedDetail.vue
@@ -9,12 +9,12 @@
     <div class="main">
 
       <div class="main_box">
-        <van-cell title="饲料许可证号" :border="false" value="登记号" />
-        <van-cell title="生产厂家" :border="false" value="登记号" />
-        <van-cell title="商品名称" :border="false" value="登记号" />
-        <van-cell title="产品通用名称" :border="false" value="登记号" />
-        <van-cell title="有效期限" :border="false" value="登记号" />
-        <van-cell title="备注" :border="false" value="登记号" />
+        <van-cell title="饲料许可证号" :border="false" v-model="form.recordCode" />
+        <van-cell title="生产厂家" :border="false" v-model="form.factory" />
+        <van-cell title="商品名称" :border="false" v-model="form.productGoodsName" />
+        <van-cell title="产品通用名称" :border="false" v-model="form.productName" />
+        <van-cell title="有效期限" :border="false" v-model="form.effectivePeriod" />
+        <van-cell title="备注" :border="false" v-model="form.remark" />
       </div>
 
     </div>
@@ -28,39 +28,15 @@
     name: "programmeDetail",
     data() {
       return {
-        showBankType:false,
-        showPayeeType:false,
-        showPicker:false,
         form:{},
-
-        bankType:'',
-        payeeType:'',
-        value:'',
-
-        bankTypeOptions:[],
-        payeeTypeOptions:[],
-        tEnforceSchemeHandlerList:[],
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
-
-        activeNames: ['1'],
-        activeNames1: ['1'],
-        activeNames2: ['1'],
       };
     },
     created() {
-      // this.getDictionaries()
+      var content = this.$route.query.content;
+      this.form = content;
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
-          this.form = response.data;
-        });
-      },
-      goBack(){
-        window.history.go(-1)
-      }
+
     },
   }
 </script>
diff --git a/src/views/lawEnforcement/trace/fertilizer.vue b/src/views/lawEnforcement/trace/fertilizer.vue
index 7dc2e422..0e5c513b 100644
--- a/src/views/lawEnforcement/trace/fertilizer.vue
+++ b/src/views/lawEnforcement/trace/fertilizer.vue
@@ -8,82 +8,103 @@
 
     <div class="main">
 
-
-
-
       <div class="main_box">
-        <van-field v-model="value" :border="false" label="登记账号" placeholder="请输入登记账号" input-align="right" />
-        <van-field v-model="value" :border="false" label="企业名称" placeholder="请输入企业名称" input-align="right" />
-        <van-field v-model="value" :border="false" label="产品通用名称" placeholder="请输入产品通用名称" input-align="right" />
-        <van-field v-model="value" :border="false" label="产品商品名称" placeholder="请输入产品商品名称" input-align="right" />
+        <van-field v-model="queryParams.recordCode" :border="false" label="登记证号" placeholder="请输入登记证号" input-align="right" />
+        <van-field v-model="queryParams.factory" :border="false" label="企业名称" placeholder="请输入企业名称" input-align="right" />
+        <van-field v-model="queryParams.productName" :border="false" label="产品通用名称" placeholder="请输入产品通用名称" input-align="right" />
+        <van-field v-model="queryParams.productGoodsName" :border="false" label="产品商品名称" placeholder="请输入产品商品名称" input-align="right" />
       </div>
 
-      <p class="submitButton">立即查询</p>
+      <p class="submitButton" @click="goSubmit">立即查询</p>
 
-      <div class="list_box" v-for="(item,index) in 10" :key="index">
-        <van-cell center :to="{name:'lawEnforcementFertilizerDetail', query: {id:item.id}}">
-          <template #title>
-            <div class="tt">
-              <span>生物有机肥</span>
-              <span>粉剂</span>
-            </div>
-            <div class="first">
-              <span>微生物肥(2021)准字(9348)号</span>
-              <span>生物有机肥</span>
-            </div>
-          </template>
-          <template #label>
-            <div class="label">
-              <p>佛山市银辉作物科学有限公司</p>
-              <p>2026-12-25</p>
-            </div>
-          </template>
-        </van-cell>
+      <div class="scroll_box">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="getList"
+        >
+          <div class="list_box" v-for="(item,index) in list" :key="index">
+            <van-cell center :to="{name:'lawEnforcementFertilizerDetail', query: {content:item}}">
+              <template #title>
+                <div class="tt">
+                  <span>{{item.productName}}</span>
+                  <span>{{item.agent}}</span>
+                </div>
+                <div class="first">
+                  <span>{{item.recordCode}}</span>
+                  <span>{{item.productGoodsName}}</span>
+                </div>
+              </template>
+              <template #label>
+                <div class="label">
+                  <p>{{item.factory}}</p>
+                  <p>{{item.effectiveDate}}</p>
+                </div>
+              </template>
+            </van-cell>
+          </div>
+        </van-list>
       </div>
-
     </div>
 
   </div>
 </template>
 
 <script>
-  import { getScheme } from "@/api/lawEnforcement/index";
+  import { listFertilizer } from "@/api/lawEnforcement/index";
   export default {
     name: "programmeDetail",
     data() {
       return {
-        showBankType:false,
-        showPayeeType:false,
-        showPicker:false,
+        loading: false,
+        finished: false,
         form:{},
-
-        bankType:'',
-        payeeType:'',
         value:'',
-
-        bankTypeOptions:[],
-        payeeTypeOptions:[],
-        tEnforceSchemeHandlerList:[],
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
-
-        activeNames: ['1'],
-        activeNames1: ['1'],
-        activeNames2: ['1'],
+        showCategory:false,
+        showAgent:false,
+        queryParams: {
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
+          recordCode: null,  // 查询参数-登记证号
+          factory: null,  // 查询参数-企业名称
+          productName: null,  // 查询参数-通用名称
+          productGoodsName: null,  // 查询参数-商品名称
+        },
+        list:[],
+        categoryOptions:[],
+        agentOptions:[],
+        category: null,  // 查询参数-农药种类
+        agent: null, // 查询参数-剂型
       };
     },
     created() {
       // this.getDictionaries()
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
-          this.form = response.data;
+      getList(){
+        var _this = this;
+        listFertilizer(_this.queryParams).then(response => {
+          response.rows.map(res=>{
+            this.list.push(res);
+          })
+          console.log(this.list.length)
+          if(this.list.length >= response.total){
+            this.finished = true;
+            return;
+          }else{
+            this.loading = false;
+            this.queryParams.pageNum += 1 ;
+          }
         });
       },
-      goBack(){
-        window.history.go(-1)
+      goSubmit(){
+        this.list = [];
+        this.getList();
       }
     },
   }
diff --git a/src/views/lawEnforcement/trace/fertilizerDetail.vue b/src/views/lawEnforcement/trace/fertilizerDetail.vue
index e45be512..a1c288d7 100644
--- a/src/views/lawEnforcement/trace/fertilizerDetail.vue
+++ b/src/views/lawEnforcement/trace/fertilizerDetail.vue
@@ -9,18 +9,18 @@
     <div class="main">
 
       <div class="main_box">
-        <van-cell title="登记证号" :border="false" value="登记号" />
-        <van-cell title="企业名称" :border="false" value="登记号" />
-        <van-cell title="产品通用名称" :border="false" value="登记号" />
-        <van-cell title="产品商品名称" :border="false" value="登记号" />
-        <van-cell title="产品形态" :border="false" value="登记号" />
-        <van-cell title="登记技术指标" :border="false" value="登记号" />
-        <van-cell title="适宜范围" :border="false" value="登记号" />
-        <van-cell title="登记证有效期" :border="false" value="登记号" />
-        <van-cell title="企业法人" :border="false" value="登记号" />
-        <van-cell title="产品标准号" :border="false" value="登记号" />
-        <van-cell title="有效菌种名称" :border="false" value="登记号" />
-        <van-cell title="备注" :border="false" value="登记号" />
+        <van-cell title="登记证号" :border="false" v-model="form.recordCode" />
+        <van-cell title="企业名称" :border="false" v-model="form.factory" />
+        <van-cell title="产品通用名称" :border="false" v-model="form.productName" />
+        <van-cell title="产品商品名称" :border="false" v-model="form.productGoodsName" />
+        <van-cell title="产品形态" :border="false" v-model="form.agent" />
+        <van-cell title="登记技术指标" :border="false" v-model="form.regIndex" />
+        <van-cell title="适宜范围" :border="false" v-model="form.suitableRange" />
+        <van-cell title="登记证有效期" :border="false" v-model="form.effectiveDate" />
+        <van-cell title="企业法人" :border="false" v-model="form.legalPerson" />
+        <van-cell title="产品标准号" :border="false" v-model="form.standardCode" />
+        <van-cell title="有效菌种名称" :border="false" v-model="form.effectiveStrain" />
+        <van-cell title="备注" :border="false" v-model="form.remark" />
       </div>
 
     </div>
@@ -34,39 +34,16 @@
     name: "programmeDetail",
     data() {
       return {
-        showBankType:false,
-        showPayeeType:false,
-        showPicker:false,
         form:{},
-
-        bankType:'',
-        payeeType:'',
-        value:'',
-
-        bankTypeOptions:[],
-        payeeTypeOptions:[],
-        tEnforceSchemeHandlerList:[],
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
-
-        activeNames: ['1'],
-        activeNames1: ['1'],
-        activeNames2: ['1'],
       };
     },
     created() {
       // this.getDictionaries()
+      var content = this.$route.query.content;
+      this.form = content;
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
-          this.form = response.data;
-        });
-      },
-      goBack(){
-        window.history.go(-1)
-      }
+
     },
   }
 </script>
diff --git a/src/views/lawEnforcement/trace/pesticides.vue b/src/views/lawEnforcement/trace/pesticides.vue
index af12df1c..00ac6365 100644
--- a/src/views/lawEnforcement/trace/pesticides.vue
+++ b/src/views/lawEnforcement/trace/pesticides.vue
@@ -9,81 +9,167 @@
     <div class="main">
 
       <div class="main_box">
-        <van-field v-model="value" :border="false" label="登记证号" placeholder="请输入登记证号" input-align="right" />
-        <van-field v-model="value" :border="false" label="农药名称" placeholder="请输入农药名称" input-align="right" />
-        <van-field v-model="value" :border="false" label="登记证持有人" placeholder="请输入登记证持有人" input-align="right" />
-        <van-field v-model="value" :border="false" label="农药种类" placeholder="请选择" input-align="right" is-link arrow-direction="down" />
-        <van-field v-model="value" :border="false" label="全部剂型" placeholder="请选择" input-align="right" is-link arrow-direction="down" />
+        <van-field v-model="queryParams.recordCode" :border="false" label="登记证号" placeholder="请输入登记证号" input-align="right" />
+        <van-field v-model="queryParams.productName" :border="false" label="农药名称" placeholder="请输入农药名称" input-align="right" />
+        <van-field v-model="queryParams.recordHolder" :border="false" label="登记证持有人" placeholder="请输入登记证持有人" input-align="right" />
+        <van-field
+          readonly
+          clickable
+          :border="false"
+          label="农药种类"
+          placeholder="请选择"
+          v-model="category"
+          @click="showCategory = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+        />
+        <van-popup v-model="showCategory" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="categoryOptions"
+            @confirm="onConfirmCategory"
+            @cancel="showCategory = false"
+          />
+        </van-popup>
+        <van-popup v-model="showAgent" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="agentOptions"
+            @confirm="onConfirmAgent"
+            @cancel="showAgent = false"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          clickable
+          :border="false"
+          label="全部剂型"
+          placeholder="请选择"
+          v-model="agent"
+          @click="showAgent = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+        />
       </div>
 
-      <p class="submitButton">立即查询</p>
-
-      <div class="list_box" v-for="(item,index) in 10" :key="index">
-        <van-cell center :to="{name:'lawEnforcementPesticidesDetail', query: {id:item.id}}">
-          <template #title>
-            <div class="tt">
-              <span>吡蚜酮</span>
-              <span>25%</span>
-            </div>
-            <div class="first">
-              <span>466156066</span>
-              <span>除虫剂</span>
-              <span>可湿性粉剂</span>
-            </div>
-            <p class="dress">佛山市银辉作物科学有限公司</p>
-          </template>
-          <template #label>
-            <div class="label">
-              <p>有效期始 2021-12-25</p>
-              <p>有效期至 2026-12-25</p>
-            </div>
-          </template>
-        </van-cell>
+      <p class="submitButton" @click="goSubmit">立即查询</p>
+      <div class="scroll_box">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="getList"
+        >
+          <div class="list_box" v-for="(item,index) in list" :key="index">
+            <van-cell center :to="{name:'lawEnforcementPesticidesDetail', query: {content:item}}">
+              <template #title>
+                <div class="tt">
+                  <span>{{item.productName}}</span>
+                  <span>{{item.content}}%</span>
+                </div>
+                <div class="first">
+                  <span>{{item.recordCode}}</span>
+                  <span>{{item.category}}</span>
+                  <span>{{item.agent}}</span>
+                </div>
+                <p class="dress">{{item.factory}}</p>
+              </template>
+              <template #label>
+                <div class="label">
+                  <p>有效期始 {{item.firstApprovalDate}}</p>
+                  <p>有效期至 {{item.effectiveDate}}</p>
+                </div>
+              </template>
+            </van-cell>
+          </div>
+        </van-list>
       </div>
-
     </div>
 
   </div>
 </template>
 
 <script>
-  import { getScheme } from "@/api/lawEnforcement/index";
+  import { listProduct } from "@/api/lawEnforcement/index";
   export default {
     name: "programmeDetail",
     data() {
       return {
-        showBankType:false,
-        showPayeeType:false,
-        showPicker:false,
+        loading: false,
+        finished: false,
         form:{},
-
-        bankType:'',
-        payeeType:'',
         value:'',
-
-        bankTypeOptions:[],
-        payeeTypeOptions:[],
-        tEnforceSchemeHandlerList:[],
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
-
-        activeNames: ['1'],
-        activeNames1: ['1'],
-        activeNames2: ['1'],
+        showCategory:false,
+        showAgent:false,
+        queryParams: {
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
+          recordCode: null,  // 查询参数-登记证号
+          productName: null,  // 查询参数-农药名称
+          category: null,  // 查询参数-农药种类
+          agent: null, // 查询参数-剂型
+          recordHolder:null,   // 查询参数-登记证持有人
+        },
+        list:[],
+        categoryOptions:[],
+        agentOptions:[],
+        category: null,  // 查询参数-农药种类
+        agent: null, // 查询参数-剂型
       };
     },
     created() {
       // this.getDictionaries()
+      // 农药种类
+      this.getDicts("category_type").then(response => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.categoryOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+      });
+      // 剂型
+      this.getDicts("agent_type").then(response => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.agentOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+      });
+
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
-          this.form = response.data;
+      getList(){
+        var _this = this;
+        listProduct(_this.queryParams).then(response => {
+          response.rows.map(res=>{
+            // res.businessType = res.businessType == '' ? '' : this.selectDictLabel(this.businessTypeOptions, res.businessType);
+            this.list.push(res);
+          })
+          console.log(this.list.length)
+          if(this.list.length >= response.total){
+            this.finished = true;
+            return;
+          }else{
+            this.loading = false;
+            this.queryParams.pageNum += 1 ;
+          }
         });
       },
-      goBack(){
-        window.history.go(-1)
+      onConfirmCategory(data){
+        this.category = data.text;
+        this.queryParams.category = data.value;
+        this.showCategory = false;
+      },
+      onConfirmAgent(data){
+        this.agent = data.text;
+        this.queryParams.agent = data.value;
+        this.showAgent = false;
+      },
+      goSubmit(){
+        this.list = [];
+        this.getList();
       }
     },
   }
@@ -153,8 +239,9 @@
     }
   }
   .main{
-    position: relative;
-    top: -150PX;
+    position: absolute;
+    width: 100%;
+    top: 58PX;
   }
   .center_box{
     text-align: center;
@@ -274,7 +361,7 @@
   }
   .submitButton{
     width: 70%;
-    margin: 25PX auto;
+    margin: 50px auto;
     background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
     text-align: center;
     color: #ffffff;
@@ -282,7 +369,11 @@
     line-height: 70px;
     border-radius: 8PX;
   }
-
+  .scroll_box{
+    height: calc(100vh - 100px - 200PX - 100PX);
+    overflow: hidden;
+    overflow-y: scroll;
+  }
   .addFamily{
     position: absolute;
     top: -2px;
diff --git a/src/views/lawEnforcement/trace/pesticidesDetail.vue b/src/views/lawEnforcement/trace/pesticidesDetail.vue
index aa80cb73..eebaf655 100644
--- a/src/views/lawEnforcement/trace/pesticidesDetail.vue
+++ b/src/views/lawEnforcement/trace/pesticidesDetail.vue
@@ -9,29 +9,29 @@
     <div class="main">
 
       <div class="main_box">
-        <van-cell title="登记证号" :border="false" value="登记号" />
-        <van-cell title="登记证持有人" :border="false" value="登记号" />
-        <van-cell title="农药名称" :border="false" value="登记号" />
-        <van-cell title="农药种类" :border="false" value="登记号" />
-        <van-cell title="剂型" :border="false" value="登记号" />
-        <van-cell title="总含量" :border="false" value="登记号" />
-        <van-cell title="有效期始" :border="false" value="登记号" />
-        <van-cell title="有效期至" :border="false" value="登记号" />
-        <van-cell title="防治作物和场所" :border="false" value="登记号" />
-        <van-cell title="毒性" :border="false" value="登记号" />
-        <van-cell title="有效成分及含量" :border="false" value="登记号" />
+        <van-cell title="登记证号" :border="false" v-model="form.recordCode" />
+        <van-cell title="登记证持有人" :border="false" v-model="form.recordHolder" />
+        <van-cell title="农药名称" :border="false" v-model="form.productName" />
+        <van-cell title="农药种类" :border="false" v-model="form.category" />
+        <van-cell title="剂型" :border="false" v-model="form.agent" />
+        <van-cell title="总含量" :border="false" v-model="form.content" />
+        <van-cell title="有效期始" :border="false" v-model="form.firstApprovalDate" />
+        <van-cell title="有效期至" :border="false" v-model="form.effectiveDate" />
+        <van-cell title="防治作物和场所" :border="false" v-model="form.preventPlace" />
+        <van-cell title="毒性" :border="false" v-model="form.virulence" />
+        <van-cell title="有效成分及含量" :border="false" v-model="form.activeContent" />
       </div>
 
       <div class="main_box" style="margin-top: 10PX;">
-        <van-cell title="防治对象" :border="false" value="登记号" />
-        <van-cell title="用药量" :border="false" value="登记号" />
-        <van-cell title="施用方法" :border="false" value="登记号" />
-        <van-cell title="生产厂家" :border="false" value="登记号" />
-        <van-cell title="厂家地址" :border="false" value="登记号" />
-        <van-cell title="厂家电话" :border="false" value="登记号" />
-        <van-cell title="厂家邮编" :border="false" value="登记号" />
-        <van-cell title="厂家传真" :border="false" value="登记号" />
-        <van-cell title="备注" :border="false" value="登记号" />
+        <van-cell title="防治对象" :border="false" v-model="form.preventObject" />
+        <van-cell title="用药量" :border="false" v-model="form.useDosage" />
+        <van-cell title="施用方法" :border="false" v-model="form.useMethod" />
+        <van-cell title="生产厂家" :border="false" v-model="form.factory" />
+        <van-cell title="厂家地址" :border="false" v-model="form.factoryAddress" />
+        <van-cell title="厂家电话" :border="false" v-model="form.factoryPhone" />
+        <van-cell title="厂家邮编" :border="false" v-model="form.factoryPostal" />
+        <van-cell title="厂家传真" :border="false" v-model="form.factoryFax" />
+        <van-cell title="备注" :border="false" v-model="form.remark" />
       </div>
 
     </div>
@@ -45,39 +45,15 @@
     name: "programmeDetail",
     data() {
       return {
-        showBankType:false,
-        showPayeeType:false,
-        showPicker:false,
         form:{},
-
-        bankType:'',
-        payeeType:'',
-        value:'',
-
-        bankTypeOptions:[],
-        payeeTypeOptions:[],
-        tEnforceSchemeHandlerList:[],
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
-
-        activeNames: ['1'],
-        activeNames1: ['1'],
-        activeNames2: ['1'],
       };
     },
     created() {
-      // this.getDictionaries()
+      var content = this.$route.query.content;
+      this.form = content;
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
-          this.form = response.data;
-        });
-      },
-      goBack(){
-        window.history.go(-1)
-      }
+
     },
   }
 </script>
diff --git a/src/views/lawEnforcement/trace/product.vue b/src/views/lawEnforcement/trace/product.vue
index 8cfb30b2..84099777 100644
--- a/src/views/lawEnforcement/trace/product.vue
+++ b/src/views/lawEnforcement/trace/product.vue
@@ -17,25 +17,34 @@
 
       <p class="submitButton">立即查询</p>
 
-      <div class="list_box" v-for="(item,index) in 10" :key="index">
-        <van-cell center :to="{name:'lawEnforcementProductDetail', query: {id:item.id}}">
-          <template #title>
-            <div class="tt">
-              <span>玉米</span>
-              <span>有机食品</span>
-            </div>
-            <div class="first">
-              <span>135OP1600299</span>
-              <span>玉米</span>
-            </div>
-          </template>
-          <template #label>
-            <div class="label">
-              <p>佛山市银辉作物科学有限公司</p>
-              <p>5年</p>
-            </div>
-          </template>
-        </van-cell>
+      <div class="scroll_box">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="getList"
+        >
+          <div class="list_box" v-for="(item,index) in list" :key="index">
+            <van-cell center :to="{name:'lawEnforcementProductDetail', query: {content:item}}">
+              <template #title>
+                <div class="tt">
+                  <span>{{item.productName}}</span>
+                  <span>{{item.productCategory}}</span>
+                </div>
+                <div class="first">
+                  <span>{{item.recordCode}}</span>
+                  <span>{{item.productType}}</span>
+                </div>
+              </template>
+              <template #label>
+                <div class="label">
+                  <p>{{item.companyName}}</p>
+                  <p>5年</p>
+                </div>
+              </template>
+            </van-cell>
+          </div>
+        </van-list>
       </div>
 
     </div>
@@ -44,43 +53,57 @@
 </template>
 
 <script>
-  import { getScheme } from "@/api/lawEnforcement/index";
+  import { listAgri } from "@/api/lawEnforcement/index";
   export default {
     name: "programmeDetail",
     data() {
       return {
-        showBankType:false,
-        showPayeeType:false,
-        showPicker:false,
+        loading: false,
+        finished: false,
         form:{},
-
-        bankType:'',
-        payeeType:'',
         value:'',
-
-        bankTypeOptions:[],
-        payeeTypeOptions:[],
-        tEnforceSchemeHandlerList:[],
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
-
-        activeNames: ['1'],
-        activeNames1: ['1'],
-        activeNames2: ['1'],
+        queryParams: {
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
+          recordCode: null,   // 查询参数-饲料许可证号
+          factory: null,  // 生产厂家
+          productGoodsName: null, // 商品名称
+          productName: null,  // 通用名称
+        },
+        list:[],
       };
     },
     created() {
       // this.getDictionaries()
+      this.getDicts("agri_product_type").then(response => {
+        this.productTypeOptions = response.data;
+      });
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
-          this.form = response.data;
+      getList(){
+        var _this = this;
+        listAgri(_this.queryParams).then(response => {
+          response.rows.map(res=>{
+            res.productType = res.productType == '' ? '' : this.selectDictLabel(this.productTypeOptions, res.productType);
+            this.list.push(res);
+          })
+          console.log(this.list.length)
+          if(this.list.length >= response.total){
+            this.finished = true;
+            return;
+          }else{
+            this.loading = false;
+            this.queryParams.pageNum += 1 ;
+          }
         });
       },
-      goBack(){
-        window.history.go(-1)
+      goSubmit(){
+        this.list = [];
+        this.getList();
       }
     },
   }
@@ -94,8 +117,14 @@
 
   }
   .main{
-    position: relative;
-    top: -150PX;
+    position: absolute;
+    width: 100%;
+    top: 88PX;
+  }
+  .scroll_box{
+    height: calc(100vh - 100px - 200PX - 100PX);
+    overflow: hidden;
+    overflow-y: scroll;
   }
   /deep/ .van-cell{
     padding-bottom: 0;
diff --git a/src/views/lawEnforcement/trace/productDetail.vue b/src/views/lawEnforcement/trace/productDetail.vue
index f8d08604..5f3b6483 100644
--- a/src/views/lawEnforcement/trace/productDetail.vue
+++ b/src/views/lawEnforcement/trace/productDetail.vue
@@ -9,15 +9,15 @@
     <div class="main">
 
       <div class="main_box">
-        <van-cell title="农产品类型" :border="false" value="登记号" />
-        <van-cell title="证书编号" :border="false" value="登记号" />
-        <van-cell title="产品名称" :border="false" value="登记号" />
-        <van-cell title="产品类别" :border="false" value="登记号" />
-        <van-cell title="注册商标" :border="false" value="登记号" />
-        <van-cell title="企业名称" :border="false" value="登记号" />
-        <van-cell title="企业地址" :border="false" value="登记号" />
-        <van-cell title="企业信息码" :border="false" value="登记号" />
-        <van-cell title="备注" :border="false" value="登记号" />
+        <van-cell title="农产品类型" :border="false" v-model="form.productType" />
+        <van-cell title="证书编号" :border="false" v-model="form.recordCode" />
+        <van-cell title="产品名称" :border="false" v-model="form.productName" />
+        <van-cell title="产品类别" :border="false" v-model="form.productCategory" />
+        <van-cell title="注册商标" :border="false" v-model="form.regMark" />
+        <van-cell title="企业名称" :border="false" v-model="form.companyName" />
+        <van-cell title="企业地址" :border="false" v-model="form.companyAddress" />
+        <van-cell title="企业信息码" :border="false" v-model="form.companyCode" />
+        <van-cell title="备注" :border="false" v-model="form.remark" />
       </div>
 
     </div>
@@ -31,39 +31,16 @@
     name: "programmeDetail",
     data() {
       return {
-        showBankType:false,
-        showPayeeType:false,
-        showPicker:false,
         form:{},
-
-        bankType:'',
-        payeeType:'',
-        value:'',
-
-        bankTypeOptions:[],
-        payeeTypeOptions:[],
-        tEnforceSchemeHandlerList:[],
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
-
-        activeNames: ['1'],
-        activeNames1: ['1'],
-        activeNames2: ['1'],
       };
     },
     created() {
       // this.getDictionaries()
+      var content = this.$route.query.content;
+      this.form = content;
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
-          this.form = response.data;
-        });
-      },
-      goBack(){
-        window.history.go(-1)
-      }
+
     },
   }
 </script>
diff --git a/src/views/lawEnforcement/trace/seed.vue b/src/views/lawEnforcement/trace/seed.vue
index 7d704b37..b4a69825 100644
--- a/src/views/lawEnforcement/trace/seed.vue
+++ b/src/views/lawEnforcement/trace/seed.vue
@@ -9,74 +9,97 @@
     <div class="main">
 
       <div class="main_box">
-        <van-field v-model="value" :border="false" label="作物种类" placeholder="作物种类" input-align="right" />
-        <van-field v-model="value" :border="false" label="品种名称" placeholder="品种名称" input-align="right" />
-        <van-field v-model="value" :border="false" label="审定登记编号" placeholder="审定登记编号" input-align="right" />
-        <van-field v-model="value" :border="false" label="审定登记单位" placeholder="审定登记单位" input-align="right" />
+        <van-field v-model="queryParams.category" :border="false" label="作物种类" placeholder="作物种类" input-align="right" />
+        <van-field v-model="queryParams.productName" :border="false" label="品种名称" placeholder="品种名称" input-align="right" />
+        <van-field v-model="queryParams.recordCode" :border="false" label="审定登记编号" placeholder="审定登记编号" input-align="right" />
+        <van-field v-model="queryParams.recordOrg" :border="false" label="审定登记单位" placeholder="审定登记单位" input-align="right" />
       </div>
 
-      <p class="submitButton">立即查询</p>
+      <p class="submitButton" @click="goSubmit">立即查询</p>
 
-      <div class="list_box" v-for="(item,index) in 10" :key="index">
-        <van-cell center :to="{name:'lawEnforcementSeedDetail', query: {id:item.id}}">
-          <template #title>
-            <div class="tt">
-              <span>皖垦玉1号</span>
-              <span>皖玉2016003</span>
-            </div>
-          </template>
-          <template #label>
-            <div class="label">
-              <p>佛山市银辉作物科学有限公司</p>
-              <p>玉米</p>
-            </div>
-          </template>
-        </van-cell>
+      <div class="scroll_box">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="getList"
+        >
+          <div class="list_box" v-for="(item,index) in list" :key="index">
+            <van-cell center :to="{name:'lawEnforcementSeedDetail', query: {content:item}}">
+              <template #title>
+                <div class="tt">
+                  <span>{{item.productName}}</span>
+                  <span>{{item.recordCode}}</span>
+                </div>
+              </template>
+              <template #label>
+                <div class="label">
+                  <p>{{item.recordOrg}}</p>
+                  <p>{{item.category}}</p>
+                </div>
+              </template>
+            </van-cell>
+          </div>
+        </van-list>
       </div>
-
     </div>
 
   </div>
 </template>
 
 <script>
-  import { getScheme } from "@/api/lawEnforcement/index";
+  import { listSeed } from "@/api/lawEnforcement/index";
   export default {
     name: "programmeDetail",
     data() {
       return {
-        showBankType:false,
-        showPayeeType:false,
-        showPicker:false,
+        loading: false,
+        finished: false,
         form:{},
-
-        bankType:'',
-        payeeType:'',
         value:'',
-
-        bankTypeOptions:[],
-        payeeTypeOptions:[],
-        tEnforceSchemeHandlerList:[],
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
-
-        activeNames: ['1'],
-        activeNames1: ['1'],
-        activeNames2: ['1'],
+        showCategory:false,
+        showAgent:false,
+        queryParams: {
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
+          category: null,
+          productName: null,
+          recordCode: null,
+        },
+        list:[],
+        categoryOptions:[],
+        agentOptions:[],
+        category: null,  // 查询参数-农药种类
+        agent: null, // 查询参数-剂型
       };
     },
     created() {
       // this.getDictionaries()
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
-          this.form = response.data;
+      getList(){
+        var _this = this;
+        listSeed(_this.queryParams).then(response => {
+          response.rows.map(res=>{
+            this.list.push(res);
+          })
+          console.log(this.list.length)
+          if(this.list.length >= response.total){
+            this.finished = true;
+            return;
+          }else{
+            this.loading = false;
+            this.queryParams.pageNum += 1 ;
+          }
         });
       },
-      goBack(){
-        window.history.go(-1)
+      goSubmit(){
+        this.list = [];
+        this.getList();
       }
     },
   }
@@ -90,8 +113,9 @@
 
   }
   .main{
-    position: relative;
-    top: -150PX;
+    position: absolute;
+    width: 100%;
+    top: 88PX;
   }
   /deep/ .van-cell{
     padding-bottom: 0;
@@ -244,4 +268,9 @@
       }
     }
   }
+  .scroll_box{
+    height: calc(100vh - 100px - 200PX - 100PX);
+    overflow: hidden;
+    overflow-y: scroll;
+  }
 </style>
diff --git a/src/views/lawEnforcement/trace/seedDetail.vue b/src/views/lawEnforcement/trace/seedDetail.vue
index 2e6e619f..2ea5aa9e 100644
--- a/src/views/lawEnforcement/trace/seedDetail.vue
+++ b/src/views/lawEnforcement/trace/seedDetail.vue
@@ -9,36 +9,36 @@
     <div class="main">
 
       <div class="main_box">
-        <van-cell title="作物种类" :border="false" value="登记号" />
-        <van-cell title="品种名称" :border="false" value="登记号" />
-        <van-cell title="审定登记编号" :border="false" value="登记号" />
-        <van-cell title="审定登记年份" :border="false" value="登记号" />
-        <van-cell title="审定登记单位" :border="false" value="登记号" />
-        <van-cell title="选（引）育单位（人）" :border="false" value="登记号" />
+        <van-cell title="作物种类" :border="false" v-model="form.category" />
+        <van-cell title="品种名称" :border="false" v-model="form.productName" />
+        <van-cell title="审定登记编号" :border="false" v-model="form.recordCode" />
+        <van-cell title="审定登记年份" :border="false" v-model="form.recordYear" />
+        <van-cell title="审定登记单位" :border="false" v-model="form.recordOrg" />
+        <van-cell title="选（引）育单位（人）" :border="false" v-model="form.recordHolder" />
       </div>
 
       <div class="main_box" style="margin-top: 10PX;">
-        <van-cell title="品种来源" :border="false" value="登记号" />
+        <van-cell title="品种来源" :border="false" v-model="form.varietySource" />
       </div>
 
       <div class="main_box" style="margin-top: 10PX;">
-        <van-cell title="特征特性" :border="false" value="登记号" />
+        <van-cell title="特征特性" :border="false" v-model="form.features" />
       </div>
 
       <div class="main_box" style="margin-top: 10PX;">
-        <van-cell title="产量表现" :border="false" value="登记号" />
+        <van-cell title="产量表现" :border="false" v-model="form.yieldPerformance" />
       </div>
 
       <div class="main_box" style="margin-top: 10PX;">
-        <van-cell title="栽培技术要点" :border="false" value="登记号" />
+        <van-cell title="栽培技术要点" :border="false" v-model="form.regIndex" />
       </div>
 
       <div class="main_box" style="margin-top: 10PX;">
-        <van-cell title="适宜种植区域" :border="false" value="登记号" />
+        <van-cell title="适宜种植区域" :border="false" v-model="form.suitableRange" />
       </div>
 
       <div class="main_box" style="margin-top: 10PX;">
-        <van-cell title="备注" :border="false" value="登记号" />
+        <van-cell title="备注" :border="false" v-model="form.remark" />
       </div>
 
     </div>
@@ -52,39 +52,15 @@
     name: "programmeDetail",
     data() {
       return {
-        showBankType:false,
-        showPayeeType:false,
-        showPicker:false,
         form:{},
-
-        bankType:'',
-        payeeType:'',
-        value:'',
-
-        bankTypeOptions:[],
-        payeeTypeOptions:[],
-        tEnforceSchemeHandlerList:[],
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
-
-        activeNames: ['1'],
-        activeNames1: ['1'],
-        activeNames2: ['1'],
       };
     },
     created() {
-      // this.getDictionaries()
+      var content = this.$route.query.content;
+      this.form = content;
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
-          this.form = response.data;
-        });
-      },
-      goBack(){
-        window.history.go(-1)
-      }
+
     },
   }
 </script>
diff --git a/src/views/lawEnforcement/trace/veterinary.vue b/src/views/lawEnforcement/trace/veterinary.vue
index a0dcfed9..43e864c0 100644
--- a/src/views/lawEnforcement/trace/veterinary.vue
+++ b/src/views/lawEnforcement/trace/veterinary.vue
@@ -9,78 +9,96 @@
     <div class="main">
 
       <div class="main_box">
-        <van-field v-model="value" :border="false" label="产品批准文号" placeholder="请输入产品批准文号" input-align="right" />
-        <van-field v-model="value" :border="false" label="生产企业名称" placeholder="请输入生产企业名称" input-align="right" />
-        <van-field v-model="value" :border="false" label="商品名称" placeholder="请输入商品名称" input-align="right" />
-        <van-field v-model="value" :border="false" label="产品通用名称" placeholder="请输入产品通用名称" input-align="right" />
+        <van-field v-model="queryParams.recordCode" :border="false" label="产品批准文号" placeholder="请输入产品批准文号" input-align="right" />
+        <van-field v-model="queryParams.factory" :border="false" label="生产企业名称" placeholder="请输入生产企业名称" input-align="right" />
+        <van-field v-model="queryParams.productGoodsName" :border="false" label="商品名称" placeholder="请输入商品名称" input-align="right" />
+        <van-field v-model="queryParams.productName" :border="false" label="产品通用名称" placeholder="请输入产品通用名称" input-align="right" />
       </div>
 
-      <p class="submitButton">立即查询</p>
+      <p class="submitButton" @click="goSubmit">立即查询</p>
 
-      <div class="list_box" v-for="(item,index) in 10" :key="index">
-        <van-cell center :to="{name:'lawEnforcementVeterinaryDetail', query: {id:item.id}}">
-          <template #title>
-            <div class="tt">
-              <span>茯苓多糖散</span>
-              <span>3年</span>
-            </div>
-            <div class="first">
-              <span>(2018)新兽药证字3号</span>
-              <span>茯苓多糖散</span>
-            </div>
-          </template>
-          <template #label>
-            <div class="label">
-              <p>佛山市银辉作物科学有限公司</p>
-              <p>2026-12-25</p>
-            </div>
-          </template>
-        </van-cell>
+      <div class="scroll_box">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="getList"
+        >
+          <div class="list_box" v-for="(item,index) in list" :key="index">
+            <van-cell center :to="{name:'lawEnforcementVeterinaryDetail', query: {content:item}}">
+              <template #title>
+                <div class="tt">
+                  <span>{{item.productName}}</span>
+                  <span>{{item.effectivePeriod}}</span>
+                </div>
+                <div class="first">
+                  <span>{{item.recordCode}}</span>
+                  <span>{{item.productGoodsName}}</span>
+                </div>
+              </template>
+              <template #label>
+                <div class="label">
+                  <p>{{item.factory}}</p>
+                  <p>{{format(item.firstApprovalDate,'yyyy-MM-dd')}}</p>
+                </div>
+              </template>
+            </van-cell>
+          </div>
+        </van-list>
       </div>
-
     </div>
 
   </div>
 </template>
 
 <script>
-  import { getScheme } from "@/api/lawEnforcement/index";
+  import { listGmp } from "@/api/lawEnforcement/index";
   export default {
     name: "programmeDetail",
     data() {
       return {
-        showBankType:false,
-        showPayeeType:false,
-        showPicker:false,
+        loading: false,
+        finished: false,
         form:{},
-
-        bankType:'',
-        payeeType:'',
         value:'',
-
-        bankTypeOptions:[],
-        payeeTypeOptions:[],
-        tEnforceSchemeHandlerList:[],
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
-
-        activeNames: ['1'],
-        activeNames1: ['1'],
-        activeNames2: ['1'],
+        queryParams: {
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
+          recordCode: null,  //查询参数-产品批准文号
+          factory: null,  //查询参数-生产企业名称
+          productGoodsName: null,  //查询参数-商品名称
+          productName: null,  //查询参数-通用名称
+        },
+        list:[],
       };
     },
     created() {
       // this.getDictionaries()
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
-          this.form = response.data;
+      getList(){
+        var _this = this;
+        listGmp(_this.queryParams).then(response => {
+          response.rows.map(res=>{
+            this.list.push(res);
+          })
+          console.log(this.list.length)
+          if(this.list.length >= response.total){
+            this.finished = true;
+            return;
+          }else{
+            this.loading = false;
+            this.queryParams.pageNum += 1 ;
+          }
         });
       },
-      goBack(){
-        window.history.go(-1)
+      goSubmit(){
+        this.list = [];
+        this.getList();
       }
     },
   }
@@ -94,8 +112,9 @@
 
   }
   .main{
-    position: relative;
-    top: -150PX;
+    position: absolute;
+    width: 100%;
+    top: 88PX;
   }
   /deep/ .van-cell{
     padding-bottom: 0;
@@ -256,4 +275,9 @@
       font-size: 0.35rem;
     }
   }
+  .scroll_box{
+    height: calc(100vh - 100px - 200PX - 100PX);
+    overflow: hidden;
+    overflow-y: scroll;
+  }
 </style>
diff --git a/src/views/lawEnforcement/trace/veterinaryDetail.vue b/src/views/lawEnforcement/trace/veterinaryDetail.vue
index fef9c8bd..2e1b4e87 100644
--- a/src/views/lawEnforcement/trace/veterinaryDetail.vue
+++ b/src/views/lawEnforcement/trace/veterinaryDetail.vue
@@ -9,14 +9,14 @@
     <div class="main">
 
       <div class="main_box">
-        <van-cell title="产品批准文号" :border="false" value="登记号" />
-        <van-cell title="生产企业名称" :border="false" value="登记号" />
-        <van-cell title="商品名称" :border="false" value="登记号" />
-        <van-cell title="产品通用名称" :border="false" value="登记号" />
-        <van-cell title="产品规格" :border="false" value="登记号" />
-        <van-cell title="批准日期" :border="false" value="登记号" />
-        <van-cell title="有效期限" :border="false" value="登记号" />
-        <van-cell title="备注" :border="false" value="登记号" />
+        <van-cell title="产品批准文号" :border="false" v-model="form.recordCode" />
+        <van-cell title="生产企业名称" :border="false" v-model="form.factory" />
+        <van-cell title="商品名称" :border="false" v-model="form.productGoodsName" />
+        <van-cell title="产品通用名称" :border="false" v-model="form.productName" />
+        <van-cell title="产品规格" :border="false" v-model="form.productSpec" />
+        <van-cell title="批准日期" :border="false" v-model="form.firstApprovalDate" />
+        <van-cell title="有效期限" :border="false" v-model="form.effectivePeriod" />
+        <van-cell title="备注" :border="false" v-model="form.remark" />
       </div>
 
     </div>
@@ -30,39 +30,16 @@
     name: "programmeDetail",
     data() {
       return {
-        showBankType:false,
-        showPayeeType:false,
-        showPicker:false,
         form:{},
-
-        bankType:'',
-        payeeType:'',
-        value:'',
-
-        bankTypeOptions:[],
-        payeeTypeOptions:[],
-        tEnforceSchemeHandlerList:[],
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
-
-        activeNames: ['1'],
-        activeNames1: ['1'],
-        activeNames2: ['1'],
       };
     },
     created() {
-      // this.getDictionaries()
+      var content = this.$route.query.content;
+      content.firstApprovalDate = this.format(content.firstApprovalDate,'yyyy-MM-dd')
+      this.form = content;
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
-          this.form = response.data;
-        });
-      },
-      goBack(){
-        window.history.go(-1)
-      }
+
     },
   }
 </script>
diff --git a/static/images/lawEnforcement/icon/individual_icon_04.png b/static/images/lawEnforcement/icon/individual_icon_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c5c65e646a8ebfdd21be4d7c3f59da33b2e25fc
GIT binary patch
literal 1493
zcmV;`1uFW9P)<h;3K|Lk000e1NJLTq001cf001cn1^@s6s9*s000004b3#c}2nYxW
zd<bNS000GyNkl<ZSVz5?du&s66vxl6+tfW&77YQx1TxLQM8cR+Dr+ghIF~7sh{`$#
zA|^&N<LeJK#;AW7jWH2|F`D=Q;#x(F%-2R>aje5l4XB_|GX+URganxad)W3Kzo+fp
zZoB(z+0Gx!)}DLL=bqQ^F-3U_Zwt+!xV9XRFC)bvB2|@Tiuqqs6eCvM<fAUt)bnkg
zu3*N4@VlYeq>_)~k$O_<Di4oBmH!5C7b)#+74Gfy@~mq}js~A0=Eo7SQZEk7b-9y#
z$yT-c%irACa)jh)pplq1PDrO4>-IXMc<GnuqM;YnE&GP-RBa)-Ew~=__8I`sE1b!~
z0&_c6Xf5j2y{D~wSVD4JU=!-Db<*InyX;3QPSmSA`i`3UGlk?xa08Sdni{|{F9Q@G
z@vF68pUm|;0g@wuhmqb_rWjCn*GDsbLA9(qVf3E`i4LwIjlV*gOY(-Cb_G!_s$}1*
zM1#Ltn-RVE8KSd)<?3uy;T{BPT*e^zliD&mU3Q@0E}nZ6(c&l50J~8!W}v#xVT{ZE
z7bd<4Q=@9``CR{E95NDo9UtD8cLa?O3Z#ITfx3AKqN9`;tX69doE5Vv$kY;-NFF*j
zgE~WN2I>wlV}Kt~;g~dV26D2x*$Dd6`$P-Y+m}K1So)Jji>lPR?vZpP+X6qMS*p)T
zs&kF#pz?VF3(Kwt?HkJYyq5H<yY}`gZo7UVsp7nMD2^|tr#K%-qEx4=Nu7(v8a(km
z(X1sN(w)lj9@J$Bkioa`*FBCAF)EbLAevoAR8o=tRJ!>1ciCw)YZAMzHwEBfK$b})
z`_Vtwxq=k9#ZM4TuQ69YfvS-qUWq|%H7h-X#^(zp7Ik%*Bcw!597yzJmH4BVNT5V2
zuT0NHc?n(YhPe^6{myhIEG2oPq<aM4pKl8(OV|zAQVQS?n~4s-W3FDkif9qKS7bjT
z`pXB_W<^gT-t&|_By*EMvSSn*P__cPe-j*Uw^yHs$kaT5Xdff$xYr>{j-JswyiOno
zp?a~Ux}-VqJW`9s=yJJx)6?nZr5ri62F%Ie0M;FZ$wG98vJsFCfg72=kZ3u|L+Un$
zbQU74T?5EKCsvz!OFQCBoOWPIv)g**8fe;+PWi{H3qd3*^;II>bqJ9UbHze*$nA~Z
z>PsL+qDu>b{2eRKTp2+tF@ipFgp_)ex^yEl1y+6Lt&UCY@)iv9yA^L;P)<eDj-xKi
zP4)D#B3&(w;6|J_wQg*rbhI!o5~Ar{P$aM!(Ohf#tPJQC*k;MVbsW5~AW>|16N7zb
zdK$Qmey($-lT;GF94E-(%vP<g7R~bwK+TW1GI%ATrv~5{#}B&|LZ1d+MwWSG$Id#2
z<3j*-sZgILBGHi*M+UldtgJYPcV;Wf1XzRvm@JX9Y|1pSUGD61&cl?XD%BE$v&_ys
zmGbw3^GTzF__fFqRH7uqT|@vRvLaFvl3o!RQ*r>y8&F{AIUK~E)j6_{w2|P;_~J3U
zcTCO9>f6U*b!AEKp$_*0-^vN|5!D=<WBfWB@{3S09ZT*)fJ3&R`j-+xDFrV>-ZslT
zL_SrQdzU%!24l;$mr%(CeXxb%nnGdLFa~eKT-=fC)#5J5KMx_=4dq!=hN<{|)fAJn
z{{*qVRZHLM?(}}6>+!W1DOR)w5&Y2VN&EZB_9Yk68D9jTH+yvLP904Gz!d<*^^UbT
z-}ExfM1o=bl+HJt58QE>YDxVOy+Mi5r_HYVT-BtRVczC1rFc;bc1*1RzB*6De=r2M
zVz<3PHTU9L$DKGv(iAwd)DK6^fR%rdpvi26`4q~f8~=6ql!}s3S&QAFjcervX>@|i
vt_srrn?vloG|PFCNATGZeQEOwX4L;5;)pIM{?o*>00000NkvXXu0mjfj~L6!

literal 0
HcmV?d00001