diff --git a/src/views/lawEnforcement/case/caseDetail.vue b/src/views/lawEnforcement/case/caseDetail.vue
index e110bdc7..6a30ff4a 100644
--- a/src/views/lawEnforcement/case/caseDetail.vue
+++ b/src/views/lawEnforcement/case/caseDetail.vue
@@ -83,36 +83,36 @@
           </van-collapse>
         </div>
 
-        <div class="main_box" style="margin-top: 10px;">
-          <van-collapse v-model="activeNames2">
-            <van-collapse-item name="1">
-              <template #title>
-                <van-icon name="../../../static/images/lawEnforcement/icon/icon_zxry.png" size="20"></van-icon>
-                <span class="custom-title">执法人员<i class="bgBlue"></i></span>
-              </template>
-              <div class="peopleList">
-                <van-row>
-                  <van-col :span="4">序号</van-col>
-                  <van-col :span="6">执行人员</van-col>
-                  <van-col :span="10">执法证号</van-col>
-                  <van-col :span="4">带队人</van-col>
-                </van-row>
-
-                <van-row v-for="(item,index) in tEnforceCaseHandlerList" :key="index" >
-                  <van-col :span="4">{{index+1}}</van-col>
-                  <van-col :span="6">{{item.enforcerName}}</van-col>
-                  <van-col :span="10">{{item.enforcerNum}}</van-col>
-                  <van-col :span="4">
-                    <div class="icon_box">
-                      <van-checkbox v-model="item.enforcerLeader" shape="square"></van-checkbox>
-                    </div>
-                  </van-col>
-                </van-row>
-                <!--            <img src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="$router.push({name:'lawEnforcementCaseLawEnforcer'})">-->
-              </div>
-            </van-collapse-item>
-          </van-collapse>
-        </div>
+<!--        <div class="main_box" style="margin-top: 10px;">-->
+<!--          <van-collapse v-model="activeNames2">-->
+<!--            <van-collapse-item name="1">-->
+<!--              <template #title>-->
+<!--                <van-icon name="../../../static/images/lawEnforcement/icon/icon_zxry.png" size="20"></van-icon>-->
+<!--                <span class="custom-title">执法人员<i class="bgBlue"></i></span>-->
+<!--              </template>-->
+<!--              <div class="peopleList">-->
+<!--                <van-row>-->
+<!--                  <van-col :span="4">序号</van-col>-->
+<!--                  <van-col :span="6">执行人员</van-col>-->
+<!--                  <van-col :span="10">执法证号</van-col>-->
+<!--                  <van-col :span="4">带队人</van-col>-->
+<!--                </van-row>-->
+
+<!--                <van-row v-for="(item,index) in tEnforceCaseHandlerList" :key="index" >-->
+<!--                  <van-col :span="4">{{index+1}}</van-col>-->
+<!--                  <van-col :span="6">{{item.enforcerName}}</van-col>-->
+<!--                  <van-col :span="10">{{item.enforcerNum}}</van-col>-->
+<!--                  <van-col :span="4">-->
+<!--                    <div class="icon_box">-->
+<!--                      <van-checkbox v-model="item.enforcerLeader" shape="square"></van-checkbox>-->
+<!--                    </div>-->
+<!--                  </van-col>-->
+<!--                </van-row>-->
+<!--                &lt;!&ndash;            <img src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="$router.push({name:'lawEnforcementCaseLawEnforcer'})">&ndash;&gt;-->
+<!--              </div>-->
+<!--            </van-collapse-item>-->
+<!--          </van-collapse>-->
+<!--        </div>-->
       </van-tab>
       <!--      勘察-->
       <van-tab v-show="progressLength>=3" v-if="zhenchaShow" :disabled="1 <= caseActive ? false : true">
@@ -1817,6 +1817,7 @@ export default {
       caseProgressOptions: [],
       successActive:0, // 当前节点的前一个已完成节点
       active: 1,  // 当前节点
+      openPic2:[]
     };
   },
 
diff --git a/src/views/lawEnforcement/caseAllocation/caseAdd.vue b/src/views/lawEnforcement/caseAllocation/caseAdd.vue
index 88305f36..2ed53591 100644
--- a/src/views/lawEnforcement/caseAllocation/caseAdd.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseAdd.vue
@@ -41,8 +41,6 @@
         <van-field
           readonly
           clickable
-          required
-          :rules="[{ required: true , message:'请选择关联方案'  }]"
           v-model="scheme"
           label="关联方案"
           placeholder="请选择关联方案"
@@ -181,7 +179,12 @@
               </template>
             </van-field>
             <div v-if="form.type=='1'">
-              <van-field v-model="form.name" required :rules="[{ required: true , message:'请输入当事人姓名' }]" label="当事人姓名" placeholder="请输入当事人姓名" :border="false" label-width="auto" input-align="right" />
+              <van-field v-model="form.name" @input="nameChange" @blur="showPopover = false" required :rules="[{ required: true , message:'请输入当事人姓名' }]" label="当事人姓名" placeholder="请输入当事人姓名" :border="false" label-width="auto" input-align="right" />
+
+              <div class="popover_box" v-if="showPopover">
+                <p v-for="(item,index) in personalList" @click="takePeople(item)">{{item.name}}<span>{{item.phone}}</span></p>
+              </div>
+
               <van-field v-if="form.type=='1'" v-model="form.sex" label="性别" placeholder="请输入性别" :border="false" label-width="auto" input-align="right" >
                 <template #input v-if="form.type=='1'">
                   <van-radio-group v-model="form.sex" direction="horizontal">
@@ -241,7 +244,10 @@
               <van-field v-model="form.zihao" label="字号名称" placeholder="请输入字号名称" :border="false" label-width="auto" input-align="right" />
             </div>
             <div v-if="form.type=='2'">
-              <van-field v-model="form.companyName" :rules="[{ required: true , message:'请输入企业名称' }]" label="企业名称" placeholder="请输入企业名称" :border="false" label-width="auto" input-align="right" />
+              <van-field v-model="form.companyName" @input="companyChange" @blur="showCompany = false" :rules="[{ required: true , message:'请输入企业名称' }]" label="企业名称" placeholder="请输入企业名称" :border="false" label-width="auto" input-align="right" />
+              <div class="popover_box" v-if="showCompany">
+                <p v-for="(item,index) in companyList" @click="takeCompany(item)">{{item.companyName}}</p>
+              </div>
               <van-field v-model="form.legalName" label="法人/负责人" placeholder="请输入法人/负责人" :border="false" label-width="auto" input-align="right" />
             </div>
 
@@ -299,7 +305,7 @@
 <!--      </div>-->
       <div class="submit_box">
         <p class="submitButton" @click="$refs.form.submit()">保存</p>
-        <p class="submitButton" @click="keepSubmit()">保存并提交</p>
+        <p class="submitButton" @click="keepSubmit()">提交</p>
       </div>
     </van-form>
 
@@ -307,7 +313,7 @@
 </template>
 
 <script>
