农业执法问题修改

src/views/lawEnforcement/caseAllocation/caseDistribution.vue

@@ -179,8 +179,6 @@
       next('/url') //放行到指定的路由
       */
       next(vm => {
-        console.log(from.path)
-        console.log(to.path)
         if (from.path === '/lawEnforcement/caseAllocation'){
           location.reload()
         }
@@ -282,6 +280,7 @@
       $route (to, from ) {
         // 监听路由变化, 实现类似 小程序的 onShow 事件
         if (to.path === '/lawEnforcement/caseDistribution') {
+          console.log('aaaa')
           // do anything you want
           if (Cookies.get('enforcer')){
             getSurveyByCaseId(this.$route.query.id).then((response) => {
@@ -295,7 +294,10 @@
                 })
               }else {
                 JSON.parse(Cookies.get('enforcer')).map((res,index)=>{
+                  let array1 = this.tEnforceCaseHandlerList.filter(function (e) { return e.enforcerName == res.enforcerName; });
+                  if ( array1.length < 1 ){
                     this.tEnforceCaseHandlerList.push(res)
+                  }
                 })
               }
             });

src/views/lawEnforcement/caseAllocation/caseListNew.vue

@@ -153,8 +153,8 @@
           this.loading = false;
           this.finished = false;
           this.queryApplyParams.pageNum = 1 ;
-          this.getList();
           this.$notify({ type: 'success', message: '提交成功' });
+          location.reload();
         }).catch(() => {});
       }
     },

src/views/lawEnforcement/supervise/enterprise.vue

@@ -99,6 +99,9 @@
         if (this.searchInput == ''){
           location.reload()
         }
+        if (this.searchInput == this.queryParams.companyName){
+          return;
+        }
         this.list = [];
         this.loading = false;
         this.finished = false;

src/views/lawEnforcement/supervise/enterpriseDetail.vue

@@ -18,7 +18,7 @@
       <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>
+    <p class="submitButton" @click="$router.push({name:'lawEnforcementEnterpriseRelation', query: {id:form.id}})">关联案件</p>
   </div>
 </template>
 

