Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/permission.js

@@ -106,6 +106,7 @@ const whiteList = [
 
   //宅基地
   '/zjdLogin',
+  '/onlineHome/workbench',
 
   //阳光村务--新
   '/sunVillage_info/login',  //登录
@@ -127,11 +128,13 @@ const whiteList = [
   '/sunVillage_info/list_vote',   //详情页
   '/sunVillage_info/list_vote_detail',   //详情页
   '/sunVillage_info/list_vote_form',   //详情页
+
 ]
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
   if (getToken()) {
+    console.info(to)
     /* has token*/
     if (to.path === '/login') {
       next({ path: '/' })
@@ -190,6 +193,7 @@ router.beforeEach((to, from, next) => {
     }
   } else {
     // 没有token
+    console.info(to);
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录白名单，直接进入
       console.log(to.path)

src/router/index.js

@@ -3825,7 +3825,6 @@ export const constantRoutes = [
     meta: {
       title: '巡查登记',
       hidden: true,
-      keepAlive: true
     },
     component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseAdd'], resolve)
   },
@@ -3834,8 +3833,7 @@ export const constantRoutes = [
     name: 'lawEnforcementCaseEdit',
     meta: {
       title: '登记修改',
-      hidden: true,
-      keepAlive: true
+      hidden: true
     },
     component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseEdit'], resolve)
   },
@@ -3844,8 +3842,7 @@ export const constantRoutes = [
     name: 'lawEnforcementCaseListNew',
     meta: {
       title: '登记列表',
-      hidden: true,
-      keepAlive: true
+      hidden: true
     },
     component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseListNew'], resolve)
   },

src/views/lawEnforcement/basis/basis.vue

@@ -89,6 +89,7 @@
     },
     methods: {
       getList(){
+        console.log('aaaa')
         var _this = this;
         getNewsList(_this.queryParams).then(response => {
           response.rows.map(res=>{
@@ -124,7 +125,7 @@
         this.loading = false;
         this.queryParams.title = this.searchInput;
         this.queryParams.pageNum = 1;
-        this.getList();
+        // this.getList();
       },
       onClickLeftIndex(){
         this.$router.push('/lawEnforcement/index_new')

src/views/lawEnforcement/caseAllocation/caseAdd.vue

@@ -267,36 +267,36 @@
         </van-collapse>
       </div>
 
-      <div class="main_box" style="margin-top: 10px;">
-        <van-collapse v-model="activeNames2">
-          <van-collapse-item name="1">
-            <template #title>
-              <van-icon name="../../../static/images/lawEnforcement/icon/icon_zxry.png" size="20"></van-icon>
-              <span class="custom-title">执法人员<i class="bgBlue"></i></span>
-            </template>
-            <div class="peopleList">
-              <van-row class="peoplett">
-                <van-col :span="4">序号</van-col>
-                <van-col :span="6">执行人员</van-col>
-                <van-col :span="10">执法证号</van-col>
-                <van-col :span="4">带队人</van-col>
-              </van-row>
-              <van-row v-for="(item,index) in tEnforceCaseHandlerList" :key="index" >
-                <van-col :span="4">{{index+1}}</van-col>
-                <van-col :span="6">{{item.enforcerName}}</van-col>
-                <van-col :span="10">{{item.enforcerNum}}</van-col>
-                <van-col :span="4">
-                  <div class="icon_box">
-                    <van-checkbox v-model="item.enforcerLeader" shape="square" @change="checkBoxChange(item.enforcerLeader,index)"></van-checkbox>
-                    <van-icon name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index)"></van-icon>
-                  </div>
-                </van-col>
-              </van-row>
-              <img src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="$router.push({name:'lawEnforcementCaseLawEnforcer'})">
-            </div>
-          </van-collapse-item>
-        </van-collapse>
-      </div>
+<!--      <div class="main_box" style="margin-top: 10px;">-->
+<!--        <van-collapse v-model="activeNames2">-->
+<!--          <van-collapse-item name="1">-->
+<!--            <template #title>-->
+<!--              <van-icon name="../../../static/images/lawEnforcement/icon/icon_zxry.png" size="20"></van-icon>-->
+<!--              <span class="custom-title">执法人员<i class="bgBlue"></i></span>-->
+<!--            </template>-->
+<!--            <div class="peopleList">-->
+<!--              <van-row class="peoplett">-->
+<!--                <van-col :span="4">序号</van-col>-->
+<!--                <van-col :span="6">执行人员</van-col>-->
+<!--                <van-col :span="10">执法证号</van-col>-->
+<!--                <van-col :span="4">带队人</van-col>-->
+<!--              </van-row>-->
+<!--              <van-row v-for="(item,index) in tEnforceCaseHandlerList" :key="index" >-->
+<!--                <van-col :span="4">{{index+1}}</van-col>-->
+<!--                <van-col :span="6">{{item.enforcerName}}</van-col>-->
+<!--                <van-col :span="10">{{item.enforcerNum}}</van-col>-->
+<!--                <van-col :span="4">-->
+<!--                  <div class="icon_box">-->
+<!--                    <van-checkbox v-model="item.enforcerLeader" shape="square" @change="checkBoxChange(item.enforcerLeader,index)"></van-checkbox>-->
+<!--                    <van-icon name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index)"></van-icon>-->
+<!--                  </div>-->
+<!--                </van-col>-->
+<!--              </van-row>-->
+<!--              <img src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="$router.push({name:'lawEnforcementCaseLawEnforcer'})">-->
+<!--            </div>-->
+<!--          </van-collapse-item>-->
+<!--        </van-collapse>-->
+<!--      </div>-->
       <div class="submit_box">
         <p class="submitButton" @click="$refs.form.submit()">保存</p>
         <p class="submitButton" @click="keepSubmit()">保存并提交</p>
@@ -533,7 +533,10 @@
           // do anything you want
           if (Cookies.get('enforcer')){
             JSON.parse(Cookies.get('enforcer')).map((res,index)=>{
-              this.tEnforceCaseHandlerList.push(res)
+              let array1 = this.tEnforceCaseHandlerList.filter(function (e) { return e.enforcerName == res.enforcerName; });
+              if ( array1.length < 1 ){
+                this.tEnforceCaseHandlerList.push(res)
+              }
             })
           }
         }

src/views/lawEnforcement/caseAllocation/caseDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="header_main">
-      查看登记
+      {{title}}
       <div class="return_btn" @click="onClickLeft"></div>
     </div>
     <div style="height: 58px;"></div>
@@ -109,6 +109,7 @@
         showPayeeType:false,
         showPicker:false,
         form:{},
+        title:'查看登记',
 
         bankType:'',
         payeeType:'',
@@ -161,16 +162,22 @@
         this.nationOptions = response.data;
       });
       this.getDetail();
-
+      if (this.$route.query.type == 'caseQuery'){
+        this.title = '案件详情查看'
+      }
     },
     methods: {
       getDetail(){
         getCase(this.$route.query.id).then((response) => {
           response.data.caseSource = response.data.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, response.data.caseSource);
+
           response.data.belongTeam = response.data.belongTeam == '' ? '' : this.selectDictLabel(this.belongTeamOptions, response.data.belongTeam);
+
+          if (response.data.type == '1'){
+            response.data.sex = response.data.sex == '' ? '' : this.selectDictLabel(this.sexOptions, response.data.sex);
+            response.data.nation = response.data.nation == '' ? '' : response.data.nation == '1' ? '汉族' : this.selectDictLabel(this.nationOptions, response.data.nation);
+          }
           response.data.type = response.data.type == '' ? '' : this.selectDictLabel(this.typeOptions, response.data.type);
-          response.data.sex = response.data.sex == '' ? '' : this.selectDictLabel(this.sexOptions, response.data.sex);
-          response.data.nation = response.data.nation == '' ? '' : this.selectDictLabel(this.nationOptions, response.data.nation);
 
           var schemeQueryParam = {
             applyStatus: "1"
@@ -189,15 +196,15 @@
             })
             // process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API
           }
+          console.log(response.data.scheme)
           schemeList(schemeQueryParam).then((responseScheme) => {
-            console.log(responseScheme.rows.filter(function (e) { return e.id == response.data.schemeId; }))
-            response.data.scheme = response.data.schemeId == '' ? '' : responseScheme.rows.filter(function (e) { return e.id == response.data.schemeId; })[0].schemeName;
-
+            console.log(responseScheme)
+            response.data.scheme = response.data.schemeId == null ? '' : responseScheme.rows.filter(function (e) { return e.id == response.data.schemeId; })[0].schemeName;
           });
           var that = this ;
           setTimeout(function () {
             that.form = response.data;
-          },2000)
+          },3000)
         });
         getSurveyByCaseId(this.$route.query.id).then((response) => {
           if(response.data != undefined){

src/views/lawEnforcement/caseAllocation/caseDistribution.vue

@@ -179,8 +179,6 @@
       next('/url') //放行到指定的路由
       */
       next(vm => {
-        console.log(from.path)
-        console.log(to.path)
         if (from.path === '/lawEnforcement/caseAllocation'){
           location.reload()
         }
@@ -282,6 +280,7 @@
       $route (to, from ) {
         // 监听路由变化, 实现类似 小程序的 onShow 事件
         if (to.path === '/lawEnforcement/caseDistribution') {
+          console.log('aaaa')
           // do anything you want
           if (Cookies.get('enforcer')){
             getSurveyByCaseId(this.$route.query.id).then((response) => {
@@ -295,7 +294,10 @@
                 })
               }else {
                 JSON.parse(Cookies.get('enforcer')).map((res,index)=>{
+                  let array1 = this.tEnforceCaseHandlerList.filter(function (e) { return e.enforcerName == res.enforcerName; });
+                  if ( array1.length < 1 ){
                     this.tEnforceCaseHandlerList.push(res)
+                  }
                 })
               }
             });

src/views/lawEnforcement/caseAllocation/caseEdit.vue

@@ -182,9 +182,9 @@
             </van-field>
             <template v-if="form.type=='1'">
               <van-field v-model="form.name" required :rules="[{ required: true , message:'请输入当事人姓名' }]" label="当事人姓名" placeholder="请输入当事人姓名" :border="false" label-width="auto" input-align="right" />
-              <van-field v-model="form.sex" label="性别" placeholder="请输入性别" :border="false" label-width="auto" input-align="right" >
-                <template #input>
-                  <van-radio-group v-model="form.sex" direction="horizontal">
+              <van-field v-if="form.type=='1'" v-model="form.sex" label="性别" placeholder="请输入性别" :border="false" label-width="auto" input-align="right" >
+                <template v-if="form.type=='1'" #input>
+                  <van-radio-group v-if="form.type=='1'" v-model="form.sex" direction="horizontal">
                     <van-radio name="1">男</van-radio>
                     <van-radio name="2">女</van-radio>
                   </van-radio-group>

src/views/lawEnforcement/caseAllocation/caseEnforceList.vue

@@ -7,8 +7,9 @@
     <div style="height: 58px;"></div>
 
     <div class="search_box">
+
+<!--      v-model="showPopover"-->
       <van-popover
-        v-model="showPopover"
         trigger="click"
         :actions="belongTeamOptions"
         @select="popChange"
@@ -17,7 +18,7 @@
         <template #reference>
           <div class="select_box">
             <p>{{popValue}}</p>
-            <van-icon name="arrow-down" color="#1D6FE9" />
+<!--            <van-icon name="arrow-down" color="#1D6FE9" />-->
           </div>
         </template>
       </van-popover>
@@ -30,22 +31,27 @@
     <div class="main_box" style="margin-top: 10px;">
       <div class="peopleList">
         <van-row class="peoplett">
-          <van-col :span="4">执行主体</van-col>
+          <van-col :span="4">带队人</van-col>
           <van-col :span="20">执行人员</van-col>
         </van-row>
-
-        <van-checkbox-group v-model="result">
-          <van-row v-for="(item,index) in enforcerList" :key="index" >
-            <van-col :span="4">{{item.belongTeam}}</van-col>
-            <van-col :span="6">{{item.name}}</van-col>
-            <van-col :span="10">{{item.enforceNum}}</van-col>
-            <van-col :span="4">
-              <div class="icon_box">
-                <van-checkbox :name="item" shape="square"></van-checkbox>
-              </div>
-            </van-col>
-          </van-row>
-        </van-checkbox-group>
+        <van-radio-group v-model="radio">
+          <van-checkbox-group v-model="result">
+            <van-row v-for="(item,index) in enforcerList" :key="index" >
+              <van-col :span="4">
+                <div class="icon_box">
+                  <van-radio :name="item.id"></van-radio>
+                </div>
+              </van-col>
+              <van-col :span="6">{{item.name}}</van-col>
+              <van-col :span="10">{{item.enforceNum}}</van-col>
+              <van-col :span="4">
+                <div class="icon_box">
+                  <van-checkbox :name="item" shape="square"></van-checkbox>
+                </div>
+              </van-col>
+            </van-row>
+          </van-checkbox-group>
+        </van-radio-group>
       </div>
     </div>
 
@@ -64,6 +70,7 @@
         showPopover: false,
         form:{},
         result:[],
+        radio:'',
         queryParams: {
           // 分页
           pageNum: 1,
@@ -82,16 +89,20 @@
         belongTeamOptions2:[],
 
         popValue:'一中队',
-        surveyForm:{}
+        surveyForm:{
+          tEnforceCaseHandlerList:[]
+        }
 
       };
     },
     created() {
+      this.queryParams.belongTeam = this.$route.query.belongTeam;
       this.getDicts("team_category").then(response => {
         for (var i = 0; i < response.data.length; i++) {
           this.belongTeamOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
         }
         this.belongTeamOptions2 = response.data;
+        this.popValue = this.selectDictLabel(response.data, this.$route.query.belongTeam);
       });
       this.getDictionaries()
       this.getDetail();
@@ -116,26 +127,36 @@
         this.getDictionaries();
       },
       choiceEnforcer(){
-        const list = [];
-        this.result.map(res=>{
-          let obj = {};
-          obj.relationType = "2";
-          obj.enforcerId = res.id;   // 执法人员ID  -- 执法人员选择页面带回值
-          obj.enforcerName = res.name;  // 执法人员姓名 -- 执法人员选择页面带回值
-          obj.enforcerNum = res.enforceNum;  // 执法证号  -- 执法人员选择页面带回值
-          obj.enforcerLeader = "";   // 是否带队  --勾选赋值
-          list.push(obj)
-        })
-        this.surveyForm.tEnforceCaseHandlerList = list;
+        var that = this ;
         this.surveyForm.caseId = this.form.id;
         getSurveyByCaseId(this.surveyForm.caseId).then(responseSurvey => {
+          console.log(responseSurvey.data.tEnforceCaseHandlerList)
           this.surveyForm.id = responseSurvey.data.id;
-          updateSurvey(this.surveyForm).then(response => {
-            this.$notify({ type: 'success', message: '保存成功' });
-            setTimeout(function(){
-              history.back(-1);
-            },2000)
-          });
+          this.result.map(res=>{
+            console.log(res)
+            let array1 = responseSurvey.data.tEnforceCaseHandlerList.filter(function (e) { return e.id == res.id; });
+            if ( array1.length < 1 ){
+              let obj = {};
+              obj.relationType = "2";
+              obj.enforcerId = res.id;   // 执法人员ID  -- 执法人员选择页面带回值
+              obj.enforcerName = res.name;  // 执法人员姓名 -- 执法人员选择页面带回值
+              obj.enforcerNum = res.enforceNum;  // 执法证号  -- 执法人员选择页面带回值
+              obj.enforcerLeader = "";   // 是否带队  --勾选赋值
+              if (this.radio == res.id){
+                obj.enforcerLeader = "Y"
+              }
+              that.surveyForm.tEnforceCaseHandlerList.push(obj)
+            }
+          })
+          setTimeout(function () {
+            updateSurvey(that.surveyForm).then(response => {
+              that.$notify({ type: 'success', message: '保存成功' });
+              setTimeout(function(){
+                history.back(-1);
+              },2000)
+            });
+          },2000)
+
         });
       },
       getDetail(){

src/views/lawEnforcement/caseAllocation/caseListNew.vue

@@ -19,7 +19,7 @@
       finished-text="没有更多了"
       @load="getList"
     >
-      <van-swipe-cell v-for="(item,index) in list" :key="index">
+      <van-swipe-cell v-for="(item,index) in list" :key="index" :disabled="item.caseProgress > 4">
         <van-cell :title="item.caseName" center :to="{name:'lawEnforcementCaseDetailNew', query: {id:item.id}}">
           <template #icon>
             <van-icon name="../../../../static/images/lawEnforcement/new/list_icon_01.png" size="20" color="#FF4646" style="margin-right: 10px;" />
@@ -28,7 +28,7 @@
             <p>{{item.caseSourceText}}</p>
             <p>第{{item.belongTeamText}}</p>
             <p>{{item.registerDate}}</p>
-            <p>{{item.caseProgressName}}</p>
+            <p>{{ item.caseProgressName}}</p>
           </template>
         </van-cell>
         <template #right>
@@ -43,7 +43,7 @@
               <van-button v-if="item.caseProgress == 1" color="#FFA63E" square text="提交" type="info" @click="submitCase(item)" class="delete-button" />
             </van-col>
             <van-col>
-              <van-button v-if="item.caseProgress != 1" color="#1CB8B1" square type="info" :to="{name:'lawEnforcementCaseEnforceList', query: {id:item.id}}" class="delete-button" >添加<br/>执法<br/>员</van-button>
+              <van-button v-if="item.caseProgress != 1" color="#1CB8B1" square type="info" :to="{name:'lawEnforcementCaseEnforceList', query: {id:item.id,belongTeam:item.belongTeam}}" class="delete-button" >添加<br/>执法<br/>员</van-button>
             </van-col>
           </van-row>
         </template>
@@ -153,8 +153,8 @@
           this.loading = false;
           this.finished = false;
           this.queryApplyParams.pageNum = 1 ;
-          this.getList();
           this.$notify({ type: 'success', message: '提交成功' });
+          location.reload();
         }).catch(() => {});
       }
     },

src/views/lawEnforcement/caseQuery/caseQuery.vue

@@ -19,10 +19,11 @@
         @load="getList"
         >
         <van-swipe-cell v-for="(item,index) in list" :key="index">
-          <van-cell :title="item.caseName" :to="{name:'lawEnforcementCaseDetailNew', query: {id:item.id}}">
+          <van-cell :title="item.caseName" :to="{name:'caseDetail', query: {id:item.id,caseProgress:item.caseProgress}}">
             <template #label>
-              <p>{{item.caseNumPart1}}农 {{item.caseNumPart2}} [{{item.caseNumPart3}}] {{item.caseNum}}号</p>
-              <p>{{item.caseProgress}}</p>
+              <p v-if="item.caseNum == null">无</p>
+              <p v-else>{{item.caseNumPart1}}农 {{item.caseNumPart2}} {{item.caseNumPartType}} [{{item.caseNumPart3}}] {{item.caseNum}}号</p>
+              <p>{{item.caseProgressText}}</p>
             </template>
           </van-cell>
           <template #right>
@@ -71,7 +72,7 @@
         var _this = this;
         listCase(_this.caseQueryParams).then(response => {
           response.rows.map(res=>{
-            res.caseProgress = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
+            res.caseProgressText = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
             _this.list.push(res);
           })
           if(_this.list.length >= response.total){

src/views/lawEnforcement/caseQuery/caseQueryDocument.vue

@@ -10,68 +10,68 @@
         <p>{{caseName}}</p>
     </div>
 
-    <div class="main_box">
+    <div class="main_box" style="margin-bottom: 10px;" v-for="(item,index) in attaCount" :key="index">
       <van-cell>
         <template #title>
           <van-icon name="../../../static/images/lawEnforcement/icon/icon_zxfa.png" size="20"></van-icon>
-          <span class="custom-title">登记<i class="bgBlue"></i></span>
+          <span class="custom-title">{{item.caseProgressName}}<i class="bgBlue"></i></span>
         </template>
       </van-cell>
       <div class="peopleList">
-        <van-row v-for="(item,index) in dengjiList" :key="index" >
+        <van-row v-for="(itemChildren,indexChildren) in item.caseProgressAttach" :key="indexChildren" >
           <van-col :span="20">
             <img src="../../../../static/images/lawEnforcement/icon/record_icon_03.png"/>
-            <p>{{item[index].substr(27,item[index].length)}}</p>
+            <p>{{itemChildren.substr(51,itemChildren.length)}}</p>
           </van-col>
           <van-col :span="4">
-            <a :href="'/api'+item[index]">下载</a>
+            <a :href="'/api'+itemChildren">下载</a>
           </van-col>
         </van-row>
-        <van-empty v-if="dengjiList == null || dengjiList == undefined || dengjiList == '' " description="暂无文件" />
+        <van-empty v-if="item.caseProgressAttach == null || item.caseProgressAttach == undefined || item.caseProgressAttach == '' " description="暂无文件" />
       </div>
     </div>
 
-    <div class="main_box" style="margin-top: 10px;">
-      <van-cell>
-        <template #title>
-          <van-icon name="../../../static/images/lawEnforcement/icon/icon_kc.png" size="20"></van-icon>
-          <span class="custom-title">勘察<i class="bgBlue"></i></span>
-        </template>
-      </van-cell>
-      <div class="peopleList">
-        <van-row v-for="(item,index) in kanchaList" :key="index" >
-          <van-col :span="20">
-            <img src="../../../../static/images/lawEnforcement/icon/record_icon_03.png" />
-            <p>{{item[index].substr(27,item[index].length)}}</p>
-          </van-col>
-          <van-col :span="4">
-            <a :href="'/api'+item[index]">下载</a>
-          </van-col>
-        </van-row>
-        <van-empty v-if="kanchaList == null || kanchaList == undefined || kanchaList == '' " description="暂无文件" />
-      </div>
-    </div>
+<!--    <div class="main_box" style="margin-top: 10px;">-->
+<!--      <van-cell>-->
+<!--        <template #title>-->
+<!--          <van-icon name="../../../static/images/lawEnforcement/icon/icon_kc.png" size="20"></van-icon>-->
+<!--          <span class="custom-title">勘察<i class="bgBlue"></i></span>-->
+<!--        </template>-->
+<!--      </van-cell>-->
+<!--      <div class="peopleList">-->
+<!--        <van-row v-for="(item,index) in kanchaList" :key="index" >-->
+<!--          <van-col :span="20">-->
+<!--            <img src="../../../../static/images/lawEnforcement/icon/record_icon_03.png" />-->
+<!--            <p>{{item[index].substr(27,item[index].length)}}</p>-->
+<!--          </van-col>-->
+<!--          <van-col :span="4">-->
+<!--            <a :href="'/api'+item[index]">下载</a>-->
+<!--          </van-col>-->
+<!--        </van-row>-->
+<!--        <van-empty v-if="kanchaList == null || kanchaList == undefined || kanchaList == '' " description="暂无文件" />-->
+<!--      </div>-->
+<!--    </div>-->
 
-    <div class="main_box" style="margin-top: 10px;">
-      <van-cell>
-        <template #title>
-          <van-icon name="../../../static/images/lawEnforcement/icon/icon_ajwd.png" size="20"></van-icon>
-          <span class="custom-title">备案<i class="bgBlue"></i></span>
-        </template>
-      </van-cell>
-      <div class="peopleList">
-        <van-row v-for="(item,index) in beianList" :key="index" >
-          <van-col :span="20">
-            <img src="../../../../static/images/lawEnforcement/icon/record_icon_03.png"/>
-            <p>{{item[index].substr(27,item[index].length)}}</p>
-          </van-col>
-          <van-col :span="4">
-            <a :href="'/api'+item[index]">下载</a>
-          </van-col>
-        </van-row>
-        <van-empty v-if="beianList == null || beianList == undefined || beianList == '' " description="暂无文件" />
-      </div>
-    </div>
+<!--    <div class="main_box" style="margin-top: 10px;">-->
+<!--      <van-cell>-->
+<!--        <template #title>-->
+<!--          <van-icon name="../../../static/images/lawEnforcement/icon/icon_ajwd.png" size="20"></van-icon>-->
+<!--          <span class="custom-title">备案<i class="bgBlue"></i></span>-->
+<!--        </template>-->
+<!--      </van-cell>-->
+<!--      <div class="peopleList">-->
+<!--        <van-row v-for="(item,index) in beianList" :key="index" >-->
+<!--          <van-col :span="20">-->
+<!--            <img src="../../../../static/images/lawEnforcement/icon/record_icon_03.png"/>-->
+<!--            <p>{{item[index].substr(27,item[index].length)}}</p>-->
+<!--          </van-col>-->
+<!--          <van-col :span="4">-->
+<!--            <a :href="'/api'+item[index]">下载</a>-->
+<!--          </van-col>-->
+<!--        </van-row>-->
+<!--        <van-empty v-if="beianList == null || beianList == undefined || beianList == '' " description="暂无文件" />-->
+<!--      </div>-->
+<!--    </div>-->
 
   </div>
 </template>
@@ -110,6 +110,7 @@
         dengjiList:[],
         kanchaList:[],
         beianList:[],
+        attaCount:{}
       };
     },
     created() {
@@ -129,14 +130,10 @@
             if (res.caseProgressAttach){
               res.caseProgressAttach = res.caseProgressAttach.split(',');
             }
-            if(res.caseProgressName=='登记'){
-              this.dengjiList.push(res.caseProgressAttach);
-            }else if(res.caseProgressName=='勘察'){
-              this.kanchaList.push(res.caseProgressAttach);
-            }else if(res.caseProgressName=='备案'){
-              this.beianList.push(res.caseProgressAttach);
-            }
           })
+          setTimeout(function(){
+            _this.attaCount = response.rows;
+          },2000)
         });
       },
       goBack(){

src/views/lawEnforcement/supervise/enterprise.vue

@@ -99,6 +99,9 @@
         if (this.searchInput == ''){
           location.reload()
         }
+        if (this.searchInput == this.queryParams.companyName){
+          return;
+        }
         this.list = [];
         this.loading = false;
         this.finished = false;

src/views/lawEnforcement/supervise/enterpriseDetail.vue

@@ -18,7 +18,7 @@
       <van-cell title="经营方式" :border="false" v-model="form.businessMode" />
       <van-cell title="经营范围" :border="false" v-model="form.businessScope" />
     </div>
-    <p class="submitButton" @click="$router.push({name:'lawEnforcementEnterpriseRelation'})">关联案件</p>
+    <p class="submitButton" @click="$router.push({name:'lawEnforcementEnterpriseRelation', query: {id:form.id}})">关联案件</p>
   </div>
 </template>
 

src/views/lawEnforcement/supervise/enterpriseRelation.vue

@@ -17,14 +17,14 @@
         @load="getList"
         >
         <van-swipe-cell v-for="(item,index) in list" :key="index">
-          <van-cell center :to="{name:'lawEnforcementTaskDetail', query: {id:item.id}}">
+          <van-cell center :to="{name:'caseDetail', query: {id:item.id,caseProgress:item.caseProgress}}">
             <template #title>
               <span>{{item.caseName}}</span>
             </template>
             <template #label>
               <div class="label">
-                <p>投诉案件</p>
-                <p>{{item.caseProgress}}</p>
+                <p>{{item.caseSource}}</p>
+                <p>{{item.caseProgressText}}</p>
               </div>
             </template>
           </van-cell>
@@ -68,7 +68,7 @@
         var _this = this;
         listCase(_this.caseQueryParams).then(response => {
           response.rows.map(res=>{
-            res.caseProgress = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
+            res.caseProgressText = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
             res.caseSource = res.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, res.caseSource);
             _this.list.push(res);
           })

src/views/lawEnforcement/supervise/individualRelation.vue

@@ -17,14 +17,14 @@
         @load="getList"
         >
         <van-swipe-cell v-for="(item,index) in list" :key="index">
-          <van-cell center :to="{name:'lawEnforcementTaskDetail', query: {id:item.id}}">
+          <van-cell center :to="{name:'caseDetail', query: {id:item.id,caseProgress:item.caseProgress}}">
             <template #title>
               <span>{{item.caseName}}</span>
             </template>
             <template #label>
               <div class="label">
                 <p>{{item.caseSource}}</p>
-                <p>{{item.caseProgress}}</p>
+                <p>{{item.caseProgressText}}</p>
               </div>
             </template>
           </van-cell>
@@ -69,7 +69,7 @@
         var _this = this;
         listCase(_this.caseQueryParams).then(response => {
           response.rows.map(res=>{
-            res.caseProgress = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
+            res.caseProgressText = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);
             res.caseSource = res.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, res.caseSource);
             _this.list.push(res);
           })

src/views/lawEnforcement/task/signInRecord.vue

@@ -71,7 +71,11 @@
             }else{
               res.caseProgressAttach = [];
             }
+
             res.caseProgressAttach.map((rr,index)=>{
+              if (i == fileForm.length-1){
+                this.openPic2.push(rr)
+              }
               res.caseProgressAttach[index] = {
                 url: '/api' + rr,
                 isImage: true
@@ -79,12 +83,13 @@
             })
             this.fileList.push(res)
           })
