Browse Source

推荐库-状态备注调整

liao-sea 9 months ago
parent
commit
f63b66a9d6

+ 5 - 1
doc/待更新脚本.txt

@@ -23,4 +23,8 @@ insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde
 alter table sys_menu add IsBlank tinyint(1);
 update sys_menu set IsBlank=1 where MenuNo='T011001';
 update sys_menu set IsBlank=1 where MenuNo='T011002';
-update sys_menu set IsBlank=1 where MenuNo='T011003';
+update sys_menu set IsBlank=1 where MenuNo='T011003';
+
+
+-- 2024.6.3
+alter table pc_recommend_mgt add remark varchar(500);

+ 13 - 0
h5app/src/api/recommendmgt/index.ts

@@ -37,6 +37,19 @@ export function setEntryState(data: any) {
     );
 }
 
+export function saveRemark(data: any) {
+    return request(
+        {
+            url: 'jobusermgr/recommendmgt/saveRemark',
+            method: 'post',
+            data: data,
+        },
+        {
+            isNew: true,
+        },
+    );
+}
+
 export function addRecommend(data: any) {
     return request(
         {

+ 34 - 13
h5app/src/views/pages/recommendMgt/detail.vue

@@ -39,20 +39,29 @@
           <ion-label>企业联系电话</ion-label>
           <ion-text>{{ dataModel.companyMobile }}</ion-text>
         </div>
-        <div class="form-detail">
-          <ion-label>入职状态</ion-label>
-          <ion-text>{{ dataModel.entryStateName }}</ion-text>
-        </div>
         <div class="form-detail">
           <ion-label>推送时间</ion-label>
           <ion-text>{{ dayjs(dataModel.createTime).format('YYYY-MM-DD') }}</ion-text>
         </div>
+        <div class="form-select">
+          <ion-label>入职状态</ion-label>
+          <ion-select name="entryState"  id="entryState" okText="确定" cancelText="取消" v-model="dataModel.entryState"
+                      interface="action-sheet" placeholder="请选择入职状态" style="width:100%;text-align:left;" >
+            <ion-select-option v-for=" (it,key) in entryStateList" :key="key" :value="it.value">
+              {{ it.name }}
+            </ion-select-option>
+          </ion-select>
+        </div>
+        <div class="form-input">
+          <ion-label>备注</ion-label>
+          <ion-textarea rows="4" placeholder="请输入备注"
+                        v-model="dataModel.remark" style="border-bottom: 1px solid #fff2e8;"></ion-textarea>
+        </div>
       </div>
     </ion-content>
     <ion-footer>
       <ion-button shape="round" expand="block"
-                  @click="onSetEntryState(dataModel.recommendMgtID, dataModel.entryState!=1?'1':'0')">
-        {{ dataModel.entryState != 1 ? '已入职' : '已离职' }}
+                  @click="onSetEntryState(dataModel)">提交
       </ion-button>
     </ion-footer>
   </ion-page>
@@ -63,8 +72,9 @@ import {defineComponent, ref} from 'vue';
 import dayjs from "dayjs";
 import {useRoute, useRouter} from "vue-router";
 import {arrowBackOutline} from 'ionicons/icons';
-import {getListById, setEntryState} from '@/api/recommendmgt/index'
+import {getListById, setEntryState,saveRemark} from '@/api/recommendmgt/index'
 import {onIonViewDidEnter} from '@ionic/vue'
+import {getSysDictionaryList} from "@/api/system/dictionary";
 
 interface RecommendModel {
   companyMobile: string,
@@ -87,9 +97,13 @@ interface RecommendModel {
   recommendType: any,
   recommendTypeName: string,
   userMobile: string,
-  zpProfessionName: string
+  zpProfessionName: string,
+  remark:string
+}
+interface SelectProps {
+  name: string,
+  value: string
 }
-
 export default defineComponent({
   name: "RecommendDetail",
   setup() {
@@ -115,21 +129,27 @@ export default defineComponent({
       recommendType: null,
       recommendTypeName: "",
       userMobile: "",
-      zpProfessionName: ""
+      zpProfessionName: "",
+      remark:""
     });
     const router = useRouter();
     const route = useRoute();
+    const entryStateList  = ref<SelectProps[]>([]);
     const loadData = async function (id: any) {
       loading.value = true;
+      const entryStateResult :any = await getSysDictionaryList("EntryState");
+      entryStateList.value = entryStateResult;
       getListById(id).then((data) => {
         dataModel.value = data;
       })
       loading.value = false;
     }
 
-    const onSetEntryState = async (recommendMgtID: any, entryState: any) => {
-      setEntryState({recommendMgtID: recommendMgtID, entryState: entryState}).then(() => {
-        loadData(route.query.id);
+    const onSetEntryState = async (item: any) => {
+      saveRemark(item).then(()=>{
+        setEntryState(item).then(() => {
+          router.push({path: './list', query: {reload:1}});
+        });
       });
     }
 
@@ -143,6 +163,7 @@ export default defineComponent({
 
     return {
       dataModel,
+      entryStateList,
       arrowBackOutline,
       dayjs,
       route,

+ 6 - 0
src/main/java/com/hz/employmentsite/controller/jobUserManager/RecommendMgtController.java

@@ -47,6 +47,12 @@ public class RecommendMgtController {
         return RespGenerstor.success(result);
     }
 
+    @PostMapping("/saveRemark")
+    public BaseResponse saveRemark(@RequestBody PcRecommendMgt data) {
+        var result = recommendMgtService.saveRemark(data.getRecommendMgtID(), data.getRemark(), accountService.getLoginUserID());
+        return RespGenerstor.success(result);
+    }
+
     @PostMapping("/addRecommend")
     public BaseResponse addRecommend(@RequestBody List<PcRecommendMgt> data) {
         var result = recommendMgtService.addRecommend(data, accountService.getLoginUserID());

+ 10 - 0
src/main/java/com/hz/employmentsite/model/PcRecommendMgt.java

@@ -31,6 +31,8 @@ public class PcRecommendMgt {
 
     private Boolean isSendUser;
 
+    private String remark;
+
     public String getRecommendMgtID() {
         return recommendMgtID;
     }
@@ -142,4 +144,12 @@ public class PcRecommendMgt {
     public void setIsSendUser(Boolean isSendUser) {
         this.isSendUser = isSendUser;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
 }

+ 70 - 0
src/main/java/com/hz/employmentsite/model/PcRecommendMgtExample.java

@@ -1004,6 +1004,76 @@ public class PcRecommendMgtExample {
             addCriterion("isSendUser not between", value1, value2, "isSendUser");
             return (Criteria) this;
         }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 19 - 2
src/main/java/com/hz/employmentsite/services/impl/companyService/PostServiceImpl.java

@@ -86,9 +86,26 @@ public class PostServiceImpl implements PostService {
         if(list != null && list.size()>0){
             for(PostVo curPost : list){
                 curPost.listLabel = labelCQuery.getPostLabelList(curPost.getPostID());
-
+                var curPcPost = pcPostMapper.selectByPrimaryKey(curPost.getPostID());
+                if (!stringUtils.IsNullOrEmpty(curPost.professionID)&&stringUtils.IsNullOrEmpty(curPost.postName)){
+                    PcProfessionExample professionExp = new PcProfessionExample();
+                    professionExp.or().andProfessionIDEqualTo(curPost.professionID);
+                    var curProfession = pcProfessionMapper.selectByExample(professionExp).stream().findFirst().orElse(null);
+                    if( curProfession!=null){
+                        curPcPost.setPostName(curProfession.getProfessionName());
+                        pcPostMapper.updateByPrimaryKey(curPcPost);
+                    }
+                }
+                if (!stringUtils.IsNullOrEmpty(curPost.workCode)&&stringUtils.IsNullOrEmpty(curPost.workName)){
+                    PcWorkcategoryExample  workCategoryExp = new PcWorkcategoryExample();
+                    workCategoryExp.or().andWorkCategoryIDEqualTo(curPost.workCode);
+                    var curWorkCategory = pcWorkcategoryMapper.selectByExample(workCategoryExp).stream().findFirst().orElse(null);
+                    if( curWorkCategory!=null){
+                        curPcPost.setWorkName(curWorkCategory.getWorkCategoryName());
+                        pcPostMapper.updateByPrimaryKey(curPcPost);
+                    }
+                }
                 if (curPost.endTime != null && curPost.endTime.before(new Date()) && curPost.recordStatus.equals(1)) {
-                    var curPcPost = pcPostMapper.selectByPrimaryKey(curPost.getPostID());
                     curPcPost.setRecordStatus(0);
                     pcPostMapper.updateByPrimaryKey(curPcPost);
                 }

+ 12 - 0
src/main/java/com/hz/employmentsite/services/impl/jobUserManager/RecommendMgtServiceImpl.java

@@ -146,6 +146,18 @@ public class RecommendMgtServiceImpl implements RecommendMgtService {
         return pcRecommendMgtMapper.updateByPrimaryKey(data);
     }
 
+    @Override
+    public int saveRemark(String id, String remark, String userId) {
+        PcRecommendMgt data = pcRecommendMgtMapper.selectByPrimaryKey(id);
+        if (data == null) {
+            return -1;
+        }
+        data.setRemark(remark);
+        data.setModifyTime(new Date());
+        data.setModifyUserID(userId);
+        return pcRecommendMgtMapper.updateByPrimaryKey(data);
+    }
+
     @Override
     public PageInfo<RecommendCompanyPostVo> getRecommendCompanyPostList(Integer page, Integer rows, String jobHuntID, String professionID,
                                                                         String companyName, Integer type, String parentProfessionID, Integer cultureRank,

+ 2 - 0
src/main/java/com/hz/employmentsite/services/service/jobUserManager/RecommendMgtService.java

@@ -24,6 +24,8 @@ public interface RecommendMgtService {
      */
     int setEntryState(String id, Integer state);
 
+    int saveRemark(String id, String remark, String userId);
+
     int addRecommend(List<PcRecommendMgt> list, String userId);
 
 

+ 1 - 0
src/main/java/com/hz/employmentsite/vo/jobUserManager/RecommendMgtVo.java

@@ -24,6 +24,7 @@ public class RecommendMgtVo extends PcRecommendMgt {
     public String jobuserId;
     public String companyId;
     public Integer workYear;
+    public String remark;
 
     // 数据权限
     @SiteID

+ 22 - 5
src/main/resources/mapping/PcRecommendMgtMapper.xml

@@ -16,6 +16,7 @@
     <result column="ModifyTime" jdbcType="TIMESTAMP" property="modifyTime" />
     <result column="isSendCompany" jdbcType="BIT" property="isSendCompany" />
     <result column="isSendUser" jdbcType="BIT" property="isSendUser" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -78,7 +79,7 @@
   <sql id="Base_Column_List">
     RecommendMgtID, PostID, JobHuntID, RecommendType, EntryState, OfficialAccountsID, 
     PostIsRead, JobPeopleIsRead, CreateUserID, CreateTime, ModifyUserID, ModifyTime, 
-    isSendCompany, isSendUser
+    isSendCompany, isSendUser, remark
   </sql>
   <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcRecommendMgtExample" resultMap="BaseResultMap">
     select
@@ -115,12 +116,14 @@
       RecommendType, EntryState, OfficialAccountsID, 
       PostIsRead, JobPeopleIsRead, CreateUserID, 
       CreateTime, ModifyUserID, ModifyTime, 
-      isSendCompany, isSendUser)
+      isSendCompany, isSendUser, remark
+      )
     values (#{recommendMgtID,jdbcType=VARCHAR}, #{postID,jdbcType=VARCHAR}, #{jobHuntID,jdbcType=VARCHAR}, 
       #{recommendType,jdbcType=INTEGER}, #{entryState,jdbcType=INTEGER}, #{officialAccountsID,jdbcType=VARCHAR}, 
       #{postIsRead,jdbcType=INTEGER}, #{jobPeopleIsRead,jdbcType=INTEGER}, #{createUserID,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 
-      #{isSendCompany,jdbcType=BIT}, #{isSendUser,jdbcType=BIT})
+      #{isSendCompany,jdbcType=BIT}, #{isSendUser,jdbcType=BIT}, #{remark,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcRecommendMgt">
     insert into pc_recommend_mgt
@@ -167,6 +170,9 @@
       <if test="isSendUser != null">
         isSendUser,
       </if>
+      <if test="remark != null">
+        remark,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="recommendMgtID != null">
@@ -211,6 +217,9 @@
       <if test="isSendUser != null">
         #{isSendUser,jdbcType=BIT},
       </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hz.employmentsite.model.PcRecommendMgtExample" resultType="java.lang.Long">
@@ -264,6 +273,9 @@
       <if test="row.isSendUser != null">
         isSendUser = #{row.isSendUser,jdbcType=BIT},
       </if>
+      <if test="row.remark != null">
+        remark = #{row.remark,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -284,7 +296,8 @@
       ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
       ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
       isSendCompany = #{row.isSendCompany,jdbcType=BIT},
-      isSendUser = #{row.isSendUser,jdbcType=BIT}
+      isSendUser = #{row.isSendUser,jdbcType=BIT},
+      remark = #{row.remark,jdbcType=VARCHAR}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -331,6 +344,9 @@
       <if test="isSendUser != null">
         isSendUser = #{isSendUser,jdbcType=BIT},
       </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
     </set>
     where RecommendMgtID = #{recommendMgtID,jdbcType=VARCHAR}
   </update>
@@ -348,7 +364,8 @@
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
       ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
       isSendCompany = #{isSendCompany,jdbcType=BIT},
-      isSendUser = #{isSendUser,jdbcType=BIT}
+      isSendUser = #{isSendUser,jdbcType=BIT},
+      remark = #{remark,jdbcType=VARCHAR}
     where RecommendMgtID = #{recommendMgtID,jdbcType=VARCHAR}
   </update>
 </mapper>

+ 1 - 1
src/main/resources/mapping/cquery/RecommendMgtCQuery.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.hz.employmentsite.mapper.cquery.RecommendMgtCQuery">
     <select id="getRecommendMgtList" resultType="com.hz.employmentsite.vo.jobUserManager.RecommendMgtVo">
         select a.recommendmgtid,a.postid,a.jobhuntid,a.recommendtype,a.entrystate,a.officialaccountsid,
-        a.postisread,a.jobpeopleisread,a.createuserid,a.createtime,a.modifyuserid,a.modifytime,
+        a.postisread,a.jobpeopleisread,a.createuserid,a.createtime,a.modifyuserid,a.modifytime,a.remark,
         c.companyname,c.usermobile as companymobile,c.username as companyusername,e.`name`,e.usermobile,
         f.professionname as zpprofessionname,f2.professionname as qzprofessionname,
         dic1.`name` as recommendtypename,dic2.`name` as entrystatename,dic3.`name` as postisreadname,

+ 14 - 0
vue/src/api/jobUserManager/recommendMgt/index.ts

@@ -11,6 +11,20 @@ export function getList(query: any) {
   );
 }
 
+export function saveRemark(data: any) {
+  return request(
+    {
+      url: 'jobusermgr/recommendmgt/saveRemark',
+      method: 'post',
+      data: data,
+    },
+    {
+      isNew: true,
+    },
+  );
+}
+
+
 export function setEntryState(data: any) {
   return request(
     {

+ 17 - 10
vue/src/views/jobUserManager/recommendMgt/index.vue

@@ -147,24 +147,22 @@
         <template #bodyCell="{ column, text, record }">
           <template v-if="column.key === 'operation'">
             <div class="table-operation">
-              <a-button type="link" size="small" v-show="record.entryState!=1" functioncode="T01030203"
-                        @click='onSetEntryState(record.recommendMgtID, 1)'>已入职
-              </a-button>
-              <a-button type="link" size="small" v-show="record.entryState==1" functioncode="T01030203"
-                        @click='onSetEntryState(record.recommendMgtID, 0)'>已离职
+              <a-button type="link" size="small" functioncode="T01030203"
+                        @click='onSetEntryState(record)'>操作
               </a-button>
             </div>
           </template>
         </template>
       </a-table>
     </div>
+    <RemarkAddModal ref="modalAddRemarkRef" @modalClosed="theModalClosed"  ></RemarkAddModal>
   </div>
 </template>
 
 <script lang="ts">
 import {reactive, ref, computed, defineComponent} from 'vue';
 import type {FormInstance, TableProps, SelectProps} from 'ant-design-vue';
-import {getList, setEntryState} from '@/api/jobUserManager/recommendMgt';
+import {getList} from '@/api/jobUserManager/recommendMgt';
 import {getSysDictionaryList} from '@/api/system/dictionary';
 import {getPaginationTotalTitle} from '@/utils/common';
 import dayjs from "dayjs";
@@ -172,14 +170,16 @@ import {getSiteList} from "@/api/baseSettings/siteInfo";
 import {get} from "@/api/common";
 import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
 import ColumnsSetting from "@/components/common/ColumnsSetting.vue";
+import RemarkAddModal from "./remarkAdd.vue";
 
 export default defineComponent({
   name: 'recommendMgtList',
-  components: {ColumnsSetting, BExportExcel},
+  components: {ColumnsSetting, BExportExcel,RemarkAddModal},
   setup() {
     const expand = ref(false);
     const modalRoleUserRef = ref();
     const modalRoleEditRef = ref();
+    const modalAddRemarkRef = ref();
     const formRef = ref<FormInstance>();
     const searchParamsState = reactive({
       pageIndex: 1,
@@ -219,6 +219,7 @@ export default defineComponent({
       {title: '企业电话', dataIndex: 'companyMobile', key: 'companyMobile', align: "center"},
       {title: '招聘岗位', dataIndex: 'zpProfessionName', key: 'zpProfessionName', align: "center"},
       {title: '入职状态', dataIndex: 'entryStateName', key: 'entryStateName', align: "center"},
+      {title: '备注', dataIndex: 'remark', key: 'remark', align: "center"},
       {
         title: '推荐类型',
         dataIndex: 'recommendTypeName',
@@ -288,10 +289,14 @@ export default defineComponent({
       formState.loading = false;
     };
 
-    const onSetEntryState = async (recommendMgtID, entryState) => {
-      setEntryState({recommendMgtID: recommendMgtID, entryState: entryState}).then(()=>{
+    const onSetEntryState = async (item) => {
+      modalAddRemarkRef.value.show(item);
+    }
+
+    const theModalClosed = (d) => {
+      if (d) {
         loadData();
-      });
+      }
     }
 
     const getRecommendTypeList = () => {
@@ -323,6 +328,8 @@ export default defineComponent({
     return {
       modalRoleUserRef,
       modalRoleEditRef,
+      modalAddRemarkRef,
+      theModalClosed,
       formRef,
       loadData,
       searchParamsState,

+ 74 - 0
vue/src/views/jobUserManager/recommendMgt/remarkAdd.vue

@@ -0,0 +1,74 @@
+<template>
+  <Modal  v-model:visible="visible" title="操作" ok-text="提交" @ok="onCommit" @cancel="onCancel()" >
+    <div class="modal-search">
+      <Form ref="modalFormRef" :model="thePostRecommend" autocomplete="off">
+        <a-form-item label="入职状态" :label-col="{ span: 4}" name="entryState">
+          <a-select ref="select" v-model:value="thePostRecommend.entryState"
+                    :options="entryStateList" :field-names="{ label: 'name', value: 'value' }">
+          </a-select>
+        </a-form-item>
+        <a-form-item label="备注" :label-col="{ span: 4 }" name="remark">
+          <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="thePostRecommend.remark" placeholder="请输入备注" :allow-clear="true"/>
+        </a-form-item>
+        </Form>
+    </div>
+  </Modal>
+</template>
+<script setup lang="ts">
+import {Form, Modal, SelectProps} from 'ant-design-vue';
+import {ref} from "vue";
+import type {FormInstance} from 'ant-design-vue';
+import {setEntryState,saveRemark} from '@/api/jobUserManager/recommendMgt';
+import {getSysDictionaryList} from "@/api/system/dictionary";
+
+defineOptions({
+  name:'remarkAddModal',
+  inheritAttrs: false,
+  components: {
+    Form,Modal
+  }
+});
+
+const visible = ref<boolean>(false);
+const loading = ref<boolean>(false);
+const entryStateList = ref<SelectProps['options']>();
+const thePostRecommend = ref({
+    recommendMgtID:"",
+    entryState:0,
+    remark:""
+});
+const modalFormRef = ref<FormInstance>();
+
+const show = async function (curRecommend:any) {
+  loading.value = true;
+  getSysDictionaryList('EntryState').then((data) => {
+    entryStateList.value = data;
+  });
+  thePostRecommend.value = curRecommend;
+  console.log(thePostRecommend.value);
+  loading.value = false;
+  visible.value = true;
+};
+
+defineExpose({show});
+const emits = defineEmits(['modalClosed']);
+const handleModalClosed = (e) => {
+  emits('modalClosed', e);
+};
+
+const onCommit =() =>{
+  saveRemark(thePostRecommend.value).then(()=>{
+    setEntryState(thePostRecommend.value).then(()=>{
+      visible.value = false;
+      handleModalClosed(true);
+    });
+  });
+};
+
+const onCancel =() =>{
+  visible.value = false;
+  handleModalClosed(true);
+};
+
+</script>
+

+ 2 - 2
vue/src/views/taskAndLog/dotask/edit.vue

@@ -174,9 +174,9 @@ import {computed, defineComponent, reactive, ref, toRefs} from 'vue';
 import {message as $message, type SelectProps, type TableColumnsType, type TableProps} from 'ant-design-vue';
 import {useTabsViewStore} from '@/store/modules/tabsView';
 import BUploadFile from '@/components/file/uploadFile.vue';
-import SiteUserModel from "./siteUser.vue"
+import SiteUserModel from "./siteUser.vue";
 import {get} from "@/api/common";
-import {getDataById, getUserList, getWorkUserList, save} from '@/api/taskAndLog/dotask'
+import {getDataById, getUserList, getWorkUserList, save} from '@/api/taskAndLog/dotask';
 import {getPaginationTotalTitle} from "@/utils/common";
 
 interface taskModel {