From 72248b160e5789edee647c351f1981d8418b291f Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Mon, 12 Dec 2022 17:52:25 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=A1=A8=E5=8D=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/backend/ProcessController.java |  76 ++
 .../palmte/work/model/ProjectRepository.java  |   6 +
 .../static/assets/process/业务采购流程@2x.png | Bin 0 -> 991 bytes
 .../static/assets/process/业务采购流程@3x.png | Bin 0 -> 1397 bytes
 .../static/assets/process/销售合同流程@2x.png | Bin 0 -> 993 bytes
 .../static/assets/process/销售合同流程@3x.png | Bin 0 -> 1568 bytes
 .../admin/business/process-completed.ftl      |  44 ++
 .../templates/admin/business/process-new.ftl  | 669 ++++++++++++++++++
 .../admin/business/process-review.ftl         |  44 ++
 9 files changed, 839 insertions(+)
 create mode 100644 src/main/java/cn/palmte/work/controller/backend/ProcessController.java
 create mode 100644 src/main/resources/static/assets/process/业务采购流程@2x.png
 create mode 100644 src/main/resources/static/assets/process/业务采购流程@3x.png
 create mode 100644 src/main/resources/static/assets/process/销售合同流程@2x.png
 create mode 100644 src/main/resources/static/assets/process/销售合同流程@3x.png
 create mode 100644 src/main/resources/templates/admin/business/process-completed.ftl
 create mode 100644 src/main/resources/templates/admin/business/process-new.ftl
 create mode 100644 src/main/resources/templates/admin/business/process-review.ftl

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
new file mode 100644
index 0000000..bac191e
--- /dev/null
+++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
@@ -0,0 +1,76 @@
+package cn.palmte.work.controller.backend;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import cn.palmte.work.model.Project;
+import cn.palmte.work.model.ProjectRepository;
+
+/**
+ * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ * @since 1.0 2022/12/8 11:03
+ */
+@Controller
+@RequestMapping("/process")
+public class ProcessController {
+
+  private final ProjectRepository projectRepository;
+
+  public ProcessController(ProjectRepository projectRepository) {
+    this.projectRepository = projectRepository;
+  }
+
+  /**
+   * 新建流程
+   */
+  @GetMapping("/new")
+  public String newProcess() {
+    return "/admin/business/process-new";
+  }
+
+  /**
+   * 已办流程
+   */
+  @GetMapping("/completed")
+  public String completed() {
+    return "/admin/business/process-completed";
+  }
+
+  /**
+   * 待我审核
+   */
+  @GetMapping("/review")
+  public String review() {
+    return "/admin/business/process-review";
+  }
+
+  @ResponseBody
+  @GetMapping("/projects")
+  public List<Map<String, Object>> query(@RequestParam String q) {
+    return projectRepository.findByProjectNoOrName(q)
+            .stream()
+            .map(project -> {
+              HashMap<String, Object> map = new HashMap<>();
+              map.put("id", project.getId());
+              map.put("name", project.getName());
+              return map;
+            })
+            .collect(Collectors.toList());
+  }
+
+  @ResponseBody
+  @GetMapping("/projects/{id}")
+  public Project query(@PathVariable int id) {
+    return projectRepository.findById(id);
+  }
+
+}
diff --git a/src/main/java/cn/palmte/work/model/ProjectRepository.java b/src/main/java/cn/palmte/work/model/ProjectRepository.java
index 7d359e2..76e21a4 100644
--- a/src/main/java/cn/palmte/work/model/ProjectRepository.java
+++ b/src/main/java/cn/palmte/work/model/ProjectRepository.java
@@ -3,6 +3,7 @@ package cn.palmte.work.model;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import javax.transaction.Transactional;
 import java.util.Date;
@@ -38,4 +39,9 @@ public interface ProjectRepository extends JpaRepository<Project,Integer> {
     @Transactional(rollbackOn = Exception.class)
     @Query(value = "update project set approve_id=?, approve_name=? where approve_id = ?", nativeQuery = true)
     int batchUpdateApprove(int targetAdminId, String targetAdminName, int adminId);
+
+    @Query(value = "select * from project where `project_no` like concat('%', :q, '%') or `name` like concat('%', :q, '%')",
+           nativeQuery = true)
+    List<Project> findByProjectNoOrName(@Param("q") String query);
+
 }