-          console.log(this.fileList)
+          console.log(this.openPic2)
         });
       },
       afterRead(file) {
         // 此时可以自行将文件上传至服务器
         this.openPic.push(file.file);
+
         let params1 = new FormData();
         params1.append("file", file.file);
         commonUpload(params1).then((r1) => {
@@ -101,7 +106,9 @@
           attachement: this.openPic2.join(','),  // 打卡上传附件(附件的路径字符串，多个附件路径之前通过英文逗号分隔)
         };
         attachmentEdit(queryParams).then((r1) => {
-
+          if (r1.code == 200){
+            this.$notify({ type: 'success', message: '保存成功' });
+          }
         })
       }
     },

src/views/lawEnforcement/task/task.vue

@@ -17,7 +17,7 @@
               <span>{{item.caseName}}</span>
               <div class="first">
                 <span>{{item.caseSource}}</span>
-                <span>分配时间：{{item.registerDate}}</span>
+                <span>分配时间：{{item.handlerSetDate}}</span>
               </div>
             </template>
             <template #label>

src/views/lawEnforcement/task/taskDetail.vue

@@ -13,13 +13,13 @@
         </template>
       </van-cell>
       <van-cell title="案件来源" :border="false" v-model="form.caseSource" />
-      <van-cell title="关联方案" :border="false" v-model="form.schemeId" />
+      <van-cell title="关联方案" :border="false" v-model="form.scheme" />
       <van-cell title="案件属地" :border="false" v-model="form.deptId" />
       <van-cell title="执行主体" :border="false" v-model="form.belongTeam" />
       <van-cell title="案件名称" :border="false" v-model="form.caseName" />
       <van-cell title="登记日期" :border="false" v-model="form.registerDate" />
       <van-cell title="执法类别" :border="false" v-model="form.enforceCategory" />
