zhangzl
/
nsgk_mobile
2
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

农业执法

wulanhaote
庞东旭 2 years ago
parent
18afa34f9f
commit
89060ce41b
12 changed files with 303 additions and 233 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -1
      config/index.js
  2. +18
    -0
      src/api/lawEnforcement/index.js
  3. +47
    -7
      src/views/lawEnforcement/case/caseDetail.vue
  4. +6
    -6
      src/views/lawEnforcement/caseAllocation/caseAdd.vue
  5. +5
    -1
      src/views/lawEnforcement/caseAllocation/caseDetail.vue
  6. +44
    -8
      src/views/lawEnforcement/caseAllocation/caseDistribution.vue
  7. +9
    -0
      src/views/lawEnforcement/caseAllocation/caseListNew.vue
  8. +1
    -1
      src/views/lawEnforcement/task/signInRecord.vue
  9. +1
    -1
      src/views/lawEnforcement/task/taskDetail.vue
  10. +168
    -202
      src/views/lawEnforcement/task/taskHandle.vue
  11. +0
    -5
      src/views/lawEnforcement/task/taskSignIn.vue
  12. +1
    -1
      src/views/lawEnforcement/userNew/user_new.vue

+ 3
- 1
config/index.js View File

@@ -12,8 +12,10 @@ module.exports = {
proxyTable: {
"/api": {
// 请求的目标主机
target: 'http://192.168.0.105:8080/',
//target: 'http://116.255.223.226:8081/nsgk_test/',
target: 'http://localhost:8080/',
//target: 'http://116.255.223.226:8083/nsgk_yongqiaoqu',
//target: 'http://localhost:8080/',
changeOrigin: true,
pathRewrite: {
'^/api': ''


+ 18
- 0
src/api/lawEnforcement/index.js View File

@@ -690,3 +690,21 @@ export function delCase(id) {
method: 'get'
})
}

// 执法人员签到次数查询
export function enforceLockinCount(query) {
return request({
url: '/enforce/clockin/enforceLockinCount',
method: 'get',
params: query
})
}

// 查询案件编号
export function getCaseNum(query) {
return request({
url: '/enforce/survey/getCaseNum',
method: 'get',
params: query
})
}

+ 47
- 7
src/views/lawEnforcement/case/caseDetail.vue View File

@@ -1,12 +1,17 @@
<template>
<div class="app-container">
<van-nav-bar
:title="type == 'waiting' ? '案件审批':'案件详情'"
fixed
placeholder
left-arrow
@click-left="onClickLeft"
/>
<!-- <van-nav-bar-->
<!-- :title="type == 'waiting' ? '案件审批':'案件详情'"-->
<!-- fixed-->
<!-- placeholder-->
<!-- left-arrow-->
<!-- @click-left="onClickLeft"-->
<!-- />-->
<div class="header_main">
案件查看
<div class="return_btn" @click="onClickLeft"></div>
</div>
<div class="jg"></div>
<van-tabs type="card" :duration="0.2" animated background="transparent" style="border: none;" v-model="caseProgress">
<!-- 登记-->
<van-tab :disabled="0 <= caseActive ? false : true">
@@ -2232,6 +2237,41 @@ export default {
.app-container {
padding: 0;
}
.jg{
height: 116px;
}
.header_main{
height: 116px;
background: url('../../../../static/images/lawEnforcement/new/list_head.png') no-repeat;
background-size: 100% 100%;
position: fixed;
top: 0;
left: 0;
width: 100%;
font-size: 36px;
line-height: 116px;
text-align: center;
color: #fff;
z-index: 999;
.return_btn{
width: 24px;
height: 43.2px;
background: url('../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
background-size: 20px 36px;
position: absolute;
left: 38px;
top: 36px;
}
.add_btn{
width: 56.4px;
height: 40.8px;
background: url('../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
background-size: 47px 34px;
position: absolute;
right: 38px;
top: 36px;
}
}
.van-row{
display: flex;
flex-wrap: wrap;


+ 6
- 6
src/views/lawEnforcement/caseAllocation/caseAdd.vue View File

@@ -180,10 +180,10 @@
</van-radio-group>
</template>
</van-field>
<template v-if="form.type=='1'">
<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.sex" label="性别" placeholder="请输入性别" :border="false" label-width="auto" input-align="right" >
<template #input>
<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">
<van-radio name="1">男</van-radio>
<van-radio name="2">女</van-radio>
@@ -239,11 +239,11 @@
<van-field v-model="form.companyPosition" label="工作单位" placeholder="请输入工作单位及职务" :border="false" label-width="auto" input-align="right" />
<van-field v-model="form.duties" label="职务" placeholder="请输入职务" :border="false" label-width="auto" input-align="right" />
<van-field v-model="form.zihao" label="字号名称" placeholder="请输入字号名称" :border="false" label-width="auto" input-align="right" />
</template>
<template v-if="form.type=='2'">
</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" />
<van-field v-model="form.legalName" label="法人/负责人" placeholder="请输入法人/负责人" :border="false" label-width="auto" input-align="right" />
</template>
</div>

<van-field v-model="form.phone" label="联系电话" placeholder="请输入联系电话" :border="false" label-width="auto" input-align="right" />
<van-field v-model="form.address" label="联系地址" placeholder="请输入联系地址" :border="false" label-width="auto" input-align="right" />


+ 5
- 1
src/views/lawEnforcement/caseAllocation/caseDetail.vue View File

@@ -192,8 +192,12 @@
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;
this.form = response.data;
});
var that = this ;
setTimeout(function () {
that.form = response.data;
},2000)
});
getSurveyByCaseId(this.$route.query.id).then((response) => {
if(response.data != undefined){


+ 44
- 8
src/views/lawEnforcement/caseAllocation/caseDistribution.vue View File

@@ -145,7 +145,9 @@
tEnforceCaseHandlerList:[],
radio:'',
submitType:'',
surveyId:''
surveyId:'',
sexOptions:[],
nationOptions:[],
};
},
created() {
@@ -158,21 +160,51 @@
this.getDicts("enforce_body_type").then(response => {
this.typeOptions = response.data;
});
this.getDicts("sex").then(response => {
this.sexOptions = response.data;
});
this.getDicts("nationality").then(response => {
this.nationOptions = response.data;
});
this.getDetail();
},
beforeRouteEnter (to, from, next) {
/*
to:获取你要跳转的路由信息
from: 获取你从哪个路由来的信息
next: （放行函数）
// 第一种写法
next(); // 直接放行
// 第二种
next('/url') //放行到指定的路由
*/
next(vm => {
console.log(from.path)
console.log(to.path)
if (from.path === '/lawEnforcement/caseAllocation'){
location.reload()
}
})
},
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);
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);

var schemeQueryParam = {
applyStatus: "1"
};
schemeList(schemeQueryParam).then((responseScheme) => {
response.data.scheme = response.data.schemeId == '' ? '' : responseScheme.rows.filter(function (e) { return e.id == response.data.schemeId; })[0].schemeName;
});
response.data.nation = response.data.nation == '' ? '' : this.selectDictLabel(this.nationOptions, response.data.nation);
console.log(this.selectDictLabel(this.nationOptions, response.data.nation))

if(response.data.schemeId){
var schemeQueryParam = {
applyStatus: "1"
};
schemeList(schemeQueryParam).then((responseScheme) => {
response.data.scheme = responseScheme.rows.filter(function (e) { return e.id == response.data.schemeId; })[0].schemeName;
});
}

getDeptName(response.data.deptId).then(res => {
response.data.deptId = res.data.deptName
@@ -188,7 +220,11 @@
})
// process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API
}
this.form = response.data;
var that = this ;
setTimeout(function () {
that.form = response.data;
},2000)

});
getSurveyByCaseId(this.$route.query.id).then((response) => {
if(response.data != undefined){


+ 9
- 0
src/views/lawEnforcement/caseAllocation/caseListNew.vue View File

@@ -28,6 +28,7 @@
<p>{{item.caseSourceText}}</p>
<p>第{{item.belongTeamText}}</p>
<p>{{item.registerDate}}</p>
<p>{{item.caseProgressName}}</p>
</template>
</van-cell>
<template #right>
@@ -95,6 +96,8 @@
response.rows.map(res=>{
res.caseSourceText = res.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, res.caseSource);
res.belongTeamText = res.belongTeam == '' ? '' : this.selectDictLabel(this.belongTeamOptions, res.belongTeam);
res.caseProgressName = res.caseProgress == '' ? '' : this.selectDictLabel(this.caseProgressOptions, res.caseProgress);

this.list.push(res);
})
console.log(this.list.length)
@@ -243,6 +246,12 @@
border-radius: 3PX;
color: #1CB8B1;
}
&:last-child{
padding: 0 7PX;
border: 1px solid #1D6FE9;
color: #1D6FE9;
border-radius: 1rem;
}
}
}
/deep/.van-cell__value{


+ 1
- 1
src/views/lawEnforcement/task/signInRecord.vue View File

@@ -8,7 +8,7 @@
<div class="jg"></div>

<div class="search_box">
<p>{{form.address}}</p>
<!-- <p>{{form.address}}</p>-->
<p>{{form.caseName}}</p>
</div>



+ 1
- 1
src/views/lawEnforcement/task/taskDetail.vue View File

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div class="header_main">
查看案件详情
查看登记
<div class="return_btn" @click="onClickLeft"></div>
</div>
<div style="height: 58px;"></div>


+ 168
- 202
src/views/lawEnforcement/task/taskHandle.vue View File

@@ -69,22 +69,7 @@
<van-icon name="../../../static/images/lawEnforcement/icon/icon_ajwd.png" size="20"></van-icon>
<span class="custom-title">附件<i class="bgBlue"></i></span>
</template>
<div class="cf">
<van-row>
<van-col :span="6">
<van-image src="../../../../static/images/lawEnforcement/icon/icon_fj.png" width="50" />
<p>产品确认</p>
<p>通知书</p>
</van-col>
<van-col :span="6">
<van-image src="../../../../static/images/lawEnforcement/icon/icon_fj.png" width="50" />
<p>产品确认</p>
<p>通知书</p>
</van-col>
<van-col :span="6"></van-col>
<van-col :span="6"></van-col>
</van-row>
</div>
<van-uploader v-model="form.attachementList" :show-upload="false" :deletable="false"/>
</van-collapse-item>
</van-collapse>
</div>
@@ -143,7 +128,7 @@
<van-cell title="案件来源" :border="false" v-model="form.caseSource" />
<van-cell title="关联方案" :border="false" v-model="form.schemeId" />
<van-cell title="案件属地" :border="false" v-model="form.deptId" />
<van-cell title="案件编号" :value="form.caseNumPart1 + '农' + form.caseNumPart2 + '[' + form.caseNumPart3 + ']' +form.caseNum + '号'"/>
<van-cell title="案件编号" :value="surveyForm.instanceId==''?'':form.caseNumPart1 + '农' + form.caseNumPart2 + '[' + form.caseNumPart3 + ']' +form.caseNum + '号'"/>
</div>

<div class="main_box" style="margin-top: 10px;">
@@ -155,19 +140,20 @@
</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-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">{{item.num}}</van-col>
<van-col :span="4">
<div class="icon_box">
<van-checkbox v-model="item.enforcerLeader" shape="square"></van-checkbox>
<van-icon name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'CaseHand')"></van-icon>
</div>
</van-col>
</van-row>
@@ -177,20 +163,6 @@
</van-collapse>
</div>

