diff --git a/src/views/lawEnforcement/basis/basis.vue b/src/views/lawEnforcement/basis/basis.vue
index 81fe504a..1084daf5 100644
--- a/src/views/lawEnforcement/basis/basis.vue
+++ b/src/views/lawEnforcement/basis/basis.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="header_main">
       执法依据
-      <div class="return_btn" @click="onClickLeft"></div>
+      <div class="return_btn" @click="onClickLeftIndex"></div>
     </div>
     <div class="jg"></div>
 
@@ -81,6 +81,11 @@
           this.enforceNewsTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
         }
       });
+
+      if (this.$route.query.searchInput){
+        this.searchInput = this.$route.query.searchInput;
+        this.goSearch();
+      }
     },
     methods: {
       getList(){
@@ -111,7 +116,8 @@
       },
       goSearch(){
         if (this.searchInput == ''){
-          location.reload()
+          let path = this.$route.path; //先获取路由路径
+          this.$router.push(path); //再跳转路由路径，query参数没带过去，所以被清除了
         }
         this.list = [];
         this.finished = false;
@@ -120,6 +126,9 @@
         this.queryParams.pageNum = 1;
         this.getList();
       },
+      onClickLeftIndex(){
+        this.$router.push('/lawEnforcement/index_new')
+      }
     },
   }
 </script>
diff --git a/src/views/lawEnforcement/caseAllocation/caseAdd.vue b/src/views/lawEnforcement/caseAllocation/caseAdd.vue
index 748cbef5..cce46e6f 100644
--- a/src/views/lawEnforcement/caseAllocation/caseAdd.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseAdd.vue
@@ -236,7 +236,8 @@
                 />
               </van-popup>
     <!--          <van-field v-model="form.nation" label="民族" placeholder="请输入民族" :border="false" label-width="auto" input-align="right" is-link arrow-direction="down" />-->
-              <van-field v-model="form.companyPosition" label="工作单位及职务" placeholder="请输入工作单位及职务" :border="false" label-width="auto" input-align="right" />
+              <van-field v-model="form.companyPosition" label="工作单位" placeholder="请输入工作单位及职务" :border="false" label-width="auto" input-align="right" />
+              <van-field v-model="form.duties" label="职务" placeholder="请输入职务" :border="false" label-width="auto" input-align="right" />
               <van-field v-model="form.zihao" label="字号名称" placeholder="请输入字号名称" :border="false" label-width="auto" input-align="right" />
             </template>
             <template v-if="form.type=='2'">
@@ -326,6 +327,8 @@
           registerDate:this.format(new Date(),'yyyy-MM-dd'),
           caseProgress:'1',
           caseStatus:'1',
+          attachement:[],
+          attachementList:[]
         },
         registerDate:new Date(),
         birthday:new Date(),
diff --git a/src/views/lawEnforcement/caseAllocation/caseAllocation.vue b/src/views/lawEnforcement/caseAllocation/caseAllocation.vue
index 18426a25..e2a6cfad 100644
--- a/src/views/lawEnforcement/caseAllocation/caseAllocation.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseAllocation.vue
@@ -28,7 +28,7 @@
             <template #label>
               <p>{{item.caseSource}}</p>
               <p>第{{item.belongTeam}}</p>
-              <p>{{item.shouanDate}}</p>
+              <p>{{item.registerDate}}</p>
             </template>
           </van-cell>
           <template #right>
@@ -65,6 +65,7 @@
           caseName: null,
           caseProgress: "2",
           title:"",
+          isDistribute: "N"
         },
         list:[],
         belongTeamOptions:[],
diff --git a/src/views/lawEnforcement/caseAllocation/caseDetail.vue b/src/views/lawEnforcement/caseAllocation/caseDetail.vue
index ff65bc4d..dac1630b 100644
--- a/src/views/lawEnforcement/caseAllocation/caseDetail.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseDetail.vue
@@ -13,13 +13,13 @@
         </template>
       </van-cell>
       <van-cell title="案件来源" :border="false" v-model="form.caseSource" />