-      <!--      <van-cell title="案件简述1" :border="false" v-model="form.caseSource" />-->
+      <van-cell title="案件简述" :border="false" v-model="form.caseDescribe" />
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
@@ -102,7 +102,7 @@
 </template>
 
 <script>
-  import { getCase , getDeptName , getSurveyByCaseId } from "@/api/lawEnforcement/index";
+  import { getCase , getDeptName , getSurveyByCaseId , schemeList } from "@/api/lawEnforcement/index";
   export default {
     name: "programmeDetail",
     data() {
@@ -129,6 +129,7 @@
 
         caseSourceOptions:[],
         belongTeamOptions:[],
+        schemeOptions:[],
 
         // 查询参数
         queryParams: {
@@ -170,6 +171,12 @@
           getDeptName(response.data.deptId).then(res => {
             response.data.deptId = res.data.deptName
           });
+          var schemeQueryParam = {
+            applyStatus: "1"
+          };
+          schemeList(schemeQueryParam).then((responseScheme) => {
+            this.$set(this.form,'scheme',response.data.schemeId == null ? '' : responseScheme.rows.filter(function (e) { return e.id == response.data.schemeId; })[0].schemeName)
+          });
           if (response.data.attachement){
             response.data.attachementList = [];
             var attachement = response.data.attachement.split( "," );

src/views/lawEnforcement/task/taskRecord.vue

@@ -12,7 +12,9 @@
         <p>{{user.nickName}}</p>
         <p>{{roleGroup}}</p>
       </div>
-      <img src="../../../../static/images/lawEnforcement/icon/task_icon_03.png" class="icon_01">
+      <img src="../../../../static/images/lawEnforcement/icon/task_icon_03.png" v-if="relationType == '2'" class="icon_01">
+      <img src="../../../../static/images/lawEnforcement/icon/task_icon_031.png" v-if="relationType == '3'" class="icon_01">
+      <img src="../../../../static/images/lawEnforcement/icon/task_icon_032.png" v-if="relationType == '4'" class="icon_01">
     </div>
 
     <div class="center_box">
@@ -37,7 +39,8 @@
         form:{},
         clockinList:[],
         user:{},
-        roleGroup:''
+        roleGroup:'',
+        relationType:''
       };
     },
     created() {
@@ -45,6 +48,7 @@
         this.user = res.data;
         this.roleGroup = res.roleGroup;
       })
+      this.relationType = this.$route.query.relationType;
       this.getDetail()
     },
     methods: {

src/views/lawEnforcement/task/taskSignIn.vue

@@ -11,7 +11,7 @@
     </baidu-map>
 
     <div style="position:absolute;top: 75px;width: 100%;">
-      <div class="main_box top_box">
+      <div :class="{'main_box' : true , 'top_box' : true , 'top_qu' : form.caseProgress == '4' , 'top_li' : form.caseProgress == '3' , 'top_kan' : form.caseProgress == '2'}">
         <van-field readonly v-model="form.caseSource" label="案件来源" :border="false" />
         <van-field readonly v-model="form.schemeId" label="关联方案" :border="false" />
         <van-field readonly v-model="form.caseName" label="案件名称" :border="false" />
@@ -240,13 +240,21 @@
     }
   }
   .top_box{
-    background: url('../../../../static/images/lawEnforcement/icon/task_icon_03.png') no-repeat 97% 10%;
     padding: 10PX 0;
     /*background-size: 100% 100%;*/
     /deep/ .van-cell{
       background: none;
     }
   }
