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

Merge remote-tracking branch 'origin/master'

Browse Source
master
guochaojie 2 months ago
parent 98b9654b91 d83a577ad8
commit a02f2c7668
16 changed files with 430 additions and 217 deletions
Show Stats Download Patch File Download Diff File

6
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayWorkService.java
Unescape View File

@ -47,4 +47,10 @@ public interface YysDayWorkService extends IService<YysDayWorkEntity> {
* @return
*/
String sure(ConfirmResponse request);
void syncIsForzen(String id);
String isFrozen(String id);
String cancelFrozen(String id);
}

3
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMonthlyProductionService.java
Unescape View File

@ -35,4 +35,7 @@ public interface YysMonthlyProductionService extends IService<YysMonthlyProducti
// 查询未进行MPR运算的计划
List<YysMonthlyProductionEntity> getUnMPRList(String month);
String isFrozen(String id);
String cancelFrozen(String id);
}

45
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java
Unescape View File

@ -28,7 +28,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
/**
*
* yysDayWork
* 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@ -65,7 +64,10 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
public List<YysDayWorkEntity> getList(YysDayWorkPagination yysDayWorkPagination) {
return getTypeList(yysDayWorkPagination, yysDayWorkPagination.getDataType());
}
/** 列表查询 */
/**
* 列表查询
*/
@Override
public List<YysDayWorkEntity> getTypeList(YysDayWorkPagination yysDayWorkPagination, String dataType) {
String userId = userProvider.get().getUserId();
@ -289,27 +291,34 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
return this.list(yysDayWorkQueryWrapper);
}
}
@Override
public YysDayWorkEntity getInfo(String id) {
QueryWrapper<YysDayWorkEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysDayWorkEntity::getId, id);
return this.getOne(queryWrapper);
}
@Override
public void create(YysDayWorkEntity entity) {
this.save(entity);
}
@Override
public boolean update(String id, YysDayWorkEntity entity) {
return this.updateById(entity);
}
@Override
public void delete(YysDayWorkEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
}
}
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
/**
* 验证表单唯一字段，正则，非空 i-0新增-1修改
*/
@Override
public String checkForm(YysDayWorkForm form, int i) {
boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
@ -343,8 +352,10 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
}
return countRecover;
}
/**
* 新增修改数据(事务回滚)
*
* @param id
* @param yysDayWorkForm
* @return
@ -365,6 +376,7 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
entity.setId(mainId);
entity.setVersion(0);
entity.setDeliveryTime(entity.getManufactureTime());
entity.setIsFrozen("否");
} else {
entity.setLastModifyTime(DateUtil.getNowDate());
entity.setLastModifyUserId(userInfo.getUserId());
@ -389,6 +401,8 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
//查询所有待确认的数据
LambdaQueryWrapper<YysDayWorkEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(YysDayWorkEntity::getIsConfirm, request.getFlag());
wrapper.eq(YysDayWorkEntity::getIsFrozen, "否");
wrapper.isNull(YysDayWorkEntity::getDeleteMark);
List<YysDayWorkEntity> root = this.list(wrapper);
if (CollectionUtils.isEmpty(root)) {
return Collections.emptyList();
@ -489,4 +503,29 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
}
return "确认失败";
}
@Override
public void syncIsForzen(String id) {
LambdaQueryWrapper<YysDayWorkEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(YysDayWorkEntity::getMonthId, id);
List<YysDayWorkEntity> list = this.list(wrapper);
list.forEach(obj -> obj.setIsFrozen("是"));
this.updateBatchById(list);
}
@Override
public String isFrozen(String id) {
YysDayWorkEntity entity = this.getById(id);
entity.setIsFrozen("是");
this.updateById(entity);
return "冻结成功";
}
@Override
public String cancelFrozen(String id) {
YysDayWorkEntity entity = this.getById(id);
entity.setIsFrozen("否");
this.updateById(entity);
return "取消冻结成功";
}
}

25
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMonthlyProductionServiceImpl.java
Unescape View File

@ -17,6 +17,7 @@ import jnpf.model.yysmonthlyproduction.YysMonthlyProductionConstant;
import jnpf.model.yysmonthlyproduction.YysMonthlyProductionForm;
import jnpf.model.yysmonthlyproduction.YysMonthlyProductionPagination;
import jnpf.permission.entity.UserEntity;
import jnpf.service.YysDayWorkService;
import jnpf.service.YysMonthlyProductionService;
import jnpf.util.*;
import org.apache.commons.collections4.CollectionUtils;
@ -28,6 +29,7 @@ import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@ -46,6 +48,9 @@ public class YysMonthlyProductionServiceImpl extends ServiceImpl<YysMonthlyProdu
@Autowired
private UserProvider userProvider;
@Autowired
private YysDayWorkService yysDayWorkService;
@Override
public List<YysMonthlyProductionEntity> getList(YysMonthlyProductionPagination yysMonthlyProductionPagination) {
return getTypeList(yysMonthlyProductionPagination, yysMonthlyProductionPagination.getDataType());
@ -321,6 +326,7 @@ public class YysMonthlyProductionServiceImpl extends ServiceImpl<YysMonthlyProdu
entity.setCreatorUserId(userInfo.getUserId());
entity.setId(mainId);
entity.setVersion(0);
entity.setIsFrozen("否");
} else {
YysMonthlyProductionEntity byId = this.getById(yysMonthlyProductionForm.getId());
boolean isProductNameChanged = !byId.getProductName().equals(yysMonthlyProductionForm.getProductName());
@ -350,4 +356,23 @@ public class YysMonthlyProductionServiceImpl extends ServiceImpl<YysMonthlyProdu
.orderByDesc(YysMonthlyProductionEntity::getDeliveryTime);
return this.list();
}
@Override
public String isFrozen(String id) {
YysMonthlyProductionEntity entity = this.getById(id);
entity.setIsFrozen("是");
boolean result = this.updateById(entity);
if (result){
CompletableFuture.runAsync(()->yysDayWorkService.syncIsForzen(id));
}
return "冻结成功";
}
@Override
public String cancelFrozen(String id) {
YysMonthlyProductionEntity entity = this.getById(id);
entity.setIsFrozen("否");
this.updateById(entity);
return "取消冻结成功";
}
}

93
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDayWorkController.java
Unescape View File

@ -1,60 +1,49 @@
package jnpf.controller;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.xuyanwu.spring.file.storage.FileInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jnpf.base.ActionResult;
import jnpf.base.UserInfo;
import jnpf.exception.DataException;
import jnpf.permission.entity.UserEntity;
import jnpf.service.*;
import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.yysdaywork.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.model.ColumnDataModel;
import jnpf.base.util.VisualUtils;
import jnpf.base.vo.DownloadVO;
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;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
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.entity.YysDayWorkEntity;
import jnpf.entity.YysMonthlyProductionEntity;
import jnpf.model.visualJson.config.HeaderModel;
import jnpf.model.yysdaywork.*;
import jnpf.onlinedev.model.ExcelImFieldModel;
import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
import cn.xuyanwu.spring.file.storage.FileInfo;
import jnpf.service.YysDayWorkService;
import jnpf.service.YysMonthlyProductionService;
import jnpf.util.*;
import lombok.Cleanup;
import jnpf.model.visualJson.config.HeaderModel;
import jnpf.base.model.ColumnDataModel;
import jnpf.base.util.VisualUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
import java.io.File;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
/**
* yysDayWork
@ -80,8 +69,7 @@ public class YysDayWorkController {
private YysDayWorkService yysDayWorkService;
@Autowired
private YysClassesService yysClassesService;
private YysMonthlyProductionService yysMonthlyProductionService;
@Autowired
private ConfigValueUtil configValueUtil;
@ -97,9 +85,14 @@ public class YysDayWorkController {
public ActionResult list(@RequestBody YysDayWorkPagination yysDayWorkPagination) throws IOException {
List<YysDayWorkEntity> list = yysDayWorkService.getList(yysDayWorkPagination);
List<Map<String, Object>> realList = new ArrayList<>();
List<YysMonthlyProductionEntity> list1 = yysMonthlyProductionService.list();
Map<String, String> collect = list1.stream().collect(Collectors.toMap(YysMonthlyProductionEntity::getId, YysMonthlyProductionEntity::getIsFrozen));
for (YysDayWorkEntity entity : list) {
Map<String, Object> yysDayWorkMap = JsonUtil.entityToMap(entity);
yysDayWorkMap.put("id", yysDayWorkMap.get("id"));
if (MapUtils.isNotEmpty(collect) && collect.containsKey(entity.getMonthId())) {
yysDayWorkMap.put("f_isFrozen", collect.getOrDefault(entity.getMonthId(), ""));
}
//副表数据
//子表数据
realList.add(yysDayWorkMap);
@ -570,4 +563,16 @@ public class YysDayWorkController {
return ActionResult.fail(result);
}
@Operation(summary = "冻结")
@GetMapping("/isFrozen/{id}")
public ActionResult isFrozen(@PathVariable("id") String id) {
return ActionResult.success(yysDayWorkService.isFrozen(id));
}
@Operation(summary = "解冻")
@GetMapping("/cancelFrozen/{id}")
public ActionResult cancelFrozen(@PathVariable("id") String id) {
return ActionResult.success(yysDayWorkService.cancelFrozen(id));
}
}

12
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMonthlyProductionController.java
Unescape View File

@ -531,6 +531,18 @@ public class YysMonthlyProductionController {
return ActionResult.success(yysMonthlyProductionMap);
}
@Operation(summary = "冻结")
@GetMapping("/isFrozen/{id}")
public ActionResult isFrozen(@PathVariable("id") String id) {
return ActionResult.success(yysMonthlyProductionService.isFrozen(id));
}
@Operation(summary = "解冻")
@GetMapping("/cancelFrozen/{id}")
public ActionResult cancelFrozen(@PathVariable("id") String id) {
return ActionResult.success(yysMonthlyProductionService.cancelFrozen(id));
}
@PostMapping("/mrp/{month}")
@Operation(summary = "MRP运算")
public ActionResult MRP(@PathVariable String month) {

2
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysDayWorkEntity.java
Unescape View File

@ -48,6 +48,8 @@ public class YysDayWorkEntity {
private String isConfirm;
@TableField("DELIVERY_TIME")
private Date deliveryTime;
@TableField(value = "IS_FROZEN" , updateStrategy = FieldStrategy.IGNORED)
private String isFrozen;
@TableField("F_CREATOR_TIME")
private Date creatorTime;
@TableField("F_CREATOR_USER_ID")

4
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysMonthlyProductionEntity.java
Unescape View File

@ -32,6 +32,10 @@ public class YysMonthlyProductionEntity {
private String currentInventory;
@TableField(value = "PLAN_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
private String planNumber;
@TableField(value = "IS_MRP" , updateStrategy = FieldStrategy.IGNORED)
private String isMrp;
@TableField(value = "IS_FROZEN" , updateStrategy = FieldStrategy.IGNORED)
private String isFrozen;
@TableField(value = "DELIVERY_TIME" , updateStrategy = FieldStrategy.IGNORED)
private Date deliveryTime;
@TableField("F_CREATOR_TIME")

3
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaywork/YysDayWorkForm.java
Unescape View File

@ -59,4 +59,7 @@ public class YysDayWorkForm {
/** 生产状态 **/
@JsonProperty("productionStatus")
private Object productionStatus;
/** 是否冻结 **/
@JsonProperty("isFrozen")
private String isFrozen;
}

