农业执法优化 扫码

src/components/qrcode/Scaner.vue

@@ -0,0 +1,354 @@
+<template>
+  <div class="scaner" ref="scaner">
+    <div class="banner" v-if="showBanner">
+      <i class="close_icon" @click="() => showBanner = false"></i>
+      <p class="text">若当前浏览器无法扫码，请切换其他浏览器尝试</p>
+    </div>
+    <div class="cover">
+      <p class="line"></p>
+      <span class="square top left"></span>
+      <span class="square top right"></span>
+      <span class="square bottom right"></span>
+      <span class="square bottom left"></span>
+      <p class="tips">将二维码放入框内，即可自动扫描</p>
+    </div>
+    <video
+      v-show="showPlay"
+      class="source"
+      ref="video"
+      :width="videoWH.width"
+      :height="videoWH.height"
+      controls
+    ></video>
+    <canvas v-show="!showPlay" ref="canvas" />
+    <button v-show="showPlay" @click="run">开始</button>
+  </div>
+</template>
+
+<script>
+
+// eslint-disable-next-line no-unused-vars
+import adapter from 'webrtc-adapter';
+import jsQR from 'jsqr';
+
+export default {
+  name: 'Scaner',
+  props: {
+    // 使用后置相机
+    useBackCamera: {
+      type: Boolean,
+      default: true
+    },
+    // 扫描识别后停止
+    stopOnScaned: {
+      type: Boolean,
+      default: true
+    },
+    drawOnfound: {
+      type: Boolean,
+      default: true
+    },
+    // 线条颜色
+    lineColor: {
+      type: String,
+      default: '#03C03C'
+    },
+    // 线条宽度
+    lineWidth: {
+      type: Number,
+      default: 2
+    },
+    // 视频宽度
+    videoWidth: {
+      type: Number,
+      default: document.documentElement.clientWidth || document.body.clientWidth
+    },
+    // 视频高度
+    videoHeight: {
+      type: Number,
+      default: document.documentElement.clientHeight - 48 || document.body.clientHeight - 48
+    },
+    responsive: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      showPlay: false,
+      showBanner: true,
+      containerWidth: null,
+      active: false
+    }
+  },
+  computed: {
+    videoWH () {
+      if (this.containerWidth) {
+        const width = this.containerWidth;
+        const height = width * 0.75;
+        return { width, height };
+      }
+      return { width: this.videoWidth, height: this.videoHeight };
+    }
+  },
+  watch: {
+    active: {
+      immediate: true,
+      handler(active) {
+        if (!active) {
+          this.fullStop();
+        }
+      }
+    }
+  },
+  methods: {
+    // 画线
+    drawLine (begin, end) {
+      this.canvas.beginPath();
+      this.canvas.moveTo(begin.x, begin.y);
+      this.canvas.lineTo(end.x, end.y);
+      this.canvas.lineWidth = this.lineWidth;
+      this.canvas.strokeStyle = this.lineColor;
+      this.canvas.stroke();
+    },
+    // 画框
+    drawBox (location) {
+      if (this.drawOnfound) {
+        this.drawLine(location.topLeftCorner, location.topRightCorner);
+        this.drawLine(location.topRightCorner, location.bottomRightCorner);
+        this.drawLine(location.bottomRightCorner, location.bottomLeftCorner);
+        this.drawLine(location.bottomLeftCorner, location.topLeftCorner);
+      }
+    },
+    tick () {
+      if (this.$refs.video && this.$refs.video.readyState === this.$refs.video.HAVE_ENOUGH_DATA) {
+        this.$refs.canvas.height = this.videoWH.height;
+        this.$refs.canvas.width = this.videoWH.width;
+        this.canvas.drawImage(this.$refs.video, 0, 0, this.$refs.canvas.width, this.$refs.canvas.height);
+        const imageData = this.canvas.getImageData(0, 0, this.$refs.canvas.width, this.$refs.canvas.height);
+        let code = false;
+        try {
+          code = jsQR(imageData.data, imageData.width, imageData.height);
+        } catch (e) {
+          console.error(e);
+        }
+        if (code) {
+          this.drawBox(code.location);
+          this.found(code.data);
+        }
+      }
+      this.run();
+    },
+    // 初始化
+    setup () {
+      if (this.responsive) {
+        this.$nextTick(() => {
+          this.containerWidth = this.$refs.scaner.clientWidth;
+        });
+      }
+      if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
+        this.previousCode = null;
+        this.parity = 0;
+        this.active = true;
+        this.canvas = this.$refs.canvas.getContext("2d");
+        const facingMode = this.useBackCamera ? { exact: 'environment' } : 'user';
+        const handleSuccess = stream => {
+           if (this.$refs.video.srcObject !== undefined) {
+            this.$refs.video.srcObject = stream;
+          } else if (window.videoEl.mozSrcObject !== undefined) {
+            this.$refs.video.mozSrcObject = stream;
+          } else if (window.URL.createObjectURL) {
+            this.$refs.video.src = window.URL.createObjectURL(stream);
+          } else if (window.webkitURL) {
+            this.$refs.video.src = window.webkitURL.createObjectURL(stream);
+          } else {
+            this.$refs.video.src = stream;
+          }
+          this.$refs.video.playsInline = true;
+          const playPromise = this.$refs.video.play();
+          playPromise.catch(() => (this.showPlay = true));
+          playPromise.then(this.run);
+        };
+        navigator.mediaDevices
+          .getUserMedia({ video: { facingMode } })
+          .then(handleSuccess)
+          .catch(() => {
+            navigator.mediaDevices
+              .getUserMedia({ video: true })
+              .then(handleSuccess)
+              .catch(error => {
+                this.$emit("error-captured", error);
+              });
+          });
+      }
+    },
+    run () {
+      if (this.active) {
+        requestAnimationFrame(this.tick);
+      }
+    },
+    found (code) {
+      if (this.previousCode !== code) {
+        this.previousCode = code;
+      } else if (this.previousCode === code) {
+        this.parity += 1;
+      }
+      if (this.parity > 2) {
+        this.active = this.stopOnScanned ? false : true;
+        this.parity = 0;
+        this.$emit("code-scanned", code);
+      }
+    },
+    // 完全停止
+    fullStop () {
+      if (this.$refs.video && this.$refs.video.srcObject) {
+        this.$refs.video.srcObject.getTracks().forEach(t => t.stop());
+      }
+    }
+  },
+  mounted () {
+    this.setup();
+  },
+  beforeDestroy () {
+    this.fullStop();
+  }
+}
+</script>
+
+<style lang="css" scoped>
+.scaner {
+  background: #000000;
+  position: fixed;
+  top: 48PX;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  height: -webkit-calc(100% - 48PX);
+  height: -moz-calc(100% - 48PX);
+  height: -ms-calc(100% - 48PX);
+  height: -o-calc(100% - 48PX);
+  height: calc(100% - 48PX);
+}
+.scaner .banner {
+  width: 340PX;
+  position: absolute;
+  top: 16PX;
+  left: 50%;
+  margin-left: -170PX;
+  background: #FA74A2;
+  border-radius: 8PX;
+  box-sizing: border-box;
+  padding: 12PX;
+  opacity: 0.9;
+  box-shadow: 1PX 1PX 10PX rgba(0, 0, 0, 0.2);
+}
+.scaner .banner .text {
+  padding: 0;
+  margin: 0;
+  color: #FFFFFF;
+  font-size: 12PX;
+  text-align: justify;
+  text-align-last: left;
+}
+.scaner .banner .close_icon {
+  display: inline-block;
+  height: 24PX;
+  width: 24PX;
+  /*background: url('../assets/close.png') no-repeat center;*/
+  background-size: auto 100%;
+  position: absolute;
+  right: 8PX;
+  top: 8PX;
+}
+.scaner .cover {
+  height: 220PX;
+  width: 220PX;
+  position: absolute;
+  top:50%;
+  left:50%;
+  -webkit-transform: translate(-50%,-50%);
+  -moz-transform: translate(-50%,-50%);
+  -ms-transform: translate(-50%,-50%);
+  -o-transform: translate(-50%,-50%);
+  transform: translate(-50%,-50%);
+  border: .5PX solid #999999;
+  z-index: 1111;
+}
+.scaner .cover .line {
+  width: 200PX;
+  height: 1PX;
+  margin-left: 10PX;
+  background: #5F68E8;
+  background: linear-gradient(to right, transparent, #5F68E8, #0165FF, #5F68E8, transparent);
+  position: absolute;
+  -webkit-animation: scan 1.75s infinite linear;
+  -moz-animation: scan 1.75s infinite linear;
+  -ms-animation: scan 1.75s infinite linear;
+  -o-animation: scan 1.75s infinite linear;
+  animation: scan 1.75s infinite linear;
+  -webkit-animation-fill-mode: both;
+  -moz-animation-fill-mode: both;
+  -ms-animation-fill-mode: both;
+  -o-animation-fill-mode: both;
+  animation-fill-mode: both;
+  border-radius: 1PX;
+}
+.scaner .cover .square {
+  display: inline-block;
+  height: 20PX;
+  width: 20PX;
+  position: absolute;
+}
+.scaner .cover .square.top {
+  top: 0;
+  border-top: 1PX solid #5F68E8;
+}
+.scaner .cover .square.left {
+  left: 0;
+  border-left: 1PX solid #5F68E8;
+}
+.scaner .cover .square.bottom {
+  bottom: 0;
+  border-bottom: 1PX solid #5F68E8;
+}
+.scaner .cover .square.right {
+ right: 0;
+  border-right: 1PX solid #5F68E8;
+}
+.scaner .cover .tips {
+  position: absolute;
+  bottom: -48PX;
+  width: 100%;
+  font-size: 14PX;
+  color: #FFFFFF;
+  opacity: 0.8;
+}
+@-webkit-keyframes scan {
+  0% {top: 0}
+  25% {top: 50PX}
+  50% {top: 100PX}
+  75% {top: 150PX}
+  100% {top: 200PX}
+}
+@-moz-keyframes scan {
+  0% {top: 0}
+  25% {top: 50PX}
+  50% {top: 100PX}
+  75% {top: 150PX}
+  100% {top: 200PX}
+}
+@-o-keyframes scan {
+  0% {top: 0}
+  25% {top: 50PX}
+  50% {top: 100PX}
+  75% {top: 150PX}
+  100% {top: 200PX}
+}
+@keyframes scan {
+  0% {top: 0}
+  25% {top: 50PX}
+  50% {top: 100PX}
+  75% {top: 150PX}
+  100% {top: 200PX}
+}
+</style>

src/components/qrcode/qrcode.vue

@@ -56,7 +56,6 @@
         error: '', // 错误信息
         show: false,
         qrcode: false,
-        qrcode: true,
         torchActive: false,
         camera: 'front',
       };

