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

---
 src/api/lawEnforcement/index.js               |   73 +
 src/router/index.js                           |   28 +
 .../lawEnforcement/caseAllocation/caseAdd.vue |  565 +++-
 .../caseAllocation/caseDetail.vue             |   24 +-
 .../caseAllocation/caseDistribution.vue       |   20 +-
 .../caseAllocation/caseList.vue               |  311 ++
 src/views/lawEnforcement/index_new.vue        |    2 +-
 .../lawEnforcement/task/signInRecord.vue      |  195 +-
 src/views/lawEnforcement/task/task.vue        |   72 +-
 src/views/lawEnforcement/task/taskDetail.vue  |  135 +-
 src/views/lawEnforcement/task/taskHandle.vue  | 2541 +++++++++++++++++
 src/views/lawEnforcement/task/taskRecord.vue  |   70 +-
 src/views/lawEnforcement/task/taskSignIn.vue  |  140 +-
 .../lawEnforcement/task/taskSignInSee.vue     |  271 ++
 .../icon/signInRecord_icon_03.png             |  Bin 0 -> 1980 bytes
 15 files changed, 4042 insertions(+), 405 deletions(-)
 create mode 100644 src/views/lawEnforcement/caseAllocation/caseList.vue
 create mode 100644 src/views/lawEnforcement/task/taskHandle.vue
 create mode 100644 src/views/lawEnforcement/task/taskSignInSee.vue
 create mode 100644 static/images/lawEnforcement/icon/signInRecord_icon_03.png

diff --git a/src/api/lawEnforcement/index.js b/src/api/lawEnforcement/index.js
index dd9557b7..f088a1f7 100644
--- a/src/api/lawEnforcement/index.js
+++ b/src/api/lawEnforcement/index.js
@@ -531,3 +531,76 @@ export function returnCase(data) {
     data: data
   })
 }
