Merge remote-tracking branch 'origin/master'

2 年前 · 56379d1f8a
--- a/babel.config.js
+++ b/babel.config.js
@@ -0,0 +1,5 @@
 module.exports = {
  presets: [
    '@vue/cli-plugin-babel/preset'
  ]
 }
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -0,0 +1,19 @@
 {
  "compilerOptions": {
    "target": "es5",
    "module": "esnext",
    "baseUrl": "./",
    "moduleResolution": "node",
    "paths": {
      "@/*": [
        "src/*"
      ]
    },
    "lib": [
      "esnext",
      "dom",
      "dom.iterable",
      "scripthost"
    ]
  }
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/index.html
+++ b/public/index.html
@@ -0,0 +1,17 @@
 <!DOCTYPE html>
 <html lang="">
  <head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
    <title><%= htmlWebpackPlugin.options.title %></title>
  </head>
  <body>
    <noscript>
      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
    </noscript>
    <div id="app"></div>
    <!-- built files will be auto injected -->
  </body>
 </html>
--- a/src/assets/images/Newbusinessentity/001_03.jpg
+++ b/src/assets/images/Newbusinessentity/001_03.jpg
--- a/src/assets/images/Newbusinessentity/001_05.jpg
+++ b/src/assets/images/Newbusinessentity/001_05.jpg
--- a/src/assets/images/Newbusinessentity/07104301.png
+++ b/src/assets/images/Newbusinessentity/07104301.png
--- a/src/assets/images/Newbusinessentity/08_03.jpg
+++ b/src/assets/images/Newbusinessentity/08_03.jpg
--- a/src/assets/images/Newbusinessentity/0_01.jpg
+++ b/src/assets/images/Newbusinessentity/0_01.jpg
--- a/src/assets/images/Newbusinessentity/0_02.png
+++ b/src/assets/images/Newbusinessentity/0_02.png
--- a/src/assets/images/Newbusinessentity/0_03.png
+++ b/src/assets/images/Newbusinessentity/0_03.png
--- a/src/assets/images/Newbusinessentity/1.png
+++ b/src/assets/images/Newbusinessentity/1.png
--- a/src/assets/images/Newbusinessentity/133_03.jpg
+++ b/src/assets/images/Newbusinessentity/133_03.jpg
--- a/src/assets/images/Newbusinessentity/1731.png
+++ b/src/assets/images/Newbusinessentity/1731.png
--- a/src/assets/images/Newbusinessentity/17312.png
+++ b/src/assets/images/Newbusinessentity/17312.png
--- a/src/assets/images/Newbusinessentity/17313.png
+++ b/src/assets/images/Newbusinessentity/17313.png
--- a/src/assets/images/Newbusinessentity/17314.png
+++ b/src/assets/images/Newbusinessentity/17314.png
--- a/src/assets/images/Newbusinessentity/17315.png
+++ b/src/assets/images/Newbusinessentity/17315.png
--- a/src/assets/images/Newbusinessentity/17316.png
+++ b/src/assets/images/Newbusinessentity/17316.png
--- a/src/assets/images/Newbusinessentity/17317.png
+++ b/src/assets/images/Newbusinessentity/17317.png
--- a/src/assets/images/Newbusinessentity/189948.png
+++ b/src/assets/images/Newbusinessentity/189948.png
--- a/src/assets/images/Newbusinessentity/189980.png
+++ b/src/assets/images/Newbusinessentity/189980.png
--- a/src/assets/images/Newbusinessentity/1_01.jpg
+++ b/src/assets/images/Newbusinessentity/1_01.jpg
--- a/src/assets/images/Newbusinessentity/1_02.jpg
+++ b/src/assets/images/Newbusinessentity/1_02.jpg
--- a/src/assets/images/Newbusinessentity/1_02_01.jpg
+++ b/src/assets/images/Newbusinessentity/1_02_01.jpg
--- a/src/assets/images/Newbusinessentity/1_04_02.jpg
+++ b/src/assets/images/Newbusinessentity/1_04_02.jpg
--- a/src/assets/images/Newbusinessentity/2.jpg
+++ b/src/assets/images/Newbusinessentity/2.jpg
--- a/src/assets/images/Newbusinessentity/21563.png
+++ b/src/assets/images/Newbusinessentity/21563.png
--- a/src/assets/images/Newbusinessentity/222_01.jpg
+++ b/src/assets/images/Newbusinessentity/222_01.jpg
--- a/src/assets/images/Newbusinessentity/2_03.jpg
+++ b/src/assets/images/Newbusinessentity/2_03.jpg
--- a/src/assets/images/Newbusinessentity/333_01.jpg
+++ b/src/assets/images/Newbusinessentity/333_01.jpg
--- a/src/assets/images/Newbusinessentity/3_03.jpg
+++ b/src/assets/images/Newbusinessentity/3_03.jpg
--- a/src/assets/images/Newbusinessentity/56_01.jpg
+++ b/src/assets/images/Newbusinessentity/56_01.jpg
--- a/src/assets/images/Newbusinessentity/66_03.jpg
+++ b/src/assets/images/Newbusinessentity/66_03.jpg
--- a/src/assets/images/Newbusinessentity/7.png
+++ b/src/assets/images/Newbusinessentity/7.png
--- a/src/assets/images/Newbusinessentity/P_fw1200.png
+++ b/src/assets/images/Newbusinessentity/P_fw1200.png
--- a/src/assets/images/Newbusinessentity/bj_01.jpg
+++ b/src/assets/images/Newbusinessentity/bj_01.jpg
--- a/src/assets/images/Newbusinessentity/book_icon_214994.png
+++ b/src/assets/images/Newbusinessentity/book_icon_214994.png
--- a/src/assets/images/Newbusinessentity/box_icon_214997.png
+++ b/src/assets/images/Newbusinessentity/box_icon_214997.png
--- a/src/assets/images/Newbusinessentity/card_credit_icon_214769.png
+++ b/src/assets/images/Newbusinessentity/card_credit_icon_214769.png
--- a/src/assets/images/Newbusinessentity/cube_icon_2150142.png
+++ b/src/assets/images/Newbusinessentity/cube_icon_2150142.png
--- a/src/assets/images/Newbusinessentity/dashboard_icon_2148461.png
+++ b/src/assets/images/Newbusinessentity/dashboard_icon_2148461.png
--- a/src/assets/images/Newbusinessentity/home_icon_128501.png
+++ b/src/assets/images/Newbusinessentity/home_icon_128501.png
--- a/src/assets/images/Newbusinessentity/layers_icon_125237.png
+++ b/src/assets/images/Newbusinessentity/layers_icon_125237.png
--- a/src/assets/images/Newbusinessentity/licencse_icon_125234.png
+++ b/src/assets/images/Newbusinessentity/licencse_icon_125234.png
--- a/src/assets/images/Newbusinessentity/lock_icon_125225.png
+++ b/src/assets/images/Newbusinessentity/lock_icon_125225.png
--- a/src/assets/images/Newbusinessentity/lock_icon_1252253.png
+++ b/src/assets/images/Newbusinessentity/lock_icon_1252253.png
--- a/src/assets/images/Newbusinessentity/map_icon_150908.png
+++ b/src/assets/images/Newbusinessentity/map_icon_150908.png
--- a/src/assets/images/Newbusinessentity/phone-call-auricular-symbol-in-black_.png
+++ b/src/assets/images/Newbusinessentity/phone-call-auricular-symbol-in-black_.png
--- a/src/assets/images/Newbusinessentity/phone_handset_icon_125195.png
+++ b/src/assets/images/Newbusinessentity/phone_handset_icon_125195.png
--- a/src/assets/images/Newbusinessentity/shield_icon_125161.png
+++ b/src/assets/images/Newbusinessentity/shield_icon_125161.png
--- a/src/assets/images/Newbusinessentity/showh_03.jpg
+++ b/src/assets/images/Newbusinessentity/showh_03.jpg
--- a/src/assets/images/Newbusinessentity/t0181f315f1a4f87af1.png
+++ b/src/assets/images/Newbusinessentity/t0181f315f1a4f87af1.png
--- a/src/assets/images/Newbusinessentity/user_icon_125113.png
+++ b/src/assets/images/Newbusinessentity/user_icon_125113.png
--- a/src/assets/images/Newbusinessentity/user_icon_1251132.png
+++ b/src/assets/images/Newbusinessentity/user_icon_1251132.png
--- a/src/assets/images/Newbusinessentity/user_icon_2058202.png
+++ b/src/assets/images/Newbusinessentity/user_icon_2058202.png
--- a/src/assets/images/Newbusinessentity/view_show_icon_1248113.png
+++ b/src/assets/images/Newbusinessentity/view_show_icon_1248113.png
--- a/src/assets/images/Newbusinessentity/weather_forecast.png
+++ b/src/assets/images/Newbusinessentity/weather_forecast.png
--- a/src/assets/images/sunVillage_info/login_head_nr.png
+++ b/src/assets/images/sunVillage_info/login_head_nr.png
--- a/src/assets/logo.png
+++ b/src/assets/logo.png
--- a/src/components/HelloWorld.vue
+++ b/src/components/HelloWorld.vue
@@ -0,0 +1,58 @@
 <template>
  <div class="hello">
    <h1>{{ msg }}</h1>
    <p>
      For a guide and recipes on how to configure / customize this project,<br>
      check out the
      <a href="https://cli.vuejs.org" target="_blank" rel="noopener">vue-cli documentation</a>.
    </p>
    <h3>Installed CLI Plugins</h3>
    <ul>
      <li><a href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-babel" target="_blank" rel="noopener">babel</a></li>
      <li><a href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-eslint" target="_blank" rel="noopener">eslint</a></li>
    </ul>
    <h3>Essential Links</h3>
    <ul>
      <li><a href="https://vuejs.org" target="_blank" rel="noopener">Core Docs</a></li>
      <li><a href="https://forum.vuejs.org" target="_blank" rel="noopener">Forum</a></li>
      <li><a href="https://chat.vuejs.org" target="_blank" rel="noopener">Community Chat</a></li>
      <li><a href="https://twitter.com/vuejs" target="_blank" rel="noopener">Twitter</a></li>
      <li><a href="https://news.vuejs.org" target="_blank" rel="noopener">News</a></li>
    </ul>
    <h3>Ecosystem</h3>
    <ul>
      <li><a href="https://router.vuejs.org" target="_blank" rel="noopener">vue-router</a></li>
      <li><a href="https://vuex.vuejs.org" target="_blank" rel="noopener">vuex</a></li>
      <li><a href="https://github.com/vuejs/vue-devtools#vue-devtools" target="_blank" rel="noopener">vue-devtools</a></li>
      <li><a href="https://vue-loader.vuejs.org" target="_blank" rel="noopener">vue-loader</a></li>
      <li><a href="https://github.com/vuejs/awesome-vue" target="_blank" rel="noopener">awesome-vue</a></li>
    </ul>
  </div>
 </template>

 <script>
 export default {
  name: 'HelloWorld',
  props: {
    msg: String
  }
 }
 </script>

 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped>
 h3 {
  margin: 40px 0 0;
 }
 ul {
  list-style-type: none;
  padding: 0;
 }
 li {
  display: inline-block;
  margin: 0 10px;
 }
 a {
  color: #42b983;
 }
 </style>
--- a/src/components/common/lawNew_footer.vue
+++ b/src/components/common/lawNew_footer.vue
@@ -14,7 +14,7 @@
          <img :src="props.active ? '../../../static/images/lawEnforcement/new/tab_05.png' : '../../../static/images/lawEnforcement/new/tab_01.png'" />
        </template>
      </van-tabbar-item>
      <van-tabbar-item replace to="/lawEnforcement/caseList">
      <van-tabbar-item replace to="/lawEnforcement/monitor">
        监控
        <template #icon="props">
          <img :src="props.active ? '../../../static/images/lawEnforcement/new/tab_06.png' : '../../../static/images/lawEnforcement/new/tab_02.png'" />
@@ -56,7 +56,11 @@ export default {
    // });
  },
  methods: {

    abc(){
      this.$dialog.alert({
        message: '功能暂未开放！',
      })
    }
  },
 };
 </script>
--- a/src/permission.js
+++ b/src/permission.js
@@ -128,6 +128,15 @@ const whiteList = [
  '/sunVillage_info/list_vote',   //详情页
  '/sunVillage_info/list_vote_detail',   //详情页
  '/sunVillage_info/list_vote_form',   //详情页
  // 新型经营主体
  'newBusinessEntity/newsBulletin', //新闻公告
  '/newBusinessEntity/index',      //首页
  '/newBusinessEntity/login',      //登录
  '/newBusinessEntity/register',   //注册
  '/newBusinessEntity/conter',  //底部组件
  '/newBusinessEntity/newsDetails',  //新闻详情
  '/newBusinessEntity/listBody',  //主体名录
  '/newBusinessEntity/map'      //地图

 ]

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2233,6 +2233,15 @@ export const constantRoutes = [
    },
    component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2'], resolve)
  },
  {
    path: '/yinnong/approvalProcess3',
    name: 'approvalProcess3',
    meta: {
      title: '审批流程',
      hidden: true,
    },
    component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalProcess3'], resolve)
  },
  {
    path: '/yinnong/collectionList',
    name: 'collectionList',
@@ -3865,6 +3874,16 @@ export const constantRoutes = [
    },
    component: (resolve) => require(['@/views/lawEnforcement/task/taskHandle'], resolve)
  },
  { ////农业执法（新）-- 案件处理
    path: '/lawEnforcement/taskHandleProcessing',
    name: 'lawEnforcementTaskHandleProcessing',
    meta: {
      title: '待办处理',
      hidden: true,
      keepAlive: true
    },
    component: (resolve) => require(['@/views/lawEnforcement/task/taskHandleProcessing'], resolve)
  },
  { ////农业执法（新）-- 案件处理
    path: '/lawEnforcement/caseEnforceList',
    name: 'lawEnforcementCaseEnforceList',
@@ -3873,7 +3892,86 @@ export const constantRoutes = [
      hidden: true,
    },
    component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseEnforceList'], resolve)
  }
  },
  { ////农业执法（新）-- 案件处理
    path: '/lawEnforcement/monitor',
    name: 'lawEnforcementMonitor',
    meta: {
      title: '监控',
      hidden: true,
    },
    component: (resolve) => require(['@/views/lawEnforcement/monitor/monitor'], resolve)
  },
  // 新型经营主体
  {
    path: '/newBusinessEntity/index',
    name: 'newBusinessEntity',
    meta: {
      title: '主页'
    },
    component: (resolve) => require(['@/views/newBusinessEntity/index'], resolve)
  },

  {
    path: '/newBusinessEntity/login',
    name: 'newBusinessEntity',
    meta: {
      title: '登录'
    },
    component: (resolve) => require(['@/views/newBusinessEntity/login'], resolve)
  },
  {
    path: '/newBusinessEntity/register',
    name: 'newBusinessEntity',
    meta: {
      title: '注册'
    },
    component: (resolve) => require(['@/views/newBusinessEntity/register'], resolve)
  },
  {
    path: '/newBusinessEntity/conter',
    name: 'newBusinessEntity',
    meta: {
      title: '组件'
    },
    component: (resolve) => require(['@/views/newBusinessEntity/conter'], resolve)
  },
  //新闻公告
  {
    path: '/newBusinessEntity/newsBulletin',
    name: 'newsBulletin',
    meta: {
      title: '新闻公告'
    },
    component: (resolve) => require(['@/views/newBusinessEntity/newsBulletin'], resolve)
  },
  //新闻详情
  {
    path: '/newBusinessEntity/newsDetails',
    name: 'newBusinessEntity',
    meta: {
      title: '新闻详情'
    },
    component: (resolve) => require(['@/views/newBusinessEntity/newsDetails'], resolve)
  },
  //主体名录
  {
    path: '/newBusinessEntity/listBody',
    name: 'newBusinessEntity',
    meta: {
      title: '主体名录'
    },
    component: (resolve) => require(['@/views/newBusinessEntity/listBody'], resolve)
  },
  //地图
  {
    path: '/newBusinessEntity/map',
    name: 'newBusinlistBody',
    meta: {
      title: '地图'
    },
    component: (resolve) => require(['@/views/newBusinessEntity/map'], resolve)
  },
 ];


--- a/src/views/lawEnforcement/case/caseDetail.vue
+++ b/src/views/lawEnforcement/case/caseDetail.vue
@@ -83,36 +83,36 @@
          </van-collapse>
        </div>

        <div class="main_box" style="margin-top: 10px;">
          <van-collapse v-model="activeNames2">
            <van-collapse-item name="1">
              <template #title>
                <van-icon name="../../../static/images/lawEnforcement/icon/icon_zxry.png" size="20"></van-icon>
                <span class="custom-title">执法人员<i class="bgBlue"></i></span>
              </template>
              <div class="peopleList">
                <van-row>
                  <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"></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>
 <!--        <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>-->
 <!--                  <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"></van-checkbox>-->
 <!--                    </div>-->
 <!--                  </van-col>-->
 <!--                </van-row>-->
 <!--                &lt;!&ndash;            <img src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="$router.push({name:'lawEnforcementCaseLawEnforcer'})">&ndash;&gt;-->
 <!--              </div>-->
 <!--            </van-collapse-item>-->
 <!--          </van-collapse>-->
 <!--        </div>-->
      </van-tab>
      <!--      勘察-->
      <van-tab v-show="progressLength>=3" v-if="zhenchaShow" :disabled="1 <= caseActive ? false : true">
@@ -1817,6 +1817,7 @@ export default {
      caseProgressOptions: [],
      successActive:0, // 当前节点的前一个已完成节点
      active: 1,  // 当前节点
      openPic2:[]
    };
  },

--- a/src/views/lawEnforcement/caseAllocation/caseAdd.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseAdd.vue
@@ -41,8 +41,6 @@
        <van-field
          readonly
          clickable
          required
          :rules="[{ required: true , message:'请选择关联方案'  }]"
          v-model="scheme"
          label="关联方案"
          placeholder="请选择关联方案"