src/views/lawEnforcement/task/taskDetail.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;">
@@ -102,7 +102,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() {
@@ -129,6 +129,7 @@
 
         caseSourceOptions:[],
         belongTeamOptions:[],
+        schemeOptions:[],
 
         // 查询参数
         queryParams: {
@@ -170,6 +171,12 @@
           getDeptName(response.data.deptId).then(res => {
             response.data.deptId = res.data.deptName
           });
+          var schemeQueryParam = {
+            applyStatus: "1"
+          };
+          schemeList(schemeQueryParam).then((responseScheme) => {
+            this.$set(this.form,'scheme',response.data.schemeId == null ? '' : responseScheme.rows.filter(function (e) { return e.id == response.data.schemeId; })[0].schemeName)
+          });
           if (response.data.attachement){
             response.data.attachementList = [];
             var attachement = response.data.attachement.split( "," );

src/views/lawEnforcement/task/taskHandle.vue

@@ -128,7 +128,21 @@
           <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.deptId" />
-          <van-cell title="案件编号" :value="surveyForm.instanceId==''?'':form.caseNumPart1 + '农' + form.caseNumPart2 + '[' + form.caseNumPart3 + ']' +form.caseNum + '号'"/>
+          <van-cell v-if="form.caseNumPart1 != null &&
+                    form.caseNumPart1 != '' &&
+                    form.caseNumPart1 != undefined &&
+                    form.caseNumPart2 != null &&
+                    form.caseNumPart2 != '' &&
+                    form.caseNumPart2 != undefined &&
+                    form.caseNumPartType != null &&
+                    form.caseNumPartType != '' &&
+                    form.caseNumPartType != undefined &&
+                    form.caseNumPart3 != null &&
+                    form.caseNumPart3 != '' &&
+                    form.caseNumPart3 != undefined &&
+                    form.caseNum != null &&
+                    form.caseNum != '' &&
+                    form.caseNum != undefined " title="案件编号" :value="form.caseNumPart1 + '农(' + form.caseNumPart2 + ')' + form.caseNumPartType + '[' + form.caseNumPart3 + ']' +form.caseNum + '号'"/>
         </div>
 
         <div class="main_box" style="margin-top: 10px;">
@@ -176,8 +190,6 @@
             <van-field
               readonly
               clickable
-              required
-              :rules="[{ required: true , message:'请选择勘察开始时间'}]"
               v-model="surveyForm.surveyStartTime"
               label="勘察开始时间"
               placeholder="请选择勘察开始时间"
@@ -190,8 +202,6 @@
             <van-field
               readonly
               clickable
-              required
-              :rules="[{ required: true , message:'请选择勘察结束时间'}]"
               v-model="surveyForm.surveyEndTime"
               label="勘察结束时间"
               placeholder="请选择勘察结束时间"
@@ -220,8 +230,6 @@
             <van-field
               readonly
               clickable
-              required
-              :rules="[{ required: true , message:'请选择询问开始时间'  }]"
               v-model="surveyForm.askStartTime"
               label="询问开始时间"
               placeholder="请选择询问开始时间"
@@ -233,8 +241,6 @@
             <van-field
               readonly
               clickable
-              required
-              :rules="[{ required: true , message:'请选择询问结束时间'}]"
               v-model="surveyForm.askEndTime"
               label="询问结束时间"
               placeholder="请选择询问结束时间"
@@ -307,8 +313,6 @@
             <van-field
               readonly
               clickable
-              required
-              :rules="[{ required: true , message:'请选择受理时间'}]"
               v-model="surveyForm.handleDate"
               label="受理时间"
               placeholder="请选择受理时间"
@@ -321,8 +325,6 @@
             <van-field
               readonly
               clickable
-              required
-              :rules="[{ required: true , message:'请选择受案时间'}]"
               v-model="surveyForm.shouanDate"
               label="受案时间"
               placeholder="请选择受案时间"
@@ -336,7 +338,7 @@
             <van-field v-model="surveyForm.reason" rows="2" autosize type="textarea" placeholder="简要案情及立案（不予立案）理由" />
             <van-field input-align="right" label-width="auto" label="是否审批" v-model="surveyForm.isApprove == 'Y' ? '是' : '否'">
               <template #input>
-                <van-radio-group v-model="surveyForm.isApprove" direction="horizontal">
+                <van-radio-group v-model="surveyForm.isApprove" direction="horizontal" @change="isApproveChange">
                   <van-radio name="Y">是</van-radio>
                   <van-radio name="N">否</van-radio>
                 </van-radio-group>
@@ -346,8 +348,6 @@
             <van-field
               readonly
               clickable
-              required
-              :rules="[{ required: true , message:'请选择审批程序设置'}]"
               v-model="surveyResult"
               label="审批程序设置"
               placeholder="请选择审批程序设置"
@@ -357,7 +357,7 @@
               label-width="auto"
             />
 
-            <van-field v-if="surveyForm.instanceId=='' && caseProgress == 1 && surveyForm.surveyResult!=1" readonly input-align="right" label-width="auto" label="案件编号" placeholder="案件编号" v-model="surveyForm.caseNumPart1 + '农(' + surveyForm.caseNumPart2 + ')' + surveyForm.caseNumPartType + '[' + surveyForm.caseNumPart3 + ']' +surveyForm.caseNum + '号'" />
+<!--            <van-field v-if="surveyForm.instanceId=='' && caseProgress == 1 && surveyForm.surveyResult!=1" readonly input-align="right" label-width="auto" label="案件编号" placeholder="案件编号" v-model="surveyForm.caseNumPart1 + '农(' + surveyForm.caseNumPart2 + ')' + surveyForm.caseNumPartType + '[' + surveyForm.caseNumPart3 + ']' +surveyForm.caseNum + '号'" />-->
 
           </div>
 
@@ -372,6 +372,38 @@
           </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>
+
         <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="submit">提交</p>
@@ -453,8 +485,6 @@
             <van-field
               readonly
               clickable
-              required
-              :rules="[{ required: true , message:'请选择查封日期'}]"
               v-model="putRecordForm.sealDate"
               label="查封日期"
               placeholder="请选择查封日期"
@@ -467,11 +497,9 @@
             <van-field
               readonly
               clickable
-              required
-              :rules="[{ required: true , message:'请选择查封时效'}]"
               v-model="putRecordForm.sealTimeliness"
               label="查封时效"
-              placeholder="请选择查封时效"
+              placeholder="请选查封择时效"
               @click="showSealTimeliness = true"
               input-align="right"
               right-icon="arrow-down"
@@ -557,8 +585,6 @@
             <van-field
               readonly
               clickable
-              required
-              :rules="[{ required: true , message:'请选择抽样时间'}]"
               v-model="samplingForm.samplingTime"
               label="抽样时间"
               placeholder="请选择抽样时间"
@@ -581,8 +607,6 @@
               <van-field
                 readonly
                 clickable
-                required
-                :rules="[{ required: true , message:'请选择厂家确认期限'}]"
                 v-model="item.timeliness"
                 label="厂家确认期限"
                 placeholder="请选择厂家确认期限"
@@ -598,8 +622,6 @@
               <van-field
                 readonly
                 clickable
-                required
-                :rules="[{ required: true , message:'请选择生产日期'}]"
                 v-model="item.productTimeNum"
                 label="生产日期"
                 placeholder="请选择生产日期"
@@ -616,8 +638,6 @@
               <van-field
                 readonly
                 clickable
-                required
-                :rules="[{ required: true , message:'请选择产品确认期限'}]"
                 v-model="item.confirmTimeliness"
                 label="产品确认期限"
                 placeholder="请选择产品确认期限"
@@ -660,6 +680,37 @@
 
         </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>
         <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="submitDefine">提交</p>
@@ -687,6 +738,7 @@
           </van-cell>
           <van-cell title="案件名称" v-model="form.caseName"/>
           <van-cell title="关联方案" v-model="form.schemeId"/>
+          <van-cell title="案件属地" :border="false" v-model="form.deptId" />
         </div>
         <div class="main_box" style="margin-top: 10px;">
           <van-collapse v-model="activeNames2">
@@ -751,7 +803,7 @@
 <!--            </div>-->
             <van-field input-align="right" label-width="auto" label="检测结果" placeholder="检测结果" v-model="evidenceForm.detectionResult"/>
             <van-field input-align="right" label-width="auto" label="申请复检单位" placeholder="申请复检单位" v-model="evidenceForm.reviewUnit"/>
-            <van-field input-align="right" label-width="auto" label="复检时效" placeholder="复检时效" v-model="evidenceForm.reviewTime"/>
+            <van-field input-align="right" label-width="auto" label="复检时效(天)" placeholder="复检时效(天)" v-model="evidenceForm.reviewTime" type="digit"/>
             <van-field input-align="right" label-width="auto" label="联系人" placeholder="联系人" v-model="evidenceForm.linkman"/>
             <van-field input-align="right" label-width="auto" label="联系电话" placeholder="联系电话" v-model="evidenceForm.linkPhone"/>
 
@@ -769,7 +821,20 @@
             <van-field input-align="right" label-width="auto" label="违反条例" placeholder="违反条例" v-model="evidenceForm.violationRegulations"/>
             <van-field input-align="right" label-width="auto" label="处罚依据" placeholder="处罚依据" v-model="evidenceForm.punishmentBase"/>
             <van-field input-align="right" label-width="auto" label="证据材料" placeholder="证据材料" v-model="evidenceForm.caseDocuments"/>
-            <van-field input-align="right" label-width="auto" label="调查结论" placeholder="调查结论" v-model="evidenceForm.conclusion"/>
+<!--            <van-field input-align="right" label-width="auto" label="调查结论" placeholder="调查结论" v-model="evidenceForm.conclusion"/>-->
+
+            <van-field
+              readonly
+              clickable
+              v-model="conclusion"
+              label="调查结论"
+              placeholder="请选择调查结论"
+              @click="showConclusion = true"
+              input-align="right"
+              right-icon="arrow-down"
+              label-width="auto"
+            />
+
             <van-field input-align="right" label-width="auto" label="处罚决定" placeholder="处罚决定" v-model="evidenceForm.penaltyDecision"/>
 
           </div>
@@ -785,6 +850,37 @@
             <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>
         <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="submitDefineEvidenceForm">提交</p>
@@ -1434,7 +1530,7 @@
       />
     </van-popup>
 
-    <van-popup v-model="showSurveyResult" position="bottom">
+    <van-popup v-model="showSurveyResult" position="bottom" >
       <van-picker
         show-toolbar
         value-key="dictLabel"
@@ -1443,6 +1539,16 @@
         @cancel="showSurveyResult = false"
       />
     </van-popup>
+
+    <van-popup v-model="showConclusion" position="bottom" >
+      <van-picker
+        show-toolbar
+        value-key="dictLabel"
+        :columns="conclusionOptions"
+        @confirm="onConfirmConclusion"
+        @cancel="showConclusion = false"
+      />
+    </van-popup>
   </div>
 </template>
 <script>
@@ -1505,6 +1611,7 @@ export default {
       showConfirmTimeliness:false,
       showSurveyStartTime:false,
       showSurveyEndTime:false,
+      showConclusion:false,
 
       form:{},
       caseProgress:0,
@@ -1516,6 +1623,7 @@ export default {
       value:'',
       type:'',
       surveyResult:'',
+      conclusion:'',
       progressLength:0,
 
       zhenchaShow:true,
@@ -1562,8 +1670,8 @@ export default {
       surveyForm: {
         id: null,
         caseId: null,
-        surveyStartTime: null,
-        surveyEndTime: null,
+        surveyStartTime: this.format(new Date(),'yyyy-MM-dd'),
+        surveyEndTime: this.format(new Date(),'yyyy-MM-dd'),
         dangshiren: null,
         recorder: null,
         askRecorder: null,
@@ -1624,6 +1732,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        instanceId: null,
         caseName: "",
         schemeId: "",
       },
@@ -1640,7 +1749,8 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
+        instanceId: null,
       },
       // 取证表单参数
       evidenceForm: {
@@ -1839,6 +1949,7 @@ export default {
       historyList: [],
       evidencHistoryList: [],
       treatHistoryList: [],
+      putRecordHistoryList: [],
       // 检测结果数据
       detectResults: [],
       decisionEnforcers: [],
@@ -2119,13 +2230,29 @@ export default {
       if (this.form.id != null && this.form.id != "") {
         this.surveyForm.caseId = this.form.id;
         getSurveyByCaseId(this.form.id).then(responseSurvey => {
-          console.log(responseSurvey)
           if (responseSurvey.data != undefined) {
             _this.surveyForm = responseSurvey.data;
+            // 空默认值赋值
+            if(_this.surveyForm.isSpotCheck==null || _this.surveyForm.isSpotCheck==""){
+              _this.surveyForm.isSpotCheck = "N";
+            }
+            if(_this.surveyForm.isApprove==null || _this.surveyForm.isApprove==""){
+              _this.surveyForm.isApprove = "Y";
+            }
+            if(_this.surveyForm.gender==null || _this.surveyForm.gender==""){
+              _this.surveyForm.gender = "1";
+            }
+            if(_this.surveyForm.isClear==null || _this.surveyForm.isClear==""){
+              _this.surveyForm.isClear = "Y";
+            }
+            if(_this.surveyForm.isAvoid==null || _this.surveyForm.isAvoid==""){
+              _this.surveyForm.isAvoid = "N";
+            }
             _this.instanceId = responseSurvey.data.instanceId;
             if (responseSurvey.data.tEnforceCaseHandlerList){
               _this.tEnforceCaseHandlerList = responseSurvey.data.tEnforceCaseHandlerList;
               responseSurvey.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
+                responseEnforce.enforcerLeader = responseEnforce.enforcerLeader=='Y'? true:false
                 let data = {
                   enforcerId : responseEnforce.enforcerId,
                   caseId:this.form.id,
@@ -2154,7 +2281,7 @@ export default {
           _this.surveyForm.caseName = this.form.caseName;
           _this.surveyForm.schemeId = this.form.schemeId;
           // 查询审批历史记录
-          // _this.getHistoryList(_this.surveyForm,'');
+          _this.getHistoryList(_this.surveyForm,'');
         });
       }
     },
@@ -2167,6 +2294,21 @@ export default {
         getputRecordByCaseId(_this.form.id).then(responsePutRecord => {
           getSamplingByCaseId(_this.form.id).then(responseSampling => {
             if(responsePutRecord.data != undefined){
+              _this.tEnforcePutRecordHandlerList = responsePutRecord.data.tEnforceCaseHandlerList;
+              if (responsePutRecord.data.tEnforceCaseHandlerList){
+                console.log(responsePutRecord.data.tEnforceCaseHandlerList)
+                responsePutRecord.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
+                  responseEnforce.enforcerLeader = responseEnforce.enforcerLeader=='Y'? true:false
+                  let data = {
+                    enforcerId : responseEnforce.enforcerId,
+                    caseId:this.form.id,
+                    relationType: "3"
+                  }
+                  enforceLockinCount(data).then(resEnforceLockin => {
+                    _this.$set(_this.tEnforcePutRecordHandlerList[index],"num",resEnforceLockin.data)
+                  });
+                });
+              }
               if (responsePutRecord.data.attachement){
                 var attachement = responsePutRecord.data.attachement.split( "," );
                 attachement.forEach(response=>{
@@ -2178,35 +2320,20 @@ export default {
                 // process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API
               }
               _this.putRecordForm = responsePutRecord.data;
-              // _this.tEnforcePutRecordHandlerList = responsePutRecord.data.tEnforceCaseHandlerList == null ? [] : responsePutRecord.data.tEnforceCaseHandlerList;
-              if (responsePutRecord.data.id == ''){
-
-                // 立案表单没有保存之前,办理人员默认获取上一节点勘察的办理人员列表
-                const queryEnforcerParams = {
-                  relationType: "2",
-                  caseId: this.form.id
-                };
-                caseHandlerList(queryEnforcerParams).then(responseHandlerList => {
-                  responseHandlerList.data.relationType = "3";
-                  _this.tEnforcePutRecordHandlerList = responseHandlerList.data;
-                  if (responseHandlerList.data){
-                    responseHandlerList.data.map((responseEnforce,index)=>{
-                      let data = {
-                        enforcerId : responseEnforce.enforcerId,
-                        caseId:this.form.id,
-                        relationType: "3"
-                      }
-                      enforceLockinCount(data).then(resEnforceLockin => {
-                        _this.$set(_this.tEnforcePutRecordHandlerList[index],"num",resEnforceLockin.data)
-                      });
+              _this.tEnforceDetainHandlerList = responsePutRecord.data.tEnforceDetainHandlerList == null ? [] : responsePutRecord.data.tEnforceDetainHandlerList;
+            }else{
+              // 立案表单没有保存之前,办理人员默认获取上一节点勘察的办理人员列表
+              const queryEnforcerParams = {
+                relationType: "2",
+                caseId: this.form.id
+              };
+              caseHandlerList(queryEnforcerParams).then(responseHandlerList => {
+                responseHandlerList.data.relationType = "3";
+                _this.tEnforcePutRecordHandlerList = responseHandlerList.data;
+                if (responseHandlerList.data){
+                  responseHandlerList.data.map((responseEnforce,index)=>{
+                    responseEnforce.enforcerLeader = responseEnforce.enforcerLeader=='Y'? true:false
 
-                    });
-                  }
-                });
-              }else{
-                _this.tEnforcePutRecordHandlerList = responsePutRecord.data.tEnforceCaseHandlerList;
-                if (responsePutRecord.data.tEnforceCaseHandlerList){
-                  responsePutRecord.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
                     let data = {
                       enforcerId : responseEnforce.enforcerId,
                       caseId:this.form.id,
@@ -2215,12 +2342,10 @@ export default {
                     enforceLockinCount(data).then(resEnforceLockin => {
                       _this.$set(_this.tEnforcePutRecordHandlerList[index],"num",resEnforceLockin.data)
                     });
+
                   });
                 }
-                console.log(_this.tEnforcePutRecordHandlerList)
-              }
-
-            }else{
+              });
               _this.putRecordForm.attachement = [];
               _this.putRecordForm.attachementList = [];
             }
@@ -2249,6 +2374,8 @@ export default {
 
             _this.putRecordForm.caseName = this.form.caseName;
             _this.putRecordForm.schemeId = this.form.schemeId;
+            // 查询审批历史记录
+            _this.getHistoryList(this.evidenceForm,'putRecord');
           });
         });
       }
@@ -2270,13 +2397,18 @@ export default {
                   responseReport.data.goodsId = goodsId;
                   responseReport.data.goodsName = goodsName;
                   responseReport.data.attachementList = [];
-                  var Evidence = responseReport.data.attachement.split( "," );
-                  console.log(Evidence)
-                  Evidence.forEach(response=>{
-                    responseReport.data.attachementList.push({
-                      url:'/api' + response,
-                    });
-                  })
+                  if (responseReport.data.attachement){
+                    var Evidence = responseReport.data.attachement.split( "," );
+                    console.log(Evidence)
+                    Evidence.forEach(response=>{
+                      responseReport.data.attachementList.push({
+                        url:'/api' + response,
+                      });
+                    })
+                  }else{
+                    responseReport.data.attachement = [];
+                    responseReport.data.attachementList = [];
+                  }
                   _this.detectResults.push(responseReport.data);
                 } else {
                   var goodsObj = {
@@ -2287,15 +2419,60 @@ export default {
                   _this.detectResults.push(goodsObj);
                 }
               });
+              // if (responseSampling.data.tEnforceSamplingGoodsList[i].attachement){
+              //   responseSampling.data.tEnforceSamplingGoodsList[i].attachementList = [];
+              //   var Sampling = responseSampling.data.tEnforceSamplingGoodsList[i].attachement.split( "," );
+              //   Sampling.forEach(response=>{
+              //     responseSampling.data.tEnforceSamplingGoodsList[i].attachementList.push({
+              //       url: '/api' + response,
+              //     });
+              //     // process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API
+              //   })
+              // }else{
+              //   responseSampling.data.tEnforceSamplingGoodsList[i].attachement = [];
+              //   responseSampling.data.tEnforceSamplingGoodsList[i].attachementList = [];
+              // }
             }
+
+
+
             if (responseEvidence.data != undefined) {
               responseEvidence.data.attachementList = [];
 
+              _this.tEnforceEvidenceHandlerList = responseEvidence.data.tEnforceCaseHandlerList;
+              if (responseEvidence.data.tEnforceCaseHandlerList){
+                responseEvidence.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
+                  responseEnforce.enforcerLeader = responseEnforce.enforcerLeader=='Y'? true:false
+                  let data = {
+                    enforcerId : responseEnforce.enforcerId,
+                    caseId:this.form.id,
+                    relationType: "4"
+                  }
+                  enforceLockinCount(data).then(resEnforceLockin => {
+                    _this.$set(_this.tEnforceEvidenceHandlerList[index],"num",resEnforceLockin.data)
+                  });
+
+                });
+              }
               responseEvidence.data.conclusion = this.selectDictLabel(this.conclusionOptions,responseEvidence.data.conclusion)
 
               _this.evidenceForm = responseEvidence.data;
 
-              if (responseEvidence.data.id == ''){
+
+              if (responseEvidence.data.attachement){
+                var Evidence = responseEvidence.data.attachement.split( "," );
+                Evidence.forEach(response=>{
+                  responseEvidence.data.attachementList.push({
+                    url:'/api' + response,
+                  });
+                })
+                // process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API
+              }else{
+                responseEvidence.data.attachement = [];
+              }
+            }else{
+              _this.evidenceForm.attachement = [];
+
 
                 // 取证表单没有保存之前,办理人员默认获取上一节点立案的办理人员列表
                 const queryEnforcerParams = {
@@ -2308,6 +2485,7 @@ export default {
 
                   if (responseHandlerList.data){
                     responseHandlerList.data.map((responseEnforce,index)=>{
+                      responseEnforce.enforcerLeader = responseEnforce.enforcerLeader=='Y'? true:false
                       let data = {
                         enforcerId : responseEnforce.enforcerId,
                         caseId:this.form.id,
@@ -2320,53 +2498,9 @@ export default {
                     });
                   }
                 });
-              }else{
-                _this.tEnforceEvidenceHandlerList = responseEvidence.data.tEnforceCaseHandlerList;
-                if (responseEvidence.data.tEnforceCaseHandlerList){
-                  responseEvidence.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
-                    let data = {
-                      enforcerId : responseEnforce.enforcerId,
-                      caseId:this.form.id,
-                      relationType: "4"
-                    }
-                    enforceLockinCount(data).then(resEnforceLockin => {
-                      _this.$set(_this.tEnforceEvidenceHandlerList[index],"num",resEnforceLockin.data)
-                    });
 
-                  });
-                }
-              }
-              if (responseEvidence.data.attachement){
-                var Evidence = responseEvidence.data.attachement.split( "," );
-                Evidence.forEach(response=>{
-                  responseEvidence.data.attachementList.push({
-                    url:'/api' + response,
-                  });
-                })
-                // process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API
-              }else{
-                responseEvidence.data.attachement = [];
-              }
-            }else{
-              _this.evidenceForm.attachement = [];
             }
-            setTimeout(function () {
-              for (var i = 0 ; i < responseSampling.data.tEnforceSamplingGoodsList.length ; i++){
-                console.log(_this.detectResults[0])
-                if (responseSampling.data.tEnforceSamplingGoodsList[i].attachement){
-                  responseSampling.data.tEnforceSamplingGoodsList[i].attachementList = [];
-                  var Sampling = responseSampling.data.tEnforceSamplingGoodsList[i].attachement.split( "," );
-                  Sampling.forEach(response=>{
-                    responseSampling.data.tEnforceSamplingGoodsList[i].attachementList.push({
-                      url: '/api' + response,
-                    });
-                    // process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API
-                  })
-                }else{
-                  responseSampling.data.tEnforceSamplingGoodsList[i].attachement = [];
-                }
-              }
-            },1000)
+
             _this.evidenceForm.caseName = this.form.caseName;
             _this.evidenceForm.schemeId = this.form.schemeId;
             // 查询审批历史记录
@@ -2715,6 +2849,15 @@ export default {
                 row.durationInMillis / 1000
               );
             });
+          }else if (type == 'putRecord'){
+            this.putRecordHistoryList = response.rows;
+            this.putRecordHistoryList.forEach((row) => {
+              row.startTime = this.format(row.startTime, "yyyy-MM-dd HH:mm:ss");
+              row.endTime = this.format(row.endTime, "yyyy-MM-dd HH:mm:ss");
+              row.durationInMillis = this.formatTotalDateSub(
+                row.durationInMillis / 1000
+              );
+            });
           }else{
             this.historyList = response.rows;
             this.historyList.forEach((row) => {
@@ -2778,33 +2921,74 @@ export default {
       this.surveyResult = data.dictLabel;
       this.showSurveyResult = false;
 
-      if (data.dictValue != '1'){
+      // 默认显示当前年份
+      let nowDate = new Date();
+
+      if (data.dictValue != '1' && data.dictValue != '2' ){
+        console.log("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
+        this.$set(this.surveyForm, "caseNumPart3", nowDate.getFullYear().toString());
+        this.$set(this.surveyForm, "caseNumPart2", this.form.enforceCategory);
+        this.$set(this.form, "caseNumPart3", nowDate.getFullYear().toString());
+        this.$set(this.form, "caseNumPart2", this.form.enforceCategory);
         if (data.dictValue == "3") {
           this.$set(this.surveyForm, "caseNumPartType", "简罚");
+          this.$set(this.form, "caseNumPartType", "简罚");
         } else if (data.dictValue == "4") {
           this.$set(this.surveyForm, "caseNumPartType", "罚");
+          this.$set(this.form, "caseNumPartType", "罚");
         }
 
         const caseNumParam = {
           caseNumPart3: this.surveyForm.caseNumPart3,
-          surveyResult: data.dictValue
+          surveyResult: data.dictValue,
+
         };
         getCaseNum(caseNumParam).then(response => {
           this.$set(this.surveyForm, "caseNum", response.data);
+          this.$set(this.form, "caseNum", response.data);
         });
 
         this.getDicts("case_number_title").then(response => {
           this.$set(this.surveyForm, "caseNumPart1", response.data[0].dictLabel);
+          this.$set(this.form, "caseNumPart1", response.data[0].dictLabel);
         });
-        // 默认显示当前年份
-        let nowDate = new Date();
-        console.log(this.form)
-        this.$set(this.surveyForm, "caseNumPart3", nowDate.getFullYear().toString());
-        this.$set(this.surveyForm, "caseNumPart2", this.form.enforceCategory);
+      }else{
+        console.log("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb")
+        this.$set(this.surveyForm, "caseNumPart3", '');
+        this.$set(this.surveyForm, "caseNumPart2", '');
+        this.$set(this.form, "caseNumPart3", '');
+        this.$set(this.form, "caseNumPart2", '');
+        this.$set(this.surveyForm, "caseNumPartType", "");
+        this.$set(this.form, "caseNumPartType", "");
+        this.$set(this.surveyForm, "caseNum", '');
+        this.$set(this.form, "caseNum", '');
+        this.$set(this.surveyForm, "caseNumPart1", '');
+        this.$set(this.form, "caseNumPart1", '');
       }
 
     },
 
+    isApproveChange(){
+      this.surveyResult = '';
+      this.surveyForm.surveyResult = '';
+      this.$set(this.surveyForm, "caseNumPart3", '');
+      this.$set(this.surveyForm, "caseNumPart2", '');
+      this.$set(this.form, "caseNumPart3", '');
+      this.$set(this.form, "caseNumPart2", '');
+      this.$set(this.surveyForm, "caseNumPartType", "");
+      this.$set(this.form, "caseNumPartType", "");
+      this.$set(this.surveyForm, "caseNum", '');
+      this.$set(this.form, "caseNum", '');
+      this.$set(this.surveyForm, "caseNumPart1", '');
+      this.$set(this.form, "caseNumPart1", '');
+    },
+
+    onConfirmConclusion(data){
+      this.evidenceForm.conclusion = data.dictValue;
+      this.conclusion = data.dictLabel;
+      this.showConclusion = false;
+    },
+
     onConfirmTimeliness(data){
       this.tEnforceSamplingGoodsList[this.goodsIndex].timeliness = this.format(data,'yyyy-MM-dd');
       this.timeliness = data;
@@ -2895,31 +3079,26 @@ export default {
     preservation(){
       this.tEnforceCaseHandlerList.map(res=>{
         res.relationType = '2';
+        console.log(res.enforcerLeader)
+        res.enforcerLeader = res.enforcerLeader == true ? 'Y' : 'N' ;
       })
       this.surveyForm.tEnforceCaseHandlerList = this.tEnforceCaseHandlerList;
       this.surveyForm.attachement = this.openPic2.join(',');
       if (this.surveyForm.id != null) {
         updateSurvey(this.surveyForm).then(response => {
           this.$notify({ type: 'success', message: '修改成功' });
-
-          setTimeout(function(){
-            history.back(-1);
-          },2000)
+          history.back(-1);
         });
       } else {
         addSurvey(this.surveyForm).then(response => {
           this.$notify({ type: 'success', message: '新增成功' });
           this.surveyForm.id = response.data;
-
-          setTimeout(function(){
-            history.back(-1);
-          },2000)
+          history.back(-1);
         });
       }
     },
 
     submit(){
-
       if (this.surveyForm.id == null) {
         this.$notify({ type: 'danger', message: '请先保存数据之后再确定提交申请' });
       } else {
@@ -2934,11 +3113,7 @@ export default {
               method: 'post',
             });
           }).then(() => {
-            this.$notify({ type: 'success', message: '提交成功' });
-
-            setTimeout(function(){
-              history.back(-1);
-            },2000)
+            this.preservation();
           })
         } else {
           // 不审批直接更新进度到备案
@@ -2979,11 +3154,7 @@ export default {
               // 更新案件的节点和状态
               updateCase(caseParam).then(response => {
                 addProgress(progressParam).then(response => {
-                  this.$notify({ type: 'success', message: '提交成功' });
-
-                  setTimeout(function(){
-                    history.back(-1);
-                  },2000)
+                  this.preservation();
                 });
               });
             });
@@ -2996,9 +3167,9 @@ export default {
 
     /** 案件立案提交按钮 */
     submitPutRecordForm() {
-
       this.tEnforcePutRecordHandlerList.map(res=>{
         res.relationType = '3';
+        res.enforcerLeader = res.enforcerLeader == true ? 'Y' : 'N' ;
       })
       // 办理人员列表
       this.putRecordForm.tEnforceCaseHandlerList = this.tEnforcePutRecordHandlerList;
@@ -3019,10 +3190,6 @@ export default {
       })
       // this.tEnforceSamplingGoodsList[index].attachement
 
-      console.log(this.samplingForm.tEnforceSamplingGoodsList)
-      console.log(this.putRecordForm)
-      console.log(this.samplingForm)
-
       var _this = this;
       if (this.putRecordForm.id != null) {
         updatePutrecord(this.putRecordForm).then(responsePutrecord => {
@@ -3032,9 +3199,7 @@ export default {
                 if (responseSampling.code == "200") {
                   this.$notify({ type: 'success', message: '修改成功' });
 
-                  setTimeout(function(){
-                    history.back(-1);
-                  },2000)
+                  history.back(-1);
                 }
               });
             } else {
@@ -3043,9 +3208,7 @@ export default {
                   this.$notify({ type: 'success', message: '新增成功' });
                   _this.samplingForm.id = responseSampling.data;
 
-                  setTimeout(function(){
-                    history.back(-1);
-                  },2000)
+                  history.back(-1);
                 }
               });
             }
@@ -3061,9 +3224,7 @@ export default {
                 _this.putRecordForm.id = responsePutrecord.data;
                 _this.samplingForm.id = responseSampling.data;
 
-                setTimeout(function(){
-                  history.back(-1);
-                },2000)
+                history.back(-1);
               }
             });
             _this.putRecordDiglogStatus = false;
@@ -3087,11 +3248,7 @@ export default {
             method: 'post',
           });
         }).then(() => {
-          this.$notify({ type: 'success', message: '提交成功' });
-
-          setTimeout(function(){
-            history.back(-1);
-          },2000)
+          this.submitPutRecordForm();
         })
       }
     },
@@ -3101,10 +3258,10 @@ export default {
       this.surveyDiglogStatus = false;
       this.tEnforceEvidenceHandlerList.map(res=>{
         res.relationType = '4';
+        res.enforcerLeader = res.enforcerLeader == true ? 'Y' : 'N' ;
       })
       this.evidenceForm.tEnforceCaseHandlerList = this.tEnforceEvidenceHandlerList;
       this.evidenceForm.detectResults = this.detectResults;
-      console.log(this.evidenceForm.detectResults)
       if (typeof this.evidenceForm.attachement != 'string'){
         this.evidenceForm.attachement = this.evidenceForm.attachement.join(',');
       }
@@ -3120,9 +3277,7 @@ export default {
           this.$notify({ type: 'success', message: '提交成功' });
           this.surveyDiglogStatus = false;
 
-          setTimeout(function(){
-            history.back(-1);
-          },2000)
+          history.back(-1);
         });
       } else {
         this.surveyDiglogStatus = true;
@@ -3131,9 +3286,7 @@ export default {
           this.evidenceForm.id = response.data;
           this.surveyDiglogStatus = false;
 
-          setTimeout(function(){
-            history.back(-1);
-          },2000)
+          history.back(-1);
         });
       }
     },
@@ -3153,12 +3306,7 @@ export default {
             method: 'post',
           });
         }).then(() => {
-          this.$notify({ type: 'success', message: '提交成功' });
-          this.cancel();
-
-          setTimeout(function(){
-            history.back(-1);
-          },2000)
+          this.submitEvidenceForm();
         })
       }
     },
