From 81dc44bcab8dae0ecddbe09623b629df9277038a Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Wed, 4 Jan 2023 15:12:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A0=87=E9=A2=98=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=A0=87=E9=A2=98=20=E8=B4=A8=E4=BF=9D=E6=9C=9F?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E9=A2=84=E7=AE=97=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=20=E5=AF=B9=E8=AF=9D=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/business/process-completed.ftl      |  2 +-
 .../admin/business/process-detail.ftl         |  2 +-
 .../templates/admin/business/process-edit.ftl | 15 +++++++++++--
 .../templates/admin/business/process-new.ftl  | 21 +++++++++++++++----
 .../admin/business/process-review.ftl         |  8 ++++++-
 5 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/templates/admin/business/process-completed.ftl b/src/main/resources/templates/admin/business/process-completed.ftl
index b0045e7..424ea0d 100644
--- a/src/main/resources/templates/admin/business/process-completed.ftl
+++ b/src/main/resources/templates/admin/business/process-completed.ftl
@@ -88,7 +88,7 @@
             <el-table-column prop="projectNo" label="项目编号" fixed width="80"></el-table-column>
             <el-table-column prop="projectTitle" label="标题" width="350">
               <template slot-scope="scope">
-                <el-popover placement="top-start" title="项目标题" width="380" trigger="hover">
+                <el-popover placement="top-start" title="标题" width="380" trigger="hover">
                   <el-button slot="reference" type="text" @click="showDetail(scope.row, scope)">
                     {{scope.row.projectTitle|ellipsis(25)}}
                   </el-button>
diff --git a/src/main/resources/templates/admin/business/process-detail.ftl b/src/main/resources/templates/admin/business/process-detail.ftl
index 5ae1ee4..8d2a76e 100644
--- a/src/main/resources/templates/admin/business/process-detail.ftl
+++ b/src/main/resources/templates/admin/business/process-detail.ftl
@@ -54,7 +54,7 @@
 
         <el-descriptions title="${process.processType.description}详情" v-cloak>
           <el-descriptions-item label="项目编号">{{process.projectNo}}</el-descriptions-item>
-          <el-descriptions-item label="项目标题">{{process.projectTitle}}</el-descriptions-item>
+          <el-descriptions-item label="标题">{{process.projectTitle}}</el-descriptions-item>
           <el-descriptions-item label="申请时间">{{process.applyDate}}</el-descriptions-item>
           <el-descriptions-item label="项目类型">${projectType}</el-descriptions-item>
           <el-descriptions-item label="合作类型">${cooperationType}</el-descriptions-item>
diff --git a/src/main/resources/templates/admin/business/process-edit.ftl b/src/main/resources/templates/admin/business/process-edit.ftl
index 7711efa..e0e5837 100644
--- a/src/main/resources/templates/admin/business/process-edit.ftl
+++ b/src/main/resources/templates/admin/business/process-edit.ftl
@@ -76,7 +76,7 @@
                 <span>{{processForm.projectNo}}</span>
               </el-form-item>
 
-              <el-form-item label="项目标题">
+              <el-form-item label="标题">
                 <span>{{processForm.projectTitle}}</span>
               </el-form-item>
 
@@ -364,7 +364,7 @@
             <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"
-                          oninput="value=value.replace(/[^\d\u4E00-\u9FA5]/g, '')" show-word-limit>
+                          @change="updateExpirationDate(scope.row)" show-word-limit>
                 </el-input>
               </template>
             </el-table-column>
@@ -628,6 +628,17 @@
         }
         return true
       },
+
+      /**
+       * 处理 质保期
+       * @param row 数据行
+       */
+      updateExpirationDate(row) {
+        if (row.expirationDate) {
+          row.expirationDate = row.expirationDate.replace(/[^\d\u4E00-\u9FA5]/g, '')
+        }
+      },
+
       /**
        * 保存 业务采购合同清单明细,返回上一级的表单界面
        */
diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
index 0c87e2f..5bc908f 100644
--- a/src/main/resources/templates/admin/business/process-new.ftl
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -112,7 +112,7 @@
         <el-dialog title="预算采购明细表" :visible.sync="procurementDetailSelectorVisible" v-cloak width="90%"
                    :close-on-click-modal="false">
 
-          <el-table border :data="procurementDetails">
+          <el-table border :data="procurementDetails" height="400">
             <el-table-column type="index" :index="1" label="序号" fixed></el-table-column>
             <el-table-column prop="feeType" label="费用项目" fixed width="80"></el-table-column>
             <el-table-column prop="name" label="产品名称" fixed></el-table-column>
@@ -181,7 +181,7 @@
               </el-tooltip>
 
               <el-tooltip :disabled="!projectSelected" effect="light" :content="processForm.projectTitle" placement="top-start">
-                <el-form-item label="项目标题">
+                <el-form-item label="标题">
                   <span v-if="projectSelected">{{processForm.projectTitle}}</span>
                   <span v-else>未选择项目</span>
                 </el-form-item>
@@ -474,7 +474,7 @@
             <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"
-                          oninput="value=value.replace(/[^\d\u4E00-\u9FA5]/g, '')" show-word-limit>
+                          @change="updateExpirationDate(scope.row)" show-word-limit>
                 </el-input>
               </template>
             </el-table-column>
@@ -928,7 +928,9 @@
               this.projectSelected = true
               let indexCounter = 1;
               this.incomeDetails = incomeDetails && incomeDetails.map(detail => ({
-                ...detail, type: computeType(detail.type), index: indexCounter++ // 用于记录序号，展示或者定位
+                ...detail, type: computeType(detail.type),
+                expirationDate: null, // 质保期需要全部重新填写
+                index: indexCounter++ // 用于记录序号，展示或者定位
               }))
 
               let rowKey = 0
@@ -1173,6 +1175,17 @@
         }
         return true
       },
+
+      /**
+       * 处理 质保期
+       * @param row 数据行
+       */
+      updateExpirationDate(row) {
+        if (row.expirationDate) {
+          row.expirationDate = row.expirationDate.replace(/[^\d\u4E00-\u9FA5]/g, '')
+        }
+      },
+
       /**
        * 保存销售合同详情数据，并返回表单界面
        */
diff --git a/src/main/resources/templates/admin/business/process-review.ftl b/src/main/resources/templates/admin/business/process-review.ftl
index 7538280..fe77298 100644
--- a/src/main/resources/templates/admin/business/process-review.ftl
+++ b/src/main/resources/templates/admin/business/process-review.ftl
@@ -78,7 +78,7 @@
             <el-table-column prop="projectNo" label="项目编号" fixed width="80"></el-table-column>
             <el-table-column prop="projectTitle" label="标题" width="350">
               <template slot-scope="scope">
-                <el-popover placement="top-start" title="项目标题" width="380" trigger="hover">
+                <el-popover placement="top-start" title="标题" width="380" trigger="hover">
                   <el-button slot="reference" type="text" @click="showDetail(scope.row, scope)">
                     {{scope.row.projectTitle|ellipsis(25)}}
                   </el-button>
@@ -363,6 +363,12 @@
       mounted() {
         this.queryTable()
       },
+      watch: {
+        // 每当 question 改变时，这个函数就会执行
+        queryForm(newQueryForm, oldQueryForm) {
+          this.resetPageParams()
+        }
+      },
       filters: {
         ellipsis(value, limit = 5) {
           if (!value) return ''