@@ -181,7 +179,12 @@
              </template>
            </van-field>
            <div 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.name" @input="nameChange" required :rules="[{ required: true , message:'请输入当事人姓名' }]" label="当事人姓名" placeholder="请输入当事人姓名" :border="false" label-width="auto" input-align="right" />
 <!--              @blur="showPopover = false"-->
              <div class="popover_box" v-if="showPopover">
                <p v-for="(item,index) in personalList" @click="takePeople(item)">{{item.name}}<span>{{item.phone}}</span></p>
              </div>

              <van-field v-if="form.type=='1'" v-model="form.sex" label="性别" placeholder="请输入性别" :border="false" label-width="auto" input-align="right" >
                <template #input v-if="form.type=='1'">
                  <van-radio-group v-model="form.sex" direction="horizontal">
@@ -241,7 +244,11 @@
              <van-field v-model="form.zihao" label="字号名称" placeholder="请输入字号名称" :border="false" label-width="auto" input-align="right" />
            </div>
            <div 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" />
 <!--              @blur="showCompany = false"-->
              <van-field v-model="form.companyName" @input="companyChange" :rules="[{ required: true , message:'请输入企业名称' }]" label="企业名称" placeholder="请输入企业名称" :border="false" label-width="auto" input-align="right" />
              <div class="popover_box" v-if="showCompany">
                <p v-for="(item,index) in companyList" @click="takeCompany(item)">{{item.companyName}}</p>
              </div>
              <van-field v-model="form.legalName" label="法人/负责人" placeholder="请输入法人/负责人" :border="false" label-width="auto" input-align="right" />
            </div>

@@ -299,7 +306,7 @@
 <!--      </div>-->
      <div class="submit_box">
        <p class="submitButton" @click="$refs.form.submit()">保存</p>
        <p class="submitButton" @click="keepSubmit()">保存并提交</p>
        <p class="submitButton" @click="keepSubmit()">提交</p>
      </div>
    </van-form>

@@ -307,7 +314,7 @@
 </template>

 <script>
  import { addCase , addProgress , treeselect , schemeList , addSurvey , commonUpload } from "@/api/lawEnforcement/index";
  import { addCase , addProgress , treeselect , schemeList , addSurvey , commonUpload , updateCase , personalList , companyList } from "@/api/lawEnforcement/index";
  import Cookies from "js-cookie";
  export default {
    name: "programmeDetail",
@@ -321,6 +328,8 @@
        showNation:false,
        showBirthday:false,
        showRegisterDate:false,
        showPopover:false,
        showCompany:false,
        form:{
          type:'1',
          sex:'1',
@@ -328,7 +337,20 @@
          caseProgress:'1',
          caseStatus:'1',
          attachement:[],
          attachementList:[]
          attachementList:[],
          id:null,
          name : '' ,
          cardNum : '' ,
          birthday : '' ,
          nation : '' ,
          companyPosition : '' ,
          duties : '' ,
          zihao : '' ,
          companyName : '' ,
          legalName : '' ,
          phone : '' ,
          address : '' ,
          uniformCode : '' ,
        },
        registerDate:new Date(),
        birthday:new Date(),
@@ -363,7 +385,9 @@
          children: "children",
        },

        deptId:''
        deptId:'',
        personalList:[],
        companyList:[],
      };
    },
    created() {
@@ -393,7 +417,10 @@
        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;
        this.nationOptions2 = response.data;
      });
      this.getDicts("case_node").then(response => {
        this.caseProgressOptions = response.data;
      });
      var schemeQueryParam = {
        applyStatus: "1"
@@ -406,7 +433,7 @@
      this.getBookList()
    },
    methods: {
      goSubmit(){
      goSubmit(type){
        if (typeof this.form.attachement != 'string'){
          this.form.attachement = this.form.attachement.join(',');
        }
@@ -424,9 +451,11 @@
              surveyForm.caseId = response.data;
              addSurvey(surveyForm).then(response => {
                this.$notify({ type: 'success', message: '保存成功' });
                setTimeout(function(){
                  history.back(-1);
                },2000)
                if (type != 'submit'){
                  setTimeout(function(){
                    history.back(-1);
                  },2000)
                }
              });
            });

@@ -491,29 +520,33 @@
        this.showBirthday = false;
      },
      keepSubmit(){
        this.form.caseId = this.form.id;
        this.form.caseStatus = "1";
        this.form.caseProgress = "2"; // 勘察
        this.form.caseProgressName = this.selectDictLabel(this.caseProgressOptions, this.form.caseProgress); // 勘察
        this.goSubmit('submit');
        var that = this ;
        setTimeout(function () {
          that.form.caseId = that.form.id;
          that.form.caseStatus = "1";
          that.form.caseProgress = "2"; // 勘察
          that.form.caseProgressName = that.selectDictLabel(that.caseProgressOptions, '2'); // 勘察

        if (typeof this.form.attachement != 'string'){
          this.form.attachement = this.form.attachement.join(',');
        }
        var _this = this;
        this.$dialog.confirm({
          message: '提交后案件将进入后续流程并且不能修改,是否确认提交?',
        }).then(function () {
          // 更新案件的节点和状态
          updateCase(_this.form).then(response => {
            _this.$notify({ type: 'success', message: '提交成功' });
            setTimeout(function(){
              history.back(-1);
            },2000)
          if (typeof that.form.attachement != 'string') {
            that.form.attachement = that.form.attachement.join(',');
          }
          that.$dialog.confirm({
            message: '提交后案件将进入后续流程并且不能修改,是否确认提交?',
          }).then(function () {
            // 更新案件的节点和状态
            updateCase(that.form).then(response => {
              that.$notify({type: 'success', message: '提交成功'});
              setTimeout(function () {
                history.back(-1);
              }, 2000)
            });
          });
        });
        },2000)
      },
      afterReadEvidenceForm(file){
        let params1 = new FormData();
        console.log( this.form.attachement )
        params1.append("file", file.file);
        commonUpload(params1).then((r1) => {
          // this.tEnforceSamplingGoodsList[index].attachement.push(r1.fileName);
@@ -524,6 +557,66 @@
        this.form.attachement.splice(detail.index,1);
        this.form.attachementList.splice(detail.index,1);
      },
      nameChange(val){
        console.log(val)
        if (val == ""){
          this.showPopover = false;
        }else{
          this.showPopover = true;
        }
        var query = {
          name:val
        }
        personalList(query).then((r1) => {
          console.log(r1)
          this.personalList = r1.data;
        })

      },
      takePeople(item){

        console.log(item)
        this.form.bodyId = item.id;
        this.form.name = item.name;
        this.form.sex = item.sex == null ? '1' : item.sex;
        this.form.cardNum = item.cardNum;
        this.form.birthday = item.birthday;
        this.form.nation = item.nation;

        this.nation = item.nation == null ? '' : this.selectDictLabel(this.nationOptions2, item.nation);

        this.form.companyPosition = item.companyPosition;
        this.form.duties = item.duties;
        this.form.zihao = item.zihao;
        this.form.phone = item.phone;
        this.form.address = item.address;
        this.form.uniformCode = item.uniformCode;
        this.showPopover = false;
      },
      companyChange(val){
        console.log(val)
        if (val == ""){
          this.showCompany = false;
        }else{
          this.showCompany = true;
        }
        var query = {
          companyName:val
        }
        companyList(query).then((r1) => {
          console.log(r1)
          this.companyList = r1.data;
        })

      },
      takeCompany(item){
        this.form.companyName = item.companyName;
        this.form.legalName = item.legalName;
        this.form.phone = item.phone;
        this.form.address = item.address;
        this.form.uniformCode = item.uniformCode;
        this.showCompany = false;
      }
    },
    watch: {
      $route (to, from ) {
@@ -552,6 +645,23 @@
  /deep/ .van-collapse-item__content{
    padding: 0;
  }
  .popover_box{
    position: absolute;
    z-index: 9;
    background: #fff;
    box-shadow: 0PX 0PX 5PX #ccc;
    padding: 5PX 10PX;
    right: 16PX;
    line-height: 30PX;
    border-radius: 5px;
    max-height: 160PX;
    overflow-y: scroll;
    width: calc(100% - 32PX);
    p{
      display: flex;
      justify-content: space-between;
    }
  }
  .cf{
    padding: 0 3%;
    margin-top: 20PX;
--- a/src/views/lawEnforcement/caseAllocation/caseDetail.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseDetail.vue
@@ -208,7 +208,12 @@
        });
        getSurveyByCaseId(this.$route.query.id).then((response) => {
          if(response.data != undefined){
            this.tEnforceCaseHandlerList = response.data.tEnforceCaseHandlerList;
            if (response.data.tEnforceCaseHandlerList){
              response.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
                responseEnforce.enforcerLeader = responseEnforce.enforcerLeader=='Y'? true:false;
                this.tEnforceCaseHandlerList.push(responseEnforce);
              });
            }
          }
        });
      },
--- a/src/views/lawEnforcement/caseAllocation/caseEdit.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseEdit.vue
@@ -41,8 +41,6 @@
        <van-field
          readonly
          clickable
          required
          :rules="[{ required: true , message:'请选择关联方案'  }]"
          v-model="scheme"
          label="关联方案"
          placeholder="请选择关联方案"
@@ -60,7 +58,7 @@
            @cancel="showScheme = false"
          />
        </van-popup>
  <!--      <van-field v-model="form.schemeId" label="关联方案" placeholder="请输入关联方案" :border="false" label-width="auto" input-align="right" />-->
  <!-- <van-field v-model="form.schemeId" label="关联方案" placeholder="请输入关联方案" :border="false" label-width="auto" input-align="right" />-->

        <van-field
          readonly
@@ -298,7 +296,7 @@
 <!--      </div>-->
      <div class="submit_box">
        <p class="submitButton" @click="$refs.form.submit()">保存</p>
        <p class="submitButton" @click="keepSubmit()">保存并提交</p>
        <p class="submitButton" @click="keepSubmit()">提交</p>
      </div>
    </van-form>

@@ -405,6 +403,10 @@
        }
      });
      this.getBookList()
      var that = this;
      setTimeout(function () {
        that.getDetail();
      },2000)
    },
    methods: {
      goSubmit(){
@@ -450,9 +452,7 @@
          // 更新案件的节点和状态
          updateCase(_this.form).then(response => {
            _this.$notify({ type: 'success', message: '提交成功' });
            setTimeout(function(){
              history.back(-1);
            },2000)
            _this.goSubmit();
          });
        });
      },
@@ -460,7 +460,6 @@
        treeselect().then((response) => {
          if (response.code == 200) {
            this.deptOptions = response.data;
            this.getDetail();
          }
        })
      },
@@ -518,7 +517,9 @@
          this.caseSource = response.data.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions2, response.data.caseSource);
          this.belongTeam = response.data.belongTeam == '' ? '' : this.selectDictLabel(this.belongTeamOptions2, response.data.belongTeam);
          this.nation = response.data.nation == '' ? '' : this.selectDictLabel(this.nationOptions2, response.data.nation);
          this.scheme = response.data.schemeId == '' ? '' : this.schemeOptions.filter(function (e) { return e.value == response.data.schemeId; })[0].text;
          console.log(response.data.schemeId)
          console.log(this.schemeOptions)
          this.scheme = response.data.schemeId == null ? '' : this.schemeOptions.filter(function (e) { return e.value == response.data.schemeId; })[0].text;
          this.enforceCategory = response.data.enforceCategory;
          if (response.data.attachement){
            response.data.attachementList = [];
--- a/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue
@@ -61,7 +61,7 @@
 </template>

 <script>
  import { listEnforcer , getCase , updateSurvey , getSurveyByCaseId } from "@/api/lawEnforcement/index";
  import { listEnforcer , getCase , updateSurvey , addSurvey , getSurveyByCaseId } from "@/api/lawEnforcement/index";
  import Cookies from "js-cookie";
  export default {
    name: "programmeDetail",
@@ -130,12 +130,36 @@
        var that = this ;
        this.surveyForm.caseId = this.form.id;
        getSurveyByCaseId(this.surveyForm.caseId).then(responseSurvey => {
          console.log(responseSurvey.data.tEnforceCaseHandlerList)
          this.surveyForm.id = responseSurvey.data.id;
          this.result.map(res=>{
            console.log(res)
            let array1 = responseSurvey.data.tEnforceCaseHandlerList.filter(function (e) { return e.id == res.id; });
            if ( array1.length < 1 ){

          if (responseSurvey.data !=undefined){
            this.surveyForm.id = responseSurvey.data.id;
            this.result.map(res=>{
              console.log(res)
              let array1 = responseSurvey.data.tEnforceCaseHandlerList.filter(function (e) { return e.id == res.id; });
              if ( array1.length < 1 ){
                let obj = {};
                obj.relationType = "2";
                obj.enforcerId = res.id;   // 执法人员ID  -- 执法人员选择页面带回值
                obj.enforcerName = res.name;  // 执法人员姓名 -- 执法人员选择页面带回值
                obj.enforcerNum = res.enforceNum;  // 执法证号  -- 执法人员选择页面带回值
                obj.enforcerLeader = "";   // 是否带队  --勾选赋值
                if (this.radio == res.id){
                  obj.enforcerLeader = "Y"
                }
                that.surveyForm.tEnforceCaseHandlerList.push(obj)
              }
            })
            setTimeout(function () {
              updateSurvey(that.surveyForm).then(response => {
                that.$notify({ type: 'success', message: '保存成功' });
                setTimeout(function(){
                  history.back(-1);
                },2000)
              });
            },2000)
          }else{
            this.result.map(res=>{
              that.surveyForm.tEnforceCaseHandlerList = [];
              let obj = {};
              obj.relationType = "2";
              obj.enforcerId = res.id;   // 执法人员ID  -- 执法人员选择页面带回值
@@ -146,16 +170,16 @@
                obj.enforcerLeader = "Y"
              }
              that.surveyForm.tEnforceCaseHandlerList.push(obj)
            }
          })
          setTimeout(function () {
            updateSurvey(that.surveyForm).then(response => {
              that.$notify({ type: 'success', message: '保存成功' });
              setTimeout(function(){
                history.back(-1);
              },2000)
            });
          },2000)
            })
            setTimeout(function () {
              addSurvey(that.surveyForm).then(response => {
                that.$notify({ type: 'success', message: '保存成功' });
                setTimeout(function(){
                  history.back(-1);
                },2000)
              });
            },2000)
          }

        });
      },
--- a/src/views/lawEnforcement/caseAllocation/caseListNew.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseListNew.vue
@@ -8,7 +8,7 @@
    <div class="search_box">
      <div class="search">
        <input type="text" v-model="searchInput" placeholder="请输入登记名称" />
        <img src="../../../../static/images/lawEnforcement/new/index_icon_04.png" @click="goSearch">
        <img src="../../../../static/images/lawEnforcement/new/index_icon_04.png" @click="getList">
      </div>
      <img src="../../../../static/images/lawEnforcement/new/list_icon_03.png" @click="$router.push({name:'lawEnforcementCaseAdd'})"/>
    </div>
@@ -37,13 +37,13 @@
              <van-button v-if="item.caseProgress == 1" square text="修改" type="info" :to="{name:'lawEnforcementCaseEdit', query: {id:item.id}}" class="delete-button" />
            </van-col>
            <van-col>
              <van-button v-if="item.caseProgress == 1" square text="删除" type="danger" @click="deleteCase(item.id)" class="delete-button" />
              <van-button v-if="item.caseProgress == 1" square text="删除" type="danger" @click="deleteCase(item.id,index)" class="delete-button" />
            </van-col>
            <van-col>
              <van-button v-if="item.caseProgress == 1" color="#FFA63E" square text="提交" type="info" @click="submitCase(item)" class="delete-button" />
            </van-col>
            <van-col>
              <van-button v-if="item.caseProgress != 1" color="#1CB8B1" square type="info" :to="{name:'lawEnforcementCaseEnforceList', query: {id:item.id,belongTeam:item.belongTeam}}" class="delete-button" >添加<br/>执法<br/>员</van-button>
              <van-button v-if="item.caseProgress == 2" color="#1CB8B1" square type="info" :to="{name:'lawEnforcementCaseEnforceList', query: {id:item.id,belongTeam:item.belongTeam}}" class="delete-button" >添加<br/>执法<br/>员</van-button>
            </van-col>
          </van-row>
        </template>
