From b323cf5991114ca997a8eeaed35ec94b9761d75b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Thu, 29 Sep 2022 17:30:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E6=8E=A5=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/lawEnforcement/index.js | 73 + src/router/index.js | 28 + .../lawEnforcement/caseAllocation/caseAdd.vue | 565 +++- .../caseAllocation/caseDetail.vue | 24 +- .../caseAllocation/caseDistribution.vue | 20 +- .../caseAllocation/caseList.vue | 311 ++ src/views/lawEnforcement/index_new.vue | 2 +- .../lawEnforcement/task/signInRecord.vue | 195 +- src/views/lawEnforcement/task/task.vue | 72 +- src/views/lawEnforcement/task/taskDetail.vue | 135 +- src/views/lawEnforcement/task/taskHandle.vue | 2541 +++++++++++++++++ src/views/lawEnforcement/task/taskRecord.vue | 70 +- src/views/lawEnforcement/task/taskSignIn.vue | 140 +- .../lawEnforcement/task/taskSignInSee.vue | 271 ++ .../icon/signInRecord_icon_03.png | Bin 0 -> 1980 bytes 15 files changed, 4042 insertions(+), 405 deletions(-) create mode 100644 src/views/lawEnforcement/caseAllocation/caseList.vue create mode 100644 src/views/lawEnforcement/task/taskHandle.vue create mode 100644 src/views/lawEnforcement/task/taskSignInSee.vue create mode 100644 static/images/lawEnforcement/icon/signInRecord_icon_03.png diff --git a/src/api/lawEnforcement/index.js b/src/api/lawEnforcement/index.js index dd9557b7..f088a1f7 100644 --- a/src/api/lawEnforcement/index.js +++ b/src/api/lawEnforcement/index.js @@ -531,3 +531,76 @@ export function returnCase(data) { data: data }) } + +// 案件退回,从勘察退回至登记 +export function addCase(data) { + return request({ + url: '/enforce/case/add', + method: 'post', + data: data + }) +} +// 新增执法进度历史 +export function addProgress(data) { + return request({ + url: '/enforce/progress/add', + method: 'post', + data: data + }) +} +// 任务查看列表 +export function caseTasklist(query) { + return request({ + url: '/enforce/case/caseTasklist', + method: 'get', + params: query + }) +} +//上传全局方法附件 +export function commonUpload(data) { + return request({ + url: '/common/upload', + method: 'post', + header: { "Content-Type": 'application/x-www-form-urlencoded' }, + data: data + }) +} +// 新增勘察打卡 +export function addClockin(data) { + return request({ + url: '/enforce/clockin/add', + method: 'post', + data: data + }) +} +// 查询勘察打卡列表 +export function clockinList(query) { + return request({ + url: '/enforce/clockin/list', + method: 'get', + params: query + }) +} +// 查询勘察打卡详情 +export function clockinGet(id) { + return request({ + url: '/enforce/clockin/get/'+ id, + method: 'get', + }) +} +// 已上传文件列表查询 +export function attachmentList(query) { + return request({ + url: '/enforce/progress/attachmentList', + method: 'get', + params: query + }) +} +// 各个节点附件上传保存方法 +export function attachmentEdit(data) { + return request({ + url: '/enforce/progress/attachmentEdit', + method: 'post', + data: data + }) +} diff --git a/src/router/index.js b/src/router/index.js index e82d246e..7328520c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3828,6 +3828,34 @@ export const constantRoutes = [ keepAlive: true }, component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseAdd'], resolve) + }, + { ////农业执法(新)-- 巡查登记列表 + path: '/lawEnforcement/caseList', + name: 'lawEnforcementCaseListNew', + meta: { + title: '巡查登记', + hidden: true, + keepAlive: true + }, + component: (resolve) => require(['@/views/lawEnforcement/caseAllocation/caseList'], resolve) + }, + { ////农业执法(新)-- 记录查看 + path: '/lawEnforcement/taskSignInSee', + name: 'lawEnforcementTaskSignInSee', + meta: { + title: '记录查看', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/task/taskSignInSee'], resolve) + }, + { ////农业执法(新)-- 案件处理 + path: '/lawEnforcement/taskHandle', + name: 'lawEnforcementTaskHandle', + meta: { + title: '案件处理', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/task/taskHandle'], resolve) } ]; diff --git a/src/views/lawEnforcement/caseAllocation/caseAdd.vue b/src/views/lawEnforcement/caseAllocation/caseAdd.vue index 6a009fec..17e9d165 100644 --- a/src/views/lawEnforcement/caseAllocation/caseAdd.vue +++ b/src/views/lawEnforcement/caseAllocation/caseAdd.vue @@ -5,134 +5,340 @@
-
- - - - - - - - - - - -
-
- - + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + @@ -222,6 +180,15 @@ color: #ffffff; font-size: .35rem; } + .tt_now{ + background: url('../../../../static/images/lawEnforcement/icon/signInRecord_icon_03.png') no-repeat center; + width: 41PX; + height: 41PX; + line-height: 41PX; + text-align: center; + color: #ffffff; + font-size: .35rem; + } i{ background: url('../../../../static/images/lawEnforcement/icon/signInRecord_icon_02.png') no-repeat center; width: 10PX; @@ -259,4 +226,10 @@ border-radius: 8PX; margin-top: 25PX; } + /deep/ .van-uploader__preview{ + margin-bottom: 0!important; + } + /deep/ .van-uploader{ + display: block; + } diff --git a/src/views/lawEnforcement/task/task.vue b/src/views/lawEnforcement/task/task.vue index ed8a97a7..adf7e3bf 100644 --- a/src/views/lawEnforcement/task/task.vue +++ b/src/views/lawEnforcement/task/task.vue @@ -9,33 +9,34 @@ v-model="loading" :finished="finished" finished-text="没有更多了" + @load="getList" > - + @@ -45,56 +46,49 @@ + + diff --git a/src/views/lawEnforcement/task/taskRecord.vue b/src/views/lawEnforcement/task/taskRecord.vue index d93315b2..ca998c2f 100644 --- a/src/views/lawEnforcement/task/taskRecord.vue +++ b/src/views/lawEnforcement/task/taskRecord.vue @@ -9,33 +9,19 @@
-