<!-- <div class="main_box">-->
<!-- <van-cell>-->
<!-- <template #title>-->
<!-- <van-icon name="../../../static/images/lawEnforcement/icon/icon_xwxx.png" size="20"></van-icon>-->
<!-- <span class="custom-title">现场检查<i class="bgBlue"></i></span>-->
<!-- </template>-->
<!-- </van-cell>-->
<!-- <van-cell title="勘察开始时间" v-model="surveyForm.surveyStartTime" />-->
<!-- <van-cell title="勘察结束时间" v-model="surveyForm.surveyEndTime" />-->
<!-- <van-cell title="当事人" v-model="surveyForm.dangshiren"/>-->
<!-- <van-cell title="记录人" v-model="surveyForm.recorder"/>-->
<!-- <van-cell title="检查(勘察)地点" v-model="surveyForm.surveyAddr"/>-->
<!-- <van-cell title="现场检查(勘察)情况" :label="surveyForm.surveyDescription" />-->
<!-- </div>-->
<van-form :readonly="caseProgress != 1 || (surveyForm.instanceId!='' && surveyForm.instanceId!=null && surveyForm.instanceId!=undefined)">
<div class="main_box">
<van-cell>
@@ -252,7 +224,7 @@
</van-field>
<van-field input-align="right" label-width="auto" label="是否申请调查人员回避" placeholder="是否申请调查人员回避" v-model="surveyForm.isAvoid == 'Y' ? '是' : '否'">
<template #input>
<van-radio-group v-model="surveyForm.isClear" direction="horizontal">
<van-radio-group v-model="surveyForm.isAvoid" direction="horizontal">
<van-radio name="Y">是</van-radio>
<van-radio name="N">否</van-radio>
</van-radio-group>
@@ -339,6 +311,8 @@
label-width="auto"
/>