src/router/index.js

@@ -3902,6 +3902,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/lawEnforcement/monitor/monitor'], resolve)
   },
+  { ////农业执法（新）-- 案件处理
+    path: '/lawEnforcement/scan',
+    name: 'lawEnforcementScan',
+    meta: {
+      title: '扫一扫',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/lawEnforcement/retrospect/scan'], resolve)
+  },
   // 新型经营主体
   {
     path: '/newBusinessEntity/index',

src/views/lawEnforcement/monitor/monitor.vue

@@ -32,7 +32,7 @@
 
       <van-tabs v-model="active" animated>
         <van-tab title="在线设备">
-          <div class="onList" v-for="(item,index) in monitorList">
+          <div class="onList" v-for="(item,index) in monitorList" :key="index" @click="openAlert">
             <div class="onList_tit">
               <img src="../../../../static/images/lawEnforcement/icon/monitor_icon_02.png" alt="">
               <p>{{item.belongTeam}}</p>
@@ -42,7 +42,7 @@
           </div>
         </van-tab>
         <van-tab title="离线设备">
-          <div class="onList offList" v-for="(item,index) in monitorList2">
+          <div class="onList offList" v-for="(item,index) in monitorList2" :key="index" @click="openAlert">
             <div class="onList_tit">
               <img src="../../../../static/images/lawEnforcement/icon/monitor_icon_02.png" alt="">
               <p>{{item.belongTeam}}</p>
@@ -61,6 +61,7 @@
 <script>
   import lawNew from "@/components/common/lawNew_footer";
   import {getMonitor} from "@/api/lawEnforcement";
+  import request from "@/utils/request";
   export default {
     name: "caseAllocation",
     components: {
@@ -93,6 +94,11 @@
           this.monitorList2 = response.rows;
         });
       },
+      openAlert(){
+        this.$dialog.alert({
+          message: '暂未开通功能',
+        })
+      }
     },
   }
 </script>

