修改bug

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java

@@ -99,7 +99,7 @@ public class ZjSqxxController extends JeecgController<ZjSqxx, IZjSqxxService> {
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody ZjSqxx zjSqxx) {
 		zjSqxxService.updateById(zjSqxx);
-		return Result.OK("编辑成功!");
+		return Result.OK("操作成功!");
 	}
 	
 	/**

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/service/impl/ZjSqxxServiceImpl.java

@@ -42,6 +42,7 @@ public class ZjSqxxServiceImpl extends ServiceImpl<ZjSqxxMapper, ZjSqxx> impleme
                 sq.setUserId(userId);
                 sq.setZjName(user.getRealname());
                 sq.setZjNo(user.getUsername());
+                sq.setSqzt("0");
                 baseMapper.insert(sq);
             }
         }

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -315,8 +315,8 @@ justauth:
 sftp:
   hostname: 210.47.29.99
   port: 22
-  username: sftp
+  username: Nenujwc@99
-  password: Nenujwc@99
+  password: LKdg&^kKf5rw
   timeout: 1000
   uploadpath: kczx
   fullpath: /data

jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList.vue

@@ -108,6 +108,7 @@
       columns,
       canResize:false,
       useSearchForm: false,
+      showActionColumn: false,
       actionColumn: {
         width: 120,
         fixed: 'right',

jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/XxhbjwxtscwjxxList.vue

@@ -65,6 +65,7 @@
       columns,
       canResize:false,
       useSearchForm: false,
+      showActionColumn: false,
       actionColumn: {
         width: 120,
         fixed: 'right',

jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue

@@ -91,6 +91,7 @@
       columns,
       canResize:false,
       useSearchForm: false,
+      showActionColumn: false,
       actionColumn: {
         width: 120,
         fixed: 'right',

jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue

@@ -73,6 +73,7 @@
   import ZjSqxxEditModal from './components/ZjSqxxEditModal.vue'
   import { useUserStore } from '/@/store/modules/user';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { defHttp } from '/@/utils/http/axios';
 
   const formRef = ref();
   const queryParam = reactive<any>({});
@@ -89,7 +90,7 @@
       canResize:false,
       useSearchForm: false,
       actionColumn: {
-        width: 120,
+        width: 220,
         fixed: 'right',
       },
       beforeFetch: async (params) => {
@@ -176,16 +177,57 @@
     (selectedRowKeys.value = []) && reload();
   }
    
+  function handleFabu(record){
+    defHttp.post({url:"/zjSqxx/zjSqxx/edit",params:{id:record.id,sqzt:"0"}}).then(res=>{
+      reload();
+    })
+  }
+
+  function handleChehui(record){
+    defHttp.post({url:"/zjSqxx/zjSqxx/edit",params:{id:record.id,sqzt:"2"}}).then(res=>{
+      reload();
+    })
+  }
   /**
    * 操作栏
    */
   function getTableAction(record) {
-    return [
+    if(record.sqzt=='0'){
-      {
+      return [
-        label: '编辑',
+        {
-        onClick: handleEdit.bind(null, record),
+          label: '编辑',
-      },
+          onClick: handleEdit.bind(null, record),
-    ];
+        },
+        {
+          label: '撤回',
+          onClick: handleChehui.bind(null, record),
+        },
+      ];
+    }else if(record.sqzt=='1'){
+      return [
+        {
+          label: '编辑',
+          onClick: handleEdit.bind(null, record),
+        },
+        {
+          label: '撤回',
+          onClick: handleChehui.bind(null, record),
+        },
+      ];
+
+    }else if(record.sqzt=='2'){
+      return [
+        {
+          label: '编辑',
+          onClick: handleEdit.bind(null, record),
+        },
+        {
+          label: '发布',
+          onClick: handleFabu.bind(null, record),
+        },
+      ];
+
+    }
   }
    
   /**

jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue

@@ -16,7 +16,8 @@
           <a-row v-for="(item, index) in sqDataList" :key="index"  class="mdule-box">
             <a-col :span="24">
               <a-form-item label="授权范围" id="ZjSqxxForm-sqfw" name="sqfw">
-                <j-dict-select-tag v-model:value="item.sqfw" dictCode="zj_sqfw" placeholder="请选择授权范围" allow-clear />
+                <j-dict-select-tag v-model:value="item.sqfw" dictCode="zj_sqfw" placeholder="请选择授权范围" allow-clear style="width:80%" />
+                  <a-button type="primary" @click="handleSqDel(index)">删除</a-button>
               </a-form-item>
             </a-col>
             <!-- 过程考核 -->
@@ -54,11 +55,11 @@
                     <JSelectMultiple v-model:value="item.kkdw" placeholder="请选择开课单位" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
-                <a-col :span="24">
+                <!-- <a-col :span="24">
                   <a-form-item label="校内专业（大类）" v-bind="validateInfos.zydl" id="ZjSqxxForm-zydl" name="zydl">
                     <a-input v-model:value="item.zydl" placeholder="请输入校内专业（大类）" allow-clear></a-input>
                   </a-form-item>
-                </a-col>
+                </a-col> -->
                 <a-col :span="24">
                   <a-form-item label="课程类别" id="ZjSqxxForm-kclb" name="kclb">
                     <JSelectMultiple v-model:value="item.kclb" placeholder="请选择开课单位" dictCode="kcxz"></JSelectMultiple>
@@ -154,11 +155,11 @@
                     <JSelectMultiple v-model:value="item.kkdw" placeholder="请选择开课单位" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
-                <a-col :span="24">
+                <!-- <a-col :span="24">
                   <a-form-item label="所属校内专业（大类）名称" v-bind="validateInfos.zydl" id="ZjSqxxForm-zydl" name="zydl">
                     <a-input v-model:value="item.zydl" placeholder="请输入所属校内专业（大类）名称" allow-clear></a-input>
                   </a-form-item>
-                </a-col>
+                </a-col> -->
                 <a-col :span="24">
                   <a-form-item label="毕业论文（设计）类别" id="ZjSqxxForm-kcmc" name="kcmc">
                     <JSelectMultiple v-model:value="item.kclb" placeholder="请选择开课单位" dictCode="kcxz"></JSelectMultiple>
@@ -201,11 +202,11 @@
                     <JSelectMultiple v-model:value="item.kkdw" placeholder="请选择开课单位" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
                   </a-form-item>
                 </a-col>
-                <a-col :span="24">
+                <!-- <a-col :span="24">
                   <a-form-item label="校内专业（大类）" v-bind="validateInfos.zydl" id="ZjSqxxForm-zydl" name="zydl">
                     <a-input v-model:value="item.zydl" placeholder="请输入校内专业（大类）" allow-clear></a-input>
                   </a-form-item>
-                </a-col>
+                </a-col> -->
                 <a-col :span="24">
                   <a-form-item label="课程类别" id="ZjSqxxForm-kclb" name="kclb">
                     <JSelectMultiple v-model:value="item.kclb" placeholder="请选择开课单位" dictCode="kcxz"></JSelectMultiple>
@@ -240,7 +241,7 @@ import { getValueType } from '/@/utils';
 import { saveNew } from '../ZjSqxx.api';
 import { Form } from 'ant-design-vue';
 import { useModal } from '/src/components/Modal';
-import UseSelectModal from '/@/views/system/role/components/UseSelectModal.vue';
+import UseSelectModal from '/@/views/system/role/components/UseSelectModalNew.vue';
 import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
 import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
 import KcKetangbiaoCheckModal from '/@/views/bl/kcKetangbiao/KcKetangbiaoCheckModal.vue';
@@ -293,6 +294,10 @@ const disabled = computed(() => {
   return props.formDisabled;
 });
 
+function handleSqDel(index){
+  sqDataList.value.splice(index, 1);
+}
+
 /**
  * 新增
  */

