From 1a179c622d64dc8a7e88c997eb77b7c2c8dac3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Fri, 21 Oct 2022 16:54:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E4=B8=9A=E6=89=A7=E6=B3=95BUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js                             |   1 +
 src/router/index.js                           |   7 +-
 src/views/lawEnforcement/basis/basis.vue      |   3 +-
 src/views/lawEnforcement/case/caseDetail.vue  |   1 +
 .../lawEnforcement/caseAllocation/caseAdd.vue |  65 ++---
 .../caseAllocation/caseDetail.vue             |  23 +-
 .../caseAllocation/caseEdit.vue               |   6 +-
 .../caseAllocation/caseEnforceList.vue        |  89 ++++---
 .../caseAllocation/caseListNew.vue            |   6 +-
 .../lawEnforcement/caseQuery/caseQuery.vue    |   9 +-
 .../caseQuery/caseQueryDocument.vue           | 103 ++++----
 .../supervise/enterpriseRelation.vue          |   8 +-
 .../supervise/individualRelation.vue          |   6 +-
 .../lawEnforcement/task/signInRecord.vue      |  11 +-
 src/views/lawEnforcement/task/task.vue        |   2 +-
 src/views/lawEnforcement/task/taskHandle.vue  | 223 ++++++++++++++----
 src/views/lawEnforcement/trace/feed.vue       |   4 +-
 src/views/lawEnforcement/trace/fertilizer.vue |   4 +-
 src/views/lawEnforcement/trace/pesticides.vue |   5 +-
 src/views/lawEnforcement/trace/product.vue    |   4 +-
 src/views/lawEnforcement/trace/seed.vue       |   4 +-
 src/views/lawEnforcement/trace/veterinary.vue |   4 +-
 .../images/lawEnforcement/icon/icon_xckc.png  | Bin 0 -> 525 bytes
 23 files changed, 385 insertions(+), 203 deletions(-)
 create mode 100644 static/images/lawEnforcement/icon/icon_xckc.png