src/views/lawEnforcement/retrospect/retrospectDetail.vue

@@ -9,7 +9,7 @@
           <img src="../../../../static/images/lawEnforcement/new/retrospect_icon_10.png">
           <p>码上放心</p>
         </div>
-        <img src="../../../../static/images/lawEnforcement/new/retrospect_icon_18.png" class="retrospect_icon">
+        <img src="../../../../static/images/lawEnforcement/new/retrospect_icon_18.png" class="retrospect_icon" @click="$router.push({name:'lawEnforcementScan'})">
         <p class="tt">产品溯源信息</p>
         <div class="top_02">
           <p><i></i>一物一码</p>
@@ -52,18 +52,13 @@
       </div>
 
     </div>
-    <vue-qrcode />
   </div>
 </template>
 
 <script>
   import { getScheme } from "@/api/lawEnforcement/index";
-  import qrcode from '@/components/qrcode/qrcode.vue';
   export default {
     name: "programmeDetail",
-    components: {
-      'vue-qrcode': qrcode,
-    },
     data() {
       return {
         showBankType:false,

src/views/lawEnforcement/retrospect/scan.vue

@@ -0,0 +1,108 @@
+<template>
+  <div class="scan">
+    <div class="nav">
+      <a class="close" @click="() => $router.go(-1)"></a>
+      <p class="title">Scan QRcode</p>
+    </div>
+    <div class="scroll-container">
+      <Scaner
+        v-on:code-scanned="codeScanned"
+        v-on:error-captured="errorCaptured"
+        :stop-on-scanned="true"
+        :draw-on-found="true"
+        :responsive="false"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+
+import Scaner from '@/components/qrcode//Scaner';
+
+export default {
+  name: 'Scan',
+  components: {
+    Scaner
+  },
+  data () {
+    return {
+      errorMessage: "",
+      scanned: ""
+    }
+  },
+  methods: {
+    codeScanned(code) {
+      this.scanned = code;
+      setTimeout(() => {
+        alert(`扫码解析成功: ${code}`);
+      }, 200)
+    },
+    errorCaptured(error) {
+      switch (error.name) {
+        case "NotAllowedError":
+          this.errorMessage = "Camera permission denied.";
+          break;
+        case "NotFoundError":
+          this.errorMessage = "There is no connected camera.";
+          break;
+        case "NotSupportedError":
+          this.errorMessage =
+            "Seems like this page is served in non-secure context.";
+          break;
+        case "NotReadableError":
+          this.errorMessage =
+            "Couldn't access your camera. Is it already in use?";
+          break;
+        case "OverconstrainedError":
+          this.errorMessage = "Constraints don't match any installed camera.";
+          break;
+        default:
+          this.errorMessage = "UNKNOWN ERROR: " + error.message;
+      }
+      console.error(this.errorMessage);
+     alert('相机调用失败');
+    }
+  },
+  mounted () {
+    var str = navigator.userAgent.toLowerCase();
+    var ver = str.match(/cpu iphone os (.*?) like mac os/);
+    if (ver && ver[1].replace(/_/g,".") < '10.3.3') {
+     alert('相机调用失败');
+    }
+  }
+}
+</script>
+
+<style lang="css" scoped>
+.scan {
+  height: 100%;
+  width: 100%;
+}
+.scan .nav {
+  width: 100%;
+  height: 48PX;
+  line-height: 48PX;
+  position: fixed;
+  top: 0;
+  left: 0;
+}
+.scan .nav .title {
+  padding: 0;
+  margin: 0;
+  font-size: 16PX;
+  color: #FFFFFF;
+  background: rebeccapurple;
+  text-align: center;
+}
+.scan .nav .close {
+  display: inline-block;
+  height: 22PX;
+  width: 22PX;
+  background: url('../../../assets/images/sunVillage_info/list_icon_5.png') no-repeat center;
+  background-size: auto 100%;
+  position: absolute;
+  left: 16PX;
+  top: 14PX;
+}
+</style>

src/views/lawEnforcement/task/taskHandleProcessing.vue

@@ -168,11 +168,11 @@
                   <van-col :span="4">
                     <div class="icon_box">
                       <van-checkbox v-model="item.enforcerLeader" shape="square"></van-checkbox>
-                      <van-icon v-if="caseActive == 1 && (surveyForm.instanceId!='' && surveyForm.instanceId!=null && surveyForm.instanceId!=undefined)" name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'CaseHand')"></van-icon>
+                      <van-icon v-if="!surveyDiglogStatus && caseActive == 1 " name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'CaseHand')"></van-icon>
                     </div>
                   </van-col>
                 </van-row>
-                <img v-if="caseActive == 1 && (surveyForm.instanceId!='' && surveyForm.instanceId!=null && surveyForm.instanceId!=undefined)" src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'CaseHand',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
+                <img v-if="!surveyDiglogStatus && caseActive == 1 " src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'CaseHand',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
               </div>
             </van-collapse-item>
           </van-collapse>
@@ -368,7 +368,7 @@
                 <span class="custom-title">案件文档<i class="bgBlue"></i></span>
               </template>
             </van-cell>
-            <van-uploader v-model="surveyOption" :after-read="afterRead" @delete="deleteFile" :show-upload="!surveyDiglogStatus || (caseProgress == 1 && ( surveyForm.instanceId=='' || surveyForm.instanceId==null || surveyForm.instanceId==undefined ))" :deletable="!surveyDiglogStatus || (caseProgress == 1 && ( surveyForm.instanceId=='' || surveyForm.instanceId==null || surveyForm.instanceId==undefined ))" />
+            <van-uploader v-model="surveyOption" :after-read="afterRead" @delete="deleteFile" :show-upload="!surveyDiglogStatus && caseProgress == 1 " :deletable="!surveyDiglogStatus && caseProgress == 1 " />
           </div>
         </van-form>
 
@@ -425,14 +425,14 @@
 <!--          </van-row>-->
 <!--          <div class="clear"></div>-->
 <!--        </div>-->
-        <div class="submit_box" v-if="caseActive == 1 && type == 'waiting'">
-          <p class="submitButton" @click="preservation('submit')">保存</p>
+        <div class="submit_box" v-if="caseActive == 1 && type == 'waiting' ">
+          <p class="submitButton" @click="preservation('submit')" v-if="!surveyDiglogStatus && caseActive == 1 ">保存</p>
           <p class="submitButton" @click="submitCase">提交</p>
         </div>
-        <div class="submit_box" v-if=" type != 'waiting' || ( caseProgress == 1 && ( surveyForm.instanceId=='' || surveyForm.instanceId==null || surveyForm.instanceId==undefined ))">
-          <p class="submitButton" @click="preservation('submit')">保存</p>
-          <p class="submitButton" @click="submit">提交</p>
-        </div>
+<!--        <div class="submit_box" v-if=" type != 'waiting' || ( caseProgress == 1 && ( surveyForm.instanceId=='' || surveyForm.instanceId==null || surveyForm.instanceId==undefined ))">-->
+<!--          <p class="submitButton" @click="preservation('submit')">保存</p>-->
+<!--          <p class="submitButton" @click="submit">提交</p>-->
+<!--        </div>-->
       </van-tab>
       <!--立案-->
       <van-tab v-show="progressLength>=4" v-if="lianShow" :disabled="2 <= caseActive ? false : true">
@@ -481,12 +481,12 @@
                   <van-col :span="4">
                     <div class="icon_box">
                       <van-checkbox v-model="item.enforcerLeader" shape="square"></van-checkbox>
-                      <van-icon v-if="caseActive == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )" name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'PutRecord')"></van-icon>
+                      <van-icon v-if="!recordDiglogStatus && caseActive == 2" name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'PutRecord')"></van-icon>
                     </div>
                   </van-col>
                 </van-row>
 <!--                @click="$router.push({name:'lawEnforcementCaseLawEnforcer'})" v-if="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )"-->
