From 527107f0f3de963f726931a5880266cd8ac5fb59 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Fri, 30 Dec 2022 14:50:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../work/model/process/ProcurementDetail.java |  4 ++
 .../work/service/ProjectProcessService.java   |  3 +
 .../templates/admin/business/process-edit.ftl | 60 ++++++++++++-------
 3 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/src/main/java/cn/palmte/work/model/process/ProcurementDetail.java b/src/main/java/cn/palmte/work/model/process/ProcurementDetail.java
index f50ae45..0be8ad8 100644
--- a/src/main/java/cn/palmte/work/model/process/ProcurementDetail.java
+++ b/src/main/java/cn/palmte/work/model/process/ProcurementDetail.java
@@ -51,6 +51,10 @@ public class ProcurementDetail {
 
   // 已采购数量
   private BigDecimal amountAlready = BigDecimal.ZERO;
+  private BigDecimal amountCurrent;
+
+  // 未采购数量
+  private BigDecimal amountLeft;
 
   private List<BudgetPurchaseDetail> purchaseDetails;
 
diff --git a/src/main/java/cn/palmte/work/service/ProjectProcessService.java b/src/main/java/cn/palmte/work/service/ProjectProcessService.java
index ba007b7..c6337ba 100644
--- a/src/main/java/cn/palmte/work/service/ProjectProcessService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectProcessService.java
@@ -220,7 +220,10 @@ public class ProjectProcessService {
         detail.setPurchaseDetails(purchaseDetails);
         detail.setBudgetCostId(costDetail.getId());
         detail.setCategory(getCategory(costDetail));
+        detail.setAmountLeft(amount.getAmountLeft());
         detail.setAmountAlready(amount.getAmountAlready());
+        detail.setAmountCurrent(amount.getAmountCurrent());
+        ret.add(detail);
       }
     }
     else {
diff --git a/src/main/resources/templates/admin/business/process-edit.ftl b/src/main/resources/templates/admin/business/process-edit.ftl
index 815d9ae..9b96a9e 100644
--- a/src/main/resources/templates/admin/business/process-edit.ftl
+++ b/src/main/resources/templates/admin/business/process-edit.ftl
@@ -12,7 +12,7 @@
 
       }
 
-      #newBusinessProcurementContractProcess {
+      #procurementContractProcess {
           overflow: auto;
       }
 
@@ -76,11 +76,9 @@
                 <span>{{processForm.projectNo}}</span>
               </el-form-item>
 
-              <el-tooltip :disabled="!projectSelected" effect="light" :content="projectTitle" placement="top-start">
-                <el-form-item label="项目标题">
-                  <span>{{projectTitle}}</span>
-                </el-form-item>
-              </el-tooltip>
+              <el-form-item label="项目标题">
+                <span>{{processForm.projectTitle}}</span>
+              </el-form-item>
 
               <el-form-item label="申请时间">
                 <span>{{processForm.applyDate}}</span>
@@ -108,7 +106,14 @@
 
               <el-form-item label="申请部门" :rules="[{ required: true, message: '申请部门不能为空'}]" prop="applyDeptId">
                 <el-cascader :options="applyDeptSectorOptions" clearable v-model="processForm.applyDeptId"
-                             :props="{ expandTrigger: 'hover', label:'name', value: 'id'}" @change="applyDeptSelected"></el-cascader>
+                             :props="{ expandTrigger: 'hover', label:'name', value: 'id'}" @change="applyDeptSelected">
+
+                  <template slot-scope="{ node, data }">
+                    <span>{{ data.name }}</span>
+                    <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+                  </template>
+
+                </el-cascader>
               </el-form-item>
 
               <el-form-item label="申请人">
@@ -460,19 +465,20 @@
   <script src="${base}/element-ui/element-ui.js"></script>
 
   <script>
-
-    const newBusinessProcurementContractProcess = "newBusinessProcurementContractProcess"
     const procurementContractDetail = "procurementContractDetail"
+    const procurementContractProcess = "procurementContractProcess"
 
     const saleContractProcess = "saleContractProcess"
     const saleContractDetail = "saleContractDetail"
     const BUTTON = "btn"
 
+    const saleContract = "sale_contract"
+    const procurementContract = "procurement_contract"
+
     const procurementDetailProperties = [
       "spec",
       "amount",
       "purchaseList",
-      "amountAlready",
       "amountCurrent",
       "supplierName",
       "totalTaxInclude",
@@ -482,7 +488,14 @@
     ]
 
     const isEmpty = (obj) => {
-      return !obj || (obj.length && obj.length === 0)
+      if (!obj) {
+        return true
+      }
+
+      if (obj.hasOwnProperty('length')) {
+        return obj.length === 0
+      }
+      return false
     }
 
     const isNotEmpty = (obj) => {
@@ -502,6 +515,7 @@
         mode: "btn", // btn
         processForm: {
           sealTypes: [],
+          applyDeptId: []
         },
         processType: '',
         projectSelected: false,
@@ -544,6 +558,12 @@
         })
         console.log(emptyRows)
         if (isNotEmpty(emptyRows)) {
+          this.procurementDetails.filter(detail => {
+            const properties = procurementDetailProperties.filter(property => isBlank(detail[property]))
+            console.log(properties)
+            return isNotEmpty(properties)
+          })
+
           const row = emptyRows[0]
           this.$message.error("合同清单明细 费用项目为：'" + row.feeType + "' 采购类别为：'" + row.category + "' 的数据未填写")
           return false
@@ -671,7 +691,7 @@
                 this.changeMode(saleContractProcess)
               }
               else if (process.processType === 'procurement_contract') {
-                this.changeMode(newBusinessProcurementContractProcess)
+                this.changeMode(procurementContractProcess)
               }
 
             })
@@ -921,18 +941,12 @@
       el: '#app',
       data,
       computed: {
-        projectTitle() {
-          const { projectNo, projectName, applyPersonName, applyDate } = this.processForm
-          if (projectNo && projectName) {
-            return projectNo.trim() + "-" + projectName.trim() + "-" + applyPersonName + "-" + applyDate
-          }
-          return ""
-        },
         isButtonMode() {
           return this.mode === BUTTON
         },
         isProcurementContractMode() {
-          return this.mode === newBusinessProcurementContractProcess
+          return this.mode === procurementContractProcess
+
         },
         isProcurementContractDetailMode() {
           return this.mode === procurementContractDetail
@@ -953,7 +967,7 @@
               return "编辑销售合同清单明细"
             case procurementContractDetail:
               return "编辑业务采购合同清单明细"
-            case newBusinessProcurementContractProcess:
+            case procurementContractProcess:
               return "编辑业务采购合同流程"
           }
         }
@@ -964,7 +978,9 @@
       mounted() {
         const processId = ${processId}
         this.loadProject(processId)
-        this.applyDeptSectorOptions = JSON.parse('${applyDeptSectorOptions}')
+        this.applyDeptSectorOptions = JSON.parse('${applyDeptSectorOptions}').map(option => ({
+          ...option, label: option.name, value: option.id
+        }))
       },
     })