diff --git a/src/permission.js b/src/permission.js
index 03fd72cc..91ffbd4a 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -127,6 +127,7 @@ const whiteList = [
   '/sunVillage_info/list_vote',   //详情页
   '/sunVillage_info/list_vote_detail',   //详情页
   '/sunVillage_info/list_vote_form',   //详情页
+
 ]
 
 router.beforeEach((to, from, next) => {
diff --git a/src/router/index.js b/src/router/index.js
index f1123146..b51ccf90 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3825,7 +3825,6 @@ export const constantRoutes = [
     meta: {
       title: '巡查登记',
       hidden: true,
-      keepAlive: true
     },
     component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseAdd'], resolve)
   },
@@ -3834,8 +3833,7 @@ export const constantRoutes = [
     name: 'lawEnforcementCaseEdit',
     meta: {
       title: '登记修改',
-      hidden: true,
-      keepAlive: true
+      hidden: true
     },
     component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseEdit'], resolve)
   },
@@ -3844,8 +3842,7 @@ export const constantRoutes = [
     name: 'lawEnforcementCaseListNew',
     meta: {
       title: '登记列表',
-      hidden: true,
-      keepAlive: true
+      hidden: true
     },
     component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseListNew'], resolve)
   },
diff --git a/src/views/lawEnforcement/basis/basis.vue b/src/views/lawEnforcement/basis/basis.vue
index 1084daf5..9d9a82ee 100644
--- a/src/views/lawEnforcement/basis/basis.vue
+++ b/src/views/lawEnforcement/basis/basis.vue
@@ -89,6 +89,7 @@
     },
     methods: {
       getList(){
+        console.log('aaaa')
         var _this = this;
         getNewsList(_this.queryParams).then(response => {
           response.rows.map(res=>{
@@ -124,7 +125,7 @@
         this.loading = false;
         this.queryParams.title = this.searchInput;
         this.queryParams.pageNum = 1;
-        this.getList();
+        // this.getList();
       },
       onClickLeftIndex(){
         this.$router.push('/lawEnforcement/index_new')
diff --git a/src/views/lawEnforcement/case/caseDetail.vue b/src/views/lawEnforcement/case/caseDetail.vue
index 35c5efc0..d0b9bfe3 100644
--- a/src/views/lawEnforcement/case/caseDetail.vue
+++ b/src/views/lawEnforcement/case/caseDetail.vue
@@ -2136,6 +2136,7 @@ export default {
 
     /** 查询审批历史展示步骤条 */
     getHistoryList(formData,type) {
+      console.log(formData)
       if (formData.instanceId != null && formData.instanceId != "") {
         var queryParams = {
           processInstanceId: formData.instanceId
diff --git a/src/views/lawEnforcement/caseAllocation/caseAdd.vue b/src/views/lawEnforcement/caseAllocation/caseAdd.vue
index 330ee7fb..88305f36 100644
--- a/src/views/lawEnforcement/caseAllocation/caseAdd.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseAdd.vue
@@ -267,36 +267,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 class="peoplett">
-                <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" @change="checkBoxChange(item.enforcerLeader,index)"></van-checkbox>
-                    <van-icon name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index)"></van-icon>
-                  </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 class="peoplett">-->
+<!--                <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" @change="checkBoxChange(item.enforcerLeader,index)"></van-checkbox>-->
+<!--                    <van-icon name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index)"></van-icon>-->
+<!--                  </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="submit_box">
         <p class="submitButton" @click="$refs.form.submit()">保存</p>
         <p class="submitButton" @click="keepSubmit()">保存并提交</p>
@@ -533,7 +533,10 @@
           // do anything you want
           if (Cookies.get('enforcer')){
             JSON.parse(Cookies.get('enforcer')).map((res,index)=>{
-              this.tEnforceCaseHandlerList.push(res)
+              let array1 = this.tEnforceCaseHandlerList.filter(function (e) { return e.enforcerName == res.enforcerName; });
+              if ( array1.length < 1 ){
+                this.tEnforceCaseHandlerList.push(res)
+              }
             })
           }
         }
diff --git a/src/views/lawEnforcement/caseAllocation/caseDetail.vue b/src/views/lawEnforcement/caseAllocation/caseDetail.vue
index be91056f..15b05e97 100644
--- a/src/views/lawEnforcement/caseAllocation/caseDetail.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="header_main">
-      查看登记
+      {{title}}
       <div class="return_btn" @click="onClickLeft"></div>
     </div>
     <div style="height: 58px;"></div>
@@ -109,6 +109,7 @@
         showPayeeType:false,
         showPicker:false,
         form:{},
+        title:'查看登记',
 
         bankType:'',
         payeeType:'',
@@ -161,16 +162,22 @@
         this.nationOptions = response.data;
       });
       this.getDetail();
-
+      if (this.$route.query.type == 'caseQuery'){
+        this.title = '案件详情查看'
+      }
     },
     methods: {
       getDetail(){
         getCase(this.$route.query.id).then((response) => {
           response.data.caseSource = response.data.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, response.data.caseSource);
+
           response.data.belongTeam = response.data.belongTeam == '' ? '' : this.selectDictLabel(this.belongTeamOptions, response.data.belongTeam);
+
+          if (response.data.type == '1'){
+            response.data.sex = response.data.sex == '' ? '' : this.selectDictLabel(this.sexOptions, response.data.sex);
+            response.data.nation = response.data.nation == '' ? '' : response.data.nation == '1' ? '汉族' : this.selectDictLabel(this.nationOptions, response.data.nation);
+          }
           response.data.type = response.data.type == '' ? '' : this.selectDictLabel(this.typeOptions, response.data.type);
-          response.data.sex = response.data.sex == '' ? '' : this.selectDictLabel(this.sexOptions, response.data.sex);
-          response.data.nation = response.data.nation == '' ? '' : this.selectDictLabel(this.nationOptions, response.data.nation);
 
           var schemeQueryParam = {
             applyStatus: "1"
@@ -189,15 +196,15 @@
             })
             // process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API
           }
+          console.log(response.data.scheme)
           schemeList(schemeQueryParam).then((responseScheme) => {
-            console.log(responseScheme.rows.filter(function (e) { return e.id == response.data.schemeId; }))
-            response.data.scheme = response.data.schemeId == '' ? '' : responseScheme.rows.filter(function (e) { return e.id == response.data.schemeId; })[0].schemeName;
-
+            console.log(responseScheme)
+            response.data.scheme = response.data.schemeId == null ? '' : responseScheme.rows.filter(function (e) { return e.id == response.data.schemeId; })[0].schemeName;
           });
           var that = this ;
           setTimeout(function () {
             that.form = response.data;
-          },2000)
+          },3000)
         });
         getSurveyByCaseId(this.$route.query.id).then((response) => {
           if(response.data != undefined){
diff --git a/src/views/lawEnforcement/caseAllocation/caseEdit.vue b/src/views/lawEnforcement/caseAllocation/caseEdit.vue
index d018d259..04242db0 100644
--- a/src/views/lawEnforcement/caseAllocation/caseEdit.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseEdit.vue
@@ -182,9 +182,9 @@
             </van-field>
             <template 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.sex" label="性别" placeholder="请输入性别" :border="false" label-width="auto" input-align="right" >
-                <template #input>
-                  <van-radio-group v-model="form.sex" direction="horizontal">
+              <van-field v-if="form.type=='1'" v-model="form.sex" label="性别" placeholder="请输入性别" :border="false" label-width="auto" input-align="right" >
+                <template v-if="form.type=='1'" #input>
+                  <van-radio-group v-if="form.type=='1'" v-model="form.sex" direction="horizontal">
                     <van-radio name="1">男</van-radio>
                     <van-radio name="2">女</van-radio>
                   </van-radio-group>
diff --git a/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue b/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue
index 128d6c10..078e9054 100644
--- a/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue
@@ -7,8 +7,9 @@
     <div style="height: 58px;"></div>
 
     <div class="search_box">
+
+<!--      v-model="showPopover"-->
       <van-popover
-        v-model="showPopover"
         trigger="click"
         :actions="belongTeamOptions"
         @select="popChange"
@@ -17,7 +18,7 @@
         <template #reference>
           <div class="select_box">
             <p>{{popValue}}</p>
-            <van-icon name="arrow-down" color="#1D6FE9" />
+<!--            <van-icon name="arrow-down" color="#1D6FE9" />-->
           </div>
         </template>
       </van-popover>
@@ -30,22 +31,27 @@
     <div class="main_box" style="margin-top: 10px;">
       <div class="peopleList">
         <van-row class="peoplett">
-          <van-col :span="4">执行主体</van-col>
+          <van-col :span="4">带队人</van-col>
           <van-col :span="20">执行人员</van-col>
         </van-row>
-
-        <van-checkbox-group v-model="result">
-          <van-row v-for="(item,index) in enforcerList" :key="index" >
-            <van-col :span="4">{{item.belongTeam}}</van-col>
-            <van-col :span="6">{{item.name}}</van-col>
-            <van-col :span="10">{{item.enforceNum}}</van-col>
-            <van-col :span="4">
-              <div class="icon_box">
-                <van-checkbox :name="item" shape="square"></van-checkbox>
-              </div>
-            </van-col>
-          </van-row>
-        </van-checkbox-group>
+        <van-radio-group v-model="radio">
+          <van-checkbox-group v-model="result">
+            <van-row v-for="(item,index) in enforcerList" :key="index" >
+              <van-col :span="4">
+                <div class="icon_box">
+                  <van-radio :name="item.id"></van-radio>
+                </div>
+              </van-col>
+              <van-col :span="6">{{item.name}}</van-col>
+              <van-col :span="10">{{item.enforceNum}}</van-col>
+              <van-col :span="4">
+                <div class="icon_box">
+                  <van-checkbox :name="item" shape="square"></van-checkbox>
+                </div>
+              </van-col>
+            </van-row>
+          </van-checkbox-group>
+        </van-radio-group>
       </div>
     </div>
 
@@ -64,6 +70,7 @@
         showPopover: false,
         form:{},
         result:[],
+        radio:'',
         queryParams: {
           // 分页
           pageNum: 1,
@@ -82,16 +89,20 @@
         belongTeamOptions2:[],
 
         popValue:'一中队',
-        surveyForm:{}
+        surveyForm:{
+          tEnforceCaseHandlerList:[]
+        }
 
       };
     },
     created() {
+      this.queryParams.belongTeam = this.$route.query.belongTeam;
       this.getDicts("team_category").then(response => {
         for (var i = 0; i < response.data.length; i++) {
           this.belongTeamOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
         }
         this.belongTeamOptions2 = response.data;
+        this.popValue = this.selectDictLabel(response.data, this.$route.query.belongTeam);
       });
       this.getDictionaries()
       this.getDetail();
@@ -116,26 +127,36 @@
         this.getDictionaries();
       },
       choiceEnforcer(){
-        const list = [];
-        this.result.map(res=>{
-          let obj = {};
-          obj.relationType = "2";
-          obj.enforcerId = res.id;   // 执法人员ID  -- 执法人员选择页面带回值
-          obj.enforcerName = res.name;  // 执法人员姓名 -- 执法人员选择页面带回值
-          obj.enforcerNum = res.enforceNum;  // 执法证号  -- 执法人员选择页面带回值
-          obj.enforcerLeader = "";   // 是否带队  --勾选赋值
-          list.push(obj)
-        })
-        this.surveyForm.tEnforceCaseHandlerList = list;
+        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;
-          updateSurvey(this.surveyForm).then(response => {
-            this.$notify({ type: 'success', message: '保存成功' });
-            setTimeout(function(){
-              history.back(-1);
-            },2000)
-          });
+          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)
+
         });
       },
       getDetail(){
diff --git a/src/views/lawEnforcement/caseAllocation/caseListNew.vue b/src/views/lawEnforcement/caseAllocation/caseListNew.vue
index 09be12ef..12995861 100644
--- a/src/views/lawEnforcement/caseAllocation/caseListNew.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseListNew.vue
@@ -19,7 +19,7 @@
       finished-text="没有更多了"
       @load="getList"
     >
-      <van-swipe-cell v-for="(item,index) in list" :key="index">
+      <van-swipe-cell v-for="(item,index) in list" :key="index" :disabled="item.caseProgress > 4">
         <van-cell :title="item.caseName" center :to="{name:'lawEnforcementCaseDetailNew', query: {id:item.id}}">
           <template #icon>
             <van-icon name="../../../../static/images/lawEnforcement/new/list_icon_01.png" size="20" color="#FF4646" style="margin-right: 10px;" />
@@ -28,7 +28,7 @@
             <p>{{item.caseSourceText}}</p>
             <p>第{{item.belongTeamText}}</p>
             <p>{{item.registerDate}}</p>
-            <p>{{item.caseProgressName}}</p>
+            <p>{{ item.caseProgressName}}</p>
           </template>
         </van-cell>
         <template #right>
@@ -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}}" class="delete-button" >添加<br/>执法<br/>员</van-button>
+              <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-col>
           </van-row>
         </template>
