-
-
-
- 检测结果
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 案件信息
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- 案件信息
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 案件文档
+
+
+
+
+
+
-
-
-
-
- 案件文档
-
-
-
-
-
审批流程
@@ -1124,7 +1443,23 @@ import {
getExecuteByCaseId ,
getEndingByCaseId ,
progressList ,
- getOnrecordByCaseId
+ getOnrecordByCaseId,
+ getDeptName,
+ addSurvey,
+ updateSurvey,
+ addProgress,
+ updateCase,
+ addOnrecord,
+ commonUpload,
+ updatePutrecord,
+ updateSampling,
+ addSampling,
+ addPutrecord,
+ updateEvidence,
+ addEvidence,
+ caseHandlerList,
+ enforceLockinCount,
+ getCaseNum
} from "@/api/lawEnforcement/index";
import law from "@/components/common/law_footer";
import request from "@/utils/request";
@@ -1135,6 +1470,10 @@ export default {
},
data() {
return {
+ activeNames: ['1'],
+ activeNames1: ['1'],
+ activeNames2: ['1'],
+
showBankType:false,
showPayeeType:false,
showPicker:false,
@@ -1146,6 +1485,8 @@ export default {
payeeType:'',
value:'',
type:'',
+ surveyResult:'',
+ conclusion:'',
progressLength:0,
zhenchaShow:true,
@@ -1165,6 +1506,9 @@ export default {
qualityStatusOptions:[],
samplingSceneOptions:[],
conclusionOptions:[],
+ surveyResultOptions:[],
+ surveyResultOptionsY:[],
+ surveyResultOptionsN:[],
minDate: new Date(2020, 0, 1),
maxDate: new Date(2025, 10, 1),
currentDate: new Date(2021, 0, 17),
@@ -1456,6 +1800,7 @@ export default {
historyList: [],
evidencHistoryList: [],
treatHistoryList: [],
+ putRecordHistoryList: [],
// 检测结果数据
detectResults: [],
decisionEnforcers: [],
@@ -1529,6 +1874,19 @@ export default {
this.getDicts("aging_status").then(response => {
this.agingStatusOptions = response.data;
});
+ this.getDicts("team_category").then(response => {
+ this.belongTeamOptions = response.data;
+ });
+ this.getDicts("approve_type").then(response => {
+ response.data.map(res=>{
+ if (res.dictValue == '1'||res.dictValue == '3'||res.dictValue == '4'){
+ this.surveyResultOptionsY.push(res);
+ }
+ if (res.dictValue == '1'||res.dictValue == '2'){
+ this.surveyResultOptionsN.push(res);
+ }
+ })
+ });
// 关联方案下拉框
var schemeQueryParam = {
applyStatus: "1"
@@ -1538,9 +1896,6 @@ export default {
this.schemeOptions = response.data;
this.getInformation();
});
-
-
-
// treeselect().then((response) => {
// this.deptOptions = response.data;
// });
@@ -1627,17 +1982,24 @@ 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.schemeId = response.data.schemeId == '' ? '' : this.selectDictScheme(this.schemeOptions, response.data.schemeId);
+ response.data.typeLable = response.data.typeLable == '' ? '' : this.selectDictLabel(this.typeOptions, response.data.type);
+ response.data.nation = response.data.nation == '' ? '' : this.selectDictLabel(this.nationOptions, response.data.nation);
+
+ 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);
+ getDeptName(response.data.deptId).then(res => {
+ response.data.deptId = res.data.deptName
+ });
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
});
})
}
@@ -1690,22 +2052,38 @@ export default {
if (this.form.id != null && this.form.id != "") {
this.surveyForm.caseId = this.form.id;
getSurveyByCaseId(this.form.id).then(responseSurvey => {
- console.log(responseSurvey)
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)=>{
+ responseEnforce.enforcerLeader = responseEnforce.enforcerLeader=='Y'? true:false
+ let data = {
+ enforcerId : responseEnforce.enforcerId,
+ caseId:this.form.id,
+ relationType: "2"
+ }
+ enforceLockinCount(data).then(resEnforceLockin => {
+ _this.$set(_this.tEnforceCaseHandlerList[index],"num",resEnforceLockin.data)
+ });
+ });
+ }
+ }else{
+
}
if (responseSurvey.data.attachement){
var attachement = responseSurvey.data.attachement.split( "," );
attachement.forEach(response=>{
this.surveyOption.push({
- url:response
+ url:'/api'+response,
+ isImage: true
});
+ this.openPic2.push(response)
})
}
- _this.surveyForm.gender = this.selectDictLabel(this.sexOptions, _this.surveyForm.gender);
- _this.surveyForm.surveyResult = this.selectDictLabel(this.surveyResultOptions, _this.surveyForm.surveyResult);
+ // _this.surveyForm.gender = this.selectDictLabel(this.sexOptions, _this.surveyForm.gender);
+ _this.surveyResult = this.selectDictLabel(this.surveyResultOptions, _this.surveyForm.surveyResult);
_this.surveyForm.caseName = this.form.caseName;
_this.surveyForm.schemeId = this.form.schemeId;
// 查询审批历史记录
@@ -1722,37 +2100,94 @@ 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.tEnforcePutRecordHandlerList = responsePutRecord.data.tEnforceCaseHandlerList;
- _this.tEnforceDetainHandlerList = responsePutRecord.data.tEnforceDetainHandlerList;
+ _this.tEnforceDetainHandlerList = responsePutRecord.data.tEnforceDetainHandlerList == null ? [] : responsePutRecord.data.tEnforceDetainHandlerList;
+ if (responsePutRecord.data.id == ''){
+
+ // 立案表单没有保存之前,办理人员默认获取上一节点勘察的办理人员列表
+ const queryEnforcerParams = {
+ relationType: "2",
+ caseId: this.form.id
+ };
+ caseHandlerList(queryEnforcerParams).then(responseHandlerList => {
+ responseHandlerList.data.relationType = "3";
+ _this.tEnforcePutRecordHandlerList = responseHandlerList.data;
+ if (responseHandlerList.data){
+ responseHandlerList.data.map((responseEnforce,index)=>{
+ responseEnforce.enforcerLeader = responseEnforce.enforcerLeader=='Y'? true:false
+
+ let data = {
+ enforcerId : responseEnforce.enforcerId,
+ caseId:this.form.id,
+ relationType: "3"
+ }
+ enforceLockinCount(data).then(resEnforceLockin => {
+ _this.$set(_this.tEnforcePutRecordHandlerList[index],"num",resEnforceLockin.data)
+ });
+
+ });
+ }
+ });
+ }else{
+ _this.tEnforcePutRecordHandlerList = responsePutRecord.data.tEnforceCaseHandlerList;
+ if (responsePutRecord.data.tEnforceCaseHandlerList){
+ console.log(responsePutRecord.data.tEnforceCaseHandlerList)
+ responsePutRecord.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
+ responseEnforce.enforcerLeader = responseEnforce.enforcerLeader=='Y'? true:false
+ let data = {
+ enforcerId : responseEnforce.enforcerId,
+ caseId:this.form.id,
+ relationType: "3"
+ }
+ 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;
_this.tEnforceSamplingGoodsList = responseSampling.data.tEnforceSamplingGoodsList;
for (var i = 0 ; i < responseSampling.data.tEnforceSamplingGoodsList.length ; i++){
- if (responseSampling.data.tEnforceSamplingGoodsList[i].attachement){
+ responseSampling.data.tEnforceSamplingGoodsList[i].showTimeliness = false;
+ if (responseSampling.data.tEnforceSamplingGoodsList[i].attachement != null){
responseSampling.data.tEnforceSamplingGoodsList[i].attachementList = [];
var Sampling = responseSampling.data.tEnforceSamplingGoodsList[i].attachement.split( "," );
Sampling.forEach(response=>{
responseSampling.data.tEnforceSamplingGoodsList[i].attachementList.push({
- url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response,
+ url:'/api' + response,
+ isImage: true
});
+ // process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API
})
+ }else{
+ responseSampling.data.tEnforceSamplingGoodsList[i].attachement = [];
}
}
console.log(responseSampling.data.tEnforceSamplingGoodsList)
}
- if (responsePutRecord.data.attachement){
- var attachement = responsePutRecord.data.attachement.split( "," );
- attachement.forEach(response=>{
- this.samplingOption.push({
- url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response,
- });
- })
- }
+
_this.putRecordForm.caseName = this.form.caseName;
_this.putRecordForm.schemeId = this.form.schemeId;
+ // 查询审批历史记录
+ _this.getHistoryList(_this.putRecordForm,'putRecord');
});
});
}
@@ -1774,47 +2209,110 @@ export default {
responseReport.data.goodsId = goodsId;
responseReport.data.goodsName = goodsName;
responseReport.data.attachementList = [];
-
+ if (responseReport.data.attachement){
+ var Evidence = responseReport.data.attachement.split( "," );
+ console.log(Evidence)
+ Evidence.forEach(response=>{
+ responseReport.data.attachementList.push({
+ url:'/api' + response,
+ });
+ })
+ }else{
+ responseReport.data.attachement = [];
+ responseReport.data.attachementList = [];
+ }
_this.detectResults.push(responseReport.data);
} else {
var goodsObj = {
"goodsId": goodsId,
- "goodsName": goodsName
+ "goodsName": goodsName,
+ attachement:[]
};
_this.detectResults.push(goodsObj);
}
});
+ // if (responseSampling.data.tEnforceSamplingGoodsList[i].attachement){
+ // responseSampling.data.tEnforceSamplingGoodsList[i].attachementList = [];
+ // var Sampling = responseSampling.data.tEnforceSamplingGoodsList[i].attachement.split( "," );
+ // Sampling.forEach(response=>{
+ // responseSampling.data.tEnforceSamplingGoodsList[i].attachementList.push({
+ // url: '/api' + response,
+ // });
+ // // process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API
+ // })
+ // }else{
+ // responseSampling.data.tEnforceSamplingGoodsList[i].attachement = [];
+ // responseSampling.data.tEnforceSamplingGoodsList[i].attachementList = [];
+ // }
}
+
+
+
if (responseEvidence.data != undefined) {
responseEvidence.data.attachementList = [];
+ _this.tEnforceEvidenceHandlerList = responseEvidence.data.tEnforceCaseHandlerList;
+ if (responseEvidence.data.tEnforceCaseHandlerList){
+ responseEvidence.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
+ responseEnforce.enforcerLeader = responseEnforce.enforcerLeader=='Y'? true:false
+ let data = {
+ enforcerId : responseEnforce.enforcerId,
+ caseId:this.form.id,
+ relationType: "4"
+ }
+ enforceLockinCount(data).then(resEnforceLockin => {
+ _this.$set(_this.tEnforceEvidenceHandlerList[index],"num",resEnforceLockin.data)
+ });
+
+ });
+ }
responseEvidence.data.conclusion = this.selectDictLabel(this.conclusionOptions,responseEvidence.data.conclusion)
_this.evidenceForm = responseEvidence.data;
- _this.tEnforceEvidenceHandlerList = responseEvidence.data.tEnforceCaseHandlerList;
- console.log(responseEvidence.data)
+
+
if (responseEvidence.data.attachement){
var Evidence = responseEvidence.data.attachement.split( "," );
Evidence.forEach(response=>{
responseEvidence.data.attachementList.push({
- url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response,
+ url:'/api' + response,
});
})
+ // process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API
+ }else{
+ responseEvidence.data.attachement = [];
}
- }
- setTimeout(function () {
- for (var i = 0 ; i < responseSampling.data.tEnforceSamplingGoodsList.length ; i++){
- console.log(_this.detectResults[0])
- if (responseSampling.data.tEnforceSamplingGoodsList[i].attachement){
- var Sampling = responseSampling.data.tEnforceSamplingGoodsList[i].attachement.split( "," );
- Sampling.forEach(response=>{
- _this.detectResults[i].attachementList.push({
- url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response,
+ }else{
+ _this.evidenceForm.attachement = [];
+
+
+ // 取证表单没有保存之前,办理人员默认获取上一节点立案的办理人员列表
+ const queryEnforcerParams = {
+ relationType: "3",
+ caseId: this.form.id
+ };
+ caseHandlerList(queryEnforcerParams).then(responseHandlerList => {
+ responseHandlerList.data.relationType = "4";
+ _this.tEnforceEvidenceHandlerList = responseHandlerList.data;
+
+ if (responseHandlerList.data){
+ responseHandlerList.data.map((responseEnforce,index)=>{
+ responseEnforce.enforcerLeader = responseEnforce.enforcerLeader=='Y'? true:false
+ let data = {
+ enforcerId : responseEnforce.enforcerId,
+ caseId:this.form.id,
+ relationType: "4"
+ }
+ enforceLockinCount(data).then(resEnforceLockin => {
+ _this.$set(_this.tEnforceEvidenceHandlerList[index],"num",resEnforceLockin.data)
});
- })
+
+ });
}
- }
- },1000)
+ });
+
+ }
+
_this.evidenceForm.caseName = this.form.caseName;
_this.evidenceForm.schemeId = this.form.schemeId;
// 查询审批历史记录
@@ -2136,6 +2634,7 @@ export default {
/** 查询审批历史展示步骤条 */
getHistoryList(formData,type) {
+ console.log(formData)
if (formData.instanceId != null && formData.instanceId != "") {
var queryParams = {
processInstanceId: formData.instanceId
@@ -2164,6 +2663,15 @@ export default {
row.durationInMillis / 1000
);
});
+ }else if (type == 'putRecord'){
+ this.putRecordHistoryList = response.rows;
+ this.putRecordHistoryList.forEach((row) => {
+ row.startTime = this.format(row.startTime, "yyyy-MM-dd HH:mm:ss");
+ row.endTime = this.format(row.endTime, "yyyy-MM-dd HH:mm:ss");
+ row.durationInMillis = this.formatTotalDateSub(
+ row.durationInMillis / 1000
+ );
+ });
}else{
this.historyList = response.rows;
this.historyList.forEach((row) => {
@@ -2272,6 +2780,9 @@ export default {
top: 36px;
}
}
+/deep/ .van-collapse-item__content{
+ padding: 0;
+}
.van-row{
display: flex;
flex-wrap: wrap;
@@ -2412,6 +2923,7 @@ export default {
.peopleList{
padding: 0 3%;
margin-top: 10PX;
+ text-align: center;
.van-row{
margin-bottom: 10PX;
.van-col{
@@ -2424,6 +2936,13 @@ export default {
}
}
}
+ .icon_box{
+ display: flex;
+ justify-content: space-around;
+ /deep/ .van-checkbox{
+ justify-content: center;
+ }
+ }
}
.cf{
padding: 0 3%;
diff --git a/src/views/lawEnforcement/caseAllocation/caseAdd.vue b/src/views/lawEnforcement/caseAllocation/caseAdd.vue
index 330ee7fb..88305f36 100644
--- a/src/views/lawEnforcement/caseAllocation/caseAdd.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseAdd.vue
@@ -267,36 +267,36 @@
-
-
-
-
-
- 执法人员
-
-
-
- 序号
- 执行人员
- 执法证号
- 带队人
-
-
- {{index+1}}
- {{item.enforcerName}}
- {{item.enforcerNum}}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
保存
保存并提交
@@ -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)
+ }
})
}
}
diff --git a/src/views/lawEnforcement/caseAllocation/caseDetail.vue b/src/views/lawEnforcement/caseAllocation/caseDetail.vue
index be91056f..15b05e97 100644
--- a/src/views/lawEnforcement/caseAllocation/caseDetail.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseDetail.vue
@@ -1,7 +1,7 @@
@@ -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){
diff --git a/src/views/lawEnforcement/caseAllocation/caseDistribution.vue b/src/views/lawEnforcement/caseAllocation/caseDistribution.vue
index 174c908c..f4319abd 100644
--- a/src/views/lawEnforcement/caseAllocation/caseDistribution.vue
+++ b/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)
+ }
})
}
});
diff --git a/src/views/lawEnforcement/caseAllocation/caseEdit.vue b/src/views/lawEnforcement/caseAllocation/caseEdit.vue
index d018d259..04242db0 100644
--- a/src/views/lawEnforcement/caseAllocation/caseEdit.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseEdit.vue
@@ -182,9 +182,9 @@
-
-
-
+
+
+
男
女
diff --git a/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue b/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue
index 128d6c10..078e9054 100644
--- a/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue
@@ -7,8 +7,9 @@
+
+
@@ -30,22 +31,27 @@
- 执行主体
+ 带队人
执行人员
-
-
-
- {{item.belongTeam}}
- {{item.name}}
- {{item.enforceNum}}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{item.name}}
+ {{item.enforceNum}}
+
+
+
+
+
+
+
+
@@ -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(){
diff --git a/src/views/lawEnforcement/caseAllocation/caseListNew.vue b/src/views/lawEnforcement/caseAllocation/caseListNew.vue
index 09be12ef..e5f60d28 100644
--- a/src/views/lawEnforcement/caseAllocation/caseListNew.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseListNew.vue
@@ -19,7 +19,7 @@
finished-text="没有更多了"
@load="getList"
>
-
+
@@ -28,7 +28,7 @@
{{item.caseSourceText}}
第{{item.belongTeamText}}
{{item.registerDate}}
- {{item.caseProgressName}}
+ {{ item.caseProgressName}}
@@ -43,7 +43,7 @@
- 添加
执法
员
+ 添加
执法
员
@@ -153,8 +153,8 @@
this.loading = false;
this.finished = false;
this.queryApplyParams.pageNum = 1 ;
- this.getList();
this.$notify({ type: 'success', message: '提交成功' });
+ location.reload();
}).catch(() => {});
}
},
diff --git a/src/views/lawEnforcement/caseQuery/caseQuery.vue b/src/views/lawEnforcement/caseQuery/caseQuery.vue
index e0f47e2f..5043a067 100644
--- a/src/views/lawEnforcement/caseQuery/caseQuery.vue
+++ b/src/views/lawEnforcement/caseQuery/caseQuery.vue
@@ -19,10 +19,11 @@
@load="getList"
>
-
+
- {{item.caseNumPart1}}农 {{item.caseNumPart2}} [{{item.caseNumPart3}}] {{item.caseNum}}号
- {{item.caseProgress}}
+ 无
+ {{item.caseNumPart1}}农 {{item.caseNumPart2}} {{item.caseNumPartType}} [{{item.caseNumPart3}}] {{item.caseNum}}号
+ {{item.caseProgressText}}
@@ -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){
diff --git a/src/views/lawEnforcement/caseQuery/caseQueryDocument.vue b/src/views/lawEnforcement/caseQuery/caseQueryDocument.vue
index 48df9a74..f4784526 100644
--- a/src/views/lawEnforcement/caseQuery/caseQueryDocument.vue
+++ b/src/views/lawEnforcement/caseQuery/caseQueryDocument.vue
@@ -10,68 +10,68 @@
{{caseName}}
+
- 登记
+ {{item.caseProgressName}}
-
+
- {{item[index].substr(27,item[index].length)}}
+ {{itemChildren.substr(51,itemChildren.length)}}
- 下载
+ 下载
-
+
-
-
-
-
- 勘察
-
-
-
-
-
-
- {{item[index].substr(27,item[index].length)}}
-
-
- 下载
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- 备案
-
-
-
-
-
-
- {{item[index].substr(27,item[index].length)}}
-
-
- 下载
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 关联案件
+ 关联案件
diff --git a/src/views/lawEnforcement/supervise/enterpriseRelation.vue b/src/views/lawEnforcement/supervise/enterpriseRelation.vue
index e1bbd9e2..7dec91c0 100644
--- a/src/views/lawEnforcement/supervise/enterpriseRelation.vue
+++ b/src/views/lawEnforcement/supervise/enterpriseRelation.vue
@@ -17,14 +17,14 @@
@load="getList"
>
-
+
{{item.caseName}}
-
投诉案件
-
{{item.caseProgress}}
+
{{item.caseSource}}
+
{{item.caseProgressText}}
{{item.caseSource}}
-
{{item.caseProgress}}
+
{{item.caseProgressText}}
@@ -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);
})
diff --git a/src/views/lawEnforcement/task/signInRecord.vue b/src/views/lawEnforcement/task/signInRecord.vue
index c4034c66..15b33699 100644
--- a/src/views/lawEnforcement/task/signInRecord.vue
+++ b/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: '保存成功' });
+ }
})
}
},
diff --git a/src/views/lawEnforcement/task/task.vue b/src/views/lawEnforcement/task/task.vue
index 3d51e4d9..66403e9b 100644
--- a/src/views/lawEnforcement/task/task.vue
+++ b/src/views/lawEnforcement/task/task.vue
@@ -17,7 +17,7 @@
{{item.caseName}}
{{item.caseSource}}
- 分配时间：{{item.registerDate}}
+ 分配时间：{{item.handlerSetDate}}
diff --git a/src/views/lawEnforcement/task/taskDetail.vue b/src/views/lawEnforcement/task/taskDetail.vue
index e22c6315..60daf9db 100644
--- a/src/views/lawEnforcement/task/taskDetail.vue
+++ b/src/views/lawEnforcement/task/taskDetail.vue
@@ -13,13 +13,13 @@
-
+
-
+
@@ -102,7 +102,7 @@
diff --git a/src/views/lawEnforcement/trace/fertilizer.vue b/src/views/lawEnforcement/trace/fertilizer.vue
index 0e5c513b..1a7769ac 100644
--- a/src/views/lawEnforcement/trace/fertilizer.vue
+++ b/src/views/lawEnforcement/trace/fertilizer.vue
@@ -15,7 +15,7 @@