<van-field v-if="surveyForm.instanceId==''&&surveyForm.surveyResult!=1" readonly input-align="right" label-width="auto" label="案件编号" placeholder="案件编号" v-model="surveyForm.caseNumPart1 + '农(' + surveyForm.caseNumPart2 + ')' + surveyForm.caseNumPartType + '[' + surveyForm.caseNumPart3 + ']' +surveyForm.caseNum + '号'" />

</div>

<div class="main_box" style="margin-top: 10px;">
@@ -351,59 +325,7 @@
<van-uploader v-model="surveyOption" :after-read="afterRead" @delete="deleteFile" :show-upload="caseProgress == 1 && ( surveyForm.instanceId=='' || surveyForm.instanceId==null || surveyForm.instanceId==undefined )" :deletable="caseProgress == 1 && ( surveyForm.instanceId=='' || surveyForm.instanceId==null || surveyForm.instanceId==undefined )" />
</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>-->

<!-- <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>-->
<!-- $refs.form.submit()-->
<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="submit">提交</p>
@@ -443,19 +365,19 @@
</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-col :span="4">带队人</van-col>
</van-row>

<van-row v-for="(item,index) in tEnforcePutRecordHandlerList" :key="index" >
<van-col :span="4">{{index+1}}</van-col>
<van-col :span="6">{{item.enforcerName}}</van-col>
<van-col :span="10">{{item.enforcerNum}}</van-col>
<van-col :span="4">{{item.num}}</van-col>
<van-col :span="4">
<div class="icon_box">
<van-checkbox v-model="item.enforcerLeader" shape="square"></van-checkbox>
<van-icon name="../../../static/images/lawEnforcement/icon/icon_delete.png" size="20" @click="removePeople(index,'PutRecord')"></van-icon>
</div>
</van-col>
</van-row>
@@ -526,16 +448,6 @@
<van-field input-align="right" label-width="auto" label="上诉单位" placeholder="上诉单位" v-model="putRecordForm.appealUnit" />
<van-field input-align="right" label-width="auto" label="复议单位" placeholder="复议单位" v-model="putRecordForm.administrativeDept" />
<van-field input-align="right" label-width="auto" label="诉讼单位" placeholder="诉讼单位" v-model="putRecordForm.lawsuitDept" />
<!-- <van-cell title="涉嫌违法行为" :value="putRecordForm.illegalAct" />-->
<!-- <van-cell title="处罚依据及内容" :value="putRecordForm.punishContent" />-->
<!-- <van-cell title="查封日期" :value="putRecordForm.sealDate" />-->
<!-- <van-cell title="查封时效" :value="putRecordForm.sealTimeliness" />-->
<!-- <van-cell title="查封天数" :value="putRecordForm.sealDays" />-->
<!-- <van-cell title="产品保存地点" :value="selectDictLabel(savePlaceOptions, putRecordForm.savePlace)" />-->
<!-- <van-cell title="现场情况" :value="putRecordForm.sceneCondition" />-->
<!-- <van-cell title="上诉单位" :value="putRecordForm.appealUnit" />-->
<!-- <van-cell title="复议单位" :value="putRecordForm.administrativeDept" />-->
<!-- <van-cell title="诉讼单位" :value="putRecordForm.lawsuitDept" />-->
<div class="peopleList cf">
<van-row>
<van-col :span="5">财务名称</van-col>
@@ -555,26 +467,26 @@
<img src="../../../../static/images/lawEnforcement/new/addFinance_btn.png" style="margin: 0 auto;" @click="addFinance" v-if="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )">
</div>

