From 95d6ebce17cdb14e65cc1a5cad0ae276ada2b68f Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 07 十二月 2023 15:06:49 +0800
Subject: [PATCH] 项目表

---
 web/src/views/modules/project/Project-AddOrUpdate.vue |  105 +++++++++++++++++++++-------------------------------
 1 files changed, 43 insertions(+), 62 deletions(-)

diff --git a/web/src/views/modules/project/Project-AddOrUpdate.vue b/web/src/views/modules/project/Project-AddOrUpdate.vue
index 7f32aeb..0376700 100644
--- a/web/src/views/modules/project/Project-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Project-AddOrUpdate.vue
@@ -66,7 +66,7 @@
                 <el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�"></el-input>
               </zt-form-item>
               <!-- 鑱旂郴浜� -->
-              <zt-form-item class="marginTopAndMarginBottom" label="杞欢鏍囪瘑" prop="identity" style="width: 49%" rules="required">
+              <zt-form-item class="marginTopAndMarginBottom" label="杞欢鏍囪瘑" prop="softwareIdentity" style="width: 49%" rules="required">
                 <el-input v-model="dataForm.softwareIdentity" placeholder="璇疯緭鍏ヨ蒋浠舵爣璇�"></el-input>
               </zt-form-item>
               <!-- 璇︾粏鍦板潃 -->
@@ -95,19 +95,29 @@
               椤圭洰璐d换浜�
             </div>
             <div class="DSTOld-1-Form">
-              <!-- 鍗曚綅鍚嶇О -->
+              <!-- 椤圭洰璐熻矗浜� -->
               <zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="椤圭洰璐熻矗浜�" prop="projectLeader" style="width: 48%" rules="required">
-                <el-input v-model="dataForm.projectLeader" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+                <zt-select v-model="dataForm.projectLeader" url="/sys/userEx/getUsersList" placeholder="椤圭洰璐熻矗浜�"/>
+<!--                <el-input v-model="dataForm.projectLeader" placeholder="璇疯緭鍏ラ」鐩礋璐d汉"></el-input>-->
+<!--                <el-select  v-model="dataForm.projectLeader"   placeholder="椤圭洰璐熻矗浜�" style="width: 100%">-->
+<!--                  <el-option v-for="data in dataList"></el-option>-->
+<!--                </el-select>-->
+<!--                <el-select v-model="dataForm.projectLeader" clearable placeholder="椤圭洰璐熻矗浜�">-->
+<!--                  <el-option v-for="item in dataList" :key="item.value" :label="item.label"-->
+<!--                             :value="item.value"/>-->
+<!--                </el-select>-->
               </zt-form-item>
-              <!-- 鑱旂郴浜� -->
+              <!-- 椤圭洰娴嬭瘯浜哄憳 -->
               <zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="椤圭洰娴嬭瘯浜哄憳" prop="projectTesters" style="width: 48%" rules="required">
-                <el-input v-model="dataForm.projectTesters" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
+<!--                <el-input v-model="dataForm.projectTesters" placeholder="璇疯緭鍏ラ」鐩祴璇曚汉鍛�"></el-input>-->
+                <zt-select v-model="dataForm.projectTesters" url="/sys/userEx/getUsersList" :multiple="true" :clearable="true" placeholder="椤圭洰娴嬭瘯浜哄憳"/>
               </zt-form-item>
-              <!-- 璇︾粏鍦板潃 -->
+              <!-- 椤圭洰瀹℃牳浜� -->
               <zt-form-item label-width="120px" label="椤圭洰瀹℃牳浜�" prop="projectReviewer" style="width: 48%" rules="required">
-                <el-input v-model="dataForm.projectReviewer" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+<!--                <el-input v-model="dataForm.projectReviewer" placeholder="璇疯緭鍏ラ」鐩鏍镐汉"></el-input>-->
+                <zt-select v-model="dataForm.projectReviewer" url="/sys/userEx/getUsersList" :multiple="true" :clearable="true" placeholder="椤圭洰瀹℃牳浜�"/>
               </zt-form-item>
-              <!-- 鑱旂郴鏂瑰紡 -->
+              <!-- 鏄惁绛剧讲鍚堝悓 -->
               <zt-form-item label-width="120px" label="鏄惁绛剧讲鍚堝悓" prop="isContract" style="width: 48%" rules="required">
                 <zt-dict v-model="dataForm.isContract" dict="is_or_not"></zt-dict>
               </zt-form-item>
@@ -115,60 +125,6 @@
           </div>
         </div>
       </el-form>
