feat():前端样式调整，后端代码提交;

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementItemService.java

@@ -15,4 +15,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  */
 public interface YysMaterialProcurementItemService extends IService<YysMaterialProcurementItemEntity> {
     QueryWrapper<YysMaterialProcurementItemEntity> getChild(YysMaterialProcurementPlanPagination pagination,QueryWrapper<YysMaterialProcurementItemEntity> yysMaterialProcurementItemQueryWrapper);
+
+    /**
+     * 生成采购计划
+     * @param id
+     * @param list
+     * @return
+     */
+    String initPlan(String id, List<YysMaterialRequirementItemEntity> list);
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementPlanService.java

@@ -36,4 +36,11 @@ public interface YysMaterialProcurementPlanService extends IService<YysMaterialP
 
     void saveOrUpdate(YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm,String id, boolean isSave) throws Exception;
 
+    /**
+     * 生成采购计划
+     * @param plan
+     * @param list
+     * @return
+     */
+    String initPlan(YysMaterialRequirementPlanEntity plan, List<YysMaterialRequirementItemEntity> list);
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialRequirementItemService.java

@@ -15,4 +15,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  */
 public interface YysMaterialRequirementItemService extends IService<YysMaterialRequirementItemEntity> {
     QueryWrapper<YysMaterialRequirementItemEntity> getChild(YysMaterialRequirementPlanPagination pagination,QueryWrapper<YysMaterialRequirementItemEntity> yysMaterialRequirementItemQueryWrapper);
+
+    /**
+     * 生成采购计划
+     *
+     * @param plan 物料需求计划主键id
+     * @return result
+     */
+    String initPlan(YysMaterialRequirementPlanEntity plan);
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialRequirementPlanService.java

@@ -2,7 +2,9 @@ package jnpf.service;
 
 import jnpf.model.yysmaterialrequirementplan.*;
 import jnpf.entity.*;
+
 import java.util.*;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
@@ -16,7 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 public interface YysMaterialRequirementPlanService extends IService<YysMaterialRequirementPlanEntity> {
     List<YysMaterialRequirementPlanEntity> getList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination);
 
-    List<YysMaterialRequirementPlanEntity> getTypeList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination,String dataType);
+    List<YysMaterialRequirementPlanEntity> getTypeList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination, String dataType);
 
     YysMaterialRequirementPlanEntity getInfo(String id);
 
@@ -27,13 +29,20 @@ public interface YysMaterialRequirementPlanService extends IService<YysMaterialR
     boolean update(String id, YysMaterialRequirementPlanEntity entity);
 
     //子表方法
-    List<YysMaterialRequirementItemEntity> getYysMaterialRequirementItemList(String id,YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination);
+    List<YysMaterialRequirementItemEntity> getYysMaterialRequirementItemList(String id, YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination);
 
     List<YysMaterialRequirementItemEntity> getYysMaterialRequirementItemList(String id);
 
     //副表数据方法
-	String checkForm(YysMaterialRequirementPlanForm form,int i);
+    String checkForm(YysMaterialRequirementPlanForm form, int i);
 
-    void saveOrUpdate(YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm,String id, boolean isSave) throws Exception;
+    void saveOrUpdate(YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm, String id, boolean isSave) throws Exception;
 
+    /**
+     * 生成采购计划
+     *
+     * @param id 物料需求计划主键id
+     * @return result
+     */
+    String initPlan(String id);
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDeviceUpkeepServiceImpl.java

@@ -426,9 +426,13 @@ public class YysDeviceUpkeepServiceImpl extends ServiceImpl<YysDeviceUpkeepMappe
 
         if (isSave) {
             String mainId = RandomUtil.uuId();
+            entity.setCreatorUserId(userInfo.getUserId());
+            entity.setCreatorTime(DateUtil.getNowDate());
             entity.setId(mainId);
             entity.setVersion(0);
         } else {
+            entity.setLastModifyTime(DateUtil.getNowDate());
+            entity.setLastModifyUserId(userInfo.getUserId());
         }
         this.saveOrUpdate(entity);
 

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementItemServiceImpl.java