-      <van-cell title="关联方案" :border="false" v-model="form.schemeId" />
+      <van-cell title="关联方案" :border="false" v-model="form.scheme" />
       <van-cell title="案件属地" :border="false" v-model="form.deptId" />
       <van-cell title="执行主体" :border="false" v-model="form.belongTeam" />
       <van-cell title="案件名称" :border="false" v-model="form.caseName" />
       <van-cell title="登记日期" :border="false" v-model="form.registerDate" />
       <van-cell title="执法类别" :border="false" v-model="form.enforceCategory" />
-<!--      <van-cell title="案件简述1" :border="false" v-model="form.caseSource" />-->
+      <van-cell title="案件简述" :border="false" v-model="form.caseDescribe" />
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
@@ -36,7 +36,8 @@
             <van-cell title="身份证号" :border="false" v-model="form.cardNum" />
             <van-cell title="出生日期" :border="false" v-model="form.birthday" />
             <van-cell title="民族" :border="false" v-model="form.nation" />
-            <van-cell title="工作单位及职务" :border="false" v-model="form.companyPosition" />
+            <van-cell title="工作单位" :border="false" v-model="form.companyPosition" />
+            <van-cell title="职务" :border="false" v-model="form.duties" />
             <van-cell title="字号名称" :border="false" v-model="form.zihao" />
           </template>
           <template v-if="form.type=='企业'">
@@ -99,7 +100,7 @@
 </template>
 
 <script>