-<!--    </div>-->
-<!--    <el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">-->
-<!--      <zt-form-item label="濮旀墭鍗曚綅鍚嶇О" prop="entrustUnitName" rules="required">-->
-<!--                        <el-input v-model="dataForm.entrustUnitName"></el-input>-->
-<!--                </zt-form-item>-->
-<!--      <zt-form-item label="濮旀墭鍗曚綅鍦板潃" prop="entrustUnitAddress" rules="required">-->
-<!--                        <el-input v-model="dataForm.entrustUnitAddress"></el-input>-->
-<!--                </zt-form-item>-->
-<!--      <zt-form-item label="濮旀墭鍗曚綅鑱旂郴浜�" prop="entrustUnitContact" rules="required">-->
-<!--                        <el-input v-model="dataForm.entrustUnitContact"></el-input>-->
-<!--                </zt-form-item>-->
-<!--      <zt-form-item label="濮旀墭鍗曚綅鑱旂郴鏂瑰紡" prop="entrustUnitContWay" rules="required">-->
-<!--                        <el-input v-model="dataForm.entrustUnitContWay"></el-input>-->
-<!--                </zt-form-item>-->
-<!--      <zt-form-item label="寮�鍙戝崟浣嶅悕绉�" prop="developUnitName" rules="required">-->
-<!--                        <el-input v-model="dataForm.developUnitName"></el-input>-->
-<!--                </zt-form-item>-->
-<!--      <zt-form-item label="寮�鍙戝崟浣嶅湴鍧�" prop="developUnitAddress" rules="required">-->
-<!--                        <el-input v-model="dataForm.developUnitAddress"></el-input>-->
-<!--                </zt-form-item>-->
-<!--      <zt-form-item label="寮�鍙戝崟浣嶈仈绯讳汉" prop="developUnitContact" rules="required">-->
-<!--                        <el-input v-model="dataForm.developUnitContact"></el-input>-->
-<!--                </zt-form-item>-->
-<!--      <zt-form-item label="寮�鍙戝崟浣嶈仈绯绘柟寮�" prop="developUnitContWay" rules="required">-->
-<!--                        <el-input v-model="dataForm.developUnitContWay"></el-input>-->
-<!--                </zt-form-item>-->
-<!--      <zt-form-item label="杞欢鍚嶇О" prop="software" rules="required">-->
-<!--                        <el-input v-model="dataForm.software"></el-input>-->
-<!--                </zt-form-item>-->
-<!--      <zt-form-item label="椤圭洰缂栧彿" prop="code" rules="required">-->
-<!--                        <el-input v-model="dataForm.code"></el-input>-->
-<!--                </zt-form-item>-->
-<!--      <zt-form-item label="椤圭洰鏍囪瘑" prop="identity" rules="required">-->
-<!--                        <el-input v-model="dataForm.identity"></el-input>-->
-<!--                </zt-form-item>-->
-<!--      <zt-form-item label="瀵嗙骇" prop="secretClass" rules="required">-->
-<!--                        <zt-dict v-model="dataForm.secretClass" dict="secret_class"></zt-dict>-->
-<!--                </zt-form-item>-->
-<!--      <zt-form-item label="鍏抽敭绛夌骇" prop="criticalLevel" rules="required">-->
-<!--                        <zt-dict v-model="dataForm.criticalLevel" dict="critical_level"></zt-dict>-->
-<!--                </zt-form-item>-->
-<!--      <zt-form-item label="椤圭洰璐熻矗浜�" prop="projectLeader" rules="required">-->
-<!--                        <el-input v-model="dataForm.projectLeader"></el-input>-->
-<!--                </zt-form-item>-->
-<!--      <zt-form-item label="椤圭洰娴嬭瘯浜哄憳" prop="projectTesters" rules="required">-->
-<!--                        <el-input v-model="dataForm.projectTesters"></el-input>-->
-<!--                </zt-form-item>-->
-<!--      <zt-form-item label="椤圭洰瀹℃牳浜哄憳" prop="projectReviewer" rules="required">-->
-<!--                        <el-input v-model="dataForm.projectReviewer"></el-input>-->
-<!--                </zt-form-item>-->
-<!--      <zt-form-item label="鏄惁绛剧讲鍚堝悓" prop="isContract" rules="required">-->
-<!--                        <zt-dict v-model="dataForm.isContract" dict="is_or_not"></zt-dict>-->
-<!--                </zt-form-item>-->
-<!--    </el-form>-->
   </zt-dialog>
 </template>
 
@@ -210,15 +166,40 @@
             ...res.data
           }
         }
+        if(this.dataForm && this.dataForm.projectTesters){
+            this.dataForm.projectTesters=this.dataForm.projectTesters.split(',')
+            console.log(this.dataForm.projectTesters)
+          }
+          if(this.dataForm && this.dataForm.projectReviewer){
+            this.dataForm.projectReviewer=this.dataForm.projectReviewer.split(',')
+            console.log(this.dataForm.projectReviewer)
+          }
         console.log(this.dataForm,'this.dataForm')
       },
       // 琛ㄥ崟鎻愪氦
       async formSubmit() {
+        if(this.dataForm && this.dataForm.projectTesters){
+          this.dataForm.projectTesters=this.dataForm.projectTesters.join(',')
+          console.log(this.dataForm.projectTesters)
+        }
+        if(this.dataForm && this.dataForm.projectReviewer){
+          this.dataForm.projectReviewer=this.dataForm.projectReviewer.join(',')
+          console.log(this.dataForm.projectReviewer)
+        }
         let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/project/Project//', this.dataForm)
         if (res.success) {
           await this.$tip.success()
           this.$refs.dialog.close()
           this.$emit('refreshDataList')
+        }else {
+          if(this.dataForm && this.dataForm.projectTesters){
+            this.dataForm.projectTesters=this.dataForm.projectTesters.split(',')
+            console.log(this.dataForm.projectTesters)
+          }
+          if(this.dataForm && this.dataForm.projectReviewer){
+            this.dataForm.projectReviewer=this.dataForm.projectReviewer.split(',')
+            console.log(this.dataForm.projectReviewer)
+          }
         }
       }
     }

--
Gitblit v1.9.1