diff --git a/src/views/lawEnforcement/caseQuery/caseQuery.vue b/src/views/lawEnforcement/caseQuery/caseQuery.vue
index e0f47e2f..5043a067 100644
--- a/src/views/lawEnforcement/caseQuery/caseQuery.vue
+++ b/src/views/lawEnforcement/caseQuery/caseQuery.vue
@@ -19,10 +19,11 @@
         @load="getList"
         >
         <van-swipe-cell v-for="(item,index) in list" :key="index">
-          <van-cell :title="item.caseName" :to="{name:'lawEnforcementCaseDetailNew', query: {id:item.id}}">
+          <van-cell :title="item.caseName" :to="{name:'caseDetail', query: {id:item.id,caseProgress:item.caseProgress}}">
             <template #label>
-              <p>{{item.caseNumPart1}}农 {{item.caseNumPart2}} [{{item.caseNumPart3}}] {{item.caseNum}}号</p>
-              <p>{{item.caseProgress}}</p>
+              <p v-if="item.caseNum == null">无</p>
+              <p v-else>{{item.caseNumPart1}}农 {{item.caseNumPart2}} {{item.caseNumPartType}} [{{item.caseNumPart3}}] {{item.caseNum}}号</p>
+              <p>{{item.caseProgressText}}</p>
             </template>
           </van-cell>
           <template #right>
