质保金修改待办关注表状态

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/attentiontodo/vo/AttentiontodoRespVO.java

@@ -43,7 +43,9 @@ public class AttentiontodoRespVO {
     @Schema(description = "提醒周期（天）")
     @ExcelProperty("提醒周期（天）")
     private String remindtime;
-
+    @Schema(description = "提醒天数")
+    @ExcelProperty("提醒天数")
+    private String evday;
     @Schema(description = "提醒人")
     @ExcelProperty("提醒人")
     private String remindman;

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/attentiontodo/vo/AttentiontodoSaveReqVO.java

@@ -34,6 +34,9 @@ public class AttentiontodoSaveReqVO {
     @Schema(description = "提醒周期（天）")
     private String remindtime;
 
+    @Schema(description = "提醒天数")
+    private String evday;
+
     @Schema(description = "提醒人")
     private String remindman;
 

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/attentiontodo/AttentiontodoDO.java

@@ -56,6 +56,10 @@ public class AttentiontodoDO extends BaseDO {
      * 提醒周期（天）
      */
     private String remindtime;
+    /**
+     * 提醒天数
+     */
+    private String evday;
     /**
      * 提醒人
      */

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java

@@ -187,9 +187,18 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
     public void showzbmoney(Long id) {
         // 校验存在
         validateProjectOrderExists(id);
+        ProjectOrderDO projectOrderDO = projectOrderMapper.selectById(id);
         // 更新是否收取质保金
         LambdaUpdateWrapper<ProjectOrderDO> eq = new LambdaUpdateWrapper<ProjectOrderDO>().eq(ProjectOrderDO::getId, id).set(ProjectOrderDO::getShowZbmoney, 1).set(ProjectOrderDO::getDeliveryStatus,4);
         projectOrderMapper.update(eq);
+        //更新待办关注表的状态
+        LambdaUpdateWrapper<bdgzsomthingDO> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(bdgzsomthingDO::getAttr3,projectOrderDO.getCode())
+                .eq(bdgzsomthingDO::getThingname,"订单发货满一年")
+                .set(bdgzsomthingDO::getAttr4,"1")
+                .set(bdgzsomthingDO::getAttr12,"0");
+        bdgzsomthingMapper.update(wrapper);
+
     }
 
     @Override

mes-ui/mes-ui-admin-vue3/src/views/heli/attentiontodo/AttentiontodoForm.vue

@@ -42,6 +42,16 @@
             </el-col>
           </el-row>
         </el-col>
+        <el-col :span="24" v-if="flag">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="提醒天数" prop="evday" >
+                <el-input v-model="formData.evday" placeholder="请输入提醒天数" class="!w-250px" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+
         <el-col :span="24">
           <el-row>
             <el-col :span="12">
@@ -116,7 +126,7 @@
           <template #default="{ row, $index }">
             <el-form-item :prop="`${$index}.remindman`" class="mb-0px!">
 			  <!-- <el-input v-model="row.remindman" placeholder="请输入提醒人" /> -->
-            <el-select filterable v-model="row.remindman" placeholder="请选择对应操作"  >
+            <el-select filterable v-model="row.remindman" placeholder="请选择对应操作"  clearable>
               <el-option v-for="dict in userList" :key="dict.value" :label="dict.label"
                 :value="dict.label"   />
               <!-- <el-input v-model="row.type" placeholder="请输入提醒人" /> -->
@@ -165,7 +175,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-
+const flag = ref(false)
 
 const formDatalist = ref({
   id: undefined,
@@ -193,6 +203,7 @@ const formDatalist = ref({
   taskDispatchDetails: [],
 })
 const formData = ref({
+  evday:undefined,
   id: undefined,
   serialnumber: undefined,
   event: undefined,
@@ -246,7 +257,10 @@ userList.value = await UserApi.getSimpleUserList()
   try {
     formData.value = await AttentiontodoApi.getAttentiontodo(id);
     formDatalist.value = await AttentiontodoApi.getAttentiontodolist(id);
-  
+    flag.value=false
+    if (formData.value.event=='《物料需求计划》的采购'){
+      flag.value=true
+    }
     // 将formData.value中的type字段分割成数组
     formData.value.type = formData.value.type.split(',');
 
@@ -284,7 +298,7 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as AttentiontodoApi.AttentiontodoVO
+    const data = { ...formData.value } as unknown as AttentiontodoApi.AttentiontodoVO
 	data.type=data.type.join(',')
 	 // for (let i = 0; i < data.taskDispatchDetails.length; i++) {
 	 //      const value = data.taskDispatchDetails[i];
@@ -293,6 +307,13 @@ const submitForm = async () => {
 	      // 在这里执行你需要的操作
 
 	    // }
+
+    for (let i = 0; i < data.taskDispatchDetails.length; i++) {
+      if (data.taskDispatchDetails[i].type==2&&data.taskDispatchDetails[i].remindman==null){
+         message.error("操作类型为关注,必须配置提醒人,请确认")
+        return
+      }
+    }
     if (formType.value === 'create') {
       // await AttentiontodoApi.createAttentiontodoline(data)
       message.success(t('common.createSuccess'))