jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java

@@ -183,7 +183,6 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 		 //用于查看本县区下面的专家信息无论是否审核，无论哪个部门
 		 QueryWrapper<Expert> queryWrapper = QueryGenerator.initQueryWrapper(expert, req.getParameterMap());
 		 queryWrapper.eq("isdone","Y");
-		 queryWrapper.eq("compopen","2");
 		 queryWrapper.in("seusername",usernames);
 		 Page<Expert> page = new Page<Expert>(pageNo, pageSize);
 		 IPage<Expert> pageList = expertService.page(page, queryWrapper);
@@ -457,41 +456,6 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 		return Result.OK("编辑成功!");
 	}
 
-
-	 /**
-	  *  编辑
-	  *
-	  * @param expert
-	  * @return
-	  */
-	 @AutoLog(value = "专家管理（市局管理员）-编辑")
-	 @ApiOperation(value="专家管理（市局管理员）-编辑", notes="专家管理（市局管理员）-编辑")
-	 @RequestMapping(value = "/editstatic", method = {RequestMethod.PUT,RequestMethod.POST})
-	 public Result<String> editstatic(@RequestBody Expert expert) {
-		 if (expert.getExpsture().equals("N")) {
-			 expert.setErrinfo("");
-		 }
-		 expertService.updateById(expert);
-		 //开始添加到用户表
-		 SysUser user = new SysUser();
-		 user.setAvatar(expert.getTopPic());
-		 user.setSex(expert.getSex());
-		 user.setRealname(expert.getRealname());
-		 user.setUsername(expert.getSeusername());
-		 user.setWorkNo(expert.getWorkon());
-		 user.setEmail(expert.getEmails());
-		 user.setPhone(expert.getPhone());
-		 user.setCreateTime(new Date());//设置创建时间
-		 String salt = oConvertUtils.randomGen(8);
-		 user.setSalt(salt);
-		 String passwordEncode = PasswordUtil.encrypt(expert.getSeusername(), expert.getPsd(), salt);
-		 user.setPassword(passwordEncode);
-		 user.setStatus(1);
-		 user.setDelFlag(CommonConstant.DEL_FLAG_0);
-		 sysUserService.editUser(user,"1843478958968647681", expert.getSsdep(), "", "");
-		 return Result.OK("编辑成功!");
-	 }
-
 	 /**
 	  *  编辑
 	  *

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() != null && !expprojectPage.getExpandproList().isEmpty()) {
+		if (!expprojectPage.getExpandproList().isEmpty()) {
 			if (expproject.getNeedexp() >= expprojectPage.getExpandproList().size()) {
 				expprojectService.saveMain(expproject, expprojectPage.getExpandproList());
 				return Result.OK("添加成功！");

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"  v-if="isEit">
+            <a-col  :span="24"  >
               <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" v-if="isEit">
+            <a-col :span="24"  >
               <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,8 +126,6 @@
 </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';
@@ -204,19 +202,14 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload
   /**
    * 新增
    */