-  import { addCase , addProgress , treeselect , schemeList , addSurvey , commonUpload } from "@/api/lawEnforcement/index";
+  import { addCase , addProgress , treeselect , schemeList , addSurvey , commonUpload , updateCase , personalList , companyList } from "@/api/lawEnforcement/index";
   import Cookies from "js-cookie";
   export default {
     name: "programmeDetail",
@@ -321,6 +327,8 @@
         showNation:false,
         showBirthday:false,
         showRegisterDate:false,
+        showPopover:false,
+        showCompany:false,
         form:{
           type:'1',
           sex:'1',
@@ -328,7 +336,8 @@
           caseProgress:'1',
           caseStatus:'1',
           attachement:[],
-          attachementList:[]
+          attachementList:[],
+          id:null
         },
         registerDate:new Date(),
         birthday:new Date(),
@@ -363,7 +372,9 @@
           children: "children",
         },
 
-        deptId:''
+        deptId:'',
+        personalList:[],
+        companyList:[],
       };
     },
     created() {
@@ -393,7 +404,10 @@
         for (var i = 0; i < response.data.length; i++) {
           this.nationOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
         }
-        // this.nationOptions = response.data;
+        this.nationOptions2 = response.data;
+      });
+      this.getDicts("case_node").then(response => {
+        this.caseProgressOptions = response.data;
       });
       var schemeQueryParam = {
         applyStatus: "1"
@@ -406,7 +420,7 @@
       this.getBookList()
     },
     methods: {
-      goSubmit(){
+      goSubmit(type){
         if (typeof this.form.attachement != 'string'){
           this.form.attachement = this.form.attachement.join(',');
         }
@@ -424,9 +438,11 @@
               surveyForm.caseId = response.data;
               addSurvey(surveyForm).then(response => {
                 this.$notify({ type: 'success', message: '保存成功' });
-                setTimeout(function(){
-                  history.back(-1);
-                },2000)
+                if (type != 'submit'){
+                  setTimeout(function(){
+                    history.back(-1);
+                  },2000)
+                }
               });
             });
 
@@ -491,29 +507,33 @@
         this.showBirthday = false;
       },
       keepSubmit(){
-        this.form.caseId = this.form.id;
-        this.form.caseStatus = "1";
-        this.form.caseProgress = "2"; // 勘察
-        this.form.caseProgressName = this.selectDictLabel(this.caseProgressOptions, this.form.caseProgress); // 勘察
+        this.goSubmit('submit');
+        var that = this ;
+        setTimeout(function () {
+          that.form.caseId = that.form.id;
+          that.form.caseStatus = "1";
+          that.form.caseProgress = "2"; // 勘察
+          that.form.caseProgressName = that.selectDictLabel(that.caseProgressOptions, '2'); // 勘察
 
-        if (typeof this.form.attachement != 'string'){
-          this.form.attachement = this.form.attachement.join(',');
-        }
-        var _this = this;
-        this.$dialog.confirm({
-          message: '提交后案件将进入后续流程并且不能修改,是否确认提交?',
-        }).then(function () {
-          // 更新案件的节点和状态
-          updateCase(_this.form).then(response => {
-            _this.$notify({ type: 'success', message: '提交成功' });
-            setTimeout(function(){
-              history.back(-1);
-            },2000)
+          if (typeof that.form.attachement != 'string') {
+            that.form.attachement = that.form.attachement.join(',');
+          }
+          that.$dialog.confirm({
+            message: '提交后案件将进入后续流程并且不能修改,是否确认提交?',
+          }).then(function () {
+            // 更新案件的节点和状态
+            updateCase(that.form).then(response => {
+              that.$notify({type: 'success', message: '提交成功'});
+              setTimeout(function () {
+                history.back(-1);
+              }, 2000)
+            });
           });
-        });
+        },2000)
       },
       afterReadEvidenceForm(file){
         let params1 = new FormData();
+        console.log( this.form.attachement )
         params1.append("file", file.file);
         commonUpload(params1).then((r1) => {
           // this.tEnforceSamplingGoodsList[index].attachement.push(r1.fileName);
@@ -524,6 +544,64 @@
         this.form.attachement.splice(detail.index,1);
         this.form.attachementList.splice(detail.index,1);
       },
+      nameChange(val){
+        console.log(val)
+        if (val == ""){
+          this.showPopover = false;
+        }else{
+          this.showPopover = true;
+        }
+        var query = {
+          name:val
+        }
+        personalList(query).then((r1) => {
+          console.log(r1)
+          this.personalList = r1.data;
+        })
+
+      },
+      takePeople(item){
+        this.form.bodyId = item.id;
+        this.form.name = item.name;
+        this.form.sex = item.sex == null ? '1' : item.sex;
+        this.form.cardNum = item.cardNum;
+        this.form.birthday = item.birthday;
+        this.form.nation = item.nation;
+
+        this.nation = item.nation == null ? '' : this.selectDictLabel(this.nationOptions2, item.nation);
+
+        this.form.companyPosition = item.companyPosition;
+        this.form.duties = item.duties;
+        this.form.zihao = item.zihao;
+        this.form.phone = item.phone;
+        this.form.address = item.address;
+        this.form.uniformCode = item.uniformCode;
+        this.showPopover = false;
+      },
+      companyChange(val){
+        console.log(val)
+        if (val == ""){
+          this.showCompany = false;
+        }else{
+          this.showCompany = true;
+        }
+        var query = {
+          companyName:val
+        }
+        companyList(query).then((r1) => {
+          console.log(r1)
+          this.companyList = r1.data;
+        })
+
+      },
+      takeCompany(item){
+        this.form.companyName = item.companyName;
+        this.form.legalName = item.legalName;
+        this.form.phone = item.phone;
+        this.form.address = item.address;
+        this.form.uniformCode = item.uniformCode;
+        this.showPopover = false;
+      }
     },
     watch: {
       $route (to, from ) {
@@ -552,6 +630,23 @@
   /deep/ .van-collapse-item__content{
     padding: 0;
   }
+  .popover_box{
+    position: absolute;
+    z-index: 9;
+    background: #fff;
+    box-shadow: 0PX 0PX 5PX #ccc;
+    padding: 5PX 10PX;
+    right: 16PX;
+    line-height: 30PX;
+    border-radius: 5px;
+    max-height: 160PX;
+    overflow-y: scroll;
+    width: calc(100% - 32PX);
+    p{
+      display: flex;
+      justify-content: space-between;
+    }
+  }
   .cf{
     padding: 0 3%;
     margin-top: 20PX;
diff --git a/src/views/lawEnforcement/caseAllocation/caseDetail.vue b/src/views/lawEnforcement/caseAllocation/caseDetail.vue
index 15b05e97..b79c072b 100644
--- a/src/views/lawEnforcement/caseAllocation/caseDetail.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseDetail.vue
@@ -208,7 +208,12 @@
         });
         getSurveyByCaseId(this.$route.query.id).then((response) => {
           if(response.data != undefined){
-            this.tEnforceCaseHandlerList = response.data.tEnforceCaseHandlerList;
+            if (response.data.tEnforceCaseHandlerList){
+              response.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
+                responseEnforce.enforcerLeader = responseEnforce.enforcerLeader=='Y'? true:false;
+                this.tEnforceCaseHandlerList.push(responseEnforce);
+              });
+            }
           }
         });
       },
diff --git a/src/views/lawEnforcement/caseAllocation/caseEdit.vue b/src/views/lawEnforcement/caseAllocation/caseEdit.vue
index 04242db0..b61e3159 100644
--- a/src/views/lawEnforcement/caseAllocation/caseEdit.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseEdit.vue
@@ -41,8 +41,6 @@
         <van-field
           readonly
           clickable
-          required
-          :rules="[{ required: true , message:'请选择关联方案'  }]"
           v-model="scheme"
           label="关联方案"
           placeholder="请选择关联方案"
@@ -60,7 +58,7 @@
             @cancel="showScheme = false"
           />
         </van-popup>
-  <!--      <van-field v-model="form.schemeId" label="关联方案" placeholder="请输入关联方案" :border="false" label-width="auto" input-align="right" />-->
+  <!-- <van-field v-model="form.schemeId" label="关联方案" placeholder="请输入关联方案" :border="false" label-width="auto" input-align="right" />-->
 
         <van-field
           readonly
@@ -298,7 +296,7 @@
 <!--      </div>-->
       <div class="submit_box">
         <p class="submitButton" @click="$refs.form.submit()">保存</p>
-        <p class="submitButton" @click="keepSubmit()">保存并提交</p>
+        <p class="submitButton" @click="keepSubmit()">提交</p>
       </div>
     </van-form>
 
@@ -405,6 +403,10 @@
         }
       });
       this.getBookList()
