yunxi
/
yueyueshu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat():前端样式调整，后端接口完善;

Browse Source
master
jiyufei 2 months ago
parent 51d7a11f61
commit ce1a4df30e
11 changed files with 2570 additions and 2468 deletions
Show Stats Download Patch File Download Diff File

44
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementPlanServiceImpl.java
Unescape View File

@ -5,18 +5,26 @@ import jnpf.mapper.YysMaterialProcurementPlanMapper;
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;
import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -25,13 +33,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）
@ -48,11 +60,15 @@ public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMateri
@Autowired
private YysMaterialProcurementItemService yysMaterialProcurementItemService;
@Override
public List<YysMaterialProcurementPlanEntity> getList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) {
return getTypeList(yysMaterialProcurementPlanPagination, yysMaterialProcurementPlanPagination.getDataType());
}
/** 列表查询 */
/**
* 列表查询
*/
@Override
public List<YysMaterialProcurementPlanEntity> getTypeList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination, String dataType) {
String userId = userProvider.get().getUserId();
@ -287,27 +303,34 @@ public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMateri
return this.list(yysMaterialProcurementPlanQueryWrapper);
}
}
@Override
public YysMaterialProcurementPlanEntity getInfo(String id) {
QueryWrapper<YysMaterialProcurementPlanEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysMaterialProcurementPlanEntity::getId, id);
return this.getOne(queryWrapper);
}
@Override
public void create(YysMaterialProcurementPlanEntity entity) {
this.save(entity);
}
@Override
public boolean update(String id, YysMaterialProcurementPlanEntity entity) {
return this.updateById(entity);
}
@Override
public void delete(YysMaterialProcurementPlanEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
}
}
/** YysMaterialProcurementItem子表方法 */
/**
* YysMaterialProcurementItem子表方法
*/
@Override
public List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id, YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) {
Map<String, Object> newtabMap = YysMaterialProcurementPlanConstant.TABLEFIELDKEY.entrySet()
@ -321,14 +344,19 @@ public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMateri
return yysMaterialProcurementItemService.list(queryWrapper);
}
/** YysMaterialProcurementItem子表方法 */
/**
* YysMaterialProcurementItem子表方法
*/
@Override
public List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id) {
QueryWrapper<YysMaterialProcurementItemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, id);
return yysMaterialProcurementItemService.list(queryWrapper);
}
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
/**
* 验证表单唯一字段，正则，非空 i-0新增-1修改
*/
@Override
public String checkForm(YysMaterialProcurementPlanForm form, int i) {
boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
@ -343,8 +371,10 @@ public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMateri
}
return countRecover;
}
/**
* 新增修改数据(事务回滚)
*
* @param id
* @param yysMaterialProcurementPlanForm
* @return
@ -383,6 +413,10 @@ public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMateri
}
yysMaterialProcurementItemService.saveOrUpdate(entitys);
}
//每次修改的时候去修改下 采购表的修改时间和创建用户 其次统计数量
entity.setLastModifyTime(DateUtil.getNowDate());
entity.setLastModifyUserId(userInfo.getUserId());
this.saveOrUpdate(entity);
}
}
}

6
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDeviceUpkeepController.java
Unescape View File

@ -183,6 +183,10 @@ public class YysDeviceUpkeepController {
}
Map<String, Object> yysDeviceUpkeepMap = JsonUtil.entityToMap(entity);
yysDeviceUpkeepMap.put("id", yysDeviceUpkeepMap.get("id"));
yysDeviceUpkeepMap.put("creatorUserId", userService.getInfo(yysDeviceUpkeepMap.get("creatorUserId").toString()).getRealName());
if (yysDeviceUpkeepMap.containsKey("lastModifyUserId")){
yysDeviceUpkeepMap.put("lastModifyUserId", userService.getInfo(yysDeviceUpkeepMap.get("lastModifyUserId").toString()).getRealName());
}
//副表数据
//子表数据
List<YysdeviceunkeeplogsEntity> yysdeviceunkeeplogsList = yysDeviceUpkeepService.getYysdeviceunkeeplogsList(entity.getId());
@ -208,7 +212,9 @@ public class YysDeviceUpkeepController {
Map<String, Object> yysDeviceUpkeepMap = JsonUtil.entityToMap(entity);
yysDeviceUpkeepMap.put("id", yysDeviceUpkeepMap.get("id"));
yysDeviceUpkeepMap.put("creatorUserId", userService.getInfo(yysDeviceUpkeepMap.get("creatorUserId").toString()).getRealName());
if (yysDeviceUpkeepMap.containsKey("lastModifyUserId")){
yysDeviceUpkeepMap.put("lastModifyUserId", userService.getInfo(yysDeviceUpkeepMap.get("lastModifyUserId").toString()).getRealName());
}
//副表数据
//子表数据
List<YysdeviceunkeeplogsEntity> yysdeviceunkeeplogsList = yysDeviceUpkeepService.getYysdeviceunkeeplogsList(entity.getId());

34
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialProcurementPlanController.java
Unescape View File

@ -8,23 +8,30 @@ import jnpf.base.ActionResult;
import jnpf.base.UserInfo;
import jnpf.exception.DataException;
import jnpf.permission.entity.UserEntity;
import jnpf.permission.service.UserService;
import jnpf.service.*;
import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.yysmaterialprocurementplan.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity;
import java.io.IOException;
import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.web.multipart.MultipartFile;
@ -36,7 +43,9 @@ import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import java.io.File;
import jnpf.onlinedev.model.ExcelImFieldModel;
import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
@ -51,6 +60,7 @@ import org.springframework.transaction.annotation.Transactional;
/**
* YysMaterialProcurementPlan
*
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
@ -78,6 +88,9 @@ public class YysMaterialProcurementPlanController {
@Autowired
private ConfigValueUtil configValueUtil;
@Resource
private UserService userService;
/**
* 列表
*
@ -92,6 +105,9 @@ public class YysMaterialProcurementPlanController {
for (YysMaterialProcurementPlanEntity entity : list) {
Map<String, Object> yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
if (StringUtils.isNoneBlank(yysMaterialProcurementPlanMap.get("creatorUserId").toString())) {
yysMaterialProcurementPlanMap.put("creatorUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("creatorUserId").toString()).getRealName());
}
//副表数据
//子表数据
List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(), yysMaterialProcurementPlanPagination);
@ -108,6 +124,7 @@ public class YysMaterialProcurementPlanController {
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
* 创建
*
@ -128,6 +145,7 @@ public class YysMaterialProcurementPlanController {
}
return ActionResult.success("创建成功");
}
/**
* 导出Excel
*
@ -274,8 +292,10 @@ public class YysMaterialProcurementPlanController {
}
return vo;
}
/**
* 编辑
*
* @param id
* @param yysMaterialProcurementPlanForm
* @return
@ -303,8 +323,10 @@ public class YysMaterialProcurementPlanController {
return ActionResult.fail("更新失败，数据不存在");
}
}
/**
* 删除
*
* @param id
* @return
*/
@ -320,9 +342,11 @@ public class YysMaterialProcurementPlanController {
}
return ActionResult.success("删除成功");
}
/**
* 表单信息(详情页)
* 详情页面使用-转换数据
*
* @param id
* @return
*/
@ -335,6 +359,10 @@ public class YysMaterialProcurementPlanController {
}
Map<String, Object> yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
yysMaterialProcurementPlanMap.put("creatorUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("creatorUserId").toString()).getRealName());
if (yysMaterialProcurementPlanMap.containsKey("lastModifyUserId")) {
yysMaterialProcurementPlanMap.put("lastModifyUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("lastModifyUserId").toString()).getRealName());
}
//副表数据
//子表数据
List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId());
@ -342,9 +370,11 @@ public class YysMaterialProcurementPlanController {
yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataDetail(yysMaterialProcurementPlanMap, YysMaterialProcurementPlanConstant.getFormData(), "590930391657874309", false);
return ActionResult.success(yysMaterialProcurementPlanMap);
}
/**
* 获取详情(编辑页)
* 编辑页面使用-不转换数据
*
* @param id
* @return
*/
@ -357,6 +387,10 @@ public class YysMaterialProcurementPlanController {
}
Map<String, Object> yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
yysMaterialProcurementPlanMap.put("creatorUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("creatorUserId").toString()).getRealName());
if (yysMaterialProcurementPlanMap.containsKey("lastModifyUserId")) {
yysMaterialProcurementPlanMap.put("lastModifyUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("lastModifyUserId").toString()).getRealName());
}
//副表数据
//子表数据
List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId());

2
jnpf-java-boot/jnpf-web/src/views/yys/yysdayplan/index.vue
Unescape View File

@ -51,6 +51,8 @@
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border>
<el-table-column prop="manufactureTime" label="生产日期" align="center">

48
jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/Detail.vue
Unescape View File

@ -3,8 +3,7 @@
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
content="详情"/>
<el-page-header @back="goBack" content="详情" />
<div class="options">
<el-button @click="goBack">取 消</el-button>
</div>
@ -13,44 +12,34 @@
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="8">
<jnpf-form-tip-item label="设备编码"
prop="deviceCode" >
<jnpf-form-tip-item label="设备编码" prop="deviceCode">
<p>{{ dataForm.deviceCode }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="设备名称"
prop="deviceName" >
<jnpf-form-tip-item label="设备名称" prop="deviceName">
<p>{{ dataForm.deviceName }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="购入日期"
prop="buyTime" >
<jnpf-form-tip-item label="购入日期" prop="buyTime">
<p>{{ dataForm.buyTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="所属部门"
prop="deviceDept" >
<jnpf-form-tip-item label="所属部门" prop="deviceDept">
<p>{{ dataForm.deviceDept }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="维修次数"
prop="repairsNum" >
<JnpfNumber v-model="dataForm.repairsNum"
placeholder="数字文本" disabled
:step="1" >
<jnpf-form-tip-item label="维修次数" prop="repairsNum">
<JnpfNumber v-model="dataForm.repairsNum" placeholder="数字文本" disabled :step="1">
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="保养次数"
prop="unkeepNum" >
<JnpfNumber v-model="dataForm.unkeepNum"
placeholder="数字文本" disabled
:step="1" >
<jnpf-form-tip-item label="保养次数" prop="unkeepNum">
<JnpfNumber v-model="dataForm.unkeepNum" placeholder="数字文本" disabled :step="1">
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
@ -78,9 +67,7 @@
</el-table-column>
<el-table-column prop="hours" label="总耗时">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.hours"
placeholder="总耗时" disabled
:step="1" >
<JnpfNumber v-model="scope.row.hours" placeholder="总耗时" disabled :step="1">
</JnpfNumber>
</template>
</el-table-column>
@ -111,8 +98,7 @@
</el-table-column>
<el-table-column prop="changNum" label="更换数量">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.changNum"
placeholder="更换数量" disabled
<JnpfNumber v-model="scope.row.changNum" placeholder="更换数量" disabled
:step="1">
</JnpfNumber>
</template>
@ -141,26 +127,22 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="创建人"
prop="creatorUserId" >
<jnpf-form-tip-item label="创建人" prop="creatorUserId">
<p>{{ dataForm.creatorUserId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="创建时间"
prop="creatorTime" >
<jnpf-form-tip-item label="创建时间" prop="creatorTime">
<p>{{ dataForm.creatorTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="修改人"
prop="lastModifyUserId" >
<jnpf-form-tip-item label="修改人" prop="lastModifyUserId">
<p>{{ dataForm.lastModifyUserId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="修改时间"
prop="lastModifyTime" >
<jnpf-form-tip-item label="修改时间" prop="lastModifyTime">
<p>{{ dataForm.lastModifyTime }}</p>
</jnpf-form-tip-item>
</el-col>

55
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/Detail.vue
Unescape View File

@ -3,8 +3,7 @@
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
content="详情"/>
<el-page-header @back="goBack" content="详情" />
<div class="options">
<el-button @click="goBack">取 消</el-button>
</div>
@ -13,32 +12,27 @@
<el-form ref="formRef" :model="dataForm" size="small" label-width="150px" label-position="right">
<template v-if="!loading">
<el-col :span="8">
<jnpf-form-tip-item label="采购计划单号"
prop="procurementNumber" >
<jnpf-form-tip-item label="采购计划单号" prop="procurementNumber">
<p>{{ dataForm.procurementNumber }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="单据日期"
prop="procurementDate" >
<jnpf-form-tip-item label="单据日期" prop="procurementDate">
<p>{{ dataForm.procurementDate }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="年月"
prop="procurementYearMonth" >
<jnpf-form-tip-item label="年月" prop="procurementYearMonth">
<p>{{ dataForm.procurementYearMonth }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="物料需求计划单号"
prop="planNumber" >
<jnpf-form-tip-item label="物料需求计划单号" prop="planNumber">
<p>{{ dataForm.planNumber }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="备注"
prop="reamrk" >
<jnpf-form-tip-item label="备注" prop="reamrk">
<p>{{ dataForm.reamrk }}</p>
</jnpf-form-tip-item>
</el-col>
@ -71,17 +65,15 @@
</el-table-column>
<el-table-column prop="lackNumber" label="欠缺量">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.lackNumber"
placeholder="数字文本" disabled
<JnpfNumber v-model="scope.row.lackNumber" placeholder="数字文本" disabled
:step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="procurementPlanNumber" label="拟采购量">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.procurementPlanNumber"
placeholder="数字文本" disabled
:step="1" >
<JnpfNumber v-model="scope.row.procurementPlanNumber" placeholder="数字文本"
disabled :step="1">
</JnpfNumber>
</template>
</el-table-column>
@ -93,6 +85,26 @@
</el-table>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="创建人" prop="creatorUserId">
<p>{{ dataForm.creatorUserId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="创建时间" prop="creatorTime">
<p>{{ formatDeliveryTime(dataForm.creatorTime) }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="修改人" prop="lastModifyUserId">
<p>{{ dataForm.lastModifyUserId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="修改时间" prop="lastModifyTime">
<p>{{ formatDeliveryTime(dataForm.lastModifyTime) }}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
@ -134,6 +146,15 @@
},
mounted() { },
methods: {
formatDeliveryTime(creatorTime) {
if (creatorTime != null) {
const date = new Date(creatorTime);
const year = date.getFullYear();
const month = date.getMonth() + 1;
const day = date.getDate();
return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
}
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {

143
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue
Unescape View File

@ -1,14 +1,10 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
:content="!dataForm.id ? '新建':'编辑'"/>
<el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
<div class="options">
<el-dropdown class="dropdown" placement="bottom">
<!-- <el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px">
更 多<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
@ -25,54 +21,62 @@
:loading="continueBtnLoading" :disabled='btnLoading'>
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button>
</el-dropdown> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
:disabled='continueBtnLoading'> 保
存</el-button>
<el-button @click="goBack"> 取 消</el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="150px" label-position="right" >
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="150px"
label-position="right">
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="8">
<jnpf-form-tip-item
label="采购计划单号" prop="procurementNumber" >
<JnpfInput v-model="dataForm.procurementNumber" @change="changeData('procurementNumber',-1)"
placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
<jnpf-form-tip-item label="采购计划单号" prop="procurementNumber">
<JnpfInput v-model="dataForm.procurementNumber"
@change="changeData('procurementNumber', -1)" placeholder="系统自动生成" readonly
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
label="单据日期" prop="procurementDate" >
<JnpfDatePicker v-model="dataForm.procurementDate" @change="changeData('procurementDate',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" >
<jnpf-form-tip-item label="单据日期" prop="procurementDate">
<JnpfDatePicker v-model="dataForm.procurementDate"
@change="changeData('procurementDate', -1)" :startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" clearable
:style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
label="年月" prop="procurementYearMonth" >
<JnpfDatePicker v-model="dataForm.procurementYearMonth" @change="changeData('procurementYearMonth',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable :style='{"width":"100%"}' type="month" format="yyyy-MM" >
<jnpf-form-tip-item label="年月" prop="procurementYearMonth">
<JnpfDatePicker v-model="dataForm.procurementYearMonth"
@change="changeData('procurementYearMonth', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择" clearable :style='{ "width": "100%" }' type="month" format="yyyy-MM">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
label="物料需求计划单号" prop="planNumber" >
<jnpf-form-tip-item label="物料需求计划单号" prop="planNumber">
<JnpfPopupSelect v-model="dataForm.planNumber" @change="changeData('planNumber', -1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.planNumber" placeholder="请选择" propsValue="plan_number" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='plan_number' field='planNumber' interfaceId="591169965881556997" :pageSize="20" :columnOptions="planNumbercolumnOptions" clearable :style='{"width":"100%"}'>
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.planNumber"
placeholder="请选择" propsValue="plan_number" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='plan_number' field='planNumber'
interfaceId="591169965881556997" :pageSize="20"
:columnOptions="planNumbercolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="备注" prop="reamrk" >
<jnpf-form-tip-item label="备注" prop="reamrk">
<JnpfTextarea v-model="dataForm.reamrk" @change="changeData('reamrk', -1)"
placeholder="请输入" :style='{"width":"100%"}' true type="textarea" :autosize='{"minRows":4,"maxRows":4}' >
placeholder="请输入" :style='{ "width": "100%" }' true type="textarea"
:autosize='{ "minRows": 4, "maxRows": 4 }'>
</JnpfTextarea>
</jnpf-form-tip-item>
</el-col>
@ -83,86 +87,87 @@
</div>
<el-table :data="dataForm.yysMaterialProcurementItemList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column
label="物料编码" prop="materialCode" >
<el-table-column label="物料编码" prop="materialCode">
<template slot="header" v-if="false">
<span class="required-sign">*</span>物料编码
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.materialCode" @change="changeData('yysmaterialprocurementitem-materialCode',scope.$index)"
<JnpfInput v-model="scope.row.materialCode"
@change="changeData('yysmaterialprocurementitem-materialCode', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="物料名称" prop="materialName" >
<el-table-column label="物料名称" prop="materialName">
<template slot="header" v-if="false">
<span class="required-sign">*</span>物料名称
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.materialName" @change="changeData('yysmaterialprocurementitem-materialName',scope.$index)"
<JnpfInput v-model="scope.row.materialName"
@change="changeData('yysmaterialprocurementitem-materialName', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="物料类型" prop="materialType" >
<el-table-column label="物料类型" prop="materialType">
<template slot="header" v-if="false">
<span class="required-sign">*</span>物料类型
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.materialType" @change="changeData('yysmaterialprocurementitem-materialType',scope.$index)"
<JnpfInput v-model="scope.row.materialType"
@change="changeData('yysmaterialprocurementitem-materialType', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="规格型号" prop="specification" >
<el-table-column label="规格型号" prop="specification">
<template slot="header" v-if="false">
<span class="required-sign">*</span>规格型号
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.specification" @change="changeData('yysmaterialprocurementitem-specification',scope.$index)"
<JnpfInput v-model="scope.row.specification"
@change="changeData('yysmaterialprocurementitem-specification', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="欠缺量" prop="lackNumber" >
<el-table-column label="欠缺量" prop="lackNumber">
<template slot="header" v-if="false">
<span class="required-sign">*</span>欠缺量
</template>
<template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.lackNumber" @change="changeData('yysmaterialprocurementitem-lackNumber',scope.$index)"
<JnpfInputNumber v-model="scope.row.lackNumber"
@change="changeData('yysmaterialprocurementitem-lackNumber', scope.$index)"
placeholder="数字文本" :precision="2" :step="1">
</JnpfInputNumber>
</template>
</el-table-column>
<el-table-column
label="拟采购量" prop="procurementPlanNumber" >
<el-table-column label="拟采购量" prop="procurementPlanNumber">
<template slot="header" v-if="false">
<span class="required-sign">*</span>拟采购量
</template>
<template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.procurementPlanNumber" @change="changeData('yysmaterialprocurementitem-procurementPlanNumber',scope.$index)"
<JnpfInputNumber v-model="scope.row.procurementPlanNumber"
@change="changeData('yysmaterialprocurementitem-procurementPlanNumber', scope.$index)"
placeholder="数字文本" :precision="2" :step="1">
</JnpfInputNumber>
</template>
</el-table-column>
<el-table-column
label="计量单位" prop="unit" >
<el-table-column label="计量单位" prop="unit">
<template slot="header" v-if="false">
<span class="required-sign">*</span>计量单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.unit" @change="changeData('yysmaterialprocurementitem-unit',scope.$index)"
<JnpfInput v-model="scope.row.unit"
@change="changeData('yysmaterialprocurementitem-unit', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</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="delyysMaterialProcurementItemList(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delyysMaterialProcurementItemList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -171,11 +176,47 @@
</div>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="创建人" prop="creatorUserId">
<JnpfInput v-model="dataForm.creatorUserId" @change="changeData('creatorUserId', -1)"
placeholder="自动生成" disabled clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="创建时间" prop="creatorTime">
<JnpfDatePicker v-model="dataForm.creatorTime" @change="changeData('creatorTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="自动生成" disabled clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="修改人" prop="lastModifyUserId">
<JnpfInput v-model="dataForm.lastModifyUserId"
@change="changeData('lastModifyUserId', -1)" placeholder="修改时记录" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="修改时间" prop="lastModifyTime">
<JnpfDatePicker v-model="dataForm.lastModifyTime"
@change="changeData('lastModifyTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="修改时记录" disabled clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
</div>
</transition>

88
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/index.vue
Unescape View File

@ -1,10 +1,3 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
@ -17,17 +10,15 @@
</el-col>
<el-col :span="6">
<el-form-item label="年月">
<JnpfDateRangePicker v-model="query.procurementYearMonth"
format="yyyy-MM" startPlaceholder="开始日期"
endPlaceholder="结束日期" >
<JnpfDateRangePicker v-model="query.procurementYearMonth" format="yyyy-MM"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据日期">
<JnpfDateRangePicker v-model="query.procurementDate"
format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期" >
<JnpfDateRangePicker v-model="query.procurementDate" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
@ -42,12 +33,14 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'" >导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
</el-button>
</div>
<div class="JNPF-common-head-right">
<!-- <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
@ -56,52 +49,42 @@
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</div> -->
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"
>
<el-table-column
prop="procurementNumber"
label="采购计划单号" align="left"
>
:span-method="arraySpanMethod" border>
<el-table-column prop="procurementYearMonth" label="年月" align="center">
</el-table-column>
<el-table-column prop="procurementNumber" label="采购计划单号" align="center">
</el-table-column>
<el-table-column
prop="procurementDate"
label="单据日期" align="left"
>
<el-table-column prop="planNumber" label="物料需求计划单号" align="center">
</el-table-column>
<el-table-column
prop="procurementYearMonth"
label="年月" align="left"
>
<el-table-column prop="procurementDate" label="单据日期" align="center">
</el-table-column>
<el-table-column
prop="planNumber"
label="物料需求计划单号" align="left"
>
<el-table-column prop="creatorUserId" label="创建人" align="center">
</el-table-column>
<el-table-column
prop="reamrk"
label="备注" align="left"
>
<el-table-column prop="creatorTime" label="创建日期" align="center" :formatter="formatDeliveryTime">
</el-table-column>
<el-table-column label="操作"
fixed="right" width="150" >
<el-table-column label="单据状态" prop="procurementStatus" align="center">
<template slot-scope="scope">
<el-button type="text"
@click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'" >编辑
<el-tag v-if="scope.row.procurementStatus == '1'">已保存</el-tag>
<el-tag type="success" v-else-if="scope.row.procurementStatus == '2'">已提交</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
@click="handleDel(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'" @click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -203,6 +186,15 @@
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
formatDeliveryTime(row, column) {
if (row.creatorTime != null) {
const date = new Date(row.creatorTime);
const year = date.getFullYear();
const month = date.getMonth() + 1;
const day = date.getDate();
return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
}
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {

39
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/Detail.vue
Unescape View File

@ -3,8 +3,7 @@
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
content="详情"/>
<el-page-header @back="goBack" content="详情" />
<div class="options">
<el-button @click="goBack">取 消</el-button>
</div>
@ -13,39 +12,34 @@
<el-form ref="formRef" :model="dataForm" size="small" label-width="150px" label-position="right">
<template v-if="!loading">
<el-col :span="12">
<jnpf-form-tip-item label="物料需求计划单号"
prop="planNumber" >
<jnpf-form-tip-item label="物料需求计划单号" prop="planNumber">
<p>{{ dataForm.planNumber }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="年月"
prop="planYearMonth" >
<jnpf-form-tip-item label="年月" prop="planYearMonth">
<p>{{ dataForm.planYearMonth }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="单据日期"
prop="orderDate" >
<jnpf-form-tip-item label="单据日期" prop="orderDate">
<p>{{ dataForm.orderDate }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="是否生成采购计划"
prop="isCreatePlan" >
<jnpf-form-tip-item label="是否生成采购计划" prop="isCreatePlan">
<p>{{ dataForm.isCreatePlan }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="备注"
prop="reamrk" >
<jnpf-form-tip-item label="备注" prop="reamrk">
<p>{{ dataForm.reamrk }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title">
<h2>设计子表</h2>
<h2>物料明细</h2>
</div>
<el-table :data="dataForm.tableField119" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
@ -76,40 +70,35 @@
</el-table-column>
<el-table-column prop="requirementNumber" label="需求数量">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.requirementNumber"
placeholder="数字文本" disabled
:step="1" >
<JnpfNumber v-model="scope.row.requirementNumber" placeholder="数字文本"
disabled :step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="inventoryNumber" label="库存">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.inventoryNumber"
placeholder="数字文本" disabled
<JnpfNumber v-model="scope.row.inventoryNumber" placeholder="数字文本" disabled
:step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="inventorySafetyNumber" label="库存安全">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.inventorySafetyNumber"
placeholder="数字文本" disabled
:step="1" >
<JnpfNumber v-model="scope.row.inventorySafetyNumber" placeholder="数字文本"
disabled :step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="notIntoNumber" label="采购未入库">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.notIntoNumber"
placeholder="数字文本" disabled
<JnpfNumber v-model="scope.row.notIntoNumber" placeholder="数字文本" disabled
:step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="lackNumber" label="欠缺量">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.lackNumber"
placeholder="数字文本" disabled
<JnpfNumber v-model="scope.row.lackNumber" placeholder="数字文本" disabled
:step="1">
</JnpfNumber>
</template>

112
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/form.vue
Unescape View File

@ -1,24 +1,21 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
:content="!dataForm.id ? '新建':'编辑'"/>
<el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
<div class="options">
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
:disabled='continueBtnLoading'> 保 存</el-button>
<el-button @click="goBack"> 取 消</el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="150px" label-position="right" >
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="150px"
label-position="right">
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="12">
<jnpf-form-tip-item
label="物料需求计划单号" prop="planNumber" >
<jnpf-form-tip-item label="物料需求计划单号" prop="planNumber">
<JnpfInput v-model="dataForm.planNumber" @change="changeData('planNumber', -1)"
placeholder="系统自动生成" readonly :style='{ "width": "100%" }'>
</JnpfInput>
@ -26,158 +23,161 @@
</el-col>
<el-col :span="12">
<jnpf-form-tip-item
label="年月" prop="planYearMonth" >
<JnpfDatePicker v-model="dataForm.planYearMonth" @change="changeData('planYearMonth',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable :style='{"width":"100%"}' type="month" format="yyyy-MM" >
<jnpf-form-tip-item label="年月" prop="planYearMonth">
<JnpfDatePicker v-model="dataForm.planYearMonth"
@change="changeData('planYearMonth', -1)" :startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" clearable
:style='{ "width": "100%" }' type="month" format="yyyy-MM">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item
label="单据日期" prop="orderDate" >
<jnpf-form-tip-item label="单据日期" prop="orderDate">
<JnpfDatePicker v-model="dataForm.orderDate" @change="changeData('orderDate', -1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" >
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item
label="是否生成采购计划" prop="isCreatePlan" >
<jnpf-form-tip-item label="是否生成采购计划" prop="isCreatePlan">
<JnpfSelect v-model="dataForm.isCreatePlan" @change="changeData('isCreatePlan', -1)"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="isCreatePlanOptions" :props="isCreatePlanProps" >
placeholder="请选择" clearable :style='{ "width": "100%" }' :options="isCreatePlanOptions"
:props="isCreatePlanProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="备注" prop="reamrk" >
<jnpf-form-tip-item label="备注" prop="reamrk">
<JnpfTextarea v-model="dataForm.reamrk" @change="changeData('reamrk', -1)"
placeholder="请输入" :style='{"width":"100%"}' true type="textarea" :autosize='{"minRows":4,"maxRows":4}' >
placeholder="请输入" :style='{ "width": "100%" }' true type="textarea"
:autosize='{ "minRows": 4, "maxRows": 4 }'>
</JnpfTextarea>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title">
<h2>设计子表</h2>
<h2>物料明细</h2>
</div>
<el-table :data="dataForm.yysMaterialRequirementItemList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column
label="物料编码" prop="materialCode" >
<el-table-column label="物料编码" prop="materialCode">
<template slot="header" v-if="true">
<span class="required-sign">*</span>物料编码
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.materialCode" @change="changeData('yysmaterialrequirementitem-materialCode',scope.$index)"
<JnpfInput v-model="scope.row.materialCode"
@change="changeData('yysmaterialrequirementitem-materialCode', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="物料名称" prop="materialName" >
<el-table-column label="物料名称" prop="materialName">
<template slot="header" v-if="true">
<span class="required-sign">*</span>物料名称
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.materialName" @change="changeData('yysmaterialrequirementitem-materialName',scope.$index)"
<JnpfInput v-model="scope.row.materialName"
@change="changeData('yysmaterialrequirementitem-materialName', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="物料类型" prop="materialType" >
<el-table-column label="物料类型" prop="materialType">
<template slot="header" v-if="false">
<span class="required-sign">*</span>物料类型
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.materialType" @change="changeData('yysmaterialrequirementitem-materialType',scope.$index)"
<JnpfInput v-model="scope.row.materialType"
@change="changeData('yysmaterialrequirementitem-materialType', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="规格型号" prop="specification" >
<el-table-column label="规格型号" prop="specification">
<template slot="header" v-if="false">
<span class="required-sign">*</span>规格型号
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.specification" @change="changeData('yysmaterialrequirementitem-specification',scope.$index)"
<JnpfInput v-model="scope.row.specification"
@change="changeData('yysmaterialrequirementitem-specification', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="计量单位" prop="unit" >
<el-table-column label="计量单位" prop="unit">
<template slot="header" v-if="false">
<span class="required-sign">*</span>计量单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.unit" @change="changeData('yysmaterialrequirementitem-unit',scope.$index)"
<JnpfInput v-model="scope.row.unit"
@change="changeData('yysmaterialrequirementitem-unit', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="需求数量" prop="requirementNumber" >
<el-table-column label="需求数量" prop="requirementNumber">
<template slot="header" v-if="false">
<span class="required-sign">*</span>需求数量
</template>
<template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.requirementNumber" @change="changeData('yysmaterialrequirementitem-requirementNumber',scope.$index)"
<JnpfInputNumber v-model="scope.row.requirementNumber"
@change="changeData('yysmaterialrequirementitem-requirementNumber', scope.$index)"
placeholder="数字文本" :precision="2" :step="1">
</JnpfInputNumber>
</template>
</el-table-column>
<el-table-column
label="库存" prop="inventoryNumber" >
<el-table-column label="库存" prop="inventoryNumber">
<template slot="header" v-if="false">
<span class="required-sign">*</span>库存
</template>
<template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.inventoryNumber" @change="changeData('yysmaterialrequirementitem-inventoryNumber',scope.$index)"
<JnpfInputNumber v-model="scope.row.inventoryNumber"
@change="changeData('yysmaterialrequirementitem-inventoryNumber', scope.$index)"
placeholder="数字文本" :precision="2" :step="1">
</JnpfInputNumber>
</template>
</el-table-column>
<el-table-column
label="库存安全" prop="inventorySafetyNumber" >
<el-table-column label="库存安全" prop="inventorySafetyNumber">
<template slot="header" v-if="false">
<span class="required-sign">*</span>库存安全
</template>
<template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.inventorySafetyNumber" @change="changeData('yysmaterialrequirementitem-inventorySafetyNumber',scope.$index)"
<JnpfInputNumber v-model="scope.row.inventorySafetyNumber"
@change="changeData('yysmaterialrequirementitem-inventorySafetyNumber', scope.$index)"
placeholder="数字文本" :precision="2" :step="1">
</JnpfInputNumber>
</template>
</el-table-column>
<el-table-column
label="采购未入库" prop="notIntoNumber" >
<el-table-column label="采购未入库" prop="notIntoNumber">
<template slot="header" v-if="false">
<span class="required-sign">*</span>采购未入库
</template>
<template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.notIntoNumber" @change="changeData('yysmaterialrequirementitem-notIntoNumber',scope.$index)"
<JnpfInputNumber v-model="scope.row.notIntoNumber"
@change="changeData('yysmaterialrequirementitem-notIntoNumber', scope.$index)"
placeholder="数字文本" :precision="2" :step="1">
</JnpfInputNumber>
</template>
</el-table-column>
<el-table-column
label="欠缺量" prop="lackNumber" >
<el-table-column label="欠缺量" prop="lackNumber">
<template slot="header" v-if="true">
<span class="required-sign">*</span>欠缺量
</template>
<template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.lackNumber" @change="changeData('yysmaterialrequirementitem-lackNumber',scope.$index)"
<JnpfInputNumber v-model="scope.row.lackNumber"
@change="changeData('yysmaterialrequirementitem-lackNumber', scope.$index)"
placeholder="数字文本" :precision="2" :step="1">
</JnpfInputNumber>
</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="delyysMaterialRequirementItemList(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delyysMaterialRequirementItemList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -189,8 +189,8 @@
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
</div>
</transition>

23
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/index.vue
Unescape View File

@ -55,16 +55,6 @@
v-has="'btn_download'">导出
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border>
@ -76,7 +66,7 @@
</el-table-column>
<el-table-column prop="creatorUserId" label="创建人" align="center">
</el-table-column>
<el-table-column prop="creatorTime" label="创建日期" align="center">
<el-table-column prop="creatorTime" label="创建日期" align="center" :formatter="formatDeliveryTime">
</el-table-column>
<el-table-column label="是否生成采购计划" prop="isCreatePlan" align="center">
<!-- <template slot-scope="scope">
@ -96,6 +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>
</template>
</el-table-column>
</JNPF-table>
@ -205,6 +197,15 @@ export default {
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
formatDeliveryTime(row, column) {
if (row.creatorTime != null) {
const date = new Date(row.creatorTime);
const year = date.getFullYear();
const month = date.getMonth() + 1;
const day = date.getDate();
return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
}
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {

Write Preview
Loading…
Cancel
Save