@@ -3266,6 +3414,7 @@ export default {
 
       }
     },
+
   },
   watch: {
     $route (to, from ) {
@@ -3299,6 +3448,10 @@ export default {
             // tEnforceEvidenceHandlerList
             // this.tEnforceCaseHandlerList.push(res)
           })
+
+          setTimeout(function () {
+            Cookies.remove("enforcer");
+          },5000)
         }
       }
     }

src/views/lawEnforcement/task/taskRecord.vue

@@ -12,7 +12,9 @@
         <p>{{user.nickName}}</p>
         <p>{{roleGroup}}</p>
       </div>
-      <img src="../../../../static/images/lawEnforcement/icon/task_icon_03.png" class="icon_01">
+      <img src="../../../../static/images/lawEnforcement/icon/task_icon_03.png" v-if="relationType == '2'" class="icon_01">
+      <img src="../../../../static/images/lawEnforcement/icon/task_icon_031.png" v-if="relationType == '3'" class="icon_01">
+      <img src="../../../../static/images/lawEnforcement/icon/task_icon_032.png" v-if="relationType == '4'" class="icon_01">
     </div>
 
     <div class="center_box">
@@ -37,7 +39,8 @@
         form:{},
         clockinList:[],
         user:{},
-        roleGroup:''
+        roleGroup:'',
+        relationType:''
       };
     },
     created() {
@@ -45,6 +48,7 @@
         this.user = res.data;
         this.roleGroup = res.roleGroup;
       })