+      var that = this;
+      setTimeout(function () {
+        that.getDetail();
+      },2000)
     },
     methods: {
       goSubmit(){
@@ -450,9 +452,7 @@
           // 更新案件的节点和状态
           updateCase(_this.form).then(response => {
             _this.$notify({ type: 'success', message: '提交成功' });
-            setTimeout(function(){
-              history.back(-1);
-            },2000)
+            _this.goSubmit();
           });
         });
       },
@@ -460,7 +460,6 @@
         treeselect().then((response) => {
           if (response.code == 200) {
             this.deptOptions = response.data;
-            this.getDetail();
           }
         })
       },
@@ -518,7 +517,9 @@
           this.caseSource = response.data.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions2, response.data.caseSource);
           this.belongTeam = response.data.belongTeam == '' ? '' : this.selectDictLabel(this.belongTeamOptions2, response.data.belongTeam);
           this.nation = response.data.nation == '' ? '' : this.selectDictLabel(this.nationOptions2, response.data.nation);
-          this.scheme = response.data.schemeId == '' ? '' : this.schemeOptions.filter(function (e) { return e.value == response.data.schemeId; })[0].text;
+          console.log(response.data.schemeId)
+          console.log(this.schemeOptions)
+          this.scheme = response.data.schemeId == null ? '' : this.schemeOptions.filter(function (e) { return e.value == response.data.schemeId; })[0].text;
           this.enforceCategory = response.data.enforceCategory;
           if (response.data.attachement){
             response.data.attachementList = [];
diff --git a/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue b/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue
index 078e9054..7b896e86 100644
--- a/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue
@@ -61,7 +61,7 @@
 </template>
 
 <script>
-  import { listEnforcer , getCase , updateSurvey , getSurveyByCaseId } from "@/api/lawEnforcement/index";
+  import { listEnforcer , getCase , updateSurvey , addSurvey , getSurveyByCaseId } from "@/api/lawEnforcement/index";
   import Cookies from "js-cookie";
   export default {
     name: "programmeDetail",
@@ -130,12 +130,36 @@
         var that = this ;
         this.surveyForm.caseId = this.form.id;
         getSurveyByCaseId(this.surveyForm.caseId).then(responseSurvey => {
-          console.log(responseSurvey.data.tEnforceCaseHandlerList)
-          this.surveyForm.id = responseSurvey.data.id;
-          this.result.map(res=>{
-            console.log(res)
-            let array1 = responseSurvey.data.tEnforceCaseHandlerList.filter(function (e) { return e.id == res.id; });
-            if ( array1.length < 1 ){
+
+          if (responseSurvey.data !=undefined){
+            this.surveyForm.id = responseSurvey.data.id;
+            this.result.map(res=>{
+              console.log(res)
+              let array1 = responseSurvey.data.tEnforceCaseHandlerList.filter(function (e) { return e.id == res.id; });
+              if ( array1.length < 1 ){
+                let obj = {};
+                obj.relationType = "2";
+                obj.enforcerId = res.id;   // 执法人员ID  -- 执法人员选择页面带回值
+                obj.enforcerName = res.name;  // 执法人员姓名 -- 执法人员选择页面带回值
+                obj.enforcerNum = res.enforceNum;  // 执法证号  -- 执法人员选择页面带回值
+                obj.enforcerLeader = "";   // 是否带队  --勾选赋值
+                if (this.radio == res.id){
+                  obj.enforcerLeader = "Y"
+                }
+                that.surveyForm.tEnforceCaseHandlerList.push(obj)
+              }
+            })
+            setTimeout(function () {
+              updateSurvey(that.surveyForm).then(response => {
+                that.$notify({ type: 'success', message: '保存成功' });
+                setTimeout(function(){
+                  history.back(-1);
+                },2000)
+              });
+            },2000)
+          }else{
+            this.result.map(res=>{
+              that.surveyForm.tEnforceCaseHandlerList = [];
               let obj = {};
               obj.relationType = "2";
               obj.enforcerId = res.id;   // 执法人员ID  -- 执法人员选择页面带回值
@@ -146,16 +170,16 @@
                 obj.enforcerLeader = "Y"
               }
               that.surveyForm.tEnforceCaseHandlerList.push(obj)
-            }
-          })
-          setTimeout(function () {
-            updateSurvey(that.surveyForm).then(response => {
-              that.$notify({ type: 'success', message: '保存成功' });
-              setTimeout(function(){
-                history.back(-1);
-              },2000)
-            });
-          },2000)
+            })
+            setTimeout(function () {
+              addSurvey(that.surveyForm).then(response => {
+                that.$notify({ type: 'success', message: '保存成功' });
+                setTimeout(function(){
+                  history.back(-1);
+                },2000)
+              });
+            },2000)
+          }
 
         });
       },
diff --git a/src/views/lawEnforcement/caseAllocation/caseListNew.vue b/src/views/lawEnforcement/caseAllocation/caseListNew.vue
index e5f60d28..88311f39 100644
--- a/src/views/lawEnforcement/caseAllocation/caseListNew.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseListNew.vue
@@ -43,7 +43,7 @@
               <van-button v-if="item.caseProgress == 1" color="#FFA63E" square text="提交" type="info" @click="submitCase(item)" class="delete-button" />
             </van-col>
             <van-col>