@@ -92,6 +92,16 @@
    methods: {
      getList(){
        var _this = this;
        if (this.searchInput != ''){
          if (this.searchInput == this.queryApplyParams.caseName){
            return;
          }
          this.list = [];
          this.queryApplyParams.caseName = this.searchInput;
          this.queryApplyParams.pageNum = 1 ;
          this.loading = false;
          this.finished = false;
        }
        listCase(_this.queryApplyParams).then(response => {
          response.rows.map(res=>{
            res.caseSourceText = res.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, res.caseSource);
@@ -121,17 +131,13 @@
        this.finished = false;
        // this.getList();
      },
      deleteCase(id){
      deleteCase(id,index){
        this.$dialog.confirm({
          message: '是否确认删除案件登记标识为"' + id + '"的数据项?',
        }).then(function () {
          return delCase(id);
        }).then(() => {
          this.list = [];
          this.loading = false;
          this.finished = false;
          this.queryApplyParams.pageNum = 1 ;
          this.getList();
          this.list.splice(index,1)
          this.$notify({ type: 'success', message: '删除成功' });
        }).catch(() => {});
      },
--- a/src/views/lawEnforcement/index_new.vue
+++ b/src/views/lawEnforcement/index_new.vue
@@ -27,11 +27,15 @@
    <div class="main1">
      <p class="tit">日常执法</p>
 <!--      <p class="content">农业农村管理方面法律及法规规定的行政处罚</p>-->
      <van-grid :column-num="3" :border="false">
      <van-grid :column-num="4" :border="false">
        <van-grid-item :to="{name:'lawEnforcementCaseAllocation'}">
          <img src="../../../static/images/lawEnforcement/new/index_icon_05.png"/>
          <p>案件分配</p>
        </van-grid-item>
        <van-grid-item :to="{name:'waitingProcessing'}">
          <img src="../../../static/images/lawEnforcement/new/index_icon_21.png"/>
          <p>待办事项</p>
        </van-grid-item>
        <van-grid-item :to="{name:'lawEnforcementTask'}">
          <img src="../../../static/images/lawEnforcement/new/index_icon_06.png"/>
          <p>任务查看</p>
@@ -229,6 +233,8 @@ export default {
  }
  /deep/ .van-grid-item__content{
    background: transparent;
    padding-left: 0;
    padding-right: 0;
    p{
      color: #333333;
      font-size: 14PX;
--- a/src/views/lawEnforcement/monitor/monitor.vue
+++ b/src/views/lawEnforcement/monitor/monitor.vue
@@ -0,0 +1,301 @@
 <template>
    <div class="home_wrapper">
        <div class="header_main">
          监控
        </div>
      <div class="jg"></div>

      <div class="main1">
        <p class="tit">设备</p>
        <!--      <p class="content">农业农村管理方面法律及法规规定的行政处罚</p>-->
        <van-grid :column-num="2" :border="false">
          <van-grid-item :to="{name:'lawEnforcementCaseAllocation'}">
            <div class="onDiv">
              <img src="../../../../static/images/lawEnforcement/icon/monitor_icon_01.png"/>
              <div class="onDiv_text">
                <p>4<span>台</span></p>
                <p>在线设备</p>
              </div>
            </div>
          </van-grid-item>
          <van-grid-item :to="{name:'waitingProcessing'}">
            <div class="onDiv outDiv">
              <img src="../../../../static/images/lawEnforcement/icon/monitor_icon_01.png"/>
              <div class="onDiv_text">
                <p>4<span>台</span></p>
                <p>在线设备</p>
              </div>
            </div>
          </van-grid-item>
        </van-grid>
      </div>

      <van-tabs v-model="active" animated>
        <van-tab title="在线设备">
          <div class="onList">
            <div class="onList_tit">
              <img src="../../../../static/images/lawEnforcement/icon/monitor_icon_02.png" alt="">
              <p>手持执法仪</p>
            </div>
            <p class="onList_num">Y-01</p>
            <p class="onList_time">接入时间：08/21 15:00</p>
          </div>
          <div class="onList">
            <div class="onList_tit">
              <img src="../../../../static/images/lawEnforcement/icon/monitor_icon_02.png" alt="">
              <p>手持执法仪</p>
            </div>
            <p class="onList_num">Y-01</p>
            <p class="onList_time">接入时间：08/21 15:00</p>
          </div>
          <div class="onList">
            <div class="onList_tit">
              <img src="../../../../static/images/lawEnforcement/icon/monitor_icon_02.png" alt="">
              <p>手持执法仪</p>
            </div>
            <p class="onList_num">Y-01</p>
            <p class="onList_time">接入时间：08/21 15:00</p>
          </div>
          <div class="onList">
            <div class="onList_tit">
              <img src="../../../../static/images/lawEnforcement/icon/monitor_icon_02.png" alt="">
              <p>手持执法仪</p>
            </div>
            <p class="onList_num">Y-01</p>
            <p class="onList_time">接入时间：08/21 15:00</p>
          </div>
        </van-tab>
        <van-tab title="离线设备">
          <div class="onList offList">
            <div class="onList_tit">
              <img src="../../../../static/images/lawEnforcement/icon/monitor_icon_02.png" alt="">
              <p>手持执法仪</p>
            </div>
            <p class="onList_num">Y-01</p>
            <p class="onList_time">最近时间：08/21 15:00</p>
          </div>
          <div class="onList offList">
            <div class="onList_tit">
              <img src="../../../../static/images/lawEnforcement/icon/monitor_icon_02.png" alt="">
              <p>手持执法仪</p>
            </div>
            <p class="onList_num">Y-01</p>
            <p class="onList_time">最近时间：08/21 15:00</p>
          </div>
          <div class="onList offList">
            <div class="onList_tit">
              <img src="../../../../static/images/lawEnforcement/icon/monitor_icon_02.png" alt="">
              <p>手持执法仪</p>
            </div>
            <p class="onList_num">Y-01</p>
            <p class="onList_time">最近时间：08/21 15:00</p>
          </div>
          <div class="onList offList">
            <div class="onList_tit">
              <img src="../../../../static/images/lawEnforcement/icon/monitor_icon_02.png" alt="">
              <p>手持执法仪</p>
            </div>
            <p class="onList_num">Y-01</p>
            <p class="onList_time">最近时间：08/21 15:00</p>
          </div>
        </van-tab>
      </van-tabs>

      <div style="height: 20PX"></div>
      <lawNew></lawNew>
    </div>
 </template>

 <script>
  import lawNew from "@/components/common/lawNew_footer";
  export default {
    name: "caseAllocation",
    components: {
      lawNew
    },
    data() {
      return {
        active: 0,
      };
    },
    created() {

    },
    methods: {

    },
  }
 </script>

 <style scoped lang="scss">
  .jg{
    height: 116px;
  }
  .onDiv{
    display: flex;
    width: 90%;
    background-image: linear-gradient(to right, #F57F65 , #F9A96D);
    justify-content: center;
    align-items: center;
    border-radius: 8PX;
    padding: 12PX 0 15PX;
    .onDiv_text{
      margin-left: 10%;
      p{
        color: #ffffff;
        line-height: 1;
        &:first-child{
          font-size: 32PX;
          margin-bottom: 5PX;
          span{
            font-size: 14PX;
          }
        }
      }
    }
  }
  .outDiv{
    background:#C9C9C9;
  }
  .onList{
    background: #1D6FE9 url("../../../../static/images/lawEnforcement/icon/monitor_icon_03.png") no-repeat;
    background-position: right 5% top 40%;
    width: 46%;
    padding: 3% 5%;
    color: #ffffff;
    border-radius: 10PX;
    float: left;
    margin: 4% 2% 0;
    .onList_tit{
      display: flex;
      align-items: center;
      p{
        margin-left: 5PX;
      }
    }
    .onList_num{
      font-size: 28PX;
      margin: 5PX 0;
    }
  }
  .offList{
    background: #C9C9C9 url("../../../../static/images/lawEnforcement/icon/monitor_icon_04.png") no-repeat;
    background-position: right 5% top 40%;
  }
  /deep/ .van-tabs--line .van-tabs__wrap{
    border-radius: 100rem;
  }
  /deep/ .van-tab{
    z-index: 1;
  }
  /deep/ .van-tab--active{
    color: #1D6FE9;
  }
  /deep/ .van-tabs__nav{
    background: #ECECEC;
  }
  /deep/ .van-tabs__line{
    background: #fff;
    border-radius: 100rem;
    z-index: 0;
    width: 47%;
    height: 60%;
    bottom: 0.5rem;
  }
 .home_wrapper{
    background: #F6F6F6;
    min-height: 100vh;
    width: 100vw;
    padding: 0 3% 0.2rem;
    .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;
        }
    }
 }
 .main1{
   padding: 0 3%;
   margin: 25PX auto 0;
   .content{
     color: #878787;
     padding-left: 2%;
     margin-top: 10PX;
   }
   /deep/ .van-grid-item__content{
     background: transparent;
     padding-left: 0;
     padding-right: 0;
     p{
       /*color: #333333;*/
       font-size: 14PX;
     }
   }
 }
 .tit{
  font-weight: bold;
  font-size: 16PX;
  padding: 0 2%;
  background: url("../../../../static/images/lawEnforcement/new/index_icon_18.png") no-repeat left center;
  line-height: 1;
 }
 .main_box{
  width: 100%;
  margin: 0 auto;
  border-radius: 10PX;
  box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
  overflow: hidden;
  background-color: #FFF;
  margin-top: 10PX;
  p,/deep/ .van-grid-item__text{
    font-size: .35rem;
    color: #646566;
  }
  .custom-title{
    font-size: 17PX;
    color: #333333;
    vertical-align: middle;
    line-height: 1;
    position: relative;
  }
  .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;
  }
 }
 </style>
--- a/src/views/lawEnforcement/retrospect/retrospectDetail.vue
+++ b/src/views/lawEnforcement/retrospect/retrospectDetail.vue
@@ -3,11 +3,13 @@
    <div class="header_main">
      种子扫描
      <div class="return_btn" @click="onClickLeft"></div>
      <div class="add_btn" @click="onClickLeft"></div>
      <div class="top_box">
        <div class="top_01">
          <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">
        <p class="tt">产品溯源信息</p>
        <div class="top_02">
          <p><i></i>一物一码</p>
@@ -20,7 +22,11 @@

    <div class="main">

      <div class="main_box center_box">
      <div class="main_box">
        <a href="#" style="font-size: 14px;display: block;width: 100%;text-align: center;">www.kasdhefivnskdfkhhwkn5664nn.5164888874.com</a>
      </div>

      <div class="main_box center_box" style="margin-top: 10px;">
        <img src="../../../../static/images/lawEnforcement/new/retrospect_icon_15.png" alt="">
        <p>该产品单元识别代码合规</p>
        <p>1534565635645126353535335656</p>
@@ -99,6 +105,11 @@
  }
  .app-container {

  }
  .retrospect_icon{
    position: absolute;
    top: 0;
    right: 0;
  }
  .top_box{
    line-height: 1;
@@ -107,6 +118,7 @@
    margin: 0 auto;
    padding-bottom: 10PX;
    background: url('../../../../static/images/lawEnforcement/new/retrospect_icon_14.png') no-repeat right bottom;
    position: relative;
    .top_01{
      display: flex;
      align-items: center;
@@ -211,7 +223,7 @@
    .add_btn{
      width: 56.4px;
      height: 40.8px;
      background: url('../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
      background: url('../../../../static/images/lawEnforcement/new/retrospect_icon_17.png') center center no-repeat;
      background-size: 47px 34px;
      position: absolute;
      right: 38px;
--- a/src/views/lawEnforcement/supervise/enterprise.vue
+++ b/src/views/lawEnforcement/supervise/enterprise.vue
@@ -79,6 +79,17 @@
    },
    methods: {
      getList(){
        if (this.searchInput != ''){
          if (this.searchInput == this.queryParams.companyName){
            return;
          }
          this.list = [];
          this.loading = false;
          this.finished = false;
          this.queryParams.companyName = this.searchInput;
          this.queryParams.pageNum = 1 ;
        }

        var _this = this;
        listCompany(_this.queryParams).then(response => {
          response.rows.map(res=>{
@@ -96,17 +107,7 @@
        });
      },
      goSearch(){
        if (this.searchInput == ''){
          location.reload()
        }
        if (this.searchInput == this.queryParams.companyName){
          return;
        }
        this.list = [];
        this.loading = false;
        this.finished = false;
        this.queryParams.companyName = this.searchInput;
        this.queryParams.pageNum = 1 ;

        this.getList();
      },
    },
--- a/src/views/lawEnforcement/supervise/individual.vue
+++ b/src/views/lawEnforcement/supervise/individual.vue
@@ -8,7 +8,7 @@
      <div class="search_box">
        <div class="search">
          <input type="text" v-model="searchInput" placeholder="请输入商户姓名" />
          <img src="../../../../static/images/lawEnforcement/new/index_icon_04.png" @click="goSearch">
          <img src="../../../../static/images/lawEnforcement/new/index_icon_04.png" @click="getList">
        </div>
      </div>

@@ -74,6 +74,16 @@
    },
    methods: {
      getList(){
        if (this.searchInput != ''){
          if (this.searchInput == this.queryParams.name){
            return;
          }
          this.list = [];
          this.loading = false;
          this.finished = false;
          this.queryParams.name = this.searchInput;
          this.queryParams.pageNum = 1 ;
        }
        listPersonal(this.queryParams).then(response => {
          response.rows.map(res=>{
            this.list.push(res);
@@ -92,12 +102,15 @@
        if (this.searchInput == ''){
          location.reload()
        }
        if (this.searchInput == this.queryParams.name){
          return;
        }
        this.list = [];
        this.loading = false;
        this.finished = false;
        this.queryParams.name = this.searchInput;
        this.queryParams.pageNum = 1 ;
        this.getList();
        // this.getList();
      },
    },
  }
--- a/src/views/lawEnforcement/task/taskDetail.vue
+++ b/src/views/lawEnforcement/task/taskDetail.vue
@@ -192,7 +192,12 @@
        });
        getSurveyByCaseId(this.$route.query.id).then((response) => {
          if(response.data != undefined){
            this.tEnforceCaseHandlerList = response.data.tEnforceCaseHandlerList;
            if (response.data.tEnforceCaseHandlerList){
              response.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
                responseEnforce.enforcerLeader = responseEnforce.enforcerLeader=='Y'? true:false;
                this.tEnforceCaseHandlerList.push(responseEnforce);
              });
            }
          }
        });
      },
--- a/src/views/lawEnforcement/task/taskHandle.vue
+++ b/src/views/lawEnforcement/task/taskHandle.vue
@@ -6,7 +6,7 @@
    </div>
    <div style="height: 58px;"></div>
    <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 }" >
@@ -105,7 +105,7 @@
          </van-collapse>
        </div>
      </van-tab>
      <!--      勘察-->
      <!--勘察-->
      <van-tab v-show="progressLength>=3" v-if="zhenchaShow" :disabled="1 <= caseActive ? false : true">
        <template #title>
          <div
@@ -167,16 +167,15 @@
                  <van-col :span="4">
                    <div class="icon_box">
                      <van-checkbox v-model="item.enforcerLeader" shape="square"></van-checkbox>
                      <van-icon v-if="caseActive == 1" name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'CaseHand')"></van-icon>
                      <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>
                    </div>
                  </van-col>
                </van-row>
                <img v-if="caseActive == 1" src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'CaseHand',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
                <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'})">
              </div>
            </van-collapse-item>
          </van-collapse>
        </div>

        <van-form :readonly="caseProgress != 1 || (surveyForm.instanceId!='' && surveyForm.instanceId!=null && surveyForm.instanceId!=undefined)">

          <div class="main_box">
@@ -372,44 +371,69 @@
          </div>
        </van-form>

        <p class="splcTit">审批流程</p>
        <div class="main_box2">
          <van-row v-for="(item,index) in historyList" :key="index">
            <van-col :span="4">
              <p class="index">{{index+1}}</p>
              <div class="indexBorder" :class="{'indexCenter':index==0 ? false : true}">
                <p class="ssT" v-if="index>0"></p>
                <p class="yq"></p>
                <p class="ss" v-if="historyList.length != index+1"></p>
              </div>
            </van-col>
            <van-col :span="20">
              <van-cell :title="item.activityName" center :border="false">
                <template #default>
                  <p style="color: #666666;">{{ item.assigneeName }}</p>
                </template>
              </van-cell>

              <van-cell center :border="false">
                <template #title>
                  <p style="color: #999999;">{{ item.endTime }}</p>
                </template>
                <template #default>
                  <p style="color: #999999;">{{ item.durationInMillis }}</p>
                </template>
              </van-cell>

              <p class="bq">审批意见：{{ item.comment }}</p>
            </van-col>
          </van-row>
        </div>

        <template v-if="historyList.length>0">
          <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>
        </template>
 <!--        <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>-->
 <!--        <div class="submit_box" v-if="caseActive == 1 && type == 'waiting'">-->
 <!--          <p class="submitButton" @click="preservation('submit')">保存1</p>-->
 <!--          <p class="submitButton" @click="submitCase">提交1</p>-->
 <!--        </div>-->
        <div class="submit_box" v-if="caseProgress == 1 && ( surveyForm.instanceId=='' || surveyForm.instanceId==null || surveyForm.instanceId==undefined )">
          <p class="submitButton" @click="preservation">保存</p>
          <p class="submitButton" @click="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">
        <template #title>
          <div
@@ -455,12 +479,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" name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'PutRecord')"></van-icon>
                      <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>
                    </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" src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'PutRecord',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
                <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'})">
              </div>
            </van-collapse-item>
          </van-collapse>
@@ -679,44 +703,72 @@
          </div>

        </van-form>
        <template v-if="putRecordHistoryList.length>0">
          <p class="splcTit">审批流程</p>
          <div class="main_box2">
            <van-row v-for="(item,index) in putRecordHistoryList" :key="index">
              <van-col :span="4">
                <p class="index">{{index+1}}</p>
                <div class="indexBorder" :class="{'indexCenter':index==0 ? false : true}">
                  <p class="ssT" v-if="index>0"></p>
                  <p class="yq"></p>
                  <p class="ss" v-if="putRecordHistoryList.length != index+1"></p>
                </div>
              </van-col>
              <van-col :span="20">
                <van-cell :title="item.activityName" center :border="false">
                  <template #default>
                    <p style="color: #666666;">{{ item.assigneeName }}</p>
                  </template>
                </van-cell>

                <van-cell center :border="false">
                  <template #title>
                    <p style="color: #999999;">{{ item.endTime }}</p>
                  </template>
                  <template #default>
                    <p style="color: #999999;">{{ item.durationInMillis }}</p>
                  </template>
                </van-cell>

                <p class="bq">审批意见：{{ item.comment }}</p>
              </van-col>
            </van-row>
          </div>
        </template>

        <p class="splcTit">审批流程</p>
        <div class="main_box2">
          <van-row v-for="(item,index) in putRecordHistoryList" :key="index">
            <van-col :span="4">
              <p class="index">{{index+1}}</p>
              <div class="indexBorder" :class="{'indexCenter':index==0 ? false : true}">
                <p class="ssT" v-if="index>0"></p>
                <p class="yq"></p>
                <p class="ss" v-if="putRecordHistoryList.length != index+1"></p>
              </div>
            </van-col>
            <van-col :span="20">
              <van-cell :title="item.activityName" center :border="false">
                <template #default>
                  <p style="color: #666666;">{{ item.assigneeName }}</p>
                </template>
              </van-cell>
 <!--        <div class="main_box examine_box" v-if="caseActive == 2 && 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 == 2 && type == 'waiting'">-->
 <!--          <van-row>-->
 <!--            <van-col span="24" align="center">-->
 <!--              <van-button type="info" native-type="submit" @click="submitPutRecord" class="submitButtonActive">提交</van-button>-->
 <!--            </van-col>-->
 <!--          </van-row>-->
 <!--          <div class="clear"></div>-->
 <!--        </div>-->

              <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>
 <!--        <div class="submit_box" v-if="caseActive == 2 && type == 'waiting'">-->
 <!--          <p class="submitButton" @click="submitPutRecordForm('submit')">保存1</p>-->
 <!--          <p class="submitButton" @click="submitPutRecord">提交1</p>-->
 <!--        </div>-->

              <p class="bq">审批意见：{{ item.comment }}</p>
            </van-col>
          </van-row>
        </div>
        <div class="submit_box" v-if="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )">
          <p class="submitButton" @click="submitPutRecordForm">保存</p>
          <p class="submitButton" @click="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">
        <template #title>
          <div
@@ -762,12 +814,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" name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'evidence')"></van-icon>
                      <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>
                    </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" src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'evidence',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
                <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'})">
              </div>
            </van-collapse-item>
          </van-collapse>
@@ -850,41 +902,72 @@
            <van-empty v-if="evidenceForm.attachement == null && caseProgress == 3 && evidenceForm.instanceId!='' && evidenceForm.instanceId!=null && evidenceForm.instanceId!=undefined" description="暂无文件" />
          </div>
        </van-form>
        <p class="splcTit">审批流程</p>
        <div class="main_box2">
          <van-row v-for="(item,index) in evidencHistoryList" :key="index">
            <van-col :span="4">
              <p class="index">{{index+1}}</p>
              <div class="indexBorder" :class="{'indexCenter':index==0 ? false : true}">
                <p class="ssT" v-if="index>0"></p>
                <p class="yq"></p>
                <p class="ss" v-if="evidencHistoryList.length != index+1"></p>
              </div>
            </van-col>
            <van-col :span="20">
              <van-cell :title="item.activityName" center :border="false">
                <template #default>
                  <p style="color: #666666;">{{ item.assigneeName }}</p>
                </template>
              </van-cell>

              <van-cell center :border="false">
                <template #title>
                  <p style="color: #999999;">{{ item.endTime }}</p>
                </template>
                <template #default>
                  <p style="color: #999999;">{{ item.durationInMillis }}</p>
                </template>
              </van-cell>
        <template v-if="evidencHistoryList.length>0">
          <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>
        </template>

 <!--        <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>-->

 <!--        <div class="submit_box" v-if="caseActive == 3 && type == 'waiting'">-->
 <!--          <p class="submitButton" @click="submitEvidenceForm('submit')">保存1</p>-->
 <!--          <p class="submitButton" @click="submitEvidence">提交1</p>-->
 <!--        </div>-->

              <p class="bq">审批意见：{{ item.comment }}</p>
            </van-col>
          </van-row>
        </div>
        <div class="submit_box" v-if="caseProgress == 3 && ( evidenceForm.instanceId=='' || evidenceForm.instanceId==null || evidenceForm.instanceId==undefined )">
          <p class="submitButton" @click="submitEvidenceForm">保存</p>
          <p class="submitButton" @click="submitEvidenceForm('submit')">保存</p>
          <p class="submitButton" @click="submitDefineEvidenceForm">提交</p>
        </div>

      </van-tab>
      <template>
 <!--      &lt;!&ndash;      处理&ndash;&gt;-->
@@ -1613,6 +1696,10 @@ export default {
      showSurveyEndTime:false,
      showConclusion:false,

      surveyDiglogStatus:false,
      recordDiglogStatus:false,
      evidenceDiglogStatus:false,

      form:{},
      caseProgress:0,
      caseActive:0,
@@ -2069,7 +2156,7 @@ export default {
    next(vm => {
      console.log(from.path)
      console.log(to.path)
      if (from.path === '/lawEnforcement/task'){
      if (from.path === '/lawEnforcement/task' || from.path === '/lawEnforcement/waitingProcessing'){
        location.reload()
      }
    })
@@ -2077,56 +2164,90 @@ export default {
  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 () {
      this.preservation();
      var that = this;
      setTimeout(function(){
        const data = {
          taskId: that.surveyForm.taskId,
          instanceId: that.surveyForm.instanceId,
          variables: JSON.stringify({
            comment: that.comment,
            pass: that.pass,
            //"formData": this.row,
          }),
        };
        return request({
          url: "/activiti/process/complete",
          method: "post",
          params: data,
        }).then((response) => {
          if (response.code == 200 && response.msg == "操作成功") {
            that.$notify({ type: 'success' , message: "操作成功" });
            history.back(-1);
          },1000)
        } else {
          this.$notify({ type: 'danger' , message: "操作失败" });
        }
      });
          } else {
            that.$notify({ type: 'danger' , message: "操作失败" });
          }
        });
      },2000);
    },

    /** 保存审批意见提交 */
    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 () {
      this.submitEvidenceForm()
      var that = this;
      setTimeout(function(){
        const data = {
          taskId: that.evidenceForm.taskId,
          instanceId: that.evidenceForm.instanceId,
          variables: JSON.stringify({
            comment: that.comment,
            pass: that.pass,
            //"formData": this.row,
          }),
        };
        return request({
          url: "/activiti/process/complete",
          method: "post",
          params: data,
        }).then((response) => {
          if (response.code == 200 && response.msg == "操作成功") {
            that.$notify({ type: 'success' , message: "操作成功" });
            history.back(-1);
          },1000)
        } else {
          this.$notify({ type: 'danger' , message: "操作失败" });
        }
      });
          } else {
            that.$notify({ type: 'danger' , message: "操作失败" });
          }
        });
      },2000);
    },

    /** 保存审批意见提交 */
    submitPutRecord() {
      this.submitPutRecordForm()
      var that = this;
      setTimeout(function(){
        const data = {
          taskId: that.putRecordForm.taskId,
          instanceId: that.putRecordForm.instanceId,
          variables: JSON.stringify({
            comment: that.comment,
            pass: that.pass,
            //"formData": this.row,
          }),
        };
        return request({
          url: "/activiti/process/complete",
          method: "post",
          params: data,
        }).then((response) => {
          if (response.code == 200 && response.msg == "操作成功") {
            that.$notify({ type: 'success' , message: "操作成功" });
            history.back(-1);
          } else {
            that.$notify({ type: 'danger' , message: "操作失败" });
          }
        });
      },2000);

    },

    /** 保存审批意见提交 */