-                <img v-if="caseActive == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )" src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'PutRecord',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
+                <img v-if="!recordDiglogStatus && caseActive == 2" src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'PutRecord',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
               </div>
             </van-collapse-item>
           </van-collapse>
@@ -556,7 +556,7 @@
                 <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-col :span="5">生产经营单位</van-col>
               </van-row>
 
               <van-row v-for="(item,index) in tEnforceDetainHandlerList" :key="index">
@@ -564,9 +564,10 @@
                 <van-col :span="3"><van-field input-align="center" placeholder="规格" v-model="item.size" /></van-col>
                 <van-col :span="3"><van-field input-align="center" placeholder="数量" v-model="item.propertyNum" /></van-col>
                 <van-col :span="6"><van-field input-align="center" placeholder="生产日期(批号)" v-model="item.productTimeNum" /></van-col>
-                <van-col :span="7"><van-field input-align="center" placeholder="生产经营单位" v-model="item.productUnit" /></van-col>
+                <van-col :span="5"><van-field input-align="center" placeholder="生产经营单位" v-model="item.productUnit" /></van-col>
+                <van-col :span="2"><van-icon v-if="!recordDiglogStatus && caseActive == 2" name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removeFinance(index)"></van-icon></van-col>
               </van-row>
-              <img src="../../../../static/images/lawEnforcement/new/addFinance_btn.png" style="margin: 0 auto;" @click="addFinance" v-if="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )">
+              <img src="../../../../static/images/lawEnforcement/new/addFinance_btn.png" style="margin: 0 auto;" @click="addFinance" v-if="!recordDiglogStatus && caseActive == 2">
             </div>
 
 <!--            <div class="cf">-->
