From 71e2d06dfa28d3bd60b0d9fa6d6c7ff32884a1a9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 14:04:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

---
 company/src/components/enterprise/confirmJobType.vue |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/company/src/components/enterprise/confirmJobType.vue b/company/src/components/enterprise/confirmJobType.vue
index f0f79ce..638a430 100644
--- a/company/src/components/enterprise/confirmJobType.vue
+++ b/company/src/components/enterprise/confirmJobType.vue
@@ -60,12 +60,13 @@
                 this.form.solutionId = arr.solutionId
                 this.data = arr.seleData
                 this.visible = true
+                this.options=[]
                 this.getFindListByDTO()
             },
             getFindListByDTO () {
                 findListByDTO({
                     solutionId: this.form.solutionId,
-                    dataType: 0
+                    // dataType: 0
                 }).then(res => {
                     this.dispatching = res
                 })
@@ -84,6 +85,10 @@
                     })
             },
             confirm() {
+              if(!this.dw || !this.gz){
+                this.$message.error("璇峰厛閫夋嫨娲鹃仯鍗曚綅鍜屽伐绉嶏紒")
+                return;
+              }
                 let obj = {
                     workTypeName: '',
                     worktypeId: '',

--
Gitblit v1.9.3