农业执法

src/router/index.js

@@ -3601,6 +3601,15 @@ export const constantRoutes = [
       hidden: true,
     },
     component: (resolve) => require(['@/views/lawEnforcement/trace/productDetail'], resolve)
+  },
+  { ////农业执法（新）-- 上传签字文书
+    path: '/lawEnforcement/signInRecord',
+    name: 'lawEnforcementSignInRecord',
+    meta: {
+      title: '上传签字文书',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/lawEnforcement/task/signInRecord'], resolve)
   }
 ];
 

src/views/lawEnforcement/caseAllocation/caseDetail.vue

@@ -82,18 +82,22 @@
           <div class="peopleList">
             <van-row>
               <van-col :span="4">序号</van-col>
-              <van-col :span="5">执行人员</van-col>
-              <van-col :span="8">执法证号</van-col>
-              <van-col :span="7">结办时间</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 10" :key="index" >
               <van-col :span="4">{{index+1}}</van-col>
-              <van-col :span="5">庞东旭{{index}}</van-col>
-              <van-col :span="8">2303888{{index}}</van-col>
-              <van-col :span="7">2022-09-09</van-col>
+              <van-col :span="6">庞东旭{{index}}</van-col>
+              <van-col :span="10">2303888{{index}}</van-col>
+              <van-col :span="4">
+                <div class="icon_box">
+                  <van-checkbox v-model="checked" 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>
@@ -207,19 +211,31 @@
     margin-right: 0;
   }
   .peopleList{
-    padding-right: 3%;
+    padding: 3%;
+    text-align: center;
     .van-row{
       margin-bottom: 10PX;
+      background: rgba(196,218,249,0.3);
+      border-radius: 5PX;
       .van-col{
         text-align: center;
         font-size: 14PX;
+        color: #333333;
+        padding: 5PX 0;
       }
       &:first-child{
+        background: none;
         .van-col{
+          padding: 0;
           color: #1D6FE9;
         }
       }
     }
+    .icon_box{
+      /deep/ .van-checkbox{
+        justify-content: center;
+      }
+    }
   }
   .main_title{
     font-size: 0.4rem;

src/views/lawEnforcement/caseAllocation/caseHistory.vue

@@ -14,13 +14,13 @@
             <template #title>
               <div class="first">
                 <span>2021-09-07  09:30:00</span>
-                <span>执法人：刘月、张薇</span>
+                <span>上级交办</span>
               </div>
               <span>关于徐胜峰在禁渔期内收购非法捕捞渔获...</span>
             </template>
             <template #label>
               <div class="label">
-                <p>上级交办</p>
+                <p>执法人：刘月、张薇</p>
                 <p>立案</p>
               </div>
             </template>
@@ -229,7 +229,10 @@
     display: flex;
     justify-content: space-between;
     span{
-      color: #1D6FE9;
+      color: #D60303;
+      &:first-child{
+        color: #1D6FE9;
+      }
     }
   }
   span{
@@ -250,7 +253,7 @@
     display: inline-block;
     font-size: 0.35rem;
     &:first-child{
-      color: #D60303;
+      color: #1D6FE9;
     }
     &:last-child{
       padding: 0 7PX;

src/views/lawEnforcement/index_new.vue

@@ -11,22 +11,22 @@
       <img src="../../../static/images/lawEnforcement/new/index_icon_04.png">
     </div>
 
-    <van-notice-bar left-icon="../../../static/images/lawEnforcement/new/index_icon_02.png" :scrollable="false" background="rgba(135,174,241,0.3)" color="#2574E9">
-      <van-swipe
-        vertical
-        class="notice-swipe"
-        :autoplay="3000"
-        :show-indicators="false"
-      >
-        <van-swipe-item>冬季种子市场摸底调查活动，截止日期10.5日！1</van-swipe-item>
-        <van-swipe-item>冬季种子市场摸底调查活动，截止日期10.5日！2</van-swipe-item>
-        <van-swipe-item>冬季种子市场摸底调查活动，截止日期10.5日！3</van-swipe-item>
-      </van-swipe>
-    </van-notice-bar>
+<!--    <van-notice-bar left-icon="../../../static/images/lawEnforcement/new/index_icon_02.png" :scrollable="false" background="rgba(135,174,241,0.3)" color="#2574E9">-->
+<!--      <van-swipe-->
+<!--        vertical-->
+<!--        class="notice-swipe"-->
+<!--        :autoplay="3000"-->
+<!--        :show-indicators="false"-->
+<!--      >-->
+<!--        <van-swipe-item>冬季种子市场摸底调查活动，截止日期10.5日！1</van-swipe-item>-->
+<!--        <van-swipe-item>冬季种子市场摸底调查活动，截止日期10.5日！2</van-swipe-item>-->
+<!--        <van-swipe-item>冬季种子市场摸底调查活动，截止日期10.5日！3</van-swipe-item>-->
+<!--      </van-swipe>-->
+<!--    </van-notice-bar>-->
 
     <div class="main1">
       <p class="tit">日常执法</p>
-      <p class="content">农业农村管理方面法律及法规规定的行政处罚</p>
+<!--      <p class="content">农业农村管理方面法律及法规规定的行政处罚</p>-->
       <van-grid :column-num="3" :border="false">
         <van-grid-item :to="{name:'lawEnforcementCaseAllocation'}">
           <img src="../../../static/images/lawEnforcement/new/index_icon_05.png"/>

src/views/lawEnforcement/task/signInRecord.vue

@@ -0,0 +1,262 @@
+<template>
+  <div class="app-container">
+    <div class="header_main">
+      上传签字文书
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
+
+    <div class="jg"></div>
+
+    <div class="search_box">
+      <p>关于宿州市埇桥区永镇乡陈诚农药种子门市部超出经营范围经营限制使用农药案</p>
+    </div>
+
+    <div>
+      <van-row type="flex" align="center">
+        <van-col>
+          <p class="tt">登记</p>
+        </van-col>
+        <van-col :span="2">
+          <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>
+          <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-col>
+      </van-row>
+    </div>
+    <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>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "programmeDetail",
+    data() {
+      return {
+        fileList:[]
+      };
+    },
+    created() {
+
+    },
+    methods: {
+
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 0 4%;
+    height: 100vh;
+    background: #ffffff;
+  }
+  .jg{
+    height: 116px;
+  }
+  .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-uploader__upload{
+    margin: 0;
+    border: 1px dashed #C9C9C9;
+    border-radius: 10px;
+    background: transparent;
+  }
+  /deep/ .van-col{
+    position: relative;
+  }
+  /deep/ .van-row{
+    /*margin-top: 10PX;*/
+  }
+  /deep/ .van-col--19{
+    padding-top: 10PX;
+  }
+  .search_box{
+    width: 88%;
+    margin: 10PX auto;
+    color: #1D6FE9;
+    font-size: 0.4rem;
+    text-align: center;
+  }
+  .tt{
+    background: url('../../../../static/images/lawEnforcement/icon/signInRecord_icon_01.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;
+    height: 10PX;
+    display: block;
+    margin: 0 auto;
+  }
+  /deep/ .van-col--2{
+    text-align: center;
+  }
+  .bottom_border{
+    border-left: 2PX solid #DDDDDD;
+    width: 0PX;
+    height: 25PX;
+    position: absolute;
+    left: calc(50% - 1PX);
+    top: calc(50% + 5PX);
+  }
+  .top_border{
+    border-left: 2PX solid #DDDDDD;
+    width: 0PX;
+    height: 35PX;
+    position: absolute;
+    left: calc(50% - 1PX);
+    top: -35PX;
+  }
+  .submitButton{
+    width: 45%;
+    margin: 0 auto;
+    background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
+    text-align: center;
+    color: #ffffff;
+    height: 70px;
+    line-height: 70px;
+    border-radius: 8PX;
+    margin-top: 25PX;
+  }
+</style>

src/views/lawEnforcement/task/taskSignIn.vue

@@ -4,13 +4,13 @@
       执法打卡
       <div class="return_btn" @click="onClickLeft"></div>
     </div>
-    <baidu-map :center="center" :zoom="zoom" :scroll-wheel-zoom="true" :pinch-to-zoom="true" map-type="BMAP_NORMAL_MAP" style="height:100vh" >
+    <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: 'http://developer.baidu.com/map/jsdemo/img/fox.gif', size: {width: 300, height: 157}}"></bm-marker>
     </baidu-map>
 
-    <div style="position:absolute;top: 70px;width: 100%;">
+    <div style="position:absolute;top: 75px;width: 100%;">
       <div class="main_box top_box">
         <van-field readonly value="案件来源" label="案件来源" placeholder="请输入案件来源" :border="false" />
         <van-field readonly value="关联方案" label="关联方案" placeholder="请输入关联方案" :border="false" />
@@ -32,6 +32,10 @@
         <div class="file_box" style="border-top: 1px solid #DEDEDE">
           <van-uploader v-model="fileList" multiple />
         </div>
+
+        <div class="bz">
+          <van-field placeholder="请输入备注" :border="false" />
+        </div>
       </div>
 
       <div class="main_box" style="margin-top: 10px;padding: 0.266667rem 0.426667rem;">
@@ -39,7 +43,7 @@
       </div>
     </div>
 
-    <div class="submitButton">
+    <div class="submitButton" @click="$router.push({name:'lawEnforcementSignInRecord'})" >
       <p class="datetime">{{ nowDate }}</p>
       <p>打卡</p>
     </div>
@@ -102,6 +106,16 @@
 <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;