Bläddra i källkod

农业执法问题优化

wulanhaote
庞东旭 2 år sedan
förälder
incheckning
3983218af8
6 ändrade filer med 266 tillägg och 87 borttagningar
  1. +6
    -2
      src/components/common/lawNew_footer.vue
  2. +3
    -7
      src/views/lawEnforcement/caseAllocation/caseListNew.vue
  3. +7
    -1
      src/views/lawEnforcement/index_new.vue
  4. +204
    -63
      src/views/lawEnforcement/task/taskHandle.vue
  5. +46
    -14
      src/views/lawEnforcement/user/waitingProcessing.vue
  6. Binär
      static/images/lawEnforcement/new/index_icon_21.png

+ 6
- 2
src/components/common/lawNew_footer.vue Visa fil

@@ -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 @click="abc">
监控
<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>


+ 3
- 7
src/views/lawEnforcement/caseAllocation/caseListNew.vue Visa fil

@@ -37,7 +37,7 @@
<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" />
@@ -131,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(() => {});
},


+ 7
- 1
src/views/lawEnforcement/index_new.vue Visa fil

@@ -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;


+ 204
- 63
src/views/lawEnforcement/task/taskHandle.vue Visa fil

@@ -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
@@ -176,8 +176,7 @@
</van-collapse-item>
</van-collapse>
</div>

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

<div class="main_box">
<van-cell>
@@ -368,7 +367,7 @@
<span class="custom-title">案件文档<i class="bgBlue"></i></span>
</template>
</van-cell>
<van-uploader v-model="surveyOption" :after-read="afterRead" @delete="deleteFile" :show-upload="caseProgress == 1 && ( surveyForm.instanceId=='' || surveyForm.instanceId==null || surveyForm.instanceId==undefined )" :deletable="caseProgress == 1 && ( surveyForm.instanceId=='' || surveyForm.instanceId==null || surveyForm.instanceId==undefined )" />
<van-uploader v-model="surveyOption" :after-read="afterRead" @delete="deleteFile" :show-upload="!surveyDiglogStatus || (caseProgress == 1 && ( surveyForm.instanceId=='' || surveyForm.instanceId==null || surveyForm.instanceId==undefined ))" :deletable="!surveyDiglogStatus || (caseProgress == 1 && ( surveyForm.instanceId=='' || surveyForm.instanceId==null || surveyForm.instanceId==undefined ))" />
</div>
</van-form>

@@ -405,12 +404,36 @@
</van-row>
</div>
</template>
<div class="submit_box" v-if="caseProgress == 1 && ( surveyForm.instanceId=='' || surveyForm.instanceId==null || surveyForm.instanceId==undefined )">
<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=" type != 'waiting' || ( caseProgress == 1 && ( surveyForm.instanceId=='' || surveyForm.instanceId==null || surveyForm.instanceId==undefined ))">
<p class="submitButton" @click="preservation('submit')">保存</p>
<p class="submitButton" @click="submit">提交</p>
</div>
</van-tab>
<!-- 立案-->
<!--立案-->
<van-tab v-show="progressLength>=4" v-if="lianShow" :disabled="2 <= caseActive ? false : true">
<template #title>
<div
@@ -467,7 +490,7 @@
</van-collapse>
</div>

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

<div class="main_box">
<van-cell>
@@ -676,7 +699,7 @@
<span class="custom-title">案件文档<i class="bgBlue"></i></span>
</template>
</van-cell>
<van-uploader v-model="samplingOption" :after-read="afterReadSampling" :before-delete="deleteFileSampling" :show-upload="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )" :deletable="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )" />
<van-uploader v-model="samplingOption" :after-read="afterReadSampling" :before-delete="deleteFileSampling" :show-upload="!recordDiglogStatus || (caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined ))" :deletable="!recordDiglogStatus || (caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined ))" />
</div>

</van-form>
@@ -713,12 +736,39 @@
</van-row>
</div>
</template>
<div class="submit_box" v-if="caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined )">

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

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

<div class="submit_box" v-if=" type != 'waiting' || (caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined ))">
<p class="submitButton" @click="submitPutRecordForm('submit')">保存</p>
<p class="submitButton" @click="submitDefine">提交</p>
</div>
</van-tab>
<!-- 取证-->
<!--取证-->
<van-tab v-show="progressLength>=5" v-if="quzhengShow" :disabled="3 <= caseActive ? false : true">
<template #title>
<div
@@ -774,7 +824,7 @@
</van-collapse-item>
</van-collapse>
</div>
<van-form :readonly="caseProgress != 3 || (evidenceForm.instanceId!='' && evidenceForm.instanceId!=null && evidenceForm.instanceId!=undefined)">
<van-form :readonly="evidenceDiglogStatus && (caseProgress != 3 || (evidenceForm.instanceId!='' && evidenceForm.instanceId!=null && evidenceForm.instanceId!=undefined))">
<div class="main_box">
<van-cell>
<template #title>
@@ -886,6 +936,33 @@
</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>

<div class="submit_box" v-if="caseProgress == 3 && ( evidenceForm.instanceId=='' || evidenceForm.instanceId==null || evidenceForm.instanceId==undefined )">
<p class="submitButton" @click="submitEvidenceForm('submit')">保存</p>
<p class="submitButton" @click="submitDefineEvidenceForm">提交</p>
@@ -1619,6 +1696,10 @@ export default {
showSurveyEndTime:false,
showConclusion:false,

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

form:{},
caseProgress:0,
caseActive:0,
@@ -2075,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()
}
})
@@ -2083,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);

},

/** 保存审批意见提交 */
@@ -2254,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;
@@ -2265,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)
});
});
}
@@ -2300,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)
@@ -2311,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)
});
});
}
@@ -2346,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)
});

});
@@ -2394,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;
@@ -2455,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)
});

});
@@ -2498,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)
});

});
@@ -3444,7 +3585,7 @@ export default {
// 监听路由变化, 实现类似 小程序的 onShow 事件
if (to.path === '/lawEnforcement/taskHandle') {
// do anything you want
console.log(this.tEnforceCaseHandlerList)
console.log(this.tEnforcePutRecordHandlerList)
if (Cookies.get('enforcer')){
console.log(this.enforceType)
JSON.parse(Cookies.get('enforcer')).map((res,index)=>{


+ 46
- 14
src/views/lawEnforcement/user/waitingProcessing.vue Visa fil

@@ -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="待办事项">
@@ -27,13 +24,13 @@
:key="index"
:value="item.formData.createTime == null ? '' : item.formData.createTime.substr(5,5)"
: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':'lawEnforcementTaskHandle',
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>
@@ -240,6 +237,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;


Binär
static/images/lawEnforcement/new/index_icon_21.png Visa fil

Före Efter
Bredd: 68  |  Höjd: 68  |  Storlek: 4.6 KiB

Laddar…
Avbryt
Spara