From 8dc605ff33a6583e679a09366b1eee85339146b5 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Wed, 28 Dec 2022 17:49:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E5=AE=9A=E4=B9=89=E6=98=BE=E7=A4=BA=E7=9A=84=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/business/process-new.ftl     | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
index 5edf70b..02ef695 100644
--- a/src/main/resources/templates/admin/business/process-new.ftl
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -86,9 +86,13 @@
         <el-dialog title="请选择项目编号" :visible.sync="procurementProjectSelectorVisible" v-cloak width="40%">
 
           <el-autocomplete v-model="processForm.projectNo" :fetch-suggestions="queryProject" clearable
-                           value-key="name" placeholder="请输入项目编号或名称，支持模糊查询" @select="handleSelectProject"
+                           value-key="projectNo" placeholder="请输入项目编号或名称，支持模糊查询" @select="handleSelectProject"
                            @clear="clearProjectProcess" style="width: 100%;">
             <template slot="prepend">项目编号</template>
+              <#--显示项目名称，但是值是 projectNo 定义显示的列表样式-->
+            <template slot-scope="{ item }">
+                <span>{{ item.name }}</span>
+            </template>
           </el-autocomplete>
 
           <div slot="footer">
@@ -579,7 +583,7 @@
 
       goToHome() {
         // 判断是否已填写了
-        if (Object.keys(this.processForm).length > 1) {
+        if (Object.keys(this.processForm).length > 2) { // 2代表 -> sealTypes,projectTitle
           this.$confirm('您确认要返回上一级吗 返回后填写的表单将重置', '返回上一级', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -720,10 +724,16 @@
             .finally(() => loading.close())
       },
       clearProjectProcess() {
-        this.projectSelected = false
         this.initForm({})
         this.incomeDetails = []
+        this.projectSelected = false
         this.procurementDetails = []
+
+        if (this.isProcurementContractMode) {
+          this.goToHome()
+          // 重新打开对话框选择项目
+          this.newProcurementContractClick()
+        }
       },
 
       async saveDraft() {