-  const isEit = ref(false)
   function add() {
-    isEit.value = true
+    edit({});
-    console.log(11111)
-    // edit({});
   }
 
   /**
    * 编辑
    */
   function edit(record) {
-    isEit.value = false
-    console.log(22222)
     nextTick(() => {
       resetFields();
       const tmpData = {};

jeecgboot-vue3/src/views/expert/adminback/Expert.api.ts

@@ -6,7 +6,7 @@ const { createConfirm } = useMessage();
 enum Api {
   list = '/expert/expert/listadminstatic',
   save='/expert/expert/add',
-  edit='/expert/expert/editstatic',
+  edit='/expert/expert/edit',
   deleteOne = '/expert/expert/delete',
   deleteBatch = '/expert/expert/deleteBatch',
   importExcel = '/expert/expert/importExcel',

jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts

@@ -76,12 +76,6 @@ export const columns: BasicColumn[] = [
       return  render.renderSwitch(text, [{text:'正常',value:'N'},{text:'异常',value:'Y'}]);
     },
   },
-
-  {
-    title: '异常原因',
-    align: "center",
-    dataIndex: 'errinfo_dictText'
-  },
 ];
 
 // 高级查询数据

jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue

@@ -4,17 +4,17 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ExpertForm">
           <a-row>
-						<a-col :span="24" >
+						<a-col :span="24" v-if="!formData.seusername">
 							<a-form-item label="用户名" v-bind="validateInfos.seusername" id="ExpertForm-seusername" name="seusername">
 								<a-input v-model:value="formData.seusername" placeholder="请输入用户名" ></a-input>
 							</a-form-item>
 						</a-col>
-            <a-col :span="24" v-if="isEit">
+            <a-col :span="24" v-if="!formData.psd">
               <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"  v-if="isEit">
+            <a-col :span="24"  v-if="!formData.psd">
               <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>
@@ -26,7 +26,7 @@
               </a-form-item>
             </a-col>
 
-            <a-col :span="24"  >
+            <a-col :span="24"  v-if="!formData.workon">
               <a-form-item label="工号" v-bind="validateInfos.workon"  name="workon">
                 <a-input v-model:value="formData.workon" placeholder="请输入工号" ></a-input>
               </a-form-item>
@@ -94,22 +94,22 @@
                 <a-textarea v-model:value="formData.expinfo" :rows="4" placeholder="请输入专家简介" />
               </a-form-item>
             </a-col>
-<!--            <a-col :span="24">
+            <a-col :span="24">
               <a-form-item label="专家状态" v-bind="validateInfos.expsture" id="ExpertForm-expsture" name="expsture">
                 <j-switch v-model:value="formData.expsture"  ></j-switch>
               </a-form-item>
-            </a-col>-->
+            </a-col>
 <!--            <a-col :span="24"  v-if="formData.expsture === 'Y'">
               <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-errinfo" name="errinfo">
                 <a-input v-model:value="formData.errinfo" placeholder="请输入异常备注"  allow-clear ></a-input>
               </a-form-item>
             </a-col>-->
 
-<!--            <a-col :span="24"  v-if="formData.expsture === 'Y'">
+            <a-col :span="24"  v-if="formData.expsture === 'Y'">
               <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-errinfo" name="errinfo">
                 <j-dict-select-tag v-model:value="formData.errinfo" dictCode="yczt" placeholder="请选择异常备注"  allow-clear />
               </a-form-item>
-            </a-col>-->
+            </a-col>
 
             <a-col :span="24"  v-if="formData.adminopen === '3' || formData.compopen === '3'">
               <a-form-item label="驳回原因" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo">
@@ -201,17 +201,14 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload
   /**
    * 新增
    */
-  const isEit = ref(false)
   function add() {
-    isEit.value = true
+    edit({});
-   // edit({});
   }
 
   /**
    * 编辑
    */
   function edit(record) {
-    isEit.value = false
     nextTick(() => {
       resetFields();
       const tmpData = {};

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" v-if="isEit">
+            <a-col :span="24">
               <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" v-if="isEit">
+            <a-col :span="24">
               <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>
@@ -97,8 +97,8 @@
 
 
             <a-col :span="24"  v-if="formData.adminopen === '3' || formData.compopen === '3'">
-              <a-form-item label="驳回原因" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo">
+              <a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo">
-                <a-input v-model:value="formData.backinfo" placeholder="请输入驳回原因"  allow-clear ></a-input>
+                <a-input v-model:value="formData.backinfo" placeholder="请输入异常备注"  allow-clear ></a-input>
               </a-form-item>
             </a-col>
 
@@ -185,17 +185,14 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload
   /**
    * 新增
    */
-  const isEit = ref(false)
   function add() {
-    isEit.value = true
+    edit({});
-    //edit({});
   }
 
   /**
    * 编辑
    */
   function edit(record) {
-    isEit.value = false
     nextTick(() => {
       resetFields();
       const tmpData = {};

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',