diff --git a/src/api/lawEnforcement/index.js b/src/api/lawEnforcement/index.js
index a540408b..dddf1f74 100644
--- a/src/api/lawEnforcement/index.js
+++ b/src/api/lawEnforcement/index.js
@@ -620,3 +620,73 @@ export function addOnrecord(data) {
data: data
})
}
+// 新增立案信息
+export function addPutrecord(data) {
+ return request({
+ url: '/enforce/putrecord/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改立案信息
+export function updatePutrecord(data) {
+ return request({
+ url: '/enforce/putrecord/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+// 新增抽样信息
+export function addSampling(data) {
+ return request({
+ url: '/enforce/sampling/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改抽样信息
+export function updateSampling(data) {
+ return request({
+ url: '/enforce/sampling/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+// 新增农业执法-案件-取证信息
+export function addEvidence(data) {
+ return request({
+ url: '/enforce/evidence/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改农业执法-案件-取证信息
+export function updateEvidence(data) {
+ return request({
+ url: '/enforce/evidence/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+// 查询处理流程关联办理人员列表
+export function caseHandlerList(query) {
+ return request({
+ url: '/enforce/caseHandler/caseHandlerList',
+ method: 'get',
+ params: query
+ })
+}
+
+// 删除案件登记
+export function delCase(id) {
+ return request({
+ url: '/enforce/case/remove/' + id,
+ method: 'get'
+ })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 7cd6b4b1..fca2aac5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2359,15 +2359,15 @@ export const constantRoutes = [
},
component: (resolve) => require(['@/views/lawEnforcement/index'], resolve)
},
- {
- path: '/lawEnforcement/caseList',
- name: 'caseList',
- meta: {
- title: '案件',
- hidden: true,
- },
- component: (resolve) => require(['@/views/lawEnforcement/case/caseList'], resolve)
- },
+ // {
+ // path: '/lawEnforcement/caseList',
+ // name: 'caseList',
+ // meta: {
+ // title: '案件',
+ // hidden: true,
+ // },
+ // component: (resolve) => require(['@/views/lawEnforcement/case/caseList'], resolve)
+ // },
{
path: '/lawEnforcement/productsList',
name: 'caseList',
@@ -3829,15 +3829,25 @@ export const constantRoutes = [
},
component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseAdd'], resolve)
},
+ { ////农业执法(新)-- 巡查登记
+ path: '/lawEnforcement/caseEdit',
+ name: 'lawEnforcementCaseEdit',
+ meta: {
+ title: '登记修改',
+ hidden: true,
+ keepAlive: true
+ },
+ component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseEdit'], resolve)
+ },
{ ////农业执法(新)-- 巡查登记列表
- path: '/lawEnforcement/caseList',
+ path: '/lawEnforcement/caseListNew',
name: 'lawEnforcementCaseListNew',
meta: {
- title: '巡查登记',
+ title: '登记列表',
hidden: true,
keepAlive: true
},
- component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseList'], resolve)
+ component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseListNew'], resolve)
},
{ ////农业执法(新)-- 记录查看
path: '/lawEnforcement/taskSignInSee',
@@ -3857,6 +3867,15 @@ export const constantRoutes = [
keepAlive: true
},
component: (resolve) => require(['@/views/lawEnforcement/task/taskHandle'], resolve)
+ },
+ { ////农业执法(新)-- 案件处理
+ path: '/lawEnforcement/caseEnforceList',
+ name: 'lawEnforcementCaseEnforceList',
+ meta: {
+ title: '添加执法人员',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseEnforceList'], resolve)
}
];
diff --git a/src/views/lawEnforcement/caseAllocation/caseAdd.vue b/src/views/lawEnforcement/caseAllocation/caseAdd.vue
index 17e9d165..748cbef5 100644
--- a/src/views/lawEnforcement/caseAllocation/caseAdd.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseAdd.vue
@@ -260,7 +260,7 @@
*请上传不超过5MB 格式为doc/xls/png/jpg/jpeg的文件
-
+
@@ -298,7 +298,7 @@
@@ -306,7 +306,7 @@
+
+
diff --git a/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue b/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue
new file mode 100644
index 00000000..128d6c10
--- /dev/null
+++ b/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue
@@ -0,0 +1,331 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+ 执行主体
+ 执行人员
+
+
+
+
+ {{item.belongTeam}}
+ {{item.name}}
+ {{item.enforceNum}}
+
+
+
+
+
+
+
+
+
+
+
确定
+
+
+
+
+
+
+
diff --git a/src/views/lawEnforcement/caseAllocation/caseList.vue b/src/views/lawEnforcement/caseAllocation/caseList.vue
deleted file mode 100644
index f4a274cd..00000000
--- a/src/views/lawEnforcement/caseAllocation/caseList.vue
+++ /dev/null
@@ -1,311 +0,0 @@
-
-
-
-
-
-
-
-
- {{item.caseName}}
-
- {{item.caseSource}}
- 分配时间:{{item.registerDate}}
-
-
-
-
-
执法人:{{item.legalName}}
-
{{item.caseProgress}}
-
-
-
-
-
-
-
-
-
- 上传
文件
-
-
- 案件
处理
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/lawEnforcement/caseAllocation/caseListNew.vue b/src/views/lawEnforcement/caseAllocation/caseListNew.vue
new file mode 100644
index 00000000..a3f892f5
--- /dev/null
+++ b/src/views/lawEnforcement/caseAllocation/caseListNew.vue
@@ -0,0 +1,274 @@
+
+
+
+
+
+
+
+

+
+

+
+
+
+
+
+
+
+
+
+ {{item.caseSourceText}}
+ 第{{item.belongTeamText}}
+ {{item.registerDate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
执法
员
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/lawEnforcement/index_new.vue b/src/views/lawEnforcement/index_new.vue
index 8729c55b..83bd8392 100644
--- a/src/views/lawEnforcement/index_new.vue
+++ b/src/views/lawEnforcement/index_new.vue
@@ -266,9 +266,6 @@ export default {
box-shadow: 0px 3PX 6PX rgba(0,0,0,0.16);
border-radius: 5PX;
overflow: hidden;
- &:nth-child(2){
- margin: 0 10PX;
- }
}
/deep/ .van-grid-item__content{
p{
diff --git a/src/views/lawEnforcement/task/task.vue b/src/views/lawEnforcement/task/task.vue
index adf7e3bf..3d51e4d9 100644
--- a/src/views/lawEnforcement/task/task.vue
+++ b/src/views/lawEnforcement/task/task.vue
@@ -22,7 +22,7 @@
-
执法人:{{item.legalName}}
+
执法人:{{item.handlerNameStr}}
{{item.caseProgressName}}
@@ -258,11 +258,13 @@
/deep/.van-cell__label .label {
display: flex;
justify-content: space-between;
+ align-items: center;
p{
display: inline-block;
font-size: 0.35rem;
&:first-child{
color: #333333;
+ width: 70%;
}
&:last-child{
padding: 0 7PX;
diff --git a/src/views/lawEnforcement/task/taskDetail.vue b/src/views/lawEnforcement/task/taskDetail.vue
index 784c3fd7..34f2d614 100644
--- a/src/views/lawEnforcement/task/taskDetail.vue
+++ b/src/views/lawEnforcement/task/taskDetail.vue
@@ -59,20 +59,8 @@
附件
-
-
-
- 产品确认
- 通知书
-
-
-
- 产品确认
- 通知书
-
-
-
-
+
+
@@ -181,6 +169,17 @@
getDeptName(response.data.deptId).then(res => {
response.data.deptId = res.data.deptName
});
+ if (response.data.attachement){
+ response.data.attachementList = [];
+ var attachement = response.data.attachement.split( "," );
+ attachement.forEach(responseAttach=>{
+ response.data.attachementList.push({
+ url:'/api' + responseAttach,
+ isImage: true
+ });
+ })
+ // process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API
+ }
this.form = response.data;
});
getSurveyByCaseId(this.$route.query.id).then((response) => {
diff --git a/src/views/lawEnforcement/task/taskHandle.vue b/src/views/lawEnforcement/task/taskHandle.vue
index bfed9024..e47ac954 100644
--- a/src/views/lawEnforcement/task/taskHandle.vue
+++ b/src/views/lawEnforcement/task/taskHandle.vue
@@ -1,12 +1,10 @@
-
+
+
@@ -173,7 +171,7 @@
-
+
@@ -193,7 +191,7 @@
-
+
@@ -451,7 +449,7 @@
带队人
-
+
{{index+1}}
{{item.enforcerName}}
{{item.enforcerNum}}
@@ -461,137 +459,266 @@
-
+
+
-
-
-
-
- 查封扣押
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 财务名称
- 规格
- 数量
- 生产日期
- 生产经营单位
-
-
-
- {{item.name}}
- {{item.size}}
- {{item.propertyNum}}
- {{item.productTimeNum}}
- {{item.productUnit}}
-
+
-
+
+
+
+
+ 查封扣押
+
+
-
-
-
-
- 证据先行
- 保存通知书
-
-
-
- 查封扣押
- 现场笔录
-
-
-
- 查封扣押
- 决定书
-
-
-
-
-
+
+
-
-
-
-
- 抽样信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 本地
+ 异地
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 财务名称
+ 规格
+ 数量
+ 生产日期
+ 生产经营单位
+
+
+
+
+
+
+
+
+
+

+
- 产品确认
- 通知书
+ 证据先行
+ 保存通知书
- 抽样取证
- 凭证
+ 查封扣押
+ 现场笔录
+
+
+
+ 查封扣押
+ 决定书
-
-
-
-
-
-
- 案件信息
-
-
-
-
-
-
-
-
-
- 案件文档
-
-
-
-
+
+
+
+
+ 抽样信息
+
+
+
+
+
+
+ 当事人
+ 有关人员
+
+
+
+
+
+
+
+
+
+
+
+
物品信息{{index+1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 产品确认
+ 通知书
+
+
+
+ 抽样取证
+ 凭证
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+ 案件信息
+
+
+
+
+
+
+
+
+
+
+ 案件文档
+
+
+
+
+
+
+
+
@@ -614,135 +741,164 @@
取证
-
-
+
+
-
-
-
-
- 办理人员
-
-
-
-
- 序号
- 执行人员
- 执法证号
-
-
-
- {{index+1}}
- {{item.enforcerName}}
- {{item.enforcerNum}}
-
+
+
+
+
+ 执法人员
+
+
+
+ 序号
+ 执行人员
+ 执法证号
+ 带队人
+
-
-
+
+ {{index+1}}
+ {{item.enforcerName}}
+ {{item.enforcerNum}}
+
+
+
+
+
+
-
-
-
-
- 检测结果
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 案件信息
-
-
-
-
-
-
-
-
-
+
+

+
+
+
+
+
+
+
+
+ 检测结果
+
+
+
+
+
+
+
+
+
+ 合格
+ 不合格
+
+
+
+
+
+
+
-
-
-
-
- 案件文档
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
审批流程
-
-
-
- {{index+1}}
-
-
-
-
-
- {{ item.assigneeName }}
-
-
+
-
-
- {{ item.endTime }}
-
-
- {{ item.durationInMillis }}
-
-
+
+
+
+
+ 案件信息
+
+
+
+
+
+
+
+
+
-
审批意见:{{ item.comment }}
-
-
+
+
+
+
+
+
+ 案件文档
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 审批
意见
-
-
- 同意
- 驳回
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1277,6 +1433,7 @@
@cancel="showAskStartTime = false"
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
// this.deptOptions = response.data;
// });
-
+ },
+ beforeRouteEnter (to, from, next) {
+ /*
+ to:获取你要跳转的路由信息
+ from: 获取你从哪个路由来的信息
+ next: (放行函数)
+ // 第一种写法
+ next(); // 直接放行
+ // 第二种
+ next('/url') //放行到指定的路由
+ */
+ next(vm => {
+ console.log(from.path)
+ console.log(to.path)
+ if (from.path === '/lawEnforcement/task'){
+ location.reload()
+ }
+ })
},
methods: {
- abc(){
- this.showAskEndTime = true
- },
/** 保存审批意见提交 */
submitCase() {
const data = {
@@ -1822,6 +2072,7 @@ export default {
}
});
},
+
/** 保存审批意见提交 */
submitEvidence() {
const data = {
@@ -1848,6 +2099,7 @@ export default {
}
});
},
+
/** 保存审批意见提交 */
submitTreat() {
const data = {
@@ -1874,6 +2126,7 @@ export default {
}
});
},
+
getInformation(){
getCase(this.$route.query.id).then(response => {
console.log(response)
@@ -1940,6 +2193,7 @@ export default {
// }
});
},
+
//勘察表单查询
caseSurvey(){
// 查询勘察表单数据
@@ -1982,22 +2236,42 @@ export default {
getSamplingByCaseId(_this.form.id).then(responseSampling => {
if(responsePutRecord.data != undefined){
_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.instanceId == ''){
+
+ // 立案表单没有保存之前,办理人员默认获取上一节点勘察的办理人员列表
+ const queryEnforcerParams = {
+ relationType: "2",
+ caseId: this.form.id
+ };
+ caseHandlerList(queryEnforcerParams).then(responseHandlerList => {
+ responseHandlerList.data.relationType = "3";
+ _this.tEnforcePutRecordHandlerList = responseHandlerList.data;
+
+ });
+ }else{
+ _this.tEnforcePutRecordHandlerList = responsePutRecord.data.tEnforceCaseHandlerList;
+ }
}
if(responseSampling.data != undefined) {
_this.samplingForm = responseSampling.data;
_this.tEnforceSamplingGoodsList = responseSampling.data.tEnforceSamplingGoodsList;
for (var i = 0 ; i < responseSampling.data.tEnforceSamplingGoodsList.length ; i++){
+ responseSampling.data.tEnforceSamplingGoodsList[i].showTimeliness = false;
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: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)
@@ -2006,9 +2280,13 @@ export default {
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,
+ 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;
@@ -2033,12 +2311,19 @@ export default {
responseReport.data.goodsId = goodsId;
responseReport.data.goodsName = goodsName;
responseReport.data.attachementList = [];
-
+ var Evidence = responseReport.data.attachement.split( "," );
+ console.log(Evidence)
+ Evidence.forEach(response=>{
+ responseReport.data.attachementList.push({
+ url:'/api' + response,
+ });
+ })
_this.detectResults.push(responseReport.data);
} else {
var goodsObj = {
"goodsId": goodsId,
- "goodsName": goodsName
+ "goodsName": goodsName,
+ attachement:[]
};
_this.detectResults.push(goodsObj);
}
@@ -2050,27 +2335,49 @@ export default {
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.instanceId == ''){
+
+ // 取证表单没有保存之前,办理人员默认获取上一节点立案的办理人员列表
+ const queryEnforcerParams = {
+ relationType: "3",
+ caseId: this.form.id
+ };
+ caseHandlerList(queryEnforcerParams).then(responseHandlerList => {
+ responseHandlerList.data.relationType = "4";
+ _this.tEnforceEvidenceHandlerList = responseHandlerList.data;
+ });
+ }else{
+ _this.tEnforceEvidenceHandlerList = responseEvidence.data.tEnforceCaseHandlerList;
+ }
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 = [];
}
+ }else{
+ _this.evidenceForm.attachement = [];
}
setTimeout(function () {
for (var i = 0 ; i < responseSampling.data.tEnforceSamplingGoodsList.length ; i++){
console.log(_this.detectResults[0])
if (responseSampling.data.tEnforceSamplingGoodsList[i].attachement){
+ responseSampling.data.tEnforceSamplingGoodsList[i].attachementList = [];
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,
+ 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 = [];
}
}
},1000)
@@ -2388,7 +2695,7 @@ export default {
that.caijueShow = true ;
that.zhixingShow = true ;
}
- },500)
+ },2000)
console.log(this.caseProgressOptions)
},
@@ -2463,11 +2770,64 @@ export default {
this.showShouanDate = false;
},
+ onConfirmSealDate(data){
+ this.putRecordForm.sealDate = this.format(data,'yyyy-MM-dd');
+ this.sealDate = data;
+ this.showSealDate = false;
+ },
+
+ onConfirmSealTimeliness(data){
+ this.putRecordForm.sealTimeliness = this.format(data,'yyyy-MM-dd');
+ this.sealTimeliness = data;
+ this.showSealTimeliness = false;
+ },
+
+ onConfirmSamplingTime(data){
+ this.samplingForm.samplingTime = this.format(data,'yyyy-MM-dd');
+ this.samplingTime = data;
+ this.showSamplingTime = false;
+ },
+
onConfirmSurveyResult(data){
this.surveyForm.surveyResult = data.dictValue;
this.surveyResult = data.dictLabel;
this.showSurveyResult = false;
},
+
+ onConfirmTimeliness(data){
+ this.tEnforceSamplingGoodsList[this.goodsIndex].timeliness = this.format(data,'yyyy-MM-dd');
+ this.timeliness = data;
+ this.showTimeliness = false;
+ },
+
+ onConfirmProductTimeNum(data){
+ this.tEnforceSamplingGoodsList[this.goodsIndex].productTimeNum = this.format(data,'yyyy-MM-dd');
+ this.productTimeNum = data;
+ this.showProductTimeNum = false;
+ },
+
+ onConfirmConfirmTimeliness(data){
+ this.tEnforceSamplingGoodsList[this.goodsIndex].confirmTimeliness = this.format(data,'yyyy-MM-dd');
+ this.confirmTimeliness = data;
+ this.showConfirmTimeliness = false;
+ },
+
+ addFinance(){
+ this.tEnforceDetainHandlerList.push({})
+ },
+
+ addGoods(){
+ // console.log(this.tEnforceSamplingGoodsList)
+ // this.tEnforceSamplingGoodsList[this.goodsIndex].attachement = this.attachementOption;
+ // // this.attachementOption = [];
+ this.goodsIndex += 1;
+ this.tEnforceSamplingGoodsList.push({attachement:[]})
+ },
+
+ addDetectResults(){
+ this.detectResults.push({attachement:[]})
+ },
+
format(time, format) {
var t = new Date(time);
var tf = function (i) { return (i < 10 ? '0' : '') + i };
@@ -2523,6 +2883,7 @@ export default {
});
}
},
+
submit(){
if (this.surveyForm.id == null) {
@@ -2590,6 +2951,139 @@ export default {
}
},
+
+ /** 案件立案提交按钮 */
+ submitPutRecordForm() {
+ // 办理人员列表
+ this.putRecordForm.tEnforceCaseHandlerList = this.tEnforcePutRecordHandlerList;
+ // 查封扣押财物列表
+ this.putRecordForm.tEnforceDetainHandlerList = this.tEnforceDetainHandlerList;
+ // 抽样产品信息表格数据
+ this.samplingForm.tEnforceSamplingGoodsList = this.tEnforceSamplingGoodsList;
+
+ this.samplingForm.caseId = this.putRecordForm.caseId;
+
+
+ this.putRecordForm.attachement = this.putRecordForm.attachement.join(',');
+
+ this.samplingForm.tEnforceSamplingGoodsList.forEach(res=>{
+ res.attachement = res.attachement.join(',');
+ })
+ // this.tEnforceSamplingGoodsList[index].attachement
+
+ console.log(this.samplingForm.tEnforceSamplingGoodsList)
+ console.log(this.putRecordForm)
+ console.log(this.samplingForm)
+
+ var _this = this;
+ if (this.putRecordForm.id != null) {
+ updatePutrecord(this.putRecordForm).then(responsePutrecord => {
+ if (responsePutrecord.code == "200") {
+ if (this.samplingForm.id != null) {
+ updateSampling(this.samplingForm).then(responseSampling => {
+ if (responseSampling.code == "200") {
+ this.$notify({ type: 'success', message: '修改成功' });
+ }
+ });
+ } else {
+ addSampling(this.samplingForm).then(responseSampling => {
+ if (responseSampling.code == "200") {
+ this.$notify({ type: 'success', message: '新增成功' });
+ _this.samplingForm.id = responseSampling.data;
+ }
+ });
+ }
+ _this.putRecordDiglogStatus = false;
+ }
+ });
+ } else {
+ addPutrecord(this.putRecordForm).then(responsePutrecord => {
+ if (responsePutrecord.code == "200") {
+ addSampling(this.samplingForm).then(responseSampling => {
+ if (responseSampling.code == "200") {
+ this.$notify({ type: 'success', message: '新增成功' });
+ _this.putRecordForm.id = responsePutrecord.data;
+ _this.samplingForm.id = responseSampling.data;
+ }
+ });
+ _this.putRecordDiglogStatus = false;
+ }
+ });
+ }
+ },
+
+ /** 弹窗确定按钮操作 */
+ submitDefine(){
+ if (this.putRecordForm.id == null) {
+ this.$notify({ type: 'success', message: '请先保存数据之后再确定提交申请' });
+ } else {
+ var id = this.putRecordForm.id;
+ const requestMapping = this.requestMapping;
+ this.$dialog.confirm({
+ message: '提交后案件将进入后续流程并且不能修改,是否确认提交?',
+ }).then(function () {
+ return request({
+ url: '/enforce/putrecord/submitApply/' + id,
+ method: 'post',
+ });
+ }).then(() => {
+ this.$notify({ type: 'success', message: '设置成功' });
+ })
+ }
+ },
+
+ /** 案件取证提交按钮 */
+ submitEvidenceForm() {
+ this.surveyDiglogStatus = false;
+ this.evidenceForm.tEnforceCaseHandlerList = this.tEnforceEvidenceHandlerList;
+ this.evidenceForm.detectResults = this.detectResults;
+ console.log(this.evidenceForm.detectResults)
+ if (typeof this.evidenceForm.attachement != 'string'){
+ this.evidenceForm.attachement = this.evidenceForm.attachement.join(',');
+ }
+
+ this.evidenceForm.detectResults.forEach(res=>{
+ if (typeof res.attachement != 'string'){
+ res.attachement = res.attachement.join(',');
+ }
+ })
+ if (this.evidenceForm.id != null) {
+ this.surveyDiglogStatus = true;
+ updateEvidence(this.evidenceForm).then(response => {
+ this.$notify({ type: 'success', message: '修改成功' });
+ this.surveyDiglogStatus = false;
+ });
+ } else {
+ this.surveyDiglogStatus = true;
+ addEvidence(this.evidenceForm).then(response => {
+ this.$notify({ type: 'success', message: '新增成功' });
+ this.evidenceForm.id = response.data;
+ this.surveyDiglogStatus = false;
+ });
+ }
+ },
+
+ /** 弹窗确定按钮操作 */
+ submitDefineEvidenceForm() {
+ if (this.evidenceForm.id == null) {
+ this.$notify({ type: 'success', message: '请先保存数据之后再确定提交申请' });
+ } else {
+ var id = this.evidenceForm.id;
+ const requestMapping = this.requestMapping;
+ this.$dialog.confirm({
+ message: '提交后案件将进入后续流程并且不能修改,是否确认提交?',
+ }).then(function () {
+ return request({
+ url: '/enforce/evidence/submitApply/' + id,
+ method: 'post',
+ });
+ }).then(() => {
+ this.$notify({ type: 'success', message: '设置成功' });
+ this.cancel();
+ })
+ }
+ },
+
afterRead(file) {
// 此时可以自行将文件上传至服务器
this.openPic.push(file.file);
@@ -2599,15 +3093,84 @@ export default {
this.openPic2.push(r1.fileName);
})
},
+
deleteFile(file,detail) {
console.log(file)
console.log(detail)
this.openPic2.splice(detail.index,1);
},
+
+ afterReadAttachement(index){
+ return(file)=>{
+ let params1 = new FormData();
+ params1.append("file", file.file);
+ commonUpload(params1).then((r1) => {
+ this.tEnforceSamplingGoodsList[index].attachement.push(r1.fileName);
+ })
+ }
+ },
+
+ deleteFileAttachement(index) {
+ console.log(this.tEnforceSamplingGoodsList)
+ return (file,detail) => {
+ console.log(detail)
+ this.tEnforceSamplingGoodsList[index].attachement.splice(detail.index,1);
+ this.tEnforceSamplingGoodsList[index].attachementList.splice(detail.index,1);
+ }
+ },
+
+ afterReadEvidence(index){
+ return(file)=>{
+ let params1 = new FormData();
+ params1.append("file", file.file);
+ commonUpload(params1).then((r1) => {
+ this.detectResults[index].attachement.push(r1.fileName);
+ })
+ }
+ },
+
+ deleteFileEvidence(index) {
+ return (file,detail) => {
+ this.detectResults[index].attachement.splice(detail.index,1);
+ this.detectResults[index].attachementList.splice(detail.index,1);
+ }
+ },
+
+ afterReadSampling(file){
+ let params1 = new FormData();
+ params1.append("file", file.file);
+ commonUpload(params1).then((r1) => {
+ // this.tEnforceSamplingGoodsList[index].attachement.push(r1.fileName);
+ this.putRecordForm.attachement.push(r1.fileName)
+ console.log(this.putRecordForm)
+ })
+ },
+
+ deleteFileSampling(file,detail) {
+ this.putRecordForm.attachement.splice(detail.index,1);
+ this.samplingOption.splice(detail.index,1);
+ console.log(this.putRecordForm)
+ },
+
+ afterReadEvidenceForm(file){
+ console.log(this.evidenceForm.attachement)
+ let params1 = new FormData();
+ params1.append("file", file.file);
+ commonUpload(params1).then((r1) => {
+ // this.tEnforceSamplingGoodsList[index].attachement.push(r1.fileName);
+ this.evidenceForm.attachement.push(r1.fileName)
+ })
+ },
+
+ deleteFileEvidenceForm(file,detail) {
+ this.evidenceForm.attachement.splice(detail.index,1);
+ this.evidenceForm.attachementList.splice(detail.index,1);
+ console.log(this.putRecordForm)
+ },
+
radioChange(value){
this.comment = value == 'true' ? '同意' : '驳回' ;
},
-
},
watch: {
$route (to, from ) {
@@ -2616,7 +3179,28 @@ export default {
// do anything you want
if (Cookies.get('enforcer')){
JSON.parse(Cookies.get('enforcer')).map((res,index)=>{
- this.tEnforceCaseHandlerList.push(res)
+ if (this.enforceType == 'caseHandler'){
+ let array1 = this.tEnforceCaseHandlerList.filter(function (e) { return e.enforcerName == res.enforcerName; });
+ if ( array1.length < 1 ){
+ this.tEnforceCaseHandlerList.push(res)//勘察
+ }
+ }
+ if (this.enforceType == 'PutRecord'){
+ let array1 = this.tEnforcePutRecordHandlerList.filter(function (e) { return e.enforcerName == res.enforcerName; });
+ if ( array1.length < 1 ){
+ this.tEnforcePutRecordHandlerList.push(res)//立案
+ }
+ }
+ if (this.enforceType == 'evidence'){
+ let array1 = this.tEnforceEvidenceHandlerList.filter(function (e) { return e.enforcerName == res.enforcerName; });
+ if ( array1.length < 1 ){
+ this.tEnforceEvidenceHandlerList.push(res)//取证
+ }
+ }
+ // tEnforceCaseHandlerList
+ // tEnforcePutRecordHandlerList
+ // tEnforceEvidenceHandlerList
+ // this.tEnforceCaseHandlerList.push(res)
})
}
}
@@ -2633,6 +3217,38 @@ export default {
.app-container {
padding: 0;
}
+.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;
+ }
+}
/deep/ .van-collapse-item__content{
padding: 0;
}
@@ -2813,6 +3429,10 @@ export default {
background: transparent;
}
}
+ .van-cell{
+ padding: 0;
+ background: transparent;
+ }
}
.main_title{
font-size: 0.4rem;
diff --git a/static/images/lawEnforcement/new/addDetect_btn.png b/static/images/lawEnforcement/new/addDetect_btn.png
new file mode 100644
index 00000000..d3173260
Binary files /dev/null and b/static/images/lawEnforcement/new/addDetect_btn.png differ
diff --git a/static/images/lawEnforcement/new/addFinance_btn.png b/static/images/lawEnforcement/new/addFinance_btn.png
new file mode 100644
index 00000000..5dfdc15c
Binary files /dev/null and b/static/images/lawEnforcement/new/addFinance_btn.png differ
diff --git a/static/images/lawEnforcement/new/addGoods_btn.png b/static/images/lawEnforcement/new/addGoods_btn.png
new file mode 100644
index 00000000..39896077
Binary files /dev/null and b/static/images/lawEnforcement/new/addGoods_btn.png differ
diff --git a/static/images/lawEnforcement/new/index_icon_08.png b/static/images/lawEnforcement/new/index_icon_08.png
index af8b0b45..74929eef 100644
Binary files a/static/images/lawEnforcement/new/index_icon_08.png and b/static/images/lawEnforcement/new/index_icon_08.png differ
diff --git a/static/images/lawEnforcement/new/index_icon_09.png b/static/images/lawEnforcement/new/index_icon_09.png
index 5d8301e3..18d8278d 100644
Binary files a/static/images/lawEnforcement/new/index_icon_09.png and b/static/images/lawEnforcement/new/index_icon_09.png differ
diff --git a/static/images/lawEnforcement/new/index_icon_10.png b/static/images/lawEnforcement/new/index_icon_10.png
index d509ffa9..2d7c9586 100644
Binary files a/static/images/lawEnforcement/new/index_icon_10.png and b/static/images/lawEnforcement/new/index_icon_10.png differ
diff --git a/static/images/lawEnforcement/new/index_icon_11.png b/static/images/lawEnforcement/new/index_icon_11.png
index 3ca7c675..5221bf63 100644
Binary files a/static/images/lawEnforcement/new/index_icon_11.png and b/static/images/lawEnforcement/new/index_icon_11.png differ
diff --git a/static/images/lawEnforcement/new/index_icon_12.png b/static/images/lawEnforcement/new/index_icon_12.png
index 95958a64..a0a9fa05 100644
Binary files a/static/images/lawEnforcement/new/index_icon_12.png and b/static/images/lawEnforcement/new/index_icon_12.png differ
diff --git a/static/images/lawEnforcement/new/index_icon_16.png b/static/images/lawEnforcement/new/index_icon_16.png
index 45f0d6a5..b6562ae4 100644
Binary files a/static/images/lawEnforcement/new/index_icon_16.png and b/static/images/lawEnforcement/new/index_icon_16.png differ
diff --git a/static/images/lawEnforcement/new/index_icon_17.png b/static/images/lawEnforcement/new/index_icon_17.png
index 46cbc035..04d8dbcd 100644
Binary files a/static/images/lawEnforcement/new/index_icon_17.png and b/static/images/lawEnforcement/new/index_icon_17.png differ
diff --git a/static/images/lawEnforcement/new/index_icon_20.png b/static/images/lawEnforcement/new/index_icon_20.png
index ce5eceaa..455d1dea 100644
Binary files a/static/images/lawEnforcement/new/index_icon_20.png and b/static/images/lawEnforcement/new/index_icon_20.png differ