From de76c5bcb99f833bd8c9f7ea77b1da6b2c8cd9da Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 15 Aug 2024 10:16:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/biaopin/AppWorkOrder/Add.vue      |  23 ++++++++++++++++++
 .../biaopin/AppWorkOrder/AppWorkOrder.vue     |   4 +--
 src/project/biaopin/AppWorkOrder/Detail.vue   |  15 ++++++++++++
 .../components/img/history-icon-active.png    | Bin 0 -> 1424 bytes
 .../components/img/history-icon.png           | Bin 0 -> 1368 bytes
 5 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 src/project/biaopin/AppWorkOrder/components/img/history-icon-active.png
 create mode 100644 src/project/biaopin/AppWorkOrder/components/img/history-icon.png

diff --git a/src/project/biaopin/AppWorkOrder/Add.vue b/src/project/biaopin/AppWorkOrder/Add.vue
index 295dd436..2eba2181 100644
--- a/src/project/biaopin/AppWorkOrder/Add.vue
+++ b/src/project/biaopin/AppWorkOrder/Add.vue
@@ -78,7 +78,11 @@ export default {
     this.forms.girdMemberId = this.user.girdMemberId
     this.forms.girdMemberName = this.user.name
     this.eventSource = option.eventSource
+    this.id = option.id
     this.typeList()
+    if(this.id) {
+      this.getDetail()
+    }
   },
   onShow() {
     document.title = '添加上报'
@@ -100,6 +104,25 @@ export default {
         }
       })
     },
+    getDetail() {
+      this.$http.post(`/app/apppatrolreportinfov2/queryDetailById?id=${this.id}`).then((res) => {
+        if (res?.data) {
+          this.forms = res.data
+          this.forms.mapInfo = {
+            lat: res.data.lat,
+            lng: res.data.lng,
+            address: res.data.address,
+          }
+          // var list = this.$dict.getDict('xbotReportEventType')
+          // this.typeList.map((item) => {
+          //   if(item.dictValue == res.data.type) {
+          //     this.forms.typeName = item.dictName
+          //   }
+          // })
+          this.selectGird = { girdId: res.data.girdId|| '', girdName: res.data.girdName || ''}
+        }
+      })
+    },
     selectStatus(e) {
       this.forms.groupName = e[0].label
       this.forms.groupId = e[0].value
diff --git a/src/project/biaopin/AppWorkOrder/AppWorkOrder.vue b/src/project/biaopin/AppWorkOrder/AppWorkOrder.vue
index 9c279ae8..ef73a926 100644
--- a/src/project/biaopin/AppWorkOrder/AppWorkOrder.vue
+++ b/src/project/biaopin/AppWorkOrder/AppWorkOrder.vue
@@ -36,8 +36,8 @@ export default {
           component: 'List',
         },
         {
-          img: require('./components/img/handle-icon.png'),
-          activeImg: require('./components/img/handle-icon-active.png'),
+          img: require('./components/img/history-icon.png'),
+          activeImg: require('./components/img/history-icon-active.png'),
           text: '历史',
           component: 'List',
         },
diff --git a/src/project/biaopin/AppWorkOrder/Detail.vue b/src/project/biaopin/AppWorkOrder/Detail.vue
index 830fab90..86763cc5 100644
--- a/src/project/biaopin/AppWorkOrder/Detail.vue
+++ b/src/project/biaopin/AppWorkOrder/Detail.vue
@@ -7,6 +7,7 @@
         <div class="names">{{ data.name }}的上报</div>
 
         <div class="times">{{ data.createTime }}</div>
+        <span class="edit-btn" @click="toEdit()" v-if="data.eventStatus != 2 && data.eventStatus != 3">编辑</span>
       </div>
     </div>
 
@@ -222,6 +223,9 @@ export default {
         current: img
       })
     },
+    toEdit() {
+      uni.navigateTo({url: `./Add?id=${this.id}&eventSource=${this.data.eventSource}`})
+    },
     formatName(name) {
       if (name == undefined) {
         return
@@ -271,6 +275,17 @@ uni-page-body {
         font-size: 28px;
         color: #999999;
       }
+
+      .edit-btn {
+        position: absolute;
+        color: #197df0;
+        top: 32px;
+        right: 32px;
+        width: 150px;
+        height: 44px;
+        line-height: 44px;
+        text-align: right;
+      }
     }
   }
 