@@ -675,11 +676,14 @@
 
   <!--            :show-upload="false" :deletable="false"-->
               <van-cell title="抽样产品附件" />
-              <van-uploader v-model="item.attachementList" :after-read="afterReadAttachement(index)" :before-delete="deleteFileAttachement(index)" :show-upload="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )" :deletable="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )" />
+              <van-uploader v-model="item.attachementList" :after-read="afterReadAttachement(index)" :before-delete="deleteFileAttachement(index)" :show-upload="!recordDiglogStatus && caseActive == 2" :deletable="!recordDiglogStatus && caseActive == 2" />
   <!--            :show-upload="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )" :deletable="caseProgress == 1 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )"-->
+              <div style="text-align: center;margin-bottom: 10px;">
+                <img src="../../../../static/images/lawEnforcement/new/removeGoods_btn.png" style="margin: 0 auto;" @click="removeGoods(index)" v-if="!recordDiglogStatus && caseActive == 2">
+              </div>
             </div>
             <div style="text-align: center;margin-bottom: 10px;">
-              <img src="../../../../static/images/lawEnforcement/new/addGoods_btn.png" style="margin: 0 auto;" @click="addGoods" v-if="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )">
+              <img src="../../../../static/images/lawEnforcement/new/addGoods_btn.png" style="margin: 0 auto;" @click="addGoods" v-if="!recordDiglogStatus && caseActive == 2">
             </div>
           </div>
 