diff --git a/src/main/resources/static/assets/process/业务采购流程@2x.png b/src/main/resources/static/assets/process/业务采购流程@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..32ec71c665942c56b1e62a585a9e835676e71bb9
GIT binary patch
literal 991
zcmV<510ei~P)<h;3K|Lk000e1NJLTq000^Q000;W1^@s7lZD+=00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR918lVFJ1ONa40RR917ytkO05%EbY5)KONl8ROR7ef2R!vA$Q4~Jsj=wXy
zsK6|&s2LF?kT%g~bSP4YB7&CD&L{*&D5FiSY!S7{F$2L!t8ElmAYx_XqE%3vD4YyU
z!=xziZ~S@hbj};^aNmn7fnB(Be!lOV^WMGZ-8%q05}EFpOwm=-*WRrTIyDZhj(HCG
z8I86+7bycZHKbPOl+c8};=qg&SW{6FEoSF`iqjmU)oti8#ThOs+lE-UJ4e6|BJ-d`
z6Rn-efmACpUp?o{{f@+1G6nj9O+W&?bcpx_lsfLsbw+_F5x#|s!f(tc%{>6Y(qeXD
zRHuuNbq;s{5nTeHT7}r_fr|R9FRP<XDGMNWuD(VPe{t4XZF-WR#%HtP4<g#aKA9U1
ze~>{9DL63_ZF^?8AfD-*;AOjG4T61jgYmK3WCkHnM>>|gsrFPkb0(m5C-Z()UK|0Z
zauTM~v9_y%W8=(&$jbcO4o$X6*=LPm@DVf+l!)qlI@a1F{(Nf%NgLVzg+TaZl94b%
zKvkws^gxihXcCazI$pl(rtj|{*Y)j-8)UEBzDn{vX`b2A;wx0{Q;qq8@<fCs-JF^z
zGM-7bheG9Dz9rYh`b=jBFF*wlG@C&h_f^t+#^2CfvBLe!M7|)Mz_w52!_nlVCIuyb
zkT?@`irtXuJcSTC$(?o|5Qjqrg$Fbb&rwg|$IsbGexyq6+>}J50)(TlqRAI#9yKu)
zD*taqBr_2@gfX*-=(e>B@-}VzcGk?s`*4d7gLcyw)ax@{hlw2D5(PQhwic43m|KdE
zWBcGDb})cg3!%d9(xS+<03Vi?mm@^0)|L$NwQVg#F17II*rJK1<V)iRApACcS|@}n
z>1gZY#CYno>(F-bM`GA(EhHBrA>PvoxSQ^B=M24$C7TmdsVZ85y?M+~<mRd$Pc^zO
zT~1dg4{FF-h|jqMkn3IE9+{w$3-1)&&C(Ix!#>Y%`N?0i>$ttW<ua5TQ%`^*PJS%$
zC3T3qv7h6|Ej2th5xg^Tdm)o$=<b?(L(EXAYT#pLkgvJ{p8N+0n>~s6mY2Q1NR>P?
z!gx!0{Oc8{168qFdb#VuwAhK+?y`}JmU+?njj`$b!|+h$*#)u9@dvRHKJ0!|6jJ~I
N002ovPDHLkV1fv?x(omS

literal 0
HcmV?d00001

diff --git a/src/main/resources/static/assets/process/业务采购流程@3x.png b/src/main/resources/static/assets/process/业务采购流程@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a17a35b9cee50963a3e6a38f40243b46cf517133
GIT binary patch
literal 1397
zcmV-*1&aEKP)<h;3K|Lk000e1NJLTq001Wd001Ni1^@s7eJ~RZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91C!hlW1ONa40RR91Bme*a0C|+ScmMzd-$_J4R9Fe^SWjpiRTzKY%x1UI
zB()nTttQ5%o0CN^YEj5;gS4n8Z{n#45vkSP_25CY+6M8Um))vVP*AC!1VOMCO>Mio
z;K75mq3tCTLowDOQn68*ZFcAL`(FA@UuWKA$8-@74(xvafA4$q=6&y*QOa@w>&9m*
zD7Kz;nIT662jGK%7sf}NWPW+6xe$1=g1yse=WgaB7np;vwJ}x(9c~W72Cb~+N>3BN
z$O^u+k|8K;fRe7TGLk$i&5I{<e0a~#DO1S<iyThMjtJ^3ApFHa^|8|SyjS_y>bNO)
zd*-5dp(*I*NTQ3SksB2D6to-edDzL6gIP<Y7{jv;91C9ceQ}ay7MZCvM^NxR8xi0T
zD1V}!EAI{v&7p%~5g+JX*Eh&Pfuk6EGEQ!}>9b8=Uk^`SVkR<ca`Jlnvwf7+IS15R
zEA9y%3UQ31?)skolN<N`DfY<7Vn|AzrnBDk4d!er9arr#Ws~>Y>KjuI^H#u4L17S6
zwgQ?<DbBKLA`2ZH8oVexQ|opi_2uhMIA9w<>^ty8%AY%vujigW&N^#`^b8J2fY8F+
z!B>6XKOnNuws%^WAdwTTa(=e@X>Dt9N`h9S*D|C%0eDxuBW}ohZ$ClP0xB!-Wzz1{
z^6<7_+jBFA8@bYx@o_h40ov+Qw8i(W2?x}bMy`B|#PYq{EW$sgsCvzqL<?aCtj2d0
zEb`1z<(mf=pRr}&x8YHG9$&E8SQi09P>c1^^0X~re6~7b(~B+wrV#Im+nbb?#93(+
zOsPwBNPlj6`wAZ<9Q#>sI7Yz$7Ooxcfg3&fRmv#>MrHk@z=@bBm}Qy-<jav{2GgKV
zjeC{ns1)6=z^O&S=<uRLOxJw?bt~PcV|121VuFPDD%oAuMZpxDX^fTbWh0Gx0+jov
z=8aa1<=`^bBnoCulO4f7Pyf0Q1^@;_(_av=;|@T?-P)NpwFH@z#ycf)N3g&V)$78W
zl<w<kkrRPU%)hg}HdcOvPLQ({d~_h4&H})93{uaPUJ<ZVMx|d~g618fu+etA^&06P
zQ>osas<pKL$jGz5=e_Dz;HF+O{q<?J%R9933SQm6digfPy1*l}K;dDU@n>;pIyr9C
zYz<mmP&f6`RNF8Ut*I^W-_ZS^+*<E)v?AG%0A{FX(IwAjj?>ZMHc7QMc=3qyi_<4d
zPT@8h=#My%I6c*zG;+yZ<CQEq<ky>M@7ih1n@NnZlO>mMS@j`~s@N&%r1oUVAr6@@
zt#RPGU5PV>^t9wZ)V7xHqhls^;gcn&RJL=Gh7bF)&O=8Bi^jW9D5H=Fs;o71bp1li
zPxQN>6{x1^`^3A+l8aeZZdRzV+d)mn<J7=>!N3#q2McXq4e3FW{P}nrwH2G_W6;Cj
zjug+CA&HWs8{c2}v9i+)WZw57tJ_zA4PtAx@BrxwA}6F*!-;WRqU2EF7PP*R%j3cc
zt#q!A3;X;w))OYB-RSw7vH5rB_(HsMrQj-68!a{zz%kokaXM-(gKp6D=}vNlNSkg-
zfL%BBA~k;3KL&{*hJu4Nn@J}}%XY&j37cal9TnWo<6d=|zeb$gviB6d1XKGDUsBfR
zsW1DDO2!fW6~lo&q`yq^EMYF{PfDZZPdefM=j?w2pxBz!lQn8w00000NkvXXu0mjf
DsF9U8

literal 0
HcmV?d00001

diff --git a/src/main/resources/static/assets/process/销售合同流程@2x.png b/src/main/resources/static/assets/process/销售合同流程@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1899213884ec36c8bf186fd84f35d33d1ab52aed
GIT binary patch
literal 993
zcmV<710MW|P)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s7-c5X100001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR918lVFJ1ONa40RR918UO$Q08GiY3IG5DOG!jQR7ee_R!c}!VH7^+&K1+1
zN-dgM1Z^UMqN3Uu5w(z3(ZU`stccMJsa23GH(|>nnr1Z6O53yuqS{p(Q?#O8U_nt(
z6jAno!0_I`@7(G9{^PyQ4EBrnoc}z&^Y~xGX9moQ-_tZj7=0bgo=!v{!z&VenZ85<
zCK?uonQmtD#;|-M0nr<44#`?OiTvcF!}_Q|X_SLblp^A!@+FueG)y~G$=QPWNrslH
zK&U__#zO&DVsPpiQ>52X4T?GtQ}pcS88-AOrVuD(_tjTSp`J&_qJ{x0F<sZ#<<W%R
zLI-#ITA%OH_FR^qx<<<Dl3>x6iOi-DdJs7S4VwVqwn)Tup|73KsoFYu;VghCQLX=P
z#m}N@+uV6Ot%yp+FxomqH&9cXMNk8mBHv5w)9rAEMoQ%Ec{7AGT3ulx&vX=ZT^F5K
zm4jFs8WbWUab=6D`M<V%Qf!hLTE8Dr?zlSZWEarY3Lo{oRA`;%MzSDGLArtJds_I9
zx|VIZ80~E&|KSwf!`W{3eA<#f!7nOCYH8sBQJV!I4Cp>c+B(^EMC**6$HxEoiaJqS
zuC|6YiK=4D;jq<9(Q`4re4L9{lT79vOyk%E<EUq~Yg4un(MBzp??`RAI$<^YDyHW;
zM2?2qxatk7p{k)w#%F56O)#qF)o*h3sD>Kiz|axb)Gn<RqRHUzqDKiE)mqImA*FCd
z9)k6TSz(;3-0!&0f+VquaMv{gDTDubMTXMIUQTi830F&|Z}58t<p+<W(_oW|1%l=^
zz$VyB43y!J_5runB7lKycOlEY2CwkRYqTp2Y1JYxS^{ep-`{x1QPn7dX`a>?Oa{{8
zbD&bD0uD|`d%rns0=lJQp{VQ;F7Q3VCsp(S&)pERiU&$j#)OoEX0bTS&`ksRB#;gM
z+_ru$S~>5H3Km3}cA~10&VI9gCZLysfoM5Yb4v04d)J|&u|k%f2w)IUT7f}J?x3XB
zIksh3rgy0&wE1c)Pt`Y=I=m?x(Y7x2z#2E<);S0|hHBr-74!p(5&bAoqiU%9Y{_SN
z5dIh8f4Zy>o*S>Ome!!3!)WTSvc_|i0ACr2YG?qyZ|A7(6xh?)#pnM5Z`UEsrIO1O
P00000NkvXXu0mjfKtjJh

literal 0
HcmV?d00001

diff --git a/src/main/resources/static/assets/process/销售合同流程@3x.png b/src/main/resources/static/assets/process/销售合同流程@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ab1d02d0ff0bbc60ad29b2109725fb992af9e4a
GIT binary patch
literal 1568
zcmV+*2H*LKP)<h;3K|Lk000e1NJLTq001Wd001Wl1^@s7`=nu`00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91C!hlW1ONa40RR91CjbBd06sLrr~m*3ib+I4R9FecSX*daRS=yyHxI2f
zikQ|EgP>3)f><PxDi->nXrY1##S%qn$-TFd_=q1OBJ@WDKdL3w<RopRrJ&}c)QYW=
zru3uQ8bPdxs0FR@Ls79dwt>9PcFnnWPR{e*bCO06gqb~i?X_pm%zoT3;mh|KBT~MG
zCA73g3^f+Dl}tqA6Lcwn(h;nRB1KyMMt_l6+7YC5xJa4EKbbd?pW8*Mq3fV&h;lN$
zo?|*1naJ;r>fYpPs3dE&6AO7wbp-4sv`;{;Q=12rPBn@YkW8ry;Jj`2!Me>45}kAO
zq?x7tYEJ~Z0Hz=M3w*oiRveqMpl_w>u8&B`X~gPTHHw^d=soy(tJ+*3>SFbbp;0x)
zNjEjbv_)1Zf6zY?Aj0#B+b)kPEuZNk8+u!88YX{eL@&kB&~*wZ6U+&wJ<=#mJ!g(+
z2v1ickZbAgrw2{501AEP%S52PozKop(U<_>(ke+~<;(~&#pjPs<qW1E3q!nWbUT<j
z5sbIOpl}<7*@HE9hV9Z05F&@&g#q(V7-$?C1VPTTBVg{w^eRf@56=$8+Yf$YHQg;1
z+uVprTrwOY&)Iq2E#rb7=4hkc!NXxfr1~J7Y8N|7^rYKgCKDYicoV`UoVSNUq`N(s
zW$DTA<?86RFuZucEK^%155<!m{pKO;^`lA<kVuf_y35F7%C9%i#}LO$ad1@0R_+=!
zjg!;#1u}L^94OJoWKc41AiFOp#+sa>-!l`*XhV$5b{B2)vPY)Me5FIQUB^~Eixikf
z1`65A(R#~JWUKj!;K_2wp%48w)dOUG9ehGNDoGS?Y<GZ6D?ApN!WbaKX6(df4ldJB
z3$pfNm<#nbiqaSa{#)$}>;(UwQ-H{b$4uAYT%7P@L=Sit85BmNZCSLnFV7P=Ku1w)
zt?+QtF7j0Z4S0rS?!mSQEYmREi9ru5uXryvlU_P53DGbJHwHY@`%MR`jCkx&z4p11
zOYNX%0YpNB=@CqN7>DR76v+L8(pYES0SJRF1X%tnA`!D+M9P<$45JU1hEkJAkgh1V
zvys7zb9R9XG8i>hBJtg5nPR4~!Ku4p*3bvY@)9Aon7SKkXm9Fe!m9xpD4E6aJ*-4x
za}4eJdz!{mlOZ61`V*4yXVuryG6ePKa7U!=lx`^O#a)p;7~uJNy#vm|Z8tk{z(ut&
zeO=#7Z9SWKGCYq}zMTFa$HW^$cTJ7a$6?2$EziPiw`Ls60&Un!u|A|PxCJ^epW%Un
z(ocYbybmYoX}@hDda>VZ!`-_t3rC`JAUTD@^;5{ITeRwg>^=(asfr5$5}m_|FDZW@
zgr8p%WL3V%P8EEjb4cq3q;;eUsn?C0`T#c96P_VXVfrd((T?5@J`>j+wk6&Ta84e`
z@1{9<;ZzHLct02>*EYC*tXoQ}dLHL-u?-EG-0=&v8L4T-JMc10hj2%Kr+Af#&M9D_
z5{`{G-9U{yxA2s36>M_^3)vjUi%0ERyhTrHU!}A@inJb5U^R)f$}Q`?r93>-F?Fms
zVAeUa@s0@||ALX-?EUacjvUh%UNO5P?^bWtIR%kufn(2<H_=>&XiR^uSV>Jg*Yb=s
z5xL{QuNOV?F+GL!?pJ%VbBeeE5)YyG@hEyssfv3|n=?b7Ya6Nm9$C6W+baK?8^X}N
zI-y8*=q7&~*Vl4?TlGbE4pI3HKj7Esgd&mF;6uaE_0JEPtNj?!6E{Q{n6(Y3zOk;Q
zHNEY8Av_kxM|0RVahYz0?VR7fC^ZMi&Y*@?%S3Xfjr>JNuvs?wC$6Y7P2*jiw^F@Y
zD>B7&TJ)J(M=nx(CdXu;p;|l=-m&UysTB_Xs$^F}qNW;^2Sxpp>RBYBfBs)mbLH15
SN20m_0000<MNUMnLSTZnUdOor

literal 0
HcmV?d00001

diff --git a/src/main/resources/templates/admin/business/process-completed.ftl b/src/main/resources/templates/admin/business/process-completed.ftl
new file mode 100644
index 0000000..f82c5c9
--- /dev/null
+++ b/src/main/resources/templates/admin/business/process-completed.ftl
@@ -0,0 +1,44 @@
+<#assign base=request.contextPath />
+<#import "../../common/defaultLayout.ftl" as defaultLayout>
+<@defaultLayout.layout>
+  <style>
+
+  </style>
+
+  <div id="app">{{ message }}</div>
+
+  <script src="https://unpkg.com/vue@3/dist/vue.global.js"></script>
+
+  <script>
+      const {createApp} = Vue
+
+      createApp({
+          data() {
+              return {
+                  message: 'Hello Vue!'
+              }
+          }
+      }).mount('#app')
+  </script>
+
+  <script type="text/javascript">
+      $(function () {
+
+      })
+  </script>
+</@defaultLayout.layout>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
new file mode 100644
index 0000000..fef3f9d
--- /dev/null
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -0,0 +1,669 @@
+<#assign base=request.contextPath />
+<#import "../../common/defaultLayout.ftl" as defaultLayout>
+<@defaultLayout.layout>
+<#--  <link rel="stylesheet" href="../assets/css/amazeui.switch.css"/>-->
+  <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+  <style>
+
+      #businessPurchaseDetailsModal {
+          overflow: auto;
+      }
+
+      #businessPurchaseDetailsModal > table {
+
+      }
+
+      #newBusinessProcurementContractProcess {
+          overflow: auto;
+      }
+
+      .el-upload__input {
+          display: none !important;
+      }
+
+  </style>
+
+  <div class="admin-content" id="app">
+    <div class="admin-content-body">
+      <div class="am-cf am-padding">
+        <div class="am-fl am-cf"><strong class="am-text-primary am-text-lg">业务应用</strong> /
+          <small>{{subTitle}}</small></div>
+      </div>
+
+      <div class="am-g">
+        <div class="am-u-sm-12 am-u-md-12" v-if="isButtonMode">
+          <button type="button" class="am-btn" @click="salesContractProcessClick">
+            <img src="${base}/assets/process/销售合同流程@3x.png" width="36"/>
+            销售合同流程
+          </button>
+          <button type="button" class="am-btn" @click="businessProcurementProcessClick">
+            <img src="${base}/assets/process/业务采购流程@3x.png" width="39"/>
+            业务采购流程
+          </button>
+
+        </div>
+
+          <#-- 业务采购流程 -->
+        <div class="am-modal am-modal-prompt" tabindex="-1" id="businessProcurementProcessModal">
+          <div class="am-modal-dialog">
+            <div class="am-modal-hd"><strong>项目编号</strong></div>
+            <div class="am-modal-bd">
+              <input type="text" class="am-modal-prompt-input" placeholder="请输入项目编号或名称，支持模糊查询"/>
+            </div>
+            <div class="am-modal-footer">
+              <span class="am-modal-btn" data-am-modal-cancel>取消</span>
+              <span class="am-modal-btn" data-am-modal-confirm>查询</span>
+            </div>
+          </div>
+        </div>
+
+          <#-- 选择 业务采购清单明细 -->
+
+        <div class="am-u-sm-12 am-u-md-12" v-if="isBusinessProcurementContractProcessMode">
+          <el-table style="width: 100%">
+
+            <el-table-column prop="fee" label="费用项目" width="180"></el-table-column>
+            <el-table-column prop="fee" label="采购类别" width="180"></el-table-column>
+            <el-table-column prop="fee" label="产品名称" width="180"></el-table-column>
+            <el-table-column prop="fee" label="单位" width="180"></el-table-column>
+            <el-table-column prop="fee" label="数量" width="180"></el-table-column>
+            <el-table-column prop="fee" label="预算单价" width="180"></el-table-column>
+            <el-table-column prop="fee" label="税率（%）" width="180"></el-table-column>
+            <el-table-column prop="fee" label="含税总金额（元）" width="180"></el-table-column>
+            <el-table-column prop="fee" label="不含税金额（元）" width="180"></el-table-column>
+            <el-table-column prop="fee" label="税金（元）" width="180"></el-table-column>
+            <el-table-column prop="fee" label="是否垫资" width="180"></el-table-column>
+            <el-table-column prop="fee" label="支出时间" width="180"></el-table-column>
+            <el-table-column prop="fee" label="支出金额（元）" width="180"></el-table-column>
+            <el-table-column prop="fee" label="已采购数量" width="180"></el-table-column>
+            <el-table-column prop="fee" label="本次采购数量" width="180"></el-table-column>
+            <el-table-column prop="fee" label="未采购数量" width="180"></el-table-column>
+
+
+            <el-table-column prop="fee" label="供应商名称"></el-table-column>
+            <el-table-column prop="fee" label="设备厂商名称"></el-table-column>
+            <el-table-column prop="fee" label="对应采购清单"></el-table-column>
+            <el-table-column prop="fee" label="规格型号"></el-table-column>
+            <el-table-column prop="fee" label="对应采购数目"></el-table-column>
+            <el-table-column prop="fee" label="采购单价"></el-table-column>
+            <el-table-column prop="fee" label="含税总金额（元）"></el-table-column>
+
+          </el-table>
+        </div>
+
+          <#-- 新增销售合同流程 -->
+
+        <div class="am-u-sm-12 am-u-md-12" v-if="isSalesContractProcessMode">
+          <el-form :inline="true" :model="project" label-position="right" label-width="100px">
+
+            <div class="am-form-inline">
+              <el-tooltip :disabled="projectSelected" effect="light" content="项目编号或名称，支持模糊查询" placement="top-end">
+                <el-form-item label="项目编号">
+                  <el-autocomplete v-model="project.projectNo" :fetch-suggestions="queryProject"
+                                   placeholder="请输入项目编号或名称" @select="handleSelectProject">
+                  </el-autocomplete>
+                </el-form-item>
+              </el-tooltip>
+
+              <el-form-item label="项目标题">
+                <el-input placeholder="请输入内容" :disabled="projectSelected" :value="projectTitle" clearable></el-input>
+              </el-form-item>
+
+              <el-form-item label="申请时间">
+                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="project.title"></el-input>
+              </el-form-item>
+
+              <el-form-item label="项目类型">
+                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="project.typeDesc"></el-input>
+              </el-form-item>
+
+              <el-form-item label="合作类型">
+                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="project.cooperateTypeStr"></el-input>
+              </el-form-item>
+
+            </div>
+
+            <div>
+
+              <el-form-item label="申请部门">
+                <el-cascader :options="applySectorOptions" clearable></el-cascader>
+              </el-form-item>
+
+              <el-form-item label="申请人">
+                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="project.cooperateTypeStr"></el-input>
+              </el-form-item>
+
+              <el-form-item label="申请部门领导">
+                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="project.cooperateTypeStr"></el-input>
+              </el-form-item>
+
+              <el-form-item label="申请人电话">
+                <el-input placeholder="请输入内容" v-model="project.cooperateTypeStr"></el-input>
+              </el-form-item>
+
+            </div>
+
+            <div>
+
+              <el-form-item label="合同编号">
+                <el-input placeholder="请输入合同编号" v-model="project.contractNumber"></el-input>
+              </el-form-item>
+
+              <el-form-item label="合同名称">
+                <el-input placeholder="请输入合同名称" v-model="project.contractName"></el-input>
+              </el-form-item>
+
+              <el-form-item label="合同金额">
+                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="project.contractAmount"></el-input>
+              </el-form-item>
+
+            </div>
+
+            <div>
+              <el-form-item label="客户名称">
+                <el-input placeholder="请输入客户名称" v-model="project.contractNumber"></el-input>
+              </el-form-item>
+
+              <el-form-item label="最终用户名称">
+                <el-input placeholder="请输入最终用户名称" v-model="project.contractName"></el-input>
+              </el-form-item>
+            </div>
+
+            <div>
+              <el-form-item label="用印类型">
+                <el-checkbox-group v-model="project.sealType">
+                  <el-checkbox label="公章"></el-checkbox>
+                  <el-checkbox label="法人章"></el-checkbox>
+                  <el-checkbox label="合同专用章"></el-checkbox>
+                  <el-checkbox label="项目章"></el-checkbox>
+                  <el-checkbox label="法人签名章"></el-checkbox>
+                  <el-checkbox label="总经理签名章"></el-checkbox>
+                  <el-checkbox label="财务专用章"></el-checkbox>
+                  <el-checkbox label="电子合同章"></el-checkbox>
+                  <el-checkbox label="其他"></el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+            </div>
+
+            <div>
+
+              <el-form-item label="税率">
+                <el-select v-model="project.rate" placeholder="请选择税率">
+                  <el-option label="0%" value="1"></el-option>
+                  <el-option label="1%" value="1"></el-option>
+                  <el-option label="3%" value="1"></el-option>
+                  <el-option label="4%" value="1"></el-option>
+                  <el-option label="5%" value="1"></el-option>
+                  <el-option label="6%" value="1"></el-option>
+                  <el-option label="9%" value="1"></el-option>
+                  <el-option label="10%" value="1"></el-option>
+                  <el-option label="13%" value="1"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="是否垫资">
+                <el-input placeholder="请输入最终用户名称" v-model="project.contractName"></el-input>
+              </el-form-item>
+
+              <el-form-item label="垫资金额">
+                <el-input value="50000元"></el-input>
+              </el-form-item>
+
+              <el-form-item label="预算毛利率">
+                <el-input value="3.91%"></el-input>
+              </el-form-item>
+
+            </div>
+
+            <div>
+              <el-form-item label="收款条件">
+                <el-input type="textarea" :autosize="{ minRows: 3, maxRows: 10}" cols="90"
+                          v-model="project.desc" placeholder="请输入收款条件（限制5000字）"></el-input>
+              </el-form-item>
+            </div>
+
+            <div>
+              <el-form-item label="备注">
+                <el-input type="textarea" :autosize="{ minRows: 3, maxRows: 10}"
+                          v-model="project.desc" placeholder="请输入备注（限制5000字）" cols="90"></el-input>
+              </el-form-item>
+            </div>
+
+            <div>
+              <el-form-item label="上传附件">
+                <el-upload class="upload-demo"
+                           action="https://jsonplaceholder.typicode.com/posts/"
+                           :on-preview="handlePreview"
+                           :on-remove="handleRemove"
+                           :before-remove="beforeRemove"
+                           :limit="1"
+                           :on-exceed="handleExceed"
+                           :file-list="fileList">
+                  <el-button size="small" type="primary">点击上传</el-button>
+                  <div slot="tip" class="el-upload__tip">只能上传PDF、excel、word、图片、压缩包，且不超过50MB</div>
+                </el-upload>
+              </el-form-item>
+            </div>
+
+            <div>
+              <el-form-item label="合同清单明细">
+                <el-button type="text">详细清单</el-button>
+              </el-form-item>
+            </div>
+
+          </el-form>
+
+        </div>
+
+          <#-- 新增业务采购合同流程 -->
+
+        <div class="am-u-sm-12 am-u-md-12" id="newBusinessProcurementContractProcess" v-if="isBusinessProcurementContractProcessMode">
+          <form role="form" id="newBusinessProcurementContractProcessForm">
+            <div class="am-form-inline">
+
+              <div class="am-form-group">
+                <label class="am-u-md-3 am-form-label">项目编号</label>
+
+                <el-autocomplete v-model="project.serialNumber" :fetch-suggestions="queryProject"
+                                 placeholder="请输入内容" @select="handleSelectProject"></el-autocomplete>
+
+              </div>
+
+              <div class="am-form-group">
+                <label class="am-u-md-3 am-form-label">项目标题</label>
+                <el-input placeholder="请输入内容" v-model="project.title" clearable></el-input>
+              </div>
+              <div class="am-form-group">
+                <label class="am-u-md-3 am-form-label">申请时间</label>
+                <input type="text" class="am-form-field am-u-sm-2" :value="project.time"/>
+              </div>
+              <div class="am-form-group">
+                <label class="am-u-sm-3 am-form-label">采购模式</label>
+                <input type="text" class="am-form-field" :value="project.time"/>
+              </div>
+              <div class="am-form-group">
+                <label class="am-u-md-3 am-form-label">合作类型</label>
+                <input type="text" class="am-form-field" :value="project.time"/>
+              </div>
+
+            </div>
+
+            <div class="am-form-inline">
+
+              <div class="am-form-group am-u-md-4">
+                <label class="am-form-label">申请部门</label>
+                <input type="text" class="am-form-field" :value="project.title"/>
+                <input type="text" class="am-form-field" :value="project.time"/>
+                <input type="text" class="am-form-field" :value="project.time"/>
+              </div>
+
+              <div class="am-form-group am-u-md-4">
+                <label class="am-form-label">申请人</label>
+                <input type="text" class="am-form-field" value="周瑾"/>
+              </div>
+
+              <div class="am-form-group am-u-md-4">
+                <label class="am-form-label">申请部门领导</label>
+                <input type="text" class="am-form-field" value="尹浩"/>
+              </div>
+
+            </div>
+
+            <div class="am-form-inline">
+
+            </div>
+
+            <div class="am-form-inline">
+              <button type="submit" class="am-btn am-btn-default">登录</button>
+            </div>
+
+          </form>
+
+        </div>
+
+      </div>
+
+    </div>
+
+  </div>
+
+  <script src="https://unpkg.com/vue@2/dist/vue.js"></script>
+  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+
+  <script>
+
+    const newBusinessProcurementContractProcess = "newBusinessProcurementContractProcess"
+    const salesContractProcess = "salesContractProcess"
+    const BUTTON = "btn"
+
+    const data = () => {
+      return {
+        mode: "btn", // btn , newBusinessProcurementContractProcess
+        project: {},
+        projectSelected: false,
+        applySectorOptions: [
+          {
+            value: 'zhinan',
+            label: '指南',
+            children: [{
+              value: 'shejiyuanze',
+              label: '设计原则',
+              children: [{
+                value: 'yizhi',
+                label: '一致'
+              }, {
+                value: 'fankui',
+                label: '反馈'
+              }, {
+                value: 'xiaolv',
+                label: '效率'
+              }, {
+                value: 'kekong',
+                label: '可控'
+              }]
+            }, {
+              value: 'daohang',
+              label: '导航',
+              children: [{
+                value: 'cexiangdaohang',
+                label: '侧向导航'
+              }, {
+                value: 'dingbudaohang',
+                label: '顶部导航'
+              }]
+            }]
+          },
+          {
+            value: 'zujian',
+            label: '组件',
+            children: [{
+              value: 'basic',
+              label: 'Basic',
+              children: [{
+                value: 'layout',
+                label: 'Layout 布局'
+              }, {
+                value: 'color',
+                label: 'Color 色彩'
+              }, {
+                value: 'typography',
+                label: 'Typography 字体'
+              }, {
+                value: 'icon',
+                label: 'Icon 图标'
+              }, {
+                value: 'button',
+                label: 'Button 按钮'
+              }]
+            }, {
+              value: 'form',
+              label: 'Form',
+              children: [{
+                value: 'radio',
+                label: 'Radio 单选框'
+              }, {
+                value: 'checkbox',
+                label: 'Checkbox 多选框'
+              }, {
+                value: 'input',
+                label: 'Input 输入框'
+              }, {
+                value: 'input-number',
+                label: 'InputNumber 计数器'
+              }, {
+                value: 'select',
+                label: 'Select 选择器'
+              }, {
+                value: 'cascader',
+                label: 'Cascader 级联选择器'
+              }, {
+                value: 'switch',
+                label: 'Switch 开关'
+              }, {
+                value: 'slider',
+                label: 'Slider 滑块'
+              }, {
+                value: 'time-picker',
+                label: 'TimePicker 时间选择器'
+              }, {
+                value: 'date-picker',
+                label: 'DatePicker 日期选择器'
+              }, {
+                value: 'datetime-picker',
+                label: 'DateTimePicker 日期时间选择器'
+              }, {
+                value: 'upload',
+                label: 'Upload 上传'
+              }, {
+                value: 'rate',
+                label: 'Rate 评分'
+              }, {
+                value: 'form',
+                label: 'Form 表单'
+              }]
+            }, {
+              value: 'data',
+              label: 'Data',
+              children: [{
+                value: 'table',
+                label: 'Table 表格'
+              }, {
+                value: 'tag',
+                label: 'Tag 标签'
+              }, {
+                value: 'progress',
+                label: 'Progress 进度条'
+              }, {
+                value: 'tree',
+                label: 'Tree 树形控件'
+              }, {
+                value: 'pagination',
+                label: 'Pagination 分页'
+              }, {
+                value: 'badge',
+                label: 'Badge 标记'
+              }]
+            }, {
+              value: 'notice',
+              label: 'Notice',
+              children: [{
+                value: 'alert',
+                label: 'Alert 警告'
+              }, {
+                value: 'loading',
+                label: 'Loading 加载'
+              }, {
+                value: 'message',
+                label: 'Message 消息提示'
+              }, {
+                value: 'message-box',
+                label: 'MessageBox 弹框'
+              }, {
+                value: 'notification',
+                label: 'Notification 通知'
+              }]
+            }, {
+              value: 'navigation',
+              label: 'Navigation',
+              children: [{
+                value: 'menu',
+                label: 'NavMenu 导航菜单'
+              }, {
+                value: 'tabs',
+                label: 'Tabs 标签页'
+              }, {
+                value: 'breadcrumb',
+                label: 'Breadcrumb 面包屑'
+              }, {
+                value: 'dropdown',
+                label: 'Dropdown 下拉菜单'
+              }, {
+                value: 'steps',
+                label: 'Steps 步骤条'
+              }]
+            }, {
+              value: 'others',
+              label: 'Others',
+              children: [{
+                value: 'dialog',
+                label: 'Dialog 对话框'
+              }, {
+                value: 'tooltip',
+                label: 'Tooltip 文字提示'
+              }, {
+                value: 'popover',
+                label: 'Popover 弹出框'
+              }, {
+                value: 'card',
+                label: 'Card 卡片'
+              }, {
+                value: 'carousel',
+                label: 'Carousel 走马灯'
+              }, {
+                value: 'collapse',
+                label: 'Collapse 折叠面板'
+              }]
+            }]
+          },
+          {
+            value: 'ziyuan',
+            label: '资源',
+            children: [{
+              value: 'axure',
+              label: 'Axure Components'
+            }, {
+              value: 'sketch',
+              label: 'Sketch Templates'
+            }, {
+              value: 'jiaohu',
+              label: '组件交互文档'
+            }]
+          }
+        ],
+        fileList: [],
+        businessPurchaseDetails: [
+          {
+            fee: 100
+          }
+        ],
+        showBusinessPurchaseDetails: false,
+      }
+    }
+
+    const methods = {
+      changeMode(mode) {
+        this.mode = mode
+      },
+
+      salesContractProcessClick() {
+        this.changeMode(salesContractProcess)
+      },
+
+      businessProcurementProcessClick() {
+        const that = this
+      },
+
+      queryProject(q, callback) {
+        fetch("${base}/process/projects?q=" + q)
+            .then(res => res.json())
+            .then(data => {
+              if (data.length === 0) {
+
+              }
+              callback(data.map(project => ({
+                value: project.name,
+                id: project.id,
+              })))
+            })
+            .catch(err => {
+              this.$message.error('项目搜索失败');
+            })
+      },
+      handleSelectProject(selected) {
+        const loading = this.$loading({
+          lock: true,
+          text: '正在加载项目',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+
+        fetch("${base}/process/projects/" + selected.id)
+            .then(res => res.json())
+            .then(data => {
+              this.project = data
+              this.projectSelected = true
+            })
+            .catch(err => {
+              this.$message.error('项目\'' + selected.value + '\'加载失败');
+            })
+            .finally(() => loading.close())
+      },
+
+      handleRemove(file, fileList) {
+        console.log(file, fileList);
+      },
+      handlePreview(file) {
+        console.log(file);
+      },
+      handleExceed(files, fileList) {
+        this.$message.warning("当前限制选择 3 个文件，本次选择了 " + files.length + " 个文件，共选择了 +" + files.length + fileList.length + " 个文件");
+      },
+      beforeRemove(file, fileList) {
+        return this.$confirm("确定移除 " + file.name + "？");
+      }
+
+    }
+
+    new Vue({
+      el: '#app',
+      data,
+      computed: {
+        projectTitle() {
+          const {projectNo, name, applyPerson, applyTime} = this.project
+          if (projectNo && name) {
+            return projectNo + "-" + name + "-" + applyPerson + "-" + applyTime
+          }
+          return ""
+        },
+        isButtonMode() {
+          return this.mode === BUTTON
+        },
+        isBusinessProcurementContractProcessMode() {
+          return this.mode === newBusinessProcurementContractProcess
+        },
+        isSalesContractProcessMode() {
+          return this.mode === salesContractProcess
+        },
+        subTitle() {
+          switch (this.mode) {
+            case BUTTON:
+              return "新增流程"
+            case salesContractProcess:
+              return "新增销售合同流程"
+            case newBusinessProcurementContractProcess:
+              return "新增业务采购合同流程"
+          }
+        }
+      },
+
+      methods,
+    })
+
+  </script>
+
+</@defaultLayout.layout>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/templates/admin/business/process-review.ftl b/src/main/resources/templates/admin/business/process-review.ftl
new file mode 100644
index 0000000..f82c5c9
--- /dev/null
+++ b/src/main/resources/templates/admin/business/process-review.ftl
@@ -0,0 +1,44 @@
+<#assign base=request.contextPath />
+<#import "../../common/defaultLayout.ftl" as defaultLayout>
+<@defaultLayout.layout>
+  <style>
+
+  </style>
+
+  <div id="app">{{ message }}</div>
+
+  <script src="https://unpkg.com/vue@3/dist/vue.global.js"></script>
+
+  <script>
+      const {createApp} = Vue
+
+      createApp({
+          data() {
+              return {
+                  message: 'Hello Vue!'
+              }
+          }
+      }).mount('#app')
+  </script>
+
+  <script type="text/javascript">
+      $(function () {
+
+      })
+  </script>
+</@defaultLayout.layout>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

From b313dd6f6b5584853c231b5134a323c7712ede0e Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Tue, 13 Dec 2022 17:37:06 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=A1=A8=E5=8D=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/backend/ProcessController.java | 124 +++-
 .../work/model/enums/ProcessStatus.java       |  12 +
 .../work/model/enums/ProcessTaxRate.java      |  23 +
 .../cn/palmte/work/model/enums/SealType.java  |  41 ++
 .../templates/admin/business/process-new.ftl  | 623 +++++++++++-------
 5 files changed, 568 insertions(+), 255 deletions(-)
 create mode 100644 src/main/java/cn/palmte/work/model/enums/ProcessStatus.java
 create mode 100644 src/main/java/cn/palmte/work/model/enums/ProcessTaxRate.java
 create mode 100644 src/main/java/cn/palmte/work/model/enums/SealType.java

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
index bac191e..734da7d 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
@@ -1,19 +1,27 @@
 package cn.palmte.work.controller.backend;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import cn.palmte.work.model.DeptRepository;
 import cn.palmte.work.model.Project;
 import cn.palmte.work.model.ProjectRepository;
+import cn.palmte.work.model.enums.ProcessStatus;
+import cn.palmte.work.model.enums.SealType;
 
 /**
  * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
@@ -22,18 +30,43 @@ import cn.palmte.work.model.ProjectRepository;
 @Controller
 @RequestMapping("/process")
 public class ProcessController {
+  static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
+  private final DeptRepository deptRepository;
   private final ProjectRepository projectRepository;
 
-  public ProcessController(ProjectRepository projectRepository) {
+  public ProcessController(ProjectRepository projectRepository, DeptRepository deptRepository) {
     this.projectRepository = projectRepository;
+    this.deptRepository = deptRepository;
+  }
+
+  static class FormMetadata {
+    // 部门
+
+    // 印章类型
+    public Map<String, String> sealTypes;
+
+    // 税率
+    public List<Integer> taxRate;
+  }
+
+  @ResponseBody
+  @GetMapping("/form/metadata")
+  public FormMetadata metadata() {
+    FormMetadata metadata = new FormMetadata();
+    metadata.sealTypes = Arrays.stream(SealType.values())
+            .collect(Collectors.toMap(SealType::getDescription, Enum::name));
+    metadata.taxRate = Arrays.asList(0, 1, 3, 4, 5, 6, 9, 10, 13);
+    return metadata;
   }
 
   /**
    * 新建流程
    */
   @GetMapping("/new")
-  public String newProcess() {
+  public String newProcess(Model model) {
+    model.addAttribute("sealTypes", SealType.values());
+    model.addAttribute("taxRate", Arrays.asList(0, 1, 3, 4, 5, 6, 9, 10, 13));
     return "/admin/business/process-new";
   }
 
@@ -67,10 +100,95 @@ public class ProcessController {
             .collect(Collectors.toList());
   }
 
+  public static class ProjectReturnValue {
+    public final String applyDate = LocalDate.now().format(formatter);
+    public String projectNo;
+    public Integer projectId;
+
+    // 申请人
+    public String applyPersonName;
+
+    // 项目类型
+    public String projectType;
+    // 合作类型
+    public String cooperationType;
+
+    // 合同金额
+    public String contractAmount;
+
+  }
+
   @ResponseBody
   @GetMapping("/projects/{id}")
   public Project query(@PathVariable int id) {
-    return projectRepository.findById(id);
+    Project byId = projectRepository.findById(id);
+
+    // projectType
+    // cooperationType
+    return byId;
+  }
+
+  // 销售合同流程
+
+  static class SaleContractForm {
+
+    public Integer projectId;
+
+    // 项目编号
+    public String projectNo;
+
+    public LocalDate applyDate;
+
+    // 项目标题
+    public String title;
+
+    // 项目类型
+    public String projectType;
+
+    // 合作类型
+    public String cooperationType;
+
+    // 申请人
+    public String applyPersonName;
+
+    public String applyDept;
+
+    // 申请部门领导
+
+    public String applyDeptLeaderName;
+
+    // 申请人电话
+    public String applyPersonPhone;
+
+    // 合同编号
+    public String contractNo;
+
+    // 合同名称
+    public String contractName;
+
+    // 客户名称
+    public String clientName;
+
+    // 用印类型
+    public String[] sealType;
+
+    // 税率
+    public String taxRate;
+
+    // 是否垫资
+
+    // 收款条件
+    public String paymentTerms;
+
+    public ProcessStatus status;
+
+  }
+
+  @ResponseBody
+  @PostMapping
+  public void post(SaleContractForm form) {
+    System.out.println(form);
+
   }
 
 }
diff --git a/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java b/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java
new file mode 100644
index 0000000..f6b4ca0
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java
@@ -0,0 +1,12 @@
+package cn.palmte.work.model.enums;
+
+/**
+ * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ * @since 1.0 2022/12/13 16:12
+ */
+public enum ProcessStatus {
+
+  draft,
+  completed
+  ;
+}
diff --git a/src/main/java/cn/palmte/work/model/enums/ProcessTaxRate.java b/src/main/java/cn/palmte/work/model/enums/ProcessTaxRate.java
new file mode 100644
index 0000000..7004b84
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/enums/ProcessTaxRate.java
@@ -0,0 +1,23 @@
+package cn.palmte.work.model.enums;
+
+/**
+ * 业务应用里面的税率
+ *
+ * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ * @since 1.0 2022/12/13 15:41
+ */
+public enum ProcessTaxRate {
+
+  ;
+
+  private final String description;
+
+  ProcessTaxRate(String description) {
+    this.description = description;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+}
diff --git a/src/main/java/cn/palmte/work/model/enums/SealType.java b/src/main/java/cn/palmte/work/model/enums/SealType.java
new file mode 100644
index 0000000..817f469
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/enums/SealType.java
@@ -0,0 +1,41 @@
+package cn.palmte.work.model.enums;
+
+/**
+ * 印章类型
+ *
+ * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ * @since 1.0 2022/12/13 15:25
+ */
+public enum SealType {
+
+  // "公章"
+  // "法人章"
+  // "合同专用章"
+  // "项目章"
+  // "法人签名章"
+  // "总经理签名章"
+  // "财务专用章"
+  // "电子合同章"
+  // "其他"
+
+  official("公章"),
+  legal("法人章"),
+  contract_special("合同专用章"),
+  project("项目章"),
+  legal_person_signature("法人签名章"),
+  general_manager_signature("总经理签名章"),
+  financial("财务专用章"),
+  electronic_contract("电子合同章"),
+  other("其他");
+
+  private final String description;
+
+  SealType(String description) {
+    this.description = description;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+}
diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
index fef3f9d..6eae1b4 100644
--- a/src/main/resources/templates/admin/business/process-new.ftl
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -21,6 +21,13 @@
           display: none !important;
       }
 
+      .el-textarea .el-input__count {
+          line-height: 15px;
+      }
+
+      .admin-content-body {
+          margin-bottom: 100px;
+      }
   </style>
 
   <div class="admin-content" id="app">
@@ -32,7 +39,7 @@
 
       <div class="am-g">
         <div class="am-u-sm-12 am-u-md-12" v-if="isButtonMode">
-          <button type="button" class="am-btn" @click="salesContractProcessClick">
+          <button type="button" class="am-btn" @click="goToSaleContractProcess">
             <img src="${base}/assets/process/销售合同流程@3x.png" width="36"/>
             销售合同流程
           </button>
@@ -55,12 +62,265 @@
               <span class="am-modal-btn" data-am-modal-confirm>查询</span>
             </div>
           </div>
+        </div>
+
+          <#-- 新增销售合同流程 -->
+
+        <div class="am-u-sm-12 am-u-md-12" v-if="isSalesContractProcessMode">
+          <el-form :inline="true" ref="saleContractProcessForm" :model="processForm" label-position="right" label-width="100px">
+
+            <div class="am-form-inline">
+              <el-tooltip :disabled="projectSelected" effect="light" content="项目编号或名称，支持模糊查询" placement="top-end">
+                <el-form-item label="项目编号">
+                  <el-autocomplete v-model="processForm.projectNo" :fetch-suggestions="queryProject"
+                                   value-key="name" placeholder="请输入项目编号或名称" @select="handleSelectProject">
+                  </el-autocomplete>
+                </el-form-item>
+              </el-tooltip>
+
+              <el-form-item label="项目标题">
+                <el-input placeholder="请输入内容" :disabled="projectSelected" :value="projectTitle" clearable></el-input>
+              </el-form-item>
+
+              <el-form-item label="申请时间">
+                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="processForm.applyDate"></el-input>
+              </el-form-item>
+
+              <el-form-item label="项目类型">
+                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="processForm.projectType"></el-input>
+              </el-form-item>
+
+              <el-form-item label="合作类型">
+                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="processForm.cooperationType"></el-input>
+              </el-form-item>
+
+            </div>
+
+            <div>
+
+              <el-form-item label="申请部门" :rules="[{ required: true, message: '申请部门电话不能为空'}]" prop="applyDept">
+                <el-cascader :options="applySectorOptions" clearable v-model="processForm.applyDept"></el-cascader>
+              </el-form-item>
+
+              <el-form-item label="申请人">
+                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="processForm.cooperateTypeStr"></el-input>
+              </el-form-item>
+
+              <el-form-item label="申请部门领导">
+                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="processForm.cooperateTypeStr"></el-input>
+              </el-form-item>
+
+              <el-form-item label="申请人电话" :rules="[{ required: true, message: '申请人电话不能为空'}]" prop="applyPersonPhone">
+                <el-input placeholder="请输入内容" v-model="processForm.applyPersonPhone"></el-input>
+              </el-form-item>
+
+            </div>
+
+            <div>
+
+              <el-form-item label="合同编号" :rules="[{ required: true, message: '合同编号不能为空'}]" prop="contractNo">
+                <el-input placeholder="请输入合同编号" v-model="processForm.contractNo"></el-input>
+              </el-form-item>
+
+              <el-form-item label="合同名称" :rules="[{ required: true, message: '合同名称不能为空'}]" prop="contractName">
+                <el-input placeholder="请输入合同名称" v-model="processForm.contractName"></el-input>
+              </el-form-item>
+
+              <el-form-item label="合同金额">
+                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="processForm.contractAmount"></el-input>
+              </el-form-item>
+
+            </div>
+
+            <div>
+              <el-form-item label="客户名称" :rules="[{ required: true, message: '客户名称不能为空'}]">
+                <el-input placeholder="请输入客户名称" v-model="processForm.contractNumber"></el-input>
+              </el-form-item>
+
+              <el-form-item label="最终用户名称">
+                <el-input placeholder="请输入最终用户名称" v-model="processForm.contractName"></el-input>
+              </el-form-item>
+            </div>
+
+            <div>
+              <el-form-item label="用印类型" :rules="[{ required: true, message: '用印类型不能为空'}]">
+                <el-checkbox-group v-model="processForm.sealType">
+                    <#list sealTypes as sealType>
+                      <el-checkbox label="${sealType.name()}" key="key-${sealType.name()}">${sealType.description}</el-checkbox>
+                    </#list>
+                </el-checkbox-group>
+              </el-form-item>
+            </div>
+
+            <div>
+
+              <el-form-item label="税率" :rules="[{ required: true, message: '税率不能为空'}]" prop="taxRate">
+                <el-select v-model="processForm.taxRate" placeholder="请选择税率">
+                    <#list taxRate as rate>
+                      <el-option label="${rate}%" value="${rate}"></el-option>
+                    </#list>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="是否垫资">
+                <el-input placeholder="请输入最终用户名称" v-model="processForm.contractName"></el-input>
+              </el-form-item>
+
+              <el-form-item label="垫资金额">
+                <el-input value="50000元"></el-input>
+              </el-form-item>
+
+              <el-form-item label="预算毛利率">
+                <el-input value="3.91%"></el-input>
+              </el-form-item>
+
+            </div>
+
+            <div>
+              <el-form-item label="收款条件" :rules="[{ required: true, message: '收款条件不能为空'}]" prop="paymentTerms">
+                <el-input type="textarea" :autosize="{ minRows: 3, maxRows: 10}" cols="90" maxlength="5000" show-word-limit
+                          v-model="processForm.paymentTerms" placeholder="请输入收款条件（限制5000字）"></el-input>
+              </el-form-item>
+            </div>
+
+            <div>
+              <el-form-item label="备注">
+                <el-input type="textarea" :autosize="{ minRows: 3, maxRows: 10}" maxlength="5000" show-word-limit
+                          v-model="processForm.remark" placeholder="请输入备注（限制5000字）" cols="90"></el-input>
+              </el-form-item>
+            </div>
+
+            <div>
+              <el-form-item label="上传附件">
+                <el-upload class="upload-demo"
+                           action="https://jsonplaceholder.typicode.com/posts/"
+                           :on-preview="handlePreview"
+                           :on-remove="handleRemove"
+                           :before-remove="beforeRemove"
+                           :limit="1"
+                           :on-exceed="handleExceed"
+                           :file-list="fileList">
+                  <el-button size="small" type="primary">点击上传</el-button>
+                  <div slot="tip" class="el-upload__tip">只能上传PDF、excel、word、图片、压缩包，且不超过50MB</div>
+                </el-upload>
+              </el-form-item>
+            </div>
+
+            <div>
+              <el-form-item label="合同清单明细">
+                <el-button type="text" @click="goToSaleContractDetail">详细清单</el-button>
+              </el-form-item>
+            </div>
+
+          </el-form>
+
+            <#-- <el-row justify="space-around" type="flex" class="row-bg">-->
+          <el-row>
+            <el-button type="info" @click="goToHome">返回上一级</el-button>
+            <el-button type="primary" @click="saveDraft">保存草稿</el-button>
+            <el-button type="success" @click="submit">提交</el-button>
+          </el-row>
+
+
+        </div>
+
+          <#-- 销售合同清单明细 -->
+
+        <div class="am-u-sm-12 am-u-md-12" v-if="isSaleContractDetailMode">
+          <el-table border :data="businessPurchaseDetails">
+            <el-table-column type="index" :index="1" label="序号"></el-table-column>
+            <el-table-column prop="fee" label="类别"></el-table-column>
+            <el-table-column prop="fee" label="名称"></el-table-column>
+            <el-table-column prop="fee" label="规格型号"></el-table-column>
+            <el-table-column prop="fee" label="参数"></el-table-column>
+            <el-table-column prop="fee" label="单位"></el-table-column>
+            <el-table-column prop="fee" label="数量"></el-table-column>
+            <el-table-column prop="fee" label="单价"></el-table-column>
+            <el-table-column prop="fee" label="税率"></el-table-column>
+            <el-table-column prop="fee" label="含税金额"></el-table-column>
+            <el-table-column prop="fee" label="不含税金额"></el-table-column>
+            <el-table-column prop="fee" label="含税总金额"></el-table-column>
+            <el-table-column prop="fee" label="税金"></el-table-column>
+            <el-table-column prop="fee" label="质保期"></el-table-column>
+
+          </el-table>
+
+          <el-row justify="space-around" type="flex" style="margin: 20px">
+            <el-button type="info" @click="goToSaleContractProcess">保存并返回上一级</el-button>
+          </el-row>
+
+        </div>
+
+          <#-- 新增业务采购合同流程 -->
+
+        <div class="am-u-sm-12 am-u-md-12" id="newBusinessProcurementContractProcess" v-if="isBusinessProcurementContractProcessMode">
+          <form role="form" id="newBusinessProcurementContractProcessForm">
+            <div class="am-form-inline">
+
+              <div class="am-form-group">
+                <label class="am-u-md-3 am-form-label">项目编号</label>
+
+                <el-autocomplete v-model="processForm.serialNumber" :fetch-suggestions="queryProject"
+                                 placeholder="请输入内容" @select="handleSelectProject"></el-autocomplete>
+
+              </div>
+
+              <div class="am-form-group">
+                <label class="am-u-md-3 am-form-label">项目标题</label>
+                <el-input placeholder="请输入内容" v-model="processForm.title" clearable></el-input>
+              </div>
+              <div class="am-form-group">
+                <label class="am-u-md-3 am-form-label">申请时间</label>
+                <input type="text" class="am-form-field am-u-sm-2" :value="processForm.time"/>
+              </div>
+              <div class="am-form-group">
+                <label class="am-u-sm-3 am-form-label">采购模式</label>
+                <input type="text" class="am-form-field" :value="processForm.time"/>
+              </div>
+              <div class="am-form-group">
+                <label class="am-u-md-3 am-form-label">合作类型</label>
+                <input type="text" class="am-form-field" :value="processForm.time"/>
+              </div>
+
+            </div>
+
+            <div class="am-form-inline">
+
+              <div class="am-form-group am-u-md-4">
+                <label class="am-form-label">申请部门</label>
+                <input type="text" class="am-form-field" :value="processForm.title"/>
+                <input type="text" class="am-form-field" :value="processForm.time"/>
+                <input type="text" class="am-form-field" :value="processForm.time"/>
+              </div>
+
+              <div class="am-form-group am-u-md-4">
+                <label class="am-form-label">申请人</label>
+                <input type="text" class="am-form-field" value="周瑾"/>
+              </div>
+
+              <div class="am-form-group am-u-md-4">
+                <label class="am-form-label">申请部门领导</label>
+                <input type="text" class="am-form-field" value="尹浩"/>
+              </div>
+
+            </div>
+
+            <div class="am-form-inline">
+
+            </div>
+
+            <div class="am-form-inline">
+              <button type="submit" class="am-btn am-btn-default">登录</button>
+            </div>
+
+          </form>
+
         </div>
 
           <#-- 选择 业务采购清单明细 -->
 
         <div class="am-u-sm-12 am-u-md-12" v-if="isBusinessProcurementContractProcessMode">
-          <el-table style="width: 100%">
+          <el-table style="width: 100%" border>
 
             <el-table-column prop="fee" label="费用项目" width="180"></el-table-column>
             <el-table-column prop="fee" label="采购类别" width="180"></el-table-column>
@@ -91,236 +351,6 @@
           </el-table>
         </div>
 
-          <#-- 新增销售合同流程 -->
-
-        <div class="am-u-sm-12 am-u-md-12" v-if="isSalesContractProcessMode">
-          <el-form :inline="true" :model="project" label-position="right" label-width="100px">
-
-            <div class="am-form-inline">
-              <el-tooltip :disabled="projectSelected" effect="light" content="项目编号或名称，支持模糊查询" placement="top-end">
-                <el-form-item label="项目编号">
-                  <el-autocomplete v-model="project.projectNo" :fetch-suggestions="queryProject"
-                                   placeholder="请输入项目编号或名称" @select="handleSelectProject">
-                  </el-autocomplete>
-                </el-form-item>
-              </el-tooltip>
-
-              <el-form-item label="项目标题">
-                <el-input placeholder="请输入内容" :disabled="projectSelected" :value="projectTitle" clearable></el-input>
-              </el-form-item>
-
-              <el-form-item label="申请时间">
-                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="project.title"></el-input>
-              </el-form-item>
-
-              <el-form-item label="项目类型">
-                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="project.typeDesc"></el-input>
-              </el-form-item>
-
-              <el-form-item label="合作类型">
-                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="project.cooperateTypeStr"></el-input>
-              </el-form-item>
-
-            </div>
-
-            <div>
-
-              <el-form-item label="申请部门">
-                <el-cascader :options="applySectorOptions" clearable></el-cascader>
-              </el-form-item>
-
-              <el-form-item label="申请人">
-                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="project.cooperateTypeStr"></el-input>
-              </el-form-item>
-
-              <el-form-item label="申请部门领导">
-                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="project.cooperateTypeStr"></el-input>
-              </el-form-item>
-
-              <el-form-item label="申请人电话">
-                <el-input placeholder="请输入内容" v-model="project.cooperateTypeStr"></el-input>
-              </el-form-item>
-
-            </div>
-
-            <div>
-
-              <el-form-item label="合同编号">
-                <el-input placeholder="请输入合同编号" v-model="project.contractNumber"></el-input>
-              </el-form-item>
-
-              <el-form-item label="合同名称">
-                <el-input placeholder="请输入合同名称" v-model="project.contractName"></el-input>
-              </el-form-item>
-
-              <el-form-item label="合同金额">
-                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="project.contractAmount"></el-input>
-              </el-form-item>
-
-            </div>
-
-            <div>
-              <el-form-item label="客户名称">
-                <el-input placeholder="请输入客户名称" v-model="project.contractNumber"></el-input>
-              </el-form-item>
-
-              <el-form-item label="最终用户名称">
-                <el-input placeholder="请输入最终用户名称" v-model="project.contractName"></el-input>
-              </el-form-item>
-            </div>
-
-            <div>
-              <el-form-item label="用印类型">
-                <el-checkbox-group v-model="project.sealType">
-                  <el-checkbox label="公章"></el-checkbox>
-                  <el-checkbox label="法人章"></el-checkbox>
-                  <el-checkbox label="合同专用章"></el-checkbox>
-                  <el-checkbox label="项目章"></el-checkbox>
-                  <el-checkbox label="法人签名章"></el-checkbox>
-                  <el-checkbox label="总经理签名章"></el-checkbox>
-                  <el-checkbox label="财务专用章"></el-checkbox>
-                  <el-checkbox label="电子合同章"></el-checkbox>
-                  <el-checkbox label="其他"></el-checkbox>
-                </el-checkbox-group>
-              </el-form-item>
-            </div>
-
-            <div>
-
-              <el-form-item label="税率">
-                <el-select v-model="project.rate" placeholder="请选择税率">
-                  <el-option label="0%" value="1"></el-option>
-                  <el-option label="1%" value="1"></el-option>
-                  <el-option label="3%" value="1"></el-option>
-                  <el-option label="4%" value="1"></el-option>
-                  <el-option label="5%" value="1"></el-option>
-                  <el-option label="6%" value="1"></el-option>
-                  <el-option label="9%" value="1"></el-option>
-                  <el-option label="10%" value="1"></el-option>
-                  <el-option label="13%" value="1"></el-option>
-                </el-select>
-              </el-form-item>
-
-              <el-form-item label="是否垫资">
-                <el-input placeholder="请输入最终用户名称" v-model="project.contractName"></el-input>
-              </el-form-item>
-
-              <el-form-item label="垫资金额">
-                <el-input value="50000元"></el-input>
-              </el-form-item>
-
-              <el-form-item label="预算毛利率">
-                <el-input value="3.91%"></el-input>
-              </el-form-item>
-
-            </div>
-
-            <div>
-              <el-form-item label="收款条件">
-                <el-input type="textarea" :autosize="{ minRows: 3, maxRows: 10}" cols="90"
-                          v-model="project.desc" placeholder="请输入收款条件（限制5000字）"></el-input>
-              </el-form-item>
-            </div>
-
-            <div>
-              <el-form-item label="备注">
-                <el-input type="textarea" :autosize="{ minRows: 3, maxRows: 10}"
-                          v-model="project.desc" placeholder="请输入备注（限制5000字）" cols="90"></el-input>
-              </el-form-item>
-            </div>
-
-            <div>
-              <el-form-item label="上传附件">
-                <el-upload class="upload-demo"
-                           action="https://jsonplaceholder.typicode.com/posts/"
-                           :on-preview="handlePreview"
-                           :on-remove="handleRemove"
-                           :before-remove="beforeRemove"
-                           :limit="1"
-                           :on-exceed="handleExceed"
-                           :file-list="fileList">
-                  <el-button size="small" type="primary">点击上传</el-button>
-                  <div slot="tip" class="el-upload__tip">只能上传PDF、excel、word、图片、压缩包，且不超过50MB</div>
-                </el-upload>
-              </el-form-item>
-            </div>
-
-            <div>
-              <el-form-item label="合同清单明细">
-                <el-button type="text">详细清单</el-button>
-              </el-form-item>
-            </div>
-
-          </el-form>
-
-        </div>
-
-          <#-- 新增业务采购合同流程 -->
-
-        <div class="am-u-sm-12 am-u-md-12" id="newBusinessProcurementContractProcess" v-if="isBusinessProcurementContractProcessMode">
-          <form role="form" id="newBusinessProcurementContractProcessForm">
-            <div class="am-form-inline">
-
-              <div class="am-form-group">
-                <label class="am-u-md-3 am-form-label">项目编号</label>
-
-                <el-autocomplete v-model="project.serialNumber" :fetch-suggestions="queryProject"
-                                 placeholder="请输入内容" @select="handleSelectProject"></el-autocomplete>
-
-              </div>
-
-              <div class="am-form-group">
-                <label class="am-u-md-3 am-form-label">项目标题</label>
-                <el-input placeholder="请输入内容" v-model="project.title" clearable></el-input>
-              </div>
-              <div class="am-form-group">
-                <label class="am-u-md-3 am-form-label">申请时间</label>
-                <input type="text" class="am-form-field am-u-sm-2" :value="project.time"/>
-              </div>
-              <div class="am-form-group">
-                <label class="am-u-sm-3 am-form-label">采购模式</label>
-                <input type="text" class="am-form-field" :value="project.time"/>
-              </div>
-              <div class="am-form-group">
-                <label class="am-u-md-3 am-form-label">合作类型</label>
-                <input type="text" class="am-form-field" :value="project.time"/>
-              </div>
-
-            </div>
-
-            <div class="am-form-inline">
-
-              <div class="am-form-group am-u-md-4">
-                <label class="am-form-label">申请部门</label>
-                <input type="text" class="am-form-field" :value="project.title"/>
-                <input type="text" class="am-form-field" :value="project.time"/>
-                <input type="text" class="am-form-field" :value="project.time"/>
-              </div>
-
-              <div class="am-form-group am-u-md-4">
-                <label class="am-form-label">申请人</label>
-                <input type="text" class="am-form-field" value="周瑾"/>
-              </div>
-
-              <div class="am-form-group am-u-md-4">
-                <label class="am-form-label">申请部门领导</label>
-                <input type="text" class="am-form-field" value="尹浩"/>
-              </div>
-
-            </div>
-
-            <div class="am-form-inline">
-
-            </div>
-
-            <div class="am-form-inline">
-              <button type="submit" class="am-btn am-btn-default">登录</button>
-            </div>
-
-          </form>
-
-        </div>
-
       </div>
 
     </div>
@@ -333,13 +363,32 @@
   <script>
 
     const newBusinessProcurementContractProcess = "newBusinessProcurementContractProcess"
-    const salesContractProcess = "salesContractProcess"
+    const saleContractProcess = "saleContractProcess"
+    const saleContractDetail = "saleContractDetail"
     const BUTTON = "btn"
 
+    const isEmpty = (obj) => {
+      return !obj || (obj.length && obj.length === 0)
+    }
+
+    const isNotEmpty = (obj) => {
+      return !isEmpty(obj)
+    }
+
+    const isBlank = (obj) => {
+      return isEmpty(obj) || (obj.trim && isEmpty(obj.trim()))
+    }
+
+    const hasText = (obj) => {
+      return !isBlank(obj)
+    }
+
     const data = () => {
       return {
         mode: "btn", // btn , newBusinessProcurementContractProcess
-        project: {},
+        processForm: {
+          sealType: [],
+        },
         projectSelected: false,
         applySectorOptions: [
           {
@@ -544,6 +593,9 @@
         businessPurchaseDetails: [
           {
             fee: 100
+          },
+          {
+            fee: 200
           }
         ],
         showBusinessPurchaseDetails: false,
@@ -555,50 +607,109 @@
         this.mode = mode
       },
 
-      salesContractProcessClick() {
-        this.changeMode(salesContractProcess)
-      },
-
       businessProcurementProcessClick() {
         const that = this
       },
 
+      goToHome() {
+        this.changeMode(BUTTON)
+      },
+
+      goToSaleContractProcess() {
+        this.changeMode(saleContractProcess)
+      },
+      goToSaleContractDetail() {
+        this.changeMode(saleContractDetail)
+      },
+
       queryProject(q, callback) {
+        if (isBlank(q)) {
+          return
+        }
         fetch("${base}/process/projects?q=" + q)
             .then(res => res.json())
             .then(data => {
               if (data.length === 0) {
-
+                callback([{
+                  name: '未搜索到结果'
+                }])
+              }
+              else {
+                callback(data.map(project => ({
+                  name: project.name,
+                  id: project.id,
+                })))
               }
-              callback(data.map(project => ({
-                value: project.name,
-                id: project.id,
-              })))
             })
             .catch(err => {
               this.$message.error('项目搜索失败');
             })
       },
       handleSelectProject(selected) {
+        const {id, name} = selected
+        if (!id) {
+          this.processForm = {}
+          return
+        }
         const loading = this.$loading({
           lock: true,
           text: '正在加载项目',
           spinner: 'el-icon-loading',
           background: 'rgba(0, 0, 0, 0.7)'
-        });
+        })
 
-        fetch("${base}/process/projects/" + selected.id)
+        fetch("${base}/process/projects/" + id)
             .then(res => res.json())
             .then(data => {
-              this.project = data
+              this.processForm = {
+                sealType: [],
+                projectId: id,
+                applyDate: new Date().toLocaleDateString(),
+                ...data
+              }
               this.projectSelected = true
             })
             .catch(err => {
-              this.$message.error('项目\'' + selected.value + '\'加载失败');
+              this.$message.error("项目'" + name + "'加载失败");
             })
             .finally(() => loading.close())
       },
 
+      saveDraft() {
+        this.processForm.status = 'draft'
+        this.submit()
+      },
+
+      submit() {
+        this.$refs["saleContractProcessForm"].validate((valid) => {
+          if (valid) {
+            const loading = this.$loading({
+              lock: true,
+              text: '正在提交',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+
+            const processForm = this.processForm
+            console.log(processForm)
+            fetch("${base}/process", {
+              method: 'POST', // or 'PUT'
+              headers: {
+                'Content-Type': 'application/json',
+              },
+              body: JSON.stringify(processForm),
+            }).then(response => {
+
+            }).catch(err => {
+              this.$message.error("项目提交失败");
+            }).finally(() => loading.close())
+          }
+          else {
+            return false;
+          }
+        })
+      },
+
       handleRemove(file, fileList) {
         console.log(file, fileList);
       },
@@ -610,8 +721,11 @@
       },
       beforeRemove(file, fileList) {
         return this.$confirm("确定移除 " + file.name + "？");
-      }
+      },
 
+      indexMethod(index) {
+        return index * 1;
+      }
     }
 
     new Vue({
@@ -619,9 +733,9 @@
       data,
       computed: {
         projectTitle() {
-          const {projectNo, name, applyPerson, applyTime} = this.project
+          const {projectNo, name, applyPerson, applyDate} = this.processForm
           if (projectNo && name) {
-            return projectNo + "-" + name + "-" + applyPerson + "-" + applyTime
+            return projectNo.trim() + "-" + name.trim() + "-" + applyPerson + "-" + applyDate
           }
           return ""
         },
@@ -632,14 +746,19 @@
           return this.mode === newBusinessProcurementContractProcess
         },
         isSalesContractProcessMode() {
-          return this.mode === salesContractProcess
+          return this.mode === saleContractProcess
+        },
+        isSaleContractDetailMode() {
+          return this.mode === saleContractDetail
         },
         subTitle() {
           switch (this.mode) {
             case BUTTON:
               return "新增流程"
-            case salesContractProcess:
+            case saleContractProcess:
               return "新增销售合同流程"
+            case saleContractDetail:
+              return "销售合同清单明细"
             case newBusinessProcurementContractProcess:
               return "新增业务采购合同流程"
           }

From b115b252ee358430c1ba3bc4d9dae21968591119 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Tue, 13 Dec 2022 18:16:15 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/backend/ProcessController.java | 34 +++++++-
 .../templates/admin/business/process-new.ftl  | 85 +++++++++++++------
 2 files changed, 91 insertions(+), 28 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
index 734da7d..556dce4 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
@@ -19,9 +19,12 @@ import java.util.stream.Collectors;
 
 import cn.palmte.work.model.DeptRepository;
 import cn.palmte.work.model.Project;
+import cn.palmte.work.model.ProjectBudgetIncomeDetail;
 import cn.palmte.work.model.ProjectRepository;
 import cn.palmte.work.model.enums.ProcessStatus;
 import cn.palmte.work.model.enums.SealType;
+import cn.palmte.work.service.ProjectBudgetService;
+import lombok.Setter;
 
 /**
  * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
@@ -34,10 +37,12 @@ public class ProcessController {
 
   private final DeptRepository deptRepository;
   private final ProjectRepository projectRepository;
+  private final ProjectBudgetService projectBudgetService;
 
-  public ProcessController(ProjectRepository projectRepository, DeptRepository deptRepository) {
+  public ProcessController(ProjectRepository projectRepository, DeptRepository deptRepository, ProjectBudgetService projectBudgetService) {
     this.projectRepository = projectRepository;
     this.deptRepository = deptRepository;
+    this.projectBudgetService = projectBudgetService;
   }
 
   static class FormMetadata {
@@ -129,7 +134,7 @@ public class ProcessController {
   }
 
   // 销售合同流程
-
+  @Setter
   static class SaleContractForm {
 
     public Integer projectId;
@@ -191,4 +196,29 @@ public class ProcessController {
 
   }
 
+  @ResponseBody
+  @GetMapping("/sale-contract-details/{id}")
+  public List<ProjectBudgetIncomeDetail> queryProjectBudgetIncomeDetail(@PathVariable int id) {
+    Project project = new Project();
+    project.setId(id);
+    return projectBudgetService.getBudgetIncomeDetail(project);
+  }
+
+  @Setter
+  public static class SaleContractDetailForm {
+
+    public int id;
+
+    // 5 个字符
+    public String expirationDate;
+
+  }
+
+  @ResponseBody
+  @PostMapping("/sale-contract-details")
+  public void saleContractDetails(SaleContractDetailForm form) {
+
+
+  }
+
 }
diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
index 6eae1b4..122a687 100644
--- a/src/main/resources/templates/admin/business/process-new.ftl
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -229,24 +229,25 @@
         <div class="am-u-sm-12 am-u-md-12" v-if="isSaleContractDetailMode">
           <el-table border :data="businessPurchaseDetails">
             <el-table-column type="index" :index="1" label="序号"></el-table-column>
-            <el-table-column prop="fee" label="类别"></el-table-column>
-            <el-table-column prop="fee" label="名称"></el-table-column>
-            <el-table-column prop="fee" label="规格型号"></el-table-column>
-            <el-table-column prop="fee" label="参数"></el-table-column>
-            <el-table-column prop="fee" label="单位"></el-table-column>
-            <el-table-column prop="fee" label="数量"></el-table-column>
-            <el-table-column prop="fee" label="单价"></el-table-column>
-            <el-table-column prop="fee" label="税率"></el-table-column>
-            <el-table-column prop="fee" label="含税金额"></el-table-column>
-            <el-table-column prop="fee" label="不含税金额"></el-table-column>
-            <el-table-column prop="fee" label="含税总金额"></el-table-column>
+            <el-table-column prop="type" label="类别"></el-table-column>
+            <el-table-column prop="name" label="名称"></el-table-column>
+            <el-table-column prop="spec" label="规格型号"></el-table-column>
+            <el-table-column prop="param" label="参数"></el-table-column>
+            <el-table-column prop="unit" label="单位"></el-table-column>
+            <el-table-column prop="amount" label="数量"></el-table-column>
+            <el-table-column prop="price" label="单价"></el-table-column>
+            <el-table-column prop="taxRate" label="税率"></el-table-column>
+            <el-table-column prop="totalTaxInclude" label="含税金额"></el-table-column>
+            <el-table-column prop="totalTaxExclude" label="不含税金额"></el-table-column>
+            <el-table-column prop="totalTax" label="含税总金额"></el-table-column>
             <el-table-column prop="fee" label="税金"></el-table-column>
-            <el-table-column prop="fee" label="质保期"></el-table-column>
+            <el-table-column prop="expirationDate" label="质保期"></el-table-column>
 
           </el-table>
 
-          <el-row justify="space-around" type="flex" style="margin: 20px">
-            <el-button type="info" @click="goToSaleContractProcess">保存并返回上一级</el-button>
+          <el-row style="margin: 20px 0">
+            <el-button type="info" @click="goToSaleContractProcess">返回上一级</el-button>
+            <el-button type="primary" @click="submitToSaleContractProcess">保存并返回上一级</el-button>
           </el-row>
 
         </div>
@@ -590,14 +591,8 @@
           }
         ],
         fileList: [],
-        businessPurchaseDetails: [
-          {
-            fee: 100
-          },
-          {
-            fee: 200
-          }
-        ],
+        saleContractDetails: [],
+        businessPurchaseDetails: [],
         showBusinessPurchaseDetails: false,
       }
     }
@@ -620,6 +615,22 @@
       },
       goToSaleContractDetail() {
         this.changeMode(saleContractDetail)
+        const loading = this.$loading({
+          lock: true,
+          text: '正在加载项目',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
+        fetch("${base}/process/sale-contract-details/" + this.processForm.id)
+            .then(res => res.json())
+            .then(data => {
+              this.businessPurchaseDetails = data
+            })
+            .catch(err => {
+              this.$message.error("销售合同清单明细加载失败");
+            })
+            .finally(() => loading.close())
       },
 
       queryProject(q, callback) {
@@ -635,10 +646,7 @@
                 }])
               }
               else {
-                callback(data.map(project => ({
-                  name: project.name,
-                  id: project.id,
-                })))
+                callback(data)
               }
             })
             .catch(err => {
@@ -710,6 +718,31 @@
         })
       },
 
+      submitToSaleContractProcess() {
+        const loading = this.$loading({
+          lock: true,
+          text: '正在提交',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
+        const processForm = this.processForm
+        fetch("${base}/process/sale-contract-details", {
+          method: 'POST', // or 'PUT'
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(processForm),
+        }).then(response => {
+          this.goToSaleContractProcess()
+
+        }).catch(err => {
+          this.$message.error("项目提交失败");
+        }).finally(() => loading.close())
+
+
+      },
+
       handleRemove(file, fileList) {
         console.log(file, fileList);
       },

From 65d853fc7bc821ea04c145d6c68d860e28859e0c Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Wed, 14 Dec 2022 14:20:25 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=98=8E=E7=BB=86=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在修改了数据库:
alter table project_budget_income_detail
    add column expiration_date varchar(32) NULL comment '质保期';

alter table project_budget_income_detail_temp
    add column expiration_date varchar(32) NULL comment '质保期';
---
 .../controller/backend/ProcessController.java |  28 ++++-
 .../model/ProjectBudgetIncomeDetailBase.java  |  12 ++
 .../templates/admin/business/process-new.ftl  | 114 ++++++++++++------
 3 files changed, 116 insertions(+), 38 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
index 556dce4..b218cf9 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
@@ -1,14 +1,19 @@
 package cn.palmte.work.controller.backend;
 
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
@@ -39,10 +44,13 @@ public class ProcessController {
   private final ProjectRepository projectRepository;
   private final ProjectBudgetService projectBudgetService;
 
-  public ProcessController(ProjectRepository projectRepository, DeptRepository deptRepository, ProjectBudgetService projectBudgetService) {
+  private final JdbcTemplate jdbcTemplate;
+
+  public ProcessController(ProjectRepository projectRepository, DeptRepository deptRepository, ProjectBudgetService projectBudgetService, JdbcTemplate jdbcTemplate) {
     this.projectRepository = projectRepository;
     this.deptRepository = deptRepository;
     this.projectBudgetService = projectBudgetService;
+    this.jdbcTemplate = jdbcTemplate;
   }
 
   static class FormMetadata {
@@ -191,7 +199,7 @@ public class ProcessController {
 
   @ResponseBody
   @PostMapping
-  public void post(SaleContractForm form) {
+  public void post(@RequestBody SaleContractForm form) {
     System.out.println(form);
 
   }
@@ -216,9 +224,21 @@ public class ProcessController {
 
   @ResponseBody
   @PostMapping("/sale-contract-details")
-  public void saleContractDetails(SaleContractDetailForm form) {
-
+  public void saleContractDetails(@RequestBody List<SaleContractDetailForm> form) {
+    jdbcTemplate.batchUpdate("update project_budget_income_detail set expiration_date =? where id =? ",
+            new BatchPreparedStatementSetter() {
+              @Override
+              public void setValues(PreparedStatement ps, int i) throws SQLException {
+                SaleContractDetailForm detailForm = form.get(i);
+                ps.setString(1, detailForm.expirationDate);
+                ps.setInt(2, detailForm.id);
+              }
 
+              @Override
+              public int getBatchSize() {
+                return form.size();
+              }
+            });
   }
 
 }
diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java
index 5760faf..4b24d21 100644
--- a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java
+++ b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java
@@ -37,6 +37,10 @@ public class ProjectBudgetIncomeDetailBase {
     @Column(name = "tax_rate")
     private BigDecimal taxRate;
 
+    // 质保期 5 个字符
+    @Column(name = "expiration_date")
+    public String expirationDate;
+
     public Integer getId() {
         return id;
     }
@@ -117,6 +121,14 @@ public class ProjectBudgetIncomeDetailBase {
         this.taxRate = taxRate;
     }
 
+    public String getExpirationDate() {
+        return expirationDate;
+    }
+
+    public void setExpirationDate(String expirationDate) {
+        this.expirationDate = expirationDate;
+    }
+
     public BigDecimal getTotalTaxInclude(){
         if(null == price){
             return null;
diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
index 122a687..fc360aa 100644
--- a/src/main/resources/templates/admin/business/process-new.ftl
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -28,6 +28,10 @@
       .admin-content-body {
           margin-bottom: 100px;
       }
+
+      .el-table__empty-block {
+          height: 60px !important;
+      }
   </style>
 
   <div class="admin-content" id="app">
@@ -227,21 +231,27 @@
           <#-- 销售合同清单明细 -->
 
         <div class="am-u-sm-12 am-u-md-12" v-if="isSaleContractDetailMode">
-          <el-table border :data="businessPurchaseDetails">
-            <el-table-column type="index" :index="1" label="序号"></el-table-column>
+          <el-table border :data="saleContractDetails" @row-dblclick="dbclick">
+            <el-table-column type="index" :index="1" label="序号" fixed></el-table-column>
+            <el-table-column prop="name" label="名称" fixed width="120"></el-table-column>
             <el-table-column prop="type" label="类别"></el-table-column>
-            <el-table-column prop="name" label="名称"></el-table-column>
             <el-table-column prop="spec" label="规格型号"></el-table-column>
             <el-table-column prop="param" label="参数"></el-table-column>
             <el-table-column prop="unit" label="单位"></el-table-column>
             <el-table-column prop="amount" label="数量"></el-table-column>
-            <el-table-column prop="price" label="单价"></el-table-column>
+            <el-table-column prop="price" label="单价" width="100"></el-table-column>
             <el-table-column prop="taxRate" label="税率"></el-table-column>
-            <el-table-column prop="totalTaxInclude" label="含税金额"></el-table-column>
-            <el-table-column prop="totalTaxExclude" label="不含税金额"></el-table-column>
-            <el-table-column prop="totalTax" label="含税总金额"></el-table-column>
+            <el-table-column prop="totalTaxInclude" label="含税金额" width="100"></el-table-column>
+            <el-table-column prop="totalTaxExclude" label="不含税金额" width="100"></el-table-column>
+            <el-table-column prop="totalTax" label="含税总金额" width="100"></el-table-column>
             <el-table-column prop="fee" label="税金"></el-table-column>
-            <el-table-column prop="expirationDate" label="质保期"></el-table-column>
+
+            <el-table-column prop="expirationDate" label="质保期" fixed="right" width="150">
+              <template slot-scope="scope">
+                <el-input maxlength="5" size="mini" placeholder="请输入质保期"
+                          v-model="scope.row.expirationDate"></el-input>
+              </template>
+            </el-table-column>
 
           </el-table>
 
@@ -592,8 +602,6 @@
         ],
         fileList: [],
         saleContractDetails: [],
-        businessPurchaseDetails: [],
-        showBusinessPurchaseDetails: false,
       }
     }
 
@@ -614,23 +622,36 @@
         this.changeMode(saleContractProcess)
       },
       goToSaleContractDetail() {
-        this.changeMode(saleContractDetail)
-        const loading = this.$loading({
-          lock: true,
-          text: '正在加载项目',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
+        const { id } = this.processForm
+        if (id) {
+          this.changeMode(saleContractDetail)
+          const loading = this.$loading({
+            lock: true,
+            text: '正在加载项目',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          fetch("${base}/process/sale-contract-details/" + id)
+              .then(res => res.json())
+              .then(data => {
+                this.saleContractDetails = data
+              })
+              .catch(err => {
+                this.$message.error("销售合同清单明细加载失败");
+              })
+              .finally(() => loading.close())
+        }
+        else {
+          this.$message.warning("项目还未选择")
+        }
+      },
 
-        fetch("${base}/process/sale-contract-details/" + this.processForm.id)
-            .then(res => res.json())
-            .then(data => {
-              this.businessPurchaseDetails = data
-            })
-            .catch(err => {
-              this.$message.error("销售合同清单明细加载失败");
-            })
-            .finally(() => loading.close())
+      dbclick(row, event, column) {
+        row.input = !row.input
+      },
+
+      render(obj) {
+        console.log(obj)
       },
 
       queryProject(q, callback) {
@@ -654,7 +675,7 @@
             })
       },
       handleSelectProject(selected) {
-        const {id, name} = selected
+        const { id, name } = selected
         if (!id) {
           this.processForm = {}
           return
@@ -707,7 +728,11 @@
               },
               body: JSON.stringify(processForm),
             }).then(response => {
-
+              this.$message({
+                showClose: true,
+                message: '提交成功',
+                type: 'success'
+              })
             }).catch(err => {
               this.$message.error("项目提交失败");
             }).finally(() => loading.close())
@@ -726,21 +751,25 @@
           background: 'rgba(0, 0, 0, 0.7)'
         })
 
-        const processForm = this.processForm
+        const form = this.saleContractDetails.map(detail => ({
+          id: detail.id, expirationDate: detail.expirationDate
+        }))
         fetch("${base}/process/sale-contract-details", {
           method: 'POST', // or 'PUT'
           headers: {
             'Content-Type': 'application/json',
           },
-          body: JSON.stringify(processForm),
+          body: JSON.stringify(form),
         }).then(response => {
+          this.$message({
+            showClose: true,
+            message: '提交成功',
+            type: 'success'
+          })
           this.goToSaleContractProcess()
-
         }).catch(err => {
           this.$message.error("项目提交失败");
         }).finally(() => loading.close())
-
-
       },
 
       handleRemove(file, fileList) {
@@ -766,7 +795,7 @@
       data,
       computed: {
         projectTitle() {
-          const {projectNo, name, applyPerson, applyDate} = this.processForm
+          const { projectNo, name, applyPerson, applyDate } = this.processForm
           if (projectNo && name) {
             return projectNo.trim() + "-" + name.trim() + "-" + applyPerson + "-" + applyDate
           }
@@ -799,6 +828,23 @@
       },
 
       methods,
+
+      mounted() {
+        fetch("${base}/process/projects/135")
+            .then(res => res.json())
+            .then(data => {
+              this.processForm = {
+                sealType: [],
+                projectId: 135,
+                applyDate: new Date().toLocaleDateString(),
+                ...data
+              }
+              this.projectSelected = true
+            })
+            .catch(err => {
+              this.$message.error("测试项目'加载失败");
+            })
+      },
     })
 
   </script>

From 3204b10b5fd7e3631172fb5eb8fce1a6acd0eca9 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Wed, 14 Dec 2022 14:51:18 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=98=8E=E7=BB=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/business/process-new.ftl  | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
index fc360aa..d3f5a8a 100644
--- a/src/main/resources/templates/admin/business/process-new.ftl
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -239,12 +239,11 @@
             <el-table-column prop="param" label="参数"></el-table-column>
             <el-table-column prop="unit" label="单位"></el-table-column>
             <el-table-column prop="amount" label="数量"></el-table-column>
-            <el-table-column prop="price" label="单价" width="100"></el-table-column>
+            <el-table-column prop="price" label="单价" width="120"></el-table-column>
             <el-table-column prop="taxRate" label="税率"></el-table-column>
-            <el-table-column prop="totalTaxInclude" label="含税金额" width="100"></el-table-column>
-            <el-table-column prop="totalTaxExclude" label="不含税金额" width="100"></el-table-column>
-            <el-table-column prop="totalTax" label="含税总金额" width="100"></el-table-column>
-            <el-table-column prop="fee" label="税金"></el-table-column>
+            <el-table-column prop="totalTaxInclude" label="含税金额" width="120"></el-table-column>
+            <el-table-column prop="totalTaxExclude" label="不含税金额" width="120"></el-table-column>
+            <el-table-column prop="totalTax" label="税金"></el-table-column>
 
             <el-table-column prop="expirationDate" label="质保期" fixed="right" width="150">
               <template slot-scope="scope">
@@ -627,14 +626,27 @@
           this.changeMode(saleContractDetail)
           const loading = this.$loading({
             lock: true,
-            text: '正在加载项目',
+            text: '销售合同清单明细',
             spinner: 'el-icon-loading',
             background: 'rgba(0, 0, 0, 0.7)'
           })
           fetch("${base}/process/sale-contract-details/" + id)
               .then(res => res.json())
               .then(data => {
-                this.saleContractDetails = data
+                // 转换数据
+                // @formatter:off
+                const computeType = (type) => {
+                  switch (type) {
+                    case 1: return '设备'
+                    case 2: return '工程'
+                    case 3: return '服务'
+                    default: return '未知'
+                  }
+                }
+                // @formatter:on
+                this.saleContractDetails = data.map(detail => ({
+                  ...detail, type: computeType(detail.type)
+                }))
               })
               .catch(err => {
                 this.$message.error("销售合同清单明细加载失败");

From df5373799faf1a19738cbed008f3e8f95464f8ab Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Wed, 14 Dec 2022 16:07:26 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E5=89=8D=E7=AB=AF=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/backend/ProcessController.java |  42 +++++--
 .../work/model/enums/CooperationType.java     |  30 +++++
 .../palmte/work/model/enums/Descriptive.java  |  12 ++
 .../palmte/work/model/enums/Enumerable.java   | 106 ++++++++++++++++++
 .../work/model/enums/ProcessStatus.java       |  19 +++-
 .../palmte/work/model/enums/ProjectType.java  |  32 ++++++
 .../cn/palmte/work/model/enums/SealType.java  |   3 +-
 .../templates/admin/business/process-new.ftl  |  60 ++++++----
 8 files changed, 271 insertions(+), 33 deletions(-)
 create mode 100644 src/main/java/cn/palmte/work/model/enums/CooperationType.java
 create mode 100644 src/main/java/cn/palmte/work/model/enums/Descriptive.java
 create mode 100644 src/main/java/cn/palmte/work/model/enums/Enumerable.java
 create mode 100644 src/main/java/cn/palmte/work/model/enums/ProjectType.java

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
index b218cf9..7da5c09 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.math.BigDecimal;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.time.LocalDate;
@@ -22,13 +23,19 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import cn.palmte.work.model.Admin;
 import cn.palmte.work.model.DeptRepository;
 import cn.palmte.work.model.Project;
 import cn.palmte.work.model.ProjectBudgetIncomeDetail;
 import cn.palmte.work.model.ProjectRepository;
+import cn.palmte.work.model.enums.CooperationType;
+import cn.palmte.work.model.enums.Enumerable;
 import cn.palmte.work.model.enums.ProcessStatus;
+import cn.palmte.work.model.enums.ProjectType;
 import cn.palmte.work.model.enums.SealType;
 import cn.palmte.work.service.ProjectBudgetService;
+import cn.palmte.work.utils.InterfaceUtil;
+import lombok.Builder;
 import lombok.Setter;
 
 /**
@@ -113,32 +120,53 @@ public class ProcessController {
             .collect(Collectors.toList());
   }
 
+  @Builder
   public static class ProjectReturnValue {
     public final String applyDate = LocalDate.now().format(formatter);
     public String projectNo;
     public Integer projectId;
+    public String projectName;
 
     // 申请人
     public String applyPersonName;
 
     // 项目类型
     public String projectType;
+
     // 合作类型
     public String cooperationType;
 
     // 合同金额
-    public String contractAmount;
+    public BigDecimal contractAmount;
 
+    // FIXME 垫资
+    // 是否垫资
+    public final String isPrepaid = "是";
+
+    // 垫资金额
+    public final String repaidAmount = "50000元";
+
+    // 预算毛利率
+    public final String budgetGrossMargin = "3.9%";
   }
 
   @ResponseBody
   @GetMapping("/projects/{id}")
-  public Project query(@PathVariable int id) {
-    Project byId = projectRepository.findById(id);
+  public ProjectReturnValue query(@PathVariable int id) {
+    Project project = projectRepository.findById(id);
+    Admin admin = InterfaceUtil.getAdmin();
 
-    // projectType
-    // cooperationType
-    return byId;
+    // 可以在对应表数据查询 是否存在再启用
+
+    return ProjectReturnValue.builder()
+            .projectId(project.getId())
+            .projectName(project.getName())
+            .projectNo(project.getProjectNo())
+            .applyPersonName(admin.getRealName())
+            .contractAmount(project.getContractAmount())
+            .projectType(Enumerable.of(ProjectType.class, project.getType()).getDescription())
+            .cooperationType(Enumerable.of(CooperationType.class, project.getCooperateType()).getDescription())
+            .build();
   }
 
   // 销售合同流程
@@ -188,8 +216,6 @@ public class ProcessController {
     // 税率
     public String taxRate;
 
-    // 是否垫资
-
     // 收款条件
     public String paymentTerms;
 
diff --git a/src/main/java/cn/palmte/work/model/enums/CooperationType.java b/src/main/java/cn/palmte/work/model/enums/CooperationType.java
new file mode 100644
index 0000000..3a2d022
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/enums/CooperationType.java
@@ -0,0 +1,30 @@
+package cn.palmte.work.model.enums;
+
+/**
+ * 合作类型：1战略合作类，2非战略合作类
+ *
+ * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ * @since 1.0 2022/12/14 15:20
+ */
+public enum CooperationType implements Enumerable<Integer> {
+
+  STRATEGIC_COOPERATION(1, "战略合作"),
+  NOT_STRATEGIC_COOPERATION(2, "战略合作");
+
+  private final int value;
+  private final String description;
+
+  CooperationType(int value, String description) {
+    this.value = value;
+    this.description = description;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  @Override
+  public Integer getValue() {
+    return value;
+  }
+}
diff --git a/src/main/java/cn/palmte/work/model/enums/Descriptive.java b/src/main/java/cn/palmte/work/model/enums/Descriptive.java
new file mode 100644
index 0000000..6429f38
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/enums/Descriptive.java
@@ -0,0 +1,12 @@
+package cn.palmte.work.model.enums;
+
+/**
+ * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ */
+public interface Descriptive {
+  /**
+   * Return a description
+   */
+  String getDescription();
+
+}
\ No newline at end of file
diff --git a/src/main/java/cn/palmte/work/model/enums/Enumerable.java b/src/main/java/cn/palmte/work/model/enums/Enumerable.java
new file mode 100644
index 0000000..c824e3f
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/enums/Enumerable.java
@@ -0,0 +1,106 @@
+package cn.palmte.work.model.enums;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+/**
+ * Enumerable for {@link Enum}
+ *
+ * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ */
+public interface Enumerable<V> extends Descriptive {
+
+  @SuppressWarnings("unchecked")
+  default V getValue() {
+    return (V) name();
+  }
+
+  @Override
+  default String getDescription() {
+    return name();
+  }
+
+  /**
+   * The default name of the enumeration, this method does not need
+   * to be implemented, the enumeration class is automatically inherited
+   */
+  String name();
+
+  /**
+   * Returns Enumerable by {@link Enumerable#getValue() enum value}
+   *
+   * @param enumerable enum
+   * @param value enumeration value
+   * @param <T> enumeration type
+   * @param <V> enumeration value type
+   * @return enumeration instance
+   * @throws NullPointerException if enumerable is {@code null}
+   * @see Enumerable#getValue()
+   */
+  // @Nullable
+  static <T extends Enumerable<V>, V> T of(Class<T> enumerable, /*@Nullable*/ V value) {
+    if (value != null) {
+      T[] enumConstants = enumerable.getEnumConstants();
+      if (enumConstants != null) {
+        for (T constant : enumConstants) {
+          if (Objects.equals(value, constant.getValue())) {
+            return constant;
+          }
+        }
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Get the value corresponding to the name
+   *
+   * @param enumerable enumeration class
+   * @param name enumeration name
+   * @param <T> enum type
+   * @param <V> enumeration value type
+   * @return enumeration value
+   * @see Enumerable#getValue()
+   */
+  // @Nullable
+  static <T extends Enumerable<V>, V> V getValue(Class<T> enumerable, String name) {
+    T[] enumConstants = enumerable.getEnumConstants();
+    if (enumConstants != null) {
+      for (T constant : enumConstants) {
+        if (Objects.equals(name, constant.name())) {
+          return constant.getValue();
+        }
+      }
+    }
+    return null;
+  }
+
+  /**
+   * @param <T> enum type
+   * @param <V> enumeration value type
+   * @param defaultValue default value
+   * @see #of(Class, V)
+   */
+  static <T extends Enumerable<V>, V> T of(Class<T> enumerable, V value, Supplier<T> defaultValue) {
+    return find(enumerable, value).orElseGet(defaultValue);
+  }
+
+  /**
+   * @param defaultValue default value
+   * @param <T> enum type
+   * @param <V> enumeration value type
+   * @see #of(Class, V)
+   */
+  static <T extends Enumerable<V>, V> T of(Class<T> enumerable, V value, T defaultValue) {
+    return find(enumerable, value).orElse(defaultValue);
+  }
+
+  /**
+   * @return Optional of T
+   */
+  static <T extends Enumerable<V>, V> Optional<T> find(Class<T> enumerable, V value) {
+    return Optional.ofNullable(of(enumerable, value));
+  }
+
+}
diff --git a/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java b/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java
index f6b4ca0..c2afb9f 100644
--- a/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java
+++ b/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java
@@ -4,9 +4,20 @@ package cn.palmte.work.model.enums;
  * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
  * @since 1.0 2022/12/13 16:12
  */
-public enum ProcessStatus {
+public enum ProcessStatus implements Enumerable<String> {
+
+  draft("草稿"),
+  completed("完成");
+
+  private final String description;
+
+  ProcessStatus(String description) {
+    this.description = description;
+  }
+
+  @Override
+  public String getDescription() {
+    return description;
+  }
 
-  draft,
-  completed
-  ;
 }
diff --git a/src/main/java/cn/palmte/work/model/enums/ProjectType.java b/src/main/java/cn/palmte/work/model/enums/ProjectType.java
new file mode 100644
index 0000000..03f51ea
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/enums/ProjectType.java
@@ -0,0 +1,32 @@
+package cn.palmte.work.model.enums;
+
+/**
+ * 项目类型：1 工程集成类、2设备集成类、3战略合作类
+ *
+ * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ * @since 1.0 2022/12/14 15:10
+ */
+public enum ProjectType implements Enumerable<Integer> {
+
+  ENGINEERING_INTEGRATION(1, "工程集成"),
+  DEVICE_INTEGRATION(2, "设备集成"),
+  STRATEGIC_COOPERATION(3, "战略合作");
+
+  private final int value;
+  private final String description;
+
+  ProjectType(int value, String description) {
+    this.value = value;
+    this.description = description;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  @Override
+  public Integer getValue() {
+    return value;
+  }
+
+}
diff --git a/src/main/java/cn/palmte/work/model/enums/SealType.java b/src/main/java/cn/palmte/work/model/enums/SealType.java
index 817f469..ed5f0c4 100644
--- a/src/main/java/cn/palmte/work/model/enums/SealType.java
+++ b/src/main/java/cn/palmte/work/model/enums/SealType.java
@@ -6,7 +6,7 @@ package cn.palmte.work.model.enums;
  * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
  * @since 1.0 2022/12/13 15:25
  */
-public enum SealType {
+public enum SealType implements Enumerable<String> {
 
   // "公章"
   // "法人章"
@@ -34,6 +34,7 @@ public enum SealType {
     this.description = description;
   }
 
+  @Override
   public String getDescription() {
     return description;
   }
diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
index d3f5a8a..f598708 100644
--- a/src/main/resources/templates/admin/business/process-new.ftl
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -76,26 +76,33 @@
             <div class="am-form-inline">
               <el-tooltip :disabled="projectSelected" effect="light" content="项目编号或名称，支持模糊查询" placement="top-end">
                 <el-form-item label="项目编号">
-                  <el-autocomplete v-model="processForm.projectNo" :fetch-suggestions="queryProject"
-                                   value-key="name" placeholder="请输入项目编号或名称" @select="handleSelectProject">
+                  <el-autocomplete v-model="processForm.projectNo" :fetch-suggestions="queryProject" clearable
+                                   value-key="name" placeholder="请输入项目编号或名称" @select="handleSelectProject"
+                                   @clear="clearProjectProcess">
                   </el-autocomplete>
                 </el-form-item>
               </el-tooltip>
 
-              <el-form-item label="项目标题">
-                <el-input placeholder="请输入内容" :disabled="projectSelected" :value="projectTitle" clearable></el-input>
-              </el-form-item>
+              <el-tooltip :disabled="!projectSelected" effect="light" :content="projectTitle" placement="top-start">
+                <el-form-item label="项目标题">
+                  <span v-if="projectSelected">{{projectTitle}}</span>
+                  <span v-else>未选择项目</span>
+                </el-form-item>
+              </el-tooltip>
 
               <el-form-item label="申请时间">
-                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="processForm.applyDate"></el-input>
+                <span v-if="projectSelected">{{processForm.applyDate}}</span>
+                <span v-else>未选择项目</span>
               </el-form-item>
 
               <el-form-item label="项目类型">
-                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="processForm.projectType"></el-input>
+                <span v-if="projectSelected">{{processForm.projectType}}</span>
+                <span v-else>未选择项目</span>
               </el-form-item>
 
               <el-form-item label="合作类型">
-                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="processForm.cooperationType"></el-input>
+                <span v-if="projectSelected">{{processForm.cooperationType}}</span>
+                <span v-else>未选择项目</span>
               </el-form-item>
 
             </div>
@@ -107,11 +114,13 @@
               </el-form-item>
 
               <el-form-item label="申请人">
-                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="processForm.cooperateTypeStr"></el-input>
+                <span v-if="projectSelected">{{processForm.applyPersonName}}</span>
+                <span v-else>未选择项目</span>
               </el-form-item>
 
               <el-form-item label="申请部门领导">
-                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="processForm.cooperateTypeStr"></el-input>
+                <span v-if="projectSelected">{{processForm.applyDeptLeaderName}}</span>
+                <span v-else>未选择部门</span>
               </el-form-item>
 
               <el-form-item label="申请人电话" :rules="[{ required: true, message: '申请人电话不能为空'}]" prop="applyPersonPhone">
@@ -131,18 +140,21 @@
               </el-form-item>
 
               <el-form-item label="合同金额">
-                <el-input placeholder="请输入内容" :disabled="projectSelected" v-model="processForm.contractAmount"></el-input>
+                <span v-if="projectSelected">{{processForm.contractAmount}}元</span>
+                <span v-else>未选择项目</span>
               </el-form-item>
 
             </div>
 
             <div>
               <el-form-item label="客户名称" :rules="[{ required: true, message: '客户名称不能为空'}]">
-                <el-input placeholder="请输入客户名称" v-model="processForm.contractNumber"></el-input>
+                <el-input placeholder="请输入客户名称" v-model="processForm.clientName"></el-input>
               </el-form-item>
 
               <el-form-item label="最终用户名称">
-                <el-input placeholder="请输入最终用户名称" v-model="processForm.contractName"></el-input>
+                  <#--TODO 最终用户名称-->
+                <span v-if="projectSelected">{{processForm.finalUserName}}</span>
+                <span v-else>未选择项目</span>
               </el-form-item>
             </div>
 
@@ -167,15 +179,18 @@
               </el-form-item>
 
               <el-form-item label="是否垫资">
-                <el-input placeholder="请输入最终用户名称" v-model="processForm.contractName"></el-input>
+                <span v-if="projectSelected">{{processForm.isPrepaid}}</span>
+                <span v-else>未选择项目</span>
               </el-form-item>
 
               <el-form-item label="垫资金额">
-                <el-input value="50000元"></el-input>
+                <span v-if="projectSelected">{{processForm.repaidAmount}}</span>
+                <span v-else>未选择项目</span>
               </el-form-item>
 
               <el-form-item label="预算毛利率">
-                <el-input value="3.91%"></el-input>
+                <span v-if="projectSelected">{{processForm.budgetGrossMargin}}</span>
+                <span v-else>未选择项目</span>
               </el-form-item>
 
             </div>
@@ -715,6 +730,12 @@
             })
             .finally(() => loading.close())
       },
+      clearProjectProcess() {
+        this.projectSelected = false
+        this.processForm = {
+          sealType: []
+        }
+      },
 
       saveDraft() {
         this.processForm.status = 'draft'
@@ -807,9 +828,9 @@
       data,
       computed: {
         projectTitle() {
-          const { projectNo, name, applyPerson, applyDate } = this.processForm
-          if (projectNo && name) {
-            return projectNo.trim() + "-" + name.trim() + "-" + applyPerson + "-" + applyDate
+          const { projectNo, projectName, applyPersonName, applyDate } = this.processForm
+          if (projectNo && projectName) {
+            return projectNo.trim() + "-" + projectName.trim() + "-" + applyPersonName + "-" + applyDate
           }
           return ""
         },
@@ -848,7 +869,6 @@
               this.processForm = {
                 sealType: [],
                 projectId: 135,
-                applyDate: new Date().toLocaleDateString(),
                 ...data
               }
               this.projectSelected = true

From 91827db481af45f1bdba26fb5c58e39cc4c21245 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Wed, 14 Dec 2022 17:50:41 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

数据合并减少请求数量，减少复杂度
---
 .../controller/backend/ProcessController.java | 136 ++++++------------
 .../work/model/enums/CooperationType.java     |   4 +-
 .../palmte/work/model/enums/Descriptive.java  |   1 +
 .../palmte/work/model/enums/Enumerable.java   |   1 +
 .../work/model/enums/ProcessStatus.java       |   2 +-
 .../work/model/enums/ProcessTaxRate.java      |   2 +-
 .../palmte/work/model/enums/ProjectType.java  |   2 +-
 .../cn/palmte/work/model/enums/SealType.java  |   2 +-
 .../model/process/SaleContractProcess.java    |  87 +++++++++++
 .../SaleContractProcessRepository.java        |  11 ++
 .../work/model/process/SealTypeArray.java     |  58 ++++++++
 .../model/process/SealTypeArrayConverter.java |  44 ++++++
 .../process/form/SaleContractDetailForm.java  |  17 +++
 .../process/form/SaleContractProcessForm.java |  71 +++++++++
 .../work/model/process/package-info.java      |   7 +
 .../templates/admin/business/process-new.ftl  | 126 ++++++----------
 16 files changed, 384 insertions(+), 187 deletions(-)
 create mode 100644 src/main/java/cn/palmte/work/model/process/SaleContractProcess.java
 create mode 100644 src/main/java/cn/palmte/work/model/process/SaleContractProcessRepository.java
 create mode 100644 src/main/java/cn/palmte/work/model/process/SealTypeArray.java
 create mode 100644 src/main/java/cn/palmte/work/model/process/SealTypeArrayConverter.java
 create mode 100644 src/main/java/cn/palmte/work/model/process/form/SaleContractDetailForm.java
 create mode 100644 src/main/java/cn/palmte/work/model/process/form/SaleContractProcessForm.java
 create mode 100644 src/main/java/cn/palmte/work/model/process/package-info.java

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
index 7da5c09..4ce8d31 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
@@ -1,9 +1,12 @@
 package cn.palmte.work.controller.backend;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,6 +26,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import javax.persistence.EntityManager;
+import javax.validation.Valid;
+
 import cn.palmte.work.model.Admin;
 import cn.palmte.work.model.DeptRepository;
 import cn.palmte.work.model.Project;
@@ -30,12 +36,16 @@ import cn.palmte.work.model.ProjectBudgetIncomeDetail;
 import cn.palmte.work.model.ProjectRepository;
 import cn.palmte.work.model.enums.CooperationType;
 import cn.palmte.work.model.enums.Enumerable;
-import cn.palmte.work.model.enums.ProcessStatus;
 import cn.palmte.work.model.enums.ProjectType;
 import cn.palmte.work.model.enums.SealType;
+import cn.palmte.work.model.process.SaleContractProcess;
+import cn.palmte.work.model.process.SealTypeArray;
+import cn.palmte.work.model.process.form.SaleContractDetailForm;
+import cn.palmte.work.model.process.form.SaleContractProcessForm;
 import cn.palmte.work.service.ProjectBudgetService;
 import cn.palmte.work.utils.InterfaceUtil;
 import lombok.Builder;
+import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 
 /**
@@ -43,6 +53,7 @@ import lombok.Setter;
  * @since 1.0 2022/12/8 11:03
  */
 @Controller
+@RequiredArgsConstructor
 @RequestMapping("/process")
 public class ProcessController {
   static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -52,13 +63,7 @@ public class ProcessController {
   private final ProjectBudgetService projectBudgetService;
 
   private final JdbcTemplate jdbcTemplate;
-
-  public ProcessController(ProjectRepository projectRepository, DeptRepository deptRepository, ProjectBudgetService projectBudgetService, JdbcTemplate jdbcTemplate) {
-    this.projectRepository = projectRepository;
-    this.deptRepository = deptRepository;
-    this.projectBudgetService = projectBudgetService;
-    this.jdbcTemplate = jdbcTemplate;
-  }
+  private final EntityManager entityManager;
 
   static class FormMetadata {
     // 部门
@@ -139,6 +144,8 @@ public class ProcessController {
     // 合同金额
     public BigDecimal contractAmount;
 
+    public List<ProjectBudgetIncomeDetail> incomeDetails;
+
     // FIXME 垫资
     // 是否垫资
     public final String isPrepaid = "是";
@@ -157,9 +164,10 @@ public class ProcessController {
     Admin admin = InterfaceUtil.getAdmin();
 
     // 可以在对应表数据查询 是否存在再启用
-
+    List<ProjectBudgetIncomeDetail> incomeDetails = projectBudgetService.getBudgetIncomeDetail(project);
     return ProjectReturnValue.builder()
             .projectId(project.getId())
+            .incomeDetails(incomeDetails)
             .projectName(project.getName())
             .projectNo(project.getProjectNo())
             .applyPersonName(admin.getRealName())
@@ -170,101 +178,37 @@ public class ProcessController {
   }
 
   // 销售合同流程
-  @Setter
-  static class SaleContractForm {
-
-    public Integer projectId;
-
-    // 项目编号
-    public String projectNo;
-
-    public LocalDate applyDate;
-
-    // 项目标题
-    public String title;
-
-    // 项目类型
-    public String projectType;
-
-    // 合作类型
-    public String cooperationType;
-
-    // 申请人
-    public String applyPersonName;
-
-    public String applyDept;
-
-    // 申请部门领导
-
-    public String applyDeptLeaderName;
-
-    // 申请人电话
-    public String applyPersonPhone;
-
-    // 合同编号
-    public String contractNo;
-
-    // 合同名称
-    public String contractName;
-
-    // 客户名称
-    public String clientName;
-
-    // 用印类型
-    public String[] sealType;
-
-    // 税率
-    public String taxRate;
-
-    // 收款条件
-    public String paymentTerms;
-
-    public ProcessStatus status;
-
-  }
 
   @ResponseBody
   @PostMapping
-  public void post(@RequestBody SaleContractForm form) {
+  @Transactional
+  public void post(@RequestBody @Valid SaleContractProcessForm form) {
     System.out.println(form);
+    SaleContractProcess entity = new SaleContractProcess();
+    BeanUtils.copyProperties(form, entity, "sealTypes", "applyDate");
+    entity.setApplyDate(LocalDate.parse(form.getApplyDate(), formatter));
+    entity.setSealTypes(SealTypeArray.of(form.getSealTypes()));
 
-  }
+    entityManager.persist(entity);
 
-  @ResponseBody
-  @GetMapping("/sale-contract-details/{id}")
-  public List<ProjectBudgetIncomeDetail> queryProjectBudgetIncomeDetail(@PathVariable int id) {
-    Project project = new Project();
-    project.setId(id);
-    return projectBudgetService.getBudgetIncomeDetail(project);
-  }
+    List<SaleContractDetailForm> incomeDetails = form.getIncomeDetails();
+    if (!CollectionUtils.isEmpty(incomeDetails)) {
+      jdbcTemplate.batchUpdate("update project_budget_income_detail set expiration_date =? where id =? ",
+              new BatchPreparedStatementSetter() {
 
-  @Setter
-  public static class SaleContractDetailForm {
+                @Override
+                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                  SaleContractDetailForm detailForm = incomeDetails.get(i);
+                  ps.setString(1, detailForm.getExpirationDate());
+                  ps.setInt(2, detailForm.getId());
+                }
 
-    public int id;
-
-    // 5 个字符
-    public String expirationDate;
-
-  }
-
-  @ResponseBody
-  @PostMapping("/sale-contract-details")
-  public void saleContractDetails(@RequestBody List<SaleContractDetailForm> form) {
-    jdbcTemplate.batchUpdate("update project_budget_income_detail set expiration_date =? where id =? ",
-            new BatchPreparedStatementSetter() {
-              @Override
-              public void setValues(PreparedStatement ps, int i) throws SQLException {
-                SaleContractDetailForm detailForm = form.get(i);
-                ps.setString(1, detailForm.expirationDate);
-                ps.setInt(2, detailForm.id);
-              }
-
-              @Override
-              public int getBatchSize() {
-                return form.size();
-              }
-            });
+                @Override
+                public int getBatchSize() {
+                  return incomeDetails.size();
+                }
+              });
+    }
   }
 
 }
diff --git a/src/main/java/cn/palmte/work/model/enums/CooperationType.java b/src/main/java/cn/palmte/work/model/enums/CooperationType.java
index 3a2d022..e62194f 100644
--- a/src/main/java/cn/palmte/work/model/enums/CooperationType.java
+++ b/src/main/java/cn/palmte/work/model/enums/CooperationType.java
@@ -4,12 +4,12 @@ package cn.palmte.work.model.enums;
  * 合作类型：1战略合作类，2非战略合作类
  *
  * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
- * @since 1.0 2022/12/14 15:20
+ * @since 2.0 2022/12/14 15:20
  */
 public enum CooperationType implements Enumerable<Integer> {
 
   STRATEGIC_COOPERATION(1, "战略合作"),
-  NOT_STRATEGIC_COOPERATION(2, "战略合作");
+  NOT_STRATEGIC_COOPERATION(2, "非战略合作");
 
   private final int value;
   private final String description;
diff --git a/src/main/java/cn/palmte/work/model/enums/Descriptive.java b/src/main/java/cn/palmte/work/model/enums/Descriptive.java
index 6429f38..ed1a9d2 100644
--- a/src/main/java/cn/palmte/work/model/enums/Descriptive.java
+++ b/src/main/java/cn/palmte/work/model/enums/Descriptive.java
@@ -2,6 +2,7 @@ package cn.palmte.work.model.enums;
 
 /**
  * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ * @since 2.0
  */
 public interface Descriptive {
   /**
diff --git a/src/main/java/cn/palmte/work/model/enums/Enumerable.java b/src/main/java/cn/palmte/work/model/enums/Enumerable.java
index c824e3f..2e4ad20 100644
--- a/src/main/java/cn/palmte/work/model/enums/Enumerable.java
+++ b/src/main/java/cn/palmte/work/model/enums/Enumerable.java
@@ -8,6 +8,7 @@ import java.util.function.Supplier;
  * Enumerable for {@link Enum}
  *
  * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ * @since 2.0
  */
 public interface Enumerable<V> extends Descriptive {
 
diff --git a/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java b/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java
index c2afb9f..f8cf2bd 100644
--- a/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java
+++ b/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java
@@ -2,7 +2,7 @@ package cn.palmte.work.model.enums;
 
 /**
  * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
- * @since 1.0 2022/12/13 16:12
+ * @since 2.0 2022/12/13 16:12
  */
 public enum ProcessStatus implements Enumerable<String> {
 
diff --git a/src/main/java/cn/palmte/work/model/enums/ProcessTaxRate.java b/src/main/java/cn/palmte/work/model/enums/ProcessTaxRate.java
index 7004b84..9b5241c 100644
--- a/src/main/java/cn/palmte/work/model/enums/ProcessTaxRate.java
+++ b/src/main/java/cn/palmte/work/model/enums/ProcessTaxRate.java
@@ -4,7 +4,7 @@ package cn.palmte.work.model.enums;
  * 业务应用里面的税率
  *
  * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
- * @since 1.0 2022/12/13 15:41
+ * @since 2.0 2022/12/13 15:41
  */
 public enum ProcessTaxRate {
 
diff --git a/src/main/java/cn/palmte/work/model/enums/ProjectType.java b/src/main/java/cn/palmte/work/model/enums/ProjectType.java
index 03f51ea..5b9b01a 100644
--- a/src/main/java/cn/palmte/work/model/enums/ProjectType.java
+++ b/src/main/java/cn/palmte/work/model/enums/ProjectType.java
@@ -4,7 +4,7 @@ package cn.palmte.work.model.enums;
  * 项目类型：1 工程集成类、2设备集成类、3战略合作类
  *
  * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
- * @since 1.0 2022/12/14 15:10
+ * @since 2.0 2022/12/14 15:10
  */
 public enum ProjectType implements Enumerable<Integer> {
 
diff --git a/src/main/java/cn/palmte/work/model/enums/SealType.java b/src/main/java/cn/palmte/work/model/enums/SealType.java
index ed5f0c4..9db8d3c 100644
--- a/src/main/java/cn/palmte/work/model/enums/SealType.java
+++ b/src/main/java/cn/palmte/work/model/enums/SealType.java
@@ -4,7 +4,7 @@ package cn.palmte.work.model.enums;
  * 印章类型
  *
  * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
- * @since 1.0 2022/12/13 15:25
+ * @since 2.0 2022/12/13 15:25
  */
 public enum SealType implements Enumerable<String> {
 
diff --git a/src/main/java/cn/palmte/work/model/process/SaleContractProcess.java b/src/main/java/cn/palmte/work/model/process/SaleContractProcess.java
new file mode 100644
index 0000000..53ead23
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/process/SaleContractProcess.java
@@ -0,0 +1,87 @@
+package cn.palmte.work.model.process;
+
+import org.hibernate.annotations.GenericGenerator;
+
+import java.time.LocalDate;
+
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import cn.palmte.work.model.enums.ProcessStatus;
+import lombok.Data;
+
+/**
+ * 销售合同流程
+ *
+ * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ * @since 2.0 2022/12/14 16:11
+ */
+@Data
+@Entity
+@Table(name = "sale_contract_process")
+public class SaleContractProcess {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @GenericGenerator(name = "persistenceGenerator", strategy = "increment")
+  private Integer id;
+
+  private Integer projectId;
+
+  // 项目编号
+  private String projectNo;
+
+  private LocalDate applyDate;
+
+  // 项目标题
+  private String projectTitle;
+
+  // 申请人
+  private String applyPersonName;
+
+  // 申请部门
+  private String applyDept;
+
+  // 申请部门领导
+  private String applyDeptLeaderName;
+
+  // 申请人电话
+  private String applyPersonPhone;
+
+  // 合同编号
+  private String contractNo;
+
+  // 合同名称
+  private String contractName;
+
+  // 客户名称
+  private String clientName;
+
+  // 用印类型
+  @Convert(converter = SealTypeArrayConverter.class)
+  private SealTypeArray sealTypes;
+
+  // 税率
+  private String taxRate;
+
+  // 收款条件
+  private String paymentTerms;
+
+  // 状态
+  @Enumerated(EnumType.STRING)
+  private ProcessStatus status;
+
+  // 项目类型
+//  @Enumerated(EnumType.STRING)
+//  private ProjectType projectType;
+
+  // 合作类型
+//  @Enumerated(EnumType.STRING)
+//  private CooperationType cooperationType;
+}
diff --git a/src/main/java/cn/palmte/work/model/process/SaleContractProcessRepository.java b/src/main/java/cn/palmte/work/model/process/SaleContractProcessRepository.java
new file mode 100644
index 0000000..0897bc9
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/process/SaleContractProcessRepository.java
@@ -0,0 +1,11 @@
+package cn.palmte.work.model.process;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ * @since 2.0 2022/12/14 17:13
+ */
+public interface SaleContractProcessRepository extends JpaRepository<SaleContractProcess, Integer> {
+
+}
diff --git a/src/main/java/cn/palmte/work/model/process/SealTypeArray.java b/src/main/java/cn/palmte/work/model/process/SealTypeArray.java
new file mode 100644
index 0000000..0f90d38
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/process/SealTypeArray.java
@@ -0,0 +1,58 @@
+package cn.palmte.work.model.process;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import javax.persistence.Convert;
+
+import cn.palmte.work.model.enums.Enumerable;
+import cn.palmte.work.model.enums.SealType;
+
+/**
+ * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ * @since 2.0 2022/12/14 16:35
+ */
+//@JsonSerialize
+@Convert(converter = SealTypeArrayConverter.class)
+public class SealTypeArray {
+  public static final SealTypeArray EMPTY = new SealTypeArray();
+
+  private final List<SealType> sealTypes = new ArrayList<>();
+
+  public SealTypeArray() { }
+
+  public SealTypeArray(SealType... sealTypes) {
+    Collections.addAll(this.sealTypes, sealTypes);
+  }
+
+  public List<SealType> getSealTypes() {
+    return sealTypes;
+  }
+
+  public void setSealTypes(List<SealType> sealTypes) {
+    this.sealTypes.clear();
+    this.sealTypes.addAll(sealTypes);
+  }
+
+  //
+
+  public static SealTypeArray of(SealType... sealTypes) {
+    return new SealTypeArray(sealTypes);
+  }
+
+  public static SealTypeArray of(String... sealTypes) {
+    return of(Arrays.stream(sealTypes)
+            .map(type -> Enumerable.of(SealType.class, type))
+            .toArray(SealType[]::new));
+  }
+
+  public static SealTypeArray of(Collection<SealType> sealTypes) {
+    SealTypeArray sealTypeArray = new SealTypeArray();
+    sealTypeArray.sealTypes.addAll(sealTypes);
+    return sealTypeArray;
+  }
+
+}
diff --git a/src/main/java/cn/palmte/work/model/process/SealTypeArrayConverter.java b/src/main/java/cn/palmte/work/model/process/SealTypeArrayConverter.java
new file mode 100644
index 0000000..eb36c59
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/process/SealTypeArrayConverter.java
@@ -0,0 +1,44 @@
+package cn.palmte.work.model.process;
+
+import org.springframework.util.StringUtils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javax.persistence.AttributeConverter;
+
+import cn.palmte.work.model.enums.Enumerable;
+import cn.palmte.work.model.enums.SealType;
+
+/**
+ * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ * @since 2.0 2022/12/14 16:36
+ */
+public class SealTypeArrayConverter implements AttributeConverter<SealTypeArray, String> {
+
+  @Override
+  public String convertToDatabaseColumn(SealTypeArray attribute) {
+    List<SealType> sealTypes = attribute.getSealTypes();
+    if (sealTypes.isEmpty()) {
+      return null;
+    }
+    return sealTypes.stream()
+            .map(SealType::getValue)
+            .collect(Collectors.joining(","));
+  }
+
+  @Override
+  public SealTypeArray convertToEntityAttribute(String dbData) {
+    return Optional.ofNullable(dbData)
+            .filter(StringUtils::hasText)
+            .map(data -> data.split(","))
+            .map(Arrays::stream)
+            .map(stream -> stream.map(element -> Enumerable.of(SealType.class, element))
+                    .toArray(SealType[]::new))
+            .map(SealTypeArray::of)
+            .orElse(SealTypeArray.EMPTY);
+  }
+
+}
diff --git a/src/main/java/cn/palmte/work/model/process/form/SaleContractDetailForm.java b/src/main/java/cn/palmte/work/model/process/form/SaleContractDetailForm.java
new file mode 100644
index 0000000..8e05fb6
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/process/form/SaleContractDetailForm.java
@@ -0,0 +1,17 @@
+package cn.palmte.work.model.process.form;
+
+import lombok.Data;
+
+/**
+ * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ * @since 2.0 2022/12/14 17:17
+ */
+@Data
+public class SaleContractDetailForm {
+
+  private int id;
+
+  // 5 个字符
+  private String expirationDate;
+
+}
diff --git a/src/main/java/cn/palmte/work/model/process/form/SaleContractProcessForm.java b/src/main/java/cn/palmte/work/model/process/form/SaleContractProcessForm.java
new file mode 100644
index 0000000..e441cd2
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/process/form/SaleContractProcessForm.java
@@ -0,0 +1,71 @@
+package cn.palmte.work.model.process.form;
+
+import java.time.LocalDate;
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import cn.palmte.work.model.enums.ProcessStatus;
+import lombok.Data;
+
+/**
+ * 销售合同流程
+ *
+ * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ * @since 2.0 2022/12/14 17:05
+ */
+@Data
+public class SaleContractProcessForm {
+
+  @NotNull
+  private Integer projectId;
+
+  // 项目编号
+  private String projectNo;
+
+  private String applyDate;
+
+  // 项目标题
+  private String projectTitle;
+
+  // 项目类型
+//  private String projectType;
+
+  // 合作类型
+//  private String cooperationType;
+
+  // 申请人
+  private String applyPersonName;
+
+  private String applyDept;
+
+  // 申请部门领导
+
+  private String applyDeptLeaderName;
+
+  // 申请人电话
+  private String applyPersonPhone;
+
+  // 合同编号
+  private String contractNo;
+
+  // 合同名称
+  private String contractName;
+
+  // 客户名称
+  private String clientName;
+
+  // 用印类型
+  private String[] sealTypes;
+
+  // 税率
+  private String taxRate;
+
+  // 收款条件
+  private String paymentTerms;
+
+  private ProcessStatus status;
+
+  private List<SaleContractDetailForm> incomeDetails;
+
+}
diff --git a/src/main/java/cn/palmte/work/model/process/package-info.java b/src/main/java/cn/palmte/work/model/process/package-info.java
new file mode 100644
index 0000000..4c4a60c
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/process/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * 流程相关的 Model
+ *
+ * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ * @since 2.0 2022/12/14 16:32
+ */
+package cn.palmte.work.model.process;
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
index f598708..a2d9463 100644
--- a/src/main/resources/templates/admin/business/process-new.ftl
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -160,7 +160,7 @@
 
             <div>
               <el-form-item label="用印类型" :rules="[{ required: true, message: '用印类型不能为空'}]">
-                <el-checkbox-group v-model="processForm.sealType">
+                <el-checkbox-group v-model="processForm.sealTypes">
                     <#list sealTypes as sealType>
                       <el-checkbox label="${sealType.name()}" key="key-${sealType.name()}">${sealType.description}</el-checkbox>
                     </#list>
@@ -246,7 +246,7 @@
           <#-- 销售合同清单明细 -->
 
         <div class="am-u-sm-12 am-u-md-12" v-if="isSaleContractDetailMode">
-          <el-table border :data="saleContractDetails" @row-dblclick="dbclick">
+          <el-table border :data="incomeDetails" @row-dblclick="dbclick">
             <el-table-column type="index" :index="1" label="序号" fixed></el-table-column>
             <el-table-column prop="name" label="名称" fixed width="120"></el-table-column>
             <el-table-column prop="type" label="类别"></el-table-column>
@@ -412,7 +412,7 @@
       return {
         mode: "btn", // btn , newBusinessProcurementContractProcess
         processForm: {
-          sealType: [],
+          sealTypes: [],
         },
         projectSelected: false,
         applySectorOptions: [
@@ -615,7 +615,8 @@
           }
         ],
         fileList: [],
-        saleContractDetails: [],
+        // 销售合同收入明细
+        incomeDetails: [],
       }
     }
 
@@ -636,37 +637,9 @@
         this.changeMode(saleContractProcess)
       },
       goToSaleContractDetail() {
-        const { id } = this.processForm
-        if (id) {
+        const { projectId } = this.processForm
+        if (projectId) {
           this.changeMode(saleContractDetail)
-          const loading = this.$loading({
-            lock: true,
-            text: '销售合同清单明细',
-            spinner: 'el-icon-loading',
-            background: 'rgba(0, 0, 0, 0.7)'
-          })
-          fetch("${base}/process/sale-contract-details/" + id)
-              .then(res => res.json())
-              .then(data => {
-                // 转换数据
-                // @formatter:off
-                const computeType = (type) => {
-                  switch (type) {
-                    case 1: return '设备'
-                    case 2: return '工程'
-                    case 3: return '服务'
-                    default: return '未知'
-                  }
-                }
-                // @formatter:on
-                this.saleContractDetails = data.map(detail => ({
-                  ...detail, type: computeType(detail.type)
-                }))
-              })
-              .catch(err => {
-                this.$message.error("销售合同清单明细加载失败");
-              })
-              .finally(() => loading.close())
         }
         else {
           this.$message.warning("项目还未选择")
@@ -681,6 +654,10 @@
         console.log(obj)
       },
 
+      initForm(form) {
+        this.processForm = { ...form, sealTypes: [] }
+      },
+
       queryProject(q, callback) {
         if (isBlank(q)) {
           return
@@ -704,7 +681,7 @@
       handleSelectProject(selected) {
         const { id, name } = selected
         if (!id) {
-          this.processForm = {}
+          this.initForm({})
           return
         }
         const loading = this.$loading({
@@ -717,13 +694,24 @@
         fetch("${base}/process/projects/" + id)
             .then(res => res.json())
             .then(data => {
-              this.processForm = {
-                sealType: [],
-                projectId: id,
-                applyDate: new Date().toLocaleDateString(),
-                ...data
+              const { incomeDetails, ...form } = data
+              // 转换数据
+              // @formatter:off
+              const computeType = (type) => {
+                switch (type) {
+                  case 1: return '设备'
+                  case 2: return '工程'
+                  case 3: return '服务'
+                  default: return '未知'
+                }
               }
+              // @formatter:on
+
+              this.initForm(form)
               this.projectSelected = true
+              this.incomeDetails = incomeDetails.map(detail => ({
+                ...detail, type: computeType(detail.type)
+              }))
             })
             .catch(err => {
               this.$message.error("项目'" + name + "'加载失败");
@@ -732,9 +720,8 @@
       },
       clearProjectProcess() {
         this.projectSelected = false
-        this.processForm = {
-          sealType: []
-        }
+        this.initForm({})
+        this.incomeDetails = []
       },
 
       saveDraft() {
@@ -752,14 +739,20 @@
               background: 'rgba(0, 0, 0, 0.7)'
             })
 
-            const processForm = this.processForm
-            console.log(processForm)
+            const form = {
+              ...this.processForm,
+              projectTitle: this.projectTitle,
+              incomeDetails: this.incomeDetails.map(detail => ({
+                id: detail.id, expirationDate: detail.expirationDate
+              }))
+            }
+
             fetch("${base}/process", {
               method: 'POST', // or 'PUT'
               headers: {
                 'Content-Type': 'application/json',
               },
-              body: JSON.stringify(processForm),
+              body: JSON.stringify(form),
             }).then(response => {
               this.$message({
                 showClose: true,
@@ -777,32 +770,7 @@
       },
 
       submitToSaleContractProcess() {
-        const loading = this.$loading({
-          lock: true,
-          text: '正在提交',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
-
-        const form = this.saleContractDetails.map(detail => ({
-          id: detail.id, expirationDate: detail.expirationDate
-        }))
-        fetch("${base}/process/sale-contract-details", {
-          method: 'POST', // or 'PUT'
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify(form),
-        }).then(response => {
-          this.$message({
-            showClose: true,
-            message: '提交成功',
-            type: 'success'
-          })
-          this.goToSaleContractProcess()
-        }).catch(err => {
-          this.$message.error("项目提交失败");
-        }).finally(() => loading.close())
+        this.goToSaleContractProcess()
       },
 
       handleRemove(file, fileList) {
@@ -863,19 +831,7 @@
       methods,
 
       mounted() {
-        fetch("${base}/process/projects/135")
-            .then(res => res.json())
-            .then(data => {
-              this.processForm = {
-                sealType: [],
-                projectId: 135,
-                ...data
-              }
-              this.projectSelected = true
-            })
-            .catch(err => {
-              this.$message.error("测试项目'加载失败");
-            })
+        this.handleSelectProject({ id: 135, name: '' })
       },
     })
 

From 7c2e202e106b5130b7577ece455711012e59a66c Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Wed, 14 Dec 2022 18:03:06 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/palmte/work/controller/backend/ProcessController.java   | 3 ++-
 .../work/model/process/form/SaleContractProcessForm.java       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
index 4ce8d31..cd5b64a 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
@@ -185,9 +185,10 @@ public class ProcessController {
   public void post(@RequestBody @Valid SaleContractProcessForm form) {
     System.out.println(form);
     SaleContractProcess entity = new SaleContractProcess();
-    BeanUtils.copyProperties(form, entity, "sealTypes", "applyDate");
+    BeanUtils.copyProperties(form, entity, "sealTypes", "applyDate", "applyDept");
     entity.setApplyDate(LocalDate.parse(form.getApplyDate(), formatter));
     entity.setSealTypes(SealTypeArray.of(form.getSealTypes()));
+    entity.setApplyDept(String.join(",", form.getApplyDept()));
 
     entityManager.persist(entity);
 
diff --git a/src/main/java/cn/palmte/work/model/process/form/SaleContractProcessForm.java b/src/main/java/cn/palmte/work/model/process/form/SaleContractProcessForm.java
index e441cd2..e1806e9 100644
--- a/src/main/java/cn/palmte/work/model/process/form/SaleContractProcessForm.java
+++ b/src/main/java/cn/palmte/work/model/process/form/SaleContractProcessForm.java
@@ -37,7 +37,7 @@ public class SaleContractProcessForm {
   // 申请人
   private String applyPersonName;
 
-  private String applyDept;
+  private String[] applyDept;
 
   // 申请部门领导
 

From dc0159b4eb2fae7b6db3c359fdde6c80d29cfc5c Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Tue, 20 Dec 2022 22:06:12 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E5=BE=85=E6=88=91=E5=AE=A1=E6=A0=B8=20?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/backend/ProcessController.java |  49 +++-
 .../work/model/enums/ProcessStatus.java       |   5 +
 .../palmte/work/model/enums/ProcessType.java  |  22 ++
 .../admin/business/process-review.ftl         | 264 ++++++++++++++++--
 4 files changed, 311 insertions(+), 29 deletions(-)
 create mode 100644 src/main/java/cn/palmte/work/model/enums/ProcessType.java

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
index cd5b64a..9d8db35 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
@@ -27,7 +27,9 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
 import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 
 import cn.palmte.work.model.Admin;
 import cn.palmte.work.model.DeptRepository;
@@ -36,6 +38,8 @@ import cn.palmte.work.model.ProjectBudgetIncomeDetail;
 import cn.palmte.work.model.ProjectRepository;
 import cn.palmte.work.model.enums.CooperationType;
 import cn.palmte.work.model.enums.Enumerable;
+import cn.palmte.work.model.enums.ProcessStatus;
+import cn.palmte.work.model.enums.ProcessType;
 import cn.palmte.work.model.enums.ProjectType;
 import cn.palmte.work.model.enums.SealType;
 import cn.palmte.work.model.process.SaleContractProcess;
@@ -45,6 +49,7 @@ import cn.palmte.work.model.process.form.SaleContractProcessForm;
 import cn.palmte.work.service.ProjectBudgetService;
 import cn.palmte.work.utils.InterfaceUtil;
 import lombok.Builder;
+import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 
@@ -107,7 +112,8 @@ public class ProcessController {
    * 待我审核
    */
   @GetMapping("/review")
-  public String review() {
+  public String review(Model model) {
+    model.addAttribute("processTypes", ProcessType.values());
     return "/admin/business/process-review";
   }
 
@@ -212,4 +218,45 @@ public class ProcessController {
     }
   }
 
+  @Data
+  static class ProcessQueryForm {
+
+    private String projectNo;
+    private String projectTitle;
+    private String projectCreator;
+
+    private ProcessType processType;
+    private ProcessStatus processStatus;
+
+  }
+
+  @ResponseBody
+  @PostMapping("/query")
+  public List<SaleContractProcess> list(@RequestBody ProcessQueryForm form) {
+    TypedQuery<SaleContractProcess> query = entityManager.createQuery(
+            "from SaleContractProcess ", SaleContractProcess.class);
+
+//    query.setMaxResults();
+    return query.getResultList();
+  }
+
+  // 审核
+  @Data
+  static class AuditForm {
+
+    private Integer processId;
+
+    @NotNull
+    private String auditOpinion;
+
+    private ProcessStatus processStatus;
+
+  }
+
+  @ResponseBody
+  @PostMapping("/audit")
+  public void audit(@RequestBody @Valid AuditForm form) {
+
+  }
+
 }
diff --git a/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java b/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java
index f8cf2bd..6f15fe0 100644
--- a/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java
+++ b/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java
@@ -1,12 +1,17 @@
 package cn.palmte.work.model.enums;
 
 /**
+ * 审核状态
+ *
  * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
  * @since 2.0 2022/12/13 16:12
  */
 public enum ProcessStatus implements Enumerable<String> {
 
   draft("草稿"),
+  to_be_audit("待审核"),
+  audit_passed("审核通过"),
+  audit_not_passed("审核不通过"),
   completed("完成");
 
   private final String description;
diff --git a/src/main/java/cn/palmte/work/model/enums/ProcessType.java b/src/main/java/cn/palmte/work/model/enums/ProcessType.java
new file mode 100644
index 0000000..9f5f740
--- /dev/null
+++ b/src/main/java/cn/palmte/work/model/enums/ProcessType.java
@@ -0,0 +1,22 @@
+package cn.palmte.work.model.enums;
+
+/**
+ * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
+ * @since 2.0 2022/12/19 16:47
+ */
+public enum ProcessType implements Enumerable<String> {
+  sale_contract("销售合同流程"),
+  business_procurement("业务采购流程");
+
+  private final String description;
+
+  ProcessType(String description) {
+    this.description = description;
+  }
+
+  @Override
+  public String getDescription() {
+    return description;
+  }
+
+}
diff --git a/src/main/resources/templates/admin/business/process-review.ftl b/src/main/resources/templates/admin/business/process-review.ftl
index f82c5c9..6f1c4ca 100644
--- a/src/main/resources/templates/admin/business/process-review.ftl
+++ b/src/main/resources/templates/admin/business/process-review.ftl
@@ -1,44 +1,252 @@
 <#assign base=request.contextPath />
 <#import "../../common/defaultLayout.ftl" as defaultLayout>
 <@defaultLayout.layout>
+  <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
   <style>
 
+      #businessPurchaseDetailsModal {
+          overflow: auto;
+      }
+
+      #businessPurchaseDetailsModal > table {
+
+      }
+
+      #newBusinessProcurementContractProcess {
+          overflow: auto;
+      }
+
+      .el-upload__input {
+          display: none !important;
+      }
+
+      .el-textarea .el-input__count {
+          line-height: 15px;
+      }
+
+      .admin-content-body {
+          margin-bottom: 100px;
+      }
+
+      .el-table__empty-block {
+          height: 60px !important;
+      }
   </style>
 
-  <div id="app">{{ message }}</div>
+  <div class="admin-content" id="app">
+    <div class="admin-content-body">
+      <div class="am-cf am-padding">
+        <div class="am-fl am-cf"><strong class="am-text-primary am-text-lg">业务应用</strong> /
+          <small>待我审核</small></div>
+      </div>
 
-  <script src="https://unpkg.com/vue@3/dist/vue.global.js"></script>
+      <div class="am-g">
+        <div class="am-u-sm-12 am-u-md-12">
+          <el-form :inline="true" ref="queryForm" :model="queryForm" label-position="right" label-width="100px">
+
+            <div>
+              <el-form-item label="标题">
+                <el-input placeholder="请输入标题" v-model="queryForm.projectTitle"></el-input>
+              </el-form-item>
+
+              <el-form-item label="项目编号">
+                <el-input placeholder="请输入项目编号" v-model="queryForm.projectNo"></el-input>
+              </el-form-item>
+
+              <el-form-item label="流程类型">
+                <el-select v-model="queryForm.processType" placeholder="请选择">
+                  <el-option label="全部" value=""></el-option>
+                    <#list processTypes as processType>
+                      <el-option label="${processType.description}"
+                                 value="${processType.name()}"></el-option>
+                    </#list>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="项目创建者">
+                <el-input placeholder="请输入项目创建者" v-model="queryForm.projectCreator"></el-input>
+              </el-form-item>
+
+              <el-button type="primary" @click="queryTable">查询</el-button>
+            </div>
+
+          </el-form>
+
+          <el-table border :data="tableData">
+            <el-table-column type="index" :index="1" label="序号" fixed></el-table-column>
+            <el-table-column prop="name" label="项目编号" fixed></el-table-column>
+            <el-table-column prop="type" label="标题"></el-table-column>
+            <el-table-column prop="spec" label="流程类型"></el-table-column>
+            <el-table-column prop="param" label="项目创建者"></el-table-column>
+            <el-table-column prop="unit" label="审核状态"></el-table-column>
+            <el-table-column prop="amount" label="当前审核人"></el-table-column>
+            <el-table-column prop="price" label="最后更新时间"></el-table-column>
+
+            <el-table-column label="操作" fixed="right" width="180">
+              <template slot-scope="scope">
+                <el-button type="text" @click="showDetail(scope.row, scope)">查看详情</el-button>
+                <el-button type="text" @click="auditProcess(scope.row, scope)">审核</el-button>
+              </template>
+            </el-table-column>
+
+          </el-table>
+
+        </div>
+      </div>
+
+      <el-dialog title="审核" :visible.sync="auditFormVisible">
+        <el-form :model="auditForm">
+
+          <el-form-item label="审核">
+            <el-radio-group v-model="auditForm.processStatus">
+              <el-radio label="audit_passed">审核通过</el-radio>
+              <el-radio label="audit_not_passed">审核不通过</el-radio>
+            </el-radio-group>
+          </el-form-item>
+
+          <el-form-item label="审核意见">
+            <el-input type="textarea" :autosize="{ minRows: 3, maxRows: 10}"
+                      maxlength="5000" v-model="auditForm.auditOpinion"
+                      placeholder="请输入审核意见" cols="90"></el-input>
+          </el-form-item>
+
+        </el-form>
+
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitAudit">提交</el-button>
+        </div>
+
+      </el-dialog>
+
+    </div>
+
+  </div>
+
+  <script src="https://unpkg.com/vue@2/dist/vue.js"></script>
+  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
   <script>
-      const {createApp} = Vue
 
-      createApp({
-          data() {
-              return {
-                  message: 'Hello Vue!'
-              }
+    const isEmpty = (obj) => {
+      return !obj || (obj.length && obj.length === 0)
+    }
+
+    const isNotEmpty = (obj) => {
+      return !isEmpty(obj)
+    }
+
+    const isBlank = (obj) => {
+      return isEmpty(obj) || (obj.trim && isEmpty(obj.trim()))
+    }
+
+    const hasText = (obj) => {
+      return !isBlank(obj)
+    }
+
+    const data = () => {
+      return {
+        auditForm: {
+          processStatus: null
+        },
+        auditFormVisible: false,
+        tableData: [],
+        queryForm: {},
+        projectSelected: false,
+        fileList: [],
+        // 销售合同收入明细
+        incomeDetails: [],
+      }
+    }
+
+    const methods = {
+      showDetail(row, scope) {
+        console.log(row)
+        console.log(scope)
+
+      },
+      auditProcess(row, scope) {
+        console.log(row)
+        console.log(scope)
+
+      },
+
+      submitAudit() {
+
+        console.log("submitAudit");
+      },
+
+      render(obj) {
+        console.log(obj)
+      },
+
+      queryTable() {
+        const form = {
+          ...this.queryForm,
+        }
+
+        fetch("${base}/process/query", {
+          method: 'POST', // or 'PUT'
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(form),
+        }).then(res => res.json())
+            .then(data => {
+              this.tableData = data
+            })
+            .catch(err => {
+              this.$message.error('项目搜索失败');
+            })
+      },
+
+    }
+
+    new Vue({
+      el: '#app',
+      data,
+      computed: {
+        projectTitle() {
+          const { projectNo, projectName, applyPersonName, applyDate } = this.processForm
+          if (projectNo && projectName) {
+            return projectNo.trim() + "-" + projectName.trim() + "-" + applyPersonName + "-" + applyDate
           }
-      }).mount('#app')
+          return ""
+        },
+        isButtonMode() {
+          return this.mode === BUTTON
+        },
+        isBusinessProcurementContractProcessMode() {
+          return this.mode === newBusinessProcurementContractProcess
+        },
+        isSalesContractProcessMode() {
+          return this.mode === saleContractProcess
+        },
+        isSaleContractDetailMode() {
+          return this.mode === saleContractDetail
+        },
+        subTitle() {
+          switch (this.mode) {
+            case BUTTON:
+              return "新增流程"
+            case saleContractProcess:
+              return "新增销售合同流程"
+            case saleContractDetail:
+              return "销售合同清单明细"
+            case newBusinessProcurementContractProcess:
+              return "新增业务采购合同流程"
+          }
+        }
+      },
+
+      methods,
+
+      mounted() {
+        this.queryTable()
+      },
+    })
+
   </script>
 
-  <script type="text/javascript">
-      $(function () {
-
-      })
-  </script>
 </@defaultLayout.layout>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-

From 01c2d0488db32f15b98adfb3979ecba26e57b360 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Wed, 21 Dec 2022 10:41:57 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E5=BE=85=E6=88=91=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/backend/ProcessController.java |   4 +-
 .../model/process/SaleContractProcess.java    |   9 +
 .../cn/palmte/work/service/UploadService.java |  73 -----
 .../work/utils/image/VerifyImageUtil.java     | 305 ------------------
 src/main/resources/sql/2.0.sql                |  38 +++
 .../admin/business/process-review.ftl         |  81 ++++-
 6 files changed, 112 insertions(+), 398 deletions(-)
 delete mode 100644 src/main/java/cn/palmte/work/service/UploadService.java
 delete mode 100644 src/main/java/cn/palmte/work/utils/image/VerifyImageUtil.java
 create mode 100644 src/main/resources/sql/2.0.sql

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
index 9d8db35..7afc235 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
@@ -51,7 +51,6 @@ import cn.palmte.work.utils.InterfaceUtil;
 import lombok.Builder;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
-import lombok.Setter;
 
 /**
  * @author <a href="https://github.com/TAKETODAY">Harry Yang</a>
@@ -189,7 +188,6 @@ public class ProcessController {
   @PostMapping
   @Transactional
   public void post(@RequestBody @Valid SaleContractProcessForm form) {
-    System.out.println(form);
     SaleContractProcess entity = new SaleContractProcess();
     BeanUtils.copyProperties(form, entity, "sealTypes", "applyDate", "applyDept");
     entity.setApplyDate(LocalDate.parse(form.getApplyDate(), formatter));
@@ -223,7 +221,7 @@ public class ProcessController {
 
     private String projectNo;
     private String projectTitle;
-    private String projectCreator;
+    private String applyPersonName;
 
     private ProcessType processType;
     private ProcessStatus processStatus;
diff --git a/src/main/java/cn/palmte/work/model/process/SaleContractProcess.java b/src/main/java/cn/palmte/work/model/process/SaleContractProcess.java
index 53ead23..6e85569 100644
--- a/src/main/java/cn/palmte/work/model/process/SaleContractProcess.java
+++ b/src/main/java/cn/palmte/work/model/process/SaleContractProcess.java
@@ -3,6 +3,7 @@ package cn.palmte.work.model.process;
 import org.hibernate.annotations.GenericGenerator;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 import javax.persistence.Convert;
 import javax.persistence.Entity;
@@ -77,6 +78,14 @@ public class SaleContractProcess {
   @Enumerated(EnumType.STRING)
   private ProcessStatus status;
 
+  // 当前审核人
+  private String currentAudit;
+
+  // 最后更新时间
+  private LocalDateTime lastUpdateAt;
+
+  private LocalDateTime createAt;
+
   // 项目类型
 //  @Enumerated(EnumType.STRING)
 //  private ProjectType projectType;
diff --git a/src/main/java/cn/palmte/work/service/UploadService.java b/src/main/java/cn/palmte/work/service/UploadService.java
deleted file mode 100644
index 92888e8..0000000
--- a/src/main/java/cn/palmte/work/service/UploadService.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package cn.palmte.work.service;
-
-import cn.palmte.work.config.UploadProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import sun.misc.BASE64Decoder;
-import top.jfunc.common.datetime.DatetimeUtils;
-import top.jfunc.common.utils.CommonUtil;
-import top.jfunc.common.utils.FileUtil;
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Date;
-
-/**
- * @author xiongshiyan at 2020/10/13 , contact me with email yanshixiong@126.com or phone 15208384257
- */
-@Service
-public class UploadService {
-    private static final Logger logger = LoggerFactory.getLogger(UploadService.class);
-    public static final String DATA_IMAGE_PNG_BASE64 = "data:image/png;base64,";
-    public static final String DATA_IMAGE_JPEG_BASE64 = "data:image/jpeg;base64,";
-    public static final String DATA_IMAGE_JPG_BASE64 = "data:image/jpg;base64,";
-
-    @Autowired
-    private UploadProperties uploadProperties;
-
-    public String upload(String base64Str){
-        String suffix = "png";
-        if (base64Str.contains(DATA_IMAGE_PNG_BASE64)) {
-            base64Str = base64Str.replaceAll(DATA_IMAGE_PNG_BASE64, "");
-            suffix = "png";
-        } else if (base64Str.contains(DATA_IMAGE_JPEG_BASE64)) {
-            base64Str = base64Str.replaceAll(DATA_IMAGE_JPEG_BASE64, "");
-            suffix = "jpeg";
-        }else if (base64Str.contains(DATA_IMAGE_JPG_BASE64)) {
-            base64Str = base64Str.replaceAll(DATA_IMAGE_JPG_BASE64, "");
-            suffix = "jpg";
-        }
-        String uploadPath = uploadProperties.getPath();
-        String uploadPrefix = uploadProperties.getPrefix();
-        String yyyyMMdd = DatetimeUtils.toStr(new Date(), "yyyyMMdd");
-        String saveDir = uploadPath + "/" + yyyyMMdd;
-        FileUtil.makeSureExistDir(saveDir);
-
-        String fileName = CommonUtil.randomString(32) + "." + suffix;
-        String absolutePath = saveDir + "/" + fileName;
-        File file = new File(absolutePath);
-
-        decodeAndWrite(base64Str , file);
-
-        return uploadPrefix + "/" + yyyyMMdd + "/" + fileName;
-    }
-
-
-    private void decodeAndWrite(String base64Str, File destFile) {
-        try {
-            // Base64解码
-            byte[] bytes = new BASE64Decoder().decodeBuffer(base64Str);
-            for (int i = 0; i < bytes.length; ++i) {
-                if (bytes[i] < 0) {
-                    // 调整异常数据
-                    bytes[i] += 256;
-                }
-            }
-            Files.write(Paths.get(destFile.getAbsolutePath()), bytes);
-        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
-        }
-    }
-}
diff --git a/src/main/java/cn/palmte/work/utils/image/VerifyImageUtil.java b/src/main/java/cn/palmte/work/utils/image/VerifyImageUtil.java
deleted file mode 100644
index 9930bfc..0000000
--- a/src/main/java/cn/palmte/work/utils/image/VerifyImageUtil.java
+++ /dev/null
@@ -1,305 +0,0 @@
-package cn.palmte.work.utils.image;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import sun.misc.BASE64Decoder;
-import top.jfunc.common.utils.ArrayUtil;
-import top.jfunc.common.utils.RandomUtil;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.*;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.List;
-import java.util.Random;
-
-/**
- * 滑动验证码相关工具方法
- */
-public class VerifyImageUtil {
-    private static final Logger logger = LoggerFactory.getLogger(VerifyImageUtil.class);
-    /**
-     * 模板图宽度
-     */
-    private static int CUT_WIDTH = 50;
-    /**
-     * 模板图高度
-     */
-    private static int CUT_HEIGHT = 50;
-    /**
-     * 抠图凸起圆心
-     */
-    private static int CIRCLE_R = 5;
-    /**
-     * 抠图内部矩形填充大小
-     */
-    private static int RECTANGLE_PADDING = 8;
-    /**
-     * 抠图的边框宽度
-     */
-    private static int SLIDER_IMG_OUT_PADDING = 1;
-
-    private static int CENTER_INDICATOR = 1;
-    private static int BORDER_INDICATOR = 2;
-    private static int OTHER_INDICATOR  = 0;
-
-    /**
-     * 根据传入的file生成验证码图片
-     */
-    public static VerifyImage getVerifyImage(File file) throws IOException {
-        BufferedImage srcImage = ImageIO.read(file);
-
-        return getVerifyImage(srcImage);
-    }
-
-    /**
-     * 根据转入的流生成验证码图片
-     */
-    public static VerifyImage getVerifyImage(InputStream inputStream) throws IOException {
-        BufferedImage srcImage = ImageIO.read(inputStream);
-
-        return getVerifyImage(srcImage);
-    }
-
-    /**
-     * 以左上角为计数起点
-     */
-    public static VerifyImage getVerifyImage(BufferedImage srcImage) throws IOException {
-        //1/4=75处，最右减1个方块儿，-5是保守的防止超界
-        int locationX = RandomUtil.randomInt(srcImage.getWidth()/4, srcImage.getWidth()-CUT_WIDTH-5);
-        //距离最下方一个方块，-5是保守的防止超界
-        int locationY = RandomUtil.randomInt(5, srcImage.getHeight()-CUT_HEIGHT-5);
-
-        BufferedImage markImage = new BufferedImage(CUT_WIDTH,CUT_HEIGHT,BufferedImage.TYPE_4BYTE_ABGR);
-        cutImgByTemplate(srcImage, markImage, getBlockData(), locationX, locationY);
-        return new VerifyImage(getImageBASE64(srcImage),
-                getImageBASE64(markImage),
-                locationX,
-                locationY,
-                srcImage.getWidth(),
-                srcImage.getHeight());
-    }
-
-
-    /**
-     * 生成随机滑块形状
-     * <p>
-     * 0 透明像素
-     * 1 滑块像素
-     * 2 阴影像素
-     * @return int[][]
-     */
-    private static int[][] getBlockData() {
-        int[][] data = new int[CUT_WIDTH][CUT_HEIGHT];
-        SecureRandom random = new SecureRandom();
-        //Random random = new Random();
-        //(x-a)²+(y-b)²=r²
-        //x中心位置左右5像素随机
-        double x1 = RECTANGLE_PADDING + (CUT_WIDTH - 2 * RECTANGLE_PADDING) / 2.0/* - 5 + random.nextInt(10)*/;
-        //y 矩形上边界半径-1像素移动
-        double y1_top = RECTANGLE_PADDING - random.nextInt(3);
-        double y1_bottom = CUT_HEIGHT - RECTANGLE_PADDING + random.nextInt(3);
-        double y1 = random.nextInt(2) == 1 ? y1_top : y1_bottom;
- 
- 
-        double x2_right = CUT_WIDTH - RECTANGLE_PADDING - CIRCLE_R + random.nextInt(2 * CIRCLE_R - 4);
-        double x2_left = RECTANGLE_PADDING + CIRCLE_R - 2 - random.nextInt(2 * CIRCLE_R - 4);
-        double x2 = random.nextInt(2) == 1 ? x2_right : x2_left;
-        double y2 = RECTANGLE_PADDING + (CUT_HEIGHT - 2 * RECTANGLE_PADDING) / 2.0 - 4 + random.nextInt(10);
- 
-        double po = Math.pow(CIRCLE_R, 2);
-        for (int i = 0; i < CUT_WIDTH; i++) {
-            for (int j = 0; j < CUT_HEIGHT; j++) {
-                //矩形区域
-                boolean fill;
-                if ((i >= RECTANGLE_PADDING && i < CUT_WIDTH - RECTANGLE_PADDING)
-                        && (j >= RECTANGLE_PADDING && j < CUT_HEIGHT - RECTANGLE_PADDING)) {
-                    data[i][j] = CENTER_INDICATOR;
-                    fill = true;
-                } else {
-                    data[i][j] = OTHER_INDICATOR;
-                    fill = false;
-                }
-                //凸出区域
-                double d3 = Math.pow(i - x1, 2) + Math.pow(j - y1, 2);
-                if (d3 < po) {
-                    data[i][j] = CENTER_INDICATOR;
-                } else {
-                    if (!fill) {
-                        data[i][j] = OTHER_INDICATOR;
-                    }
-                }
-                //凹进区域
-                double d4 = Math.pow(i - x2, 2) + Math.pow(j - y2, 2);
-                if (d4 < po) {
-                    data[i][j] = OTHER_INDICATOR;
-                }
-            }
-        }
-        //边界阴影
-        for (int i = 0; i < CUT_WIDTH; i++) {
-            for (int j = 0; j < CUT_HEIGHT; j++) {
-                //四个正方形边角处理
-                for (int k = 1; k <= SLIDER_IMG_OUT_PADDING; k++) {
-                    //左上、右上
-                    if (i >= RECTANGLE_PADDING - k && i < RECTANGLE_PADDING
-                            && ((j >= RECTANGLE_PADDING - k && j < RECTANGLE_PADDING)
-                            || (j >= CUT_HEIGHT - RECTANGLE_PADDING - k && j < CUT_HEIGHT - RECTANGLE_PADDING +1))) {
-                        data[i][j] = BORDER_INDICATOR;
-                    }
- 
-                    //左下、右下
-                    if (i >= CUT_WIDTH - RECTANGLE_PADDING + k - 1 && i < CUT_WIDTH - RECTANGLE_PADDING + 1) {
-                        for (int n = 1; n <= SLIDER_IMG_OUT_PADDING; n++) {
-                            if (((j >= RECTANGLE_PADDING - n && j < RECTANGLE_PADDING)
-                                    || (j >= CUT_HEIGHT - RECTANGLE_PADDING - n && j <= CUT_HEIGHT - RECTANGLE_PADDING ))) {
-                                data[i][j] = BORDER_INDICATOR;
-                            }
-                        }
-                    }
-                }
- 
-                if (data[i][j] == 1 && j - SLIDER_IMG_OUT_PADDING > 0 && data[i][j - SLIDER_IMG_OUT_PADDING] == 0) {
-                    data[i][j - SLIDER_IMG_OUT_PADDING] = BORDER_INDICATOR;
-                }
-                if (data[i][j] == 1 && j + SLIDER_IMG_OUT_PADDING > 0 && j + SLIDER_IMG_OUT_PADDING < CUT_HEIGHT && data[i][j + SLIDER_IMG_OUT_PADDING] == 0) {
-                    data[i][j + SLIDER_IMG_OUT_PADDING] = BORDER_INDICATOR;
-                }
-                if (data[i][j] == 1 && i - SLIDER_IMG_OUT_PADDING > 0 && data[i - SLIDER_IMG_OUT_PADDING][j] == 0) {
-                    data[i - SLIDER_IMG_OUT_PADDING][j] = BORDER_INDICATOR;
-                }
-                if (data[i][j] == 1 && i + SLIDER_IMG_OUT_PADDING > 0 && i + SLIDER_IMG_OUT_PADDING < CUT_WIDTH && data[i + SLIDER_IMG_OUT_PADDING][j] == 0) {
-                    data[i + SLIDER_IMG_OUT_PADDING][j] = BORDER_INDICATOR;
-                }
-            }
-        }
-
-
-        //最外边界
-        /*for (int i = 0; i < CUT_WIDTH; i++) {
-            data[0][i] = data[CUT_WIDTH-1][i] = 3;
-        }
-        for (int i = 0; i < CUT_HEIGHT; i++) {
-            data[i][0] = data[i][CUT_HEIGHT-1] = 3;
-        }*/
-
-        return data;
-    }
- 
-    /**
-     * 裁剪区块
-     * 根据生成的滑块形状，对原图和裁剪块进行变色处理
-     * @param oriImage    原图
-     * @param targetImage 裁剪图
-     * @param blockImage  滑块
-     * @param x           裁剪点x
-     * @param y           裁剪点y
-     */
-    private static void cutImgByTemplate(BufferedImage oriImage, BufferedImage targetImage, int[][] blockImage, int x, int y) {
-
-        print(blockImage);
-
-        for (int i = 0; i < CUT_WIDTH; i++) {
-            for (int j = 0; j < CUT_HEIGHT; j++) {
-                int xx = x + i;
-                int yy = y + j;
-                int rgbFlg = blockImage[i][j];
-                int rgb_ori = oriImage.getRGB(xx, yy);
-
-                // 原图中对应位置变色处理
-                if (rgbFlg == CENTER_INDICATOR) {
-                    //中心
-                    //抠图上复制对应颜色值
-                    targetImage.setRGB(i,j, rgb_ori);
-                    //原图对应位置颜色变化[透明50%]
-                    oriImage.setRGB(xx, yy, rgb_ori & 0x80ffffff);
-                } else if (rgbFlg == BORDER_INDICATOR) {
-                    //边框
-                    targetImage.setRGB(i, j, Color.WHITE.getRGB());
-                    oriImage.setRGB(xx, yy, Color.GRAY.getRGB());
-                }else if(rgbFlg == OTHER_INDICATOR){
-                    //int alpha = 0;
-                    targetImage.setRGB(i, j, rgb_ori & 0x00ffffff);
-                }
-            }
- 
-        }
-    }
-    private static void print(int[][] blockData){
-        StringBuilder builder = new StringBuilder("\r\n");
-        for (int i = 0; i < blockData.length; i++) {
-            for (int j = 0; j < blockData[i].length; j++) {
-                builder.append(blockData[i][j]).append(" ");
-            }
-            builder.append("\r\n");
-        }
-        logger.debug(builder.toString());
-    }
- 
- 
-    /**
-     * 随机获取一张图片文件
-     */
-    public static File getRandomFile(File dir) throws IOException {
-        File[] fileList = dir.listFiles();
-        if(ArrayUtil.isEmpty(fileList)){
-            return null;
-        }
-        List<String> fileNameList = new ArrayList<>(fileList.length);
-        for (File tempFile: fileList){
-            if (tempFile.isDirectory()) {
-                continue;
-            }
-            if (tempFile.getName().endsWith(".png") || tempFile.getName().endsWith(".jpg")){
-                fileNameList.add(tempFile.getAbsolutePath().trim());
-            }
-        }
-        int randomIndex = new SecureRandom().nextInt(fileNameList.size());
-        //int randomIndex = new Random().nextInt(fileNameList.size());
-        return new File(fileNameList.get(randomIndex));
-    }
- 
-    /**
-     * 将IMG输出为文件
-     */
-    public static void writeImg(BufferedImage image, File file) throws IOException {
-        ByteArrayOutputStream bao=new ByteArrayOutputStream();
-        ImageIO.write(image,"png",bao);
-        try (FileOutputStream out = new FileOutputStream(file)){
-            out.write(bao.toByteArray());
-        }
-    }
- 
-    /**
-     * 将图片转换为BASE64
-     */
-    public static String getImageBASE64(BufferedImage image) throws IOException {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ImageIO.write(image,"png",out);
-        //转成byte数组
-        byte[] bytes = out.toByteArray();
-
-        return Base64.getEncoder().encodeToString(bytes);
-    }
- 
-    /**
-     * 将BASE64字符串转换为图片
-     */
-    public static BufferedImage base64String2Image(String base64String) throws IOException {
-        BASE64Decoder decoder=new BASE64Decoder();
-        byte[] bytes1 = decoder.decodeBuffer(base64String);
-        ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes1);
-        return ImageIO.read(byteArrayInputStream);
-    }
-
-    /*public static void main(String[] args) throws IOException {
-        VerifyImage verifyImage = VerifyImageUtil.getVerifyImage(new File("C:\\Users\\xiongshiyan\\Desktop\\ssss.png"));
-        System.out.println(verifyImage);
-        VerifyImageUtil.writeImg(VerifyImageUtil.base64String2Image(verifyImage.getSrcImage()), new File("C:\\Users\\xiongshiyan\\Desktop\\src.png"));
-        VerifyImageUtil.writeImg(VerifyImageUtil.base64String2Image(verifyImage.getCutImage()), new File("C:\\Users\\xiongshiyan\\Desktop\\cut.png"));
-    }*/
- 
-}
\ No newline at end of file
diff --git a/src/main/resources/sql/2.0.sql b/src/main/resources/sql/2.0.sql
new file mode 100644
index 0000000..f452615
--- /dev/null
+++ b/src/main/resources/sql/2.0.sql
@@ -0,0 +1,38 @@
+# 创建 流程表
+create table sale_contract_process
+(
+    id                     int auto_increment primary key,
+    apply_date             date         null,
+    apply_dept             varchar(255) null,
+    apply_dept_leader_name varchar(255) null,
+    apply_person_name      varchar(255) null,
+    apply_person_phone     varchar(255) null,
+    client_name            varchar(255) null,
+    contract_name          varchar(255) null,
+    contract_no            varchar(255) null,
+    payment_terms          varchar(255) null,
+    project_id             int          null,
+    project_no             varchar(255) null,
+    project_title          varchar(255) null comment '标题',
+    seal_types             varchar(255) null comment '印章类型',
+    `status`               varchar(255) null,
+    tax_rate               varchar(255) null,
+
+    current_audit          varchar(255) null comment '当前审核人',
+
+    create_at              datetime default CURRENT_TIMESTAMP comment '创建时间',
+    last_update_at         datetime on update CURRENT_TIMESTAMP comment '最后更新时间'
+
+);
+
+
+alter table sale_contract_process
+    add current_audit varchar(255) null comment '当前审核人';
+
+alter table sale_contract_process
+    add create_at datetime default CURRENT_TIMESTAMP comment '创建时间';
+alter table sale_contract_process
+    add last_update_at datetime on update CURRENT_TIMESTAMP comment '最后更新时间';
+
+
+
diff --git a/src/main/resources/templates/admin/business/process-review.ftl b/src/main/resources/templates/admin/business/process-review.ftl
index 6f1c4ca..1390c37 100644
--- a/src/main/resources/templates/admin/business/process-review.ftl
+++ b/src/main/resources/templates/admin/business/process-review.ftl
@@ -31,6 +31,10 @@
       .el-table__empty-block {
           height: 60px !important;
       }
+
+      .el-radio-button__inner, .el-radio-group {
+          line-height: unset;
+      }
   </style>
 
   <div class="admin-content" id="app">
@@ -42,7 +46,7 @@
 
       <div class="am-g">
         <div class="am-u-sm-12 am-u-md-12">
-          <el-form :inline="true" ref="queryForm" :model="queryForm" label-position="right" label-width="100px">
+          <el-form :inline="true" ref="queryForm" :model="queryForm" label-position="right">
 
             <div>
               <el-form-item label="标题">
@@ -64,8 +68,8 @@
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="项目创建者">
-                <el-input placeholder="请输入项目创建者" v-model="queryForm.projectCreator"></el-input>
+              <el-form-item label="申请人">
+                <el-input placeholder="请输入申请人" v-model="queryForm.applyPersonName"></el-input>
               </el-form-item>
 
               <el-button type="primary" @click="queryTable">查询</el-button>
@@ -75,13 +79,13 @@
 
           <el-table border :data="tableData">
             <el-table-column type="index" :index="1" label="序号" fixed></el-table-column>
-            <el-table-column prop="name" label="项目编号" fixed></el-table-column>
-            <el-table-column prop="type" label="标题"></el-table-column>
-            <el-table-column prop="spec" label="流程类型"></el-table-column>
-            <el-table-column prop="param" label="项目创建者"></el-table-column>
-            <el-table-column prop="unit" label="审核状态"></el-table-column>
+            <el-table-column prop="projectNo" label="项目编号" fixed></el-table-column>
+            <el-table-column prop="projectTitle" label="标题"></el-table-column>
+            <el-table-column prop="processType" label="流程类型"></el-table-column>
+            <el-table-column prop="applyPersonName" label="申请人"></el-table-column>
+            <el-table-column prop="status" label="审核状态"></el-table-column>
             <el-table-column prop="amount" label="当前审核人"></el-table-column>
-            <el-table-column prop="price" label="最后更新时间"></el-table-column>
+            <el-table-column prop="lastUpdateAt" label="最后更新时间"></el-table-column>
 
             <el-table-column label="操作" fixed="right" width="180">
               <template slot-scope="scope">
@@ -92,21 +96,24 @@
 
           </el-table>
 
+          <el-pagination style="text-align: center; margin-top: 10px"
+                         @current-change="handlePageChange"
+                         layout="prev, pager, next" :total="50"></el-pagination>
         </div>
       </div>
 
       <el-dialog title="审核" :visible.sync="auditFormVisible">
-        <el-form :model="auditForm">
+        <el-form ref="auditForm" :model="auditForm" label-width="80px">
 
-          <el-form-item label="审核">
+          <el-form-item prop="processStatus" label="审核" :rules="[{ required: true, message: '还没审核'}]">
             <el-radio-group v-model="auditForm.processStatus">
               <el-radio label="audit_passed">审核通过</el-radio>
               <el-radio label="audit_not_passed">审核不通过</el-radio>
             </el-radio-group>
           </el-form-item>
 
-          <el-form-item label="审核意见">
-            <el-input type="textarea" :autosize="{ minRows: 3, maxRows: 10}"
+          <el-form-item prop="auditOpinion" label="审核意见" :rules="[{ required: true, message: '审核意见不能为空'}]">
+            <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 10}"
                       maxlength="5000" v-model="auditForm.auditOpinion"
                       placeholder="请输入审核意见" cols="90"></el-input>
           </el-form-item>
@@ -166,14 +173,48 @@
 
       },
       auditProcess(row, scope) {
-        console.log(row)
-        console.log(scope)
-
+        this.auditForm = {
+          processId: row.id,
+          processStatus: null
+        }
+        this.auditFormVisible = true
       },
 
       submitAudit() {
+        this.$refs["auditForm"].validate((valid) => {
+          if (valid) {
+            const loading = this.$loading({
+              lock: true,
+              text: '正在审核',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+
+            const form = this.auditForm
+
+            fetch("${base}/process/audit", {
+              method: 'POST', // or 'PUT'
+              headers: {
+                'Content-Type': 'application/json',
+              },
+              body: JSON.stringify(form),
+            }).then(response => {
+              this.$message({
+                showClose: true,
+                message: '审核成功',
+                type: 'success'
+              })
+              // 关闭对话框
+              this.auditFormVisible = false
+            }).catch(err => {
+              this.$message.error("审核失败");
+            }).finally(() => loading.close())
+          }
+          else {
+            return false;
+          }
+        })
 
-        console.log("submitAudit");
       },
 
       render(obj) {
@@ -200,6 +241,12 @@
             })
       },
 
+      handlePageChange(val) {
+        console.log(`当前页:` + val)
+
+
+      },
+
     }
 
     new Vue({

From 68763c93a4b076ea86494d0f3974f43bc759e840 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Wed, 21 Dec 2022 10:42:22 +0800
Subject: [PATCH 11/11] hibernate-java8

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 5fd884b..ff10a31 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,6 +32,7 @@ repositories {
 }
 
 dependencies {
+    implementation 'org.hibernate:hibernate-java8:5.1.0.Final'
     compile "org.springframework.boot:spring-boot-starter:${springBootVersion}"
     compile 'org.springframework.boot:spring-boot-starter-web'
     compile 'org.springframework.boot:spring-boot-starter-freemarker'