<div class="cf">
<van-row>
<van-col :span="6">
<van-image src="../../../../static/images/lawEnforcement/icon/icon_fj.png" width="50" />
<p>证据先行</p>
<p>保存通知书</p>
</van-col>
<van-col :span="6">
<van-image src="../../../../static/images/lawEnforcement/icon/icon_fj.png" width="50" />
<p>查封扣押</p>
<p>现场笔录</p>
</van-col>
<van-col :span="6">
<van-image src="../../../../static/images/lawEnforcement/icon/icon_fj.png" width="50" />
<p>查封扣押</p>
<p>决定书</p>
</van-col>
<van-col :span="6"></van-col>
</van-row>
</div>
<!-- <div class="cf">-->
<!-- <van-row>-->
<!-- <van-col :span="6">-->
<!-- <van-image src="../../../../static/images/lawEnforcement/icon/icon_fj.png" width="50" />-->
<!-- <p>证据先行</p>-->
<!-- <p>保存通知书</p>-->
<!-- </van-col>-->
<!-- <van-col :span="6">-->
<!-- <van-image src="../../../../static/images/lawEnforcement/icon/icon_fj.png" width="50" />-->
<!-- <p>查封扣押</p>-->
<!-- <p>现场笔录</p>-->
<!-- </van-col>-->
<!-- <van-col :span="6">-->
<!-- <van-image src="../../../../static/images/lawEnforcement/icon/icon_fj.png" width="50" />-->
<!-- <p>查封扣押</p>-->
<!-- <p>决定书</p>-->
<!-- </van-col>-->
<!-- <van-col :span="6"></van-col>-->
<!-- </van-row>-->
<!-- </div>-->
</div>