@@ -1,11 +1,15 @@
 package jnpf.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.google.common.collect.Lists;
 import jnpf.entity.*;
 import jnpf.mapper.YysMaterialProcurementItemMapper;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.yysmaterialprocurementplan.*;
+
 import java.math.BigDecimal;
+
 import cn.hutool.core.util.ObjectUtil;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.util.GeneraterSwapUtil;
@@ -13,8 +17,11 @@ import jnpf.database.model.superQuery.SuperQueryJsonModel;
 import jnpf.database.model.superQuery.ConditionJsonModel;
 import jnpf.database.model.superQuery.SuperQueryConditionModel;
 import jnpf.model.QueryModel;
+
 import java.util.stream.Collectors;
+
 import jnpf.base.model.ColumnDataModel;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jnpf.database.model.superQuery.SuperJsonModel;
@@ -22,13 +29,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import java.text.SimpleDateFormat;
+
 import jnpf.util.*;
+
 import java.util.*;
+
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
+
 /**
- *
  * YysMaterialProcurementPlan
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@@ -36,7 +47,7 @@ import jnpf.permission.entity.UserEntity;
  * 日期： 2024-08-08
  */
 @Service
-public class YysMaterialProcurementItemServiceImpl extends ServiceImpl<YysMaterialProcurementItemMapper, YysMaterialProcurementItemEntity> implements YysMaterialProcurementItemService{
+public class YysMaterialProcurementItemServiceImpl extends ServiceImpl<YysMaterialProcurementItemMapper, YysMaterialProcurementItemEntity> implements YysMaterialProcurementItemService {
     @Autowired
     private GeneraterSwapUtil generaterSwapUtil;
 
@@ -45,15 +56,37 @@ public class YysMaterialProcurementItemServiceImpl extends ServiceImpl<YysMateri
 
     //子表过滤方法
     @Override
-    public QueryWrapper<YysMaterialProcurementItemEntity> getChild(YysMaterialProcurementPlanPagination pagination, QueryWrapper<YysMaterialProcurementItemEntity> yysMaterialProcurementItemQueryWrapper){
+    public QueryWrapper<YysMaterialProcurementItemEntity> getChild(YysMaterialProcurementPlanPagination pagination, QueryWrapper<YysMaterialProcurementItemEntity> yysMaterialProcurementItemQueryWrapper) {
-    boolean pcPermission = true;
+        boolean pcPermission = true;
-    boolean appPermission = false;
+        boolean appPermission = false;
-    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+        boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
-    String ruleQueryJson = isPc?YysMaterialProcurementPlanConstant.getColumnData():YysMaterialProcurementPlanConstant.getAppColumnData();
+        String ruleQueryJson = isPc ? YysMaterialProcurementPlanConstant.getColumnData() : YysMaterialProcurementPlanConstant.getAppColumnData();
-    ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
+        ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson, ColumnDataModel.class);
-    String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
+        String ruleJson = isPc ? JsonUtil.getObjectToString(dataModel.getRuleList()) : JsonUtil.getObjectToString(dataModel.getRuleListApp());
-        if(isPc){
+        if (isPc) {
         }
         return yysMaterialProcurementItemQueryWrapper;
     }
+
+    @Override
+    public String initPlan(String id, List<YysMaterialRequirementItemEntity> list) {
+        if (CollectionUtils.isEmpty(list)) {
+            return "生成失败，物流明细为空";
+        }
+        List<YysMaterialProcurementItemEntity> lists = Lists.newLinkedList();
+        for (YysMaterialRequirementItemEntity yysMaterialRequirementItemEntity : list) {
+            String mainId = RandomUtil.uuId();
+            YysMaterialProcurementItemEntity procurementItem = BeanUtil.copyProperties(yysMaterialRequirementItemEntity, YysMaterialProcurementItemEntity.class);
+            procurementItem.setId(mainId);
+            procurementItem.setMaterialProcurementPlanId(id);
+            procurementItem.setCreatorTime(DateUtil.getNowDate());
+            procurementItem.setCreatorUserId(userProvider.get().getUserId());
+            lists.add(procurementItem);
+        }
+        boolean result = this.saveBatch(lists);
+        if (result){
+            return "生成成功";
+        }
+        return "生成失败";
+    }
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementPlanServiceImpl.java

@@ -1,5 +1,6 @@
 package jnpf.service.impl;
 
+import com.google.common.collect.Lists;
 import jnpf.entity.*;
 import jnpf.mapper.YysMaterialProcurementPlanMapper;
 import jnpf.service.*;
@@ -26,6 +27,7 @@ import jnpf.model.QueryModel;
 import java.util.stream.Collectors;
 
 import jnpf.base.model.ColumnDataModel;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jnpf.database.model.superQuery.SuperJsonModel;
@@ -419,4 +421,26 @@ public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMateri
             this.saveOrUpdate(entity);
         }
     }
+
+    @Override
+    public String initPlan(YysMaterialRequirementPlanEntity plan, List<YysMaterialRequirementItemEntity> list) {
+        if (CollectionUtils.isEmpty(list)) {
+            return "生成失败,物料需求计划-物料明细为空";
+        }
+        String mainId = RandomUtil.uuId();
+        YysMaterialProcurementPlanEntity procurementPlan = new YysMaterialProcurementPlanEntity();
+        procurementPlan.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false));
+        procurementPlan.setId(mainId);
+        procurementPlan.setPlanNumber(plan.getPlanNumber());
+        procurementPlan.setProcurementYearMonth(plan.getPlanYearMonth());
+        procurementPlan.setProcurementDate(plan.getOrderDate());
+        procurementPlan.setProcurementStatus("1");
+        procurementPlan.setCreatorTime(DateUtil.getNowDate());
+        procurementPlan.setCreatorUserId(userProvider.get().getUserId());
+        boolean result = this.save(procurementPlan);
+        if (result) {
+            return yysMaterialProcurementItemService.initPlan(procurementPlan.getId(), list);
+        }
+        return "生成成功";
+    }
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialRequirementItemServiceImpl.java

@@ -1,11 +1,14 @@
 package jnpf.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jnpf.entity.*;
 import jnpf.mapper.YysMaterialRequirementItemMapper;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.yysmaterialrequirementplan.*;
+
 import java.math.BigDecimal;
+
 import cn.hutool.core.util.ObjectUtil;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.util.GeneraterSwapUtil;
@@ -13,8 +16,11 @@ import jnpf.database.model.superQuery.SuperQueryJsonModel;
 import jnpf.database.model.superQuery.ConditionJsonModel;
 import jnpf.database.model.superQuery.SuperQueryConditionModel;
 import jnpf.model.QueryModel;
+
 import java.util.stream.Collectors;
+
 import jnpf.base.model.ColumnDataModel;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jnpf.database.model.superQuery.SuperJsonModel;
@@ -22,13 +28,19 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import java.text.SimpleDateFormat;
+
 import jnpf.util.*;
+
 import java.util.*;
+
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
+
+import javax.annotation.Resource;
+
 /**
- *
  * YysMaterialRequirementPlan
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@@ -36,24 +48,39 @@ import jnpf.permission.entity.UserEntity;
  * 日期： 2024-08-07
  */
 @Service
-public class YysMaterialRequirementItemServiceImpl extends ServiceImpl<YysMaterialRequirementItemMapper, YysMaterialRequirementItemEntity> implements YysMaterialRequirementItemService{
+public class YysMaterialRequirementItemServiceImpl extends ServiceImpl<YysMaterialRequirementItemMapper, YysMaterialRequirementItemEntity> implements YysMaterialRequirementItemService {
     @Autowired
     private GeneraterSwapUtil generaterSwapUtil;
 
     @Autowired
     private UserProvider userProvider;
 
+    @Resource
+    private YysMaterialProcurementPlanService yysMaterialProcurementPlanService;
+
     //子表过滤方法
     @Override
-    public QueryWrapper<YysMaterialRequirementItemEntity> getChild(YysMaterialRequirementPlanPagination pagination, QueryWrapper<YysMaterialRequirementItemEntity> yysMaterialRequirementItemQueryWrapper){
+    public QueryWrapper<YysMaterialRequirementItemEntity> getChild(YysMaterialRequirementPlanPagination pagination, QueryWrapper<YysMaterialRequirementItemEntity> yysMaterialRequirementItemQueryWrapper) {
-    boolean pcPermission = true;
+        boolean pcPermission = true;
-    boolean appPermission = false;
+        boolean appPermission = false;
-    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+        boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
-    String ruleQueryJson = isPc?YysMaterialRequirementPlanConstant.getColumnData():YysMaterialRequirementPlanConstant.getAppColumnData();
+        String ruleQueryJson = isPc ? YysMaterialRequirementPlanConstant.getColumnData() : YysMaterialRequirementPlanConstant.getAppColumnData();
-    ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
+        ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson, ColumnDataModel.class);
-    String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
+        String ruleJson = isPc ? JsonUtil.getObjectToString(dataModel.getRuleList()) : JsonUtil.getObjectToString(dataModel.getRuleListApp());
-        if(isPc){
+        if (isPc) {
         }
         return yysMaterialRequirementItemQueryWrapper;
     }
+
+    @Override
+    public String initPlan(YysMaterialRequirementPlanEntity plan) {
+        LambdaQueryWrapper<YysMaterialRequirementItemEntity> wrapper = new LambdaQueryWrapper<>(YysMaterialRequirementItemEntity.class);
+        wrapper.eq(YysMaterialRequirementItemEntity::getMaterialRequirementPlanId, plan.getId());
+        List<YysMaterialRequirementItemEntity> list = this.list(wrapper)
+                .stream().filter(obj -> ObjectUtil.isNotNull(obj.getLackNumber()) && obj.getLackNumber().compareTo(BigDecimal.ZERO) != 0).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(list)) {
+            return yysMaterialProcurementPlanService.initPlan(plan, list);
+        }
+        return "数据为空";
+    }
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialRequirementPlanServiceImpl.java

@@ -26,6 +26,7 @@ import jnpf.model.QueryModel;
 import java.util.stream.Collectors;
 
 import jnpf.base.model.ColumnDataModel;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jnpf.database.model.superQuery.SuperJsonModel;
@@ -43,6 +44,8 @@ import java.util.*;
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
 
+import javax.annotation.Resource;
+
 /**
  * YysMaterialRequirementPlan
  * 版本： V3.5
@@ -51,6 +54,7 @@ import jnpf.permission.entity.UserEntity;
  * 日期： 2024-08-07
  */
 @Service
+@Slf4j
 public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMaterialRequirementPlanMapper, YysMaterialRequirementPlanEntity> implements YysMaterialRequirementPlanService {
     @Autowired
     private GeneraterSwapUtil generaterSwapUtil;
@@ -61,6 +65,7 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
     @Autowired
     private YysMaterialRequirementItemService yysMaterialRequirementItemService;
 
+
     @Override
     public List<YysMaterialRequirementPlanEntity> getList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination) {
         return getTypeList(yysMaterialRequirementPlanPagination, yysMaterialRequirementPlanPagination.getDataType());
@@ -464,4 +469,19 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
             }
         }
     }
