From ad25315c17bb5dac0b9546c2d3ae4228c6b599a8 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Mon, 18 Oct 2021 10:08:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=BC=96=E8=BE=91=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9Aid=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E8=AF=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arriveAndInvoicing/ArriveAndInvoivingList.vue          | 4 ++--
 src/views/packManagement/modules/PackCompanyModule.vue     | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 760ae88..3202450 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -8,8 +8,8 @@
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="类型项目" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-dict-select-tag v-model="queryParam.projectType" placeholder="请选择类型项目"
+              <a-form-item label="项目类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-dict-select-tag v-model="queryParam.projectType" placeholder="请选择项目类型"
                                    dictCode="project_type"/>
               </a-form-item>
             </a-col>
diff --git a/src/views/packManagement/modules/PackCompanyModule.vue b/src/views/packManagement/modules/PackCompanyModule.vue
index 9495164..8314de3 100644
--- a/src/views/packManagement/modules/PackCompanyModule.vue
+++ b/src/views/packManagement/modules/PackCompanyModule.vue
@@ -208,7 +208,12 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
-          values.companyId = values.company.id
+          // 判断选中企业是否改变
+          if (values.company.id === this.model.companyId) {
+            values.companyId = this.model.companyTemporaryId
+          } else {
+            values.companyId = values.company.id
+          }
           that.confirmLoading = true
           let httpurl = ''
           if (!this.model.id) {