+  .top_kan{
+    background: url('../../../../static/images/lawEnforcement/icon/task_icon_03.png') no-repeat 97% 10%;
+  }
+  .top_qu{
+    background: url('../../../../static/images/lawEnforcement/icon/task_icon_032.png') no-repeat 97% 10%;
+  }
+  .top_li{
+    background: url('../../../../static/images/lawEnforcement/icon/task_icon_031.png') no-repeat 97% 10%;
+  }
   .main_box{
     width: 96%;
     margin: 0 auto;

src/views/lawEnforcement/task/taskSignInSee.vue

@@ -11,7 +11,7 @@
     </baidu-map>
 
     <div style="position:absolute;top: 75px;width: 100%;">
-      <div class="main_box top_box">
+      <div :class="{'main_box' : true , 'top_box' : true , 'top_qu' : form.caseProgress == '4' , 'top_li' : form.caseProgress == '3' , 'top_kan' : form.caseProgress == '2'}">
         <van-field readonly v-model="form.caseSource" label="案件来源" :border="false" />
         <van-field readonly v-model="form.schemeId" label="关联方案" :border="false" />
         <van-field readonly v-model="form.caseName" label="案件名称" :border="false" />
@@ -189,13 +189,21 @@
     }
   }
   .top_box{
-    background: url('../../../../static/images/lawEnforcement/icon/task_icon_03.png') no-repeat 97% 10%;
     padding: 10PX 0;
     /*background-size: 100% 100%;*/
     /deep/ .van-cell{
       background: none;
     }
   }