@@ -2248,6 +2369,15 @@ export default {
            if(_this.surveyForm.isAvoid==null || _this.surveyForm.isAvoid==""){
              _this.surveyForm.isAvoid = "N";
            }
            var taskName = responseSurvey.data.taskName;
            console.log(taskName)
            if (taskName == "调整申请") {
              // 如果是调整申请
              this.surveyDiglogStatus = false;
            } else {
              // 设置表单按钮不可编辑
              this.surveyDiglogStatus = true;
            }
            _this.instanceId = responseSurvey.data.instanceId;
            if (responseSurvey.data.tEnforceCaseHandlerList){
              _this.tEnforceCaseHandlerList = responseSurvey.data.tEnforceCaseHandlerList;
@@ -2259,7 +2389,8 @@ export default {
                  relationType: "2"
                }
                enforceLockinCount(data).then(resEnforceLockin => {
                  _this.$set(_this.tEnforceCaseHandlerList[index],"num",resEnforceLockin.data)
                  console.log(resEnforceLockin)
                  _this.$set(_this.tEnforceCaseHandlerList[index],"num",resEnforceLockin.data.length)
                });
              });
            }
@@ -2294,6 +2425,14 @@ export default {
        getputRecordByCaseId(_this.form.id).then(responsePutRecord => {
          getSamplingByCaseId(_this.form.id).then(responseSampling => {
            if(responsePutRecord.data != undefined){
              var taskName = responsePutRecord.data.taskName;
              if (taskName == "调整申请") {
                // 如果是调整申请
                this.recordDiglogStatus = false;
              } else {
                // 设置表单按钮不可编辑
                this.recordDiglogStatus = true;
              }
              _this.tEnforcePutRecordHandlerList = responsePutRecord.data.tEnforceCaseHandlerList;
              if (responsePutRecord.data.tEnforceCaseHandlerList){
                console.log(responsePutRecord.data.tEnforceCaseHandlerList)
@@ -2305,7 +2444,7 @@ export default {
                    relationType: "3"
                  }
                  enforceLockinCount(data).then(resEnforceLockin => {
                    _this.$set(_this.tEnforcePutRecordHandlerList[index],"num",resEnforceLockin.data)
                    _this.$set(_this.tEnforcePutRecordHandlerList[index],"num",resEnforceLockin.data.length)
                  });
                });
              }
@@ -2340,7 +2479,7 @@ export default {
                      relationType: "3"
                    }
                    enforceLockinCount(data).then(resEnforceLockin => {
                      _this.$set(_this.tEnforcePutRecordHandlerList[index],"num",resEnforceLockin.data)
                      _this.$set(_this.tEnforcePutRecordHandlerList[index],"num",resEnforceLockin.data.length)
                    });

                  });
@@ -2375,7 +2514,7 @@ export default {
            _this.putRecordForm.caseName = this.form.caseName;
            _this.putRecordForm.schemeId = this.form.schemeId;
            // 查询审批历史记录
            _this.getHistoryList(this.evidenceForm,'putRecord');
            _this.getHistoryList(this.putRecordForm,'putRecord');
          });
        });
      }
