From 52ab6847f23d1a16252be012291e41ed11ca5e52 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 26 Apr 2022 18:00:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8F=A1=E6=89=8B=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/PersonnelSelection/index.vue   |  2 --
 .../virtualList/components/addModel.vue           | 10 ++++++++--
 .../projectManagement/components/listAddModel.vue | 15 ++++++++-------
 .../components/listOfRegulations.vue              |  4 +++-
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index e91185584..3228a68df 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -191,8 +191,6 @@
             } else {
               this.userIds = []
             }
-            console.log(this.userIds)
-            console.log(this.userName)
             this.treeVisible = true
           } else {
             this.gData = []
diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
index 79577bc8d..c5f89f38b 100644
--- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
@@ -123,7 +123,7 @@
           },
           {
             title: this.$t('technicalField'),
-            dataIndex: 'technologyTerritory_dictText',
+            dataIndex: 'technologyTerritory',
             align: 'center',
             ellipsis: true
           },
@@ -133,11 +133,17 @@
           //   align: 'center'
           // },
           {
-            title: this.$t('StandardImplementationDate'),
+            title: this.$t('ImplementationDate'),
             dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
             align: 'center',
             ellipsis: true
           },
+          {
+            title: this.$t('vehicleInProductionDate'),
+            dataIndex: 'implementTime',
+            align: 'center',
+            ellipsis: true
+          },
           {
             title: this.$t('correspondingStandard'),
             dataIndex: 'correspondingStandard',
diff --git a/jero-web/src/views/projectManagement/components/listAddModel.vue b/jero-web/src/views/projectManagement/components/listAddModel.vue
index 0d390f125..cbb004715 100644
--- a/jero-web/src/views/projectManagement/components/listAddModel.vue
+++ b/jero-web/src/views/projectManagement/components/listAddModel.vue
@@ -115,21 +115,22 @@
           },
           {
             title: this.$t('technicalField'),
-            dataIndex: 'technologyTerritory_dictText',
+            dataIndex: 'technologyTerritory',
             align: 'center',
             ellipsis: true
           },
-          // {
-          //   title: this.$t('functionalAreas'),
-          //   dataIndex: 'functionalAreas',
-          //   align: 'center'
-          // },
           {
-            title: this.$t('StandardImplementationDate'),
+            title: this.$t('ImplementationDate'),
             dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
             align: 'center',
             ellipsis: true
           },
+          {
+            title: this.$t('vehicleInProductionDate'),
+            dataIndex: 'implementTime',
+            align: 'center',
+            ellipsis: true
+          },
           {
             title: this.$t('correspondingStandard'),
             dataIndex: 'correspondingStandard',
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 747380d70..9199fde5d 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -831,7 +831,9 @@
         let query = {
           type: 1,
           msg: value,
-          taskAffirmDueDate: this.formInline.taskAffirmDueDate
+          projectNameId:this.$route.query.projectNameId,
+          projectName:this.$route.query.projectName,
+          taskAffirmDueDate: this.formInline.taskAffirmDueDate,
         }
         postAction('/workFlow/startProcess', query).then((res) => {
           if (res.success) {