feat(erp): 为请购单增加审批意见功能

- 在ErpPurchaseRequisition实体类中添加一审和二审审批意见字段
- 在ErpPurchaseRequisitionBo和ErpPurchaseRequisitionVo中同步添加审批意见字段
- 修改approve和reject方法接口，支持传递审批意见参数
- 在服务实现层将审批意见保存到对应字段中
- 更新前端控制器接收审批意见参数并传递给服务层
- 在前端页面显示审批意见，并调整审批进度布局样式
- 添加数据库表结构变更SQL脚本，增加审批意见字段

klp-ui/src/api/erp/purchaseRequisition.js

@@ -45,18 +45,20 @@ export function submitApproval(reqId, firstApproverId, firstApproverName) {
 }
 
 // 审批通过
-export function approvePurchase(reqId) {
+export function approvePurchase(reqId, approvalOpinion) {
   return request({
     url: '/erp/purchaseRequisition/' + reqId + '/approve',
-    method: 'put'
+    method: 'put',
+    params: { approvalOpinion }
   })
 }
 
 // 驳回
-export function rejectPurchase(reqId) {
+export function rejectPurchase(reqId, approvalOpinion) {
   return request({
     url: '/erp/purchaseRequisition/' + reqId + '/reject',
-    method: 'put'
+    method: 'put',
+    params: { approvalOpinion }
   })
 }
 

klp-ui/src/views/erp/purchaseRequisition/index.vue

@@ -363,9 +363,15 @@
 
         <!-- 审批进度 -->
         <div class="pv-section-title" style="margin-top:14px">审批进度</div>
-        <div style="display:flex;gap:24px;padding:8px 0;font-size:13px">
-          <div><label style="color:#909399">一审人：</label><span>{{ viewForm.signPurchaseHandler || '待审批' }}</span></div>
-          <div><label style="color:#909399">二审人（陈清鑫）：</label><span>{{ viewForm.signRequestGm || '待审批' }}</span></div>
+        <div style="padding:8px 0;font-size:13px">
+          <div style="margin-bottom:10px">
+            <div><label style="color:#909399">一审人：</label><span>{{ viewForm.signPurchaseHandler || '待审批' }}</span></div>
+            <div v-if="viewForm.firstApprovalOpinion" style="margin:4px 0 0 62px;color:#606266;font-size:12px;padding:4px 10px;background:#f5f7fa;border-radius:3px;display:inline-block">意见：{{ viewForm.firstApprovalOpinion }}</div>
+          </div>
+          <div>
+            <div><label style="color:#909399">二审人（陈清鑫）：</label><span>{{ viewForm.signRequestGm || '待审批' }}</span></div>
+            <div v-if="viewForm.secondApprovalOpinion" style="margin:4px 0 0 124px;color:#606266;font-size:12px;padding:4px 10px;background:#f5f7fa;border-radius:3px;display:inline-block">意见：{{ viewForm.secondApprovalOpinion }}</div>
+          </div>
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -766,7 +772,7 @@ export default {
     // 审批通过
     doApprove() {
       this.approvalLoading = true
-      approvePurchase(this.approvalReq.reqId).then(() => {
+      approvePurchase(this.approvalReq.reqId, this.approvalRemark).then(() => {
         this.$modal.msgSuccess('审批通过')
         this.approvalOpen = false
         this.getList()
@@ -775,7 +781,7 @@ export default {
     // 驳回
     doReject() {
       this.approvalLoading = true
-      rejectPurchase(this.approvalReq.reqId).then(() => {
+      rejectPurchase(this.approvalReq.reqId, this.approvalRemark).then(() => {
         this.$modal.msgSuccess('已驳回')
         this.approvalOpen = false
         this.getList()