@@ -71,7 +72,7 @@
         var _this = this;
         listCase(_this.caseQueryParams).then(response => {
           response.rows.map(res=>{
-            res.caseProgress = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
+            res.caseProgressText = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
             _this.list.push(res);
           })
           if(_this.list.length >= response.total){
diff --git a/src/views/lawEnforcement/caseQuery/caseQueryDocument.vue b/src/views/lawEnforcement/caseQuery/caseQueryDocument.vue
index 48df9a74..f4784526 100644
--- a/src/views/lawEnforcement/caseQuery/caseQueryDocument.vue
+++ b/src/views/lawEnforcement/caseQuery/caseQueryDocument.vue
@@ -10,68 +10,68 @@
         <p>{{caseName}}</p>
     </div>
 
-    <div class="main_box">
+    <div class="main_box" style="margin-bottom: 10px;" v-for="(item,index) in attaCount" :key="index">
       <van-cell>
         <template #title>
           <van-icon name="../../../static/images/lawEnforcement/icon/icon_zxfa.png" size="20"></van-icon>
-          <span class="custom-title">登记<i class="bgBlue"></i></span>
+          <span class="custom-title">{{item.caseProgressName}}<i class="bgBlue"></i></span>
         </template>
       </van-cell>
       <div class="peopleList">
-        <van-row v-for="(item,index) in dengjiList" :key="index" >
+        <van-row v-for="(itemChildren,indexChildren) in item.caseProgressAttach" :key="indexChildren" >
           <van-col :span="20">
             <img src="../../../../static/images/lawEnforcement/icon/record_icon_03.png"/>
-            <p>{{item[index].substr(27,item[index].length)}}</p>
+            <p>{{itemChildren.substr(51,itemChildren.length)}}</p>
           </van-col>
           <van-col :span="4">
-            <a :href="'/api'+item[index]">下载</a>
+            <a :href="'/api'+itemChildren">下载</a>
           </van-col>
         </van-row>
-        <van-empty v-if="dengjiList == null || dengjiList == undefined || dengjiList == '' " description="暂无文件" />
+        <van-empty v-if="item.caseProgressAttach == null || item.caseProgressAttach == undefined || item.caseProgressAttach == '' " description="暂无文件" />
       </div>
     </div>
 
-    <div class="main_box" style="margin-top: 10px;">
-      <van-cell>
-        <template #title>
-          <van-icon name="../../../static/images/lawEnforcement/icon/icon_kc.png" size="20"></van-icon>
-          <span class="custom-title">勘察<i class="bgBlue"></i></span>
-        </template>
-      </van-cell>
-      <div class="peopleList">
-        <van-row v-for="(item,index) in kanchaList" :key="index" >
-          <van-col :span="20">
-            <img src="../../../../static/images/lawEnforcement/icon/record_icon_03.png" />
-            <p>{{item[index].substr(27,item[index].length)}}</p>
-          </van-col>
-          <van-col :span="4">
-            <a :href="'/api'+item[index]">下载</a>
-          </van-col>
-        </van-row>
-        <van-empty v-if="kanchaList == null || kanchaList == undefined || kanchaList == '' " description="暂无文件" />
-      </div>
-    </div>
+<!--    <div class="main_box" style="margin-top: 10px;">-->
+<!--      <van-cell>-->
+<!--        <template #title>-->
+<!--          <van-icon name="../../../static/images/lawEnforcement/icon/icon_kc.png" size="20"></van-icon>-->
+<!--          <span class="custom-title">勘察<i class="bgBlue"></i></span>-->
+<!--        </template>-->
+<!--      </van-cell>-->
+<!--      <div class="peopleList">-->
+<!--        <van-row v-for="(item,index) in kanchaList" :key="index" >-->
+<!--          <van-col :span="20">-->
+<!--            <img src="../../../../static/images/lawEnforcement/icon/record_icon_03.png" />-->
+<!--            <p>{{item[index].substr(27,item[index].length)}}</p>-->
+<!--          </van-col>-->
+<!--          <van-col :span="4">-->
+<!--            <a :href="'/api'+item[index]">下载</a>-->
+<!--          </van-col>-->
+<!--        </van-row>-->
+<!--        <van-empty v-if="kanchaList == null || kanchaList == undefined || kanchaList == '' " description="暂无文件" />-->
+<!--      </div>-->
+<!--    </div>-->
 
-    <div class="main_box" style="margin-top: 10px;">
-      <van-cell>
-        <template #title>
-          <van-icon name="../../../static/images/lawEnforcement/icon/icon_ajwd.png" size="20"></van-icon>
-          <span class="custom-title">备案<i class="bgBlue"></i></span>
-        </template>
-      </van-cell>
-      <div class="peopleList">
-        <van-row v-for="(item,index) in beianList" :key="index" >
-          <van-col :span="20">
-            <img src="../../../../static/images/lawEnforcement/icon/record_icon_03.png"/>
-            <p>{{item[index].substr(27,item[index].length)}}</p>
-          </van-col>
-          <van-col :span="4">
-            <a :href="'/api'+item[index]">下载</a>
-          </van-col>
-        </van-row>
-        <van-empty v-if="beianList == null || beianList == undefined || beianList == '' " description="暂无文件" />
-      </div>
-    </div>
+<!--    <div class="main_box" style="margin-top: 10px;">-->
+<!--      <van-cell>-->
+<!--        <template #title>-->
+<!--          <van-icon name="../../../static/images/lawEnforcement/icon/icon_ajwd.png" size="20"></van-icon>-->
+<!--          <span class="custom-title">备案<i class="bgBlue"></i></span>-->
+<!--        </template>-->
+<!--      </van-cell>-->
+<!--      <div class="peopleList">-->
+<!--        <van-row v-for="(item,index) in beianList" :key="index" >-->
+<!--          <van-col :span="20">-->
+<!--            <img src="../../../../static/images/lawEnforcement/icon/record_icon_03.png"/>-->
+<!--            <p>{{item[index].substr(27,item[index].length)}}</p>-->
+<!--          </van-col>-->
+<!--          <van-col :span="4">-->
+<!--            <a :href="'/api'+item[index]">下载</a>-->
+<!--          </van-col>-->
+<!--        </van-row>-->
+<!--        <van-empty v-if="beianList == null || beianList == undefined || beianList == '' " description="暂无文件" />-->
+<!--      </div>-->
+<!--    </div>-->
 
   </div>
 </template>
@@ -110,6 +110,7 @@
         dengjiList:[],
         kanchaList:[],
         beianList:[],
+        attaCount:{}
       };
     },
     created() {
@@ -129,14 +130,10 @@
             if (res.caseProgressAttach){
               res.caseProgressAttach = res.caseProgressAttach.split(',');
             }
-            if(res.caseProgressName=='登记'){
-              this.dengjiList.push(res.caseProgressAttach);
-            }else if(res.caseProgressName=='勘察'){
-              this.kanchaList.push(res.caseProgressAttach);
-            }else if(res.caseProgressName=='备案'){
-              this.beianList.push(res.caseProgressAttach);
-            }
           })
+          setTimeout(function(){
+            _this.attaCount = response.rows;
+          },2000)
         });
       },
       goBack(){
diff --git a/src/views/lawEnforcement/supervise/enterpriseRelation.vue b/src/views/lawEnforcement/supervise/enterpriseRelation.vue
index e1bbd9e2..7dec91c0 100644
--- a/src/views/lawEnforcement/supervise/enterpriseRelation.vue
+++ b/src/views/lawEnforcement/supervise/enterpriseRelation.vue
@@ -17,14 +17,14 @@
         @load="getList"
         >
         <van-swipe-cell v-for="(item,index) in list" :key="index">
-          <van-cell center :to="{name:'lawEnforcementTaskDetail', query: {id:item.id}}">
+          <van-cell center :to="{name:'caseDetail', query: {id:item.id,caseProgress:item.caseProgress}}">
             <template #title>
               <span>{{item.caseName}}</span>
             </template>
             <template #label>
               <div class="label">
-                <p>投诉案件</p>
-                <p>{{item.caseProgress}}</p>
+                <p>{{item.caseSource}}</p>
+                <p>{{item.caseProgressText}}</p>
               </div>
             </template>
           </van-cell>
@@ -68,7 +68,7 @@
         var _this = this;
         listCase(_this.caseQueryParams).then(response => {
           response.rows.map(res=>{
-            res.caseProgress = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
+            res.caseProgressText = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
             res.caseSource = res.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, res.caseSource);
             _this.list.push(res);
           })
diff --git a/src/views/lawEnforcement/supervise/individualRelation.vue b/src/views/lawEnforcement/supervise/individualRelation.vue
index 45810822..54bdb096 100644
--- a/src/views/lawEnforcement/supervise/individualRelation.vue
+++ b/src/views/lawEnforcement/supervise/individualRelation.vue
@@ -17,14 +17,14 @@
         @load="getList"
         >
         <van-swipe-cell v-for="(item,index) in list" :key="index">
-          <van-cell center :to="{name:'lawEnforcementTaskDetail', query: {id:item.id}}">
+          <van-cell center :to="{name:'caseDetail', query: {id:item.id,caseProgress:item.caseProgress}}">
             <template #title>
               <span>{{item.caseName}}</span>
             </template>
             <template #label>
               <div class="label">
                 <p>{{item.caseSource}}</p>
-                <p>{{item.caseProgress}}</p>
+                <p>{{item.caseProgressText}}</p>
               </div>
             </template>
           </van-cell>
@@ -69,7 +69,7 @@
         var _this = this;
         listCase(_this.caseQueryParams).then(response => {
           response.rows.map(res=>{
-            res.caseProgress = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
+            res.caseProgressText = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
             res.caseSource = res.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, res.caseSource);
             _this.list.push(res);
           })
diff --git a/src/views/lawEnforcement/task/signInRecord.vue b/src/views/lawEnforcement/task/signInRecord.vue
index c4034c66..15b33699 100644
--- a/src/views/lawEnforcement/task/signInRecord.vue
+++ b/src/views/lawEnforcement/task/signInRecord.vue
@@ -71,7 +71,11 @@
             }else{
               res.caseProgressAttach = [];
             }
+
             res.caseProgressAttach.map((rr,index)=>{
+              if (i == fileForm.length-1){
+                this.openPic2.push(rr)
+              }
               res.caseProgressAttach[index] = {
                 url: '/api' + rr,
                 isImage: true
@@ -79,12 +83,13 @@
             })
             this.fileList.push(res)
           })
-          console.log(this.fileList)
+          console.log(this.openPic2)
         });
       },
       afterRead(file) {
         // 此时可以自行将文件上传至服务器
         this.openPic.push(file.file);
+
         let params1 = new FormData();
         params1.append("file", file.file);
         commonUpload(params1).then((r1) => {
@@ -101,7 +106,9 @@
           attachement: this.openPic2.join(','),  // 打卡上传附件(附件的路径字符串，多个附件路径之前通过英文逗号分隔)
         };
         attachmentEdit(queryParams).then((r1) => {
-
+          if (r1.code == 200){
+            this.$notify({ type: 'success', message: '保存成功' });
+          }
         })
       }
     },
