From c87f916175565107814cade742963fcf2242014c Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 10 May 2022 09:28:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E8=B0=83=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../components/transferList.vue               | 20 ++++++++++++++++---
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index e6ac0470d..d55486d53 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -788,4 +788,5 @@ module.exports = {
   blue: 'blue',
   yellow: 'yellow',
   resultReported:'Result Reported',
+  TheDoesNotContainData:'The maintenance list of the virtual list does not contain data',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 2a33529fb..5fd6264ec 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -793,4 +793,5 @@ module.exports = {
   blue:'蓝',
   yellow:'黄',
   resultReported:'结果报告',
+  TheDoesNotContainData:'该虚拟清单的维护清单中没有数据,是否需要添加',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/transferList.vue b/jero-web/src/views/projectManagement/components/transferList.vue
index 102b1d168..474d64e53 100644
--- a/jero-web/src/views/projectManagement/components/transferList.vue
+++ b/jero-web/src/views/projectManagement/components/transferList.vue
@@ -159,13 +159,14 @@
       handleCancel() {
         this.visible = false
       },
-      handleSubmit() {
+      handleSubmit(flag) {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           this.confirmLoading = true
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
           postAction(this.url.addModel, {
             dummyInventoryBaseId: selectedRowKeys.join(','),
-            projectLibraryId: this.$route.query.id
+            projectLibraryId: this.$route.query.id,
+            flag: flag
           }).then((res) => {
             if (res.success) {
               this.confirmLoading = false
@@ -174,14 +175,27 @@
               this.selectedRowKeys = []
               this.$emit('transferListForm')
             } else {
+              if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
+                this.confirmLoading = false
+                this.getAdd()
+                return
+              }
               this.$message.warning(this.$t('operationFailed'))
               this.confirmLoading = false
             }
           })
-          this.visible = false
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }
+      },
+      getAdd() {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('TheDoesNotContainData'),
+          onOk() {
+            _this.handleSubmit(1)
+          }
+        })
       }
     }
   }

From dcb3b029f9d3f22a55e21b1e605b86e8fd64ad5f Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 10 May 2022 09:36:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E8=B0=83=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/projectManagement/components/transferList.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/components/transferList.vue b/jero-web/src/views/projectManagement/components/transferList.vue
index 474d64e53..acc7ddbf9 100644
--- a/jero-web/src/views/projectManagement/components/transferList.vue
+++ b/jero-web/src/views/projectManagement/components/transferList.vue
@@ -193,7 +193,7 @@
         this.$confirm({
           content: _this.$t('TheDoesNotContainData'),
           onOk() {
-            _this.handleSubmit(1)
+            _this.handleSubmit('1')
           }
         })
       }

From ad2dcca6fb1dcb95c565fa4d48e8c450b84498bd Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 10 May 2022 09:43:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E8=B0=83=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/PersonnelSelection/index.vue           | 3 ++-
 .../src/views/projectManagement/components/transferList.vue    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index 17a94d9ce..b01b48980 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -161,7 +161,8 @@
         this.confirmLoading = true
         postAction('sys/user/queryDepartUserTreeList', {
           departId: this.departId,
-          json: gData
+          json: gData,
+          flag:'1',
         }).then((res) => {
           this.confirmLoading = false
           if (res.success) {
diff --git a/jero-web/src/views/projectManagement/components/transferList.vue b/jero-web/src/views/projectManagement/components/transferList.vue
index acc7ddbf9..1eb5812c7 100644
--- a/jero-web/src/views/projectManagement/components/transferList.vue
+++ b/jero-web/src/views/projectManagement/components/transferList.vue
@@ -53,7 +53,7 @@
 
     <div class="drawer-bootom-button">
       <a-button @click="handleCancel" type="danger" style="margin-right: 16px">{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
     </div>
   </a-drawer>
 </template>