From ff77eaa3428460cb17628ec83acd8f85d893db68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Sun, 10 Nov 2024 11:19:52 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expproject/controller/ExpprojectController.java |  2 +-
 .../views/expert/admin/components/ExpertForm.vue    | 13 ++++++++++---
 .../views/expert/county/components/ExpertForm.vue   |  9 ++++++---
 .../src/views/expert/firm/components/ExpertForm.vue |  9 ++++++---
 .../src/views/expproject/admin/Expproject.data.ts   |  4 ++--
 5 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java
index b07adf5..ac98550 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java
@@ -143,7 +143,7 @@ public class ExpprojectController {
 	public Result<String> add(@RequestBody ExpprojectPage expprojectPage) {
 		Expproject expproject = new Expproject();
 		BeanUtils.copyProperties(expprojectPage, expproject);
-		if (!expprojectPage.getExpandproList().isEmpty()) {
+		if ( expprojectPage.getExpandproList() != null && !expprojectPage.getExpandproList().isEmpty()) {
 			if (expproject.getNeedexp() >= expprojectPage.getExpandproList().size()) {
 				expprojectService.saveMain(expproject, expprojectPage.getExpandproList());
 				return Result.OK("添加成功！");
diff --git a/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue
index b867049..b04e097 100644
--- a/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue
@@ -9,12 +9,12 @@
 								<a-input v-model:value="formData.seusername" placeholder="请输入用户名" ></a-input>
 							</a-form-item>
 						</a-col>
-            <a-col  :span="24"  >
+            <a-col  :span="24"  v-if="isEit">
               <a-form-item label="密码" v-bind="validateInfos.psd" name="psd">
                 <a-input-password v-model:value="formData.psd" placeholder="请输入密码"  ></a-input-password>
               </a-form-item>
             </a-col>
-            <a-col :span="24"  >
+            <a-col :span="24" v-if="isEit">
               <a-form-item label="确人密码" v-bind="validateInfos.sepsd"  name="sepsd">
                 <a-input-password v-model:value="formData.sepsd" placeholder="确认密码"  ></a-input-password>
               </a-form-item>
@@ -126,6 +126,8 @@
 </template>
 
 <script lang="ts" setup>
+import { usePermission } from '/@/hooks/web/usePermission';
+const { hasPermission } = usePermission();
 import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue';
 import JSelectDept from '/src/components/Form/src/jeecg/components/JSelectDept.vue';
 import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload.vue';
@@ -202,14 +204,19 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload
   /**
    * 新增
    */
+  const isEit = ref(false)
   function add() {
-    edit({});
+    isEit.value = true
+    console.log(11111)
+    // edit({});
   }
 
   /**
    * 编辑
    */
   function edit(record) {
+    isEit.value = false
+    console.log(22222)
     nextTick(() => {
       resetFields();
       const tmpData = {};
diff --git a/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue
index 9d95419..5a5206a 100644
--- a/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue
@@ -9,12 +9,12 @@
 								<a-input v-model:value="formData.seusername" placeholder="请输入用户名" ></a-input>
 							</a-form-item>
 						</a-col>
-            <a-col :span="24" >
+            <a-col :span="24" v-if="isEit">
               <a-form-item label="密码" v-bind="validateInfos.psd" name="psd">
                 <a-input-password v-model:value="formData.psd" placeholder="请输入密码"  ></a-input-password>
               </a-form-item>
             </a-col>
-            <a-col :span="24"  >
+            <a-col :span="24"  v-if="isEit">
               <a-form-item label="确人密码" v-bind="validateInfos.sepsd"  name="sepsd">
                 <a-input-password v-model:value="formData.sepsd" placeholder="确认密码"  ></a-input-password>
               </a-form-item>
@@ -201,14 +201,17 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload
   /**
    * 新增
    */
+  const isEit = ref(false)
   function add() {
-    edit({});
+    isEit.value = true
+   // edit({});
   }
 
   /**
    * 编辑
    */
   function edit(record) {
+    isEit.value = false
     nextTick(() => {
       resetFields();
       const tmpData = {};
diff --git a/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue
index 62635de..7abd887 100644
--- a/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue
+++ b/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue
@@ -9,12 +9,12 @@
 								<a-input v-model:value="formData.seusername" placeholder="请输入用户名" ></a-input>
 							</a-form-item>
 						</a-col>
-            <a-col :span="24">
+            <a-col :span="24" v-if="isEit">
               <a-form-item label="密码" v-bind="validateInfos.psd" name="psd">
                 <a-input-password v-model:value="formData.psd" placeholder="请输入密码"  ></a-input-password>
               </a-form-item>
             </a-col>
-            <a-col :span="24">
+            <a-col :span="24" v-if="isEit">
               <a-form-item label="确人密码" v-bind="validateInfos.sepsd"  name="sepsd">
                 <a-input-password v-model:value="formData.sepsd" placeholder="确认用户名"  ></a-input-password>
               </a-form-item>
@@ -185,14 +185,17 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload
   /**
    * 新增
    */
+  const isEit = ref(false)
   function add() {
-    edit({});
+    isEit.value = true
+    //edit({});
   }
 
   /**
    * 编辑
    */
   function edit(record) {
+    isEit.value = false
     nextTick(() => {
       resetFields();
       const tmpData = {};
diff --git a/jeecgboot-vue3/src/views/expproject/admin/Expproject.data.ts b/jeecgboot-vue3/src/views/expproject/admin/Expproject.data.ts
index 67ecf8a..5711f58 100644
--- a/jeecgboot-vue3/src/views/expproject/admin/Expproject.data.ts
+++ b/jeecgboot-vue3/src/views/expproject/admin/Expproject.data.ts
@@ -53,7 +53,7 @@ export const expandproColumns: JVxeColumn[] = [
       placeholder: '请输入${title}',
       defaultValue:'',
     },
-    {
+/*    {
       title: '所属领域',
       key: 'exptype',
       type: JVxeTypes.input,
@@ -61,7 +61,7 @@ export const expandproColumns: JVxeColumn[] = [
       width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',
-    },
+    },*/
     /*{
       title: '所属单位',
       key: 'ssdep',