diff --git a/src/views/lawEnforcement/task/task.vue b/src/views/lawEnforcement/task/task.vue
index 3d51e4d9..66403e9b 100644
--- a/src/views/lawEnforcement/task/task.vue
+++ b/src/views/lawEnforcement/task/task.vue
@@ -17,7 +17,7 @@
               <span>{{item.caseName}}</span>
               <div class="first">
                 <span>{{item.caseSource}}</span>
-                <span>分配时间：{{item.registerDate}}</span>
+                <span>分配时间：{{item.handlerSetDate}}</span>
               </div>
             </template>
             <template #label>
diff --git a/src/views/lawEnforcement/task/taskHandle.vue b/src/views/lawEnforcement/task/taskHandle.vue
index 2e26d15b..03373ca5 100644
--- a/src/views/lawEnforcement/task/taskHandle.vue
+++ b/src/views/lawEnforcement/task/taskHandle.vue
@@ -153,17 +153,63 @@
                   <van-col :span="4">
                     <div class="icon_box">
                       <van-checkbox v-model="item.enforcerLeader" shape="square"></van-checkbox>
-                      <van-icon name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'CaseHand')"></van-icon>
+                      <van-icon v-if="caseActive == 1" name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'CaseHand')"></van-icon>
                     </div>
                   </van-col>
                 </van-row>
-                <img src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'CaseHand',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
+                <img v-if="caseActive == 1" 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>
         </div>
 
         <van-form :readonly="caseProgress != 1 || (surveyForm.instanceId!='' && surveyForm.instanceId!=null && surveyForm.instanceId!=undefined)">
+
+          <div class="main_box">
+            <van-cell>
+              <template #title>
+                <van-icon name="../../../static/images/lawEnforcement/icon/icon_xckc.png" size="20"></van-icon>
+                <span class="custom-title">现场检查<i class="bgBlue"></i></span>
+              </template>
+            </van-cell>
+
+            <van-field
+              readonly
+              clickable
+              required
+              :rules="[{ required: true , message:'请选择勘察开始时间'}]"
+              v-model="surveyForm.surveyStartTime"
+              label="勘察开始时间"
+              placeholder="请选择勘察开始时间"
+              @click="showSurveyStartTime = true"
+              input-align="right"
+              right-icon="arrow-down"
+              label-width="auto"
+            />
+
+            <van-field
+              readonly
+              clickable
+              required
+              :rules="[{ required: true , message:'请选择勘察结束时间'}]"
+              v-model="surveyForm.surveyEndTime"
+              label="勘察结束时间"
+              placeholder="请选择勘察结束时间"
+              @click="showSurveyEndTime = true"
+              input-align="right"
+              right-icon="arrow-down"
+              label-width="auto"
+            />
+
+            <van-field input-align="right" label-width="auto" label="当事人" placeholder="当事人" v-model="surveyForm.dangshiren" />
+            <van-field input-align="right" label-width="auto" label="记录人" placeholder="记录人" v-model="surveyForm.recorder" />
+            <van-field input-align="right" label-width="auto" label="检查（勘察）地点" placeholder="检查（勘察）地点" v-model="surveyForm.surveyAddr" />
+
+            <van-field readonly input-align="right" label-width="auto" label="现场检查（勘察）情况"/>
+            <van-field v-model="surveyForm.surveyDescription" rows="2" autosize type="textarea" placeholder="现场检查（勘察）情况" />
+
+          </div>
+
           <div class="main_box">
             <van-cell>
               <template #title>
@@ -311,7 +357,7 @@
               label-width="auto"
             />
 
-            <van-field v-if="surveyForm.instanceId==''&&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>
 
@@ -377,12 +423,12 @@
                   <van-col :span="4">
                     <div class="icon_box">
                       <van-checkbox v-model="item.enforcerLeader" shape="square"></van-checkbox>
-                      <van-icon name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'PutRecord')"></van-icon>
+                      <van-icon v-if="caseActive == 2" 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 src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'PutRecord',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
+                <img v-if="caseActive == 2" 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>
@@ -442,6 +488,8 @@
               </template>
             </van-field>
 
+            <van-field v-if="putRecordForm.savePlace==2" v-model="putRecordForm.savePlaceAddress" rows="2" autosize type="textarea" placeholder="请输入异地具体保存地址" />
+
             <van-field readonly input-align="right" label-width="auto" label="现场情况"/>
             <van-field v-model="putRecordForm.sceneCondition" rows="2" autosize type="textarea" placeholder="现场情况" />
 
@@ -450,18 +498,18 @@
             <van-field input-align="right" label-width="auto" label="诉讼单位" placeholder="诉讼单位" v-model="putRecordForm.lawsuitDept" />
             <div class="peopleList cf">
               <van-row>
-                <van-col :span="5">财务名称</van-col>
+                <van-col :span="5">财物名称</van-col>
                 <van-col :span="3">规格</van-col>
                 <van-col :span="3">数量</van-col>
-                <van-col :span="6">生产日期</van-col>
+                <van-col :span="6">生产日期(批号)</van-col>
                 <van-col :span="7">生产经营单位</van-col>
               </van-row>
 
               <van-row v-for="(item,index) in tEnforceDetainHandlerList" :key="index">
-                <van-col :span="5"><van-field input-align="center" placeholder="财务名称" v-model="item.name" /></van-col>
+                <van-col :span="5"><van-field input-align="center" placeholder="财物名称" v-model="item.name" /></van-col>
                 <van-col :span="3"><van-field input-align="center" placeholder="规格" v-model="item.size" /></van-col>
                 <van-col :span="3"><van-field input-align="center" placeholder="数量" v-model="item.propertyNum" /></van-col>