-              <van-button v-if="item.caseProgress != 1" color="#1CB8B1" square type="info" :to="{name:'lawEnforcementCaseEnforceList', query: {id:item.id,belongTeam:item.belongTeam}}" class="delete-button" >添加<br/>执法<br/>员</van-button>
+              <van-button v-if="item.caseProgress == 2" color="#1CB8B1" square type="info" :to="{name:'lawEnforcementCaseEnforceList', query: {id:item.id,belongTeam:item.belongTeam}}" class="delete-button" >添加<br/>执法<br/>员</van-button>
             </van-col>
           </van-row>
         </template>
diff --git a/src/views/lawEnforcement/supervise/enterprise.vue b/src/views/lawEnforcement/supervise/enterprise.vue
index afe5f2fd..ef27cfef 100644
--- a/src/views/lawEnforcement/supervise/enterprise.vue
+++ b/src/views/lawEnforcement/supervise/enterprise.vue
@@ -79,6 +79,17 @@
     },
     methods: {
       getList(){
+        if (this.searchInput != ''){
+          if (this.searchInput == this.queryParams.companyName){
+            return;
+          }
+          this.list = [];
+          this.loading = false;
+          this.finished = false;
+          this.queryParams.companyName = this.searchInput;
+          this.queryParams.pageNum = 1 ;
+        }
+
         var _this = this;
         listCompany(_this.queryParams).then(response => {
           response.rows.map(res=>{
@@ -96,17 +107,7 @@
         });
       },
       goSearch(){
-        if (this.searchInput == ''){
-          location.reload()
-        }
-        if (this.searchInput == this.queryParams.companyName){
-          return;
-        }
-        this.list = [];
-        this.loading = false;
-        this.finished = false;
-        this.queryParams.companyName = this.searchInput;
-        this.queryParams.pageNum = 1 ;
+
         this.getList();
       },
     },
diff --git a/src/views/lawEnforcement/supervise/individual.vue b/src/views/lawEnforcement/supervise/individual.vue
index 40dbc2c3..bebc7c3a 100644
--- a/src/views/lawEnforcement/supervise/individual.vue
+++ b/src/views/lawEnforcement/supervise/individual.vue
@@ -8,7 +8,7 @@
       <div class="search_box">
         <div class="search">
           <input type="text" v-model="searchInput" placeholder="请输入商户姓名" />
-          <img src="../../../../static/images/lawEnforcement/new/index_icon_04.png" @click="goSearch">
+          <img src="../../../../static/images/lawEnforcement/new/index_icon_04.png" @click="getList">
         </div>
       </div>
 
@@ -74,6 +74,16 @@
     },
     methods: {
       getList(){
+        if (this.searchInput != ''){
+          if (this.searchInput == this.queryParams.name){
+            return;
+          }
+          this.list = [];
+          this.loading = false;
+          this.finished = false;
+          this.queryParams.name = this.searchInput;
+          this.queryParams.pageNum = 1 ;
+        }
         listPersonal(this.queryParams).then(response => {
           response.rows.map(res=>{
             this.list.push(res);
@@ -92,12 +102,15 @@
         if (this.searchInput == ''){
           location.reload()
         }
+        if (this.searchInput == this.queryParams.name){
+          return;
+        }
         this.list = [];
         this.loading = false;
         this.finished = false;
         this.queryParams.name = this.searchInput;
         this.queryParams.pageNum = 1 ;
-        this.getList();
+        // this.getList();
       },
     },
   }
diff --git a/src/views/lawEnforcement/task/taskDetail.vue b/src/views/lawEnforcement/task/taskDetail.vue
index 60daf9db..c65edfcb 100644
--- a/src/views/lawEnforcement/task/taskDetail.vue
+++ b/src/views/lawEnforcement/task/taskDetail.vue
@@ -192,7 +192,12 @@
         });
         getSurveyByCaseId(this.$route.query.id).then((response) => {
           if(response.data != undefined){
-            this.tEnforceCaseHandlerList = response.data.tEnforceCaseHandlerList;
+            if (response.data.tEnforceCaseHandlerList){
+              response.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
+                responseEnforce.enforcerLeader = responseEnforce.enforcerLeader=='Y'? true:false;
+                this.tEnforceCaseHandlerList.push(responseEnforce);
+              });
+            }
           }
         });
       },
diff --git a/src/views/lawEnforcement/task/taskHandle.vue b/src/views/lawEnforcement/task/taskHandle.vue
index 32c5794f..adfd166a 100644
--- a/src/views/lawEnforcement/task/taskHandle.vue
+++ b/src/views/lawEnforcement/task/taskHandle.vue
@@ -167,11 +167,11 @@
                   <van-col :span="4">
                     <div class="icon_box">
                       <van-checkbox v-model="item.enforcerLeader" shape="square"></van-checkbox>
-                      <van-icon v-if="caseActive == 1" name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'CaseHand')"></van-icon>
+                      <van-icon v-if="caseActive == 1 && (surveyForm.instanceId!='' && surveyForm.instanceId!=null && surveyForm.instanceId!=undefined)" name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'CaseHand')"></van-icon>
                     </div>
                   </van-col>
                 </van-row>
-                <img v-if="caseActive == 1" src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'CaseHand',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
+                <img v-if="caseActive == 1 && (surveyForm.instanceId!='' && surveyForm.instanceId!=null && surveyForm.instanceId!=undefined)" src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'CaseHand',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
               </div>
             </van-collapse-item>
           </van-collapse>
@@ -372,40 +372,41 @@
           </div>
         </van-form>
 
-        <p class="splcTit">审批流程</p>
-        <div class="main_box2">
-          <van-row v-for="(item,index) in historyList" :key="index">
-            <van-col :span="4">
-              <p class="index">{{index+1}}</p>
-              <div class="indexBorder" :class="{'indexCenter':index==0 ? false : true}">
-                <p class="ssT" v-if="index>0"></p>
-                <p class="yq"></p>
-                <p class="ss" v-if="historyList.length != index+1"></p>
-              </div>
-            </van-col>
-            <van-col :span="20">
-              <van-cell :title="item.activityName" center :border="false">
-                <template #default>
-                  <p style="color: #666666;">{{ item.assigneeName }}</p>
-                </template>
-              </van-cell>
-
-              <van-cell center :border="false">
-                <template #title>
-                  <p style="color: #999999;">{{ item.endTime }}</p>
-                </template>
-                <template #default>
-                  <p style="color: #999999;">{{ item.durationInMillis }}</p>
-                </template>
-              </van-cell>
-
-              <p class="bq">审批意见：{{ item.comment }}</p>
-            </van-col>
-          </van-row>
-        </div>
-
+        <template v-if="historyList">
+          <p class="splcTit">审批流程</p>
+          <div class="main_box2">
+            <van-row v-for="(item,index) in historyList" :key="index">
+              <van-col :span="4">
+                <p class="index">{{index+1}}</p>
+                <div class="indexBorder" :class="{'indexCenter':index==0 ? false : true}">
+                  <p class="ssT" v-if="index>0"></p>
+                  <p class="yq"></p>
+                  <p class="ss" v-if="historyList.length != index+1"></p>
+                </div>
+              </van-col>
+              <van-col :span="20">
+                <van-cell :title="item.activityName" center :border="false">
+                  <template #default>
+                    <p style="color: #666666;">{{ item.assigneeName }}</p>
+                  </template>
+                </van-cell>
+
+                <van-cell center :border="false">
+                  <template #title>
+                    <p style="color: #999999;">{{ item.endTime }}</p>
+                  </template>
+                  <template #default>
+                    <p style="color: #999999;">{{ item.durationInMillis }}</p>
+                  </template>
+                </van-cell>
+
+                <p class="bq">审批意见：{{ item.comment }}</p>
+              </van-col>
+            </van-row>
+          </div>
+        </template>
         <div class="submit_box" v-if="caseProgress == 1 && ( surveyForm.instanceId=='' || surveyForm.instanceId==null || surveyForm.instanceId==undefined )">