jeecgboot-vue3/src/views/bl/zyHuizong/ZyHuizongList.vue

@@ -94,6 +94,7 @@ const emit = defineEmits(['callback']);
       columns,
       canResize:false,
       useSearchForm: false,
+      showActionColumn: false,
       actionColumn: {
         width: 120,
         fixed: 'right',

jeecgboot-vue3/src/views/bl/zyHuizongXiangxi/ZyHuizongXiangxiList.vue

@@ -70,6 +70,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     columns,
     canResize: false,
     useSearchForm: false,
+    showActionColumn: false,
     actionColumn: {
       width: 120,
       fixed: 'right',

jeecgboot-vue3/src/views/bl/zyInfoScjl/ZyInfoScjlList.vue

@@ -111,6 +111,7 @@
       columns,
       canResize:false,
       useSearchForm: false,
+      showActionColumn: false,
       actionColumn: {
         width: 120,
         fixed: 'right',

jeecgboot-vue3/src/views/system/notice/index.vue

@@ -24,7 +24,7 @@
             <a-row class="item-header-border">
               <a-col :span="16">
                 <span class="item-title" style="font-weight: bold;">{{notice.titile}}</span>
-                <span :class="notice.sendStatus=='0'?'state-cg':notice.sendStatus=='1'?'state-fb':'state-cx'">{{notice.sendStatus}}-{{showDictValue(notice.sendStatus, statusData)}}</span>
+                <span :class="notice.sendStatus=='0'?'state-cg':notice.sendStatus=='1'?'state-fb':'state-cx'">{{showDictValue(notice.sendStatus, statusData)}}</span>
               </a-col>
               <a-col :span="8" class="item-text-right">
                 <a-button v-if="notice.sendStatus!=1" class="item-button-border" type="link" @click="handleEdit(notice)">编辑</a-button>

jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue

@@ -8,14 +8,14 @@
   import { BasicModal, useModalInner } from '/src/components/Modal';
   import { BasicTable, useTable, TableAction } from '/src/components/Table';
   import { userColumns, searchUserFormSchema } from '../role.data';
-  import { list } from '../../user/user.api';
+  import { expertList } from '../../user/user.api';
   // 声明Emits
   const emit = defineEmits(['select', 'register']);
   const checkedKeys = ref<Array<string | number>>([]);
   const [registerModal, { setModalProps, closeModal }] = useModalInner();
   //注册table数据
   const [registerTable, { reload }] = useTable({
-    api: list,
+    api: expertList,
     rowKey: 'id',
     columns: userColumns,
     formConfig: {

jeecgboot-vue3/src/views/system/user/user.api.ts

@@ -30,6 +30,7 @@ enum Api {
   putCancelQuit = '/sys/user/putCancelQuit',
   updateUserTenantStatus='/sys/tenant/updateUserTenantStatus',
   getUserTenantPageList='/sys/tenant/getUserTenantPageList',
+  expertList = '/sys/user/expertList',
 }
 /**
  * 导出api
@@ -45,6 +46,7 @@ export const getImportUrl = Api.importExcel;
  * @param params
  */
 export const list = (params) => defHttp.get({ url: Api.list, params });
+export const expertList = (params) => defHttp.get({ url: Api.expertList, params });
 
 /**
  * 列表接口(查询全部用户，不通过租户隔离)