+
+// 案件退回,从勘察退回至登记
+export function addCase(data) {
+  return request({
+    url: '/enforce/case/add',
+    method: 'post',
+    data: data
+  })
+}
+// 新增执法进度历史
+export function addProgress(data) {
+  return request({
+    url: '/enforce/progress/add',
+    method: 'post',
+    data: data
+  })
+}
+// 任务查看列表
+export function caseTasklist(query) {
+  return request({
+    url: '/enforce/case/caseTasklist',
+    method: 'get',
+    params: query
+  })
+}
+//上传全局方法附件
+export function commonUpload(data) {
+  return request({
+    url: '/common/upload',
+    method: 'post',
+    header: { "Content-Type": 'application/x-www-form-urlencoded' },
+    data: data
+  })
+}
+// 新增勘察打卡
+export function addClockin(data) {
+  return request({
+    url: '/enforce/clockin/add',
+    method: 'post',
+    data: data
+  })
+}
+// 查询勘察打卡列表
+export function clockinList(query) {
+  return request({
+    url: '/enforce/clockin/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询勘察打卡详情
+export function clockinGet(id) {
+  return request({
+    url: '/enforce/clockin/get/'+ id,
+    method: 'get',
+  })
+}
+// 已上传文件列表查询
+export function attachmentList(query) {
+  return request({
+    url: '/enforce/progress/attachmentList',
+    method: 'get',
+    params: query
+  })
+}
+// 各个节点附件上传保存方法
+export function attachmentEdit(data) {
+  return request({
+    url: '/enforce/progress/attachmentEdit',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index e82d246e..7328520c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3828,6 +3828,34 @@ export const constantRoutes = [
       keepAlive: true
     },
     component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseAdd'], resolve)
+  },
+  { ////农业执法（新）-- 巡查登记列表
+    path: '/lawEnforcement/caseList',
+    name: 'lawEnforcementCaseListNew',
+    meta: {
+      title: '巡查登记',
+      hidden: true,
+      keepAlive: true
+    },
+    component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseList'], resolve)
+  },
+  { ////农业执法（新）-- 记录查看
+    path: '/lawEnforcement/taskSignInSee',
+    name: 'lawEnforcementTaskSignInSee',
+    meta: {
+      title: '记录查看',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/lawEnforcement/task/taskSignInSee'], resolve)
+  },
+  { ////农业执法（新）-- 案件处理
+    path: '/lawEnforcement/taskHandle',
+    name: 'lawEnforcementTaskHandle',
+    meta: {
+      title: '案件处理',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/lawEnforcement/task/taskHandle'], resolve)
   }
 ];
 
diff --git a/src/views/lawEnforcement/caseAllocation/caseAdd.vue b/src/views/lawEnforcement/caseAllocation/caseAdd.vue
index 6a009fec..17e9d165 100644
--- a/src/views/lawEnforcement/caseAllocation/caseAdd.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseAdd.vue
@@ -5,134 +5,340 @@
       <div class="return_btn" @click="onClickLeft"></div>
     </div>
     <div style="height: 58px;"></div>
-    <div class="main_box">
-      <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>
-        </template>
-      </van-cell>
-      <van-field v-model="form.caseSource" label="案件来源" placeholder="请输入案件来源" :border="false" label-width="auto" input-align="right" is-link arrow-direction="down" />
-      <van-field v-model="form.schemeId" label="关联方案" placeholder="请输入关联方案" :border="false" label-width="auto" input-align="right" />
-      <van-field v-model="form.deptId" label="案件属地" placeholder="请输入案件属地" :border="false" label-width="auto" input-align="right" is-link arrow-direction="down" />
-      <van-field v-model="form.belongTeam" label="执行主体" placeholder="请输入执行主体" :border="false" label-width="auto" input-align="right" is-link arrow-direction="down" />
-      <van-field v-model="form.caseName" label="案件名称" placeholder="请输入案件名称" :border="false" label-width="auto" input-align="right" />
-      <van-field v-model="form.registerDate" label="登记日期" placeholder="请输入登记日期" :border="false" label-width="auto" input-align="right" />
-      <van-field v-model="form.enforceCategory" label="执法类别" placeholder="请输入执法类别" :border="false" label-width="auto" input-align="right" is-link arrow-direction="down" />
-      <van-field v-model="form.caseDescribe" label="案件简述" placeholder="请输入案件简述" :border="false" label-width="auto" input-align="right" />
-    </div>
 
-    <div class="main_box" style="margin-top: 10px;">
-      <van-collapse v-model="activeNames">
-        <van-collapse-item name="1">
+    <van-form @submit="goSubmit" :show-error-message="false" ref="form">
+      <div class="main_box">
+        <van-cell>
           <template #title>
-            <van-icon name="../../../static/images/lawEnforcement/icon/icon_dsr.png" size="20"></van-icon>
-            <span class="custom-title">当事人<i class="bgBlue"></i></span>
+            <van-icon name="../../../static/images/lawEnforcement/icon/icon_zxfa.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="caseSource"
+          label="案件来源"
+          placeholder="请选择案件来源"
+          @click="showCaseSource = true"
+          input-align="right"
+          right-icon="arrow-down"
+          :border="false"
+          label-width="auto"
+        />
+        <van-popup v-model="showCaseSource" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="caseSourceOptions"
+            @confirm="onConfirmCaseSource"
+            @cancel="showCaseSource = false"
+          />
+        </van-popup>
+
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择关联方案'  }]"
+          v-model="scheme"
+          label="关联方案"
+          placeholder="请选择关联方案"
+          @click="showScheme = true"
+          input-align="right"
+          right-icon="arrow-down"
+          :border="false"
+          label-width="auto"
+        />
+        <van-popup v-model="showScheme" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="schemeOptions"
+            @confirm="onConfirmScheme"
+            @cancel="showScheme = false"
+          />
+        </van-popup>
+  <!--      <van-field v-model="form.schemeId" label="关联方案" placeholder="请输入关联方案" :border="false" label-width="auto" input-align="right" />-->
+
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择案件属地'  }]"
+          v-model="deptName"
+          label="案件属地"
+          placeholder="请选择案件属地"
+          @click="showDeptId = true"
+          input-align="right"
+          right-icon="arrow-down"
+          :border="false"
+          label-width="auto"
+        />
+        <van-popup v-model="showDeptId" position="bottom">
+          <van-cascader
+            v-model="villageValue"
+            title="请选择案件属地"
+            :options="deptOptions"
+            @close="showDeptId = false"
+            @finish="onConfirmDept"
+            active-color="#1989fa"
+            :field-names="hcAreaInfoFieldName"
+          />
+        </van-popup>
+  <!--      <van-field v-model="form.deptId" label="案件属地" placeholder="请输入案件属地" :border="false" label-width="auto" input-align="right" is-link arrow-direction="down" />-->
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择执行主体'  }]"
+          v-model="belongTeam"
+          label="执行主体"
+          placeholder="请选择执行主体"
+          @click="showBelongTeam = true"
+          input-align="right"
+          right-icon="arrow-down"
+          :border="false"
+          label-width="auto"
+        />
+        <van-popup v-model="showBelongTeam" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="belongTeamOptions"
+            @confirm="onConfirmBelongTeam"
+            @cancel="showBelongTeam = false"
+          />
+        </van-popup>
+  <!--      <van-field v-model="form.belongTeam" label="执行主体" placeholder="请输入执行主体" :border="false" label-width="auto" input-align="right" is-link arrow-direction="down" />-->
+        <van-field v-model="form.caseName" required :rules="[{ required: true , message:'请输入案件名称'  }]" label="案件名称" placeholder="请输入案件名称" :border="false" label-width="auto" input-align="right" />
+
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择登记日期'  }]"
+          v-model="form.registerDate"
+          label="登记日期"
+          placeholder="请选择登记日期"
+          @click="showRegisterDate = true"
+          input-align="right"
+          right-icon="arrow-down"
+          :border="false"
+          label-width="auto"
+        />
+        <van-popup v-model="showRegisterDate" position="bottom">
+          <van-datetime-picker
+            v-model="registerDate"
+            type="date"
+            title="选择年月日"
+            :min-date="minDate"
+            @confirm="onConfirmRegisterDate"
+            @cancel="showRegisterDate = false"
+          />
+        </van-popup>
+
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'请选择执法类别'  }]"
+          v-model="enforceCategory"
+          label="执法类别"
+          placeholder="请选择执法类别"
+          @click="showEnforceCategory = true"
+          input-align="right"
+          right-icon="arrow-down"
+          :border="false"
+          label-width="auto"
+        />
+        <van-popup v-model="showEnforceCategory" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="enforceCategoryOptions"
+            @confirm="onConfirmEnforceCategory"
+            @cancel="showEnforceCategory = false"
+          />
+        </van-popup>
+  <!--      <van-field v-model="form.enforceCategory" label="执法类别" placeholder="请输入执法类别" :border="false" label-width="auto" input-align="right" is-link arrow-direction="down" />-->
+        <van-field v-model="form.caseDescribe" label="案件简述" placeholder="请输入案件简述" :border="false" label-width="auto" input-align="right" />
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;">
+        <van-collapse v-model="activeNames">
+          <van-collapse-item name="1">
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_dsr.png" size="20"></van-icon>
+              <span class="custom-title">当事人<i class="bgBlue"></i></span>
+            </template>
+
+            <van-field v-model="form.type" label="当事人类型" :border="false" label-width="auto" input-align="right" >
+              <template #input>
+                <van-radio-group v-model="form.type" direction="horizontal">
+                  <van-radio name="1">个人/个体工商户</van-radio>
+                  <van-radio name="2">企业</van-radio>
+                </van-radio-group>
+              </template>
+            </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-radio name="1">男</van-radio>
+                    <van-radio name="2">女</van-radio>
+                  </van-radio-group>
+                </template>
+              </van-field>
+              <van-field v-model="form.cardNum" required :rules="[{ required: true , message:'请输入身份证号' }]" label="身份证号" placeholder="请输入身份证号" :border="false" label-width="auto" input-align="right" />
 
-          <van-field v-model="form.type" label="当事人类型" :border="false" label-width="auto" input-align="right" >
-            <template #input>
-              <van-radio-group v-model="form.type" direction="horizontal">
-                <van-radio name="1">个人/个体工商户</van-radio>
-                <van-radio name="2">企业</van-radio>
-              </van-radio-group>
+              <van-field
+                readonly
+                clickable
+                v-model="form.birthday"
+                label="出生日期"
+                placeholder="请选择出生日期"
+                @click="showBirthday = true"
+                input-align="right"
+                right-icon="arrow-down"
+                :border="false"
+                label-width="auto"
+              />
+              <van-popup v-model="showBirthday" position="bottom">
+                <van-datetime-picker
+                  v-model="birthday"
+                  type="date"
+                  title="选择年月日"
+                  :min-date="minDate"
+                  @confirm="onConfirmBirthday"
+                  @cancel="showBirthday = false"
+                />
+              </van-popup>
+
+              <van-field
+                readonly
+                clickable
+                v-model="nation"
+                label="民族"
+                placeholder="请选择民族"
+                @click="showNation = true"
+                input-align="right"
+                right-icon="arrow-down"
+                :border="false"
+                label-width="auto"
+              />
+              <van-popup v-model="showNation" position="bottom">
+                <van-picker
+                  show-toolbar
+                  :columns="nationOptions"
+                  @confirm="onConfirmNation"
+                  @cancel="showNation = false"
+                />
+              </van-popup>
+    <!--          <van-field v-model="form.nation" label="民族" placeholder="请输入民族" :border="false" label-width="auto" input-align="right" is-link arrow-direction="down" />-->
+              <van-field v-model="form.companyPosition" label="工作单位及职务" placeholder="请输入工作单位及职务" :border="false" label-width="auto" input-align="right" />
+              <van-field v-model="form.zihao" label="字号名称" placeholder="请输入字号名称" :border="false" label-width="auto" input-align="right" />
             </template>
-          </van-field>
-          <van-field v-model="form.name" 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-radio name="1">男</van-radio>
-                <van-radio name="2">女</van-radio>
-              </van-radio-group>
+            <template v-if="form.type=='2'">
+              <van-field v-model="form.companyName" :rules="[{ required: true , message:'请输入企业名称' }]" label="企业名称" placeholder="请输入企业名称" :border="false" label-width="auto" input-align="right" />
+              <van-field v-model="form.legalName" label="法人/负责人" placeholder="请输入法人/负责人" :border="false" label-width="auto" input-align="right" />
             </template>
-          </van-field>
-          <van-field v-model="form.cardNum" label="身份证号" placeholder="请输入身份证号" :border="false" label-width="auto" input-align="right" />
-          <van-field v-model="form.birthday" label="出生日期" placeholder="请输入出生日期" :border="false" label-width="auto" input-align="right" />
-          <van-field v-model="form.nation" label="民族" placeholder="请输入民族" :border="false" label-width="auto" input-align="right" is-link arrow-direction="down" />
-          <van-field v-model="form.companyPosition" label="工作单位及职务" placeholder="请输入工作单位及职务" :border="false" label-width="auto" input-align="right" />
-          <van-field v-model="form.phone" label="联系电话" placeholder="请输入联系电话" :border="false" label-width="auto" input-align="right" />
-          <van-field v-model="form.uniformCode" label="统一社会信用代码" placeholder="请输入统一社会信用代码" :border="false" label-width="auto" input-align="right" />
-          <van-field v-model="form.zihao" label="字号名称" placeholder="请输入字号名称" :border="false" label-width="auto" input-align="right" />
 
-        </van-collapse-item>
-      </van-collapse>
-    </div>
+            <van-field v-model="form.phone" label="联系电话" placeholder="请输入联系电话" :border="false" label-width="auto" input-align="right" />
+            <van-field v-model="form.address" label="联系地址" placeholder="请输入联系地址" :border="false" label-width="auto" input-align="right" />
+            <van-field v-model="form.uniformCode" label="统一社会信用代码" placeholder="请输入统一社会信用代码" :border="false" label-width="auto" input-align="right" />
+          </van-collapse-item>
+        </van-collapse>
+      </div>
 
-    <div class="main_box" style="margin-top: 10px;">
-      <van-collapse v-model="activeNames1">
-        <van-collapse-item name="1">
-          <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>
-          <p style="color: #FE1313;text-align: center;margin-top: 5PX;font-size: .3rem">*请上传不超过5MB 格式为doc/xls/png/jpg/jpeg的文件</p>
-          <div class="cf">
-            <van-uploader v-model="fileList" multiple />
-          </div>
-        </van-collapse-item>
-      </van-collapse>
-    </div>
+      <div class="main_box" style="margin-top: 10px;">
+        <van-collapse v-model="activeNames1">
+          <van-collapse-item name="1">
+            <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>
+            <p style="color: #FE1313;text-align: center;margin-top: 5PX;font-size: .3rem">*请上传不超过5MB 格式为doc/xls/png/jpg/jpeg的文件</p>
+            <div class="cf">
+              <van-uploader v-model="fileList" multiple />
+            </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">保存并打卡</p>
+      </div>
+    </van-form>
 
-    <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="goSubmit">保存</p>
-      <p class="submitButton">保存并打卡</p>
-    </div>
   </div>
 </template>
 
 <script>
-  import { getScheme } from "@/api/lawEnforcement/index";
+  import { addCase , addProgress , treeselect , schemeList , addSurvey } from "@/api/lawEnforcement/index";
   import Cookies from "js-cookie";
   export default {
     name: "programmeDetail",
     data() {
       return {
-        showBankType:false,
-        showPayeeType:false,
-        showPicker:false,
-        form:{},
-
-        bankType:'',
-        payeeType:'',
-        value:'',
+        showCaseSource:false,
+        showBelongTeam:false,
+        showEnforceCategory:false,
+        showDeptId:false,
+        showScheme:false,
+        showNation:false,
+        showBirthday:false,
+        showRegisterDate:false,
+        form:{
+          type:'1',
+          sex:'1',
+          registerDate:this.format(new Date(),'yyyy-MM-dd'),
+          caseProgress:'1',
+          caseStatus:'1',
+        },
+        registerDate:new Date(),
+        birthday:new Date(),
+        caseSource : '',
+        belongTeam : '',
+        enforceCategory : '',
+        nation : '',
+        deptName : '',
+        scheme : '',
+        villageValue : '',
 
-        bankTypeOptions:[],
-        payeeTypeOptions:[],
         tEnforceSchemeHandlerList:[],
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
+        minDate: new Date(1900, 0, 1),
 
         activeNames: ['1'],
         activeNames1: ['1'],
@@ -140,33 +346,144 @@
 
         caseSourceOptions:[],
         belongTeamOptions:[],
+        enforceCategoryOptions:[],
+        nationOptions:[],
+        deptOptions:[],
+        schemeOptions:[],
 
-        // 查询参数
-        queryParams: {
-          // 分页
-          pageNum: 1,
-          pageSize: 10,
-          // 查询排序
-          orderByColumn: "id",
-          isAsc: "desc",
-          name: null,  // 搜索参数-执行人姓名或证件号
-          belongTeam: null, // 搜索参数-所在中队
-        },
         tEnforceCaseHandlerList:[],
         radio:'',
-        submitType:'',
-        surveyId:'',
         fileList: [],
+        hcAreaInfoFieldName: {
+          text: "label",
+          value: "value",
+          children: "children",
+        },
+
+        deptId:''
       };
     },
     created() {
-      // this.getDictionaries()
-
+      //案件来源
+      this.getDicts("case_source").then(response => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.caseSourceOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        // this.caseSourceOptions = response.data;
+      });
+      //执行主体
+      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.belongTeamOptions = response.data;
+      });
+      //执法类别
+      this.getDicts("enforce_category").then(response => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.enforceCategoryOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        // this.enforceCategoryOptions = response.data;
+      });
+      //民族
+      this.getDicts("nationality").then(response => {
+        for (var i = 0; i < response.data.length; i++) {
+          this.nationOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
+        }
+        // this.nationOptions = response.data;
+      });
+      var schemeQueryParam = {
+        applyStatus: "1"
+      };
+      schemeList(schemeQueryParam).then((response) => {
+        for (var i = 0; i < response.rows.length; i++) {
+          this.schemeOptions.push({text: response.rows[i].schemeName, value: response.rows[i].id});
+        }
+      });
+      this.getBookList()
     },
     methods: {
       goSubmit(){
+        addCase(this.form).then(response => {
+          if(response.code=="200"){
+            var progressParam = {
+              caseId: response.data,
+              caseStatus:"1",
+              caseProgress:"1",
+              caseProgressName:"登记"
+          };
+            addProgress(progressParam).then(response2 => {
+              let surveyForm = {};
+              surveyForm.tEnforceCaseHandlerList = this.tEnforceCaseHandlerList;
+              surveyForm.caseId = response.data;
+              addSurvey(surveyForm).then(response => {
+                this.$notify({ type: 'success', message: '保存成功' });
+                setTimeout(function(){
+                  history.back(-1);
+                },2000)
+              });
+            });
 
-      }
+          }
+          this.form.id = response.data;
+        });
+      },
+      getBookList(){
+        treeselect().then((response) => {
+          if (response.code == 200) {
+            this.deptOptions = response.data;
+          }
+        })
+      },
+      //选择案件来源
+      onConfirmCaseSource(data){
+        this.form.caseSource = data.value;
+        this.caseSource = data.text;
+        this.showCaseSource = false;
+      },
+      //选择案件属地
+      onConfirmDept({ selectedOptions }){
+        console.log(selectedOptions[selectedOptions.length-1])
+        this.form.deptId = selectedOptions[selectedOptions.length-1].value;
+        this.deptName = selectedOptions[selectedOptions.length-1].label;
+        this.showDeptId = false
+      },
+      //选择执行主体
+      onConfirmBelongTeam(data){
+        this.form.belongTeam = data.value;
+        this.belongTeam = data.text;
+        this.showBelongTeam = false;
+      },
+      //选择执法类别
+      onConfirmEnforceCategory(data){
+        this.form.enforceCategory = data.value;
+        this.enforceCategory = data.text;
+        this.showEnforceCategory = false;
+      },
+      //选择民族
+      onConfirmNation(data){
+        this.form.nation = data.value;
+        this.nation = data.text;
+        this.showNation = false;
+      },
+      //选择关联方案
+      onConfirmScheme(data){
+        this.form.schemeId = data.value;
+        this.scheme = data.text;
+        this.showScheme = false;
+      },
+      //选择登记时间
+      onConfirmRegisterDate(data){
+        this.form.registerDate = this.format(data,'yyyy-MM-dd');
+        this.registerDate = data;
+        this.showRegisterDate = false;
+      },
+      //选择出生日期
+      onConfirmBirthday(data){
+        this.form.birthday = this.format(data,'yyyy-MM-dd');
+        this.birthday = data;
+        this.showBirthday = false;
+      },
     },
     watch: {
       $route (to, from ) {
diff --git a/src/views/lawEnforcement/caseAllocation/caseDetail.vue b/src/views/lawEnforcement/caseAllocation/caseDetail.vue
index 9f14c2c1..7a83f986 100644
--- a/src/views/lawEnforcement/caseAllocation/caseDetail.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseDetail.vue
@@ -30,16 +30,22 @@
             <span class="custom-title">当事人<i class="bgBlue"></i></span>
           </template>
           <van-cell title="当事人类型" :border="false" v-model="form.type" />
-          <van-cell title="当事人姓名" :border="false" v-model="form.name" />
-          <van-cell title="性别" :border="false" v-model="form.sex" />
-          <van-cell title="身份证号" :border="false" v-model="form.cardNum" />
-          <van-cell title="出生日期" :border="false" v-model="form.birthday" />
-          <van-cell title="民族" :border="false" v-model="form.nation" />
-          <van-cell title="工作单位及职务" :border="false" v-model="form.companyPosition" />
+          <template v-if="form.type=='个人/个体工商户'">
+            <van-cell title="当事人姓名" :border="false" v-model="form.name" />
+            <van-cell title="性别" :border="false" v-model="form.sex" />
+            <van-cell title="身份证号" :border="false" v-model="form.cardNum" />
+            <van-cell title="出生日期" :border="false" v-model="form.birthday" />
+            <van-cell title="民族" :border="false" v-model="form.nation" />
+            <van-cell title="工作单位及职务" :border="false" v-model="form.companyPosition" />
+            <van-cell title="字号名称" :border="false" v-model="form.zihao" />
+          </template>
+          <template v-if="form.type=='企业'">
+            <van-cell title="企业名称" :border="false" v-model="form.companyName" />
+            <van-cell title="法人/负责人" :border="false" v-model="form.legalName" />
+          </template>
           <van-cell title="联系电话" :border="false" v-model="form.phone" />
           <van-cell title="联系地址" :border="false" v-model="form.address" />
           <van-cell title="统一社会信用代码" :border="false" v-model="form.uniformCode" />
-          <van-cell title="字号名称" :border="false" v-model="form.zihao" />
         </van-collapse-item>
       </van-collapse>
     </div>
@@ -158,6 +164,9 @@
       this.getDicts("enforce_body_type").then(response => {
         this.typeOptions = response.data;
       });
+      this.getDicts("sex").then(response => {
+        this.sexOptions = response.data;
+      });
       this.getDetail();
     },
     methods: {
@@ -166,6 +175,7 @@
           response.data.caseSource = response.data.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, response.data.caseSource);
           response.data.belongTeam = response.data.belongTeam == '' ? '' : this.selectDictLabel(this.belongTeamOptions, response.data.belongTeam);
           response.data.type = response.data.type == '' ? '' : this.selectDictLabel(this.typeOptions, response.data.type);
+          response.data.sex = response.data.sex == '' ? '' : this.selectDictLabel(this.sexOptions, response.data.sex);
           getDeptName(response.data.deptId).then(res => {
             response.data.deptId = res.data.deptName
           });
diff --git a/src/views/lawEnforcement/caseAllocation/caseDistribution.vue b/src/views/lawEnforcement/caseAllocation/caseDistribution.vue
index 234025d3..439c1344 100644
--- a/src/views/lawEnforcement/caseAllocation/caseDistribution.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseDistribution.vue
@@ -29,16 +29,22 @@
             <span class="custom-title">当事人<i class="bgBlue"></i></span>
           </template>
           <van-cell title="当事人类型" :border="false" v-model="form.type" />
-          <van-cell title="当事人姓名" :border="false" v-model="form.name" />
-          <van-cell title="性别" :border="false" v-model="form.sex" />
-          <van-cell title="身份证号" :border="false" v-model="form.cardNum" />
-          <van-cell title="出生日期" :border="false" v-model="form.birthday" />
-          <van-cell title="民族" :border="false" v-model="form.nation" />
-          <van-cell title="工作单位及职务" :border="false" v-model="form.companyPosition" />
+          <template v-if="form.type=='个人/个体工商户'">
+            <van-cell title="当事人姓名" :border="false" v-model="form.name" />
+            <van-cell title="性别" :border="false" v-model="form.sex" />
+            <van-cell title="身份证号" :border="false" v-model="form.cardNum" />
+            <van-cell title="出生日期" :border="false" v-model="form.birthday" />
+            <van-cell title="民族" :border="false" v-model="form.nation" />
+            <van-cell title="工作单位及职务" :border="false" v-model="form.companyPosition" />
+            <van-cell title="字号名称" :border="false" v-model="form.zihao" />
+          </template>
+          <template v-if="form.type=='企业'">
+            <van-cell title="企业名称" :border="false" v-model="form.companyName" />
+            <van-cell title="法人/负责人" :border="false" v-model="form.legalName" />
+          </template>
           <van-cell title="联系电话" :border="false" v-model="form.phone" />
           <van-cell title="联系地址" :border="false" v-model="form.address" />
           <van-cell title="统一社会信用代码" :border="false" v-model="form.uniformCode" />
-          <van-cell title="字号名称" :border="false" v-model="form.zihao" />
         </van-collapse-item>
       </van-collapse>
     </div>
diff --git a/src/views/lawEnforcement/caseAllocation/caseList.vue b/src/views/lawEnforcement/caseAllocation/caseList.vue
new file mode 100644
index 00000000..f4a274cd
--- /dev/null
+++ b/src/views/lawEnforcement/caseAllocation/caseList.vue
@@ -0,0 +1,311 @@
+<template>
+    <div class="home_wrapper">
+        <div class="header_main">
+            登记列表
+            <div class="return_btn" @click="onClickLeft"></div>
+        </div>
+      <div class="jg"></div>
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="getList"
+        >
+        <van-swipe-cell v-for="(item,index) in list" :key="index">
+          <van-cell center :to="{name:'lawEnforcementTaskDetail', query: {id:item.id}}">
+            <template #title>
+              <span>{{item.caseName}}</span>
+              <div class="first">
+                <span>{{item.caseSource}}</span>
+                <span>分配时间：{{item.registerDate}}</span>
+              </div>
+            </template>
+            <template #label>
+              <div class="label">
+                <p>执法人：{{item.legalName}}</p>
+                <p>{{item.caseProgress}}</p>
+              </div>
+            </template>
+          </van-cell>
+          <template #right>
+            <van-row>
+              <van-col>
+                <van-button square color="#FFA63E" text="打卡" :to="{name:'lawEnforcementCaseReturn', query: {id:item.id}}" class="delete-button" />
+              </van-col>
+              <van-col>
+                <van-button square color="#1CB8B1" :to="{name:'lawEnforcementCaseDistribution', query: {id:item.id}}" class="delete-button" >上传<br/>文件</van-button>
+              </van-col>
+              <van-col>
+                <van-button square color="#1D6FE9" :to="{name:'lawEnforcementCaseDistribution', query: {id:item.id}}" class="delete-button" >案件<br/>处理</van-button>
+              </van-col>
+            </van-row>
+          </template>
+        </van-swipe-cell>
+      </van-list>
+    </div>
+</template>
+
+<script>
+  import { caseTasklist } from "@/api/lawEnforcement/index";
+  export default {
+    name: "caseAllocation",
+    data() {
+      return {
+        loading: false,
+        finished: false,
+        searchInput:'',
+        queryParams: {
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        list:[]
+      };
+    },
+    created() {
+      this.getDicts("case_source").then(response => {
+        this.caseSourceOptions = response.data;
+      });
+      this.getDicts("case_node").then(response => {
+        this.caseProgressOptions = response.data;
+      });
+    },
+    methods: {
+      getList(){
+        var _this = this;
+        caseTasklist(_this.queryParams).then(response => {
+          response.rows.map(res=>{
+            res.caseSource = res.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, res.caseSource);
+            res.caseProgress = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
+            this.list.push(res);
+          })
+          if(this.list.length >= response.total){
+            this.finished = true;
+            return;
+          }else{
+            this.loading = false;
+            this.queryParams.pageNum += 1 ;
+          }
+        });
+      },
+      tabClick(year){
+        this.queryParams.year = year ;
+        this.applicationList = [];
+        this.getList();
+      },
+      tabShow(){
+        this.showTab = !this.showTab;
+      },
+      /** 删除按钮操作 */
+      handleDelete(row,index) {
+        let assetStatus = row.assetStatus ? row.assetStatus : data[0].assetStatus;
+        if (assetStatus === '2' || assetStatus === '3') {
+          this.$notify({
+            message: "不允许删除已出售或已报废的资产",
+            type: "warning",
+          });
+          return;
+        }
+        let useType = row.useType;
+        if(useType == 3) {
+          this.$notify({
+            message: "出租或出借的资产不允许删除",
+            type: "warning",
+          });
+          return ;
+        }
+        const ids = row.id || this.ids;
+
+        this.$dialog.alert(
+          {
+            message:'是否确认删除固定资产?',
+            title:"警告",
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+          }
+        )
+          .then(function () {
+            return delPermanent(ids);
+          })
+          .then(() => {
+            this.applicationList.splice(index, 1);
+            this.$notify({ type: 'success', message: '删除成功' });
+          });
+      },
+      goAdd(){
+        this.$router.push('/sunVillage_info/list_finance_add')
+      },
+      goDetail(id){
+        this.$router.push({path:'/sunVillage_info/list_finance_detail',query: {id:id,type:'finance'}})
+      },
+      goRanking(id,time){
+        this.$router.push({path:'/sunVillage_info/list_finance_ranking',query: {id:id,time:time}})
+      },
+      goEdit(id){
+        this.$router.push({path:'/sunVillage_info/list_finance_edit',query: {id:id,type:'finance'}})
+      },
+      goRemove(id){
+        this.$dialog.alert({
+          title: '提示',
+          message: '确认删除？',
+          showCancelButton:true,
+        })
+          .then(() => {
+            openRemove(id).then(response => {
+              this.$notify({ type: 'success', message: '删除成功' });
+              this.getList()
+            });
+          })
+          .catch(() => {
+            // on cancel
+          });
+
+      }
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .jg{
+    height: 116px;
+  }
+.home_wrapper{
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+    padding: 0 2% 0.2rem;
+    .search_box{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      width: 92%;
+      margin: 0PX auto;
+      .search{
+        background: #ffffff;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        width: 80%;
+        margin: 10PX auto;
+        border: 1px solid #1D6FE9;
+        padding: 1PX 1PX 1PX 12PX ;
+        border-radius: 50PX;
+        input{
+          flex: 1;
+          background: transparent;
+        }
+      }
+    }
+    .header_main{
+        height: 116px;
+        background: url('../../../../static/images/lawEnforcement/new/list_head.png') no-repeat;
+        background-size: 100% 100%;
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        font-size: 36px;
+        line-height: 116px;
+        text-align: center;
+        color: #fff;
+        z-index: 999;
+        .return_btn{
+            width: 24px;
+            height: 43.2px;
+            background: url('../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+            background-size: 20px 36px;
+            position: absolute;
+            left: 38px;
+            top: 36px;
+        }
+        .add_btn{
+            width: 56.4px;
+            height: 40.8px;
+            background: url('../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+            background-size: 47px 34px;
+            position: absolute;
+            right: 38px;
+            top: 36px;
+        }
+    }
+
+}
+/deep/.van-cell__title{
+  .first{
+    display: flex;
+    justify-content: space-between;
+    span{
+      color: #FE1313;
+      &:last-child{
+        color: #B4B0B0;
+      }
+    }
+  }
+  span{
+    font-family: Arial;
+    font-size: 0.35rem;
+    font-weight: normal;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    word-break: break-all;
+    overflow: hidden;
+  }
+}
+/deep/.van-cell__label .label {
+  display: flex;
+  justify-content: space-between;
+  p{
+    display: inline-block;
+    font-size: 0.35rem;
+    &:first-child{
+      color: #333333;
+    }
+    &:last-child{
+      padding: 0 7PX;
+      border: 1px solid #1D6FE9;
+      color: #1D6FE9;
+      border-radius: 1rem;
+    }
+  }
+}
+/deep/.van-cell__value{
+  flex: 0.3;
+  color: #1D6FE9;
+  font-weight: bold;
+}
+/deep/.van-cell{
+  /*margin-bottom: 0.2rem;*/
+  /*overflow: hidden;*/
+}
+/deep/.van-cell:first-child{
+  /*margin-top: 0.2rem;*/
+}
+/deep/van-ellipsis{
+  font-weight: bold;
+}
+/deep/ .van-swipe-cell{
+  margin-bottom: 0.3rem;
+  border-radius: 0.2rem;
+  overflow: hidden;
+  box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+  &:first-child{
+    margin-top: 0.3rem;
+  }
+}
+/deep/ .van-swipe-cell__right{
+  right: -1PX;
+}
+.van-row{
+  height: 100%;
+}
+.van-col{
+  height: 100%;
+}
+.delete-button {
+  height: 100%;
+}
+</style>
diff --git a/src/views/lawEnforcement/index_new.vue b/src/views/lawEnforcement/index_new.vue
index 827dc3b3..8729c55b 100644
--- a/src/views/lawEnforcement/index_new.vue
+++ b/src/views/lawEnforcement/index_new.vue
@@ -36,7 +36,7 @@
           <img src="../../../static/images/lawEnforcement/new/index_icon_06.png"/>
           <p>任务查看</p>
         </van-grid-item>
-        <van-grid-item :to="{name:'lawEnforcementCaseAdd'}">
+        <van-grid-item :to="{name:'lawEnforcementCaseListNew'}">
           <img src="../../../static/images/lawEnforcement/new/index_icon_07.png"/>
           <p>巡查登记</p>
         </van-grid-item>
diff --git a/src/views/lawEnforcement/task/signInRecord.vue b/src/views/lawEnforcement/task/signInRecord.vue
index 73a0c1e5..0f69f30b 100644
--- a/src/views/lawEnforcement/task/signInRecord.vue
+++ b/src/views/lawEnforcement/task/signInRecord.vue
@@ -8,144 +8,102 @@
     <div class="jg"></div>
 
     <div class="search_box">
-      <p>关于宿州市埇桥区永镇乡陈诚农药种子门市部超出经营范围经营限制使用农药案</p>
+      <p>{{form.address}}</p>
+      <p>{{form.caseName}}</p>
     </div>
 
     <div>
-      <van-row type="flex" align="center">
+      <van-row type="flex" align="center" v-for="(item,index) in fileList" :key="index">
         <van-col>
-          <p class="tt">登记</p>
+          <p :class="{'tt':form.caseProgress != item.caseProgress,'tt_now':form.caseProgress == item.caseProgress,}">{{item.caseProgressName}}</p>
         </van-col>
         <van-col :span="2">
+          <p class="top_border" v-if="index!=0"></p>
           <i></i>
-          <p class="bottom_border"></p>
+          <p class="bottom_border" v-if="index != fileList.length-1"></p>
         </van-col>
         <van-col :span="19">
-          <van-uploader v-model="fileList" multiple preview-size="60" upload-icon="add" />
-        </van-col>
-      </van-row>
-      <van-row type="flex" align="center">
-        <van-col>
-          <p class="tt">勘察</p>
-        </van-col>
-        <van-col :span="2">
-          <p class="top_border"></p>
-          <i></i>
-          <p class="bottom_border"></p>
-        </van-col>
-        <van-col :span="19">
-          <van-uploader v-model="fileList" multiple preview-size="60" upload-icon="add" />
-        </van-col>
-      </van-row>
-      <van-row type="flex" align="center">
-        <van-col>
-          <p class="tt">立案</p>
-        </van-col>
-        <van-col :span="2">
-          <p class="top_border"></p>
-          <i></i>
-          <p class="bottom_border"></p>
-        </van-col>
-        <van-col :span="19">
-          <van-uploader v-model="fileList" multiple preview-size="60" upload-icon="add" />
-        </van-col>
-      </van-row>
-      <van-row type="flex" align="center">
-        <van-col>
-          <p class="tt">取证</p>
-        </van-col>
-        <van-col :span="2">
-          <p class="top_border"></p>
-          <i></i>
-          <p class="bottom_border"></p>
-        </van-col>
-        <van-col :span="19">
-          <van-uploader v-model="fileList" multiple preview-size="60" upload-icon="add" />
-        </van-col>
-      </van-row>
-      <van-row type="flex" align="center">
-        <van-col>
-          <p class="tt">处理</p>
-        </van-col>
-        <van-col :span="2">
-          <p class="top_border"></p>
-          <i></i>
-          <p class="bottom_border"></p>
-        </van-col>
-        <van-col :span="19">
-          <van-uploader v-model="fileList" multiple preview-size="60" upload-icon="add" />
-        </van-col>
-      </van-row>
-      <van-row type="flex" align="center">
-        <van-col>
-          <p class="tt">裁决</p>
-        </van-col>
-        <van-col :span="2">
-          <p class="top_border"></p>
-          <i></i>
-          <p class="bottom_border"></p>
-        </van-col>
-        <van-col :span="19">
-          <van-uploader v-model="fileList" multiple preview-size="60" upload-icon="add" />
-        </van-col>
-      </van-row>
-      <van-row type="flex" align="center">
-        <van-col>
-          <p class="tt">执行</p>
-        </van-col>
-        <van-col :span="2">
-          <p class="top_border"></p>
-          <i></i>
-          <p class="bottom_border"></p>
-        </van-col>
-        <van-col :span="19">
-          <van-uploader v-model="fileList" multiple preview-size="60" upload-icon="add" />
-        </van-col>
-      </van-row>
-      <van-row type="flex" align="center">
-        <van-col>
-          <p class="tt">备案</p>
-        </van-col>
-        <van-col :span="2">
-          <p class="top_border"></p>
-          <i></i>
-          <p class="bottom_border"></p>
-        </van-col>
-        <van-col :span="19">
-          <van-uploader v-model="fileList" multiple preview-size="60" upload-icon="add" />
-        </van-col>
-      </van-row>
-      <van-row type="flex" align="center">
-        <van-col>
-          <p class="tt">结案</p>
-        </van-col>
-        <van-col :span="2">
-          <p class="top_border"></p>
-          <i></i>
-        </van-col>
-        <van-col :span="19">
-          <van-uploader v-model="fileList" multiple preview-size="60" upload-icon="add" />
+          <van-uploader v-model="item.caseProgressAttach" :show-upload="index == fileList.length-1 ? true : false" :deletable="index == fileList.length-1 ? true : false" :after-read="afterRead" @delete="deleteFile" multiple preview-size="60" upload-icon="add" />
         </van-col>
       </van-row>
     </div>
+<!--    $router.push({name:'lawEnforcementEnterpriseRelation'})-->
     <p style="color: #FE1313;text-align: center;margin-top: 20PX;">*请上传不超过5MB 格式为doc/xls/png/jpg/jpeg/mp4的文件</p>
-    <p class="submitButton" @click="$router.push({name:'lawEnforcementEnterpriseRelation'})">保存</p>
+    <p class="submitButton" @click="submitForm">保存</p>
   </div>
 </template>
 
 <script>
+  import { getCase,attachmentList,commonUpload,attachmentEdit } from "@/api/lawEnforcement/index";
   export default {
     name: "programmeDetail",
     data() {
       return {
-        fileList:[]
+        fileList1:[],
+        fileList:[],
+        openPic:[],
+        openPic2:[],
+        caseProgressOptions:[],
+        form:{}
       };
     },
     created() {
-
+      this.getDicts("case_node").then(response => {
+        this.caseProgressOptions = response.data;
+        getCase(this.$route.query.id).then((res) => {
+          res.data.caseProgressName = this.selectDictLabel(response.data, res.data.caseProgress);
+          this.form = res.data;//caseProgress
+        });
+      });
+      this.getDetail();
     },
     methods: {
+      getDetail(){
+        let queryParams = {
+          caseId:this.$route.query.id
+        }
+        attachmentList(queryParams).then((response) => {
+          let fileForm = response.rows;
+          console.log(fileForm)
+          fileForm.map((res,i)=>{
+            if (res.caseProgressAttach != null && res.caseProgressAttach != ''){
+              res.caseProgressAttach = res.caseProgressAttach.split(",");
+            }else{
+              res.caseProgressAttach = [];
+            }
+            res.caseProgressAttach.map((rr,index)=>{
+              res.caseProgressAttach[index] = {
+                url: '/api' + rr,
+                isImage: true
+              }
+            })
+            this.fileList.push(res)
+          })
+          console.log(this.fileList)
+        });
+      },
+      afterRead(file) {
+        // 此时可以自行将文件上传至服务器
+        this.openPic.push(file.file);
+        let params1 = new FormData();
+        params1.append("file", file.file);
+        commonUpload(params1).then((r1) => {
+          this.openPic2.push(r1.fileName);
+        })
+      },
+      deleteFile(file,detail) {
+        this.openPic2.splice(detail.index,1);
+      },
+      submitForm(){
+        let queryParams = {
+          id: this.$route.query.id,// 案件ID
+          caseProgress: this.form.caseProgress,
+          attachement: this.openPic2.join(','),  // 打卡上传附件(附件的路径字符串，多个附件路径之前通过英文逗号分隔)
+        };
+        attachmentEdit(queryParams).then((r1) => {
 
+        })
+      }
     },
   }
 </script>
@@ -222,6 +180,15 @@
     color: #ffffff;
     font-size: .35rem;
   }
+  .tt_now{
+    background: url('../../../../static/images/lawEnforcement/icon/signInRecord_icon_03.png') no-repeat center;
+    width: 41PX;
+    height: 41PX;
+    line-height: 41PX;
+    text-align: center;
+    color: #ffffff;
+    font-size: .35rem;
+  }
   i{
     background: url('../../../../static/images/lawEnforcement/icon/signInRecord_icon_02.png') no-repeat center;
     width: 10PX;
@@ -259,4 +226,10 @@
     border-radius: 8PX;
     margin-top: 25PX;
   }
+  /deep/ .van-uploader__preview{
+    margin-bottom: 0!important;
+  }
+  /deep/ .van-uploader{
+    display: block;
+  }
 </style>
diff --git a/src/views/lawEnforcement/task/task.vue b/src/views/lawEnforcement/task/task.vue
index ed8a97a7..adf7e3bf 100644
--- a/src/views/lawEnforcement/task/task.vue
+++ b/src/views/lawEnforcement/task/task.vue
@@ -9,33 +9,34 @@
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
+        @load="getList"
         >
-        <van-swipe-cell v-for="(item,index) in 10" :key="index">
+        <van-swipe-cell v-for="(item,index) in list" :key="index">
           <van-cell center :to="{name:'lawEnforcementTaskDetail', query: {id:item.id}}">
             <template #title>
-              <span>关于徐胜峰在禁渔期内收购非法捕捞渔获...</span>
+              <span>{{item.caseName}}</span>
               <div class="first">
-                <span>上级交办</span>
-                <span>分配时间：2021-09-07</span>
+                <span>{{item.caseSource}}</span>
+                <span>分配时间：{{item.registerDate}}</span>
               </div>
             </template>
             <template #label>
               <div class="label">
-                <p>执法人：刘月、张薇</p>
-                <p>立案</p>
+                <p>执法人：{{item.legalName}}</p>
+                <p>{{item.caseProgressName}}</p>
               </div>
             </template>
           </van-cell>
           <template #right>
             <van-row>
               <van-col>
-                <van-button square color="#FFA63E" text="打卡" :to="{name:'lawEnforcementCaseReturn', query: {id:item.id}}" class="delete-button" />
+                <van-button square color="#FFA63E" text="打卡" :to="{name:'lawEnforcementTaskSignIn', query: {id:item.id}}" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button square color="#1CB8B1" :to="{name:'lawEnforcementCaseDistribution', query: {id:item.id}}" class="delete-button" >上传<br/>文件</van-button>
+                <van-button square color="#1CB8B1" :to="{name:'lawEnforcementSignInRecord', query: {id:item.id}}" class="delete-button" >上传<br/>文件</van-button>
               </van-col>
               <van-col>
-                <van-button square color="#1D6FE9" :to="{name:'lawEnforcementCaseDistribution', query: {id:item.id}}" class="delete-button" >案件<br/>处理</van-button>
+                <van-button square color="#1D6FE9" :to="{name:'lawEnforcementTaskHandle', query: {id:item.id,caseProgress:item.caseProgress}}" class="delete-button" >案件<br/>处理</van-button>
               </van-col>
             </van-row>
           </template>
@@ -45,56 +46,49 @@
 </template>
 
 <script>
-  import { financePublicList,openRemove } from "@/api/sunVillage_info/fixedAssets";
-  import Cookies from "js-cookie";
-  import request from '@/utils/request'
+  import { caseTasklist } from "@/api/lawEnforcement/index";
   export default {
     name: "caseAllocation",
     data() {
       return {
-        applicationList:[],
-        applicationListSecond:[],
-        assetStatusOptions:[],
-        auditStatus:[],
         loading: false,
         finished: false,
-        show: false,
-        showTab: false,
-        fileList:[],
-        listLength:'0',
         searchInput:'',
-        queryParams:{
-          pageNum:1,
-          pageSize:10,
-          orderByColumn:'createTime',
-          isAsc:'desc',
-          year:'2022',
+        queryParams: {
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
         },
-        uploadFiles1:[],
-        projectId:'',
-        projectIndex:'',
-        showBtn:true,
+        list:[]
       };
     },
     created() {
-
+      this.getDicts("case_source").then(response => {
+        this.caseSourceOptions = response.data;
+      });
+      this.getDicts("case_node").then(response => {
+        this.caseProgressOptions = response.data;
+      });
     },
     methods: {
       getList(){
         var _this = this;
-        financePublicList(_this.queryParams).then(response => {
-          _this.listLength = response.total;
+        caseTasklist(_this.queryParams).then(response => {
           response.rows.map(res=>{
-            _this.applicationList.push(res);
+            res.caseSource = res.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, res.caseSource);
+            res.caseProgressName = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
+            this.list.push(res);
           })
-          if(_this.applicationList.length >= response.total){
-            _this.finished = true;
+          if(this.list.length >= response.total){
+            this.finished = true;
             return;
           }else{
-            _this.loading = false;
-            _this.queryParams.pageNum += 1 ;
+            this.loading = false;
+            this.queryParams.pageNum += 1 ;
           }
-
         });
       },
       tabClick(year){
diff --git a/src/views/lawEnforcement/task/taskDetail.vue b/src/views/lawEnforcement/task/taskDetail.vue
index 46662b29..784c3fd7 100644
--- a/src/views/lawEnforcement/task/taskDetail.vue
+++ b/src/views/lawEnforcement/task/taskDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="header_main">
-      查看登记案件
+      查看登记
       <div class="return_btn" @click="onClickLeft"></div>
     </div>
     <div style="height: 58px;"></div>
@@ -12,14 +12,14 @@
           <span class="custom-title">登记<i class="bgBlue"></i></span>
         </template>
       </van-cell>
-      <van-cell title="案件来源" :border="false" value="案件来源" />
-      <van-cell title="关联方案" :border="false" value="关联方案" />
-      <van-cell title="案件属地" :border="false" value="案件属地" />
-      <van-cell title="执行主体" :border="false" value="执行主体" />
-      <van-cell title="案件名称" :border="false" value="案件名称" />
-      <van-cell title="登记日期" :border="false" value="登记日期" />
-      <van-cell title="执法类别" :border="false" value="执法类别" />
-      <van-cell title="案件简述" :border="false" value="案件简述" />
+      <van-cell title="案件来源" :border="false" v-model="form.caseSource" />
+      <van-cell title="关联方案" :border="false" v-model="form.schemeId" />
+      <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" />-->
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
@@ -29,17 +29,24 @@
             <van-icon name="../../../static/images/lawEnforcement/icon/icon_dsr.png" size="20"></van-icon>
             <span class="custom-title">当事人<i class="bgBlue"></i></span>
           </template>
-          <van-cell title="当事人类型" :border="false" value="当事人类型" />
-          <van-cell title="当事人姓名" :border="false" value="当事人姓名" />
-          <van-cell title="性别" :border="false" value="性别" />
-          <van-cell title="身份证号" :border="false" value="身份证号" />
-          <van-cell title="出生日期" :border="false" value="出生日期" />
-          <van-cell title="民族" :border="false" value="民族" />
-          <van-cell title="工作单位及职务" :border="false" value="工作单位及职务" />
-          <van-cell title="联系电话" :border="false" value="联系电话" />
-          <van-cell title="联系地址" :border="false" value="联系地址" />
-          <van-cell title="统一社会信用代码" :border="false" value="统一社会信用代码" />
-          <van-cell title="字号名称" :border="false" value="字号名称" />
+          <van-cell title="当事人类型" :border="false" v-model="form.type" />
+
+          <template v-if="form.type=='个人/个体工商户'">
+            <van-cell title="当事人姓名" :border="false" v-model="form.name" />
+            <van-cell title="性别" :border="false" v-model="form.sex" />
+            <van-cell title="身份证号" :border="false" v-model="form.cardNum" />
+            <van-cell title="出生日期" :border="false" v-model="form.birthday" />
+            <van-cell title="民族" :border="false" v-model="form.nation" />
+            <van-cell title="工作单位及职务" :border="false" v-model="form.companyPosition" />
+            <van-cell title="字号名称" :border="false" v-model="form.zihao" />
+          </template>
+          <template v-if="form.type=='企业'">
+            <van-cell title="企业名称" :border="false" v-model="form.companyName" />
+            <van-cell title="法人/负责人" :border="false" v-model="form.legalName" />
+          </template>
+          <van-cell title="联系电话" :border="false" v-model="form.phone" />
+          <van-cell title="联系地址" :border="false" v-model="form.address" />
+          <van-cell title="统一社会信用代码" :border="false" v-model="form.uniformCode" />
         </van-collapse-item>
       </van-collapse>
     </div>
@@ -86,32 +93,31 @@
               <van-col :span="4">带队人</van-col>
             </van-row>
 
-            <van-row v-for="(item,index) in 10" :key="index" >
+            <van-row v-for="(item,index) in tEnforceCaseHandlerList" :key="index" >
               <van-col :span="4">{{index+1}}</van-col>
-              <van-col :span="6">庞东旭{{index}}</van-col>
-              <van-col :span="10">2303888{{index}}</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="checked" shape="square"></van-checkbox>
-<!--                  <van-icon name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20"></van-icon>-->
+                  <van-checkbox v-model="item.enforcerLeader" shape="square"></van-checkbox>
                 </div>
               </van-col>
             </van-row>
+            <!--            <img src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="$router.push({name:'lawEnforcementCaseLawEnforcer'})">-->
           </div>
         </van-collapse-item>
       </van-collapse>
     </div>
-    <p class="submitButton" @click="$router.push({name:'lawEnforcementTaskSignIn'})">执法打卡</p>
+    <p class="submitButton" @click="$router.push({name:'lawEnforcementTaskSignIn', query: {id:form.id}})">执法打卡</p>
   </div>
 </template>
 
 <script>
-  import { getScheme } from "@/api/lawEnforcement/index";
+  import { getCase , getDeptName , getSurveyByCaseId } from "@/api/lawEnforcement/index";
   export default {
     name: "programmeDetail",
     data() {
       return {
-        checked:'',
         showBankType:false,
         showPayeeType:false,
         showPicker:false,
@@ -131,16 +137,57 @@
         activeNames: ['1'],
         activeNames1: ['1'],
         activeNames2: ['1'],
+
+        caseSourceOptions:[],
+        belongTeamOptions:[],
+
+        // 查询参数
+        queryParams: {
+          // 分页
+          pageNum: 1,
+          pageSize: 10,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
+          name: null,  // 搜索参数-执行人姓名或证件号
+          belongTeam: null, // 搜索参数-所在中队
+        },
+        tEnforceCaseHandlerList:[]
       };
     },
     created() {
       // this.getDictionaries()
+      this.getDicts("case_source").then(response => {
+        this.caseSourceOptions = response.data;
+      });
+      this.getDicts("team_category").then(response => {
+        this.belongTeamOptions = response.data;
+      });
+      this.getDicts("enforce_body_type").then(response => {
+        this.typeOptions = response.data;
+      });
+      this.getDicts("sex").then(response => {
+        this.sexOptions = response.data;
+      });
+      this.getDetail();
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
+      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);
+          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);
+          getDeptName(response.data.deptId).then(res => {
+            response.data.deptId = res.data.deptName
+          });
           this.form = response.data;
         });
+        getSurveyByCaseId(this.$route.query.id).then((response) => {
+          if(response.data != undefined){
+            this.tEnforceCaseHandlerList = response.data.tEnforceCaseHandlerList;
+          }
+        });
       },
       goBack(){
         window.history.go(-1)
@@ -151,18 +198,11 @@
 
 <style scoped lang="scss">
   .app-container {
-    padding: 2% 0 10%;
+    padding: 2% 0;
   }
   /deep/ .van-collapse-item__content{
     padding: 0;
   }
-  /deep/ .van-checkbox{
-    justify-content: center;
-  }
-  .icon_box{
-    display: flex;
-    justify-content: space-around;
-  }
   .cf{
     padding: 0 3%;
     margin-top: 20PX;
@@ -239,6 +279,11 @@
         }
       }
     }
+    .icon_box{
+      /deep/ .van-checkbox{
+        justify-content: center;
+      }
+    }
   }
   .main_title{
     font-size: 0.4rem;
@@ -278,13 +323,6 @@
       right: -8PX;
     }
   }
-
-  .addFamily{
-    position: absolute;
-    top: -2px;
-    right: 0;
-    border-radius: 50%;
-  }
   .submitButton{
     width: 45%;
     margin: 0 auto;
@@ -296,4 +334,11 @@
     border-radius: 8PX;
     margin-top: 25PX;
   }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
 </style>
diff --git a/src/views/lawEnforcement/task/taskHandle.vue b/src/views/lawEnforcement/task/taskHandle.vue
new file mode 100644
index 00000000..0b90e781
--- /dev/null
+++ b/src/views/lawEnforcement/task/taskHandle.vue
@@ -0,0 +1,2541 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      :title="type == 'waiting' ? '案件审批':'案件详情'"
+      fixed
+      placeholder
+      left-arrow
+      @click-left="onClickLeft"
+    />
+    <van-tabs type="card" :duration="0.2" animated background="transparent" style="border: none;" v-model="caseProgress">
+      <!--      登记-->
+      <van-tab :disabled="0 <= caseActive ? false : true">
+        <template #title>
+          <div :class="{ finish: 1 <= caseActive , notStarted: 1 > caseActive , ongoing: 0 == caseActive }" >
+            <p>登记</p>
+            <p>
+              <van-icon name="success" v-if="1 <= caseActive"/>
+              <van-icon name="circle" v-if="caseActive == 0"/>
+            </p>
+          </div>
+        </template>
+        <div class="main_box">
+          <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>
+            </template>
+          </van-cell>
+          <van-cell title="案件来源" :value="form.caseSource"/>
+          <van-cell title="关联方案" :value="form.schemeId"/>
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_ajxx.png" size="20"></van-icon>
+              <span class="custom-title">案件信息<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="案件编号" :value="form.caseNumPart1 + '农' + form.caseNumPart2 + '[' + form.caseNumPart3 + ']' +form.caseNum + '号'"/>
+          <van-cell title="案件名称" :value="form.caseName"/>
+          <van-cell title="登记日期" :value="form.registerDate" right-icon="calendar-o" />
+          <van-cell title="执法类别" :value="form.enforceCategory"/>
+          <van-cell title="当事人类型" :value="form.typeLable"/>
+
+          <template v-if="form.type=='1'">
+            <van-cell title="当事人姓名" :value="form.name"/>
+            <van-cell title="性别" :value="form.sex"/>
+            <van-cell title="民族" :value="form.nation" />
+            <van-cell title="出生日期" :value="form.birthday" />
+            <van-cell title="身份证号" :value="form.cardNum" />
+            <van-cell title="工作单位及职务" :value="form.companyPosition" />
+            <van-cell title="所在地区" :value="form.deptId" />
+            <van-cell title="联系电话" :value="form.phone" />
+            <van-cell title="联系地址" :value="form.address" />
+            <van-cell title="统一社会信用代码" :value="form.uniformCode" />
+            <van-cell title="字号名称" :value="form.zihao" />
+          </template>
+
+          <template v-if="form.type=='2'">
+            <van-cell title="企业名称" :value="form.companyName"/>
+            <van-cell title="法人/负责人" :value="form.legalName"/>
+            <van-cell title="所在地区" :value="form.deptId" />
+            <van-cell title="联系地址" :value="form.address" />
+            <van-cell title="联系电话" :value="form.phone" />
+            <van-cell title="统一社会信用代码" :value="form.uniformCode" />
+          </template>
+        </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>
+          <van-uploader v-if="form.attachement != null" v-model="attachementOption" multiple :show-upload="false" :deletable="false" />
+          <van-empty v-else description="暂无文件" />
+        </div>
+      </van-tab>
+      <!--      勘察-->
+      <van-tab v-show="progressLength>=3" v-if="zhenchaShow" :disabled="1 <= caseActive ? false : true">
+        <template #title>
+          <div
+            :class="{ finish: 2 <= caseActive , notStarted: 2 > caseActive , ongoing: 1 == caseActive }"
+          >
+            <p>勘察</p>
+            <p>
+              <van-icon name="success" v-if="2 <= caseActive"/>
+              <van-icon name="circle" v-if="caseActive == 1"/>
+            </p>
+          </div>
+        </template>
+        <div class="main_box">
+          <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>
+            </template>
+          </van-cell>
+          <van-cell title="案件名称" v-model="surveyForm.caseName"/>
+          <van-cell title="关联方案" v-model="surveyForm.schemeId"/>
+        </div>
+
+        <div class="main_box" style="margin-top: 10px;">
+          <van-cell>
+            <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>
+          </van-cell>
+          <div class="peopleList">
+            <van-row>
+              <van-col :span="4">序号</van-col>
+              <van-col :span="10">执行人员</van-col>
+              <van-col :span="10">执法证号</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="10">{{item.enforcerName}}</van-col>
+              <van-col :span="10">{{item.enforcerNum}}</van-col>
+            </van-row>
+
+          </div>
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_xwxx.png" size="20"></van-icon>
+              <span class="custom-title">现场检查<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="勘察开始时间" v-model="surveyForm.surveyStartTime" />
+          <van-cell title="勘察结束时间" v-model="surveyForm.surveyEndTime" />
+          <van-cell title="当事人" v-model="surveyForm.dangshiren"/>
+          <van-cell title="记录人" v-model="surveyForm.recorder"/>
+          <van-cell title="检查(勘察)地点" v-model="surveyForm.surveyAddr"/>
+          <van-cell title="现场检查(勘察)情况" :label="surveyForm.surveyDescription" />
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_xwxx.png" size="20"></van-icon>
+              <span class="custom-title">询问信息<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="询问开始时间" v-model="surveyForm.askStartTime"/>
+          <van-cell title="询问结束时间" v-model="surveyForm.askEndTime"/>
+          <van-cell title="询问地点" v-model="surveyForm.askAddr"/>
+          <van-cell title="询问记录人" v-model="surveyForm.askRecorder"/>
+          <van-cell title="被询问人姓名"v-model="surveyForm.askedName"/>
+          <van-cell title="被询问人电话" v-model="surveyForm.askedPhone"/>
+          <van-cell title="身份证号" v-model="surveyForm.idCard"/>
+          <van-cell title="性别" v-model="surveyForm.gender"/>
+          <van-cell title="工作单位" v-model="surveyForm.workCompany" />
+          <van-cell title="职务" v-model="surveyForm.workPosition" />
+          <van-cell title="住址" v-model="surveyForm.address" />
+          <van-cell title="询问问题" :label="surveyForm.question" />
+          <van-cell title="被询问人员证件是否清楚" v-model="surveyForm.isClear == 'Y' ? '是' : '否'" />
+          <van-cell title="是否申请调查人员回避" v-model="surveyForm.isAvoid == 'Y' ? '是' : '否'" />
+          <van-cell title="被询问人回答内容" :label="surveyForm.answer" />
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_xccj.png" size="20"></van-icon>
+              <span class="custom-title">现场抽检选项<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="是否现场抽检" v-model="surveyForm.isSpotCheck == 'Y' ? '是' : '否'"/>
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_ajxx.png" size="20"></van-icon>
+              <span class="custom-title">案件信息<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="受理时间" v-model="surveyForm.handleDate" />
+          <van-cell title="受案时间" v-model="surveyForm.shouanDate" />
+          <van-cell title="简要案情及立案（不予立案）理由" :label="surveyForm.reason" />
+          <van-cell title="是否审批" v-model="surveyForm.isApprove == 'Y' ? '是' : '否'"/>
+          <van-cell title="审批程序设置" v-model="surveyForm.surveyResult" />
+        </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>
+          <van-uploader v-if="surveyForm.attachement != null" v-model="surveyOption" multiple :show-upload="false" :deletable="false" />
+          <van-empty v-else description="暂无文件" />
+        </div>
+
+        <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="main_box examine_box" v-if="caseActive == 1 && type == 'waiting'">
+          <van-row type="flex" justify="space-between" align="center">
+            <van-col span="5">审批<br/>意见</van-col>
+            <van-col span="19">
+              <van-radio-group v-model="pass" direction="horizontal" @change="radioChange">
+                <van-radio name="true">同意</van-radio>
+                <van-radio name="false">驳回</van-radio>
+              </van-radio-group>
+              <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="审批意见"/>
+            </van-col>
+          </van-row>
+        </div>
+        <div style="margin: 16px 2%;" v-if="caseActive == 1 && type == 'waiting'">
+          <van-row>
+            <van-col span="24" align="center">
+              <van-button type="info" native-type="submit" @click="submitCase" class="submitButtonActive">提交</van-button>
+            </van-col>
+          </van-row>
+          <div class="clear"></div>
+        </div>
+      </van-tab>
+      <!--      立案-->
+      <van-tab v-show="progressLength>=4" v-if="lianShow" :disabled="2 <= caseActive ? false : true">
+        <template #title>
+          <div
+            :class="{ finish: 3 <= caseActive , notStarted: 3 > caseActive , ongoing: 2 == caseActive }"
+          >
+            <p>立案</p>
+            <p>
+              <van-icon name="success" v-if="3 <= caseActive"/>
+              <van-icon name="circle" v-if="caseActive == 2"/>
+            </p>
+          </div>
+        </template>
+        <div class="main_box">
+          <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>
+            </template>
+          </van-cell>
+          <van-cell title="案件名称" :value="putRecordForm.caseName" />
+          <van-cell title="关联方案" :value="putRecordForm.schemeId" />
+        </div>
+
+        <div class="main_box" style="margin-top: 10px;">
+          <van-cell>
+            <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>
+          </van-cell>
+          <div class="peopleList">
+            <van-row>
+              <van-col :span="4">序号</van-col>
+              <van-col :span="10">执行人员</van-col>
+              <van-col :span="10">执法证号</van-col>
+            </van-row>
+
+            <van-row v-for="(item,index) in tEnforcePutRecordHandlerList" :key="index">
+              <van-col :span="4">{{index+1}}</van-col>
+              <van-col :span="10">{{item.enforcerName}}</van-col>
+              <van-col :span="10">{{item.enforcerNum}}</van-col>
+            </van-row>
+
+          </div>
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_cfky.png" size="20"></van-icon>
+              <span class="custom-title">查封扣押<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="涉嫌违法行为" :value="putRecordForm.illegalAct" />
+          <van-cell title="处罚依据及内容" :value="putRecordForm.punishContent" />
+          <van-cell title="查封日期" :value="putRecordForm.sealDate" />
+          <van-cell title="查封时效" :value="putRecordForm.sealTimeliness" />
+          <van-cell title="查封天数" :value="putRecordForm.sealDays" />
+          <van-cell title="产品保存地点" :value="selectDictLabel(savePlaceOptions, putRecordForm.savePlace)" />
+          <van-cell title="现场情况" :value="putRecordForm.sceneCondition" />
+          <van-cell title="上诉单位" :value="putRecordForm.appealUnit" />
+          <van-cell title="复议单位" :value="putRecordForm.administrativeDept"  />
+          <van-cell title="诉讼单位" :value="putRecordForm.lawsuitDept"  />
+          <div class="peopleList cf">
+            <van-row>
+              <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="7">生产经营单位</van-col>
+            </van-row>
+
+            <van-row v-for="(item,index) in tEnforceDetainHandlerList" :key="index">
+              <van-col :span="5">{{item.name}}</van-col>
+              <van-col :span="3">{{item.size}}</van-col>
+              <van-col :span="3">{{item.propertyNum}}</van-col>
+              <van-col :span="6">{{item.productTimeNum}}</van-col>
+              <van-col :span="7">{{item.productUnit}}</van-col>
+            </van-row>
+
+          </div>
+
+          <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-image src="../../../../static/images/lawEnforcement/icon/icon_fj.png" width="50" />
+                <p>查封扣押</p>
+                <p>决定书</p>
+              </van-col>
+              <van-col :span="6"></van-col>
+            </van-row>
+          </div>
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_cfky.png" size="20"></van-icon>
+              <span class="custom-title">抽样信息<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="抽样现场人员" :value="selectDictLabel(samplingSceneOptions, samplingForm.samplingScene)" />
+          <van-cell title="抽样时间" :value="samplingForm.samplingTime" />
+          <van-cell title="抽样地点" :value="samplingForm.samplingPlace" />
+          <van-cell title="联系人" :value="samplingForm.linkman" />
+          <van-cell title="联系电话" :value="samplingForm.linkPhone" />
+
+          <div v-for="(item,index) in tEnforceSamplingGoodsList" :key="index">
+            <van-cell title="物品名称" :value="item.goodsName" />
+            <van-cell title="商标" :value="item.goodsIcon" />
+            <van-cell title="生产单位" :value="item.productUnit" />
+            <van-cell title="厂家确认期限" :value="item.timeliness"  />
+            <van-cell title="产品许可证" :value="item.productLicenseNum"  />
+            <van-cell title="单位许可证" :value="item.unitLicenseNum"  />
+            <van-cell title="生产日期" :value="item.productTimeNum"  />
+            <van-cell title="样品规格" :value="item.specs"  />
+            <van-cell title="样品基数" :value="item.basenum"  />
+            <van-cell title="抽样数量" :value="item.samplingNum"  />
+            <van-cell title="产品确认期限" :value="item.confirmTimeliness"  />
+            <van-cell title="抽样产品附件" />
+            <van-uploader v-if="item.attachement != null" v-model="item.attachementList" multiple :show-upload="false" :deletable="false" />
+            <van-empty v-else description="暂无文件" />
+
+            <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>
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_ajxx.png" size="20"></van-icon>
+              <span class="custom-title">案件信息<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="立案程序" value="一般程序"  />
+          <van-cell title="案件进展" :label="putRecordForm.progressCase"  />
+        </div>
+
+        <div class="main_box" style="margin-top: 10px;margin-bottom: 20PX;">
+          <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>
+          <van-uploader v-if="samplingForm.attachement != null" v-model="samplingOption" multiple :show-upload="false" :deletable="false" />
+          <van-empty v-else description="暂无文件" />
+        </div>
+      </van-tab>
+      <!--      取证-->
+      <van-tab v-show="progressLength>=5" v-if="quzhengShow" :disabled="3 <= caseActive ? false : true">
+        <template #title>
+          <div
+            :class="{ finish: 4 <= caseActive , notStarted: 4 > caseActive , ongoing: 3 == caseActive }"
+          >
+            <p>取证</p>
+            <p>
+              <van-icon name="success" v-if="4 <= caseActive"/>
+              <van-icon name="circle" v-if="caseActive == 3"/>
+            </p>
+          </div>
+        </template>
+        <div class="main_box">
+          <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>
+            </template>
+          </van-cell>
+          <van-cell title="案件名称" v-model="evidenceForm.caseName"/>
+          <van-cell title="关联方案" v-model="evidenceForm.schemeId"/>
+        </div>
+
+        <div class="main_box" style="margin-top: 10px;">
+          <van-cell>
+            <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>
+          </van-cell>
+          <div class="peopleList">
+            <van-row>
+              <van-col :span="4">序号</van-col>
+              <van-col :span="10">执行人员</van-col>
+              <van-col :span="10">执法证号</van-col>
+            </van-row>
+
+            <van-row v-for="(item,index) in tEnforceEvidenceHandlerList" :key="index">
+              <van-col :span="4">{{index+1}}</van-col>
+              <van-col :span="10">{{item.enforcerName}}</van-col>
+              <van-col :span="10">{{item.enforcerNum}}</van-col>
+            </van-row>
+
+          </div>
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_xwxx.png" size="20"></van-icon>
+              <span class="custom-title">检测结果<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <div v-for="(item,index) in detectResults" :key="index">
+            <van-cell title="产品名称" v-model="item.goodsName" />
+            <van-cell title="检测报告编号" v-model="item.reportNum" />
+            <van-cell title="质量判定" v-model="item.qualityStatus == '1' ? '合格':'不合格'"/>
+            <van-cell title="检测结果附件" v-model="item.attachement"/>
+            <van-uploader v-if="item.attachement != null" v-model="item.attachementList" multiple :show-upload="false" :deletable="false" />
+            <van-empty v-else description="暂无文件" />
+          </div>
+          <van-cell title="检测结果" v-model="evidenceForm.detectionResult" />
+          <van-cell title="申请复检单位" v-model="evidenceForm.reviewUnit" />
+          <van-cell title="复检时效" v-model="evidenceForm.reviewTime"/>
+          <van-cell title="联系人" v-model="evidenceForm.linkman"/>
+          <van-cell title="联系电话" v-model="evidenceForm.linkPhone"/>
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_ajxx.png" size="20"></van-icon>
+              <span class="custom-title">案件信息<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="案件调查过程" v-model="evidenceForm.investigationProcess" />
+          <van-cell title="涉嫌违法事实" v-model="evidenceForm.allegedIllegal" />
+          <van-cell title="违反条例" v-model="evidenceForm.violationRegulations" />
+          <van-cell title="处罚依据" v-model="evidenceForm.punishmentBase"/>
+          <van-cell title="证据材料" v-model="evidenceForm.caseDocuments" />
+          <van-cell title="调查结论" v-model="evidenceForm.conclusion" />
+          <van-cell title="处罚决定" :label="evidenceForm.penaltyDecision" />
+        </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>
+          <van-uploader v-if="evidenceForm.attachement != null" v-model="evidenceForm.attachementList" multiple :show-upload="false" :deletable="false" />
+          <van-empty v-else description="暂无文件" />
+        </div>
+
+        <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="main_box examine_box" v-if="caseActive == 3 && type == 'waiting'">
+          <van-row type="flex" justify="space-between" align="center">
+            <van-col span="5">审批<br/>意见</van-col>
+            <van-col span="19">
+              <van-radio-group v-model="pass" direction="horizontal" @change="radioChange">
+                <van-radio name="true">同意</van-radio>
+                <van-radio name="false">驳回</van-radio>
+              </van-radio-group>
+              <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="审批意见"/>
+            </van-col>
+          </van-row>
+        </div>
+        <div style="margin: 16px 2%;" v-if="caseActive == 3 && type == 'waiting'">
+          <van-row>
+            <van-col span="24" align="center">
+              <van-button type="info" native-type="submit" @click="submitEvidence" class="submitButtonActive">提交</van-button>
+            </van-col>
+          </van-row>
+          <div class="clear"></div>
+        </div>
+      </van-tab>
+      <!--      处理-->
+      <van-tab v-show="progressLength>=6" v-if="chuliShow" :disabled="4 <= caseActive ? false : true">
+        <template #title>
+          <div
+            :class="{ finish: 5 <= caseActive , notStarted: 5 > caseActive , ongoing: 4 == caseActive }"
+          >
+            <p>处理</p>
+            <p>
+              <van-icon name="success" v-if="5 <= caseActive"/>
+              <van-icon name="circle" v-if="caseActive == 4"/>
+            </p>
+          </div>
+        </template>
+        <div class="main_box">
+          <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>
+            </template>
+          </van-cell>
+          <van-cell title="案件名称" v-model="treatForm.caseName"/>
+          <van-cell title="关联方案" v-model="treatForm.schemeId"/>
+        </div>
+
+        <div class="main_box" style="margin-top: 10px;">
+          <van-cell>
+            <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>
+          </van-cell>
+          <div class="peopleList">
+            <van-row>
+              <van-col :span="4">序号</van-col>
+              <van-col :span="10">执行人员</van-col>
+              <van-col :span="10">执法证号</van-col>
+            </van-row>
+
+            <van-row v-for="(item,index) in tEnforceTreatHandlerList" :key="index">
+              <van-col :span="4">{{index+1}}</van-col>
+              <van-col :span="10">{{item.enforcerName}}</van-col>
+              <van-col :span="10">{{item.enforcerNum}}</van-col>
+            </van-row>
+
+          </div>
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_xwxx.png" size="20"></van-icon>
+              <span class="custom-title">听证<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="是否听证" v-model="treatForm.isHearing == 'Y' ? '是':'否'" />
+          <div v-if="treatForm.isHearing=='Y'">
+            <van-cell title="听证开始时间" v-model="treatForm.hearingStartTime" />
+            <van-cell title="听证结束时间" v-model="treatForm.hearingEndTime" />
+            <van-cell title="听证地点" v-model="treatForm.place"/>
+            <van-cell title="申请人" v-model="treatForm.proposer"/>
+            <van-cell title="法人代表(负责人)" v-model="treatForm.director" />
+            <van-cell title="证件类型" v-model="treatForm.documentType" />
+            <van-cell title="证件号码" v-model="treatForm.documentNumber"/>
+            <van-cell title="联系方式" v-model="treatForm.phoneNumber"/>
+            <van-cell title="通讯地址" v-model="treatForm.postalAddress"/>
+
+            <van-cell title="委托代理人" v-model="treatForm.agent"/>
+            <van-cell title="代理人证件类型" v-model="treatForm.agentDocumentType"/>
+            <van-cell title="代理人证件号码" v-model="treatForm.agentDocumentNumber"/>
+            <van-cell title="代理人联系方式" v-model="treatForm.agentPhoneNumber"/>
+            <van-cell title="代理人通讯地址" v-model="treatForm.agentPostalAddress"/>
+            <van-cell title="听证主持人" v-model="treatForm.hearingHost"/>
+            <van-cell title="听证主持人执法证号" v-model="treatForm.hearingHostNum"/>
+            <van-cell title="听证记录人" v-model="treatForm.hearingRecorder"/>
+            <van-cell title="听证记录人执法证号" v-model="treatForm.hearingRecorderNum"/>
+            <van-cell title="主持听证机关" v-model="treatForm.hearingAuthority"/>
+            <van-cell title="听证记录" :label="treatForm.hearingRecord"/>
+            <van-cell title="听证会报告事项" :label="treatForm.hearingReportMatters"/>
+          </div>
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_ajxx.png" size="20"></van-icon>
+              <span class="custom-title">案件处理意见<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="案件事实及依据" :label="treatForm.caseEvidence" />
+          <van-cell title="裁量依据及理由" :label="treatForm.caseReason" />
+          <van-cell title="陈述申辩或听证情况" :label="treatForm.caseSituation" />
+          <van-cell title="处罚意见" :label="treatForm.caseOpinion"/>
+          <van-cell title="处罚决定" :label="treatForm.caseDecision" />
+        </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>
+          <van-uploader v-if="treatForm.attachement != null" v-model="treatForm.attachementList" multiple :show-upload="false" :deletable="false" />
+          <van-empty v-else description="暂无文件" />
+        </div>
+
+        <p class="splcTit">审批流程</p>
+        <div class="main_box2">
+          <van-row v-for="(item,index) in treatHistoryList" :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="treatHistoryList.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="main_box examine_box" v-if="caseActive == 4 && type == 'waiting'">
+          <van-row type="flex" justify="space-between" align="center">
+            <van-col span="5">审批<br/>意见</van-col>
+            <van-col span="19">
+              <van-radio-group v-model="pass" direction="horizontal" @change="radioChange">
+                <van-radio name="true">同意</van-radio>
+                <van-radio name="false">驳回</van-radio>
+              </van-radio-group>
+              <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="审批意见"/>
+            </van-col>
+          </van-row>
+        </div>
+        <div style="margin: 16px 2%;" v-if="caseActive == 4 && type == 'waiting'">
+          <van-row>
+            <van-col span="24" align="center">
+              <van-button type="info" native-type="submit" @click="submitTreat" class="submitButtonActive">提交</van-button>
+            </van-col>
+          </van-row>
+          <div class="clear"></div>
+        </div>
+      </van-tab>
+      <!--      裁决-->
+      <van-tab v-show="progressLength>=7" v-if="caijueShow" :disabled="5 <= caseActive ? false : true">
+        <template #title>
+          <div
+            :class="{ finish: 6 <= caseActive , notStarted: 6 > caseActive , ongoing: 5 == caseActive }"
+          >
+            <p>裁决</p>
+            <p>
+              <van-icon name="success" v-if="6 <= caseActive"/>
+              <van-icon name="circle" v-if="caseActive == 5"/>
+            </p>
+          </div>
+        </template>
+        <div class="main_box">
+          <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>
+            </template>
+          </van-cell>
+          <van-cell title="案件名称" v-model="decisionForm.caseName"/>
+          <van-cell title="关联方案" v-model="decisionForm.schemeId"/>
+        </div>
+
+        <div class="main_box" style="margin-top: 10px;">
+          <van-cell>
+            <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>
+          </van-cell>
+          <div class="peopleList">
+            <van-row>
+              <van-col :span="4">序号</van-col>
+              <van-col :span="10">执行人员</van-col>
+              <van-col :span="10">执法证号</van-col>
+            </van-row>
+
+            <van-row v-for="(item,index) in tEnforceDecisionHandlerList" :key="index">
+              <van-col :span="4">{{index+1}}</van-col>
+              <van-col :span="10">{{item.enforcerName}}</van-col>
+              <van-col :span="10">{{item.enforcerNum}}</van-col>
+            </van-row>
+
+          </div>
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_xwxx.png" size="20"></van-icon>
+              <span class="custom-title">送达文书<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="送达文书名称" v-model="decisionForm.deliveryName" />
+          <van-cell title="送达文书编号" v-model="decisionForm.deliveryNum" />
+          <van-cell title="受送达人姓名或名称" v-model="decisionForm.deliveryPersonName"/>
+          <van-cell title="送达单位" v-model="decisionForm.deliveryUnit"/>
+          <van-cell title="送达方式" v-model="decisionForm.deliveryWay" />
+          <van-cell title="送达时间" v-model="decisionForm.deliveryTime" />
+          <van-cell title="送达地点" v-model="decisionForm.deliveryAddress"/>
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_xwxx.png" size="20"></van-icon>
+              <span class="custom-title">行政处罚<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="缴款时间" v-model="decisionForm.payTime" />
+          <van-cell title="缴款地点" v-model="decisionForm.payAddress" />
+          <van-cell title="上诉部门" v-model="decisionForm.appealDept"/>
+          <van-cell title="行政部门" v-model="decisionForm.administrativeDept"/>
+          <van-cell title="诉讼部门" v-model="decisionForm.lawsuitDept" />
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_ajxx.png" size="20"></van-icon>
+              <span class="custom-title">案件信息<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="备案" label="行政处罚" />
+          <van-cell title="案件当前状态" :label="decisionForm.surveyStatus" />
+        </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>
+          <van-uploader v-if="decisionForm.attachement != null" v-model="decisionForm.attachementList" multiple :show-upload="false" :deletable="false" />
+          <van-empty v-else description="暂无文件" />
+        </div>
+      </van-tab>
+      <!--      执行-->
+      <van-tab v-show="progressLength>=8" v-if="zhixingShow" :disabled="6 <= caseActive ? false : true">
+        <template #title>
+          <div
+            :class="{ finish: 7 <= caseActive , notStarted: 7 > caseActive , ongoing: 6 == caseActive }"
+          >
+            <p>执行</p>
+            <p>
+              <van-icon name="success" v-if="7 <= caseActive"/>
+              <van-icon name="circle" v-if="caseActive == 6"/>
+            </p>
+          </div>
+        </template>
+        <div class="main_box">
+          <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>
+            </template>
+          </van-cell>
+          <van-cell title="案件名称" v-model="executeForm.caseName"/>
+          <van-cell title="关联方案" v-model="executeForm.schemeId"/>
+        </div>
+
+        <div class="main_box" style="margin-top: 10px;">
+          <van-cell>
+            <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>
+          </van-cell>
+          <div class="peopleList">
+            <van-row>
+              <van-col :span="4">序号</van-col>
+              <van-col :span="10">执行人员</van-col>
+              <van-col :span="10">执法证号</van-col>
+            </van-row>
+
+            <van-row v-for="(item,index) in tEnforceExecuteHandlerList" :key="index">
+              <van-col :span="4">{{index+1}}</van-col>
+              <van-col :span="10">{{item.enforcerName}}</van-col>
+              <van-col :span="10">{{item.enforcerNum}}</van-col>
+            </van-row>
+
+          </div>
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_xwxx.png" size="20"></van-icon>
+              <span class="custom-title">处罚催告<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="滞纳罚款日期" v-model="executeForm.fineTime" />
+          <van-cell title="加处罚款金额(元)" v-model="executeForm.fineMoney" />
+        </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>
+          <van-uploader v-if="executeForm.attachement != null" v-model="executeForm.attachementList" multiple :show-upload="false" :deletable="false" />
+          <van-empty v-else description="暂无文件" />
+        </div>
+      </van-tab>
+      <!--      备案-->
+      <van-tab v-if="caseActive == 7" :disabled="7 <= caseActive ? false : true">
+        <template #title>
+          <div
+            :class="{ finish: 8 <= caseActive , notStarted: 8 > caseActive , ongoing: 7 == caseActive }"
+          >
+            <p>备案</p>
+            <p>
+              <van-icon name="success" v-if="8 <= caseActive"/>
+              <van-icon name="circle" v-if="caseActive == 7"/>
+            </p>
+          </div>
+        </template>
+        <div class="main_box">
+          <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>
+            </template>
+          </van-cell>
+          <van-cell title="案件名称" v-model="onrecordForm.caseName"/>
+          <van-cell title="关联方案" v-model="onrecordForm.schemeId"/>
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_xwxx.png" size="20"></van-icon>
+              <span class="custom-title">案件信息<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <div v-if="onrecordForm.recordType=='1'">
+            <van-cell title="备案" value="交办执法" />
+            <van-cell title="交办原因" :label="onrecordForm.assignReason" />
+            <van-divider>交办单位</van-divider>
+            <van-cell title="交办单位" v-model="onrecordForm.assignDept" />
+            <van-cell title="辖区名称" v-model="onrecordForm.regionName" />
+          </div>
+          <div v-if="onrecordForm.recordType=='2'">
+            <van-cell title="备案" value="无违法行为" />
+            <van-cell title="案件结果" v-model="onrecordForm.surveyResult" />
+          </div>
+          <div v-if="onrecordForm.recordType=='3'">
+            <van-cell title="备案" value="刑事追责" />
+            <van-cell title="案件状态" v-model="onrecordForm.caseStatus" />
+            <van-divider>移送信息</van-divider>
+            <van-cell title="移送公安局" v-model="onrecordForm.transferPolice" />
+            <van-cell title="抄送" v-model="onrecordForm.transferCopy" />
+            <van-cell title="联系人" v-model="onrecordForm.contacts" />
+            <van-cell title="联系电话" v-model="onrecordForm.phone" />
+          </div>
+          <div v-if="onrecordForm.recordType=='4'">
+            <van-divider>办理人员</van-divider>
+            <div class="peopleList">
+              <van-row>
+                <van-col :span="4">序号</van-col>
+                <van-col :span="10">执行人员</van-col>
+                <van-col :span="10">执法证号</van-col>
+              </van-row>
+
+              <van-row v-for="(item,index) in tEnforceOnrecordHandlerList" :key="index">
+                <van-col :span="4">{{index+1}}</van-col>
+                <van-col :span="10">{{item.enforcerName}}</van-col>
+                <van-col :span="10">{{item.enforcerNum}}</van-col>
+              </van-row>
+            </div>
+            <van-divider>处罚整改</van-divider>
+            <van-cell title="处罚时间" v-model="onrecordForm.punishStartTime" />
+            <van-cell title="责令整改期限" v-model="onrecordForm.rectifyTime" />
+            <van-cell title="违法事实" v-model="onrecordForm.breakFact" />
+            <van-cell title="处罚依据" v-model="onrecordForm.punishmentBase" />
+            <van-cell title="违反条例" v-model="onrecordForm.punishContent" />
+            <van-cell title="告知事项">
+              <template #label>
+                <p>1、当事人应当对违法行为立即或者在{{onrecordForm.correctDays}}日内予以纠正；</p>
+                <p>2、当事人必须在收到处罚决定书之日起15日内持本决定书到 {{onrecordForm.punishAddress}} 缴纳罚款。逾期不缴纳的,每日按罚款数额的3%加处罚款；</p>
+                <p>3、对本处罚决定不服的，可以在收到本处罚决定书之日起60日内向 {{onrecordForm.peopleGov}} 人民政府或者
+                  {{onrecordForm.reviewGov}} 申请行政复议；或者六个月内向
+                  {{onrecordForm.peopleCourt}} 人民法院提起行政诉讼。
+                </p>
+              </template>
+            </van-cell>
+            <van-cell title="是否当场执行" v-model="onrecordForm.spotExecute" />
+            <van-cell title="其他执行方式" v-model="onrecordForm.executModes" />
+            <van-cell title="拒不改正办法" v-model="onrecordForm.refusalCorrect" />
+            <van-cell title="改正违法行为" v-model="onrecordForm.unillegal" />
+            <van-cell title="联系人" v-model="onrecordForm.contacts" />
+            <van-cell title="联系电话" v-model="onrecordForm.phone" />
+            <van-divider>案件信息</van-divider>
+            <van-cell title="备案" value="简易程序" />
+            <van-cell title="案件结果" v-model="onrecordForm.surveyResult" />
+          </div>
+          <div v-if="onrecordForm.recordType=='5'">
+            <van-cell title="备案" value="违法不予立案" />
+            <van-cell title="案件结果" v-model="onrecordForm.surveyResult" />
+          </div>
+          <div v-if="onrecordForm.recordType=='6'">
+            <van-cell title="备案" value="撤销立案" />
+            <van-cell title="案件结果" v-model="onrecordForm.surveyResult" />
+          </div>
+          <div v-if="onrecordForm.recordType=='7'">
+            <van-cell title="备案" value="不予行政处罚" />
+            <van-cell title="案件结果" v-model="onrecordForm.surveyResult" />
+          </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>
+          <van-uploader v-if="executeForm.attachement != null" v-model="executeForm.attachementList" multiple :show-upload="false" :deletable="false" />
+          <van-empty v-else description="暂无文件" />
+        </div>
+      </van-tab>
+      <!--      结案-->
+      <van-tab v-if="caseActive == 8" :disabled="8 <= caseActive ? false : true">
+        <template #title>
+          <div
+            :class="{ finish: 9 <= caseActive , notStarted: 9 > caseActive , ongoing: 8 == caseActive }"
+          >
+            <p>结案</p>
+            <p>
+              <van-icon name="success" v-if="9 <= caseActive"/>
+              <van-icon name="circle" v-if="caseActive == 8"/>
+            </p>
+          </div>
+        </template>
+        <div class="main_box">
+          <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>
+            </template>
+          </van-cell>
+          <van-cell title="案件名称" :value="endingForm.caseName"/>
+          <van-cell title="关联方案" :value="endingForm.schemeId"/>
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_cfky.png" size="20"></van-icon>
+              <span class="custom-title">罚没物品处理<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="执行人" :value="endingForm.executeName"/>
+          <van-cell title="记录人" :value="endingForm.recordName"/>
+          <van-cell title="处理日期" :value="endingForm.dealDate"/>
+          <van-cell title="处理地点" :value="endingForm.dealAddress"/>
+          <van-cell title="处理物品" :value="endingForm.dealGoods"/>
+          <van-cell title="处理来源" :value="endingForm.goodsSource"/>
+          <van-cell title="处理情况" :label="endingForm.dealCondition"/>
+        </div>
+
+        <div class="main_box">
+          <van-cell>
+            <template #title>
+              <van-icon name="../../../static/images/lawEnforcement/icon/icon_ajxx.png" size="20"></van-icon>
+              <span class="custom-title">案件信息<i class="bgBlue"></i></span>
+            </template>
+          </van-cell>
+          <van-cell title="结案" value="已执行"/>
+          <van-cell title="案件结果" :label="endingForm.surveyResult"/>
+          <van-cell title="罚款缴纳类型" :value="endingForm.agingStatus"/>
+
+          <div v-if="endingForm.agingStatus=='1'">
+            <van-cell title="申请时间" :value="endingForm.applyTime"/>
+            <van-cell title="总金额" :value="endingForm.totalMoney"/>
+            <van-cell title="分期缴纳期数" :value="endingForm.agingNum"/>
+            <van-cell title="缴纳时间" :value="endingForm.payTime"/>
+            <van-cell title="每期缴纳金额" :value="endingForm.payMoney"/>
+          </div>
+
+          <div v-if="endingForm.agingStatus=='2'">
+            <van-cell title="申请时间" :value="endingForm.applyTime"/>
+            <van-cell title="缴纳期限时间" :value="endingForm.payDeadline"/>
+          </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>
+          <van-uploader v-if="endingForm.attachement != null" v-model="endingForm.attachementList" multiple :show-upload="false" :deletable="false" />
+          <van-empty v-else description="暂无文件" />
+        </div>
+      </van-tab>
+    </van-tabs>
+
+  </div>
+</template>
+<script>
+import {
+  getCase ,
+  schemeOptionList ,
+  treeselect ,
+  getSurveyByCaseId ,
+  getputRecordByCaseId ,
+  getSamplingByCaseId ,
+  getEvidenceByCaseId ,
+  getReportByGoodsId ,
+  getEnforcerList ,
+  getTreatByCaseId ,
+  getDecisionByCaseId ,
+  getExecuteByCaseId ,
+  getEndingByCaseId ,
+  progressList ,
+  getOnrecordByCaseId
+} from "@/api/lawEnforcement/index";
+import law from "@/components/common/law_footer";
+import request from "@/utils/request";
+export default {
+  name: "index",
+  components: {
+    law
+  },
+  data() {
+    return {
+      showBankType:false,
+      showPayeeType:false,
+      showPicker:false,
+      form:{},
+      caseProgress:0,
+      caseActive:0,
+
+      bankType:'',
+      payeeType:'',
+      value:'',
+      type:'',
+      progressLength:0,
+
+      zhenchaShow:true,
+      lianShow:true,
+      quzhengShow:true,
+      chuliShow:true,
+      caijueShow:true,
+      zhixingShow:true,
+
+      pass: "true",
+      comment: "同意",
+
+      bankTypeOptions:[],
+      payeeTypeOptions:[],
+      attachementOption:[],
+      savePlaceOptions:[],
+      qualityStatusOptions:[],
+      samplingSceneOptions:[],
+      conclusionOptions:[],
+      minDate: new Date(2020, 0, 1),
+      maxDate: new Date(2025, 10, 1),
+      currentDate: new Date(2021, 0, 17),
+      fileList: [
+        { url: 'https://img01.yzcdn.cn/vant/leaf.jpg' },
+        // Uploader 根据文件后缀来判断是否为图片文件
+        // 如果图片 URL 中不包含类型信息，可以添加 isImage 标记来声明
+        { url: 'https://cloud-image', isImage: true },
+      ],
+
+      // 勘察表单参数
+      surveyForm: {
+        id: null,
+        caseId: null,
+        surveyStartTime: null,
+        surveyEndTime: null,
+        dangshiren: null,
+        recorder: null,
+        askRecorder: null,
+        surveyAddr: null,
+        surveyDescription: null,
+        isSpotCheck: "N",
+        handleDate: null,
+        reason: null,
+        shouanDate: null,
+        isApprove: "Y",
+        surveyResult: "4",
+        askStartTime: null,
+        askEndTime: null,
+        askAddr: null,
+        recorder: null,
+        askedName: null,
+        askedPhone: null,
+        handleDate: null,
+        idCard: null,
+        gender: "1",
+        workCompany: null,
+        workPosition: null,
+        address: null,
+        question: null,
+        answer: null,
+        isClear: "Y",
+        isAvoid: "N",
+        attachement: null,
+        applyUserId: null,
+        applyUserName: null,
+        applyTime: null,
+        instanceId: null,
+        processKey: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        caseName: "",
+        schemeId: "",
+      },
+
+      // 立案表单参数
+      putRecordForm: {
+        id: null,
+        caseId: null,
+        illegalAct: null,
+        punishContent: null,
+        sealDate: null,
+        sealDays: null,
+        sealTimeliness: null,
+        savePlace: "1",
+        savePlaceAddress: null,
+        sceneCondition: null,
+        appealUnit: null,
+        progressCase: null,
+        attachement: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        caseName: "",
+        schemeId: "",
+      },
+      //勘察表单参数
+      samplingForm:{
+        id: null,
+        caseId: null,
+        samplingType: '2', // 此为立案页面,type默认为2立案抽样
+        samplingScene: '1',
+        samplingTime: null,
+        samplingPlace: null,
+        linkman: null,
+        linkPhone: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      },
+      // 取证表单参数
+      evidenceForm: {
+        id: null,
+        caseId: null,
+        detectionResult: null,
+        reviewUnit: null,
+        reviewTime: null,
+        linkman: null,
+        linkPhone: null,
+        investigationProcess: null,
+        allegedIllegal: null,
+        violationRegulations: null,
+        punishmentBase: null,
+        caseDocuments: null,
+        conclusion: "1",
+        penaltyDecision: null,
+        attachement: null,
+        applyUserId: null,
+        applyUserName: null,
+        applyTime: null,
+        instanceId: null,
+        processKey: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      },
+      // 检测报告表单参数
+      reportForm: {
+        id: null,
+        goodsId: null,
+        reportNum: null,
+        qualityStatus: null,
+        attachement: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      },
+      // 处理表单参数
+      treatForm: {
+        id: null,
+        caseId: null,
+        isHearing: "Y",
+        hearingStartTime: null,
+        hearingEndTime: null,
+        place: null,
+        proposer: null,
+        director: null,
+        documentType: null,
+        documentNumber: null,
+        phoneNumber: null,
+        postalAddress: null,
+        agent: null,
+        agentDocumentType: null,
+        agentDocumentNumber: null,
+        agentPhoneNumber: null,
+        agentPostalAddress: null,
+        hearingHost: null,
+        hearingHostNum: null,
+        hearingRecorder: null,
+        hearingRecorderNum: null,
+        hearingAuthority: null,
+        hearingRecord: null,
+        hearingReportMatters: null,
+        caseEvidence: null,
+        caseReason: null,
+        caseSituation: null,
+        caseOpinion: "1",
+        caseDecision: null,
+        attachement: null,
+        applyUserId: null,
+        applyUserName: null,
+        applyTime: null,
+        instanceId: null,
+        processKey: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        caseName: "",
+        schemeId: "",
+      },
+      // 裁决表单参数
+      decisionForm: {
+        id: null,
+        caseId: null,
+        deliveryName: null,
+        deliveryNum: null,
+        deliveryPersonName: null,
+        deliveryUnit: null,
+        deliveryWay: null,
+        deliveryTime: null,
+        deliveryAddress: null,
+        payTime: null,
+        payAddress: null,
+        appealDept: null,
+        administrativeDept: null,
+        lawsuitDept: null,
+        surveyStatus: null,
+        attachement: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        caseName: "",
+        schemeId: "",
+      },
+      // 执行表单参数
+      executeForm: {
+        id: null,
+        caseId: null,
+        fineTime: null,
+        fineMoney: null,
+        attachement: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        caseName: "",
+        schemeId: "",
+      },
+      // 结案表单参数
+      endingForm: {
+        id: null,
+        caseId: null,
+        executeName: null,
+        recordName: null,
+        dealDate: null,
+        dealAddress: null,
+        dealGoods: null,
+        goodsSource: null,
+        dealCondition: null,
+        surveyResult: null,
+        agingStatus: "3",
+        applyTime: null,
+        totalMoney: null,
+        agingNum: null,
+        payTime: null,
+        payMoney: null,
+        payDeadline: null,
+        attachement: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        caseName: "",
+        schemeId: "",
+      },
+      // 备案表单参数
+      onrecordForm: {
+        id: null,
+        caseId: null,
+        surveyResult: null,
+        recordType: null,
+        punishStartTime: null,
+        rectifyTime: null,
+        breakFact: null,
+        punishmentBase: null,
+        punishContent: null,
+        correctDays: null,
+        punishAddress: null,
+        peopleGov: null,
+        reviewGov: null,
+        peopleCourt: null,
+        spotExecute: "0",
+        executModes: null,
+        refusalCorrect: null,
+        unillegal: null,
+        assignReason: null,
+        assignDept: null,
+        regionName: null,
+        caseStatus: "0",
+        transferPolice: null,
+        transferCopy: null,
+        contacts: null,
+        phone: null,
+        attachement: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      },
+      // 办理人员列表
+      tEnforceCaseHandlerList: [],
+      tEnforcePutRecordHandlerList: [],
+      tEnforceSamplingGoodsList: [],
+      tEnforceDetainHandlerList: [],
+      tEnforceEvidenceHandlerList: [],
+      tEnforceTreatHandlerList: [],
+      tEnforceDecisionHandlerList: [],
+      tEnforceExecuteHandlerList: [],
+      tEnforceOnrecordHandlerList: [],
+      getDecisionByCaseId: [],
+      historyList: [],
+      evidencHistoryList: [],
+      treatHistoryList: [],
+      // 检测结果数据
+      detectResults: [],
+      decisionEnforcers: [],
+      executeEnforcers: [],
+      endingEnforcers: [],
+      treatEnforcers: [],
+      surveyOption: [],
+      samplingOption: [],
+      putRecordOption: [],
+      documentTypeOptions: [],
+      agingStatusOptions: [],
+
+      // 案件执法进度 1:登记 2:勘察 3:立案 4:取证 5:处理 6:裁决 7:执行 8:备案 9:结案字典
+      caseProgressOptions: [],
+      successActive:0, // 当前节点的前一个已完成节点
+      active: 1,  // 当前节点
+    };
+  },
+
+  created() {
+    this.caseProgress = parseInt(this.$route.query.caseProgress)-1;
+    this.caseActive = parseInt(this.$route.query.caseProgress)-1 ;
+    // if (parseInt(this.$route.query.caseProgress)>7){
+    //   this.caseProgress = 7;
+    //   this.caseActive = 7 ;
+    // }else{
+    //   this.caseProgress = parseInt(this.$route.query.caseProgress)-1;
+    //   this.caseActive = parseInt(this.$route.query.caseProgress)-1 ;
+    // }
+    this.type = this.$route.query.type;
+    console.log(this.caseProgress)
+    this.getDicts("case_source").then(response => {
+      this.caseSourceOptions = response.data;
+    });
+    this.getDicts("enforce_body_type").then(response => {
+      this.typeOptions = response.data;
+    });
+    this.getDicts("sex").then(response => {
+      this.sexOptions = response.data;
+    });
+    this.getDicts("nationality").then(response => {
+      this.nationOptions = response.data;
+    });
+    this.getDicts("case_status").then(response => {
+      this.caseStatusOptions = response.data;
+    });
+    // this.getDicts("case_node").then(response => {
+    //   this.caseProgressOptions = response.data;
+    // });
+    this.getDicts("enforce_category").then(response => {
+      this.enforceCategoryOptions = response.data;
+    });
+    this.getDicts("approve_type").then(response => {
+      this.surveyResultOptions = response.data;
+    });
+    this.getDicts("goods_location").then(response => {
+      this.savePlaceOptions = response.data;
+    });
+    this.getDicts("sampling_person_type").then(response => {
+      this.samplingSceneOptions = response.data;
+    });
+    this.getDicts("quality_type").then(response => {
+      this.qualityStatusOptions = response.data;
+    });
+    this.getDicts("conclusion_type").then(response => {
+      this.conclusionOptions = response.data;
+    });
+    this.getDicts("cert_type").then(response => {
+      this.documentTypeOptions = response.data;
+    });
+    this.getDicts("aging_status").then(response => {
+      this.agingStatusOptions = response.data;
+    });
+    // 关联方案下拉框
+    var schemeQueryParam = {
+      applyStatus: "1"
+    };
+    schemeOptionList(schemeQueryParam).then((response) => {
+      console.log(response)
+      this.schemeOptions = response.data;
+      this.getInformation();
+    });
+
+
+
+    // treeselect().then((response) => {
+    //   this.deptOptions = response.data;
+    // });
+
+  },
+  methods: {
+    /** 保存审批意见提交 */
+    submitCase() {
+      const data = {
+        taskId: this.surveyForm.taskId,
+        instanceId: this.surveyForm.instanceId,
+        variables: JSON.stringify({
+          comment: this.comment,
+          pass: this.pass,
+          //"formData": this.row,
+        }),
+      };
+      return request({
+        url: "/activiti/process/complete",
+        method: "post",
+        params: data,
+      }).then((response) => {
+        if (response.code == 200 && response.msg == "操作成功") {
+          this.$notify({ type: 'success' , message: "操作成功" });
+          setTimeout(function () {
+            history.back(-1);
+          },1000)
+        } else {
+          this.$notify({ type: 'danger' , message: "操作失败" });
+        }
+      });
+    },
+    /** 保存审批意见提交 */
+    submitEvidence() {
+      const data = {
+        taskId: this.evidenceForm.taskId,
+        instanceId: this.evidenceForm.instanceId,
+        variables: JSON.stringify({
+          comment: this.comment,
+          pass: this.pass,
+          //"formData": this.row,
+        }),
+      };
+      return request({
+        url: "/activiti/process/complete",
+        method: "post",
+        params: data,
+      }).then((response) => {
+        if (response.code == 200 && response.msg == "操作成功") {
+          this.$notify({ type: 'success' , message: "操作成功" });
+          setTimeout(function () {
+            history.back(-1);
+          },1000)
+        } else {
+          this.$notify({ type: 'danger' , message: "操作失败" });
+        }
+      });
+    },
+    /** 保存审批意见提交 */
+    submitTreat() {
+      const data = {
+        taskId: this.treatForm.taskId,
+        instanceId: this.treatForm.instanceId,
+        variables: JSON.stringify({
+          comment: this.comment,
+          pass: this.pass,
+          //"formData": this.row,
+        }),
+      };
+      return request({
+        url: "/activiti/process/complete",
+        method: "post",
+        params: data,
+      }).then((response) => {
+        if (response.code == 200 && response.msg == "操作成功") {
+          this.$notify({ type: 'success' , message: "操作成功" });
+          setTimeout(function () {
+            history.back(-1);
+          },1000)
+        } else {
+          this.$notify({ type: 'danger' , message: "操作失败" });
+        }
+      });
+    },
+    getInformation(){
+      getCase(this.$route.query.id).then(response => {
+        console.log(response)
+        response.data.caseSource = this.selectDictLabel(this.caseSourceOptions, response.data.caseSource);
+        response.data.schemeId = this.selectDictScheme(this.schemeOptions, response.data.schemeId);
+        response.data.typeLable = this.selectDictLabel(this.typeOptions, response.data.type);
+        response.data.sex = this.selectDictLabel(this.sexOptions, response.data.sex);
+        response.data.nation = this.selectDictLabel(this.nationOptions, response.data.nation);
+        if (response.data.attachement){
+          var attachement = response.data.attachement.split( "," );
+          attachement.forEach(res=>{
+            this.attachementOption.push({
+              url:res
+            });
+          })
+        }
+
+        // response.data.deptId = this.selectDictDeptId(this.deptOptions, response.data.deptId);
+        this.form = response.data;
+        this.progressSpeed()
+        // if (this.caseActive == 7){//判断是否为备案
+        //
+        // }else{
+        //   if( this.caseActive >= 1 ){//勘察
+        //     console.log("勘察")
+        //     this.caseSurvey();
+        //   }
+        //   if( this.caseActive >= 2 ){//立案
+        //     console.log("立案")
+        //     this.getFileCase();
+        //   }
+        //   if( this.caseActive >= 3 ){//取证
+        //     console.log("取证")
+        //     this.getEvidenceCase();
+        //   }
+        //   if( this.caseActive >= 4 ){//处理
+        //     console.log("处理")
+        //     this.getTreat();
+        //   }
+        //   if( this.caseActive >= 5 ){//裁决
+        //     console.log("裁决")
+        //     this.getDecision();
+        //   }
+        //   if( this.caseActive >= 6 ){//执行
+        //     console.log("执行")
+        //     this.getExecuteCase();
+        //   }
+        //   if( this.caseActive >= 7 ){//备案
+        //     console.log("备案")
+        //     this.getOnrecord();
+        //   }
+        //   if( this.caseActive >= 8 ){//结案
+        //     console.log("结案")
+        //     this.getEndingForm();
+        //   }
+        // }
+      });
+    },
+    //勘察表单查询
+    caseSurvey(){
+      // 查询勘察表单数据
+      var _this = this;
+      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;
+            _this.instanceId = responseSurvey.data.instanceId;
+            _this.tEnforceCaseHandlerList = responseSurvey.data.tEnforceCaseHandlerList;
+          }
+          if (responseSurvey.data.attachement){
+            var attachement = responseSurvey.data.attachement.split( "," );
+            attachement.forEach(response=>{
+              this.surveyOption.push({
+                url:response
+              });
+            })
+          }
+          _this.surveyForm.gender = this.selectDictLabel(this.sexOptions, _this.surveyForm.gender);
+          _this.surveyForm.surveyResult = this.selectDictLabel(this.surveyResultOptions, _this.surveyForm.surveyResult);
+          _this.surveyForm.caseName = this.form.caseName;
+          _this.surveyForm.schemeId = this.form.schemeId;
+          // 查询审批历史记录
+          _this.getHistoryList(_this.surveyForm,'');
+        });
+      }
+    },
+
+    //查询立案表单数据
+    getFileCase(){
+      var _this = this;
+      if(this.form.id != null && this.form.id !=""){
+        this.putRecordForm.caseId = this.form.id;
+        getputRecordByCaseId(_this.form.id).then(responsePutRecord => {
+          getSamplingByCaseId(_this.form.id).then(responseSampling => {
+            if(responsePutRecord.data != undefined){
+              _this.putRecordForm = responsePutRecord.data;
+              _this.tEnforcePutRecordHandlerList = responsePutRecord.data.tEnforceCaseHandlerList;
+              _this.tEnforceDetainHandlerList = responsePutRecord.data.tEnforceDetainHandlerList;
+            }
+            if(responseSampling.data != undefined) {
+              _this.samplingForm = responseSampling.data;
+              _this.tEnforceSamplingGoodsList = responseSampling.data.tEnforceSamplingGoodsList;
+
+              for (var i = 0 ; i < responseSampling.data.tEnforceSamplingGoodsList.length ; i++){
+                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:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response,
+                    });
+                  })
+                }
+              }
+              console.log(responseSampling.data.tEnforceSamplingGoodsList)
+            }
+            if (responsePutRecord.data.attachement){
+              var attachement = responsePutRecord.data.attachement.split( "," );
+              attachement.forEach(response=>{
+                this.samplingOption.push({
+                  url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response,
+                });
+              })
+            }
+            _this.putRecordForm.caseName = this.form.caseName;
+            _this.putRecordForm.schemeId = this.form.schemeId;
+          });
+        });
+      }
+    },
+
+    //查询取证表单数据
+    getEvidenceCase(){
+      var _this = this;
+      if (this.form.id != null && this.form.id != "") {
+        this.evidenceForm.caseId = this.form.id;
+        getEvidenceByCaseId(this.form.id).then(responseEvidence => {
+          getSamplingByCaseId(this.form.id).then(responseSampling => {
+            for (var i = 0; i < responseSampling.data.tEnforceSamplingGoodsList.length; i++) {
+              let goodsId = responseSampling.data.tEnforceSamplingGoodsList[i].id;
+              let goodsName = responseSampling.data.tEnforceSamplingGoodsList[i].goodsName;
+              getReportByGoodsId(goodsId).then(responseReport => {
+                console.log(responseReport)
+                if (responseReport.data != undefined) {
+                  responseReport.data.goodsId = goodsId;
+                  responseReport.data.goodsName = goodsName;
+                  responseReport.data.attachementList = [];
+
+                  _this.detectResults.push(responseReport.data);
+                } else {
+                  var goodsObj = {
+                    "goodsId": goodsId,
+                    "goodsName": goodsName
+                  };
+                  _this.detectResults.push(goodsObj);
+                }
+              });
+            }
+            if (responseEvidence.data != undefined) {
+              responseEvidence.data.attachementList = [];
+
+              responseEvidence.data.conclusion = this.selectDictLabel(this.conclusionOptions,responseEvidence.data.conclusion)
+
+              _this.evidenceForm = responseEvidence.data;
+              _this.tEnforceEvidenceHandlerList = responseEvidence.data.tEnforceCaseHandlerList;
+              console.log(responseEvidence.data)
+              if (responseEvidence.data.attachement){
+                var Evidence = responseEvidence.data.attachement.split( "," );
+                Evidence.forEach(response=>{
+                  responseEvidence.data.attachementList.push({
+                    url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response,
+                  });
+                })
+              }
+            }
+            setTimeout(function () {
+              for (var i = 0 ; i < responseSampling.data.tEnforceSamplingGoodsList.length ; i++){
+                console.log(_this.detectResults[0])
+                if (responseSampling.data.tEnforceSamplingGoodsList[i].attachement){
+                  var Sampling = responseSampling.data.tEnforceSamplingGoodsList[i].attachement.split( "," );
+                  Sampling.forEach(response=>{
+                    _this.detectResults[i].attachementList.push({
+                      url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response,
+                    });
+                  })
+                }
+              }
+            },1000)
+            _this.evidenceForm.caseName = this.form.caseName;
+            _this.evidenceForm.schemeId = this.form.schemeId;
+            // 查询审批历史记录
+            _this.getHistoryList(this.evidenceForm,'evidence');
+          });
+        });
+      }
+    },
+
+    //查询处理表单数据
+    getTreat(){
+      // 执行人员列表查询
+      getEnforcerList().then(response => {
+        const data = response.enforcerList;
+        for (let i = 0; i < data.length; i++) {
+          const res = {
+            enforcerId: data[i].id,
+            enforcerName: data[i].name,
+            enforcerNum: data[i].enforceNum,
+            value: data[i].name,
+          };
+          this.treatEnforcers.push(res);
+        }
+      });
+      // 查询处理表单数据
+      var _this = this;
+      if (this.form.id != null && this.form.id != "") {
+        this.treatForm.caseId = this.form.id;
+        getTreatByCaseId(this.form.id).then(responseTreat => {
+          console.log(responseTreat)
+          if (responseTreat.data != undefined) {
+            responseTreat.data.attachementList = [];
+            responseTreat.data.documentType = this.selectDictLabel(this.documentTypeOptions,responseTreat.data.documentType)
+            responseTreat.data.agentDocumentType = this.selectDictLabel(this.documentTypeOptions,responseTreat.data.agentDocumentType)
+            _this.treatForm = responseTreat.data;
+            _this.tEnforceTreatHandlerList = responseTreat.data.tEnforceCaseHandlerList;
+
+            if (responseTreat.data.attachement){
+              var Treat = responseTreat.data.attachement.split( "," );
+              Treat.forEach(response=>{
+                responseTreat.data.attachementList.push({
+                  url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response,
+                });
+              })
+            }
+          }
+          _this.treatForm.caseName = this.form.caseName;
+          _this.treatForm.schemeId = this.form.schemeId;
+
+          // 查询审批历史记录
+          _this.getHistoryList(_this.treatForm,'treat');
+        });
+      }
+    },
+
+    //查询裁决表单数据
+    getDecision(){
+      // 执行人员列表查询
+      getEnforcerList().then(response => {
+        const data = response.enforcerList;
+        for (let i = 0; i < data.length; i++) {
+          const res = {
+            enforcerId: data[i].id,
+            enforcerName: data[i].name,
+            enforcerNum: data[i].enforceNum,
+            value: data[i].name,
+          };
+          this.decisionEnforcers.push(res);
+        }
+      });
+      // 查询裁决表单数据
+      var _this = this;
+      if (this.form.id != null && this.form.id != "") {
+        this.decisionForm.caseId = this.form.id;
+        getDecisionByCaseId(this.form.id).then(responseDecision => {
+          if (responseDecision.data != undefined) {
+            console.log(responseDecision)
+            responseDecision.data.attachementList = [];
+            _this.decisionForm = responseDecision.data;
+            _this.tEnforceDecisionHandlerList = responseDecision.data.tEnforceCaseHandlerList;
+
+            if (responseDecision.data.attachement){
+              var Treat = responseDecision.data.attachement.split( "," );
+              Treat.forEach(response=>{
+                responseDecision.data.attachementList.push({
+                  url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response,
+                });
+              })
+            }
+          }
+          _this.decisionForm.caseName = this.form.caseName;
+          _this.decisionForm.schemeId = this.form.schemeId;
+        });
+      }
+    },
+
+    //查询执行表单数据
+    getExecuteCase(){
+      // 执行人员列表查询
+      getEnforcerList().then(response => {
+        const data = response.enforcerList;
+        for (let i = 0; i < data.length; i++) {
+          const res = {
+            enforcerId: data[i].id,
+            enforcerName: data[i].name,
+            enforcerNum: data[i].enforceNum,
+            value: data[i].name,
+          };
+          this.executeEnforcers.push(res);
+        }
+      });
+
+      // 查询执行表单数据
+      var _this = this;
+      if (this.form.id != null && this.form.id != "") {
+        this.executeForm.caseId = this.form.id;
+        getExecuteByCaseId(this.form.id).then(responseExecute => {
+          if (responseExecute.data != undefined) {
+            responseExecute.data.attachementList = [];
+            _this.executeForm = responseExecute.data;
+            _this.tEnforceExecuteHandlerList = responseExecute.data.tEnforceCaseHandlerList;
+
+            if (responseExecute.data.attachement){
+              var Execute = responseExecute.data.attachement.split( "," );
+              Execute.forEach(response=>{
+                responseExecute.data.attachementList.push({
+                  url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response,
+                });
+              })
+            }
+          }
+          _this.executeForm.caseName = this.form.caseName;
+          _this.executeForm.schemeId = this.form.schemeId;
+        });
+      }
+    },
+
+    getOnrecord(){
+      // 查询备案表单数据
+      if (this.form.id != null && this.form.id != "") {
+        this.onrecordForm.caseId = this.form.id;
+        getCase(this.form.id).then(response => {
+          getOnrecordByCaseId(this.form.id).then(responseOnrecord => {
+            if (responseOnrecord.data != undefined) {
+              this.onrecordForm = responseOnrecord.data;
+              this.tEnforceOnrecordHandlerList = responseOnrecord.data.tEnforceCaseHandlerList;
+            }
+            this.onrecordForm.caseName = this.form.caseName;
+            this.onrecordForm.schemeId = this.form.schemeId;
+          });
+        });
+      }
+    },
+
+    //查询结案表单数据
+    getEndingForm(){
+      // 执行人员列表查询
+      getEnforcerList().then(response => {
+        const data = response.enforcerList;
+        for (let i = 0; i < data.length; i++) {
+          const res = {
+            enforcerId: data[i].id,
+            enforcerName: data[i].name,
+            enforcerNum: data[i].enforceNum,
+            value: data[i].name,
+          };
+          this.endingEnforcers.push(res);
+        }
+      });
+      // 查询结案表单数据
+      var _this = this;
+      if (this.form.id != null && this.form.id != "") {
+        this.endingForm.caseId = this.form.id;
+        getEndingByCaseId(this.form.id).then(responseEnding => {
+          if (responseEnding.data != undefined) {
+            responseEnding.data.attachementList = [];
+            responseEnding.data.agingStatus = this.selectDictLabel(this.agingStatusOptions,responseEnding.data.agingStatus)
+            _this.endingForm = responseEnding.data;
+
+            if (responseEnding.data.attachement){
+              var Execute = responseEnding.data.attachement.split( "," );
+              Execute.forEach(response=>{
+                responseEnding.data.attachementList.push({
+                  url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response,
+                });
+              })
+            }
+          }
+          _this.endingForm.caseName = this.form.caseName;
+          _this.endingForm.schemeId = this.form.schemeId;
+        });
+      }
+    },
+
+    progressSpeed(){
+      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
+        };
+        progressList(progressParam).then(response => {
+          console.log(response)
+          for (var i = 0; i < response.data.length; i++) {
+            var obj={
+              dictLabel:response.data[i].caseProgressName,
+              dictValue:response.data[i].caseProgress
+            }
+            this.caseProgressOptions.push(obj);
+          }
+        });
+      } else if(this.form.caseProgress=="8" && this.form.caseStatus == "1"){
+        console.log("b")
+        // 进行中的案件到达备案阶段显示历史节点和备案节点
+        var progressParam = {
+          "caseId": this.form.id
+        };
+        progressList(progressParam).then(response => {
+          for (var i = 0; i < response.data.length; i++) {
+            var obj = {
+              dictLabel: response.data[i].caseProgressName,
+              dictValue: response.data[i].caseProgress
+            }
+            this.caseProgressOptions.push(obj);
+          }
+          var onrecordObj = {
+            dictLabel: "备案",
+            dictValue: "8"
+          }
+          this.caseProgressOptions.push(onrecordObj);
+        });
+      } else{
+        console.log("c")
+        // 非备案或者结案阶段的案件,显示所有节点判断状态
+        this.getDicts("case_node").then(response => {
+          console.log(this.form.caseProgress)
+          if (this.form.caseProgress == "8") { // 结案状态
+            for (var i = 0; i < response.data.length; i++) {
+              if (response.data[i].dictValue != "8") { // 如果是结案,步骤条不显示备案
+                this.caseProgressOptions.push(response.data[i]);
+              }
+            }
+          } else{
+            this.caseProgressOptions = response.data;
+          }
+        });
+      }
+
+      var that = this ;
+      setTimeout(function () {
+        that.zhenchaShow = false ;
+        that.lianShow = false ;
+        that.quzhengShow = false ;
+        that.chuliShow = false ;
+        that.caijueShow = false ;
+        that.zhixingShow = false ;
+
+        console.log(this.zhenchaShow)
+        console.log(this.lianShow)
+        console.log(this.quzhengShow)
+        console.log(this.chuliShow)
+        console.log(this.caijueShow)
+        console.log(this.zhixingShow)
+        that.progressLength = that.caseProgressOptions.length;
+        console.log(that.caseProgressOptions.length-1)
+        if( that.caseProgressOptions.length >= 3 && that.caseActive >= 1 ){//勘察
+          console.log("勘察")
+          that.caseSurvey();
+          that.zhenchaShow = true ;
+        }
+        if( that.caseProgressOptions.length >= 4 && that.caseActive >= 2 ){//立案
+          console.log("立案")
+          that.getFileCase();
+          that.lianShow = true ;
+        }
+        if( that.caseProgressOptions.length >= 5 && that.caseActive >= 3 ){//取证
+          console.log("取证")
+          that.getEvidenceCase();
+          that.quzhengShow = true ;
+        }
+        if( that.caseProgressOptions.length >= 6 && that.caseActive >= 4 ){//处理
+          console.log("处理")
+          that.getTreat();
+          that.chuliShow = true ;
+        }
+        if( that.caseProgressOptions.length >= 7 && that.caseActive >= 5 ){//裁决
+          console.log("裁决")
+          that.getDecision();
+          that.caijueShow = true ;
+        }
+        if( that.caseProgressOptions.length >= 8 && that.caseActive >= 6 ){//执行
+          console.log("执行")
+          that.getExecuteCase();
+          that.zhixingShow = true ;
+        }
+        if( that.caseActive == 8 ){//执行
+          console.log("结案")
+          that.caseProgress = that.caseProgressOptions.length-1;
+          that.getEndingForm();
+        }
+        if (that.caseActive == 7){//判断是否为备案
+          console.log("备案")
+          that.caseProgress = that.caseProgressOptions.length-1;
+          that.getOnrecord();
+        }else{
+          that.zhenchaShow = true ;
+          that.lianShow = true ;
+          that.quzhengShow = true ;
+          that.chuliShow = true ;
+          that.caijueShow = true ;
+          that.zhixingShow = true ;
+        }
+      },500)
+
+      console.log(this.caseProgressOptions)
+    },
+
+    /** 查询审批历史展示步骤条 */
+    getHistoryList(formData,type) {
+      if (formData.instanceId != null && formData.instanceId != "") {
+        var queryParams = {
+          processInstanceId: formData.instanceId
+        };
+        return request({
+          url: "/activiti/process/listHistory",
+          method: "post",
+          data: queryParams,
+        }).then((response) => {
+          if (type == 'evidence'){
+            this.evidencHistoryList = response.rows;
+            this.evidencHistoryList.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 if (type == 'treat'){
+            this.treatHistoryList = response.rows;
+            this.treatHistoryList.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) => {
+              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.spanNum = 5;
+      }
+    },
+
+    format(time, format) {
+      var t = new Date(time);
+      var tf = function (i) { return (i < 10 ? '0' : '') + i };
+      return format.replace(/yyyy|MM|dd|HH|mm|ss/g, function (a) {
+        switch (a) {
+          case 'yyyy':
+            return tf(t.getFullYear());
+            break;
+          case 'MM':
+            return tf(t.getMonth() + 1);
+            break;
+          case 'mm':
+            return tf(t.getMinutes());
+            break;
+          case 'dd':
+            return tf(t.getDate());
+            break;
+          case 'HH':
+            return tf(t.getHours());
+            break;
+          case 'ss':
+            return tf(t.getSeconds());
+            break;
+        }
+      })
+    },
+    /**
+     * 计算出相差天数
+     * @param secondSub
+     */
+    formatTotalDateSub (secondSub) {
+      var days = Math.floor(secondSub / (24 * 3600));     // 计算出小时数
+      var leave1 = secondSub % (24*3600) ;                // 计算天数后剩余的毫秒数
+      var hours = Math.floor(leave1 / 3600);              // 计算相差分钟数
+      var leave2 = leave1 % (3600);                       // 计算小时数后剩余的毫秒数
+      var minutes = Math.floor(leave2 / 60);              // 计算相差秒数
+      var leave3 = leave2 % 60;                           // 计算分钟数后剩余的毫秒数
+      var seconds = Math.round(leave3);
+      return days + "天" + hours + "时" + minutes + "分" + seconds + '秒';
+    },
+
+    radioChange(value){
+      this.comment = value == 'true' ? '同意' : '驳回' ;
+    },
+
+  },
+};
+</script>
+
+<style scoped lang="scss">
+@font-face {
+  font-family: SourceHanSansCNBold;
+  src: url("../../../assets/fonts/SourceHanSansCN-Bold.otf");
+}
+.app-container {
+  padding: 0;
+}
+.van-row{
+  display: flex;
+  flex-wrap: wrap;
+}
+.examine_box{
+  background-color: #1D6FE9!important;
+  padding: 0.18rem!important;
+  padding-left: 0!important;
+  border-radius: 0.15rem!important;
+  margin-top: 0.3rem!important;
+}
+.examine_box .van-col:first-child{
+  color: #FFF!important;
+  font-size: 0.45rem!important;
+  text-align: center!important;
+}
+.examine_box .van-col:last-child{
+  background-color: #FFF!important;
+  border-radius: 0.15rem!important;
+  overflow: hidden!important;
+  .van-radio-group--horizontal{
+    padding: 0.2rem 0;
+    border-bottom: 1px solid #eee;
+  }
+}
+/deep/.van-tabs .van-tabs__nav{
+  border: none;
+  height: auto;
+}
+/deep/.van-radio--horizontal{
+  margin-left: 20px;
+  margin-right: 0;
+}
+.submitButtonActive{
+  width: 100%;
+  margin: 0 auto;
+}
+.van-uploader {
+  padding: 15PX;
+}
+/deep/ .van-nav-bar--fixed{
+  background: url("../../../../static/images/lawEnforcement/head_bg.png") 100%;
+}
+/deep/ .van-nav-bar .van-icon{
+  color: #ffffff;
+}
+/deep/ .van-nav-bar__title{
+  color: #ffffff;
+}
+/deep/ .van-tabs__nav--complete{
+  padding: 0;
+  border: none;
+  height: auto;
+}
+/deep/ .van-tabs__nav--card .van-tab{
+  border: none;
+}
+/deep/ .van-tabs--card>.van-tabs__wrap{
+  height: auto;
+  margin-top: 10PX;
+}
+/deep/ .van-tabs__nav--card .van-tab.van-tab--active{
+  background: transparent;
+  .van-tab__text{
+    width: 56PX;
+    height: 56PX;
+    line-height: 56PX;
+  }
+  .finish,.ongoing,.notStarted{
+    padding: 15PX 0;
+  }
+}
+/deep/ .van-tab__text{
+  display: block;
+  width: 44PX;
+  height: 44PX;
+  background: #FFF;
+  border-radius: 50%;
+  border: 1px solid #C9C9C9;
+  color: #C9C9C9;
+  text-align: center;
+  padding: 0;
+  p{
+    line-height: 1;
+  }
+}
+.finish{
+  border-radius: 50%;
+  border: 1px solid #1DCC80;
+  color: #1DCC80;
+  padding: 10PX 0;
+  height: 100%;
+}
+.ongoing{
+  border-radius: 50%;
+  border: 1px solid #1D6FE9;
+  color: #1D6FE9;
+  padding: 10PX 0;
+  height: 100%;
+}
+.notStarted{
+  padding: 10PX 0;
+  height: 100%;
+}
+.typeBox{
+  width: 44PX;
+  height: 44PX;
+  background: #ffffff;
+  text-align: center;
+  font-size: 14PX;
+  border-radius: 50%;
+  border: 1px solid #1DCC80;
+  color: #1DCC80;
+  margin: 0 auto;
+  padding: 10PX 0px;
+  line-height: 1;
+  position: relative;
+  top: 50%;
+  transform: translateY(-50%);
+}
+.noActive{
+  border: 1px solid #1D6FE9;
+  color: #1D6FE9;
+}
+.doActive{
+  border: 1px solid #C9C9C9;
+  color: #C9C9C9;
+}
+.active{
+  width: 56PX;
+  height: 56PX;
+  padding: 15PX 0px;
+}
+/deep/ .van-radio--horizontal{
+  margin-left: 0.32rem;
+  margin-right: 0;
+}
+.peopleList{
+  padding: 0 3%;
+  margin-top: 10PX;
+  .van-row{
+    margin-bottom: 10PX;
+    .van-col{
+      text-align: center;
+      font-size: 14PX;
+    }
+    &:first-child{
+      .van-col{
+        color: #1D6FE9;
+      }
+    }
+  }
+}
+.cf{
+  padding: 0 3%;
+  margin-top: 20PX;
+  margin-bottom: 20PX;
+  .van-row{
+    background: #F0F3F5;
+    .van-col{
+      padding: 5PX 0;
+      font-size: 12PX!important;
+      text-align: center;
+      p{
+        color: #1D6FE9;
+      }
+    }
+    &:first-child{
+      background: transparent;
+    }
+  }
+}
+.main_title{
+  font-size: 0.4rem;
+  color: #1D6FE9;
+  margin: 0.2rem 6%;
+  margin-top: 0;
+  position: relative;
+}
+.main_box{
+  width: 96%;
+  margin: 0 auto;
+  border-radius: 6PX;
+  box-shadow: 0PX 3PX 6PX 0PX rgba(0,0,0,0.16);
+  overflow: hidden;
+  background-color: #FFF;
+  margin-top: 10PX;
+  .van-icon{
+    vertical-align: middle;
+  }
+  .custom-title{
+    font-size: 17PX;
+    color: #333333;
+    vertical-align: middle;
+    line-height: 1;
+    position: relative;
+    margin-left: 5PX;
+  }
+  .tap{
+    color: #1D6FE9;
+  }
+  .bgBlue{
+    display: block;
+    position: absolute;
+    width: 17PX;
+    height: 17PX;
+    border-radius: 50%;
+    background-color: rgba(29,111,233,0.26);
+    top: -2PX;
+    right: -8PX;
+  }
+}
+.submitButton{
+  width: 80%;
+  margin: 0 auto;
+  background-color: #1D6FE9;
+}
+
+.addFamily{
+  position: absolute;
+  top: -2px;
+  right: 0;
+  border-radius: 50%;
+}
+.main_box2{
+  width: 96%;
+  margin: 0 auto;
+  background: #ffffff;
+  border-radius: 6PX;
+  overflow: hidden;
+  margin-top: 10PX;
+  margin-bottom: 20PX;
+  box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+  .van-col{
+    position: relative;
+  }
+  .van-col--20{
+    padding: 12PX 0;
+  }
+  .van-row:nth-child(2n){
+    background: rgba(29,111,233,0.1);
+  }
+  /deep/ .van-cell{
+    background: transparent;
+    padding: 0 10Px;
+  }
+  .bq{
+    display: inline-block;
+    padding: 0PX 10PX;
+    line-height: 0.64rem;
+    border-radius: 5PX;
+  }
+  .index{
+    background: #1D6FE9;
+    color: #ffffff;
+    text-align: center;
+    width: 20PX;
+    height: 20PX;
+    line-height: 20PX;
+    border-radius: 50%;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%,-50%);
+  }
+  .indexCenter{
+    top: 0!important;
+  }
+  .van-row:first-child{
+    .van-col:first-child{
+      .indexBorder {
+        top: calc(50% - 5px);
+      }
+    }
+  }
+  .indexBorder{
+    width: 10PX;
+    position: absolute;
+    right: 0;
+    top: 0;
+    height: 100%;
+    .yq{
+      height: 10PX;
+      width: 10PX;
+      background: #C9C9C9;
+      border-radius: 50%;
+    }
+    .ss{
+      height: calc(50% - 5PX);
+      width: 2PX;
+      background: #C9C9C9;
+      position: relative;
+      left: 4PX;
+    }
+    .ssT{
+      height: calc(50% - 5PX);
+      width: 2PX;
+      background: #C9C9C9;
+      position: relative;
+      left: 4PX;
+    }
+  }
+}
+.splcTit{
+  font-size: 17PX;
+  text-align: center;
+  margin-top: 25PX;
+  margin-bottom: 5PX;
+}
+</style>
diff --git a/src/views/lawEnforcement/task/taskRecord.vue b/src/views/lawEnforcement/task/taskRecord.vue
index d93315b2..ca998c2f 100644
--- a/src/views/lawEnforcement/task/taskRecord.vue
+++ b/src/views/lawEnforcement/task/taskRecord.vue
@@ -9,33 +9,19 @@
     <div class="top_box">
       <img src="../../../../static/images/lawEnforcement/icon/task_icon_04.png" class="icon_02">
       <div class="name_box">
-        <p>张薇</p>
-        <p>执法检查人员</p>
+        <p>{{user.nickName}}</p>
+        <p>{{roleGroup}}</p>
       </div>
       <img src="../../../../static/images/lawEnforcement/icon/task_icon_03.png" class="icon_01">
     </div>
 
     <div class="center_box">
-      <div class="center_box_list">
+      <div class="center_box_list" v-for="(item,index) in clockinList">
         <div class="center_box_list_left">
-          <p>2022-07-09 14:10</p>
-          <p>宿州市埇桥区永乡镇供销社楼下</p>
+          <p>{{item.clockinDate}} {{item.clockinTime}}</p>
+          <p>{{item.clockinAddr}}</p>
         </div>
-        <p class="goSee">查看</p>
-      </div>
-      <div class="center_box_list">
-        <div class="center_box_list_left">
-          <p>2022-07-09 14:10</p>
-          <p>宿州市埇桥区永乡镇供销社楼下</p>
-        </div>
-        <p class="goSee">查看</p>
-      </div>
-      <div class="center_box_list">
-        <div class="center_box_list_left">
-          <p>2022-07-09 14:10</p>
-          <p>宿州市埇桥区永乡镇供销社楼下</p>
-        </div>
-        <p class="goSee">查看</p>
+        <router-link class="goSee" :to="{name:'lawEnforcementTaskSignInSee', query: {caseId:item.caseId , id:item.id}}">查看</router-link>
       </div>
     </div>
 
@@ -43,45 +29,35 @@
 </template>
 
 <script>
-  import { getScheme } from "@/api/lawEnforcement/index";
+  import { clockinList , getUserProfile } from "@/api/lawEnforcement/index";
   export default {
     name: "programmeDetail",
     data() {
       return {
-        checked:'',
-        showBankType:false,
-        showPayeeType:false,
-        showPicker:false,
         form:{},
-
-        bankType:'',
-        payeeType:'',
-        value:'',
-
-        bankTypeOptions:[],
-        payeeTypeOptions:[],
-        tEnforceSchemeHandlerList:[],
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
-        currentDate: new Date(2021, 0, 17),
-
-        activeNames: ['1'],
-        activeNames1: ['1'],
-        activeNames2: ['1'],
+        clockinList:[],
+        user:{},
+        roleGroup:''
       };
     },
     created() {
-      // this.getDictionaries()
+      getUserProfile().then(res => {
+        this.user = res.data;
+        this.roleGroup = res.roleGroup;
+      })
+      this.getDetail()
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
-          this.form = response.data;
+      getDetail(){
+        let queryParams = {
+          caseId:this.$route.query.id,
+          relationType:this.$route.query.relationType,
+          clockin_user:this.$route.query.clockin_user
+        }
+        clockinList(queryParams).then((response) => {
+          this.clockinList = response.rows;
         });
       },
-      goBack(){
-        window.history.go(-1)
-      }
     },
   }
 </script>
diff --git a/src/views/lawEnforcement/task/taskSignIn.vue b/src/views/lawEnforcement/task/taskSignIn.vue
index 2cf0df55..4395aa18 100644
--- a/src/views/lawEnforcement/task/taskSignIn.vue
+++ b/src/views/lawEnforcement/task/taskSignIn.vue
@@ -12,46 +12,46 @@
 
     <div style="position:absolute;top: 75px;width: 100%;">
       <div class="main_box top_box">
-        <van-field readonly value="案件来源123" label="案件来源" placeholder="请输入案件来源" :border="false" />
-        <van-field readonly value="关联方案" label="关联方案" placeholder="请输入关联方案" :border="false" />
-        <van-field readonly value="案件名称" label="案件名称" placeholder="请输入案件名称" :border="false" />
+        <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" />
       </div>
 
       <div class="main_box" style="margin-top: 10px;padding: 0rem 0.426667rem;">
         <div class="file_box">
           <p class="left_box">未</p>
           <div class="center_box">
-            <p class="time">8:29<span>（2022年9月6日）</span></p>
-            <p class="dress">宿州市埇桥区永乡镇供销社楼下</p>
+            <p class="time">{{ nowTime }}<span>（{{ nowDate }}）</span></p>
+            <p class="dress">{{clockinAddr}}</p>
           </div>
-          <div class="file_box_btn" @click="$router.push({name:'lawEnforcementTaskRecord'})">
+          <div class="file_box_btn" @click="$router.push({name:'lawEnforcementTaskRecord', query: {id:form.id,relationType:form.caseProgress,clockin_user:clockin_user}})">
             <img src="../../../../static/images/lawEnforcement/icon/task_icon.png">
             <p>打卡记录</p>
           </div>
         </div>
         <div class="file_box" style="border-top: 1px solid #DEDEDE">
-          <van-uploader v-model="fileList" multiple />
+          <van-uploader v-model="fileList" :after-read="afterRead" @delete="deleteFile" />
         </div>
 
         <div class="bz">
-          <van-field placeholder="请输入备注" :border="false" />
+          <van-field placeholder="请输入备注" v-model="remark" :border="false" />
         </div>
       </div>
 
       <div class="main_box" style="margin-top: 10px;padding: 0.266667rem 0.426667rem;">
-        <p class="now_dress">当前位置：宿州市埇桥区永乡镇供销社楼下</p>
+        <p class="now_dress">当前位置：{{clockinAddr}}</p>
       </div>
     </div>
-
-    <div class="submitButton" @click="$router.push({name:'lawEnforcementSignInRecord'})" >
-      <p class="datetime">{{ nowDate }}</p>
+<!--    $router.push({name:'lawEnforcementSignInRecord'}) @click="submitForm"-->
+    <div class="submitButton" @click="submitForm" >
+      <p class="datetime">{{ nowTime }}</p>
       <p>打卡</p>
     </div>
   </div>
 </template>
 
 <script>
-  import { getScheme } from "@/api/lawEnforcement/index";
+  import { getCase , schemeList , commonUpload , getUserProfile , addClockin } from "@/api/lawEnforcement/index";
   export default {
     name: "programmeDetail",
     data() {
@@ -60,7 +60,9 @@
         showBankType:false,
         showPayeeType:false,
         showPicker:false,
-        form:{},
+        form:{
+          clockinAddr:''
+        },
         center: { lng: 122.089726, lat: 37.540728 }, //经纬度
         zoom: 15, //地图展示级别
 
@@ -78,27 +80,117 @@
         activeNames: ['1'],
         activeNames1: ['1'],
         activeNames2: ['1'],
-        nowDate: '', // 当前时间
+        nowDate: this.format(new Date(),'yyyy-MM-dd'), // 当前日期
+        nowTime: '', // 当前时间
 
-        fileList:[]
+        fileList:[],
+        openPic:[],
+        openPic2:[],
+        clockinAddr:'',
+        remark:'',
+        clockin_user:''
       };
     },
     created() {
       // this.getDictionaries()
       var that = this;
       setInterval(function () {
-        that.nowDate = that.format(new Date(),'HH:mm')
+        that.nowTime = that.format(new Date(),'HH:mm')
       }, 500);
+      this.getDicts("case_source").then(response => {
+        this.caseSourceOptions = response.data;
+      });
+      this.getDetail();
+
+      getUserProfile().then(res => {
+        this.clockin_user = res.data.userName;
+      })
     },
     methods: {
-      getDictionaries(){
-        getScheme(this.$route.query.id).then((response) => {
+      getDetail(){
+        getCase(this.$route.query.id).then((response) => {
+          response.data.caseSource = response.data.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, response.data.caseSource);
+          var schemeQueryParam = {
+            applyStatus: "1",
+          };
+          schemeList(schemeQueryParam).then((res) => {
+            let scheme = res.rows.filter(function (e) { return e.id == response.data.schemeId; });
+            if (scheme.length > 0){
+              response.data.schemeId = scheme[0].schemeName
+            }
+          });
           this.form = response.data;
+          var that = this;
+          that.getNowLocation();
+        });
+      },
+      afterRead(file) {
+        // 此时可以自行将文件上传至服务器
+        this.openPic.push(file.file);
+        let params1 = new FormData();
+        params1.append("file", file.file);
+        commonUpload(params1).then((r1) => {
+          this.openPic2.push(r1.fileName);
+        })
+      },
+      deleteFile(file,detail) {
+        console.log(file)
+        console.log(detail)
+        this.openPic2.splice(detail.index,1);
+      },
+      getNowLocation(){
+        let that = this;
+        var location_lon = "";
+        var location_lat = ""; // 经度,纬度
+        navigator.geolocation.getCurrentPosition((position) => {
+          console.log(position)
+          let lat = position.coords.latitude;
+          let lng = position.coords.longitude;
+          const pointBak = new BMap.Point(lng, lat);
+          const convertor = new BMap.Convertor();
+          convertor.translate([pointBak], 1, 5,function(resPoint) {
+            if(resPoint && resPoint.points && resPoint.points.length>0){
+              lng = resPoint.points[0].lng;
+              lat = resPoint.points[0].lat;
+            }
+            const point = new BMap.Point(lng, lat);
+            const geo = new BMap.Geocoder();
+            that.form.latitude = point.lat;
+            that.form.longitude = point.lng;
+            that.center.lng = point.lng;
+            that.center.lat = point.lat;
+            geo.getLocation(point, (res) => {
+              console.log(res)
+              that.clockinAddr = res.address;
+              that.form.clockinAddr = res.address;
+            });
+          });
         });
       },
-      goBack(){
-        window.history.go(-1)
+      submitForm(){
+          let queryParams = {
+            deptId: this.form.deptId,
+            caseId: this.$route.query.id,   // 案件ID
+            relationType: this.form.caseProgress,  // 案件所在阶段（2:勘察 3:立案 4:取证 5:处理 6:裁决 7:执行）
+            clockinAddr: this.form.clockinAddr,  // 打卡地址（中文汉字地址）
+            clockinDate: this.format(new Date(),'yyyy-MM-dd'),  // 打卡日期（仅日期，例如：2022-09-29 ）
+            clockinTime: this.format(new Date(),'HH:mm'),  // 打卡时间 （仅日期，例如：11:19）
+            clockinUser: this.clockin_user,  // 打卡账号（获取当前登录执法人员用户的账号，一般是手机号账号）
+            attachement: this.openPic2.join(','),  // 打卡上传附件(附件的路径字符串，多个附件路径之前通过英文逗号分隔)
+            latitude: this.form.latitude,  // 打卡纬度（定位坐标纬度）
+            longitude: this.form.longitude,  // 打卡经度（定位坐标经度）
+            remark:this.remark
+          };
+          console.log(queryParams)
+          addClockin(queryParams).then(response => {
+            if (response.code == 200){
+              this.$toast.success('打卡成功');
+            }
+          })
       }
+      // showPosition(position){
+      //   console.log("我当前经度为"+position.coords.latitude+",纬度为"+position.coords.longitude+"的地方哦")
+      // },
     },
   }
 </script>
@@ -224,9 +316,9 @@
       margin-top: 3vw;
     }
     .datetime{
-      margin-top: 7vw;
-      font-weight: bold;
-      font-size: 0.5rem;
+      margin-top: 6vw;
+      /*font-weight: bold;*/
+      font-size: 0.6rem;
     }
   }
 </style>
diff --git a/src/views/lawEnforcement/task/taskSignInSee.vue b/src/views/lawEnforcement/task/taskSignInSee.vue
new file mode 100644
index 00000000..37787290
--- /dev/null
+++ b/src/views/lawEnforcement/task/taskSignInSee.vue
@@ -0,0 +1,271 @@
+<template>
+  <div class="app-container">
+    <div class="header_main">
+      查看打卡
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
+    <baidu-map :center="center" panBy="[50,50]" :zoom="zoom" :scroll-wheel-zoom="true" :pinch-to-zoom="true" map-type="BMAP_NORMAL_MAP" style="height:150vh" >
+      <!-- 必须给容器指高度，不然地图将显示在一个高度为0的容器中，看不到 -->
+      <bm-geolocation anchor="BMAP_ANCHOR_BOTTOM_RIGHT" :showAddressBar="true" :autoLocation="true"></bm-geolocation>
+      <bm-marker :position="center" :dragging="true" animation="BMAP_ANIMATION_BOUNCE" :icon="{url: '../../../../static/images/lawEnforcement/new/address.gif', size: {width: 50, height: 50}}"></bm-marker>
+    </baidu-map>
+
+    <div style="position:absolute;top: 75px;width: 100%;">
+      <div class="main_box top_box">
+        <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" />
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;padding: 0rem 0.426667rem;">
+        <div class="file_box">
+          <p class="left_box">未</p>
+          <div class="center_box">
+            <p class="time">{{ nowTime }}<span>（{{ nowDate }}）</span></p>
+            <p class="dress">{{clockinAddr}}</p>
+          </div>
+<!--          <div class="file_box_btn" @click="$router.push({name:'lawEnforcementTaskRecord', query: {id:form.id,relationType:form.caseProgress,clockin_user:clockin_user}})">-->
+<!--            <img src="../../../../static/images/lawEnforcement/icon/task_icon.png">-->
+<!--            <p>打卡记录</p>-->
+<!--          </div>-->
+        </div>
+        <div class="file_box" style="border-top: 1px solid #DEDEDE">
+          <van-uploader v-model="fileList" :show-upload="false" :deletable="false" />
+          <van-empty v-if="fileList.length<1" description="暂无文件" />
+        </div>
+
+        <div class="bz">
+          <van-field placeholder="暂无备注" v-model="remark" :border="false" readonly />
+        </div>
+      </div>
+
+      <div class="main_box" style="margin-top: 10px;padding: 0.266667rem 0.426667rem;">
+        <p class="now_dress">当前位置：{{clockinAddr}}</p>
+      </div>
+    </div>
+<!--    $router.push({name:'lawEnforcementSignInRecord'}) @click="submitForm"-->
+<!--    <div class="submitButton" @click="submitForm" >-->
+<!--      <p class="datetime">{{ nowTime }}</p>-->
+<!--      <p>打卡</p>-->
+<!--    </div>-->
+  </div>
+</template>
+
+<script>
+  import { getCase , schemeList , commonUpload , getUserProfile , addClockin , clockinGet } from "@/api/lawEnforcement/index";
+  export default {
+    name: "programmeDetail",
+    data() {
+      return {
+        checked:'',
+        showBankType:false,
+        showPayeeType:false,
+        showPicker:false,
+        form:{
+          clockinAddr:''
+        },
+        center: { lng: 122.089726, lat: 37.540728 }, //经纬度
+        zoom: 15, //地图展示级别
+
+        bankType:'',
+        payeeType:'',
+        value:'',
+
+        bankTypeOptions:[],
+        payeeTypeOptions:[],
+        tEnforceSchemeHandlerList:[],
+        minDate: new Date(2020, 0, 1),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(2021, 0, 17),
+
+        activeNames: ['1'],
+        activeNames1: ['1'],
+        activeNames2: ['1'],
+        nowDate: this.format(new Date(),'yyyy-MM-dd'), // 当前日期
+        nowTime: '', // 当前时间
+
+        fileList:[],
+        openPic:[],
+        openPic2:[],
+        clockinAddr:'',
+        remark:'',
+        clockin_user:''
+      };
+    },
+    created() {
+      // this.getDictionaries()
+      var that = this;
+      this.getDicts("case_source").then(response => {
+        this.caseSourceOptions = response.data;
+      });
+      this.getDetail();
+      getUserProfile().then(res => {
+        this.clockin_user = res.data.userName;
+      })
+    },
+    methods: {
+      getDetail(){
+        getCase(this.$route.query.caseId).then((response) => {
+          response.data.caseSource = response.data.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, response.data.caseSource);
+          var schemeQueryParam = {
+            applyStatus: "1",
+          };
+          schemeList(schemeQueryParam).then((res) => {
+            let scheme = res.rows.filter(function (e) { return e.id == response.data.schemeId; });
+            if (scheme.length > 0){
+              response.data.schemeId = scheme[0].schemeName
+            }
+          });
+          this.form = response.data;
+        });
+        clockinGet(this.$route.query.id).then((response) => {
+
+          this.nowTime = response.data.clockinTime;
+          this.nowDate = response.data.clockinDate;
+          this.clockinAddr = response.data.clockinAddr;
+          this.remark = response.data.remark;
+          let fileList = response.data.attachement.split(",");
+          fileList.map(res=>{
+            this.fileList.push({
+              url: '/api' + res,
+              isImage: true
+            })
+          })
+
+          this.center.lng = response.data.longitude;
+          this.center.lat = response.data.latitude;
+          console.log(response.data.attachement.split(","))
+        })
+      },
+
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 0;
+    height: 100vh;
+    overflow: hidden;
+  }
+  .bz{
+    padding-bottom: 15PX;
+    /deep/ .van-cell{
+      padding: 2px 8px;
+      border: 1px solid #C9C9C9;
+      border-radius: 8px;
+    }
+  }
+  .header_main{
+    height: 116px;
+    background: url('../../../../static/images/lawEnforcement/new/list_head.png') no-repeat;
+    background-size: 100% 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    font-size: 36px;
+    line-height: 116px;
+    text-align: center;
+    color: #fff;
+    z-index: 999;
+    .return_btn{
+      width: 24px;
+      height: 43.2px;
+      background: url('../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+      background-size: 20px 36px;
+      position: absolute;
+      left: 38px;
+      top: 36px;
+    }
+    .add_btn{
+      width: 56.4px;
+      height: 40.8px;
+      background: url('../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
+      background-size: 47px 34px;
+      position: absolute;
+      right: 38px;
+      top: 36px;
+    }
+  }
+  .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;
+    }
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 10PX;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .file_box{
+    display: flex;
+    align-items: center;
+    font-size: 0.35rem;
+    padding: 0.266667rem 0;
+    .left_box{
+      background: #C9C9C9;
+      color: #ffffff;
+      width: 27PX;
+      height: 27PX;
+      line-height: 27PX;
+      text-align: center;
+      border-radius: 100%;
+    }
+    .center_box{
+      padding: 0rem 0.426667rem;
+      .time{
+        font-size: 0.5rem;
+        span{
+          font-size: 0.35rem;
+          color: #878787;
+        }
+      }
+      .dress{
+        color: #B4B0B0;
+        background: url('../../../../static/images/lawEnforcement/icon/task_icon_01.png') no-repeat left center;
+        padding-left: 14PX;
+      }
+    }
+    .file_box_btn{
+      text-align: center;
+      color: #1CB8B1;
+      margin-left: auto;
+    }
+  }
+  .now_dress{
+    font-size: 0.35rem;
+    background: url('../../../../static/images/lawEnforcement/icon/task_icon_02.png') no-repeat left center;
+    padding-left: 20PX;
+    line-height: 35PX;
+  }
+  .submitButton{
+    width: 25vw;
+    background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
+    text-align: center;
+    color: #ffffff;
+    height: 25vw;
+    line-height: 70px;
+    border-radius: 100%;
+    position: absolute;
+    bottom: 5%;
+    left: 50%;
+    transform: translateX(-50%);
+    p{
+      font-size: 0.4rem;
+      line-height: 1;
+      margin-top: 3vw;
+    }
+    .datetime{
+      margin-top: 6vw;
+      /*font-weight: bold;*/
+      font-size: 0.6rem;
+    }
+  }
+</style>
diff --git a/static/images/lawEnforcement/icon/signInRecord_icon_03.png b/static/images/lawEnforcement/icon/signInRecord_icon_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea02c0c72ae28fd12b6245acb80c9e98c68f0834
GIT binary patch
literal 1980
zcmV;t2SfOYP)<h;3K|Lk000e1NJLTq001cf001cn1^@s6s9*s000004b3#c}2nYxW
zd<bNS000MbNkl<ZSVzrSYiyHM7=GXLt(UKmu$f>O{$Th+P4F`0j|j?;r~ySKq9iD+
zRe|;ExJ(Hc{6UFV@WPO_9T#aQ7h{Zy8X;<QBSw@cG9@Mue}MjApoVP;?CaX~yuRma
zzqT7I>)0GNS<ZL9({s+#=e@r}7{VtW4a^~gsQ@&E0LJlA<p_9!fNtXFHY98Vls_ZF
zVRv=p;FVs5gWVY4yKIh3YD;+ITp;`cFtra6&kLZl4k_Bu7d}f-V_Z_maw)ZP67m}U
z-a-Jpmxw+Uf_4rTaM2*mCSy8C*vOatE<o;gj{4^_eEfq{u|JZUgC&X6e?24-=JB2i
zLR{mi4t-zD{-Qv}V@8AsCXv9k`3GMJE~!MMhe=|U;FBZ)&!H3uI(Tg5IiR2xBK%}@
za7U{Rs4G@G4M}cd2^@2KL$w0|y(~!Dy|mm+IgUFtobOoF(4r1&4|+?T=v)azUcRJ)
zMaW3_7#?}fL&5oJ{z5E4i7jQpScf{x+*NZA3GtpT<Sn?k@vlN)3xe!!^52@0;-H?2
z--6G)b6y>Aal_K}jAj)-mfFAuJp!`~5cI6yu|=IpyOxhNQ6AS2X1Tnf-}(dEFGvMY
z627K;!*jCiX^v*L+)Bli&DfAepw>hxIWx;@)Ho;*SN8|>5|EaNdmKM`e4*<UzzZ+4
z-brX?WJ=ev#DUs5<T-VafSIFTNb74?%s8h@?Ph#x>)-i|UIMZ!7WhZ+iQk|^Yyl)Z
zmQlGp1}zmFrn&53UuyxScWbUSQ`)agkn*|NPcM-1s1eaXyzlTev{(k>aGp}uYTJTh
zPBCZ$Oh4H3G_zN@-jPTqCMwaJvA`?>InU#bWUW36GUEqd(S6~&EhBklDKj{XIykT{
zw~ku3eX?csvA|&>`K-qm`9aNdAfv{2><3pXKX~!gnjrhX^)@pjHcG1VtlM61M*VlO
zgMCT&hGt|z#$)~mh{R*MFXV0C>@9UAT&EZqyBQ_Qv^D2M`Jc`^x}Dt<%j#ks-A%@B
zLb1oaxZw+nNw%twHKHb$FS7sQMrIM1#f<fi^vD!!7`3)B$ROvZ2o`v};m0hHX3Xeu
zd;WH*SlqQ~*(s*3B4ZsntH_HagLdFK_fX7vr#)-7O{4?MUGa0WlcnoME8PMJ@Z^CD
zo0e1xp&h%504+x>Woq*1H9K0FJSFNkkuB*(fYb@y+ql<!vnI$o$f7PP77rAwhp;Z{
zJkLey&E3Xg&b+Q?kj4SF<gF^l>w2rEg{41Z#H=~vSNpl|kmtF^s(4f2LC&O>Asfxl
zB`BYERyQ6qH~TrQq8YiETu6n|*-l|q8}j-gy)IIfi20}V0B%zt+jN4-Dx>b&>~CjQ
zvk@lWR{F;3z5s`J9XmXAk+O8ESaMY9WHUR>nU<Ar@iRfgl;sTZ9DQXZ<9Pzjy_huL
z_N!!c%m_R1O9BQfS*O0Du{6tMFP+?~bP`x6bCIU7d$bwPrEk4eU`XqS^yPUvX+{H|
zGp3N+7dl`vNY<_Yg>@^CoR!U$083aW{Vy`GlX`Vzj~Oy7Kbelz>5Mif`jMLpfI4?=
z)=y5vc$0rNS98l%sc<1=RC29x)guna?8&18;Z~ONmrU2|wgn~K6UOQ|GuUH>4X)~7
z!qp3n@P}@MD=6x9$I;Wy<mu@wC~ADD0qk}8!XKFtBgn6=S{B52Z_xeWAeS+ZGq^|D
zJua|7W<<V_Q7>wbt}4|NiPNl-V{&zLx-|Ij=g?_7ofT!idM+c3eW+p7y(simE;ElA
z-x7%DJ>G`z;@bkNxH#Hu*D&eWY8#VX%MAY<i4A61sNQ_nKLex)+Ce4@va2aD6(zmF
zHO@3k1-1uTxpi{eNJSt{B!2NM4OOO-@W7E0qFSdf{9~^g#}a!i&_FWvk^WTUH^gG^
z?n$WD2uGko4tsdsv&1@GCC&<DF>~MPKECrocXeom!gLA9Oev8q&=XOkQl@|%d_K^=
zkz{Cd1yE>E#jLgVZA=sd*|$KqfJ#)6XiV?A+SbiNb$3zgo!qaq0A|FTZA{nz`(;wS
z?2ZK{Nnri-hG(m}C3;FKMu$yDnZaLN=%`X6R(G&99~30&T)u`A`2Y)ow1K98zR7RP
zaXq9uYC--RbH&9NK&Lu`bA@_~fJ}Q)Bb?qJz{`TP4#>3S*!w)e?%->i)r9C-#Y}s-
z%Qm6d*v@_QKLlXRDNE{Y_L6KQNy2D;d$BKz1A??S#H0QOF4S)al52He<Xii_rLP)R
zaZmh_OlDr0)?MmkrZb&g+AmVnV(XnHTK0n^#U^%fNAj(>KY&Gpw3IsPzXMTl&z%0`
z!#{D3)jq>HTe}M#-1ohT#U_q=NCSFA0+w?#VvX$w2RftQChFxj#dp=-FNJ)DTY_@|
z=@4kJ7bXAqfn=LQOP#?*+uM|$B~#jXZp4nK5-5Wne3HL=7kkxDQG=Z-)C~kIe|^v(
z^EWHU%i;4*PW7fR!{xj-p7r!3>)(z1e1=`t85D4of5c%nltBT@zvo{L3ag;G)rn^S
O0000<MNUMnLSTX+fWqDY

literal 0
HcmV?d00001


From f668a63a51811ea7d97b109c787fd7ff6e81ab09 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Fri, 30 Sep 2022 08:39:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=85=E5=9F=BA?=
 =?UTF-8?q?=E5=9C=B0=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=89=B9=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=B7=B2=E5=8A=9E=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homestead/homeApplication/proposerLite.vue    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index 79332ea2..feca7c34 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -1988,11 +1988,15 @@ export default {
         case PROPOSER_VIEW:
           this.formVisible.baseApplyForm.groupFormVisible = hasGroupLevel && this.isNotProposeStatus(houseApplyStatus, ["1", '32']);
           this.formVisible.baseApplyForm.villageFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31"]);
-          this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, 'town_leader') ? -99 : '8']);
-          this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8']);
-          this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8']);
-          this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8']);
+          this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, 'town_leader') ? -99 : '7', this.isInRoles(role, 'town_leader') ? -99 : '8']);
+          this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8']);
+          this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8']);
+          this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8']);
 
+          // this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", "7", '4', '5', this.isInRoles(role, 'town_leader') ? -99 : '8','7']);
+          // this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "7", "31", '4', '5', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8','7']);
+          // this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "7", "31", '4', '5', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8','7']);
+          // this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "7", "31", '4', '5', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8','7']);
           this.formVisible.landscopeVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9', '10']);
           this.formVisible.landscopeForm.baseFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9', '10']);
 
@@ -2565,7 +2569,8 @@ export default {
       }
 
       // 通用设置
-      if(this.type =='done' && this.applicationDetail.tHouseApplyEnd == null && this.applicationDetail.tHouseApplyEnd.taskId ==null){
+      // if(this.type =='done' && this.applicationDetail.tHouseApplyEnd == null && this.applicationDetail.tHouseApplyEnd.taskId ==null){
+      if(this.type =='done' && this.applicationDetail.tHouseApplyEnd == null){
         if (this.isAccepting()) {
           this.active = PROPOSER_STAGE_START;
           this.selectedTabName = PROPOSER_STAGE_START;

From 66cd960e30ebcd3abcc11ecc3bf05b6081f64402 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Fri, 30 Sep 2022 08:41:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=85=E5=9F=BA?=
 =?UTF-8?q?=E5=9C=B0=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=89=B9=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=B7=B2=E5=8A=9E=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../onlineHome/homestead/homeApplication/proposerLite.vue   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index feca7c34..8b1100d2 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -1992,11 +1992,7 @@ export default {
           this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8']);
           this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8']);
           this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8']);
-
-          // this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", "7", '4', '5', this.isInRoles(role, 'town_leader') ? -99 : '8','7']);
-          // this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "7", "31", '4', '5', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8','7']);
-          // this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "7", "31", '4', '5', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8','7']);
-          // this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "7", "31", '4', '5', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8','7']);
+          
           this.formVisible.landscopeVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9', '10']);
           this.formVisible.landscopeForm.baseFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9', '10']);