-          <p class="submitButton" @click="preservation">保存</p>
+          <p class="submitButton" @click="preservation('submit')">保存</p>
           <p class="submitButton" @click="submit">提交</p>
         </div>
       </van-tab>
@@ -455,12 +456,12 @@
                   <van-col :span="4">
                     <div class="icon_box">
                       <van-checkbox v-model="item.enforcerLeader" shape="square"></van-checkbox>
-                      <van-icon v-if="caseActive == 2" name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'PutRecord')"></van-icon>
+                      <van-icon v-if="caseActive == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )" name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'PutRecord')"></van-icon>
                     </div>
                   </van-col>
                 </van-row>
 <!--                @click="$router.push({name:'lawEnforcementCaseLawEnforcer'})" v-if="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )"-->
-                <img v-if="caseActive == 2" src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'PutRecord',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
+                <img v-if="caseActive == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )" src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'PutRecord',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
               </div>
             </van-collapse-item>
           </van-collapse>
@@ -679,40 +680,41 @@
           </div>
 
         </van-form>
-
-        <p class="splcTit">审批流程</p>
-        <div class="main_box2">
-          <van-row v-for="(item,index) in putRecordHistoryList" :key="index">
-            <van-col :span="4">
-              <p class="index">{{index+1}}</p>
-              <div class="indexBorder" :class="{'indexCenter':index==0 ? false : true}">
-                <p class="ssT" v-if="index>0"></p>
-                <p class="yq"></p>
-                <p class="ss" v-if="putRecordHistoryList.length != index+1"></p>
-              </div>
-            </van-col>
-            <van-col :span="20">
-              <van-cell :title="item.activityName" center :border="false">
-                <template #default>
-                  <p style="color: #666666;">{{ item.assigneeName }}</p>
-                </template>
-              </van-cell>
-
-              <van-cell center :border="false">
-                <template #title>
-                  <p style="color: #999999;">{{ item.endTime }}</p>
-                </template>
-                <template #default>
-                  <p style="color: #999999;">{{ item.durationInMillis }}</p>
-                </template>
-              </van-cell>
-
-              <p class="bq">审批意见：{{ item.comment }}</p>
-            </van-col>
-          </van-row>
-        </div>
+        <template v-if="putRecordHistoryList">
+          <p class="splcTit">审批流程</p>
+          <div class="main_box2">
+            <van-row v-for="(item,index) in putRecordHistoryList" :key="index">
+              <van-col :span="4">
+                <p class="index">{{index+1}}</p>
+                <div class="indexBorder" :class="{'indexCenter':index==0 ? false : true}">
+                  <p class="ssT" v-if="index>0"></p>
+                  <p class="yq"></p>
+                  <p class="ss" v-if="putRecordHistoryList.length != index+1"></p>
+                </div>
+              </van-col>
+              <van-col :span="20">
+                <van-cell :title="item.activityName" center :border="false">
+                  <template #default>
+                    <p style="color: #666666;">{{ item.assigneeName }}</p>
+                  </template>
+                </van-cell>
+
+                <van-cell center :border="false">
+                  <template #title>
+                    <p style="color: #999999;">{{ item.endTime }}</p>
+                  </template>
+                  <template #default>
+                    <p style="color: #999999;">{{ item.durationInMillis }}</p>
+                  </template>
+                </van-cell>
+
+                <p class="bq">审批意见：{{ item.comment }}</p>
+              </van-col>
+            </van-row>
+          </div>
+        </template>
         <div class="submit_box" v-if="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )">
-          <p class="submitButton" @click="submitPutRecordForm">保存</p>
+          <p class="submitButton" @click="submitPutRecordForm('submit')">保存</p>
           <p class="submitButton" @click="submitDefine">提交</p>
         </div>
       </van-tab>
@@ -762,12 +764,12 @@
                   <van-col :span="4">
                     <div class="icon_box">
                       <van-checkbox v-model="item.enforcerLeader" shape="square"></van-checkbox>
-                      <van-icon v-if="caseActive == 3" name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'evidence')"></van-icon>
+                      <van-icon v-if="caseActive == 3 && ( evidenceForm.instanceId=='' || evidenceForm.instanceId==null || evidenceForm.instanceId==undefined )" name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'evidence')"></van-icon>
                     </div>
                   </van-col>
                 </van-row>
                 <!--                @click="$router.push({name:'lawEnforcementCaseLawEnforcer'})" v-if="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )"-->
-                <img v-if="caseActive == 3" src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'evidence',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
+                <img v-if="caseActive == 3 && ( evidenceForm.instanceId=='' || evidenceForm.instanceId==null || evidenceForm.instanceId==undefined )" src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'evidence',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
               </div>
             </van-collapse-item>
           </van-collapse>
@@ -850,41 +852,45 @@
             <van-empty v-if="evidenceForm.attachement == null && caseProgress == 3 && evidenceForm.instanceId!='' && evidenceForm.instanceId!=null && evidenceForm.instanceId!=undefined" description="暂无文件" />
           </div>
         </van-form>
-        <p class="splcTit">审批流程</p>
-        <div class="main_box2">
-          <van-row v-for="(item,index) in evidencHistoryList" :key="index">
-            <van-col :span="4">
-              <p class="index">{{index+1}}</p>
-              <div class="indexBorder" :class="{'indexCenter':index==0 ? false : true}">
-                <p class="ssT" v-if="index>0"></p>
-                <p class="yq"></p>
-                <p class="ss" v-if="evidencHistoryList.length != index+1"></p>
-              </div>
-            </van-col>
-            <van-col :span="20">
-              <van-cell :title="item.activityName" center :border="false">
-                <template #default>
-                  <p style="color: #666666;">{{ item.assigneeName }}</p>
-                </template>
-              </van-cell>
 