+
+    @Override
+    public String initPlan(String id) {
+        log.info("生成采购计划，计划id：{}", id);
+        YysMaterialRequirementPlanEntity plan = this.getById(id);
+        if (Objects.isNull(plan)) {
+            return "生成失败，计划为空";
+        }
+        String result = yysMaterialRequirementItemService.initPlan(plan);
+        if (result.contains("成功")){
+            plan.setIsCreatePlan("1");
+            this.updateById(plan);
+        }
+        return result;
+    }
 }

jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialRequirementPlanController.java

@@ -400,4 +400,14 @@ public class YysMaterialRequirementPlanController {
         return ActionResult.success(yysMaterialRequirementPlanMap);
     }
 
+    @Operation(summary = "生成采购计划")
+    @GetMapping("/initPlan/{id}")
+    public ActionResult initPlan(@PathVariable("id") String id) {
+        String result = yysMaterialRequirementPlanService.initPlan(id);
+        if (result.contains("成功")) {
+            return ActionResult.success("生成成功");
+        }
+        return ActionResult.fail(result);
+    }
+
 }

jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/Detail.vue

@@ -57,7 +57,7 @@
                                         <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">检修记录</span>
                                     </div>
                                 </el-col>
-                                <el-table :data="dataForm.tableField108" size='mini'>
+                                <el-table :data="dataForm.tableField108" size='mini' border>
                                     <el-table-column type="index" width="50" label="序号" align="center" />
                                     <el-table-column prop="unkeepType" label="维保类型">
                                         <template slot-scope="scope">

jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/form.vue

@@ -75,8 +75,14 @@
                                         <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">检修记录</span>
                                     </div>
                                 </el-col>
-                                <el-table :data="dataForm.yysdeviceunkeeplogsList" size='small'>
+                                <el-table :data="dataForm.yysdeviceunkeeplogsList" size='small' border>
                                     <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
+                                    <el-table-column label="操作" width="50" fixed="left">
+                                        <template slot-scope="scope">
+                                            <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                                                @click="delyysdeviceunkeeplogsList(scope.$index)">删除</el-button>
+                                        </template>
+                                    </el-table-column>
                                     <el-table-column label="维保类型" prop="unkeepType" fixed="left" width="200" align="center">
                                         <template slot="header" v-if="true">
                                             <span class="required-sign">*</span>维保类型
@@ -251,12 +257,7 @@
                                             </JnpfTextarea>
                                         </template>
                                     </el-table-column>
-                                    <el-table-column label="操作" width="50">
+                                    
-                                        <template slot-scope="scope">
-                                            <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                                                @click="delyysdeviceunkeeplogsList(scope.$index)">删除</el-button>
-                                        </template>
-                                    </el-table-column>
                                 </el-table>
                                 <div class="table-actions" @click="addyysdeviceunkeeplogsList()">
                                     <el-button type="text" icon="el-icon-plus">新增</el-button>

jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/Detail.vue

@@ -50,7 +50,7 @@
                                         <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">物料明细</span>
                                     </div>
                                 </el-col>
-                                <el-table :data="dataForm.tableField107" size='mini'>
+                                <el-table :data="dataForm.tableField107" size='mini' border>
                                     <el-table-column type="index" width="50" label="序号" align="center" />
                                     <el-table-column prop="materialCode" label="物料编码">
                                         <template slot-scope="scope">

jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue

@@ -94,7 +94,7 @@
                                         <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">物料明细</span>
                                     </div>
                                 </el-col>
-                                <el-table :data="dataForm.yysMaterialProcurementItemList" size='mini'>
+                                <el-table :data="dataForm.yysMaterialProcurementItemList" size='mini' border>
                                     <el-table-column type="index" width="50" label="序号" align="center" />
                                     <el-table-column label="物料编码" prop="materialCode">
                                         <template slot="header" v-if="false">
@@ -173,12 +173,14 @@
                                             </JnpfInput>
                                         </template>
                                     </el-table-column>
-                                    <el-table-column label="操作" width="50">
+                                    <el-table-column label="操作" width="200">
                                         <template slot-scope="scope">
                                             <el-button size="mini" type="text" class="JNPF-table-delBtn"
                                                 @click="delyysMaterialProcurementItemList(scope.$index)">删除</el-button>