diff --git a/src/project/biaopin/AppWorkOrder/components/img/history-icon-active.png b/src/project/biaopin/AppWorkOrder/components/img/history-icon-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..aee2e0cad61e978f012b3fa2a9cb2ad9a7c9e7c3
GIT binary patch
literal 1424
zcmV;B1#kL^P)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00001b5ch_0Itp)
z=>Px)N=ZaPRA@u(m|JWVWfaH%=iAHdZrxo342=)ihZYRP7}2O$jFlF_7-M)TqJWxc
zl?WxFBn55EVp_H&cx%9b@xeBV5HuPde9*4JghB-bd_a5SDi;+B*%rE&*_mSof|h1?
zXJ#3Pq3JyTzw@2ncg}adbA~X=KN{tH7z4cBBRm$t(I3GGi?X51Q{hq@prQhV@wPxS
z20_?Qa7Tg{1BZY4gycf@)lJdTHG|Wb)y>3sypRoUb`24JCl}T9G=+8-VoM*eKE545
zbs@$rTytoVKlD%}LaJGtx`1W%@$(E!G;7#my&4pv_)s)>-mG0+z|#6Sn>G4>=-q;*
zc11%yW^La#fG!W++ua!IwjEISgiLspFI8*>92X$GFw=`kVF8ygL7*c|%8Z}7GT7Uf
zK}NYzY#SgEQ2&e%&pzO_j%=8vOIH{TUk~B%$r}mB0COC-?iI>bMYR-NIMa*b(U_tm
z4@&ohOeC^nii`=LEtA@I2QBm1q#;`YXOy_Ga-I*x;{@CWpNVt^IQF-K#+^x=zG%9o
zgl&L=fQIM%n0uecWDKs!KaM5w#h$e3wYC9jo-KI9i`Ob7_`SwUj8;Gfh8XXDn?UE$
zjI#j)Uc&v8T?hxra3>=xz=c5-zn)T{n9orAQq=U(TeQH|6t&1_Q)b2ht!&jy9lb?j
zTO(LC-Hp1Z{qW})D42l*CltK*T@ruBbt{Sr&{+VTf^ZN*?1O>}Zg55hCJ11<Li{Ks
z_uGAI1E<ZNmu{UO*=%d`Uu3=?v!~^M2d|_U4PPa&?^xa^A;Ux;xEMRr{@{TV5lUtQ
zsEDxpu4&*M)ih#C)W<aqsF|#(kg#}`1ntq!^_}Wh5cwvF?sM6FA|S?YH1sxxe%}0J
z;%-@`N<dVCcqTxTuG!_kz_b@oV;;e=H)i|K5|OEYL<IqkFCu8|n&ip8TuV`{9qT%$
zKx@&mOdz|3hnI9Wjyt}wJ@vfG{5k{W0CJ^;OhAVq+On)l+NK}3{}crQn%Q8amVtJ+
zhijHsga;H#uY$^}hikMep#3!%`OD&8ji6>1dp9hrqJATO*bOKPLU~Vfc>hPSR1_-L
z0tgIubXJ)QTBr2=k(_sT2!dKxR7z`{2B?5(L+|?FnoY6v0)_d@Y!22u;f2pb*s?2y
zRG#|eB3k%nrFXmDowPH8r@&ZHH`nurtcuSWsJIzG0(N<Xx@c)-;7q<q+6G9#HrXF~
zWo3D?nn9oDDkw%H2tX$AtF?3dZH@pGg6evrq4!&UNVPI}NiL^M0D?emwR5DG90AB~
zDnHs3+SAgW>|sWkC4hw9+A7}^M*v>$C0p84ab^x#14sk4RZ`dyfQnl!Io@>VNuz+R
z9ciR8*_#$^c)mI`6Ai3z3LsqW2m96)9W<JvXD+Ewb2McGNk;6qjMfl1Cq)T(v3GrV
zt6q_rKf{BGchJ>tCflbmC(?|qoid<O>++|hmmQI!AZ+Z5hH6{dlZ*2`6Jb9g=*$0l
zC1ghbWp>sx0pK81uCANsP3C*(jkI5y#&HilzzG&&Y2UhFTfSD!D4=z%+UodaFp7+B
zoKMHV2@>MrzG(1#u4dc7KGrtdQ&z`2RK{ZlHZ~*?f|}D(aP6vDD9Sc2=^C+mT$=jU
z;FGGNe#XFL-OY^&QiAA1k1zPnkqD)4`M_HeVV@^4P|1W%VBBMjL02_I5K;D}TY4ko
z2XE;wi|ekIE@#OV9xNdl6Lj4-Ajk-?kkH!`30*KCFIb{GE){IqAq&R<9TJFw-585t
e!AIwih5rCfP@`7~PJ9sn0000<MNUMnLSTY<=9azy

literal 0
HcmV?d00001

diff --git a/src/project/biaopin/AppWorkOrder/components/img/history-icon.png b/src/project/biaopin/AppWorkOrder/components/img/history-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..7db6d494cf012f228f88f498ed4c2f1e49e0a2c9
GIT binary patch
literal 1368
zcmV-e1*iInP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00001b5ch_0Itp)
z=>Px)5=lfsRA@u(S>JC{Wf*?m_q40ovf<XkSX;J%491Fy8Rge13gLeMjf$EWj5plq
zg+yZX3NDBmqKPJ62r&w`UQ1@oKxAZk0SKEgVCz8H*yy^gYtQ*!bEYJ~)}HUwLn%wo
zZQozd_q^ZtKHpcuBL8TS<3k1Dlg@C3!9~xYi13-d^J^`O4uEJofQHh5mPu073zCll
zocTQ-kLQZX>)4_{_g&~<Q@#YSt(XM=*GC9{fUtL4e0@(bu^a*RoV{=YkX^+D_sWNW
z-?}!&;zXp}#?%3L8<3FOz#iMHYF}V^XJ^}Ow{bN9o)@=4ABDYC8Edyax31r9>?Z~w
z$k+b-#`en<fDf%eQ4IQg1|rKt2vqq&<QPJG(Unpd8&6^UZW<yF?Tk_~xVklr#-;Vz
zg}X7#<xE_<GKAFR^n-2{fD139V}JFWoqvih`WAK5a-P|ivPC^B+D)JeKo9relG+-q
zYHmUxpg$&*C``}HV&G~Lnc1ux?*6qcC4*~LMX@xv#C?$ft_|Hn^46Gp-%<h$HwMuh
zSq8&kSB2(G6a80`m`J5v`IVeOgBf+T)v(8fu9C5pNj7UDm7bojQgq;!l0lt%Jh!O;
z^zan*oE@Ej6$U+IFw{_oXIjEw&UcCmCQ?(ldi^G5vyP8pN`Mgv&JY=W40YBJ8O;UA
zBt=0e#6;8<pB4CE%a*ob9kTDYaV@s(>z_RbLk)%JplMmS{O7RKNHCe`Q;XyWbF${#
zjvXsA3jyfv7T@;m5F)Z3IY2vsJp-fRr3L@kn90nd|H?4Z(+k!N0-Y3t4kS9){W?56
z7FL9vig_oL+De2*JC6wd0`o7d)JYbcj7EbaMC9s?$Tfp@V!z)9TdpzZch6+9NKef`
zJ$y5tlU?YslyA?Ao7)F(B=5Wg!rMxzgdI8$Lpf$X1;JO%k%r@LSS$*ln*{T1<ww8x
z_eLV&lttP1MDYFtduFa8$}0wlaLACV!_jD+mfkBhz#IXI#HRJV*OQ|MMX(P*_5A?r
z>#D&9V{AOHoSP=Xk(Nkkzs^FJ5}-wd!(H*%{-Kfa-AdH=3l$h`s)sEFheqx!+}{5=
zG4abQ!u2Pd_GBpm-hjcoTb3;w5`({0O4)zp%=@BE4KSFT0W$wYmU?x?icqo;lO+R4
zgyY$C&6}&*YIh0nb-n{d7a#z;-QQ}7hK`j7K&E#S@z^JWBX^FHQhV|h<pLmt`Pj;E
z!|P=MkRge#P0yYl93Jf_pv@D2z`)9AXiZrFy!YgAEjfA@f;uk%f{<#BgbGTk((OSX
zw<bC}uImC!-Wtz)irSawIsH&h01f61TjL#lx-FWS%`ehT)56%q6r`M5l$l=XipRcl
zI%FDyweVN@3hG?bQn>l|T@cgJmT>Tmve<)6^!e6!$G#iMvDXTX37^4pZ#{)R%Tmah
zR+)_nNFNxxnj4!kg$BKj{IYGh+y*^BGhluvv7!A~A*rSf&?~8Sy7xj_iPY#OcCfpq
zeA!Jebavj(C$=^6cq_I~^<F$BqPjE^>zW+OP1Std))uT;=(^+-#QW>gxl21pS>Fhx
z*(tf^@3Tbw+0)hXVJsHQKK2W5clY2^Rkbra#Zq5@(4q;#$!way2My&vvU&6B$;bL+
zaj(*Wfq}rpgw>i82|87;^SdoZ0tOGn<7-EC?2EN=lxoEWE*HNFz;a=t*g7f<7Q1rg
a;`a}|D7aVrMi)c?0000<MNUMnLSTXbublw^

literal 0
HcmV?d00001