@@ -701,7 +705,7 @@
                 <span class="custom-title">案件文档<i class="bgBlue"></i></span>
               </template>
             </van-cell>
-            <van-uploader v-model="samplingOption" :after-read="afterReadSampling" :before-delete="deleteFileSampling" :show-upload="!recordDiglogStatus || (caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined ))" :deletable="!recordDiglogStatus || (caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined ))" />
+            <van-uploader v-model="samplingOption" :after-read="afterReadSampling" :before-delete="deleteFileSampling" :show-upload="!recordDiglogStatus && caseProgress == 2" :deletable="!recordDiglogStatus && caseProgress == 2 " />
           </div>
 
         </van-form>
@@ -761,14 +765,14 @@
 <!--        </div>-->
 
         <div class="submit_box" v-if="caseActive == 2 && type == 'waiting'">
-          <p class="submitButton" @click="submitPutRecordForm('submit')">保存</p>
+          <p class="submitButton" @click="submitPutRecordForm('submit')" v-if="!recordDiglogStatus && caseActive == 2">保存</p>
           <p class="submitButton" @click="submitPutRecord">提交</p>
         </div>
 
-        <div class="submit_box" v-if=" type != 'waiting' || (caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined ))">
-          <p class="submitButton" @click="submitPutRecordForm('submit')">保存</p>
-          <p class="submitButton" @click="submitDefine">提交</p>
-        </div>
+<!--        <div class="submit_box" v-if=" type != 'waiting' || (caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined ))">-->
+<!--          <p class="submitButton" @click="submitPutRecordForm('submit')">保存</p>-->
+<!--          <p class="submitButton" @click="submitDefine">提交</p>-->
+<!--        </div>-->
       </van-tab>
       <!--取证-->
       <van-tab v-show="progressLength>=5" v-if="quzhengShow" :disabled="3 <= caseActive ? false : true">