@@ -2388,6 +2527,14 @@ export default {
        this.evidenceForm.caseId = this.form.id;
        getEvidenceByCaseId(this.form.id).then(responseEvidence => {
          getSamplingByCaseId(this.form.id).then(responseSampling => {
            var taskName = responseEvidence.data.taskName;
            if (taskName == "调整申请") {
              // 如果是调整申请
              this.evidenceDiglogStatus = false;
            } else {
              // 设置表单按钮不可编辑
              this.evidenceDiglogStatus = true;
            }
            for (var i = 0; i < responseSampling.data.tEnforceSamplingGoodsList.length; i++) {
              let goodsId = responseSampling.data.tEnforceSamplingGoodsList[i].id;
              let goodsName = responseSampling.data.tEnforceSamplingGoodsList[i].goodsName;
@@ -2449,7 +2596,7 @@ export default {
                    relationType: "4"
                  }
                  enforceLockinCount(data).then(resEnforceLockin => {
                    _this.$set(_this.tEnforceEvidenceHandlerList[index],"num",resEnforceLockin.data)
                    _this.$set(_this.tEnforceEvidenceHandlerList[index],"num",resEnforceLockin.data.length)
                  });

                });
@@ -2492,7 +2639,7 @@ export default {
                        relationType: "4"
                      }
                      enforceLockinCount(data).then(resEnforceLockin => {
                        _this.$set(_this.tEnforceEvidenceHandlerList[index],"num",resEnforceLockin.data)
                        _this.$set(_this.tEnforceEvidenceHandlerList[index],"num",resEnforceLockin.data.length)
                      });

                    });
@@ -2821,6 +2968,9 @@ export default {

    /** 查询审批历史展示步骤条 */
    getHistoryList(formData,type) {

      console.log(formData)
      console.log(type)
      if (formData.instanceId != null && formData.instanceId != "") {
        var queryParams = {
          processInstanceId: formData.instanceId
@@ -2830,6 +2980,7 @@ export default {
          method: "post",
          data: queryParams,
        }).then((response) => {
          console.log(response)
          if (type == 'evidence'){
            this.evidencHistoryList = response.rows;
            this.evidencHistoryList.forEach((row) => {
@@ -3076,7 +3227,7 @@ export default {
      return days + "天" + hours + "时" + minutes + "分" + seconds + '秒';
    },

    preservation(){
    preservation(type){
      this.tEnforceCaseHandlerList.map(res=>{
        res.relationType = '2';
        console.log(res.enforcerLeader)
@@ -3086,26 +3237,30 @@ export default {
      this.surveyForm.attachement = this.openPic2.join(',');
      if (this.surveyForm.id != null) {
        updateSurvey(this.surveyForm).then(response => {
          this.$notify({ type: 'success', message: '修改成功' });
          history.back(-1);
          if (type == 'submit'){
            this.$notify({ type: 'success', message: '修改成功' });
            history.back(-1);
          }
        });
      } else {
        addSurvey(this.surveyForm).then(response => {
          this.$notify({ type: 'success', message: '新增成功' });
          this.surveyForm.id = response.data;
          history.back(-1);
          if (type == 'submit'){
            this.$notify({ type: 'success', message: '新增成功' });
            history.back(-1);
          }
        });
      }
    },

    submit(){
      if (this.surveyForm.id == null) {
        this.$notify({ type: 'danger', message: '请先保存数据之后再确定提交申请' });
      } else {
        if (this.surveyForm.isApprove == "Y") { // 是否审批选择是,走工作流审批
          var id = this.surveyForm.id;
          const requestMapping = this.requestMapping;
          this.$dialog.confirm({
      this.preservation();
      var that = this;
      setTimeout(function() {
        if (that.surveyForm.isApprove == "Y") { // 是否审批选择是,走工作流审批
          var id = that.surveyForm.id;
          const requestMapping = that.requestMapping;
          that.$dialog.confirm({
            message: '提交后案件将进入后续流程并且不能修改,是否确认提交?',
          }).then(function () {
            return request({
@@ -3113,11 +3268,12 @@ export default {
              method: 'post',
            });
          }).then(() => {
            this.preservation();
            that.$notify({ type: 'success', message: '提交成功' });
            history.back(-1);
          })
        } else {
          // 不审批直接更新进度到备案
          var caseId = this.surveyForm.caseId;
          var caseId = that.surveyForm.caseId;
          var caseStatus = "1";
          var caseProgress = "8"; // 备案
          var caseParam = {
@@ -3125,7 +3281,7 @@ export default {
            caseId: caseId,
            caseStatus: caseStatus,
            caseProgress: caseProgress,
            caseProgressName: this.selectDictLabel(this.caseProgressOptions, caseProgress)
            caseProgressName: that.selectDictLabel(that.caseProgressOptions, caseProgress)
          };

          var progressParam = {
@@ -3133,17 +3289,16 @@ export default {
            caseId: caseId,
            caseStatus: caseStatus,
            caseProgress: "2", // 勘察
            caseProgressName: this.selectDictLabel(this.caseProgressOptions, "2")
            caseProgressName: that.selectDictLabel(that.caseProgressOptions, "2")
          };

          var _this = this;
          this.$dialog.confirm({
            message: '提交后案件将进入后续流程并且不能修改,是否确认提交?',
          }).then(function () {
            let recordType = "";
            if (_this.surveyForm.surveyResult == "1") { // 审批程序设置 1:不予立案  2:无违法行为
            if (that.surveyForm.surveyResult == "1") { // 审批程序设置 1:不予立案  2:无违法行为
              recordType = "5";  // 两个表值不一致做对应匹配
            } else if (_this.surveyForm.surveyResult == "2") {
            } else if (that.surveyForm.surveyResult == "2") {
              recordType = "2";
            }
            var onrecordParam = {
@@ -3154,19 +3309,18 @@ export default {
              // 更新案件的节点和状态
              updateCase(caseParam).then(response => {
                addProgress(progressParam).then(response => {
                  this.preservation();
                  that.$notify({ type: 'success', message: '提交成功' });
                  history.back(-1);
                });
              });
            });
          });

        }
      }

      },2000)
    },

    /** 案件立案提交按钮 */
    submitPutRecordForm() {
    submitPutRecordForm(type) {
      this.tEnforcePutRecordHandlerList.map(res=>{
        res.relationType = '3';
        res.enforcerLeader = res.enforcerLeader == true ? 'Y' : 'N' ;
@@ -3197,18 +3351,21 @@ export default {
            if (this.samplingForm.id != null) {
              updateSampling(this.samplingForm).then(responseSampling => {
                if (responseSampling.code == "200") {
                  this.$notify({ type: 'success', message: '修改成功' });

                  history.back(-1);
                  if (type == 'submit'){
                    this.$notify({ type: 'success', message: '修改成功' });
                    history.back(-1);
                  }
                }
              });
            } else {
              addSampling(this.samplingForm).then(responseSampling => {
                if (responseSampling.code == "200") {
                  this.$notify({ type: 'success', message: '新增成功' });
                  _this.samplingForm.id = responseSampling.data;

                  history.back(-1);
                  if (type == 'submit'){
                    this.$notify({ type: 'success', message: '保存成功' });
                    history.back(-1);
                  }
                }
              });
            }
@@ -3220,11 +3377,13 @@ export default {
          if (responsePutrecord.code == "200") {
            addSampling(this.samplingForm).then(responseSampling => {
              if (responseSampling.code == "200") {
                this.$notify({ type: 'success', message: '新增成功' });
                _this.putRecordForm.id = responsePutrecord.data;
                _this.samplingForm.id = responseSampling.data;

                history.back(-1);
                if (type == 'submit'){
                  this.$notify({ type: 'success', message: '保存成功' });
                  history.back(-1);
                }
              }
            });
            _this.putRecordDiglogStatus = false;
@@ -3235,12 +3394,12 @@ export default {

    /** 弹窗确定按钮操作 */
    submitDefine(){
      if (this.putRecordForm.id == null) {
        this.$notify({ type: 'success', message: '请先保存数据之后再确定提交申请' });
      } else {
        var id = this.putRecordForm.id;
      this.submitPutRecordForm();
      var that = this;
      setTimeout(function() {
        var id = that.putRecordForm.id;
        const requestMapping = this.requestMapping;
        this.$dialog.confirm({
        that.$dialog.confirm({
          message: '提交后案件将进入后续流程并且不能修改,是否确认提交?',
        }).then(function () {
          return request({
@@ -3248,13 +3407,14 @@ export default {
            method: 'post',
          });
        }).then(() => {
          this.submitPutRecordForm();
          that.$notify({ type: 'success', message: '提交成功' });
          history.back(-1);
        })
      }
      },2000)
    },

    /** 案件取证提交按钮 */
    submitEvidenceForm() {
    submitEvidenceForm(type) {
      this.surveyDiglogStatus = false;
      this.tEnforceEvidenceHandlerList.map(res=>{
        res.relationType = '4';
@@ -3271,34 +3431,37 @@ export default {
            res.attachement = res.attachement.join(',');
          }
        })

      if (this.evidenceForm.id != null) {
        this.surveyDiglogStatus = true;
        updateEvidence(this.evidenceForm).then(response => {
          this.$notify({ type: 'success', message: '提交成功' });
          this.surveyDiglogStatus = false;

          history.back(-1);
          if (type == 'submit'){
            this.$notify({ type: 'success', message: '保存成功' });
            history.back(-1);
          }
        });
      } else {
        this.surveyDiglogStatus = true;
        addEvidence(this.evidenceForm).then(response => {
          this.$notify({ type: 'success', message: '提交成功' });
          this.evidenceForm.id = response.data;
          this.surveyDiglogStatus = false;

          history.back(-1);
          if (type == 'submit'){
            this.$notify({ type: 'success', message: '保存成功' });
            history.back(-1);
          }
        });
      }
    },

    /** 弹窗确定按钮操作 */
    submitDefineEvidenceForm() {
      if (this.evidenceForm.id == null) {
        this.$notify({ type: 'success', message: '请先保存数据之后再确定提交申请' });
      } else {
        var id = this.evidenceForm.id;
        const requestMapping = this.requestMapping;
        this.$dialog.confirm({
      this.submitEvidenceForm();
      var that = this;
      setTimeout(function(){
        var id = that.evidenceForm.id;
        const requestMapping = that.requestMapping;
        that.$dialog.confirm({
          message: '提交后案件将进入后续流程并且不能修改,是否确认提交?',
        }).then(function () {
          return request({
@@ -3306,9 +3469,10 @@ export default {
            method: 'post',
          });
        }).then(() => {
          this.submitEvidenceForm();
          that.$notify({ type: 'success', message: '提交成功' });
          history.back(-1);
        })
      }
      },2000)
    },

    afterRead(file) {
@@ -3421,6 +3585,7 @@ export default {
      // 监听路由变化, 实现类似 小程序的 onShow 事件
      if (to.path === '/lawEnforcement/taskHandle') {
        // do anything you want
        console.log(this.tEnforcePutRecordHandlerList)
        if (Cookies.get('enforcer')){
          console.log(this.enforceType)
          JSON.parse(Cookies.get('enforcer')).map((res,index)=>{
--- a/src/views/lawEnforcement/task/taskHandleProcessing.vue
+++ b/src/views/lawEnforcement/task/taskHandleProcessing.vue
--- a/src/views/lawEnforcement/task/taskRecord.vue
+++ b/src/views/lawEnforcement/task/taskRecord.vue
@@ -56,7 +56,7 @@
        let queryParams = {
          caseId:this.$route.query.id,
          relationType:this.$route.query.relationType,
          clockin_user:this.$route.query.clockin_user
          clockinUser:this.$route.query.clockin_user
        }
        clockinList(queryParams).then((response) => {
          this.clockinList = response.rows;
--- a/src/views/lawEnforcement/trace/feed.vue
+++ b/src/views/lawEnforcement/trace/feed.vue
@@ -15,7 +15,10 @@
        <van-field v-model="queryParams.productName" :border="false" label="产品通用名称" placeholder="请输入产品通用名称" input-align="right" />
      </div>

      <p class="submitButton" @click="getList('search')">立即查询</p>
      <div class="submitButton">
        <p @click="getList('search')">立即查询</p>
        <p @click="clearSearch">重置</p>
      </div>

      <div class="scroll_box">
        <van-list
@@ -100,6 +103,9 @@
          }
        });
      },
      clearSearch(){
        location.reload()
      }
    },
  }
 </script>
@@ -201,14 +207,18 @@
    }
  }
  .submitButton{
    width: 70%;
    margin: 25PX auto;
    background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
    text-align: center;
    color: #ffffff;
    height: 70px;
    line-height: 70px;
    border-radius: 8PX;
    margin: 50px auto;
    display: flex;
    justify-content: space-around;
    p{
      width: 40%;
      background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
      text-align: center;
      color: #ffffff;
      height: 70px;
      line-height: 70px;
      border-radius: 8PX;
    }
  }

  .addFamily{
--- a/src/views/lawEnforcement/trace/fertilizer.vue
+++ b/src/views/lawEnforcement/trace/fertilizer.vue
@@ -15,7 +15,10 @@
        <van-field v-model="queryParams.productGoodsName" :border="false" label="产品商品名称" placeholder="请输入产品商品名称" input-align="right" />
      </div>

      <p class="submitButton" @click="getList('search')">立即查询</p>
      <div class="submitButton">
        <p @click="getList('search')">立即查询</p>
        <p @click="clearSearch">重置</p>
      </div>

      <div class="scroll_box">
        <van-list
@@ -106,6 +109,9 @@
          }
        });
      },
      clearSearch(){
        location.reload()
      }
    },
  }
 </script>
@@ -294,14 +300,18 @@
    }
  }
  .submitButton{
    width: 70%;
    margin: 25PX auto;
    background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
    text-align: center;
    color: #ffffff;
    height: 70px;
    line-height: 70px;
    border-radius: 8PX;
    margin: 50px auto;
    display: flex;
    justify-content: space-around;
    p{
      width: 40%;
      background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
      text-align: center;
      color: #ffffff;
      height: 70px;
      line-height: 70px;
      border-radius: 8PX;
    }
  }

  .addFamily{
--- a/src/views/lawEnforcement/trace/pesticides.vue
+++ b/src/views/lawEnforcement/trace/pesticides.vue
@@ -54,7 +54,11 @@
        />
      </div>

      <p class="submitButton" @click="getList('search')">立即查询</p>
      <div class="submitButton">
        <p @click="getList('search')">立即查询</p>
        <p @click="clearSearch">重置</p>
      </div>

      <div class="scroll_box">
        <van-list
          v-model="loading"
@@ -171,6 +175,9 @@
        this.queryParams.agent = data.value;
        this.showAgent = false;
      },
      clearSearch(){
        location.reload()
      }
    },
  }
 </script>
@@ -360,14 +367,18 @@
    }
  }
  .submitButton{
    width: 70%;
    margin: 50px auto;
    background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
    text-align: center;
    color: #ffffff;
    height: 70px;
    line-height: 70px;
    border-radius: 8PX;
    display: flex;
    justify-content: space-around;
    p{
      width: 40%;
      background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
      text-align: center;
      color: #ffffff;
      height: 70px;
      line-height: 70px;
      border-radius: 8PX;
    }
  }
  .scroll_box{
    height: calc(100vh - 100px - 200PX - 100PX);
--- a/src/views/lawEnforcement/trace/product.vue
+++ b/src/views/lawEnforcement/trace/product.vue
@@ -9,13 +9,16 @@
    <div class="main">

      <div class="main_box">
        <van-field v-model="value" :border="false" label="证书编号" placeholder="请输入证书编号" input-align="right" />
        <van-field v-model="value" :border="false" label="产品名称" placeholder="请输入产品名称" input-align="right" />
        <van-field v-model="value" :border="false" label="产品类别" placeholder="请输入产品类别" input-align="right" />
        <van-field v-model="value" :border="false" label="农产品类型" placeholder="请输入农产品类型" input-align="right" />
        <van-field v-model="queryParams.recordCode" :border="false" label="证书编号" placeholder="请输入证书编号" input-align="right" />
        <van-field v-model="queryParams.productGoodsName" :border="false" label="产品名称" placeholder="请输入产品名称" input-align="right" />
        <van-field v-model="queryParams.factory" :border="false" label="生产厂家" placeholder="请输入生产厂家" input-align="right" />
        <van-field v-model="queryParams.productName" :border="false" label="通用名称" placeholder="请输入通用名称" input-align="right" />
      </div>

      <p class="submitButton" @click="getList('search')">立即查询</p>
      <div class="submitButton">
        <p @click="getList('search')">立即查询</p>
        <p @click="clearSearch">重置</p>
      </div>

      <div class="scroll_box">
        <van-list
@@ -105,11 +108,8 @@
          }
        });
      },
      goSubmit(){
        this.list = [];
        this.queryParams.pageNum = 1 ;
        this.finished = false;
        this.loading = false;
      clearSearch(){
        location.reload()
      }
    },
  }
@@ -212,14 +212,18 @@
    }
  }
  .submitButton{
    width: 70%;
    margin: 25PX auto;
    background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
    text-align: center;
    color: #ffffff;
    height: 70px;
    line-height: 70px;
    border-radius: 8PX;
    margin: 50px auto;
    display: flex;
    justify-content: space-around;
    p{
      width: 40%;
      background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
      text-align: center;
      color: #ffffff;
      height: 70px;
      line-height: 70px;
      border-radius: 8PX;
    }
  }

  .addFamily{
--- a/src/views/lawEnforcement/trace/seed.vue
+++ b/src/views/lawEnforcement/trace/seed.vue
@@ -15,7 +15,10 @@
        <van-field v-model="queryParams.recordOrg" :border="false" label="审定登记单位" placeholder="请输入审定登记单位" input-align="right" />
      </div>

      <p class="submitButton" @click="getList('search')">立即查询</p>
      <div class="submitButton">
        <p @click="getList('search')">立即查询</p>
        <p @click="clearSearch">重置</p>
      </div>

      <div class="scroll_box">
        <van-list
@@ -101,11 +104,8 @@
          }
        });
      },
      goSubmit(){
        this.list = [];
        this.queryParams.pageNum = 1 ;
        this.finished = false;
        this.loading = false;
      clearSearch(){
        location.reload()
      }
    },
  }
@@ -196,14 +196,18 @@
    }
  }
  .submitButton{
    width: 70%;
    margin: 25PX auto;
    background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
    text-align: center;
    color: #ffffff;
    height: 70px;
    line-height: 70px;
    border-radius: 8PX;
    margin: 50px auto;
    display: flex;
    justify-content: space-around;
    p{
      width: 40%;
      background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
      text-align: center;
      color: #ffffff;
      height: 70px;
      line-height: 70px;
      border-radius: 8PX;
    }
  }
  /deep/.van-cell__title{
    .tt{
--- a/src/views/lawEnforcement/trace/veterinary.vue
+++ b/src/views/lawEnforcement/trace/veterinary.vue
@@ -15,7 +15,10 @@
        <van-field v-model="queryParams.productName" :border="false" label="产品通用名称" placeholder="请输入产品通用名称" input-align="right" />
      </div>

      <p class="submitButton" @click="getList('search')">立即查询</p>
      <div class="submitButton">
        <p @click="getList('search')">立即查询</p>
        <p @click="clearSearch">重置</p>
      </div>

      <div class="scroll_box">
        <van-list
@@ -100,6 +103,9 @@
          }
        });
      },
      clearSearch(){
        location.reload()
      }
    },
  }
 </script>
@@ -196,14 +202,18 @@
    }
  }
  .submitButton{
    width: 70%;
    margin: 25PX auto;
    background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
    text-align: center;
    color: #ffffff;
    height: 70px;
    line-height: 70px;
    border-radius: 8PX;
    margin: 50px auto;
    display: flex;
    justify-content: space-around;
    p{
      width: 40%;
      background-image: linear-gradient(to right, #2E79E9 , #77A6EF);
      text-align: center;
      color: #ffffff;
      height: 70px;
      line-height: 70px;
      border-radius: 8PX;
    }
  }

  .addFamily{
--- a/src/views/lawEnforcement/user/waitingProcessing.vue
+++ b/src/views/lawEnforcement/user/waitingProcessing.vue
@@ -1,12 +1,9 @@
 <template>
  <div class="app-container">
    <van-nav-bar
      title="待办事项"
      fixed
      placeholder
      left-arrow
      @click-left="onClickLeft"
    />
    <div class="header_main">
      待办事项
      <div class="return_btn" @click="onClickLeft"></div>
    </div>

    <van-tabs>
      <van-tab title="待办事项">
@@ -25,15 +22,15 @@
            <van-cell
              v-for="(item,index) in taskList"
              :key="index"
              :value="item.formData.createTime == null ? '' : item.formData.createTime.substr(5,5)"
              :value="item.formData.createTime == null ? '' : item.createTime.substr(0,10)"
              :to="{
            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:'',
              type:'waiting'
            }
          }"
                name:item.formData.activityBusinessType == '21' ? 'schemeDetail':'lawEnforcementTaskHandleProcessing',
                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:'',
                  type:'waiting'
                }
              }"
            >
              <template #title>
                <span class="tap">{{selectDictLabel(activityBusinessTypeOptions,item.formData.activityBusinessType).substr(2,2)}}</span>
@@ -60,14 +57,14 @@
            <van-cell
              v-for="(item,index) in taskDoneList"
              :key="index"
              :value="item.formData.createTime == null ? '' : item.formData.createTime.substr(5,5)"
              :value="item.formData.createTime == null ? '' : item.endTime.substr(0,10)"
              :to="{
            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:'',
            }
          }"
                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:'',
                }
              }"
            >
              <template #title>
                <span class="tap">{{selectDictLabel(activityBusinessTypeOptions,item.formData.activityBusinessType).substr(2,2)}}</span>
@@ -79,8 +76,6 @@
        </van-list>
      </van-tab>
    </van-tabs>


  </div>
 </template>
 <script>
@@ -122,9 +117,9 @@ export default {
        taskId: null,
        taskName: null,
        systemType: 26,
        orderByColumn: "A.ID_",
        activityBusinessType:'',
        isAsc:''
        orderByColumn: "A.CREATE_TIME_",
        isAsc: "desc",
      },
      // 查询参数
      queryParams: {
@@ -133,9 +128,9 @@ export default {
        taskId: null,
        taskName: null,
        systemType: 26,
        orderByColumn: "A.ID_",
        activityBusinessType:'',
        isAsc:''
        orderByColumn: "A.END_TIME_",
        isAsc: "desc",
      },
      //新闻集合
      workList:[],
@@ -180,21 +175,20 @@ export default {
        url: "/activiti/process/taskList",
        method: "get",
        params: this.queryParamsTask,
      })
        .then((response) => {
          console.log(response)
          for (var i = 0; i < response.rows.length; i++) {
            this.taskList.push(response.rows[i]);
          }
          if(this.taskList.length >= response.total ){
            this.finished = true;
            return;
          }
          this.queryParamsTask.pageNum += 1 ;
          this.loading = false;
        })
        .then(() => {
        });
      }).then((response) => {
        console.log(response)
        for (var i = 0; i < response.rows.length; i++) {
          this.taskList.push(response.rows[i]);
        }
        if(this.taskList.length >= response.total ){
          this.finished = true;
          return;
        }
        this.queryParamsTask.pageNum += 1 ;
        this.loading = false;
      }).then(() => {

      });
    },
    getTaskDoneList(){
      this.doneLoading = true;
@@ -203,20 +197,20 @@ export default {
        method: "get",
        params: this.queryParams,
      })
        .then((response) => {
          for (var i = 0; i < response.rows.length; i++) {
            this.taskDoneList.push(response.rows[i]);
          }
          console.log(this.taskDoneList.length >= response.total)
          if(this.taskDoneList.length >= response.total ){
            this.doneFinished = true;
            return;
          }
          this.queryParams.pageNum += 1 ;
          this.doneLoading = false;
        })
        .then(() => {
        });
      .then((response) => {
        for (var i = 0; i < response.rows.length; i++) {
          this.taskDoneList.push(response.rows[i]);
        }
        console.log(this.taskDoneList.length >= response.total)
        if(this.taskDoneList.length >= response.total ){
          this.doneFinished = true;
          return;
        }
        this.queryParams.pageNum += 1 ;
        this.doneLoading = false;
      })
      .then(() => {
      });
    },
    getListchange(type){
      if(type == 'db'){
@@ -240,6 +234,41 @@ export default {
  font-family: SourceHanSansCNBold;
  src: url("../../../assets/fonts/SourceHanSansCN-Bold.otf");
 }
 .jg{
  height: 180PX;
 }
 .header_main{
  /*height: 116px;*/
  background: url('../../../../static/images/lawEnforcement/new/header_bg.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;
  }
 }
 .van-list{
  width: 96%;
  margin: 0 auto;
--- a/src/views/lawEnforcement/userNew/user_new.vue
+++ b/src/views/lawEnforcement/userNew/user_new.vue
@@ -106,7 +106,7 @@ export default {
        console.log(response);
        Cookies.remove("User-Token");
        this.$router.push({
          path: '/lawEnforcement'
          path: '/lawEnforcement/login'
        })
      });
    },
--- a/src/views/newBusinessEntity/conter.vue
+++ b/src/views/newBusinessEntity/conter.vue
@@ -0,0 +1,68 @@
 <template>
  <div class="fotter">
    <router-view />

    <van-tabbar route active-color="#33db89" @change="onChange" class="aa">
      <van-tabbar-item to="/newBusinessEntity/index">
        <span>全部</span>
        <template #icon="props">
          <img src="../../assets/images/Newbusinessentity/001_03.jpg" />
        </template>
      </van-tabbar-item>
      <van-tabbar-item to="/newBusinessEntity/index">
   
        <template >
          <img src="../../assets/images/Newbusinessentity/001_05.jpg" />
        </template>
        <p>供求</p>
      </van-tabbar-item>


      <!-- <van-tabbar-item replace to="">
        供求
        <template #icon="props">
          <img :src="props.active ? '../../assets/images/Newbusinessentity/001_05.jpg' : '../../assets/images/Newbusinessentity/001_05.jpg'" />
        </template>
      </van-tabbar-item> -->
      <!-- <van-tabbar-item replace to="/newBusinessEntity/index" icon="home-o">全部</van-tabbar-item> -->
      <!-- <van-tabbar-item replace to="/search" icon="search">供求</van-tabbar-item> -->
      <van-tabbar-item replace to="/newBusinessEntity/login" icon="search"
        >我的</van-tabbar-item
      >
    </van-tabbar>
  </div>
 </template>
 <script>

 export default {
  name: "conter",
  data() {
    return {
      active: 0,
      icon: {
        active: "../../assets/images/Newbusinessentity/001_03.jpg",
        inactive: "https://img01.yzcdn.cn/vant/user-inactive.png",
      },
    };
  },
  methods: {
    onChange(index) {
      this.active = index;
    },
  },
 };
 </script>
 <style scoped lang="scss">
 .fotter {
  position: relative;
  height: 0.1rem;
 }
 .aa {
  position: absolute;
 }

 .van-tabbar-item__text{
  display: flex;
  flex-direction:column;
 }
 </style>
--- a/src/views/newBusinessEntity/index.vue
+++ b/src/views/newBusinessEntity/index.vue
@@ -0,0 +1,496 @@
 <template>
  <div class="app-container">
    <div class="box">
      <div class="app_top">
        <div class="topa">
          <div class="appa-left">
            <span>></span>
            <span>张的村</span>
          </div>

          <div class="appa_middeo">
            <div>
              <input type="text" class="serch" />
              <img
                src="../../assets/images/Newbusinessentity/0_03.png"
                alt=""
                class="serchimgs"
              />
            </div>
          </div>
          <div class="appa_right">
            <img src="../../assets/images/Newbusinessentity/0_02.png" alt="" />
          </div>
        </div>
        <div class="topb">
          <div class="namesa">您好，王海明</div>
          <div class="Serviceeva">经营主体掌上服务平台</div>
        </div>
        <div class="topc">
          <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
            <van-swipe-item>1</van-swipe-item>
            <van-swipe-item>2</van-swipe-item>
            <van-swipe-item>3</van-swipe-item>
            <van-swipe-item>4</van-swipe-item>
          </van-swipe>
        </div>
      </div>
      <div class="middle">
        <ul class="local-nav">
          <li
            @click="
              $router.push(
                {
                  name: 'newsBulletin',
                },
                () => {},
                () => {}
              )
            "
          >
            <!-- <a href="#"> -->
              <span class="local-nav-icon1 local-nav-icon">
                <img src="../../assets/images/Newbusinessentity/2.jpg" alt="" />
              </span>
              <span class="news">新闻公告</span>
            <!-- </a> -->
          </li>
          <li>
            <a href="#">
              <span class="local-nav-icon2 local-nav-icon">
                <img src="../../assets/images/Newbusinessentity/7.png" alt="" />
              </span>
              <span class="news">项目指南</span>
            </a>
          </li>
          <li>
            <a href="#">
              <span class="local-nav-icon3 local-nav-icon">
                <img
                  src="../../assets/images/Newbusinessentity/book_icon_214994.png"
                  alt=""
                />
              </span>
              <span class="news">政策法规</span>
            </a>
          </li>
          <li
            @click="
              $router.push(
                {
                  name: 'newBusinlistBody',
                },
                () => {},
                () => {}
              )
            "
          >
            <!-- <a href="#"> -->
            <span class="local-nav-icon4 local-nav-icon">
              <img
                src="../../assets/images/Newbusinessentity/box_icon_214997.png"
                alt=""
              />
            </span>
            <span class="news">主体名录</span>
            <!-- </a> -->
          </li>
          <li>
            <a href="#">
              <span class="local-nav-icon5 local-nav-icon">
                <img
                  src="../../assets/images/Newbusinessentity/card_credit_icon_214769.png"
                  alt=""
                />
              </span>
              <span class="news">金融服务</span>
            </a>
          </li>
          <li>
            <a href="#">
              <span class="local-nav-icon6 local-nav-icon">
                <img
                  src="../../assets/images/Newbusinessentity/dashboard_icon_2148461.png"
                  alt=""
                />
              </span>
              <span class="news">农技服务</span>
            </a>
          </li>
          <li>
            <a href="#">
              <span class="local-nav-icon7 local-nav-icon">
                <img
                  src="../../assets/images/Newbusinessentity/66_03.jpg"
                  alt=""
                />
              </span>
              <span class="news">价格看板</span>
            </a>
          </li>
          <li>
            <a href="#">
              <span class="local-nav-icon8 local-nav-icon">
                <img
                  src="../../assets/images/Newbusinessentity/cube_icon_2150142.png"
                  alt=""
                />
              </span>
              <span class="news">培训活动</span>
            </a>
          </li>
        </ul>
      </div>
      <div class="bottom">
        <div class="bttoma">
          <div class="latestnews">最新资讯</div>
          <div class="more">更多</div>
        </div>
        <div class="bottomb">
          <ul class="content">
            <li>
              <a href="#">
                <span class="content-icon"></span>
                <span class="Agricultural">农业服务App上线通知！</span>
                <span class="Comprehensive"
                  >新型经营主体综合服务APP今日上线</span
                >
              </a>
            </li>
            <li>
              <a href="#">
                <span class="content-icon"></span>
                <span class="Agricultural">农业服务App上线通知！</span>
                <span class="Comprehensive"
                  >新型经营主体综合服务APP今日上线</span
                >
              </a>
            </li>
            <li>
              <a href="#">
                <span class="content-icon"></span>
                <span class="Agricultural">农业服务App上线通知！</span>
                <span class="Comprehensive"
                  >新型经营主体综合服务APP今日上线</span
                >
              </a>
            </li>
            <li>
              <a href="#">
                <span class="content-icon"></span>
                <span class="Agricultural">农业服务App上线通知！</span>
                <span class="Comprehensive"
                  >新型经营主体综合服务APP今日上线</span
                >
              </a>
            </li>
          </ul>
        </div>
      </div>
      <!-- <div class="fotter">
        <van-tabbar v-model="active" class="aa">
          <van-tabbar-item name="home" icon="home-o">全部</van-tabbar-item>
          <van-tabbar-item name="search" icon="search">供求</van-tabbar-item>
          <van-tabbar-item name="friends" icon="friends-o">我的</van-tabbar-item>
        </van-tabbar>
      </div> -->
      <tabbar></tabbar>
    </div>
  </div>
 </template>
 <script>
 import tabbar from "./conter.vue";
 export default {
  components: {
    tabbar,
  },
  data() {
    return {
      active: 0,
    };
  },
  methods: {
    backHistory() {
      this.$router.go(-1);
    },
  },
 };
 </script>

 <style scoped lang="scss">
 .box {
  width: 100%;
 }
 .app_top {
  position: relative;
  background: red;
  width: 100%;
  height: 6.5rem;
  overflow: hidden;
  background: url("../../assets/images/Newbusinessentity/0_01.jpg") no-repeat;

  .topa {
    width: 100%;
    display: flex;
    justify-content: space-between;
    margin-top: 0.3rem;

    .appa-left {
      height: 0.8rem;
      background: 3rem;
      margin-left: 0.2rem;
      color: white;
      line-height: 0.7rem;
    }
    .appa_right {
      margin-top: 0.2rem;
      margin-right: 0.5rem;
    }
  }

  .topb {
    .namesa {
      font-size: 0.4rem;
      margin: 0.4rem 0 0.3rem 0.2rem;
      font-weight: bold;
    }
    .Serviceeva {
      font-weight: normal;
      font-size: 0.34rem;
      margin-left: 0.2rem;
    }
  }
  .topc {
    width: 8.5rem;
    height: 3.3rem;
    position: absolute;

    border-radius: 0.3rem;
    bottom: 0.2rem;
    left: 0.8rem;
    .my-swipe .van-swipe-item[data-v-768abd1c] {
      margin-top: 0.2rem;
      line-height: 3rem;
      border-radius: 0.3rem;
    }
  }
 }
 .appa_middeo {
  position: relative;
  .serch {
    background: white;
    width: 6rem;
    height: 0.8rem;
    border-radius: 5rem;
  }
  .serchimgs {
    position: absolute;
    left: 0.5rem;
    top: 0.2rem;
  }
 }
 .my-swipe .van-swipe-item {
  color: #fff;
  font-size: 20px;
  line-height: 150px;
  text-align: center;
  background-color: #45d385;
 }

 .middle {
  width: 8.5rem;
  height: 4rem;
  // background: red;
  margin: 0 auto;

  .local-nav {
    display: flex;
    flex-wrap: wrap;

    li {
      text-align: center;
      margin: 0 auto;
      flex: 23%;
      display: block;
      width: 2rem;
      height: 2rem;
      // background: blue;
      .local-nav-icon {
        position: relative;
        display: block;
        width: 1.3rem;
        height: 1.3rem;
        background-size: 1.3rem;
        margin-left: 0.4rem;
      }
      .local-nav-icon1 {
        // position: relative;
        // display: block;
        // width: 1.3rem;
        // height: 1.3rem;
        background: url("../../assets/images/Newbusinessentity/1.png") no-repeat;
        // background-size: 1.3rem;
        // margin-left: 0.4rem;
        // img {
        //   position: absolute;
        //   top: 0.3rem;
        //   left: 0.3rem;
        // }
        img {
          position: absolute;
          top: 0.3rem;
          left: 0.3rem;
        }
      }
      .local-nav-icon2 {
        background: url("../../assets/images/Newbusinessentity/1731.png")
          no-repeat;

        img {
          position: absolute;
          top: 0.13rem;
          right: 0.13rem;
        }
      }

      .local-nav-icon3 {
        background: url("../../assets/images/Newbusinessentity/17312.png")
          no-repeat;

        img {
          position: absolute;
          top: 0.13rem;
          right: 0.13rem;
        }
      }
      .local-nav-icon4 {
        background: url("../../assets/images/Newbusinessentity/17313.png")
          no-repeat;

        img {
          position: absolute;
          top: 0.13rem;
          right: 0.13rem;
        }
      }
      .local-nav-icon5 {
        background: url("../../assets/images/Newbusinessentity/17314.png")
          no-repeat;

        img {
          position: absolute;
          top: 0.19rem;
          right: 0.07rem;
        }
      }

      .local-nav-icon6 {
        background: url("../../assets/images/Newbusinessentity/17315.png")
          no-repeat;

        img {
          position: absolute;
          top: 0.13rem;
          right: 0.13rem;
        }
      }

      .local-nav-icon7 {
        background: url("../../assets/images/Newbusinessentity/17316.png")
          no-repeat;

        img {
          position: absolute;
          top: 0.25rem;
          right: 0.28rem;
        }
      }
      .local-nav-icon8 {
        background: url("../../assets/images/Newbusinessentity/17317.png")
          no-repeat;

        img {
          position: absolute;
          top: 0.17rem;
          right: 0.17rem;
        }
      }

      .news {
        display: inline-block;
        font-size: 0.35rem;
        margin-top: 0.1rem;
        color: black;
      }
    }
  }
 }
 .bottom {
  width: 100%;
  height: 9.7rem;

  .bttoma {
    width: 8.5rem;
    height: 1.5rem;
    display: flex;
    justify-content: space-between;
    margin: 0 auto;

    .latestnews {
      font-size: 0.5rem;
      font-weight: bold;
      margin-left: 0.23rem;
    }
    .more {
      font-size: 0.32rem;
      color: #adadad;
      margin-top: 0.1rem;
      margin-right: 0.23rem;
    }
  }
 }
 .bottomb {
  width: 8.5rem;
  margin: 0 auto;

  .content {
    display: block;
    width: 8.5rem;
    display: flex;
    flex-wrap: wrap;

    li {
      width: 4rem;
      flex: 1;
    }
    .Agricultural {
      display: block;
      color: #000000;
      width: 4rem;
      font-size: 0.34rem;
      font-weight: normal;
    }
    .Comprehensive {
      display: block;
      width: 4rem;
      color: #7c7c7c;
    }
    .content-icon {
      display: block;
      width: 4.4rem;
      height: 2.3rem;
      background: url("../../assets/images/Newbusinessentity/3_03.jpg")
        no-repeat;
      background-size: 4rem;
    }
  }
 }
 .fotter {
  margin-top: 1rem;
 }
 // .aa{

 //   position: absolute;
 //     bottom: -0.8rem;
 // }
 </style>
--- a/src/views/newBusinessEntity/listBody.vue
+++ b/src/views/newBusinessEntity/listBody.vue
@@ -0,0 +1,309 @@
 <template>
  <div>
    <div class="box">
      <div class="top">
        <div class="topone">
          <van-icon name="arrow-left" class="leftarrow" @click="backHistory" />
          <span class="newsbull"> 主体名录 </span>
          <span
            class="icons"
            @click="
              $router.push(
                {
                  name: 'newBusinessbody',
                },
                () => {},
                () => {}
              )
            "
          ></span>
        </div>
      </div>
      <div class="content">
        <div class="contentone">
          <div class="comname">
            <div>
              <img
                src="../../assets/images/Newbusinessentity/07104301.png"
                alt=""
              />
            </div>
            <!-- 内容 -->
            <div class="comnameright">
              <span class="corporation">唐山市五四刘四有限公司</span>
              <div class="delname">
                <span class="Peopleicon"></span><span>刘永昌</span>
                <span class="delicon"></span><span>17762000000</span>
              </div>
              <div class="mainbusiness">
                主营业务：蔬菜种植、生猪肉、蔬菜供 应、禽畜蛋类...
              </div>
              <div class="establishedtime">成立时间：2022-3-3</div>
              <img
                src="../../assets/images/Newbusinessentity/133_03.jpg"
                alt=""
                class="sprita"
              />
            </div>
          </div>

          <div class="comname">
            <div>
              <img
                src="../../assets/images/Newbusinessentity/07104301.png"
                alt=""
              />
            </div>
            <!-- 内容 -->
            <div class="comnameright">
              <span class="corporation">唐山市五四刘四有限公司</span>
              <div class="delname">
                <span class="Peopleicon"></span><span>刘永昌</span>
                <span class="delicon"></span><span>17762000000</span>
              </div>
              <div class="mainbusiness">
                主营业务：蔬菜种植、生猪肉、蔬菜供 应、禽畜蛋类...
              </div>
              <div class="establishedtime">成立时间：2022-3-3</div>
              <img
                src="../../assets/images/Newbusinessentity/133_03.jpg"
                alt=""
                class="sprita"
              />
            </div>
          </div>

          <div class="comname">
            <div>
              <img
                src="../../assets/images/Newbusinessentity/07104301.png"
                alt=""
              />
            </div>
            <!-- 内容 -->
            <div class="comnameright">
              <span class="corporation">唐山市五四刘四有限公司</span>
              <div class="delname">
                <span class="Peopleicon"></span><span>刘永昌</span>
                <span class="delicon"></span><span>17762000000</span>
              </div>
              <div class="mainbusiness">
                主营业务：蔬菜种植、生猪肉、蔬菜供 应、禽畜蛋类...
              </div>
              <div class="establishedtime">成立时间：2022-3-3</div>
              <img
                src="../../assets/images/Newbusinessentity/133_03.jpg"
                alt=""
                class="sprita"
              />
            </div>
          </div>

          <div class="comname">
            <div>
              <img
                src="../../assets/images/Newbusinessentity/07104301.png"
                alt=""
              />
            </div>
            <!-- 内容 -->
            <div class="comnameright">
              <span class="corporation">唐山市五四刘四有限公司</span>
              <div class="delname">
                <span class="Peopleicon"></span><span>刘永昌</span>
                <span class="delicon"></span><span>17762000000</span>
              </div>
              <div class="mainbusiness">
                主营业务：蔬菜种植、生猪肉、蔬菜供 应、禽畜蛋类...
              </div>
              <div class="establishedtime">成立时间：2022-3-3</div>
              <img
                src="../../assets/images/Newbusinessentity/133_03.jpg"
                alt=""
                class="sprita"
              />
            </div>
          </div>

          <div class="comname">
            <div>
              <img
                src="../../assets/images/Newbusinessentity/07104301.png"
                alt=""
              />
            </div>
            <!-- 内容 -->
            <div class="comnameright">
              <span class="corporation">唐山市五四刘四有限公司</span>
              <div class="delname">
                <span class="Peopleicon"></span><span>刘永昌</span>
                <span class="delicon"></span><span>17762000000</span>
              </div>
              <div class="mainbusiness">
                主营业务：蔬菜种植、生猪肉、蔬菜供 应、禽畜蛋类...
              </div>
              <div class="establishedtime">成立时间：2022-3-3</div>
              <img
                src="../../assets/images/Newbusinessentity/133_03.jpg"
                alt=""
                class="sprita"
              />
            </div>
          </div>

          <div class="comname">
            <div>
              <img
                src="../../assets/images/Newbusinessentity/07104301.png"
                alt=""
              />
            </div>
            <!-- 内容 -->
            <div class="comnameright">
              <span class="corporation">唐山市五四刘四有限公司</span>
              <div class="delname">
                <span class="Peopleicon"></span><span>刘永昌</span>
                <span class="delicon"></span><span>17762000000</span>
              </div>
              <div class="mainbusiness">
                主营业务：蔬菜种植、生猪肉、蔬菜供 应、禽畜蛋类...
              </div>
              <div class="establishedtime">成立时间：2022-3-3</div>
              <img
                src="../../assets/images/Newbusinessentity/133_03.jpg"
                alt=""
                class="sprita"
              />
            </div>
          </div>
        </div>
      </div>
      <div class="fotter">
        <tabbar></tabbar>
      </div>
    </div>
  </div>
 </template>


 <script>
 import tabbar from "./conter.vue";
 export default {
  components: {
    tabbar,
  },
  data() {
    return {};
  },
  methods: {
    backHistory() {
      this.$router.go(-1);
    },
  },
 };
 </script>
 <style scoped lang="scss">
 span,
 ul,
 li {
  display: block;
 }
 .top {
  width: 100%;
  height: 2.33rem;
  background: url("../../assets/images/Newbusinessentity/1_02_01.jpg") no-repeat;
  overflow: hidden;
  .topone {
    width: 100%;
    display: flex;
    justify-content: space-between;
    margin-top: 0.2rem;
    .leftarrow {
      color: #ffffff;
      font-size: 0.5rem;
      margin: 0.92rem 0 0rem 0.5rem;
      width: 0.5rem;
    }
    .newsbull {
      color: #ffffff;
      font-size: 0.5rem;
      font-weight: normal;
      margin: 0.8rem auto 0 3rem;
    }
    .icons {
      width: 0.5rem;
      height: 0.5rem;
      background: url("../../assets/images/Newbusinessentity/map_icon_150908.png")
        no-repeat;
      margin: 0.85rem 0.5rem 0.2rem 0.2rem;
    }
  }
 }
 .content {
  width: 100%;
  background: #f0f0f0;
  height: 18rem;
  overflow: hidden;
  .contentone {
    margin: 0 auto;
    width: 93%;
    height: 10rem;
    .comnameright {
      margin-left: 0.2rem;

      border-radius: 0.2rem;
    }
    .comname {
      width: 99%;
      display: flex;
      border-radius: 0.2rem;
      height: 3.31rem;
      background: #ffffff;
      margin-top: 0.5rem;
      .delname {
        display: flex;
        margin-top: 0.2rem;
      }
      .corporation {
        font-size: 0.4rem;
        font-weight: bold;
      }
      .Peopleicon {
        margin: 0.1rem 0.2rem 0.2rem 0rem;
        width: 0.3rem;
        height: 0.3rem;
        background: url("../../assets/images/Newbusinessentity/user_icon_2058202.png");
      }

      .delicon {
        margin: 0.1rem 0.2rem 0.2rem 0.6rem;
        width: 0.28rem;
        height: 0.3rem;
        background: url("../../assets/images/Newbusinessentity/phone-call-auricular-symbol-in-black_.png");
      }
      .mainbusiness {
        color: #326700;
        font-size: 0.35rem;
      }
      .establishedtime {
        font-size: 0.2rem;
        color: #8f8f8f;
        margin-top: 0.3rem;
      }
      .sprit {
        height: 0.3rem;
        width: 0.2rem;
      }
      .sprita {
        display: block;
        width: 0.8rem;
        height: 0.3rem;
        margin-left: 5rem;
      }
    }
  }
 }
 .fotter[data-v-40d35e05] {
  height: 1.2rem;
 }
 </style>
--- a/src/views/newBusinessEntity/login.vue
+++ b/src/views/newBusinessEntity/login.vue
@@ -0,0 +1,206 @@
 <template>
  <div>
    <div class="content">
      <div class="servrept">
        新型经济主体掌上<br />
        <span class="serc"> 综合服务平台</span>
      </div>
      <div class="contbottom">
        <div class="toggle">
          <button class="nolog">农户登录</button>
          <button class="qylog">企业登录</button>
        </div>
        <div class="register">
          <div class="usern">
            <span>用户名</span>
            <input type="text" class="username" placeholder="请输入用户名" />
          </div>
          <div class="passw">
            <span class="passhz">密码</span>
            <input type="text" class="password" placeholder="请输入密码" />
            <span class="qhpass">
              <img
                src="../../assets/images/Newbusinessentity/2_03.jpg"
                alt=""
              />
            </span>
          </div>
          <div class="loggoto">
            <button class="loggo">登录</button>
          </div>
          <div class="jumpreg">没有农户账号？点此 <a href="#"  @click="$router.push('./register')" >注册</a></div>
        </div>
    
      </div>
    </div>
    <tabbar class="fotter"></tabbar>
  </div>
 </template>
 <script>
 import tabbar from "./conter.vue";
 export default {
  components:{
      tabbar
  },
  data() {
    return {
      active: 0,
    };
  },
 };
 </script>
 <style scoped lang="scss">
 span,
 li,
 ul {
  display: block;
 }
 .content {
  position: relative;
  height: 21.2rem;
  width: 100%;
  background: url("../../assets/images/Newbusinessentity/333_01.jpg") no-repeat;
  background-size: 10.16rem;
  .servrept {
    font-size: 0.8rem;
    font-weight: bold;
    position: absolute;
    top: 1.7rem;
    left: 1.8rem;
  }
  .serc {
    margin-left: 0.8rem;
  }
  .contbottom {
    position: absolute;
    width: 8.7rem;
    height: 8rem;
    background: white;
    border-radius: 0.3rem;
    top: 10.6rem;
    left: 0.7rem;

    .register {
      height: 5rem;
      width: 7rem;
   
      position: absolute;
      top: 2rem;
      left: 0.9rem;
      //密码

      .passw {
        display: flex;
        position: relative;
        top: 0.6rem;
        background: #eeeeee;
        height: 0.8rem;
        width: 7rem;
        border-radius: 1rem;

        .passhz {
          position: absolute;
          left: 0.6rem;
          top: 0.14rem;
          color: #b0b0b0;
          font-size: 0.36rem;
        }
        .password {
          background: #eeeeee;
          position: absolute;
          left: 2rem;
          // background: pink;
          height: 0.8rem;
          width: 3rem;
          font-size: 0.36rem;
          color: #dbdbdb;
        }
        .qhpass {
          width: 0.5rem;
          height: 0.5rem;
          position: absolute;
          right: 0.3rem;
          top: 0.2rem;
        }
      }
      //用户名

      .usern {
        display: flex;
        position: relative;
        background: #eeeeee;
        height: 0.8rem;
        width: 7rem;
        border-radius: 1rem;
        span {
          position: absolute;
          left: 0.6rem;
          top: 0.14rem;
          color: #b0b0b0;
          font-size: 0.36rem;
        }
        .username {
          background: #eeeeee;
          position: absolute;
          left: 2rem;
          // background: pink;
          height: 0.8rem;
          width: 3rem;
          font-size: 0.36rem;
          color: #dbdbdb;
        }

        //密码
      }
    }
    .toggle {
      position: absolute;
      top: 0.5rem;
      left: 0.8rem;
      width: 7rem;
      height: 1.2rem;

      display: flex;
      justify-content: space-between;
      .nolog,
      .qylog {
        font-size: 0.4rem;
        font-weight: bold;
        background: #ffffff;
      }
    }
    .loggoto {
      position: relative;
      top: 1.4rem;
      .loggo {
        width: 5rem;
        height: 1rem;
        text-align: center;
        color: #ffffff;
        background: #41d25e;
        font-size: 0.4rem;
        position: absolute;
        left: 1rem;
        border-radius: 0.3rem;
      }
    }


    //跳转
    .jumpreg{
        position: relative;
        top: 2.8rem;
        left: 1.7rem;
        font-weight:normal;
        font-size: 0.32rem;
        a{
            color:#5bcc5b;
        }
    }
  }
 }
 .fotter{
    position: relative;
    height: 0.1rem;
 }
 </style>
--- a/src/views/newBusinessEntity/map.vue
+++ b/src/views/newBusinessEntity/map.vue
@@ -0,0 +1,214 @@
    <template>
  <div>
    <div class="box">
      <div class="top">
        <div class="topone">
          <van-icon name="arrow-left" @click="backHistory" class="arrowl" />
          <div class="weather">
            <span class="sun"></span>
            <span class="cleard">晴天</span>
            <span class="temperature">20～32℃</span>
          </div>
          <div class="province">
            <span>山东省</span>
            <span>烟台市</span>
            <span>莱州市</span>
            <van-icon name="arrow" class="arrowr" />
          </div>
        </div>
        <div class="search">
          <input type="text" class="serch" />
          <img
            src="../../assets/images/Newbusinessentity/0_03.png"
            alt=""
            class="serchimgs"
          />
        </div>
      </div>
      <div class="footer">
        <van-cell @click="showPopup">
          <van-tabs v-model="active">
            <van-tab title="农户"></van-tab>
            <van-tab title="新型经营主体"></van-tab>
            <van-tab title="经济人"></van-tab>
            <van-tab title="采购商"></van-tab>
          </van-tabs>
        </van-cell>
        <!-- //弹窗内容 -->
        <van-popup
          v-model="show"
          round
          position="bottom"
          :style="{ height: '80%' }"
        >
          <div>
            <!-- tab -->
            <van-tabs v-model="active" id="cc">
              <van-tab title="农户"></van-tab>
              <van-tab title="新型经营主体"></van-tab>
              <van-tab title="经济人"></van-tab>
              <van-tab title="采购商"></van-tab>
            </van-tabs>
            <!-- //搜索栏 -->
            <div class="searchtow">
              <input type="text" class="serchtow" />
              <img
                src="../../assets/images/Newbusinessentity/0_03.png"
                alt=""
                class="serchimgstow"
              />
            </div>
          </div>
          <div class="suoyin">
            <van-index-bar>
              <van-index-anchor index="A" />
              <van-cell title="安心超人有限公司" />
              <van-cell title="安心超人有限公司" />
              <van-cell title="安心超人有限公司" />

              <van-index-anchor index="B" />
              <van-cell title="百度心超人有限公司" />
              <van-cell title="百度心超人有限公司" />
              <van-cell title="百度心超人有限公司" />

              ...
            </van-index-bar>
          </div>
        </van-popup>
      </div>
    </div>
  </div>
 </template>
 <script>
 export default {
  data() {
    return {
      active: 2,
      show: false,
    };
  },
  methods: {
    showPopup() {
      this.show = true;
    },
    backHistory() {
      this.$router.go(-1);
    },
  },
 };
 </script>
 <style scoped lang="scss">
 span {
  display: block;
 }
 .top {
  overflow: hidden;
  width: 100%;
  height: 19.5rem;
  background: url("../../assets/images/Newbusinessentity/56_01.jpg");
  .topone {
    display: flex;
    justify-content: space-around;
    margin-top: 0.2rem;
    margin-top: 0.9rem;
    .weather {
      display: flex;
    }
    .sun {
      color: #696969;
      width: 0.3rem;
      height: 0.3rem;
      background: url("../../assets/images/Newbusinessentity/weather_forecast.png");
      margin: 0.25rem 0.2rem 0.2rem 0rem;
    }
    .temperature {
      margin: 0.2rem 0.2rem 0.2rem 0rem;
    }
    .cleard {
      margin: 0.2rem 0.2rem 0.2rem 0rem;
    }
    .province {
      display: flex;
      width: 3.9rem;
      height: 0.8rem;
      background: #45c182;
      color: #ffffff;
      border-radius: 0.3rem;
      font-size: 0.34rem;
      text-align: center;
      line-height: 0.8rem;
      .arrowr {
        font-size: 0.4rem;
        margin: 0.2rem 0 0 0.1rem;
      }
      span {
        height: 0.3rem;
        margin-left: 0.1rem;
      }
    }
    .arrowl {
      font-size: 0.5rem;
      font-weight: bold;
    }
  }
  .search {
    position: relative;
    height: 0.9rem;
    top: 0.5rem;
    left: 0.54rem;
  }
  .serch {
    background: white;
    width: 9rem;
    height: 0.8rem;
    border-radius: 5rem;
    text-indent: 1rem;
    // margin: 0.5rem 0.2rem 0.2rem 0.5rem;
  }
  .serchimgs {
    position: absolute;
    left: 0.5rem;
    top: 0.2rem;
  }
 }
 .footer {
  width: 100%;
  height: 2rem;
  background: url("../../assets/images/Newbusinessentity/1_02.jpg") no-repeat;
  overflow: hidden;
  .searchtow {
    position: relative;
    height: 0.9rem;
    left: 0.54rem;
    bottom: 1.1rem;
  }
  .serchtow {
    background: white;
    width: 9rem;
    height: 0.8rem;
    border-radius: 5rem;
    text-indent: 1rem;
    // margin: 0.5rem 0.2rem 0.2rem 0.5rem;
  }
  .serchimgstow {
    position: absolute;
    left: 0.5rem;
    top: 0.2rem;
    z-index: 20003;
  }
 }
 /deep/ .van-cell {
  background-color: rgba(110, 190, 125, 0.1) !important;
  padding: 0rem 0rem;
 }
 /deep/ .van-tabs__nav {
  background-color: rgba(110, 190, 125, 0.2) !important;
  margin-top: 0.3rem;
 }

 #cc {
  background-color: rgba(110, 190, 125, 0.7) !important;
  background: url("../../assets/images/Newbusinessentity/1_04_02.jpg") no-repeat;
  height: 2.7rem;
 }
 </style>