<div class="main_box">
@@ -753,24 +665,23 @@
</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-col :span="4">带队人</van-col>
</van-row>

<van-row v-for="(item,index) in tEnforceEvidenceHandlerList" :key="index" >
<van-col :span="4">{{index+1}}</van-col>
<van-col :span="6">{{item.enforcerName}}</van-col>
<van-col :span="10">{{item.enforcerNum}}</van-col>
<van-col :span="4">{{item.num}}</van-col>
<van-col :span="4">
<div class="icon_box">
<van-checkbox v-model="item.enforcerLeader" shape="square"></van-checkbox>
<van-icon 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 src="../../../../static/images/lawEnforcement/new/addPeop_btn.png" style="margin: 0 auto;" @click="enforceType = 'evidence',$router.push({name:'lawEnforcementCaseLawEnforcer'})">
</div>
@@ -846,59 +757,6 @@
<p class="submitButton" @click="submitEvidenceForm">保存</p>
<p class="submitButton" @click="submitDefineEvidenceForm">提交</p>
</div>
<!-- <p class="splcTit">审批流程</p>-->
<!-- <div class="main_box2">-->
<!-- <van-row v-for="(item,index) in evidencHistoryList" :key="index">-->
<!-- <van-col :span="4">-->
<!-- <p class="index">{{index+1}}</p>-->
<!-- <div class="indexBorder" :class="{'indexCenter':index==0 ? false : true}">-->
<!-- <p class="ssT" v-if="index>0"></p>-->
<!-- <p class="yq"></p>-->
<!-- <p class="ss" v-if="evidencHistoryList.length != index+1"></p>-->
<!-- </div>-->
<!-- </van-col>-->
<!-- <van-col :span="20">-->
<!-- <van-cell :title="item.activityName" center :border="false">-->
<!-- <template #default>-->
<!-- <p style="color: #666666;">{{ item.assigneeName }}</p>-->
<!-- </template>-->
<!-- </van-cell>-->

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

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