张薇

-

执法检查人员

+

{{user.nickName}}

+

{{roleGroup}}

-
+
-

2022-07-09 14:10

-

宿州市埇桥区永乡镇供销社楼下

+

{{item.clockinDate}} {{item.clockinTime}}

+

{{item.clockinAddr}}

-

查看

-
-
-
-

2022-07-09 14:10

-

宿州市埇桥区永乡镇供销社楼下

-
-

查看

-
-
-
-

2022-07-09 14:10

-

宿州市埇桥区永乡镇供销社楼下

-
-

查看

+ 查看
@@ -43,45 +29,35 @@ diff --git a/src/views/lawEnforcement/task/taskSignIn.vue b/src/views/lawEnforcement/task/taskSignIn.vue index 2cf0df55..4395aa18 100644 --- a/src/views/lawEnforcement/task/taskSignIn.vue +++ b/src/views/lawEnforcement/task/taskSignIn.vue @@ -12,46 +12,46 @@
- - - + + +

-

8:29(2022年9月6日)

-

宿州市埇桥区永乡镇供销社楼下

+

{{ nowTime }}({{ nowDate }})

+

{{clockinAddr}}

-
+

打卡记录

- +
- +
-

当前位置:宿州市埇桥区永乡镇供销社楼下

+

当前位置:{{clockinAddr}}

- -
-

{{ nowDate }}

+ +
+

{{ nowTime }}

打卡