+      this.relationType = this.$route.query.relationType;
       this.getDetail()
     },
     methods: {

src/views/lawEnforcement/task/taskSignIn.vue

@@ -11,7 +11,7 @@
     </baidu-map>
 
     <div style="position:absolute;top: 75px;width: 100%;">
-      <div class="main_box top_box">
+      <div :class="{'main_box' : true , 'top_box' : true , 'top_qu' : form.caseProgress == '4' , 'top_li' : form.caseProgress == '3' , 'top_kan' : form.caseProgress == '2'}">
         <van-field readonly v-model="form.caseSource" label="案件来源" :border="false" />
         <van-field readonly v-model="form.schemeId" label="关联方案" :border="false" />
         <van-field readonly v-model="form.caseName" label="案件名称" :border="false" />
@@ -240,13 +240,21 @@
     }
   }
   .top_box{
-    background: url('../../../../static/images/lawEnforcement/icon/task_icon_03.png') no-repeat 97% 10%;
     padding: 10PX 0;
     /*background-size: 100% 100%;*/
     /deep/ .van-cell{
       background: none;
     }
   }
+  .top_kan{
+    background: url('../../../../static/images/lawEnforcement/icon/task_icon_03.png') no-repeat 97% 10%;
+  }
+  .top_qu{
+    background: url('../../../../static/images/lawEnforcement/icon/task_icon_032.png') no-repeat 97% 10%;
+  }
+  .top_li{
+    background: url('../../../../static/images/lawEnforcement/icon/task_icon_031.png') no-repeat 97% 10%;
+  }
   .main_box{
     width: 96%;
     margin: 0 auto;

src/views/lawEnforcement/task/taskSignInSee.vue

@@ -11,7 +11,7 @@
     </baidu-map>
 
     <div style="position:absolute;top: 75px;width: 100%;">
-      <div class="main_box top_box">
+      <div :class="{'main_box' : true , 'top_box' : true , 'top_qu' : form.caseProgress == '4' , 'top_li' : form.caseProgress == '3' , 'top_kan' : form.caseProgress == '2'}">
         <van-field readonly v-model="form.caseSource" label="案件来源" :border="false" />
         <van-field readonly v-model="form.schemeId" label="关联方案" :border="false" />
         <van-field readonly v-model="form.caseName" label="案件名称" :border="false" />
@@ -189,13 +189,21 @@
     }
   }
   .top_box{
-    background: url('../../../../static/images/lawEnforcement/icon/task_icon_03.png') no-repeat 97% 10%;
     padding: 10PX 0;
     /*background-size: 100% 100%;*/
     /deep/ .van-cell{
       background: none;
     }
   }