<!-- <div class="main_box examine_box" v-if="caseActive == 3 && type == 'waiting'">-->
<!-- <van-row type="flex" justify="space-between" align="center">-->
<!-- <van-col span="5">审批<br/>意见</van-col>-->
<!-- <van-col span="19">-->
<!-- <van-radio-group v-model="pass" direction="horizontal" @change="radioChange">-->
<!-- <van-radio name="true">同意</van-radio>-->
<!-- <van-radio name="false">驳回</van-radio>-->
<!-- </van-radio-group>-->
<!-- <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="审批意见"/>-->
<!-- </van-col>-->
<!-- </van-row>-->
<!-- </div>-->
<!-- <div style="margin: 16px 2%;" v-if="caseActive == 3 && type == 'waiting'">-->
<!-- <van-row>-->
<!-- <van-col span="24" align="center">-->
<!-- <van-button type="info" native-type="submit" @click="submitEvidence" class="submitButtonActive">提交</van-button>-->
<!-- </van-col>-->
<!-- </van-row>-->
<!-- <div class="clear"></div>-->
<!-- </div>-->
</van-tab>
<template>
<!-- &lt;!&ndash; 处理&ndash;&gt;-->
@@ -1565,7 +1423,9 @@ import {
addPutrecord,
updateEvidence,
addEvidence,
caseHandlerList
caseHandlerList,
enforceLockinCount,
getCaseNum
} from "@/api/lawEnforcement/index";
import law from "@/components/common/law_footer";
import request from "@/utils/request";
@@ -2130,10 +1990,8 @@ export default {
getInformation(){
getCase(this.$route.query.id).then(response => {
console.log(response)
response.data.caseSource = this.selectDictLabel(this.caseSourceOptions, response.data.caseSource);
response.data.schemeId = this.selectDictScheme(this.schemeOptions, response.data.schemeId);
response.data.typeLable = this.selectDictLabel(this.typeOptions, response.data.type);
response.data.sex = this.selectDictLabel(this.sexOptions, response.data.sex);
response.data.nation = this.selectDictLabel(this.nationOptions, response.data.nation);

response.data.caseSource = response.data.caseSource == '' ? '' : this.selectDictLabel(this.caseSourceOptions, response.data.caseSource);
@@ -2145,9 +2003,11 @@ export default {
});
if (response.data.attachement){
var attachement = response.data.attachement.split( "," );
response.data.attachementList = []
attachement.forEach(res=>{
this.attachementOption.push({
url:res
response.data.attachementList.push({
url:'/api'+res,
isImage: true
});
})
}
@@ -2205,7 +2065,19 @@ export default {
if (responseSurvey.data != undefined) {
_this.surveyForm = responseSurvey.data;
_this.instanceId = responseSurvey.data.instanceId;
_this.tEnforceCaseHandlerList = responseSurvey.data.tEnforceCaseHandlerList;
if (responseSurvey.data.tEnforceCaseHandlerList){
_this.tEnforceCaseHandlerList = responseSurvey.data.tEnforceCaseHandlerList;
responseSurvey.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
let data = {
enforcerId : responseEnforce.enforcerId
}
enforceLockinCount(data).then(resEnforceLockin => {
_this.$set(_this.tEnforceCaseHandlerList[index],"num",resEnforceLockin.data)
});
});
}
}else{

}
if (responseSurvey.data.attachement){
var attachement = responseSurvey.data.attachement.split( "," );
@@ -2235,9 +2107,18 @@ export default {
getputRecordByCaseId(_this.form.id).then(responsePutRecord => {
getSamplingByCaseId(_this.form.id).then(responseSampling => {
if(responsePutRecord.data != undefined){
if (responsePutRecord.data.attachement){
var attachement = responsePutRecord.data.attachement.split( "," );
attachement.forEach(response=>{
this.samplingOption.push({
url:'/api' + response,
isImage: true
});
})
// process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API
}
_this.putRecordForm = responsePutRecord.data;
_this.tEnforceDetainHandlerList = responsePutRecord.data.tEnforceDetainHandlerList == null ? [] : responsePutRecord.data.tEnforceDetainHandlerList;

// _this.tEnforcePutRecordHandlerList = responsePutRecord.data.tEnforceCaseHandlerList == null ? [] : responsePutRecord.data.tEnforceCaseHandlerList;
if (responsePutRecord.data.instanceId == ''){

// 立案表单没有保存之前,办理人员默认获取上一节点勘察的办理人员列表
@@ -2248,11 +2129,36 @@ export default {
caseHandlerList(queryEnforcerParams).then(responseHandlerList => {
responseHandlerList.data.relationType = "3";
_this.tEnforcePutRecordHandlerList = responseHandlerList.data;
if (responseHandlerList.data){
responseHandlerList.data.map((responseEnforce,index)=>{
let data = {
enforcerId : responseEnforce.enforcerId
}
enforceLockinCount(data).then(resEnforceLockin => {
_this.$set(_this.tEnforcePutRecordHandlerList[index],"num",resEnforceLockin.data)
});

});
}
});
}else{
_this.tEnforcePutRecordHandlerList = responsePutRecord.data.tEnforceCaseHandlerList;
if (responsePutRecord.data.tEnforceCaseHandlerList){
responsePutRecord.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
let data = {
enforcerId : responseEnforce.enforcerId
}
enforceLockinCount(data).then(resEnforceLockin => {
_this.$set(_this.tEnforcePutRecordHandlerList[index],"num",resEnforceLockin.data)
});
});
}
console.log(_this.tEnforcePutRecordHandlerList)
}

}else{
_this.putRecordForm.attachement = [];
_this.putRecordForm.attachementList = [];
}
if(responseSampling.data != undefined) {
_this.samplingForm = responseSampling.data;
@@ -2260,7 +2166,7 @@ export default {

for (var i = 0 ; i < responseSampling.data.tEnforceSamplingGoodsList.length ; i++){
responseSampling.data.tEnforceSamplingGoodsList[i].showTimeliness = false;
if (responseSampling.data.tEnforceSamplingGoodsList[i].attachement){
if (responseSampling.data.tEnforceSamplingGoodsList[i].attachement != null){
responseSampling.data.tEnforceSamplingGoodsList[i].attachementList = [];
var Sampling = responseSampling.data.tEnforceSamplingGoodsList[i].attachement.split( "," );
Sampling.forEach(response=>{
@@ -2276,18 +2182,7 @@ export default {
}
console.log(responseSampling.data.tEnforceSamplingGoodsList)
}
if (responsePutRecord.data.attachement){
var attachement = responsePutRecord.data.attachement.split( "," );
attachement.forEach(response=>{
this.samplingOption.push({
url:'/api' + response,
isImage: true
});
})
// process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API
}else{
responsePutRecord.data.attachement = [];
}

_this.putRecordForm.caseName = this.form.caseName;
_this.putRecordForm.schemeId = this.form.schemeId;
});
@@ -2346,9 +2241,32 @@ export default {
caseHandlerList(queryEnforcerParams).then(responseHandlerList => {
responseHandlerList.data.relationType = "4";
_this.tEnforceEvidenceHandlerList = responseHandlerList.data;

if (responseHandlerList.data){
responseHandlerList.data.map((responseEnforce,index)=>{
let data = {
enforcerId : responseEnforce.enforcerId
}
enforceLockinCount(data).then(resEnforceLockin => {
_this.$set(_this.tEnforceEvidenceHandlerList[index],"num",resEnforceLockin.data)
});

});
}
});
}else{
_this.tEnforceEvidenceHandlerList = responseEvidence.data.tEnforceCaseHandlerList;
if (responseEvidence.data.tEnforceCaseHandlerList){
responseEvidence.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
let data = {
enforcerId : responseEnforce.enforcerId
}
enforceLockinCount(data).then(resEnforceLockin => {
_this.$set(_this.tEnforceEvidenceHandlerList[index],"num",resEnforceLockin.data)
});

});
}
}
if (responseEvidence.data.attachement){
var Evidence = responseEvidence.data.attachement.split( "," );
@@ -2792,6 +2710,32 @@ export default {
this.surveyForm.surveyResult = data.dictValue;
this.surveyResult = data.dictLabel;
this.showSurveyResult = false;

if (data.dictValue != '1'){
if (data.dictValue == "3") {
this.$set(this.surveyForm, "caseNumPartType", "简罚");
} else if (data.dictValue == "4") {
this.$set(this.surveyForm, "caseNumPartType", "罚");
}

const caseNumParam = {
caseNumPart3: this.surveyForm.caseNumPart3,
surveyResult: data.dictValue
};
getCaseNum(caseNumParam).then(response => {
this.$set(this.surveyForm, "caseNum", response.data);
});

this.getDicts("case_number_title").then(response => {
this.$set(this.surveyForm, "caseNumPart1", response.data[0].dictLabel);
});
// 默认显示当前年份
let nowDate = new Date();
console.log(this.form)
this.$set(this.surveyForm, "caseNumPart3", nowDate.getFullYear().toString());
this.$set(this.surveyForm, "caseNumPart2", this.form.enforceCategory);
}

},

onConfirmTimeliness(data){
@@ -2963,11 +2907,13 @@ export default {

this.samplingForm.caseId = this.putRecordForm.caseId;

this.putRecordForm.attachement = this.putRecordForm.attachement.join(',');
if (typeof this.putRecordForm.attachement != 'string') {
this.putRecordForm.attachement = this.putRecordForm.attachement.join(',');
}
this.samplingForm.tEnforceSamplingGoodsList.forEach(res=>{
res.attachement = res.attachement.join(',');
if (typeof res.attachement != 'string') {
res.attachement = res.attachement.join(',');
}
})
// this.tEnforceSamplingGoodsList[index].attachement

@@ -3171,6 +3117,22 @@ export default {
radioChange(value){
this.comment = value == 'true' ? '同意' : '驳回' ;
},

removePeople(index,type){
if (type == 'CaseHand'){

this.tEnforceCaseHandlerList.splice(index,1)

}else if(type == 'PutRecord'){

this.tEnforcePutRecordHandlerList.splice(index,1)

}else if(type == 'evidence'){

this.tEnforceEvidenceHandlerList.splice(index,1)

}
},
},
watch: {
$route (to, from ) {
@@ -3178,9 +3140,11 @@ export default {
if (to.path === '/lawEnforcement/taskHandle') {
// do anything you want
if (Cookies.get('enforcer')){
console.log(this.enforceType)
JSON.parse(Cookies.get('enforcer')).map((res,index)=>{
if (this.enforceType == 'caseHandler'){
if (this.enforceType == 'CaseHand'){
let array1 = this.tEnforceCaseHandlerList.filter(function (e) { return e.enforcerName == res.enforcerName; });
console.log(array1)
if ( array1.length < 1 ){
this.tEnforceCaseHandlerList.push(res)//勘察
}
@@ -3406,6 +3370,8 @@ export default {
}
}
.icon_box{
display: flex;
justify-content: space-around;
/deep/ .van-checkbox{
justify-content: center;
}


+ 0
- 5
src/views/lawEnforcement/task/taskSignIn.vue View File

@@ -141,16 +141,12 @@
let that = this;
var location_lon = "";
var location_lat = ""; // 经度,纬度
alert("进入定位")
navigator.geolocation.getCurrentPosition((position) => {
alert("完成定位2")
console.log(position)
let lat = position.coords.latitude;
let lng = position.coords.longitude;
const pointBak = new BMap.Point(lng, lat);
const convertor = new BMap.Convertor();
convertor.translate([pointBak], 1, 5,function(resPoint) {
alert("完成定位3")
if(resPoint && resPoint.points && resPoint.points.length>0){
lng = resPoint.points[0].lng;
lat = resPoint.points[0].lat;
@@ -161,7 +157,6 @@
that.form.longitude = point.lng;
that.center.lng = point.lng;
that.center.lat = point.lat;
alert("完成定位")
geo.getLocation(point, (res) => {
console.log(res)
that.clockinAddr = res.address;


+ 1
- 1
src/views/lawEnforcement/userNew/user_new.vue View File

@@ -8,7 +8,7 @@
</van-col>
<van-col :span="19" v-show="loginType">
<p class="userName">{{user.nickName}}</p>
<p class="userDept">( {{roleGroup}} )</p>
<p class="userDept">{{roleGroup}}</p>
</van-col>
<van-col :span="24" v-show="loginButton">
<van-button icon="friends" color="red" style="border-radius: 30PX;padding: 0 30PX;height: 30PX;" to="/lawEnforcement/login">


Write Preview
Loading…
Cancel
Save