+  .top_kan{
+    background: url('../../../../static/images/lawEnforcement/icon/task_icon_03.png') no-repeat 97% 10%;
+  }
+  .top_qu{
+    background: url('../../../../static/images/lawEnforcement/icon/task_icon_032.png') no-repeat 97% 10%;
+  }
+  .top_li{
+    background: url('../../../../static/images/lawEnforcement/icon/task_icon_031.png') no-repeat 97% 10%;
+  }
   .main_box{
     width: 96%;
     margin: 0 auto;

src/views/lawEnforcement/trace/feed.vue

@@ -15,7 +15,7 @@
         <van-field v-model="queryParams.productName" :border="false" label="产品通用名称" placeholder="请输入产品通用名称" input-align="right" />
       </div>
 
-      <p class="submitButton" @click="goSubmit">立即查询</p>
+      <p class="submitButton" @click="getList('search')">立即查询</p>
 
       <div class="scroll_box">
         <van-list
@@ -80,8 +80,12 @@
       // this.getDictionaries()
     },
     methods: {
-      getList(){
+      getList(type){
         var _this = this;
+        if (type == 'search'){
+          this.list = [];
+          this.queryParams.pageNum = 1 ;
+        }
         listFeed(_this.queryParams).then(response => {
           response.rows.map(res=>{
             this.list.push(res);
@@ -96,10 +100,6 @@
           }
         });
       },
-      goSubmit(){
-        this.list = [];
-        this.getList();
-      }
     },
   }
 </script>

src/views/lawEnforcement/trace/fertilizer.vue

@@ -15,7 +15,7 @@
         <van-field v-model="queryParams.productGoodsName" :border="false" label="产品商品名称" placeholder="请输入产品商品名称" input-align="right" />
       </div>
 
-      <p class="submitButton" @click="goSubmit">立即查询</p>
+      <p class="submitButton" @click="getList('search')">立即查询</p>
 
       <div class="scroll_box">
         <van-list
@@ -86,8 +86,12 @@
       // this.getDictionaries()
     },
     methods: {
-      getList(){
+      getList(type){
         var _this = this;
+        if (type == 'search'){
+          this.list = [];
+          this.queryParams.pageNum = 1 ;
+        }
         listFertilizer(_this.queryParams).then(response => {
           response.rows.map(res=>{
             this.list.push(res);
@@ -102,10 +106,6 @@
           }
         });
       },
-      goSubmit(){
-        this.list = [];
-        this.getList();
-      }
     },
   }
 </script>

src/views/lawEnforcement/trace/pesticides.vue

@@ -54,7 +54,7 @@
         />
       </div>
 
-      <p class="submitButton" @click="goSubmit">立即查询</p>
+      <p class="submitButton" @click="getList('search')">立即查询</p>
       <div class="scroll_box">
         <van-list
           v-model="loading"
@@ -140,8 +140,12 @@
 
     },
     methods: {
-      getList(){
+      getList(type){
         var _this = this;
+        if (type == 'search'){
+          this.list = [];
+          this.queryParams.pageNum = 1 ;
+        }
         listProduct(_this.queryParams).then(response => {
           response.rows.map(res=>{
             // res.businessType = res.businessType == '' ? '' : this.selectDictLabel(this.businessTypeOptions, res.businessType);
@@ -167,10 +171,6 @@
         this.queryParams.agent = data.value;
         this.showAgent = false;
       },
-      goSubmit(){
-        this.list = [];
-        this.getList();
-      }
     },
   }
 </script>

src/views/lawEnforcement/trace/product.vue

@@ -15,7 +15,7 @@
         <van-field v-model="value" :border="false" label="农产品类型" placeholder="请输入农产品类型" input-align="right" />
       </div>
 
-      <p class="submitButton">立即查询</p>
+      <p class="submitButton" @click="getList('search')">立即查询</p>
 
       <div class="scroll_box">
         <van-list
@@ -84,8 +84,12 @@
       });
     },
     methods: {
-      getList(){
+      getList(type){
         var _this = this;
+        if (type == 'search'){
+          this.list = [];
+          this.queryParams.pageNum = 1 ;
+        }
         listAgri(_this.queryParams).then(response => {
           response.rows.map(res=>{
             res.productType = res.productType == '' ? '' : this.selectDictLabel(this.productTypeOptions, res.productType);
@@ -103,7 +107,9 @@
       },
       goSubmit(){
         this.list = [];
-        this.getList();
+        this.queryParams.pageNum = 1 ;
+        this.finished = false;
+        this.loading = false;
       }
     },
   }

src/views/lawEnforcement/trace/seed.vue

@@ -15,7 +15,7 @@
         <van-field v-model="queryParams.recordOrg" :border="false" label="审定登记单位" placeholder="请输入审定登记单位" input-align="right" />
       </div>
 
-      <p class="submitButton" @click="goSubmit">立即查询</p>
+      <p class="submitButton" @click="getList('search')">立即查询</p>
 
       <div class="scroll_box">
         <van-list
@@ -81,8 +81,12 @@
       // this.getDictionaries()
     },
     methods: {
-      getList(){
+      getList(type){
         var _this = this;
+        if (type == 'search'){
+          this.list = [];
+          this.queryParams.pageNum = 1 ;
+        }
         listSeed(_this.queryParams).then(response => {
           response.rows.map(res=>{
             this.list.push(res);
@@ -99,7 +103,9 @@
       },
       goSubmit(){
         this.list = [];
-        this.getList();
+        this.queryParams.pageNum = 1 ;
+        this.finished = false;
+        this.loading = false;
       }
     },
   }

src/views/lawEnforcement/trace/veterinary.vue

@@ -15,7 +15,7 @@
         <van-field v-model="queryParams.productName" :border="false" label="产品通用名称" placeholder="请输入产品通用名称" input-align="right" />
       </div>
 
-      <p class="submitButton" @click="goSubmit">立即查询</p>
+      <p class="submitButton" @click="getList('search')">立即查询</p>
 
       <div class="scroll_box">
         <van-list
@@ -80,8 +80,12 @@
       // this.getDictionaries()
     },
     methods: {
-      getList(){
+      getList(type){
         var _this = this;
+        if (type == 'search'){
+          this.list = [];
+          this.queryParams.pageNum = 1 ;
+        }
         listGmp(_this.queryParams).then(response => {
           response.rows.map(res=>{
             this.list.push(res);
@@ -96,10 +100,6 @@
           }
         });
       },
-      goSubmit(){
-        this.list = [];
-        this.getList();
-      }
     },
   }
 </script>

src/views/yinnong/workbench.vue

@@ -7,7 +7,7 @@
         <template #left>
             <van-icon name="location" color="3A80FB" size="16"/>
             <p  style="color: #878787;margin-left: 5px" @click="selectDept">{{deptName}}</p>
-          <van-popup v-model="villageVisbile" round position="bottom">
+          <van-popup v-model="villageVisbile" round position="bottom" get-container="#app">
             <van-cascader
               v-model="villageValue"
               title="请选择所在村"
@@ -22,7 +22,7 @@
         <template #right>
 <!--          <van-icon name="wap-nav" color="#000" size="18"/>-->
           <p  style="color: #878787;margin-left: 5px" @click="bookVisbile = true">{{bookName}}</p>
-          <van-popup v-model="bookVisbile" round position="bottom">
+          <van-popup v-model="bookVisbile" round position="bottom" get-container="#app">
             <van-picker
               title="请选择账套"
               show-toolbar