-                <van-col :span="6"><van-field input-align="center" placeholder="生产日期" v-model="item.productTimeNum" /></van-col>
+                <van-col :span="6"><van-field input-align="center" placeholder="生产日期(批号)" v-model="item.productTimeNum" /></van-col>
                 <van-col :span="7"><van-field input-align="center" placeholder="生产经营单位" v-model="item.productUnit" /></van-col>
               </van-row>
               <img src="../../../../static/images/lawEnforcement/new/addFinance_btn.png" style="margin: 0 auto;" @click="addFinance" v-if="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )">
@@ -583,22 +631,6 @@
               <van-cell title="抽样产品附件" />
               <van-uploader v-model="item.attachementList" :after-read="afterReadAttachement(index)" :before-delete="deleteFileAttachement(index)" :show-upload="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )" :deletable="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )" />
   <!--            :show-upload="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )" :deletable="caseProgress == 1 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )"-->
-              <div class="cf">
-                <van-row>
-                  <van-col :span="6">
-                    <van-image src="../../../../static/images/lawEnforcement/icon/icon_fj.png" width="50" />
-                    <p>产品确认</p>
-                    <p>通知书</p>
-                  </van-col>
-                  <van-col :span="6">
-                    <van-image src="../../../../static/images/lawEnforcement/icon/icon_fj.png" width="50" />
-                    <p>抽样取证</p>
-                    <p>凭证</p>
-                  </van-col>
-                  <van-col :span="6"></van-col>
-                  <van-col :span="6"></van-col>
-                </van-row>
-              </div>
             </div>
             <div style="text-align: center;margin-bottom: 10px;">
               <img src="../../../../static/images/lawEnforcement/new/addGoods_btn.png" style="margin: 0 auto;" @click="addGoods" v-if="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )">
@@ -678,12 +710,12 @@
                   <van-col :span="4">
                     <div class="icon_box">
                       <van-checkbox v-model="item.enforcerLeader" shape="square"></van-checkbox>
-                      <van-icon name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'evidence')"></van-icon>
+                      <van-icon v-if="caseActive == 3" 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 src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'evidence',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
+                <img v-if="caseActive == 3" 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>
@@ -1285,7 +1317,7 @@
     <van-popup v-model="showAskStartTime" position="bottom">
       <van-datetime-picker
         v-model="askStartTime"
-        type="date"
+        type="datetime"
         title="选择年月日"
         @confirm="onConfirmAskStartTime"
         @cancel="showAskStartTime = false"
@@ -1295,7 +1327,7 @@
     <van-popup v-model="showAskEndTime" position="bottom">
       <van-datetime-picker
         v-model="askEndTime"
-        type="date"
+        type="datetime"
         title="选择年月日"
         @confirm="onConfirmAskEndTime"
         @cancel="showAskEndTime = false"
@@ -1382,6 +1414,26 @@
       />
     </van-popup>
 
+    <van-popup v-model="showSurveyStartTime" position="bottom" get-container="#app">
+      <van-datetime-picker
+        v-model="confirmSurveyStartTime"
+        type="datetime"
+        title="选择年月日"
+        @confirm="onConfirmSurveyStartTime"
+        @cancel="showSurveyStartTime = false"
+      />
+    </van-popup>
+
+    <van-popup v-model="showSurveyEndTime" position="bottom" get-container="#app">
+      <van-datetime-picker
+        v-model="confirmSurveyEndTime"
+        type="datetime"
+        title="选择年月日"
+        @confirm="onConfirmSurveyEndTime"
+        @cancel="showSurveyEndTime = false"
+      />
+    </van-popup>
+
     <van-popup v-model="showSurveyResult" position="bottom">
       <van-picker
         show-toolbar