-  import { getCase , getDeptName , getSurveyByCaseId } from "@/api/lawEnforcement/index";
+  import { getCase , getDeptName , getSurveyByCaseId , schemeList } from "@/api/lawEnforcement/index";
   export default {
     name: "programmeDetail",
     data() {
@@ -126,6 +127,7 @@
 
         caseSourceOptions:[],
         belongTeamOptions:[],
+        schemeOptions:[],
 
         // 查询参数
         queryParams: {
@@ -155,7 +157,11 @@
       this.getDicts("sex").then(response => {
         this.sexOptions = response.data;
       });
+      this.getDicts("nationality").then(response => {
+        this.nationOptions = response.data;
+      });
       this.getDetail();
+
     },
     methods: {
       getDetail(){
@@ -164,6 +170,11 @@
           response.data.belongTeam = response.data.belongTeam == '' ? '' : this.selectDictLabel(this.belongTeamOptions, response.data.belongTeam);
           response.data.type = response.data.type == '' ? '' : this.selectDictLabel(this.typeOptions, response.data.type);
           response.data.sex = response.data.sex == '' ? '' : this.selectDictLabel(this.sexOptions, response.data.sex);
+          response.data.nation = response.data.nation == '' ? '' : this.selectDictLabel(this.nationOptions, response.data.nation);
+
+          var schemeQueryParam = {
+            applyStatus: "1"
+          };
           getDeptName(response.data.deptId).then(res => {
             response.data.deptId = res.data.deptName
           });
@@ -178,7 +189,11 @@
             })
             // process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API
           }
-          this.form = response.data;
+          schemeList(schemeQueryParam).then((responseScheme) => {
+            console.log(responseScheme.rows.filter(function (e) { return e.id == response.data.schemeId; }))
+            response.data.scheme = response.data.schemeId == '' ? '' : responseScheme.rows.filter(function (e) { return e.id == response.data.schemeId; })[0].schemeName;
+            this.form = response.data;
+          });
         });
         getSurveyByCaseId(this.$route.query.id).then((response) => {
           if(response.data != undefined){
diff --git a/src/views/lawEnforcement/caseAllocation/caseDistribution.vue b/src/views/lawEnforcement/caseAllocation/caseDistribution.vue
index 4bb8977f..0b17c8d0 100644
--- a/src/views/lawEnforcement/caseAllocation/caseDistribution.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseDistribution.vue
@@ -13,12 +13,13 @@
         </template>
       </van-cell>
       <van-cell title="案件来源" :border="false" v-model="form.caseSource" />
-      <van-cell title="关联方案" :border="false" v-model="form.schemeId" />
+      <van-cell title="关联方案" :border="false" v-model="form.scheme" />
       <van-cell title="案件属地" :border="false" v-model="form.deptId" />
       <van-cell title="执行主体" :border="false" v-model="form.belongTeam" />
       <van-cell title="案件名称" :border="false" v-model="form.caseName" />
       <van-cell title="登记日期" :border="false" v-model="form.registerDate" />
       <van-cell title="执法类别" :border="false" v-model="form.enforceCategory" />
+      <van-cell title="案件简述" :border="false" v-model="form.caseDescribe" />
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
@@ -101,7 +102,7 @@
 </template>
 
 <script>
-  import { getCase , getDeptName , getSurveyByCaseId , updateSurvey , addSurvey } from "@/api/lawEnforcement/index";
+  import { getCase , getDeptName , getSurveyByCaseId , updateSurvey , addSurvey , schemeList } from "@/api/lawEnforcement/index";
   import Cookies from "js-cookie";
   export default {
     name: "programmeDetail",
@@ -165,6 +166,14 @@
           response.data.caseSource = response.data.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, response.data.caseSource);
           response.data.belongTeam = response.data.belongTeam == '' ? '' : this.selectDictLabel(this.belongTeamOptions, response.data.belongTeam);
           response.data.type = response.data.type == '' ? '' : this.selectDictLabel(this.typeOptions, response.data.type);
+
+          var schemeQueryParam = {
+            applyStatus: "1"
+          };
+          schemeList(schemeQueryParam).then((responseScheme) => {
+            response.data.scheme = response.data.schemeId == '' ? '' : responseScheme.rows.filter(function (e) { return e.id == response.data.schemeId; })[0].schemeName;
+          });
+
           getDeptName(response.data.deptId).then(res => {
             response.data.deptId = res.data.deptName
           });
diff --git a/src/views/lawEnforcement/caseAllocation/caseHistory.vue b/src/views/lawEnforcement/caseAllocation/caseHistory.vue
index c330e327..594c45c4 100644
--- a/src/views/lawEnforcement/caseAllocation/caseHistory.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseHistory.vue
@@ -9,19 +9,20 @@
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
+        @load="getList"
         >
-          <van-cell center v-for="(item,index) in 10" :key="index" :to="{name:'approvalDetail', query: {id:item.id}}">
+          <van-cell center v-for="(item,index) in applicationList" :key="index" :to="{name:'caseDetail', query: {id:item.caseId,caseProgress:item.caseProgress}}">
             <template #title>
               <div class="first">
-                <span>2021-09-07  09:30:00</span>
-                <span>上级交办</span>
+                <span>{{item.handlerSetDate}}</span>
+                <span>{{item.caseSource}}</span>
               </div>
-              <span>关于徐胜峰在禁渔期内收购非法捕捞渔获...</span>
+              <span>{{item.caseName}}</span>
             </template>
             <template #label>
               <div class="label">
-                <p>执法人：刘月、张薇</p>
-                <p>立案</p>
+                <p>执法人：{{item.handlerNameStr}}</p>
+                <p>{{item.caseProgressName}}</p>
               </div>
             </template>
           </van-cell>
@@ -30,7 +31,7 @@
 </template>
 
 <script>
-  import { financePublicList,openRemove } from "@/api/sunVillage_info/fixedAssets";
+  import { listSurvey } from "@/api/lawEnforcement/index";
   import Cookies from "js-cookie";
   import request from '@/utils/request'
   export default {
@@ -48,12 +49,18 @@
         fileList:[],
         listLength:'0',
         searchInput:'',
-        queryParams:{
-          pageNum:1,
-          pageSize:10,
-          orderByColumn:'createTime',
-          isAsc:'desc',
-          year:'2022',
+        // 查询参数
+        queryParams: {
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
+          caseName: null,
+          caseProgress: "2",
+          title:"",
+          isDistribute: "Y"   // 办理人员是否已分配 （查询历史任务传参 “Y” ）
         },
         uploadFiles1:[],
         projectId:'',
@@ -62,14 +69,21 @@
       };
     },
     created() {
-
+      this.getDicts("case_source").then(response => {
+        this.caseSourceOptions = response.data;
+      });
+      this.getDicts("case_node").then(response => {
+        this.caseProgressOptions = response.data;
+      });
     },
     methods: {
       getList(){
         var _this = this;
-        financePublicList(_this.queryParams).then(response => {
+        listSurvey(_this.queryParams).then(response => {
           _this.listLength = response.total;
           response.rows.map(res=>{
+            res.caseSource = res.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, res.caseSource);
+            res.caseProgressName = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
             _this.applicationList.push(res);
           })
           if(_this.applicationList.length >= response.total){
@@ -139,20 +153,20 @@
         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
-          });
+        // this.$dialog.alert({
+        //   title: '提示',
+        //   message: '确认删除？',
+        //   showCancelButton:true,
+        // })
+        //   .then(() => {
+        //     openRemove(id).then(response => {
+        //       this.$notify({ type: 'success', message: '删除成功' });
+        //       this.getList()
+        //     });
+        //   })
+        //   .catch(() => {
+        //     // on cancel
+        //   });
 
       }
     },
diff --git a/src/views/lawEnforcement/caseQuery/caseQuery.vue b/src/views/lawEnforcement/caseQuery/caseQuery.vue
index 2b3f25a2..e0f47e2f 100644
--- a/src/views/lawEnforcement/caseQuery/caseQuery.vue
+++ b/src/views/lawEnforcement/caseQuery/caseQuery.vue
@@ -19,7 +19,7 @@
         @load="getList"
         >
         <van-swipe-cell v-for="(item,index) in list" :key="index">
-          <van-cell :title="item.caseName" :to="{name:'lawEnforcementCaseDetail', query: {id:item.id}}">
+          <van-cell :title="item.caseName" :to="{name:'lawEnforcementCaseDetailNew', query: {id:item.id}}">
             <template #label>
               <p>{{item.caseNumPart1}}农 {{item.caseNumPart2}} [{{item.caseNumPart3}}] {{item.caseNum}}号</p>
               <p>{{item.caseProgress}}</p>
@@ -79,7 +79,7 @@
             return;
           }else{
             _this.loading = false;
-            _this.queryParams.pageNum += 1 ;
+            _this.caseQueryParams.pageNum += 1 ;
           }
 
         });
diff --git a/src/views/lawEnforcement/caseQuery/caseQueryDocument.vue b/src/views/lawEnforcement/caseQuery/caseQueryDocument.vue
index a9d8b359..48df9a74 100644
--- a/src/views/lawEnforcement/caseQuery/caseQueryDocument.vue
+++ b/src/views/lawEnforcement/caseQuery/caseQueryDocument.vue
@@ -7,7 +7,7 @@
     <div style="height: 58px;"></div>
 
     <div class="search_box">
-        <p>张雷未经定点从事生猪屠宰活动案</p>
+        <p>{{caseName}}</p>
     </div>
 
     <div class="main_box">
@@ -18,15 +18,16 @@
         </template>
       </van-cell>
       <div class="peopleList">
-        <van-row v-for="(item,index) in 2" :key="index" >
+        <van-row v-for="(item,index) in dengjiList" :key="index" >
           <van-col :span="20">
             <img src="../../../../static/images/lawEnforcement/icon/record_icon_03.png"/>
-            <p>指定管辖通知书</p>
+            <p>{{item[index].substr(27,item[index].length)}}</p>
           </van-col>
           <van-col :span="4">
-            <p>下载</p>
+            <a :href="'/api'+item[index]">下载</a>
           </van-col>
         </van-row>
+        <van-empty v-if="dengjiList == null || dengjiList == undefined || dengjiList == '' " description="暂无文件" />
       </div>
     </div>
 
@@ -38,15 +39,16 @@
         </template>
       </van-cell>
       <div class="peopleList">
-        <van-row v-for="(item,index) in 2" :key="index" >
+        <van-row v-for="(item,index) in kanchaList" :key="index" >
           <van-col :span="20">
             <img src="../../../../static/images/lawEnforcement/icon/record_icon_03.png" />
-            <p>指定管辖通知书</p>
+            <p>{{item[index].substr(27,item[index].length)}}</p>
           </van-col>
           <van-col :span="4">
-            <p>下载</p>
+            <a :href="'/api'+item[index]">下载</a>
           </van-col>
         </van-row>
+        <van-empty v-if="kanchaList == null || kanchaList == undefined || kanchaList == '' " description="暂无文件" />
       </div>
     </div>
 
@@ -58,15 +60,16 @@
         </template>
       </van-cell>
       <div class="peopleList">
-        <van-row v-for="(item,index) in 2" :key="index" >
+        <van-row v-for="(item,index) in beianList" :key="index" >
           <van-col :span="20">
             <img src="../../../../static/images/lawEnforcement/icon/record_icon_03.png"/>
-            <p>指定管辖通知书</p>
+            <p>{{item[index].substr(27,item[index].length)}}</p>
           </van-col>
           <van-col :span="4">
-            <p>下载</p>
+            <a :href="'/api'+item[index]">下载</a>
           </van-col>
         </van-row>
+        <van-empty v-if="beianList == null || beianList == undefined || beianList == '' " description="暂无文件" />
       </div>
     </div>
 
@@ -74,7 +77,7 @@
 </template>
 
 <script>
-  import { getScheme } from "@/api/lawEnforcement/index";
+  import { attachmentList , getCase } from "@/api/lawEnforcement/index";
   export default {
     name: "programmeDetail",
     data() {
@@ -91,6 +94,7 @@
         bankType:'',
         payeeType:'',
         value:'',
+        caseName:'',
 
         bankTypeOptions:[],
         payeeTypeOptions:[],
@@ -102,15 +106,37 @@
         activeNames: ['1'],
         activeNames1: ['1'],
         activeNames2: ['1'],
+
+        dengjiList:[],
+        kanchaList:[],
+        beianList:[],
       };
     },
     created() {
-      // this.getDictionaries()
+      getCase(this.$route.query.id).then((response) => {
+        this.caseName = response.data.caseName;
+      });
+      this.getList()
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
-          this.form = response.data;
+      getList(){
+        var _this = this;
+        let caseQueryParams = {
+          caseId:this.$route.query.id
+        }
+        attachmentList(caseQueryParams).then(response => {
+          response.rows.forEach(res=>{
+            if (res.caseProgressAttach){
+              res.caseProgressAttach = res.caseProgressAttach.split(',');
+            }
+            if(res.caseProgressName=='登记'){
+              this.dengjiList.push(res.caseProgressAttach);
+            }else if(res.caseProgressName=='勘察'){
+              this.kanchaList.push(res.caseProgressAttach);
+            }else if(res.caseProgressName=='备案'){
+              this.beianList.push(res.caseProgressAttach);
+            }
+          })
         });
       },
       goBack(){
@@ -142,6 +168,7 @@
     margin: 10PX auto;
     color: #1D6FE9;
     font-size: 0.4rem;
+    text-align: center;
   }
   .cf{
     padding: 0 3%;
@@ -218,7 +245,7 @@
       .van-col--4{
         display: flex;
         justify-content: right;
-        p{
+        a{
           color: #1D6FE9;
           border: 1px solid #1D6FE9;
           text-align: center;
diff --git a/src/views/lawEnforcement/index_new.vue b/src/views/lawEnforcement/index_new.vue
index 83bd8392..ec52bd44 100644
--- a/src/views/lawEnforcement/index_new.vue
+++ b/src/views/lawEnforcement/index_new.vue
@@ -7,8 +7,8 @@
 
     <div class="search">
       <img src="../../../static/images/lawEnforcement/new/index_icon_03.png">
-      <input type="text" placeholder="请输入执法依据名称" />
-      <img src="../../../static/images/lawEnforcement/new/index_icon_04.png">
+      <input type="text" placeholder="请输入执法依据名称" v-model="searchInput" />
+      <img src="../../../static/images/lawEnforcement/new/index_icon_04.png" @click="goSearch">
     </div>
 
 <!--    <van-notice-bar left-icon="../../../static/images/lawEnforcement/new/index_icon_02.png" :scrollable="false" background="rgba(135,174,241,0.3)" color="#2574E9">-->
@@ -130,6 +130,7 @@ export default {
       loading: false,
       //是否滚动到底部
       finished: false,
+      searchInput:'',
       //查询参数
       queryParams: {
         pageNum: 1,
@@ -146,7 +147,9 @@ export default {
 
   },
   methods: {
-
+    goSearch(){
+      this.$router.push({name:'lawEnforcementBasis',query:{searchInput:this.searchInput}});
+    }
   },
 };
 </script>
diff --git a/src/views/lawEnforcement/retrospect/retrospect.vue b/src/views/lawEnforcement/retrospect/retrospect.vue
index 2a55116e..6d41cc2c 100644
--- a/src/views/lawEnforcement/retrospect/retrospect.vue
+++ b/src/views/lawEnforcement/retrospect/retrospect.vue
@@ -7,6 +7,11 @@
       <div class="jg"></div>
 
       <div class="main_box">
+        <van-cell>
+          <template #title>
+            <span class="custom-title">扫码查询<i class="bgBlue"></i></span>
+          </template>
+        </van-cell>
         <van-grid :column-num="3" :border="false" square clickable>
           <van-grid-item icon="../../../static/images/lawEnforcement/new/retrospect_icon_01.png" text="农药扫码" :to="{name:'lawEnforcementRetrospectDetail'}" />
           <van-grid-item icon="../../../static/images/lawEnforcement/new/retrospect_icon_01.png" text="种子扫码" />
@@ -17,6 +22,11 @@
       </div>
 
       <div class="main_box">
+        <van-cell>
+          <template #title>
+            <span class="custom-title">本地查询<i class="bgBlue"></i></span>
+          </template>
+        </van-cell>
         <van-grid :column-num="3" :border="false" square clickable>
           <van-grid-item :to="{name:'lawEnforcementPesticides'}">
             <van-image src="../../../static/images/lawEnforcement/new/retrospect_icon_04.png" />
@@ -125,5 +135,25 @@
     font-size: .35rem;
     color: #646566;
   }
+  .custom-title{
+    font-size: 17PX;
+    color: #333333;
+    vertical-align: middle;
+    line-height: 1;
+    position: relative;
+  }
+  .tap{
+    color: #1D6FE9;
+  }
+  .bgBlue{
+    display: block;
+    position: absolute;
+    width: 17PX;
+    height: 17PX;
+    border-radius: 50%;
+    background-color: rgba(29,111,233,0.26);
+    top: -2PX;
+    right: -8PX;
+  }
 }
 </style>
diff --git a/src/views/lawEnforcement/supervise/enterpriseRelation.vue b/src/views/lawEnforcement/supervise/enterpriseRelation.vue
index 54587ece..e1bbd9e2 100644
--- a/src/views/lawEnforcement/supervise/enterpriseRelation.vue
+++ b/src/views/lawEnforcement/supervise/enterpriseRelation.vue
@@ -7,7 +7,7 @@
       <div class="jg"></div>
 
       <div class="search_box" v-if="list.length>0">
-        <p><span>{{list[0].name}}</span>关联案件</p>
+        <p><span>{{list[0].companyName}}</span>关联案件</p>
       </div>
 
       <van-list
diff --git a/src/views/lawEnforcement/supervise/individualDetail.vue b/src/views/lawEnforcement/supervise/individualDetail.vue
index 41337544..3d96ac9e 100644
--- a/src/views/lawEnforcement/supervise/individualDetail.vue
+++ b/src/views/lawEnforcement/supervise/individualDetail.vue
@@ -12,7 +12,8 @@
       <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.companyPosition" />
+      <van-cell title="职务" :border="false" v-model="form.duties" />
       <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" />
diff --git a/src/views/lawEnforcement/task/taskDetail.vue b/src/views/lawEnforcement/task/taskDetail.vue
index 34f2d614..3b4c6c66 100644
--- a/src/views/lawEnforcement/task/taskDetail.vue
+++ b/src/views/lawEnforcement/task/taskDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="header_main">
-      查看登记
+      查看案件详情
       <div class="return_btn" @click="onClickLeft"></div>
     </div>
     <div style="height: 58px;"></div>
@@ -37,7 +37,8 @@
             <van-cell title="身份证号" :border="false" v-model="form.cardNum" />
             <van-cell title="出生日期" :border="false" v-model="form.birthday" />
             <van-cell title="民族" :border="false" v-model="form.nation" />
-            <van-cell title="工作单位及职务" :border="false" v-model="form.companyPosition" />
+            <van-cell title="工作单位" :border="false" v-model="form.companyPosition" />
+            <van-cell title="职务" :border="false" v-model="form.duties" />
             <van-cell title="字号名称" :border="false" v-model="form.zihao" />
           </template>
           <template v-if="form.type=='企业'">
diff --git a/src/views/lawEnforcement/task/taskHandle.vue b/src/views/lawEnforcement/task/taskHandle.vue
index e47ac954..bb2dd68f 100644
--- a/src/views/lawEnforcement/task/taskHandle.vue
+++ b/src/views/lawEnforcement/task/taskHandle.vue
@@ -31,7 +31,7 @@
           <van-cell title="案件名称" :border="false" v-model="form.caseName" />
           <van-cell title="登记日期" :border="false" v-model="form.registerDate" />
           <van-cell title="执法类别" :border="false" v-model="form.enforceCategory" />
-          <!--      <van-cell title="案件简述1" :border="false" v-model="form.caseSource" />-->
+          <!--<van-cell title="案件简述1" :border="false" v-model="form.caseSource" />-->
         </div>
 
         <div class="main_box" style="margin-top: 10px;">
diff --git a/src/views/lawEnforcement/task/taskSignIn.vue b/src/views/lawEnforcement/task/taskSignIn.vue
index 4395aa18..18c0344a 100644
--- a/src/views/lawEnforcement/task/taskSignIn.vue
+++ b/src/views/lawEnforcement/task/taskSignIn.vue
@@ -120,8 +120,7 @@
             }
           });
           this.form = response.data;
-          var that = this;
-          that.getNowLocation();
+          this.getNowLocation();
         });
       },
       afterRead(file) {
@@ -142,13 +141,16 @@
         let that = this;
         var location_lon = "";
         var location_lat = ""; // 经度,纬度
+        alert("进入定位")
         navigator.geolocation.getCurrentPosition((position) => {
+          alert("完成定位2")
           console.log(position)
           let lat = position.coords.latitude;
           let lng = position.coords.longitude;
           const pointBak = new BMap.Point(lng, lat);
           const convertor = new BMap.Convertor();
           convertor.translate([pointBak], 1, 5,function(resPoint) {
+            alert("完成定位3")
             if(resPoint && resPoint.points && resPoint.points.length>0){
               lng = resPoint.points[0].lng;
               lat = resPoint.points[0].lat;
@@ -159,6 +161,7 @@
             that.form.longitude = point.lng;
             that.center.lng = point.lng;
             that.center.lat = point.lat;
+            alert("完成定位")
             geo.getLocation(point, (res) => {
               console.log(res)
               that.clockinAddr = res.address;
diff --git a/src/views/lawEnforcement/trace/pesticides.vue b/src/views/lawEnforcement/trace/pesticides.vue
index 00ac6365..b7a61d32 100644
--- a/src/views/lawEnforcement/trace/pesticides.vue
+++ b/src/views/lawEnforcement/trace/pesticides.vue
@@ -74,7 +74,7 @@
                   <span>{{item.category}}</span>
                   <span>{{item.agent}}</span>
                 </div>
-                <p class="dress">{{item.factory}}</p>
+                <p class="dress">{{item.recordHolder}}</p>
               </template>
               <template #label>
                 <div class="label">
diff --git a/src/views/lawEnforcement/trace/product.vue b/src/views/lawEnforcement/trace/product.vue
index 84099777..7a4eb8cf 100644
--- a/src/views/lawEnforcement/trace/product.vue
+++ b/src/views/lawEnforcement/trace/product.vue
@@ -39,7 +39,7 @@
               <template #label>
                 <div class="label">
                   <p>{{item.companyName}}</p>
-                  <p>5年</p>
+<!--                  <p>5年</p>-->
                 </div>
               </template>
             </van-cell>
diff --git a/src/views/lawEnforcement/trace/seed.vue b/src/views/lawEnforcement/trace/seed.vue
index b4a69825..6030c496 100644
--- a/src/views/lawEnforcement/trace/seed.vue
+++ b/src/views/lawEnforcement/trace/seed.vue
@@ -9,10 +9,10 @@
     <div class="main">
 
       <div class="main_box">
-        <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" />
+        <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" @click="goSubmit">立即查询</p>
diff --git a/src/views/lawEnforcement/userNew/user_new.vue b/src/views/lawEnforcement/userNew/user_new.vue
index 41e70ba7..b80b5f4a 100644
--- a/src/views/lawEnforcement/userNew/user_new.vue
+++ b/src/views/lawEnforcement/userNew/user_new.vue
@@ -8,7 +8,7 @@
         </van-col>
         <van-col :span="19" v-show="loginType">
           <p class="userName">{{user.nickName}}</p>
-          <p class="userDept">({{companyName}})</p>
+          <p class="userDept">( {{roleGroup}} )</p>
         </van-col>
         <van-col :span="24" v-show="loginButton">
           <van-button icon="friends" color="red" style="border-radius: 30PX;padding: 0 30PX;height: 30PX;" to="/lawEnforcement/login">