+                                                <el-button size="mini" type="text"
+                                                @click="delyysMaterialProcurementItemList(scope.$index)">生成采购单</el-button>
                                         </template>
-                                    </el-table-column>
+                                    </el-table-column> 
                                 </el-table>
                                 <div class="table-actions" @click="addyysMaterialProcurementItemList()">
                                     <el-button type="text" icon="el-icon-plus">添加</el-button>

jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/Detail.vue

@@ -50,7 +50,7 @@
                                         <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">物料明细</span>
                                     </div>
                                 </el-col>
-                                <el-table :data="dataForm.tableField119" size='mini'>
+                                <el-table :data="dataForm.tableField119" size='mini' border>
                                     <el-table-column type="index" width="50" label="序号" align="center" />
                                     <el-table-column prop="materialCode" label="物料编码">
                                         <template slot-scope="scope">

jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/index.vue

@@ -86,7 +86,8 @@
                             </el-button>
                             <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
                             </el-button>
-                            <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">生成采购计划
+                            <el-button type="text" v-has="'btn_detail'" v-show="scope.row.isCreatePlan === '否'"
+                                @click="intPlan(scope.row.id)">生成采购计划
                             </el-button>
                         </template>
                     </el-table-column>
@@ -197,6 +198,25 @@ export default {
         this.queryData = JSON.parse(JSON.stringify(this.query))
     },
     methods: {
+        intPlan(id) {
+            this.$confirm('此操作将生成采购计划, 是否继续?', '提示', {
+                type: 'warning'
+            }).then(() => {
+                request({
+                    url: `/api/example/YysMaterialRequirementPlan/initPlan/` + id,
+                    method: 'GET'
+                }).then(res => {
+                    this.$message({
+                        type: 'success',
+                        message: res.msg,
+                        onClose: () => {
+                            this.initData()
+                        }
+                    });
+                })
+            }).catch(() => {
+            });
+        },
         formatDeliveryTime(row, column) {
             if (row.creatorTime != null) {
                 const date = new Date(row.creatorTime);

jnpf-java-boot/jnpf-web/src/views/yys/yyspackagereport/form.vue

@@ -157,7 +157,7 @@
                             <jnpf-form-tip-item label="报工成员" prop="reportMember">
                                 <JnpfUserSelect v-model="dataForm.reportMember" @change="changeData('reportMember', -1)"
                                     placeholder="请选择报工成员" selectType="all" :ableIds="ableAll.reportMemberableIds"
-                                    clearable :style='{ "width": "100%" }' :multiple="true">
+                                    clearable :style='{ "width": "100%" }' >
                                 </JnpfUserSelect>
                             </jnpf-form-tip-item>
                         </el-col>
@@ -237,7 +237,7 @@ export default {
                 qualifiedNum: 0,
                 compensatoryHour: 0,
                 reportGroup: undefined,
-                reportMember: [],
+                reportMember: undefined,
                 status: "1",
                 version: 0,
             },

jnpf-java-boot/jnpf-web/src/views/yys/yysprodreport/form.vue

@@ -155,7 +155,7 @@
                             <jnpf-form-tip-item label="报工成员" prop="reportMember">
                                 <JnpfUserSelect v-model="dataForm.reportMember" @change="changeData('reportMember', -1)"
                                     placeholder="请选择报工成员" selectType="all" :ableIds="ableAll.reportMemberableIds"
-                                    clearable :style='{ "width": "100%" }' :multiple="true">
+                                    clearable :style='{ "width": "100%" }'>
                                 </JnpfUserSelect>
                             </jnpf-form-tip-item>
                         </el-col>
@@ -235,7 +235,7 @@ export default {
                 qualifiedNum: 0,
                 compensatoryHour: 0,
                 reportGroup: undefined,
-                reportMember: [],
+                reportMember: undefined,
                 status: "1",
                 version: 0,
             },