--- a/src/views/newBusinessEntity/newsBulletin.vue
+++ b/src/views/newBusinessEntity/newsBulletin.vue
@@ -0,0 +1,257 @@
 <template>
  <div>
    <div class="box">
      <div class="top">
        <div class="topone">
          <van-icon name="arrow-left" class="leftarrow" @click="backHistory" />
          <span class="newsbull"> 新闻公告 </span>
        </div>
        <div class="cut">
          <button class="notification" @click="notificationa">通知公告</button>
          <button class="newsdetails" @click="newsdetailsb">新闻详情</button>
        </div>
      </div>
      <div class="content" v-if="show">
        <div class="contents" @click="$router.push('./newsDetails') ">
          <img
            src="../../assets/images/Newbusinessentity/P_fw1200.png"
            alt=""
          />
          <div class="profitmniu">新疆：智慧养牛牛牛牛，利润一头抵五头</div>
          <div class="times">2022-3-3</div>
        </div>
        <div class="contents">
          <img
            src="../../assets/images/Newbusinessentity/P_fw1200.png"
            alt=""
          />
          <div class="profitmniu">新疆：智慧养牛牛牛牛，利润一头抵五头</div>
          <div class="times">2022-3-3</div>
        </div>
        <div class="contents">
          <img
            src="../../assets/images/Newbusinessentity/P_fw1200.png"
            alt=""
          />
          <div class="profitmniu">新疆：智慧养牛牛牛牛，利润一头抵五头</div>
          <div class="times">2022-3-3</div>
        </div>
        <div class="contents">
          <img
            src="../../assets/images/Newbusinessentity/P_fw1200.png"
            alt=""
          />
          <div class="profitmniu">新疆：智慧养牛牛牛牛，利润一头抵五头</div>
          <div class="times">2022-3-3</div>
        </div>
        <div class="contents">
          <img
            src="../../assets/images/Newbusinessentity/P_fw1200.png"
            alt=""
          />
          <div class="profitmniu">新疆：智慧养牛牛牛牛，利润一头抵五头</div>
          <div class="times">2022-3-3</div>
        </div>
        <div class="contents">
          <img
            src="../../assets/images/Newbusinessentity/P_fw1200.png"
            alt=""
          />
          <div class="profitmniu">新疆：智慧养牛牛牛牛，利润一头抵五头</div>
          <div class="times">2022-3-3</div>
        </div>
        <div class="contents">
          <img
            src="../../assets/images/Newbusinessentity/P_fw1200.png"
            alt=""
          />
          <div class="profitmniu">新疆：智慧养牛牛牛牛，利润一头抵五头</div>
          <div class="times">2022-3-3</div>
        </div>
        <div class="contents">
          <img
            src="../../assets/images/Newbusinessentity/P_fw1200.png"
            alt=""
          />
          <div class="profitmniu">新疆：智慧养牛牛牛牛，利润一头抵五头</div>
          <div class="times">2022-3-3</div>
        </div>
      </div>
      <div class="content contentb" v-else>
        <div class="contents">
          <img
            src="../../assets/images/Newbusinessentity/P_fw1200.png"
            alt=""
          />
          <div class="profitmniu">a新疆：智慧养牛牛牛牛，利润一头抵五头</div>
          <div class="times">2022-3-3</div>
        </div>
        <div class="contents">
          <img
            src="../../assets/images/Newbusinessentity/P_fw1200.png"
            alt=""
          />
          <div class="profitmniu">a新疆：智慧养牛牛牛牛，利润一头抵五头</div>
          <div class="times">2022-3-3</div>
        </div>
        <div class="contents">
          <img
            src="../../assets/images/Newbusinessentity/P_fw1200.png"
            alt=""
          />
          <div class="profitmniu">a新疆：智慧养牛牛牛牛，利润一头抵五头</div>
          <div class="times">2022-3-3</div>
        </div>
        <div class="contents">
          <img
            src="../../assets/images/Newbusinessentity/P_fw1200.png"
            alt=""
          />
          <div class="profitmniu">新疆：智慧养牛牛牛牛，利润一头抵五头</div>
          <div class="times">2022-3-3</div>
        </div>
        <div class="contents">
          <img
            src="../../assets/images/Newbusinessentity/P_fw1200.png"
            alt=""
          />
          <div class="profitmniu">新疆：智慧养牛牛牛牛，利润一头抵五头</div>
          <div class="times">2022-3-3</div>
        </div>
        <div class="contents">
          <img
            src="../../assets/images/Newbusinessentity/P_fw1200.png"
            alt=""
          />
          <div class="profitmniu">新疆：智慧养牛牛牛牛，利润一头抵五头</div>
          <div class="times">2022-3-3</div>
        </div>
        <div class="contents">
          <img
            src="../../assets/images/Newbusinessentity/P_fw1200.png"
            alt=""
          />
          <div class="profitmniu">新疆：智慧养牛牛牛牛，利润一头抵五头</div>
          <div class="times">2022-3-3</div>
        </div>
        <div class="contents">
          <img
            src="../../assets/images/Newbusinessentity/P_fw1200.png"
            alt=""
          />
          <div class="profitmniu">新疆：智慧养牛牛牛牛，利润一头抵五头</div>
          <div class="times">2022-3-3</div>
        </div>
      </div>
      <div class="fotter">
        <tabbar></tabbar>
      </div>
    </div>
  </div>
 </template>
   
 <script>
 import tabbar from "./conter.vue";
 export default {
  components: {
    tabbar,
  },
  data() {
    return {
      show: true,
    };
  },
  methods: {
    //通知公告
    notificationa() {
      if (this.show == true) {
        return this;
      } else {
        this.show = !this.show;
      }
    },
    newsdetailsb() {
      //新闻详情
      if (this.show == false) {
        return this;
      } else {
        this.show = !this.show;
      }
    },
    backHistory() {
      this.$router.go(-1);
    },
  },
 };
 </script>
 <style scoped lang="scss">
 span,
 li,
 ul {
  display: inline-block;
 }
 .top {
  width: 100%;
  height: 3.11rem;
  background: url("../../assets/images/Newbusinessentity/1_01.jpg") no-repeat;
  overflow: hidden;
  .topone {
    width: 100%;
    display: flex;
    margin-top: 0.2rem;
    .leftarrow {
      color: #ffffff;
      font-size: 0.5rem;
      margin: 0.8rem 0 0rem 0.5rem;
      width: 0.5rem;
    }
    .newsbull {
      color: #ffffff;
      font-size: 0.5rem;
      font-weight: normal;
      margin: 0.7rem auto 0 3rem;
    }
  }
  .cut {
    display: flex;
    justify-content: space-between;
    .notification,
    .newsdetails {
      color: #ffffff;
      font-size: 0.35rem;
      background: #c5e5cc;
      border-radius: 0.3rem;
      padding: 0.1rem 0.9rem 0.1rem 0.9rem;
    }
    .notification {
      margin: 0.5rem 0 0 0.7rem;
    }
    .newsdetails {
      margin: 0.5rem 0.6rem 0 0.7rem;
    }
  }
 }
 .content {
  width: 95%;
  height: 17.2rem;
  margin: 0 auto;
  overflow: hidden;
  .contents {
    display: flex;
    justify-content: space-around;
    margin-top: 0.4rem;

    .profitmniu {
      width: 3.8rem;
    }
    .times {
      height: 0.45rem;
      margin-top: 1.2rem;
      color: #8f8f8f;
    }
  }
 }
 .fotter[data-v-40d35e05] {
  height: 1.4rem;
 }
 </style>