@@ -816,12 +820,12 @@
                   <van-col :span="4">
                     <div class="icon_box">
                       <van-checkbox v-model="item.enforcerLeader" shape="square"></van-checkbox>
-                      <van-icon v-if="caseActive == 3 && ( evidenceForm.instanceId=='' || evidenceForm.instanceId==null || evidenceForm.instanceId==undefined )" name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'evidence')"></van-icon>
+                      <van-icon v-if="!evidenceDiglogStatus && caseActive == 3 " name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'evidence')"></van-icon>
                     </div>
                   </van-col>
                 </van-row>
                 <!--                @click="$router.push({name:'lawEnforcementCaseLawEnforcer'})" v-if="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )"-->
-                <img v-if="caseActive == 3 && ( evidenceForm.instanceId=='' || evidenceForm.instanceId==null || evidenceForm.instanceId==undefined )" src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'evidence',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
+                <img v-if="!evidenceDiglogStatus && caseActive == 3" src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'evidence',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
               </div>
             </van-collapse-item>
           </van-collapse>
@@ -900,8 +904,8 @@
                 <span class="custom-title">案件文档<i class="bgBlue"></i></span>
               </template>
             </van-cell>
-            <van-uploader v-model="evidenceForm.attachementList" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" :show-upload="!evidenceDiglogStatus || (caseProgress == 3 && ( evidenceForm.instanceId=='' || evidenceForm.instanceId==null || evidenceForm.instanceId==undefined ))" :deletable="!evidenceDiglogStatus || (caseProgress == 3 && ( evidenceForm.instanceId=='' || evidenceForm.instanceId==null || evidenceForm.instanceId==undefined ))" />
-            <van-empty v-if="evidenceForm.attachement == null && caseProgress == 3 && evidenceForm.instanceId!='' && evidenceForm.instanceId!=null && evidenceForm.instanceId!=undefined" description="暂无文件" />
+            <van-uploader v-model="evidenceForm.attachementList" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" :show-upload="!evidenceDiglogStatus && caseProgress == 3" :deletable="!evidenceDiglogStatus && caseProgress == 3 " />
+            <van-empty v-if="evidenceForm.attachement == null && caseProgress == 3" description="暂无文件" />
           </div>
         </van-form>
 