+  .top_kan{
+    background: url('../../../../static/images/lawEnforcement/icon/task_icon_03.png') no-repeat 97% 10%;
+  }
+  .top_qu{
+    background: url('../../../../static/images/lawEnforcement/icon/task_icon_032.png') no-repeat 97% 10%;
+  }
+  .top_li{
+    background: url('../../../../static/images/lawEnforcement/icon/task_icon_031.png') no-repeat 97% 10%;
+  }
   .main_box{
     width: 96%;
     margin: 0 auto;

src/views/lawEnforcement/trace/feed.vue

@@ -15,7 +15,7 @@
         <van-field v-model="queryParams.productName" :border="false" label="产品通用名称" placeholder="请输入产品通用名称" input-align="right" />
       </div>
 
-      <p class="submitButton" @click="goSubmit">立即查询</p>
+      <p class="submitButton" @click="getList('search')">立即查询</p>
 
       <div class="scroll_box">
         <van-list
@@ -80,8 +80,12 @@
       // this.getDictionaries()
     },
     methods: {
-      getList(){
+      getList(type){
         var _this = this;
+        if (type == 'search'){
+          this.list = [];
+          this.queryParams.pageNum = 1 ;
+        }
         listFeed(_this.queryParams).then(response => {
           response.rows.map(res=>{
             this.list.push(res);
@@ -96,12 +100,6 @@
           }
         });
       },
-      goSubmit(){
-        this.list = [];
-        this.queryParams.pageNum = 1 ;
-        this.finished = false;
-        this.loading = false;
-      }
     },
   }
 </script>

src/views/lawEnforcement/trace/fertilizer.vue

@@ -15,7 +15,7 @@
         <van-field v-model="queryParams.productGoodsName" :border="false" label="产品商品名称" placeholder="请输入产品商品名称" input-align="right" />
       </div>
 
-      <p class="submitButton" @click="goSubmit">立即查询</p>
+      <p class="submitButton" @click="getList('search')">立即查询</p>
 
       <div class="scroll_box">
         <van-list
@@ -86,8 +86,12 @@
       // this.getDictionaries()
     },
     methods: {
-      getList(){
+      getList(type){
         var _this = this;
+        if (type == 'search'){
+          this.list = [];
+          this.queryParams.pageNum = 1 ;
+        }
         listFertilizer(_this.queryParams).then(response => {
           response.rows.map(res=>{
             this.list.push(res);
@@ -102,12 +106,6 @@
           }
         });
       },
-      goSubmit(){
-        this.list = [];
-        this.queryParams.pageNum = 1 ;
-        this.finished = false;
-        this.loading = false;
-      }
     },
   }
 </script>

src/views/lawEnforcement/trace/pesticides.vue

@@ -54,7 +54,7 @@
         />
       </div>
 
-      <p class="submitButton" @click="goSubmit">立即查询</p>
+      <p class="submitButton" @click="getList('search')">立即查询</p>
       <div class="scroll_box">
         <van-list
           v-model="loading"
@@ -140,8 +140,12 @@
 
     },
     methods: {
-      getList(){
+      getList(type){
         var _this = this;
+        if (type == 'search'){
+          this.list = [];
+          this.queryParams.pageNum = 1 ;
+        }
         listProduct(_this.queryParams).then(response => {
           response.rows.map(res=>{
             // res.businessType = res.businessType == '' ? '' : this.selectDictLabel(this.businessTypeOptions, res.businessType);
@@ -167,13 +171,6 @@
         this.queryParams.agent = data.value;
         this.showAgent = false;
       },
-      goSubmit(){
-        this.list = [];
-        this.queryParams.pageNum = 1 ;
-        this.finished = false;
-        this.loading = false;
-        // this.getList();
-      }
     },
   }
 </script>

src/views/lawEnforcement/trace/product.vue

@@ -15,7 +15,7 @@
         <van-field v-model="value" :border="false" label="农产品类型" placeholder="请输入农产品类型" input-align="right" />
       </div>
 
-      <p class="submitButton">立即查询</p>
+      <p class="submitButton" @click="getList('search')">立即查询</p>
 
       <div class="scroll_box">
         <van-list
@@ -84,8 +84,12 @@
       });
     },
     methods: {
-      getList(){
+      getList(type){
         var _this = this;
+        if (type == 'search'){
+          this.list = [];
+          this.queryParams.pageNum = 1 ;
+        }
         listAgri(_this.queryParams).then(response => {
           response.rows.map(res=>{
             res.productType = res.productType == '' ? '' : this.selectDictLabel(this.productTypeOptions, res.productType);

src/views/lawEnforcement/trace/seed.vue

@@ -15,7 +15,7 @@
         <van-field v-model="queryParams.recordOrg" :border="false" label="审定登记单位" placeholder="请输入审定登记单位" input-align="right" />
       </div>
 
-      <p class="submitButton" @click="goSubmit">立即查询</p>
+      <p class="submitButton" @click="getList('search')">立即查询</p>
 
       <div class="scroll_box">
         <van-list
@@ -81,8 +81,12 @@
       // this.getDictionaries()
     },
     methods: {
-      getList(){
+      getList(type){
         var _this = this;
+        if (type == 'search'){
+          this.list = [];
+          this.queryParams.pageNum = 1 ;
+        }
         listSeed(_this.queryParams).then(response => {
           response.rows.map(res=>{
             this.list.push(res);

src/views/lawEnforcement/trace/veterinary.vue

@@ -15,7 +15,7 @@
         <van-field v-model="queryParams.productName" :border="false" label="产品通用名称" placeholder="请输入产品通用名称" input-align="right" />
       </div>
 
-      <p class="submitButton" @click="goSubmit">立即查询</p>
+      <p class="submitButton" @click="getList('search')">立即查询</p>
 
       <div class="scroll_box">
         <van-list
@@ -80,8 +80,12 @@
       // this.getDictionaries()
     },
     methods: {
-      getList(){
+      getList(type){
         var _this = this;
+        if (type == 'search'){
+          this.list = [];
+          this.queryParams.pageNum = 1 ;
+        }
         listGmp(_this.queryParams).then(response => {
           response.rows.map(res=>{
             this.list.push(res);
@@ -96,12 +100,6 @@
           }
         });
       },
-      goSubmit(){
-        this.list = [];
-        this.queryParams.pageNum = 1 ;
-        this.finished = false;
-        this.loading = false;
-      }
     },
   }
 </script>