@@ -1451,6 +1503,9 @@ export default {
       showTimeliness:false,
       showProductTimeNum:false,
       showConfirmTimeliness:false,
+      showSurveyStartTime:false,
+      showSurveyEndTime:false,
+
       form:{},
       caseProgress:0,
       caseActive:0,
@@ -1493,6 +1548,9 @@ export default {
       timeliness:new Date(),
       productTimeNum:new Date(),
       confirmTimeliness:new Date(),
+
+      confirmSurveyStartTime:new Date(),
+      confirmSurveyEndTime:new Date(),
       fileList: [
         { url: 'https://img01.yzcdn.cn/vant/leaf.jpg' },
         // Uploader 根据文件后缀来判断是否为图片文件
@@ -2069,7 +2127,9 @@ export default {
               _this.tEnforceCaseHandlerList = responseSurvey.data.tEnforceCaseHandlerList;
               responseSurvey.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
                 let data = {
-                  enforcerId : responseEnforce.enforcerId
+                  enforcerId : responseEnforce.enforcerId,
+                  caseId:this.form.id,
+                  relationType: "2"
                 }
                 enforceLockinCount(data).then(resEnforceLockin => {
                   _this.$set(_this.tEnforceCaseHandlerList[index],"num",resEnforceLockin.data)
@@ -2119,7 +2179,7 @@ export default {
               }
               _this.putRecordForm = responsePutRecord.data;
               // _this.tEnforcePutRecordHandlerList = responsePutRecord.data.tEnforceCaseHandlerList == null ? [] : responsePutRecord.data.tEnforceCaseHandlerList;
-              if (responsePutRecord.data.instanceId == ''){
+              if (responsePutRecord.data.id == ''){
 
                 // 立案表单没有保存之前,办理人员默认获取上一节点勘察的办理人员列表
                 const queryEnforcerParams = {
@@ -2132,7 +2192,9 @@ export default {
                   if (responseHandlerList.data){
                     responseHandlerList.data.map((responseEnforce,index)=>{
                       let data = {
-                        enforcerId : responseEnforce.enforcerId
+                        enforcerId : responseEnforce.enforcerId,
+                        caseId:this.form.id,
+                        relationType: "3"
                       }
                       enforceLockinCount(data).then(resEnforceLockin => {
                         _this.$set(_this.tEnforcePutRecordHandlerList[index],"num",resEnforceLockin.data)
@@ -2146,7 +2208,9 @@ export default {
                 if (responsePutRecord.data.tEnforceCaseHandlerList){
                   responsePutRecord.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
                     let data = {
-                      enforcerId : responseEnforce.enforcerId
+                      enforcerId : responseEnforce.enforcerId,
+                      caseId:this.form.id,
+                      relationType: "3"
                     }
                     enforceLockinCount(data).then(resEnforceLockin => {
                       _this.$set(_this.tEnforcePutRecordHandlerList[index],"num",resEnforceLockin.data)
@@ -2231,7 +2295,7 @@ export default {
 
               _this.evidenceForm = responseEvidence.data;
 
-              if (responseEvidence.data.instanceId == ''){
+              if (responseEvidence.data.id == ''){
 
                 // 取证表单没有保存之前,办理人员默认获取上一节点立案的办理人员列表
                 const queryEnforcerParams = {
@@ -2245,7 +2309,9 @@ export default {
                   if (responseHandlerList.data){
                     responseHandlerList.data.map((responseEnforce,index)=>{
                       let data = {
-                        enforcerId : responseEnforce.enforcerId
+                        enforcerId : responseEnforce.enforcerId,
+                        caseId:this.form.id,
+                        relationType: "4"
                       }
                       enforceLockinCount(data).then(resEnforceLockin => {
                         _this.$set(_this.tEnforceEvidenceHandlerList[index],"num",resEnforceLockin.data)
@@ -2259,7 +2325,9 @@ export default {
                 if (responseEvidence.data.tEnforceCaseHandlerList){
                   responseEvidence.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
                     let data = {
-                      enforcerId : responseEnforce.enforcerId
+                      enforcerId : responseEnforce.enforcerId,
+                      caseId:this.form.id,
+                      relationType: "4"
                     }
                     enforceLockinCount(data).then(resEnforceLockin => {
                       _this.$set(_this.tEnforceEvidenceHandlerList[index],"num",resEnforceLockin.data)
@@ -2497,7 +2565,6 @@ export default {
       console.log(this.form)
       if((this.form.caseStatus == "2" || this.form.caseStatus == "3") &&
         (this.form.caseProgress=="8" || this.form.caseProgress=="9")){
-        console.log("a")
         // 已结束备案或者结案阶段的案件,查询显示已保存案件的历史流程节点
         var progressParam = {
           "caseId": this.form.id
@@ -2665,13 +2732,13 @@ export default {
     },
 
     onConfirmAskStartTime(data){
-      this.surveyForm.askStartTime = this.format(data,'yyyy-MM-dd');
+      this.surveyForm.askStartTime = this.format(data,'yyyy-MM-dd HH:mm');
       this.askStartTime = data;
       this.showAskStartTime = false;
     },
 
     onConfirmAskEndTime(data){
-      this.surveyForm.askEndTime = this.format(data,'yyyy-MM-dd');
+      this.surveyForm.askEndTime = this.format(data,'yyyy-MM-dd HH:mm');
       this.askEndTime = data;
       this.showAskEndTime = false;
     },
@@ -2756,6 +2823,18 @@ export default {
       this.showConfirmTimeliness = false;
     },
 
+    onConfirmSurveyStartTime(data){
+      this.surveyForm.surveyStartTime = this.format(data,'yyyy-MM-dd HH:mm');
+      this.confirmSurveyStartTime = data;
+      this.showSurveyStartTime = false;
+    },
+
+    onConfirmSurveyEndTime(data){
+      this.surveyForm.surveyEndTime = this.format(data,'yyyy-MM-dd HH:mm');
+      this.confirmSurveyEndTime = data;
+      this.showSurveyEndTime = false;
+    },
+
     addFinance(){
       this.tEnforceDetainHandlerList.push({})
     },
@@ -2814,16 +2893,27 @@ export default {
     },
 
     preservation(){
+      this.tEnforceCaseHandlerList.map(res=>{
+        res.relationType = '2';
+      })
       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)
         });
       } else {
         addSurvey(this.surveyForm).then(response => {
           this.$notify({ type: 'success', message: '新增成功' });
           this.surveyForm.id = response.data;
+
+          setTimeout(function(){
+            history.back(-1);
+          },2000)
         });
       }
     },
@@ -2844,7 +2934,11 @@ export default {
               method: 'post',
             });
           }).then(() => {
-            this.$notify({ type: 'success', message: '设置成功' });
+            this.$notify({ type: 'success', message: '提交成功' });
+
+            setTimeout(function(){
+              history.back(-1);
+            },2000)
           })
         } else {
           // 不审批直接更新进度到备案
@@ -2885,7 +2979,11 @@ export default {
               // 更新案件的节点和状态
               updateCase(caseParam).then(response => {
                 addProgress(progressParam).then(response => {
-                  this.$notify({ type: 'success', message: '设置成功' });
+                  this.$notify({ type: 'success', message: '提交成功' });
+
+                  setTimeout(function(){
+                    history.back(-1);
+                  },2000)
                 });
               });
             });
@@ -2898,6 +2996,10 @@ export default {
 
     /** 案件立案提交按钮 */
     submitPutRecordForm() {
+
+      this.tEnforcePutRecordHandlerList.map(res=>{
+        res.relationType = '3';
+      })
       // 办理人员列表
       this.putRecordForm.tEnforceCaseHandlerList = this.tEnforcePutRecordHandlerList;
       // 查封扣押财物列表
@@ -2929,6 +3031,10 @@ export default {
               updateSampling(this.samplingForm).then(responseSampling => {
                 if (responseSampling.code == "200") {
                   this.$notify({ type: 'success', message: '修改成功' });
+
+                  setTimeout(function(){
+                    history.back(-1);
+                  },2000)
                 }
               });
             } else {
@@ -2936,6 +3042,10 @@ export default {
                 if (responseSampling.code == "200") {
                   this.$notify({ type: 'success', message: '新增成功' });
                   _this.samplingForm.id = responseSampling.data;
+
+                  setTimeout(function(){
+                    history.back(-1);
+                  },2000)
                 }
               });
             }
@@ -2950,6 +3060,10 @@ export default {
                 this.$notify({ type: 'success', message: '新增成功' });
                 _this.putRecordForm.id = responsePutrecord.data;
                 _this.samplingForm.id = responseSampling.data;
+
+                setTimeout(function(){
+                  history.back(-1);
+                },2000)
               }
             });
             _this.putRecordDiglogStatus = false;
@@ -2973,7 +3087,11 @@ export default {
             method: 'post',
           });
         }).then(() => {
-          this.$notify({ type: 'success', message: '设置成功' });
+          this.$notify({ type: 'success', message: '提交成功' });
+
+          setTimeout(function(){
+            history.back(-1);
+          },2000)
         })
       }
     },
@@ -2981,6 +3099,9 @@ export default {
     /** 案件取证提交按钮 */
     submitEvidenceForm() {
       this.surveyDiglogStatus = false;
+      this.tEnforceEvidenceHandlerList.map(res=>{
+        res.relationType = '4';
+      })
       this.evidenceForm.tEnforceCaseHandlerList = this.tEnforceEvidenceHandlerList;
       this.evidenceForm.detectResults = this.detectResults;
       console.log(this.evidenceForm.detectResults)
@@ -2996,15 +3117,23 @@ export default {
       if (this.evidenceForm.id != null) {
         this.surveyDiglogStatus = true;
         updateEvidence(this.evidenceForm).then(response => {
-          this.$notify({ type: 'success', message: '修改成功' });
+          this.$notify({ type: 'success', message: '提交成功' });
           this.surveyDiglogStatus = false;
+
+          setTimeout(function(){
+            history.back(-1);
+          },2000)
         });
       } else {
         this.surveyDiglogStatus = true;
         addEvidence(this.evidenceForm).then(response => {
-          this.$notify({ type: 'success', message: '新增成功' });
+          this.$notify({ type: 'success', message: '提交成功' });
           this.evidenceForm.id = response.data;
           this.surveyDiglogStatus = false;
+
+          setTimeout(function(){
+            history.back(-1);
+          },2000)
         });
       }
     },
@@ -3024,8 +3153,12 @@ export default {
             method: 'post',
           });
         }).then(() => {
-          this.$notify({ type: 'success', message: '设置成功' });
+          this.$notify({ type: 'success', message: '提交成功' });
           this.cancel();
+
+          setTimeout(function(){
+            history.back(-1);
+          },2000)
         })
       }
     },
diff --git a/src/views/lawEnforcement/trace/feed.vue b/src/views/lawEnforcement/trace/feed.vue
index 05229723..005b1654 100644
--- a/src/views/lawEnforcement/trace/feed.vue
+++ b/src/views/lawEnforcement/trace/feed.vue
@@ -98,7 +98,9 @@
       },
       goSubmit(){
         this.list = [];
-        this.getList();
+        this.queryParams.pageNum = 1 ;
+        this.finished = false;
+        this.loading = false;
       }
     },
   }
diff --git a/src/views/lawEnforcement/trace/fertilizer.vue b/src/views/lawEnforcement/trace/fertilizer.vue
index 0e5c513b..71d18ebe 100644
--- a/src/views/lawEnforcement/trace/fertilizer.vue
+++ b/src/views/lawEnforcement/trace/fertilizer.vue
@@ -104,7 +104,9 @@
       },
       goSubmit(){
         this.list = [];
-        this.getList();
+        this.queryParams.pageNum = 1 ;
+        this.finished = false;
+        this.loading = false;
       }
     },
   }
diff --git a/src/views/lawEnforcement/trace/pesticides.vue b/src/views/lawEnforcement/trace/pesticides.vue
index b7a61d32..d39ef060 100644
--- a/src/views/lawEnforcement/trace/pesticides.vue
+++ b/src/views/lawEnforcement/trace/pesticides.vue
@@ -169,7 +169,10 @@
       },
       goSubmit(){
         this.list = [];
-        this.getList();
+        this.queryParams.pageNum = 1 ;
+        this.finished = false;
+        this.loading = false;
+        // this.getList();
       }
     },
   }
diff --git a/src/views/lawEnforcement/trace/product.vue b/src/views/lawEnforcement/trace/product.vue
index 7a4eb8cf..ed27007e 100644
--- a/src/views/lawEnforcement/trace/product.vue
+++ b/src/views/lawEnforcement/trace/product.vue
@@ -103,7 +103,9 @@
       },
       goSubmit(){
         this.list = [];
-        this.getList();
+        this.queryParams.pageNum = 1 ;
+        this.finished = false;
+        this.loading = false;
       }
     },
   }
diff --git a/src/views/lawEnforcement/trace/seed.vue b/src/views/lawEnforcement/trace/seed.vue
index 6030c496..296f209c 100644
--- a/src/views/lawEnforcement/trace/seed.vue
+++ b/src/views/lawEnforcement/trace/seed.vue
@@ -99,7 +99,9 @@
       },
       goSubmit(){
         this.list = [];
-        this.getList();
+        this.queryParams.pageNum = 1 ;
+        this.finished = false;
+        this.loading = false;
       }
     },
   }
diff --git a/src/views/lawEnforcement/trace/veterinary.vue b/src/views/lawEnforcement/trace/veterinary.vue
index 43e864c0..0394ef27 100644
--- a/src/views/lawEnforcement/trace/veterinary.vue
+++ b/src/views/lawEnforcement/trace/veterinary.vue
@@ -98,7 +98,9 @@
       },
       goSubmit(){
         this.list = [];
-        this.getList();
+        this.queryParams.pageNum = 1 ;
+        this.finished = false;
+        this.loading = false;
       }
     },
   }
diff --git a/static/images/lawEnforcement/icon/icon_xckc.png b/static/images/lawEnforcement/icon/icon_xckc.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c0c15d21746dc0f4b32305268e322564180e205
GIT binary patch
literal 525
zcmV+o0`mQdP)<h;3K|Lk000e1NJLTq000yK000#T1^@s6M%B)!00004b3#c}2nYxW
zd<bNS0005RNkl<ZI8VJ*O-{mK5S{no&jw>%C?r6{6Nop^6Nrfizyk=qfp7u~7f??i
zdlzy8djm0G0=fVbR%pI)rq~4kz*ggzG+lK1`sU4hQ#kIxS>f?15tZbMb(pBhK<(b!
z@R2L`&jqE(#B#?l79w$pfI+vO+Ci?;XJ)E(8>wnMFru8>FA~$`GnTgg1TgD9?t<+#
z!|Z(m6bYIH+MmOAXn{S|OzUO?3VpUznAiTuEO|q3Ezo=>;5?wOp8qf4w1(mIl>xD>
z5V51y3OyIHoyjocK9pcNuf;IrTY_Vl&%|4IAo$|f0)S1OXxCeBMb=OltMIK(BURLw
zHCahJZUMa7si(Ih0SeoKu)CRNqX3!Xo@)$FJM|PI0jAwSev!ww;<+R7oJKS_*>ca5
zwkweV-(HsXuq`YPRI?yvmM@raC2>8B#88Ws<$@hI0oo23%7E@=WJxyI)wIO&p)v~+
zWK3&B3;tv<w5bu4={w(M`KL(<r!8#Hkx2Nz2AuxzyOw2QZCQ>tvK$Y7%I;%bxDTcM
z9c0V>s%UW{v1-dIZ^r=@4GYrxQ@4@M2gaOOA@~ghk&AKs7qjg3ytVc#yO)0&&d=XC
P00000NkvXXu0mjf9)Im$

literal 0
HcmV?d00001