-              <van-cell center :border="false">
-                <template #title>
-                  <p style="color: #999999;">{{ item.endTime }}</p>
-                </template>
-                <template #default>
-                  <p style="color: #999999;">{{ item.durationInMillis }}</p>
-                </template>
-              </van-cell>
-
-              <p class="bq">审批意见：{{ item.comment }}</p>
-            </van-col>
-          </van-row>
-        </div>
+        <template v-if="evidencHistoryList">
+          <p class="splcTit">审批流程</p>
+          <div class="main_box2">
+            <van-row v-for="(item,index) in evidencHistoryList" :key="index">
+              <van-col :span="4">
+                <p class="index">{{index+1}}</p>
+                <div class="indexBorder" :class="{'indexCenter':index==0 ? false : true}">
+                  <p class="ssT" v-if="index>0"></p>
+                  <p class="yq"></p>
+                  <p class="ss" v-if="evidencHistoryList.length != index+1"></p>
+                </div>
+              </van-col>
+              <van-col :span="20">
+                <van-cell :title="item.activityName" center :border="false">
+                  <template #default>
+                    <p style="color: #666666;">{{ item.assigneeName }}</p>
+                  </template>
+                </van-cell>
+
+                <van-cell center :border="false">
+                  <template #title>
+                    <p style="color: #999999;">{{ item.endTime }}</p>
+                  </template>
+                  <template #default>
+                    <p style="color: #999999;">{{ item.durationInMillis }}</p>
+                  </template>
+                </van-cell>
+
+                <p class="bq">审批意见：{{ item.comment }}</p>
+              </van-col>
+            </van-row>
+          </div>
+        </template>
         <div class="submit_box" v-if="caseProgress == 3 && ( evidenceForm.instanceId=='' || evidenceForm.instanceId==null || evidenceForm.instanceId==undefined )">
-          <p class="submitButton" @click="submitEvidenceForm">保存</p>
+          <p class="submitButton" @click="submitEvidenceForm('submit')">保存</p>
           <p class="submitButton" @click="submitDefineEvidenceForm">提交</p>
         </div>
+
       </van-tab>
       <template>
 <!--      &lt;!&ndash;      处理&ndash;&gt;-->
@@ -2375,7 +2381,7 @@ export default {
             _this.putRecordForm.caseName = this.form.caseName;
             _this.putRecordForm.schemeId = this.form.schemeId;
             // 查询审批历史记录
-            _this.getHistoryList(this.evidenceForm,'putRecord');
+            _this.getHistoryList(this.putRecordForm,'putRecord');
           });
         });
       }