@@ -961,14 +965,14 @@
 <!--        </div>-->
 
         <div class="submit_box" v-if="caseActive == 3 && type == 'waiting'">
-          <p class="submitButton" @click="submitEvidenceForm('submit')">保存</p>
+          <p class="submitButton" @click="submitEvidenceForm('submit')" v-if="!evidenceDiglogStatus && caseActive == 3">保存</p>
           <p class="submitButton" @click="submitEvidence">提交</p>
         </div>
 
-        <div class="submit_box" v-if="caseProgress == 3 && ( evidenceForm.instanceId=='' || evidenceForm.instanceId==null || evidenceForm.instanceId==undefined )">
-          <p class="submitButton" @click="submitEvidenceForm('submit')">保存</p>
-          <p class="submitButton" @click="submitDefineEvidenceForm">提交</p>
-        </div>
+<!--        <div class="submit_box" v-if="caseProgress == 3 && ( evidenceForm.instanceId=='' || evidenceForm.instanceId==null || evidenceForm.instanceId==undefined )">-->
+<!--          <p class="submitButton" @click="submitEvidenceForm('submit')">保存</p>-->
+<!--          <p class="submitButton" @click="submitDefineEvidenceForm">提交</p>-->
+<!--        </div>-->
 
       </van-tab>
       <template>
@@ -3581,6 +3585,14 @@ export default {
       }
     },
 
+    removeGoods(index){
+      this.tEnforceSamplingGoodsList.splice(index,1)
+    },
+
+    removeFinance(index){
+      this.tEnforceDetainHandlerList.splice(index,1)
+    }
+
   },
   watch: {
     $route (to, from ) {

src/views/lawEnforcement/user/waitingProcessing.vue

@@ -62,7 +62,7 @@
                 name:item.formData.activityBusinessType == '21' ? 'schemeDetail':'caseDetail',
                 query:{
                   id:item.formData.activityBusinessType == '21' ? item.formData.id:item.formData.caseId,
-                  caseProgress:item.formData.activityBusinessType == '21' ? '': item.formData.activityBusinessType == '22' ? 2:item.formData.activityBusinessType == '24' ? 4:item.formData.activityBusinessType == '25' ? 5:'',
+                  caseProgress:item.formData.activityBusinessType == '21' ? '': item.formData.activityBusinessType == '22' ? 2:item.formData.activityBusinessType == '25' ? 3:item.formData.activityBusinessType == '24' ? 4:'',
                 }
               }"
             >
@@ -239,7 +239,7 @@ export default {
 }
 .header_main{
   /*height: 116px;*/
-  background: url('../../../../static/images/lawEnforcement/new/header_bg.png') no-repeat;
+  background: url('../../../../static/images/lawEnforcement/new/list_head.png') no-repeat;
   background-size: 100% 100%;
   /*position: fixed;*/
   top: 0;