From 02671ebced674ee4347ea3819a860c1e0ea517b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Wed, 12 Oct 2022 14:38:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E4=B8=9A=E6=89=A7=E6=B3=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/lawEnforcement/index.js | 70 + src/router/index.js | 43 +- .../lawEnforcement/caseAllocation/caseAdd.vue | 43 +- .../caseAllocation/caseAllocation.vue | 2 +- .../caseAllocation/caseDetail.vue | 27 +- .../caseAllocation/caseDistribution.vue | 41 +- .../caseAllocation/caseEdit.vue | 726 +++++++++++ .../caseAllocation/caseEnforceList.vue | 331 +++++ .../caseAllocation/caseList.vue | 311 ----- .../caseAllocation/caseListNew.vue | 274 ++++ src/views/lawEnforcement/index_new.vue | 3 - src/views/lawEnforcement/task/task.vue | 4 +- src/views/lawEnforcement/task/taskDetail.vue | 27 +- src/views/lawEnforcement/task/taskHandle.vue | 1138 +++++++++++++---- .../lawEnforcement/new/addDetect_btn.png | Bin 0 -> 1868 bytes .../lawEnforcement/new/addFinance_btn.png | Bin 0 -> 1903 bytes .../lawEnforcement/new/addGoods_btn.png | Bin 0 -> 1911 bytes .../lawEnforcement/new/index_icon_08.png | Bin 3364 -> 7663 bytes .../lawEnforcement/new/index_icon_09.png | Bin 2619 -> 6049 bytes .../lawEnforcement/new/index_icon_10.png | Bin 3748 -> 8347 bytes .../lawEnforcement/new/index_icon_11.png | Bin 3189 -> 7135 bytes .../lawEnforcement/new/index_icon_12.png | Bin 13679 -> 41349 bytes .../lawEnforcement/new/index_icon_16.png | Bin 13747 -> 41496 bytes .../lawEnforcement/new/index_icon_17.png | Bin 12314 -> 29950 bytes .../lawEnforcement/new/index_icon_20.png | Bin 23537 -> 65989 bytes 25 files changed, 2407 insertions(+), 633 deletions(-) create mode 100644 src/views/lawEnforcement/caseAllocation/caseEdit.vue create mode 100644 src/views/lawEnforcement/caseAllocation/caseEnforceList.vue delete mode 100644 src/views/lawEnforcement/caseAllocation/caseList.vue create mode 100644 src/views/lawEnforcement/caseAllocation/caseListNew.vue create mode 100644 static/images/lawEnforcement/new/addDetect_btn.png create mode 100644 static/images/lawEnforcement/new/addFinance_btn.png create mode 100644 static/images/lawEnforcement/new/addGoods_btn.png 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 @@ + + + + + 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 @@ - - - - - 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 @@ + + + + + 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 @@ @@ -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 @@