--- a/src/views/newBusinessEntity/newsDetails.vue
+++ b/src/views/newBusinessEntity/newsDetails.vue
@@ -0,0 +1,159 @@
 <template>
  <div>
    <div class="box">
      <div class="top">
        <div class="topone">
          <van-icon name="arrow-left" class="leftarrow" @click="backHistory" />
          <span class="newsbull" > 新闻详情 </span>
        </div>
      </div>
      <div class="content">
        <div class="title">浩浩荡荡！新疆700万头牲畜开始春季转场</div>
        <div class="issuer">
          发布人: <span class="cctvnet">央视网</span>
          <span class="times">2022-3-15</span>
        </div>
        <div class="picture">
          <img
            src="../../assets/images/Newbusinessentity/t0181f315f1a4f87af1.png"
            alt=""
          />
        </div>
        <div class="particulars">
          转场，顾名思义就是啊啊牲畜在各个草之间迁徙转区的每户啊啊牧民都有属于自己的草场，根对对对数和不同，小的三亩，大的信
          转场，顾名思义就是啊啊牲畜在各个草之间迁徙转区的每户啊啊牧民都有属于自己的草场，根对对对数和不同，小的三亩，大的信
          转场，顾名思义就是啊啊牲畜在各个草之间迁徙转区的每户啊啊牧民都有属于自己的草场，根对对对数和不同，小的三亩，大的信
          转场，顾名思义就是啊啊牲畜在各个草之间迁徙转区的每户啊啊牧民都有属于自己的草场，根对对对数和不同，小的三亩，大的信
          转场，顾名思义就是啊啊牲畜在各个草之间迁徙转区的每户啊啊牧民都有属于自己的草场，根对对对数和不同，小的三亩，大的信
          转场，顾名思义就是啊啊牲畜在各个草之间迁徙转区的每户啊啊牧民都有属于自己的草场，根对对对数和不同，小的三亩，大的信
        </div>
      </div>
      <div class="accessory">
        <span class="download">附件下载</span>
        <div class="downloads">
          <div class="downloaddoc">
            <img
              src="../../assets/images/Newbusinessentity/189948.png"
              alt=""
            />
            <span>附件.doc</span>
          </div>
          <div class="downloadxls">
            <img
              src="../../assets/images/Newbusinessentity/189980.png"
              alt=""
            />
            <span>附件.xls</span>
          </div>
        </div>
      </div>
      <div class="fotter">
        <tabbar></tabbar>
      </div>
    </div>
  </div>
 </template>
 <script>
 import tabbar from "./conter.vue";
 export default {
  components: {
    tabbar,
  },
  data() {
      return{

      }
  },
  methods:{
    backHistory(){
        this.$router.go(-1)
    }
  }
 };
 </script>

 <style scoped lang="scss">
 span,
 li,
 ul {
  display: inline-block;
 }
 .top {
  width: 100%;
  height: 2.33rem;
  background: url("../../assets/images/Newbusinessentity/1_02_01.jpg") no-repeat;
  overflow: hidden;
  .topone {
    width: 100%;
    display: flex;
    margin-top: 0.2rem;
    .leftarrow {
      color: #ffffff;
      font-size: 0.5rem;
      margin: 0.92rem 0 0rem 0.5rem;
      width: 0.5rem;
    }
    .newsbull {
      color: #ffffff;
      font-size: 0.5rem;
      font-weight: normal;
      margin: 0.8rem auto 0 3.2rem;
    }
  }
 }
 .content {
  .title {
    font-size: 0.45rem;
    font-weight: bold;
    margin: 0.2rem 0.2rem 0.2rem 0.4rem;
  }
  .issuer {
    display: flex;
    margin-left: 0.4rem;
    color: #a1a1a1;
  }
  .cctvnet {
    margin-left: 0.2rem;
  }
  .times {
    margin-left: 0.6rem;
  }
  .picture {
    margin: 0.4rem 0.2rem 0.2rem 0.4rem;
  }
  .particulars {
    font-size: 0.2rem;
    height: 9rem;
    width: 9.1rem;
    margin: 0 auto;
    font-size: 0.37rem;
    text-indent: 0.8rem;
  }
 }
 .accessory {
  .download {
    font-size: 0.4rem;
    margin-left: 0.5rem;
  }
  .downloads {
    display: flex;
    margin: 0.6rem 0.2rem 0.2rem 0.6rem;
    .downloadxls {
      margin-left: 0.6rem;
    }
    .downloaddoc,
    .downloadxls {
      display: flex;
      flex-direction: column;

      img {
        width: 0.8rem;
        height: 0.8rem;
      }
    }
  }
 }
 .fotter[data-v-40d35e05] {
  height: 2.4rem;
 }
 </style>