@@ -224,9 +316,9 @@ margin-top: 3vw; } .datetime{ - margin-top: 7vw; - font-weight: bold; - font-size: 0.5rem; + margin-top: 6vw; + /*font-weight: bold;*/ + font-size: 0.6rem; } } diff --git a/src/views/lawEnforcement/task/taskSignInSee.vue b/src/views/lawEnforcement/task/taskSignInSee.vue new file mode 100644 index 00000000..37787290 --- /dev/null +++ b/src/views/lawEnforcement/task/taskSignInSee.vue @@ -0,0 +1,271 @@ + + + + + diff --git a/static/images/lawEnforcement/icon/signInRecord_icon_03.png b/static/images/lawEnforcement/icon/signInRecord_icon_03.png new file mode 100644 index 0000000000000000000000000000000000000000..ea02c0c72ae28fd12b6245acb80c9e98c68f0834 GIT binary patch literal 1980 zcmV;t2SfOYP)O{$Th+P4F`0j|j?;r~ySKq9iD+ zRe|;ExJ(Hc{6UFV@WPO_9T#aQ7h{Zy8X;)0GNSAal_K}jAj)-mfFAuJp!`~5cI6yu|=IpyOxhNQ6AS2X1Tnf-}(dEFGvMY z627K;!*jCiX^v*L+)Bli&DfAepw>hxIWx;@)Ho;*SN8|>5|EaNdmKM`e4*)-i|UIMZ!7WhZ+iQk|^Yyl)Z zmQlGp1}zmFrn&53UuyxScWbUSQ`)agkn*|NPcM-1s1eaXyzlTev{(k>aGp}uYTJTh zPBCZ$Oh4H3G_zN@-jPTqCMwaJvA`?>InU#bWUW36GUEqd(S6~&EhBklDKj{XIykT{ zw~ku3eX?csvA|&>`K-qm`9aNdAfv{2><3pXKX~!gnjrhX^)@pjHcG1VtlM61M*VlO zgMCT&hGt|z#$)~mh{R*MFXV0C>@9UAT&EZqyBQ_Qv^D2M`Jc`^x}Dt<%j#ks-A%@B zLb1oaxZw+nNw%twHKHb$FS7sQMrIM1#fWoq*1H9K0FJSFNkkuB*(fYb@y+qlw2rEg{41Z#H=~vSNpl|kmtF^s(4f2LC&O>Asfxl zB`BYERyQ6qH~TrQq8YiETu6n|*-l|q8}j-gy)IIfi20}V0B%zt+jN4-Dx>b&>~CjQ zvk@lWR{F;3z5s`J9XmXAk+O8ESaMY9WHUR>nU@^CoR!U$083aW{Vy`GlX`Vzj~Oy7Kbelz>5Mif`jMLpfI4?= z)=y5vc$0rNS98l%sc<1=RC29x)guna?8&18;Z~ONmrU2|wgn~K6UOQ|GuUH>4X)~7 z!qp3n@P}@MD=6x9$I;Wywbt}4|NiPNl-V{&zLx-|Ij=g?_7ofT!idM+c3eW+p7y(simE;ElA z-x7%DJ>G`z;@bkNxH#Hu*D&eWY8#VX%MAY~MPKECrocXeom!gLA9Oev8q&=XOkQl@|%d_K^= zkz{Cd1yE>E#jLgVZA=sd*|$KqfJ#)6XiV?A+SbiNb$3zgo!qaq0A|FTZA{nz`(;wS z?2ZK{Nnri-hG(m}C3;FKMu$yDnZaLN=%`X6R(G&99~30&T)u`A`2Y)ow1K98zR7RP zaXq9uYC--RbH&9NK&Lu`bA@_~fJ}Q)Bb?qJz{`TP4#>3S*!w)e?%->i)r9C-#Y}s- z%Qm6d*v@_QKLlXRDNE{Y_L6KQNy2D;d$BKz1A??S#H0QOF4S)al52HeKY&Gpw3IsPzXMTl&z%0` z!#{D3)jq>HTe}M#-1ohT#U_q=NCSFA0+w?#VvX$w2RftQChFxj#dp=-FNJ)DTY_@| z=@4kJ7bXAqfn=LQOP#?*+uM|$B~#jXZp4nK5-5Wne3HL=7kkxDQG=Z-)C~kIe|^v( z^EWHU%i;4*PW7fR!{xj-p7r!3>)(z1e1=`t85D4of5c%nltBT@zvo{L3ag;G)rn^S O0000