@@ -2821,6 +2827,9 @@ export default {
 
     /** 查询审批历史展示步骤条 */
     getHistoryList(formData,type) {
+
+      console.log(formData)
+      console.log(type)
       if (formData.instanceId != null && formData.instanceId != "") {
         var queryParams = {
           processInstanceId: formData.instanceId
@@ -3076,7 +3085,7 @@ export default {
       return days + "天" + hours + "时" + minutes + "分" + seconds + '秒';
     },
 
-    preservation(){
+    preservation(type){
       this.tEnforceCaseHandlerList.map(res=>{
         res.relationType = '2';
         console.log(res.enforcerLeader)
@@ -3086,26 +3095,30 @@ export default {
       this.surveyForm.attachement = this.openPic2.join(',');
       if (this.surveyForm.id != null) {
         updateSurvey(this.surveyForm).then(response => {
-          this.$notify({ type: 'success', message: '修改成功' });
-          history.back(-1);
+          if (type == 'submit'){
+            this.$notify({ type: 'success', message: '修改成功' });
+            history.back(-1);
+          }
         });
       } else {
         addSurvey(this.surveyForm).then(response => {
-          this.$notify({ type: 'success', message: '新增成功' });
           this.surveyForm.id = response.data;
-          history.back(-1);
+          if (type == 'submit'){
+            this.$notify({ type: 'success', message: '新增成功' });
+            history.back(-1);
+          }
         });
       }
     },
 
     submit(){
-      if (this.surveyForm.id == null) {
-        this.$notify({ type: 'danger', message: '请先保存数据之后再确定提交申请' });
-      } else {
-        if (this.surveyForm.isApprove == "Y") { // 是否审批选择是,走工作流审批
-          var id = this.surveyForm.id;
-          const requestMapping = this.requestMapping;
-          this.$dialog.confirm({
+      this.preservation();
+      var that = this;
+      setTimeout(function() {
+        if (that.surveyForm.isApprove == "Y") { // 是否审批选择是,走工作流审批
+          var id = that.surveyForm.id;
+          const requestMapping = that.requestMapping;
+          that.$dialog.confirm({
             message: '提交后案件将进入后续流程并且不能修改,是否确认提交?',
           }).then(function () {
             return request({
@@ -3113,11 +3126,12 @@ export default {
               method: 'post',
             });
           }).then(() => {
-            this.preservation();
+            that.$notify({ type: 'success', message: '提交成功' });
+            history.back(-1);
           })
         } else {
           // 不审批直接更新进度到备案
-          var caseId = this.surveyForm.caseId;
+          var caseId = that.surveyForm.caseId;
           var caseStatus = "1";
           var caseProgress = "8"; // 备案
           var caseParam = {
@@ -3125,7 +3139,7 @@ export default {
             caseId: caseId,
             caseStatus: caseStatus,
             caseProgress: caseProgress,
-            caseProgressName: this.selectDictLabel(this.caseProgressOptions, caseProgress)
+            caseProgressName: that.selectDictLabel(that.caseProgressOptions, caseProgress)
           };
 
           var progressParam = {
@@ -3133,17 +3147,16 @@ export default {
             caseId: caseId,
             caseStatus: caseStatus,
             caseProgress: "2", // 勘察
-            caseProgressName: this.selectDictLabel(this.caseProgressOptions, "2")
+            caseProgressName: that.selectDictLabel(that.caseProgressOptions, "2")
           };
 
-          var _this = this;
           this.$dialog.confirm({
             message: '提交后案件将进入后续流程并且不能修改,是否确认提交?',
           }).then(function () {
             let recordType = "";
-            if (_this.surveyForm.surveyResult == "1") { // 审批程序设置 1:不予立案  2:无违法行为
+            if (that.surveyForm.surveyResult == "1") { // 审批程序设置 1:不予立案  2:无违法行为
               recordType = "5";  // 两个表值不一致做对应匹配
-            } else if (_this.surveyForm.surveyResult == "2") {
+            } else if (that.surveyForm.surveyResult == "2") {
               recordType = "2";
             }
             var onrecordParam = {
@@ -3154,19 +3167,18 @@ export default {
               // 更新案件的节点和状态
               updateCase(caseParam).then(response => {
                 addProgress(progressParam).then(response => {
-                  this.preservation();
+                  that.$notify({ type: 'success', message: '提交成功' });
+                  history.back(-1);
                 });
               });
             });
           });
-
         }
-      }
-
+      },2000)
     },
 
     /** 案件立案提交按钮 */
-    submitPutRecordForm() {
+    submitPutRecordForm(type) {
       this.tEnforcePutRecordHandlerList.map(res=>{
         res.relationType = '3';
         res.enforcerLeader = res.enforcerLeader == true ? 'Y' : 'N' ;
@@ -3197,18 +3209,21 @@ export default {
             if (this.samplingForm.id != null) {
               updateSampling(this.samplingForm).then(responseSampling => {
                 if (responseSampling.code == "200") {
-                  this.$notify({ type: 'success', message: '修改成功' });
-
-                  history.back(-1);
+                  if (type == 'submit'){
+                    this.$notify({ type: 'success', message: '修改成功' });
+                    history.back(-1);
+                  }
                 }
               });
             } else {
               addSampling(this.samplingForm).then(responseSampling => {
                 if (responseSampling.code == "200") {
-                  this.$notify({ type: 'success', message: '新增成功' });
                   _this.samplingForm.id = responseSampling.data;
 
-                  history.back(-1);
+                  if (type == 'submit'){
+                    this.$notify({ type: 'success', message: '保存成功' });
+                    history.back(-1);
+                  }
                 }
               });
             }
@@ -3220,11 +3235,13 @@ export default {
           if (responsePutrecord.code == "200") {
             addSampling(this.samplingForm).then(responseSampling => {
               if (responseSampling.code == "200") {
-                this.$notify({ type: 'success', message: '新增成功' });
                 _this.putRecordForm.id = responsePutrecord.data;
                 _this.samplingForm.id = responseSampling.data;
 
-                history.back(-1);
+                if (type == 'submit'){
+                  this.$notify({ type: 'success', message: '保存成功' });
+                  history.back(-1);
+                }
               }
             });
             _this.putRecordDiglogStatus = false;
@@ -3235,12 +3252,12 @@ export default {
 
     /** 弹窗确定按钮操作 */
     submitDefine(){
-      if (this.putRecordForm.id == null) {
-        this.$notify({ type: 'success', message: '请先保存数据之后再确定提交申请' });
-      } else {
-        var id = this.putRecordForm.id;
+      this.submitPutRecordForm();
+      var that = this;
+      setTimeout(function() {
+        var id = that.putRecordForm.id;
         const requestMapping = this.requestMapping;
-        this.$dialog.confirm({
+        that.$dialog.confirm({
           message: '提交后案件将进入后续流程并且不能修改,是否确认提交?',
         }).then(function () {
           return request({
@@ -3248,13 +3265,14 @@ export default {
             method: 'post',
           });
         }).then(() => {
-          this.submitPutRecordForm();
+          that.$notify({ type: 'success', message: '提交成功' });
+          history.back(-1);
         })
-      }
+      },2000)
     },
 
     /** 案件取证提交按钮 */
-    submitEvidenceForm() {
+    submitEvidenceForm(type) {
       this.surveyDiglogStatus = false;
       this.tEnforceEvidenceHandlerList.map(res=>{
         res.relationType = '4';
@@ -3271,34 +3289,37 @@ export default {
             res.attachement = res.attachement.join(',');
           }
         })
+
       if (this.evidenceForm.id != null) {
         this.surveyDiglogStatus = true;
         updateEvidence(this.evidenceForm).then(response => {
-          this.$notify({ type: 'success', message: '提交成功' });
           this.surveyDiglogStatus = false;
-
-          history.back(-1);
+          if (type == 'submit'){
+            this.$notify({ type: 'success', message: '保存成功' });
+            history.back(-1);
+          }
         });
       } else {
         this.surveyDiglogStatus = true;
         addEvidence(this.evidenceForm).then(response => {
-          this.$notify({ type: 'success', message: '提交成功' });
           this.evidenceForm.id = response.data;
           this.surveyDiglogStatus = false;
-
-          history.back(-1);
+          if (type == 'submit'){
+            this.$notify({ type: 'success', message: '保存成功' });
+            history.back(-1);
+          }
         });
       }
     },
 
     /** 弹窗确定按钮操作 */
     submitDefineEvidenceForm() {
-      if (this.evidenceForm.id == null) {
-        this.$notify({ type: 'success', message: '请先保存数据之后再确定提交申请' });
-      } else {
-        var id = this.evidenceForm.id;
-        const requestMapping = this.requestMapping;
-        this.$dialog.confirm({
+      this.submitEvidenceForm();
+      var that = this;
+      setTimeout(function(){
+        var id = that.evidenceForm.id;
+        const requestMapping = that.requestMapping;
+        that.$dialog.confirm({
           message: '提交后案件将进入后续流程并且不能修改,是否确认提交?',
         }).then(function () {
           return request({
@@ -3306,9 +3327,10 @@ export default {
             method: 'post',
           });
         }).then(() => {
-          this.submitEvidenceForm();
+          that.$notify({ type: 'success', message: '提交成功' });
+          history.back(-1);
         })
-      }
+      },2000)
     },
 
     afterRead(file) {
diff --git a/src/views/lawEnforcement/task/taskRecord.vue b/src/views/lawEnforcement/task/taskRecord.vue
index 599b86be..e37dde0a 100644
--- a/src/views/lawEnforcement/task/taskRecord.vue
+++ b/src/views/lawEnforcement/task/taskRecord.vue
@@ -56,7 +56,7 @@
         let queryParams = {
           caseId:this.$route.query.id,
           relationType:this.$route.query.relationType,
-          clockin_user:this.$route.query.clockin_user
+          clockinUser:this.$route.query.clockin_user
         }
         clockinList(queryParams).then((response) => {
           this.clockinList = response.rows;
diff --git a/src/views/lawEnforcement/trace/feed.vue b/src/views/lawEnforcement/trace/feed.vue
index 67d4bebc..d55f19a8 100644
--- a/src/views/lawEnforcement/trace/feed.vue
+++ b/src/views/lawEnforcement/trace/feed.vue
@@ -15,7 +15,10 @@
         <van-field v-model="queryParams.productName" :border="false" label="产品通用名称" placeholder="请输入产品通用名称" input-align="right" />
       </div>
 
-      <p class="submitButton" @click="getList('search')">立即查询</p>
+      <div class="submitButton">
+        <p @click="getList('search')">立即查询</p>
+        <p @click="clearSearch">重置</p>
+      </div>
 
       <div class="scroll_box">
         <van-list
@@ -100,6 +103,9 @@
           }
         });
       },
+      clearSearch(){
+        location.reload()
+      }
     },
   }
 </script>
@@ -201,14 +207,18 @@
     }
   }
   .submitButton{
-    width: 70%;
-    margin: 25PX auto;
-    background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
-    text-align: center;
-    color: #ffffff;
-    height: 70px;
-    line-height: 70px;
-    border-radius: 8PX;
+    margin: 50px auto;
+    display: flex;
+    justify-content: space-around;
+    p{
+      width: 40%;
+      background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
+      text-align: center;
+      color: #ffffff;
+      height: 70px;
+      line-height: 70px;
+      border-radius: 8PX;
+    }
   }
 
   .addFamily{
diff --git a/src/views/lawEnforcement/trace/fertilizer.vue b/src/views/lawEnforcement/trace/fertilizer.vue
index 1a7769ac..f7a35247 100644
--- a/src/views/lawEnforcement/trace/fertilizer.vue
+++ b/src/views/lawEnforcement/trace/fertilizer.vue
@@ -15,7 +15,10 @@
         <van-field v-model="queryParams.productGoodsName" :border="false" label="产品商品名称" placeholder="请输入产品商品名称" input-align="right" />
       </div>
 
-      <p class="submitButton" @click="getList('search')">立即查询</p>
+      <div class="submitButton">
+        <p @click="getList('search')">立即查询</p>
+        <p @click="clearSearch">重置</p>
+      </div>
 
       <div class="scroll_box">
         <van-list
@@ -106,6 +109,9 @@
           }
         });
       },
+      clearSearch(){
+        location.reload()
+      }
     },
   }
 </script>
@@ -294,14 +300,18 @@
     }
   }
   .submitButton{
-    width: 70%;
-    margin: 25PX auto;
-    background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
-    text-align: center;
-    color: #ffffff;
-    height: 70px;
-    line-height: 70px;
-    border-radius: 8PX;
+    margin: 50px auto;
+    display: flex;
+    justify-content: space-around;
+    p{
+      width: 40%;
+      background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
+      text-align: center;
+      color: #ffffff;
+      height: 70px;
+      line-height: 70px;
+      border-radius: 8PX;
+    }
   }
 
   .addFamily{
diff --git a/src/views/lawEnforcement/trace/pesticides.vue b/src/views/lawEnforcement/trace/pesticides.vue
index 9ff27c7d..399b0918 100644
--- a/src/views/lawEnforcement/trace/pesticides.vue
+++ b/src/views/lawEnforcement/trace/pesticides.vue
@@ -54,7 +54,11 @@
         />
       </div>
 
-      <p class="submitButton" @click="getList('search')">立即查询</p>
+      <div class="submitButton">
+        <p @click="getList('search')">立即查询</p>
+        <p @click="clearSearch">重置</p>
+      </div>
+
       <div class="scroll_box">
         <van-list
           v-model="loading"
@@ -171,6 +175,9 @@
         this.queryParams.agent = data.value;
         this.showAgent = false;
       },
+      clearSearch(){
+        location.reload()
+      }
     },
   }
 </script>
@@ -360,14 +367,18 @@
     }
   }
   .submitButton{
-    width: 70%;
     margin: 50px auto;
-    background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
-    text-align: center;
-    color: #ffffff;
-    height: 70px;
-    line-height: 70px;
-    border-radius: 8PX;
+    display: flex;
+    justify-content: space-around;
+    p{
+      width: 40%;
+      background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
+      text-align: center;
+      color: #ffffff;
+      height: 70px;
+      line-height: 70px;
+      border-radius: 8PX;
+    }
   }
   .scroll_box{
     height: calc(100vh - 100px - 200PX - 100PX);
diff --git a/src/views/lawEnforcement/trace/product.vue b/src/views/lawEnforcement/trace/product.vue
index ca32e76d..eb69286b 100644
--- a/src/views/lawEnforcement/trace/product.vue
+++ b/src/views/lawEnforcement/trace/product.vue
@@ -9,13 +9,16 @@
     <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.productGoodsName" :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" />
       </div>
 
-      <p class="submitButton" @click="getList('search')">立即查询</p>
+      <div class="submitButton">
+        <p @click="getList('search')">立即查询</p>
+        <p @click="clearSearch">重置</p>
+      </div>
 
       <div class="scroll_box">
         <van-list
@@ -105,11 +108,8 @@
           }
         });
       },
-      goSubmit(){
-        this.list = [];
-        this.queryParams.pageNum = 1 ;
-        this.finished = false;
-        this.loading = false;
+      clearSearch(){
+        location.reload()
       }
     },
   }
@@ -212,14 +212,18 @@
     }
   }
   .submitButton{
-    width: 70%;
-    margin: 25PX auto;
-    background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
-    text-align: center;
-    color: #ffffff;
-    height: 70px;
-    line-height: 70px;
-    border-radius: 8PX;
+    margin: 50px auto;
+    display: flex;
+    justify-content: space-around;
+    p{
+      width: 40%;
+      background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
+      text-align: center;
+      color: #ffffff;
+      height: 70px;
+      line-height: 70px;
+      border-radius: 8PX;
+    }
   }
 
   .addFamily{
diff --git a/src/views/lawEnforcement/trace/seed.vue b/src/views/lawEnforcement/trace/seed.vue
index 5ae96a9c..90859359 100644
--- a/src/views/lawEnforcement/trace/seed.vue
+++ b/src/views/lawEnforcement/trace/seed.vue
@@ -15,7 +15,10 @@
         <van-field v-model="queryParams.recordOrg" :border="false" label="审定登记单位" placeholder="请输入审定登记单位" input-align="right" />
       </div>
 
-      <p class="submitButton" @click="getList('search')">立即查询</p>
+      <div class="submitButton">
+        <p @click="getList('search')">立即查询</p>
+        <p @click="clearSearch">重置</p>
+      </div>
 
       <div class="scroll_box">
         <van-list
@@ -101,11 +104,8 @@
           }
         });
       },
-      goSubmit(){
-        this.list = [];
-        this.queryParams.pageNum = 1 ;
-        this.finished = false;
-        this.loading = false;
+      clearSearch(){
+        location.reload()
       }
     },
   }
@@ -196,14 +196,18 @@
     }
   }
   .submitButton{
-    width: 70%;
-    margin: 25PX auto;
-    background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
-    text-align: center;
-    color: #ffffff;
-    height: 70px;
-    line-height: 70px;
-    border-radius: 8PX;
+    margin: 50px auto;
+    display: flex;
+    justify-content: space-around;
+    p{
+      width: 40%;
+      background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
+      text-align: center;
+      color: #ffffff;
+      height: 70px;
+      line-height: 70px;
+      border-radius: 8PX;
+    }
   }
   /deep/.van-cell__title{
     .tt{
diff --git a/src/views/lawEnforcement/trace/veterinary.vue b/src/views/lawEnforcement/trace/veterinary.vue
index 7a069831..f1b3f6cb 100644
--- a/src/views/lawEnforcement/trace/veterinary.vue
+++ b/src/views/lawEnforcement/trace/veterinary.vue
@@ -15,7 +15,10 @@
         <van-field v-model="queryParams.productName" :border="false" label="产品通用名称" placeholder="请输入产品通用名称" input-align="right" />
       </div>
 
-      <p class="submitButton" @click="getList('search')">立即查询</p>
+      <div class="submitButton">
+        <p @click="getList('search')">立即查询</p>
+        <p @click="clearSearch">重置</p>
+      </div>
 
       <div class="scroll_box">
         <van-list
@@ -100,6 +103,9 @@
           }
         });
       },
+      clearSearch(){
+        location.reload()
+      }
     },
   }
 </script>
@@ -196,14 +202,18 @@
     }
   }
   .submitButton{
-    width: 70%;
-    margin: 25PX auto;
-    background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
-    text-align: center;
-    color: #ffffff;
-    height: 70px;
-    line-height: 70px;
-    border-radius: 8PX;
+    margin: 50px auto;
+    display: flex;
+    justify-content: space-around;
+    p{
+      width: 40%;
+      background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
+      text-align: center;
+      color: #ffffff;
+      height: 70px;
+      line-height: 70px;
+      border-radius: 8PX;
+    }
   }
 
   .addFamily{