3
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysmonthlyproduction/YysMonthlyProductionForm.java
Unescape View File

@ -44,4 +44,7 @@ public class YysMonthlyProductionForm {
/** 交期 **/
@JsonProperty("deliveryTime")
private String deliveryTime;
/** 是否冻结 **/
@JsonProperty("isFrozen")
private String isFrozen;
}

1
jnpf-java-boot/jnpf-web/src/views/yys/yysdaywork/form.vue
Unescape View File

@ -196,6 +196,7 @@ export default {
sort: 1,
productionStatus: '1',
version: 0,
isFrozen:undefined,
},
tableRequiredData: {},
dataRule:

87
jnpf-java-boot/jnpf-web/src/views/yys/yysdaywork/index.vue
Unescape View File

@ -66,37 +66,37 @@
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border>
<el-table-column prop="manufactureTime" label="生产日期" align="center">
<el-table-column prop="manufactureTime" label="生产日期" align="center" width="150">
</el-table-column>
<el-table-column prop="deviceCode" label="设备编码" align="center">
<el-table-column prop="deviceCode" label="设备编码" align="center" width="150">
</el-table-column>
<el-table-column prop="deviceName" label="设备名称" align="center">
<el-table-column prop="deviceName" label="设备名称" align="center" width="150">
</el-table-column>
<el-table-column prop="sort" label="顺序号" align="center">
<el-table-column prop="sort" label="顺序号" align="center" width="150">
<template slot-scope="scope" v-if="scope.row.sort">
<JnpfNumber v-model="scope.row.sort" :thousands="false" />
</template>
</el-table-column>
<el-table-column prop="post" label="班次" align="center">
<el-table-column prop="post" label="班次" align="center" width="150">
</el-table-column>
<el-table-column prop="startTime" label="开始时间" align="center">
<el-table-column prop="startTime" label="开始时间" align="center" width="150">
</el-table-column>
<el-table-column prop="endTime" label="结束时间" align="center">
<el-table-column prop="endTime" label="结束时间" align="center" width="150">
</el-table-column>
<el-table-column prop="productCode" label="产品编码" align="center">
<el-table-column prop="productCode" label="产品编码" align="center" width="150">
</el-table-column>
<el-table-column prop="productName" label="产品名称" align="center">
<el-table-column prop="productName" label="产品名称" align="center" width="150">
</el-table-column>
<el-table-column prop="models" label="规格型号" align="center">
<el-table-column prop="models" label="规格型号" align="center" width="150">
</el-table-column>
<el-table-column prop="measurementUnit" label="计量单位" align="center">
<el-table-column prop="measurementUnit" label="计量单位" align="center" width="150">
</el-table-column>
<el-table-column prop="planNumber" label="计量数量" align="center">
<el-table-column prop="planNumber" label="计量数量" align="center" width="150">
<template slot-scope="scope" v-if="scope.row.planNumber">
<JnpfNumber v-model="scope.row.planNumber" :thousands="false" />
</template>
</el-table-column>
<el-table-column label="生产状态" prop="productionStatus" align="center">
<el-table-column label="生产状态" prop="productionStatus" align="center" width="150">
<!-- <template slot-scope="scope">
{{ scope.row.productionStatus }}
</template> -->
@ -105,7 +105,13 @@
<el-tag type="success" v-else-if="scope.row.productionStatus == '已完工'">已完工</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column prop="isFrozen" label="是否冻结" align="center" width="150">
<template slot-scope="scope">
<el-tag v-if="scope.row.isFrozen == '是'">是</el-tag>
<el-tag type="success" v-else-if="scope.row.isFrozen == '否'">否</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="250">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
</el-button>
@ -113,6 +119,12 @@
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">详情
</el-button>
<el-button type="text" v-show="scope.row.isFrozen == '否'"
@click="isFrozen(scope.row.id, scope.row.manufactureTime)">冻结
</el-button>
<el-button type="text" v-show="scope.row.f_isFrozen == '否' && scope.row.isFrozen == '是' "
@click="cancelForzen(scope.row.id)">取消冻结
</el-button>
</template>
</el-table-column>
</JNPF-table>
@ -225,6 +237,53 @@ export default {
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
isFrozen(id, time) {
if (time != null) {
const targetDate = new Date(time);
// 获取当前日期
const today = new Date();
if (targetDate.getTime() < today.getTime()) {
this.$message.error('生产日期小于当前日期，不允许冻结');
return
}
}
this.$confirm('此操作将冻结该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/example/YysDayWork/isFrozen/${id}`,
method: 'GET'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
cancelForzen(id) {
this.$confirm('此操作将取消冻结该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/example/YysDayWork/cancelFrozen/${id}`,
method: 'GET'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {

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

@ -51,7 +51,7 @@
</el-table-column>
<el-table-column prop="className" label="分类名称" align="center">
</el-table-column>
<el-table-column prop="parentClassification" label="上级分类" align="center">
<el-table-column prop="parentClassname" label="上级分类" align="center">
</el-table-column>
<el-table-column prop="enableStatus" label="启用状态" align="center">
<template slot-scope="scope">

1
jnpf-java-boot/jnpf-web/src/views/yys/yysmonthlyproduction/form.vue
Unescape View File

@ -133,6 +133,7 @@ export default {
currentInventory: undefined,
deliveryTime: undefined,
version: 0,
isFrozen:undefined,
},
tableRequiredData: {},
dataRule:

56
jnpf-java-boot/jnpf-web/src/views/yys/yysmonthlyproduction/index.vue
Unescape View File

@ -32,9 +32,9 @@
</el-button>
<el-button type="success" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()">导入
</el-button>
<el-button type="success" icon="icon-ym icon-ym-btn-add" @click="handelUpload()">智能排产
<el-button type="success" icon="icon-ym el-icon-data-line" @click="handelUpload()">智能排产
</el-button>
<el-button type="success" icon="icon-ym icon-ym-btn-add" @click="handelUpload()">MRP运算
<el-button type="success" icon="icon-ym el-icon-data-analysis" @click="handelUpload()">MRP运算
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -66,7 +66,13 @@
</el-table-column>
<el-table-column prop="deliveryTime" label="交期" align="center">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column prop="isFrozen" label="是否冻结" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.isFrozen == '是'">是</el-tag>
<el-tag type="success" v-else-if="scope.row.isFrozen == '否'">否</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="250">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
</el-button>
@ -74,6 +80,11 @@
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">详情
</el-button>
<el-button type="text" v-show="scope.row.isFrozen == '否'" @click="isFrozen(scope.row.id)">冻结
</el-button>
<el-button type="text" v-show="scope.row.isFrozen == '是'"
@click="cancelForzen(scope.row.id)">取消冻结
</el-button>
</template>
</el-table-column>
</JNPF-table>
@ -112,6 +123,7 @@ import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
import { CANCELED } from 'dropzone';
export default {
components: {
@ -179,6 +191,44 @@ export default {
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
isFrozen(id) {
this.$confirm('此操作将冻结该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/example/YysMonthlyProduction/isFrozen/${id}`,
method: 'GET'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
cancelForzen(id) {
this.$confirm('此操作将取消冻结该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/example/YysMonthlyProduction/cancelFrozen/${id}`,
method: 'GET'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {

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

@ -51,7 +51,7 @@
</el-table-column>
<el-table-column prop="className" label="分类名称" align="center">
</el-table-column>
<el-table-column prop="parentClassification" label="上级分类" align="center">
<el-table-column prop="parentClassname" label="上级分类" align="center">
</el-table-column>
<el-table-column prop="enableStatus" label="启用状态" align="center">
<template slot-scope="scope">

Write Preview
Loading…
Cancel
Save