--- a/src/views/newBusinessEntity/register.vue
+++ b/src/views/newBusinessEntity/register.vue
@@ -0,0 +1,365 @@
 <template>
  <div>
    <div class="box">
      <div class="list">
        <div class="regsit">
          <button class="noreg" @click="Agrireg">农户注册</button>
          <button class="qyreg" @click="busireg">企业注册</button>
        </div>
        <!-- 企业注册 -->
        <div class="show" v-if="show">
          <div class="frames frame">
            <i class="icona icona1"></i>
            <span>主体类别:</span>
            <input type="text" class="subject" />
            <i class="arrows"></i>
          </div>
          <div class="frames frame">
            <i class="icona icona2"></i>
            <span>主体名称:</span>
            <input type="text" class="subject" />
            <!-- <i class="arrows"></i> -->
          </div>
          <div class="frames frame">
            <i class="icona icona3"></i>
            <span>负责人姓名:</span>
            <input type="text" class="subject subjectname" />
            <!-- <i class="arrows"></i> -->
          </div>
          <div class="frames frame">
            <i class="icona icona4"></i>
            <span>手机号码:</span>
            <input type="text" class="subject" />
            <!-- <i class="arrows"></i> -->
          </div>
          <div class="frames frame">
            <i class="icona icona5"></i>
            <span>验证码:</span>
            <input type="text" class="subject" />
            <i class="verification">获取验证码</i>
          </div>
          <div class="frames frame">
            <i class="icona icona6"></i>
            <span>用户名</span>
            <input type="text" class="subject" />
            <!-- <i class="arrows"></i> -->
          </div>
          <div class="frames frame">
            <i class="icona icona7"></i>
            <span>密码</span>
            <input type="text" class="subject" />
            <i class="arrows showh1"></i>
          </div>
          <div class="frames frame">
            <i class="icona icona8"></i>
            <span>确认密码</span>
            <input type="text" class="subject" />
            <i class="arrows showh2"></i>
          </div>
        </div>
        <!-- 农业注册 -->
        <div class="show" v-else>
          <div class="frames frame">
            <i class="icona icona3"></i>
            <span>农户:</span>
            <input type="text" class="subject" />
            <i class="arrows"></i>
          </div>
          <div class="frames frame">
            <i class="icona icona9"></i>
            <span>身份证:</span>
            <input type="text" class="subject" />
            <!-- <i class="arrows"></i> -->
            <div></div>
          </div>

          <div class="frames frame">
            <i class="icona icona4"></i>
            <span>手机号码:</span>
            <input type="text" class="subject subjectname" />
            <!-- <i class="arrows"></i> -->
            <div class="verify">
              <i class="verimg"></i>
              <span class="fapeasant">非本地农户</span>
            </div>
          </div>

          <div class="frames frame">
            <i class="icona icona1"></i>
            <span>验证码:</span>
            <input type="text" class="subject" />
            <i class="verification">获取验证码</i>
          </div>
          <div class="frames frame">
            <i class="icona icona1"></i>
            <span>用户名:</span>
            <input type="text" class="subject" />
            <!-- <i class="arrows"></i> -->
          </div>
          <div class="frames frame">
            <i class="icona icona7"></i>
            <span>密码</span>
            <input type="text" class="subject" />
            <i class="arrows showh1"></i>
          </div>
          <div class="frames frame">
            <i class="icona icona8"></i>
            <span>确认密码</span>
            <input type="text" class="subject" />
            <i class="arrows showh2"></i>
          </div>
        </div>

        <div class="loggoto">
          <button class="loggo">登录</button>
        </div>
        <div class="jumpreg">
          <input type="radio" class="dx" />
          <span>我已阅读并同意</span>
          <a href="#">《隐私政策》</a>和 <a href="#">《用户协议》</a><br />
          <span class="texta">*登录后请完善基础信息成为正式用户</span>
        </div>
      </div>
     
    </div>
    <tabbar></tabbar>
  </div>
 </template>
 <script>
 import tabbar from "./conter.vue";
 export default {
    components:{
        tabbar
    },
  name: "index",
  data() {
    return {
      show: true,
    };
  },
  methods:{
    //农业注册
      Agrireg(){
            if(this.show==true){
                return this
            }else{
                this.show=!this.show
            }
      } ,
      //企业注册
      busireg(){
        if(this.show==false){
                return this
            }else{
                this.show=!this.show
            }
      }
  }
 };
 </script>
 <style scoped lang="scss">
 .box {
  width: 100%;
  background: url("../../assets/images/Newbusinessentity/bj_01.jpg") no-repeat;
  height: 21.2rem;
  overflow: hidden;
  position: relative;
  background-size: 10.2rem;
 }
 .list {
  width: 9rem;
  height: 18rem;
  background: #ffffff;
  border-radius: 1rem;
  margin: 1rem auto;
  position: relative;
  .regsit {
    position: absolute;
    top: 0.5rem;
    left: 0.8rem;
    width: 7rem;
    height: 1.2rem;

    display: flex;
    justify-content: space-between;
    .noreg,
    .qyreg {
      font-size: 0.4rem;
      font-weight: bold;
      background: #ffffff;
    }
    .noreg {
      margin-left: 0.7rem;
    }
  }
  .frame {
    position: relative;
    background: #eeeeee;
    border-radius: 1rem;
    margin-top: 0.5rem;
  }
  //校验农户注册
  .verify {
    width: 3rem;
    position: absolute;
    right: 0.2rem;
    top: 0.8rem;
    .verimg {
    display: block;
      width: 0.4rem;
      height: 0.4rem;
      background: url('../../assets/images/Newbusinessentity/08_03.jpg') no-repeat;
      margin: 0.24rem 0rem 0rem 0.5rem
    }
    .fapeasant{
        color: red;
        font-size: 0.2rem;
    }
  }
  .frames {
    display: flex;
    top: 2rem;
    left: 0.6rem;
    height: 1rem;
    width: 8rem;

    span {
      position: absolute;
      left: 0.9rem;
      top: 0.22rem;
      color: #b0b0b0;
      font-size: 0.36rem;
    }
    .subject {
      background: #eeeeee;
      position: absolute;
      left: 2.5rem;
      top: 0.1rem;
      // background: pink;
      height: 0.8rem;
      width: 3rem;
      font-size: 0.36rem;
      color: #dbdbdb;
    }
    .subjectname {
      left: 2.8rem;
    }
    .icona {
      width: 0.5rem;
      height: 0.5rem;

      position: absolute;
      top: 0.29rem;
      left: 0.3rem;
    }
    .icona1 {
      background: url("../../assets/images/Newbusinessentity/layers_icon_125237.png")
        no-repeat;
    }
    .icona2 {
      background: url("../../assets/images/Newbusinessentity/home_icon_128501.png")
        no-repeat;
    }
    .icona3 {
      background: url("../../assets/images/Newbusinessentity/user_icon_125113.png")
        no-repeat;
    }
    .icona4 {
      background: url("../../assets/images/Newbusinessentity/phone_handset_icon_125195.png")
        no-repeat;
    }
    .icona5 {
      background: url("../../assets/images/Newbusinessentity/shield_icon_125161.png")
        no-repeat;
    }
    .icona6 {
      background: url("../../assets/images/Newbusinessentity/user_icon_1251132.png")
        no-repeat;
    }
    .icona7 {
      background: url("../../assets/images/Newbusinessentity/lock_icon_1252253.png")
        no-repeat;
    }
    .icona8 {
      background: url("../../assets/images/Newbusinessentity/lock_icon_1252253.png")
        no-repeat;
    }

    //农业注册
    .icona9 {
      background: url("../../assets/images/Newbusinessentity/licencse_icon_125234.png")
        no-repeat;
    }

    .arrows {
      width: 0.5rem;
      height: 0.5rem;
      background: url("../../assets/images/Newbusinessentity/21563.png")
        no-repeat;
      position: absolute;
      top: 0.36rem;
      right: 0.3rem;
    }
    .showh1 {
      background: url("../../assets/images/Newbusinessentity/showh_03.jpg")
        no-repeat;
    }
    .showh2 {
      background: url("../../assets/images/Newbusinessentity/view_show_icon_1248113.png")
        no-repeat;
    }
    .verification {
      width: 2.7rem;
      height: 0.76rem;
      color: #ffffff;
      font-size: 0.2rem;
      background: #75c757;
      border-radius: 0.3rem;
      position: absolute;
      right: 0.2rem;
      top: 0.1rem;
      text-align: center;
      line-height: 0.76rem;
      font-size: 0.35rem;
    }
  }
  .loggoto {
    position: relative;
    top: 1.4rem;
    .loggo {
      width: 6rem;
      height: 1rem;
      text-align: center;
      color: #ffffff;
      background: #41d25e;
      font-size: 0.4rem;
      position: absolute;
      left: 1.7rem;
      top: 1.6rem;
      border-radius: 0.4rem;
    }
  }
  .jumpreg {
    position: relative;
    top: 4.5rem;
    left: 1.2rem;
    font-weight: normal;
    font-size: 0.32rem;
    color: #858585;

    overflow: hidden;
    a {
      color: #3096ff;
    }
    .dx {
      border: #5bcc5b 0.2rem solid;
      background: #5bcc5b;
      color: #5bcc5b;
    }
    .texta {
      display: block;
      margin: 0.3rem 0 0 0.6rem;
    }
  }
 }
 </style>
--- a/src/views/sunVillage_info/list_finance_add.vue
+++ b/src/views/sunVillage_info/list_finance_add.vue
@@ -131,6 +131,7 @@
      this.type = this.$route.query.type;
      this.queryParams.bookId = Cookies.get('bookId');
      this.queryParams.deptId = Cookies.get('deptId');
      this.form.openName = this.format(new Date(),'yyyy')+ '年' + (this.format(new Date(),'MM')-1) + '月财务公开';
    },
    methods: {
      onSubmit(){
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -9,6 +9,9 @@
      <template #title>
        <p style="font-weight: bold;">添加银行卡转账申请</p>
      </template>
      <template #right>
        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
      </template>
    </van-nav-bar>
    <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
      <p class="main_title">基础信息</p>
@@ -457,6 +460,13 @@

    },
    methods: {
      goFlow(){
        if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){
          window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode;
        }else{
            this.$notify({ type: 'danger', message: '无审批流程！' });
        }
      },
      getTemplateList(){
        let templateQueryParams = {
          // 分页
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd10.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd10.vue
@@ -9,6 +9,9 @@
      <template #title>
        <p style="font-weight: bold;">添加现金提现申请</p>
      </template>
      <template #right>
        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
      </template>
    </van-nav-bar>
    <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
      <p class="main_title">基础信息</p>
@@ -348,6 +351,13 @@
      this.addChargeItme();
    },
    methods: {
      goFlow(){
        if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){
          window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode;
        }else{
            this.$notify({ type: 'danger', message: '无审批流程！' });
        }
      },
      getNowDate(){
        var _this = this;
        let yy = new Date().getFullYear();
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue
@@ -9,6 +9,9 @@
      <template #title>
        <p style="font-weight: bold;">添加备付金支出申请</p>
      </template>
      <template #right>
        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
      </template>
    </van-nav-bar>
    <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
      <p class="main_title">基础信息</p>
@@ -378,6 +381,13 @@
      this.getTemplateList();
    },
    methods: {
      goFlow(){
        if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){
          window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode;
        }else{
            this.$notify({ type: 'danger', message: '无审批流程！' });
        }
      },
      getTemplateList(){
        let templateQueryParams = {
          // 分页