商品回收类目添加图片和描述

master
CJYXTX\27961 8 months ago
parent ce5225592c
commit 79f7da57f8

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* V3.5 * V3.5
* https://www.jnpfsoft.com * https://www.jnpfsoft.com
* JNPF * JNPF
* 2024-03-05 * 2024-03-11
*/ */
public interface NxProductMapper extends BaseMapper<NxProductEntity> { public interface NxProductMapper extends BaseMapper<NxProductEntity> {

@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
* V3.5 * V3.5
* https://www.jnpfsoft.com * https://www.jnpfsoft.com
* JNPF * JNPF
* 2024-03-05 * 2024-03-11
*/ */
public interface NxProductService extends IService<NxProductEntity> { public interface NxProductService extends IService<NxProductEntity> {
List<NxProductEntity> getList(NxProductPagination nxProductPagination); List<NxProductEntity> getList(NxProductPagination nxProductPagination);

@ -36,7 +36,7 @@ import jnpf.permission.entity.UserEntity;
* V3.5 * V3.5
* https://www.jnpfsoft.com * https://www.jnpfsoft.com
* JNPF * JNPF
* 2024-03-05 * 2024-03-11
*/ */
@Service @Service
public class NxProductServiceImpl extends ServiceImpl<NxProductMapper, NxProductEntity> implements NxProductService{ public class NxProductServiceImpl extends ServiceImpl<NxProductMapper, NxProductEntity> implements NxProductService{
@ -316,10 +316,18 @@ public class NxProductServiceImpl extends ServiceImpl<NxProductMapper, NxProduct
if(isSave){ if(isSave){
String mainId = RandomUtil.uuId() ; String mainId = RandomUtil.uuId() ;
entity.setCode(generaterSwapUtil.getBillNumber("prodcut", false)); entity.setCode(generaterSwapUtil.getBillNumber("prodcut", false));
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
entity.setLastModifyTime(null);
entity.setLastModifyUserId(null);
entity.setId(mainId); entity.setId(mainId);
entity.setVersion(0); entity.setVersion(0);
}else{ }else{
entity.setCode(generaterSwapUtil.getBillNumber("prodcut", false)); entity.setCode(generaterSwapUtil.getBillNumber("prodcut", false));
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
entity.setLastModifyTime(null);
entity.setLastModifyUserId(null);
} }
this.saveOrUpdate(entity); this.saveOrUpdate(entity);

@ -54,7 +54,7 @@ import org.springframework.transaction.annotation.Transactional;
* @ V3.5 * @ V3.5
* @ https://www.jnpfsoft.com * @ https://www.jnpfsoft.com
* @ JNPF * @ JNPF
* @ 2024-03-05 * @ 2024-03-11
*/ */
@Slf4j @Slf4j
@RestController @RestController
@ -173,8 +173,23 @@ public class NxProductController {
case "unit" : case "unit" :
entitys.add(new ExcelExportEntity("库存单位" ,"unit")); entitys.add(new ExcelExportEntity("库存单位" ,"unit"));
break; break;
case "remak" : case "description" :
entitys.add(new ExcelExportEntity("备注" ,"remak")); entitys.add(new ExcelExportEntity("描述" ,"description"));
break;
case "creatorTime" :
entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime"));
break;
case "creatorUserId" :
entitys.add(new ExcelExportEntity("创建用户" ,"creatorUserId"));
break;
case "lastModifyTime" :
entitys.add(new ExcelExportEntity("修改时间" ,"lastModifyTime"));
break;
case "lastModifyUserId" :
entitys.add(new ExcelExportEntity("修改用户" ,"lastModifyUserId"));
break;
case "photo" :
entitys.add(new ExcelExportEntity("图片" ,"photo"));
break; break;
default: default:
break; break;

@ -9,7 +9,7 @@ import java.util.Date;
* @ V3.5 * @ V3.5
* @ https://www.jnpfsoft.com * @ https://www.jnpfsoft.com
* @ JNPF * @ JNPF
* @ 2024-03-05 * @ 2024-03-11
*/ */
@Data @Data
@TableName("nx_product") @TableName("nx_product")
@ -24,21 +24,23 @@ public class NxProductEntity {
private String spec; private String spec;
@TableField(value = "UNIT" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "UNIT" , updateStrategy = FieldStrategy.IGNORED)
private String unit; private String unit;
@TableField(value = "REMAK" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "DESCRIPTION" , updateStrategy = FieldStrategy.IGNORED)
private String remak; private String description;
@TableField(value = "f_creator_time" , fill = FieldFill.INSERT) @TableField(value = "PHOTO" , updateStrategy = FieldStrategy.IGNORED)
private String photo;
@TableField("F_CREATOR_TIME")
private Date creatorTime; private Date creatorTime;
@TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) @TableField("F_CREATOR_USER_ID")
private String creatorUserId; private String creatorUserId;
@TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) @TableField("F_LAST_MODIFY_TIME")
private Date lastModifyTime; private Date lastModifyTime;
@TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) @TableField("F_LAST_MODIFY_USER_ID")
private String lastModifyUserId; private String lastModifyUserId;
@TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) @TableField("F_DELETE_TIME")
private Date deleteTime; private Date deleteTime;
@TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) @TableField("F_DELETE_USER_ID")
private String deleteUserId; private String deleteUserId;
@TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) @TableField("F_DELETE_MARK")
private Integer deleteMark; private Integer deleteMark;
@TableField("F_TENANT_ID") @TableField("F_TENANT_ID")
private String tenantId; private String tenantId;

@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @ V3.5 * @ V3.5
* @ https://www.jnpfsoft.com * @ https://www.jnpfsoft.com
* @ JNPF * @ JNPF
* @ 2024-03-05 * @ 2024-03-11
*/ */
@Data @Data
public class NxProductForm { public class NxProductForm {
@ -32,11 +32,22 @@ public class NxProductForm {
/** 库存单位 **/ /** 库存单位 **/
@JsonProperty("unit") @JsonProperty("unit")
private Object unit; private Object unit;
/** 备注 **/ /** 描述 **/
@JsonProperty("remak") @JsonProperty("description")
private String remak; private String description;
/** 创建时间 **/
/** 备注 **/ @JsonProperty("creatorTime")
@JsonProperty("status") private String creatorTime;
private Integer status; /** 创建用户 **/
@JsonProperty("creatorUserId")
private String creatorUserId;
/** 修改时间 **/
@JsonProperty("lastModifyTime")
private String lastModifyTime;
/** 修改用户 **/
@JsonProperty("lastModifyUserId")
private String lastModifyUserId;
/** 图片 **/
@JsonProperty("photo")
private Object photo;
} }

@ -11,7 +11,7 @@ import java.util.List;
* @ V3.5 * @ V3.5
* @ https://www.jnpfsoft.com * @ https://www.jnpfsoft.com
* @ JNPF * @ JNPF
* @ 2024-03-05 * @ 2024-03-11
*/ */
@Data @Data
public class NxProductPagination extends Pagination { public class NxProductPagination extends Pagination {

@ -1,49 +1,52 @@
<template> <template>
<el-dialog <el-dialog title="详情"
title="详情" :close-on-click-modal="false" append-to-body
:close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
append-to-body width="600px">
:visible.sync="visible" <el-row :gutter="15" class="">
class="JNPF-dialog JNPF-dialog_center" <el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
lock-scroll
width="600px"
>
<el-row :gutter="15" class="">
<el-form
ref="formRef"
:model="dataForm"
size="small"
label-width="100px"
label-position="right"
>
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="12"> <el-col :span="12" >
<jnpf-form-tip-item label="编码" prop="code"> <jnpf-form-tip-item label="编码"
<p>{{ dataForm.code }}</p> prop="code" >
<p>{{dataForm.code}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12" >
<jnpf-form-tip-item label="名称" prop="name"> <jnpf-form-tip-item label="名称"
<p>{{ dataForm.name }}</p> prop="name" >
<p>{{dataForm.name}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12" >
<jnpf-form-tip-item label="规格" prop="spec"> <jnpf-form-tip-item label="规格"
<p>{{ dataForm.spec }}</p> prop="spec" >
<p>{{dataForm.spec}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12" >
<jnpf-form-tip-item label="库存单位" prop="unit"> <jnpf-form-tip-item label="库存单位"
<p>{{ dataForm.unit }}</p> prop="unit" >
<p>{{ dataForm.unit }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24" >
<jnpf-form-tip-item label="备注" prop="remak"> <jnpf-form-tip-item label="描述"
<p>{{ dataForm.remak }}</p> prop="description" >
<p>{{dataForm.description}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="图片"
prop="photo" >
<JnpfUploadImg v-model="dataForm.photo"
disabled
detailed :fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0" >
</JnpfUploadImg>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
</template> </template>
</el-form> </el-form>
</el-row> </el-row>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button> <el-button @click="visible = false"> </el-button>
@ -52,14 +55,14 @@
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import request from "@/utils/request"; import request from '@/utils/request'
import { getConfigData } from "@/api/onlineDev/visualDev"; import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from "@/utils/jnpf"; import jnpf from '@/utils/jnpf'
import Detail from "@/views/basic/dynamicModel/list/detail"; import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"; import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { Detail }, components: { Detail},
props: [], props: [],
data() { data() {
return { return {
@ -68,63 +71,65 @@ export default {
loading: false, loading: false,
dataForm: { dataForm: {
id: "", id :'',
code: "", code : '',
name: "", name : '',
spec: "", spec : '',
unit: "", unit : "",
remak: "", description : '',
creatorTime: "", creatorTime : "",
creatorUserId: "", creatorUserId : "",
lastModifyTime: "", lastModifyTime : "",
lastModifyUserId: "", lastModifyUserId : "",
photo : [],
}, },
unitOptions: [ unitOptions:[{"fullName":"克","id":"1"},{"fullName":"千克","id":"2"},{"fullName":"吨","id":"3"}],
{ fullName: "克", id: "1" }, unitProps:{"label":"fullName","value":"id" },
{ fullName: "千克", id: "2" },
{ fullName: "吨", id: "3" }, }
],
unitProps: { label: "fullName", value: "id" },
};
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() {}, created() {
},
mounted() {}, mounted() {},
methods: { methods: {
toDetail(defaultValue, modelId) { toDetail(defaultValue, modelId) {
if (!defaultValue) return; if (!defaultValue) return
getConfigData(modelId).then((res) => { getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return; if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData); let formData = JSON.parse(res.data.formData)
formData.popupType = "general"; formData.popupType = 'general'
this.detailVisible = true; this.detailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue); this.$refs.Detail.init(formData, modelId, defaultValue)
}); })
}); })
}, },
dataInfo(dataAll) { dataInfo(dataAll){
let _dataAll = dataAll; let _dataAll =dataAll
this.dataForm = _dataAll; this.dataForm = _dataAll
}, },
init(id) { init(id) {
this.dataForm.id = id || 0; this.dataForm.id = id || 0;
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
if (this.dataForm.id) { if(this.dataForm.id){
this.loading = true; this.loading = true
request({ request({
url: "/api/scm/NxProduct/detail/" + this.dataForm.id, url: '/api/scm/NxProduct/detail/'+this.dataForm.id,
method: "get", method: 'get'
}).then((res) => { }).then(res => {
this.dataInfo(res.data); this.dataInfo(res.data)
this.loading = false; this.loading = false
}); })
} }
});
})
}, },
}, },
}; }
</script> </script>

@ -2,142 +2,97 @@
<template> <template>
<el-dialog <el-dialog :title="!dataForm.id ? '新建' :'编辑'"
:title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" append-to-body
:close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
append-to-body width="600px">
:visible.sync="visible"
class="JNPF-dialog JNPF-dialog_center"
lock-scroll
width="600px"
>
<el-row :gutter="15" class=""> <el-row :gutter="15" class="">
<el-form <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right" >
ref="formRef"
:model="dataForm"
:rules="dataRule"
size="small"
label-width="100px"
label-position="right"
>
<template v-if="!loading"> <template v-if="!loading">
<!-- 具体表单 --> <!-- 具体表单 -->
<el-col :span="12"> <el-col :span="12" >
<jnpf-form-tip-item label="编码" prop="code"> <jnpf-form-tip-item
<JnpfInput label="编码" prop="code" >
v-model="dataForm.code" <JnpfInput v-model="dataForm.code" @change="changeData('code',-1)"
@change="changeData('code', -1)" placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
placeholder="系统自动生成"
readonly
:style="{ width: '100%' }"
>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12" >
<jnpf-form-tip-item label="名称" prop="name"> <jnpf-form-tip-item
<JnpfInput label="名称" prop="name" >
v-model="dataForm.name" <JnpfInput v-model="dataForm.name" @change="changeData('name',-1)"
@change="changeData('name', -1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入"
clearable
:style="{ width: '100%' }"
>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12" >
<jnpf-form-tip-item label="规格" prop="spec"> <jnpf-form-tip-item
<JnpfInput label="规格" prop="spec" >
v-model="dataForm.spec" <JnpfInput v-model="dataForm.spec" @change="changeData('spec',-1)"
@change="changeData('spec', -1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入"
clearable
:style="{ width: '100%' }"
>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12" >
<jnpf-form-tip-item label="库存单位" prop="unit"> <jnpf-form-tip-item
<JnpfSelect label="库存单位" prop="unit" >
v-model="dataForm.unit" <JnpfSelect v-model="dataForm.unit" @change="changeData('unit',-1)"
@change="changeData('unit', -1)" placeholder="请选择" clearable :style='{"width":"100%"}' :options="unitOptions" :props="unitProps" >
placeholder="请选择"
clearable
:style="{ width: '100%' }"
:options="unitOptions"
:props="unitProps"
>
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24" >
<jnpf-form-tip-item label="备注" prop="remak"> <jnpf-form-tip-item
<JnpfInput label="描述" prop="description" >
v-model="dataForm.remak" <JnpfInput v-model="dataForm.description" @change="changeData('description',-1)"
@change="changeData('remak', -1)" placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入"
clearable
:style="{ width: '100%' }"
>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item
label="图片" prop="photo" >
<JnpfUploadImg v-model="dataForm.photo" @change="changeData('photo',-1)"
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0" >
</JnpfUploadImg>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<!-- 表单结束 --> <!-- 表单结束 -->
</template> </template>
</el-form> </el-form>
<SelectDialog <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
v-if="selectDialogVisible" ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
:config="currTableConf"
:formData="dataForm"
ref="selectDialog"
@select="addForSelect"
@close="selectDialogVisible = false"
/>
</el-row> </el-row>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id"> <div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled="prevDis"> <el-button @click="prev" :disabled='prevDis'>
{{ "上一条" }} {{'上一条'}}
</el-button> </el-button>
<el-button @click="next" :disabled="nextDis"> <el-button @click="next" :disabled='nextDis'>
{{ "下一条" }} {{'下一条'}}
</el-button> </el-button>
</div> </div>
<el-button <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
type="primary" {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button>
@click="dataFormSubmit(2)"
:loading="continueBtnLoading"
>
{{ !dataForm.id ? "确定并新增" : "确定并继续" }}</el-button
>
<el-button @click="visible = false"> </el-button> <el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</el-button
>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import request from "@/utils/request"; import request from '@/utils/request'
import { mapGetters } from "vuex"; import {mapGetters} from "vuex";
import { getDataInterfaceRes } from "@/api/systemData/dataInterface"; import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from "@/api/systemData/dictionary"; import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from "@/api/permission/user"; import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from "@/api/permission/organize"; import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
getDateDay, import { thousandsFormat } from "@/components/Generator/utils/index"
getLaterData, export default {
getBeforeData, components: { },
getBeforeTime,
getLaterTime,
} from "@/components/Generator/utils/index.js";
import { thousandsFormat } from "@/components/Generator/utils/index";
export default {
components: {},
props: [], props: [],
data() { data() {
return { return {
@ -150,128 +105,137 @@ export default {
visible: false, visible: false,
loading: false, loading: false,
btnLoading: false, btnLoading: false,
formRef: "formRef", formRef: 'formRef',
setting: {}, setting:{},
eventType: "", eventType: '',
userBoxVisible: false, userBoxVisible:false,
selectDialogVisible: false, selectDialogVisible: false,
currTableConf: {}, currTableConf:{},
dataValueAll: {}, dataValueAll:{},
addTableConf: {}, addTableConf:{
},
// //
ableAll: {}, ableAll:{
tableRows: {}, },
Vmodel: "", tableRows:{
currVmodel: "", },
Vmodel:"",
currVmodel:"",
dataForm: { dataForm: {
code: undefined, code : undefined,
name: undefined, name : undefined,
spec: undefined, spec : undefined,
unit: undefined, unit : undefined,
remak: undefined, description : undefined,
creatorTime: undefined, creatorTime : undefined,
creatorUserId: undefined, creatorUserId : undefined,
lastModifyTime: undefined, lastModifyTime : undefined,
lastModifyUserId: undefined, lastModifyUserId : undefined,
photo : [],
version: 0, version: 0,
}, },
tableRequiredData: {}, tableRequiredData: {},
dataRule: { dataRule:
{
name: [ name: [
{ {
required: true, required: true,
message: "请输入", message: '请输入',
trigger: "blur", trigger: 'blur'
}, },
], ],
spec: [ spec: [
{ {
required: true, required: true,
message: "请输入", message: '请输入',
trigger: "blur", trigger: 'blur'
}, },
], ],
unit: [ unit: [
{ {
required: true, required: true,
message: "请选择", message: '请选择',
trigger: "change", trigger: 'change'
}, },
], ],
photo: [
{
required: true,
message: '请至少选择一个',
trigger: 'change'
}, },
unitOptions: [
{ fullName: "克", id: "1" },
{ fullName: "千克", id: "2" },
{ fullName: "吨", id: "3" },
], ],
unitProps: { label: "fullName", value: "id" }, },
childIndex: -1, unitOptions:[{"fullName":"克","id":"1"},{"fullName":"千克","id":"2"},{"fullName":"吨","id":"3"}],
isEdit: false, unitProps:{"label":"fullName","value":"id" },
childIndex:-1,
isEdit:false,
interfaceRes: { interfaceRes: {
code: [], code:[] ,
name: [], name:[] ,
spec: [], spec:[] ,
unit: [], unit:[] ,
remak: [], description:[] ,
creatorTime: [], creatorTime:[] ,
creatorUserId: [], creatorUserId:[] ,
lastModifyTime: [], lastModifyTime:[] ,
lastModifyUserId: [], lastModifyUserId:[] ,
}, photo:[] ,
}; },
}
}, },
computed: { computed: {
...mapGetters(["userInfo"]), ...mapGetters(['userInfo'])
}, },
watch: {}, watch: {},
created() { created() {
this.dataAll(); this.dataAll()
this.initDefaultData(); this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm)); this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
}, },
mounted() {}, mounted() {},
methods: { methods: {
prev() { prev() {
this.index--; this.index--
if (this.index === 0) { if (this.index === 0) {
this.prevDis = true; this.prevDis = true
} }
this.nextDis = false; this.nextDis = false
for (let index = 0; index < this.allList.length; index++) { for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index]; const element = this.allList[index];
if (this.index == index) { if (this.index == index) {
this.getInfo(element.id); this.getInfo(element.id)
} }
} }
}, },
next() { next() {
this.index++; this.index++
if (this.index === this.allList.length - 1) { if (this.index === this.allList.length - 1) {
this.nextDis = true; this.nextDis = true
} }
this.prevDis = false; this.prevDis = false
for (let index = 0; index < this.allList.length; index++) { for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index]; const element = this.allList[index];
if (this.index == index) { if (this.index == index) {
this.getInfo(element.id); this.getInfo(element.id)
} }
} }
}, },
getInfo(id) { getInfo(id) {
request({ request({
url: "/api/scm/NxProduct/" + id, url: '/api/scm/NxProduct/'+ id,
method: "get", method: 'get'
}).then((res) => { }).then(res => {
this.dataInfo(res.data); this.dataInfo(res.data)
}); });
}, },
goBack() { goBack() {
this.visible = false; this.visible = false
this.$emit("refreshDataList", true); this.$emit('refreshDataList', true)
}, },
changeData(model, index) { changeData(model, index) {
this.isEdit = false; this.isEdit = false
this.childIndex = index; this.childIndex = index
let modelAll = model.split("-"); let modelAll = model.split("-");
let faceMode = ""; let faceMode = "";
for (let i = 0; i < modelAll.length; i++) { for (let i = 0; i < modelAll.length; i++) {
@ -279,237 +243,236 @@ export default {
} }
for (let key in this.interfaceRes) { for (let key in this.interfaceRes) {
if (key != faceMode) { if (key != faceMode) {
let faceReList = this.interfaceRes[key]; let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) { for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) { if (faceReList[i].relationField == model) {
let options = "get" + key + "Options"; let options = 'get' + key + 'Options';
if (this[options]) { if(this[options]){
this[options](); this[options]()
} }
this.changeData(key, index); this.changeData(key, index)
} }
} }
} }
} }
}, },
changeDataFormData(type, data, model, index, defaultValue) { changeDataFormData(type, data, model,index,defaultValue) {
if (!this.isEdit) { if(!this.isEdit) {
if (type == 2) { if (type == 2) {
for (let i = 0; i < this.dataForm[data].length; i++) { for (let i = 0; i < this.dataForm[data].length; i++) {
if (index == -1) { if (index == -1) {
this.dataForm[data][i][model] = defaultValue; this.dataForm[data][i][model] = defaultValue
} else if (index == i) { } else if (index == i) {
this.dataForm[data][i][model] = defaultValue; this.dataForm[data][i][model] = defaultValue
} }
} }
} else { } else {
this.dataForm[data] = defaultValue; this.dataForm[data] = defaultValue
} }
} }
}, },
dataAll() {}, dataAll(){
clearData() { },
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll)); clearData(){
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
}, },
init(id, isDetail, allList) { init(id,isDetail,allList) {
this.prevDis = false; this.prevDis = false
this.nextDis = false; this.nextDis = false
this.allList = allList || []; this.allList = allList || []
if (allList.length) { if (allList.length) {
this.index = this.allList.findIndex((item) => item.id === id); this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) { if (this.index == 0) {
this.prevDis = true; this.prevDis = true
} }
if (this.index == this.allList.length - 1) { if (this.index == this.allList.length - 1) {
this.nextDis = true; this.nextDis = true
} }
} else { } else {
this.prevDis = true; this.prevDis = true
this.nextDis = true; this.nextDis = true
} }
this.dataForm.id = id || 0; this.dataForm.id = id || 0;
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
if (this.dataForm.id) { if(this.dataForm.id){
this.loading = true; this.loading = true
request({ request({
url: "/api/scm/NxProduct/" + this.dataForm.id, url: '/api/scm/NxProduct/'+this.dataForm.id,
method: "get", method: 'get'
}).then((res) => { }).then(res => {
this.dataInfo(res.data); this.dataInfo(res.data)
this.loading = false; this.loading = false
}); });
} else { }else{
this.clearData(); this.clearData()
this.initDefaultData(); this.initDefaultData()
} }
}); });
this.$store.commit("generator/UPDATE_RELATION_DATA", {}); this.$store.commit('generator/UPDATE_RELATION_DATA', {})
}, },
// //
initDefaultData() {}, initDefaultData() {
},
// //
dataFormSubmit(type) { dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0; this.dataFormSubmitType = type ? type : 0
this.$refs["formRef"].validate((valid) => { this.$refs['formRef'].validate((valid) => {
if (valid) { if (valid) {
this.request(); this.request()
} }
}); })
}, },
request() { request() {
let _data = this.dataList(); let _data =this.dataList()
if (this.dataFormSubmitType == 2) { if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true; this.continueBtnLoading = true
} else { } else {
this.btnLoading = true; this.btnLoading = true
} }
if (!this.dataForm.id) { if (!this.dataForm.id) {
request({ request({
url: "/api/scm/NxProduct", url: '/api/scm/NxProduct',
method: "post", method: 'post',
data: _data, data: _data
}) }).then((res) => {
.then((res) => {
this.$message({ this.$message({
message: res.msg, message: res.msg,
type: "success", type: 'success',
duration: 1000, duration: 1000,
onClose: () => { onClose: () => {
if (this.dataFormSubmitType == 2) { if (this.dataFormSubmitType == 2) {
this.$nextTick(() => { this.$nextTick(() => {
this.clearData(); this.clearData()
this.initDefaultData(); this.initDefaultData()
}); })
this.continueBtnLoading = false; this.continueBtnLoading = false
return; return
}
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
} }
this.visible = false;
this.btnLoading = false;
this.$emit("refresh", true);
},
});
}) })
.catch(() => { }).catch(()=>{
this.btnLoading = false; this.btnLoading = false
this.continueBtnLoading = false; this.continueBtnLoading = false
});
} else {
request({
url: "/api/scm/NxProduct/" + this.dataForm.id,
method: "PUT",
data: _data,
}) })
.then((res) => { }else{
request({
url: '/api/scm/NxProduct/'+this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
this.$message({ this.$message({
message: res.msg, message: res.msg,
type: "success", type: 'success',
duration: 1000, duration: 1000,
onClose: () => { onClose: () => {
if (this.dataFormSubmitType == 2) if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
return (this.continueBtnLoading = false); this.visible = false
this.visible = false; this.btnLoading = false
this.btnLoading = false; this.$emit('refresh', true)
this.$emit("refresh", true); }
}, })
}); }).catch(()=>{
this.btnLoading = false
this.continueBtnLoading = false
}) })
.catch(() => {
this.btnLoading = false;
this.continueBtnLoading = false;
});
} }
}, },
openSelectDialog(key) { openSelectDialog(key) {
this.currTableConf = this.addTableConf[key]; this.currTableConf=this.addTableConf[key]
this.currVmodel = key; this.currVmodel=key
this.selectDialogVisible = true; this.selectDialogVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.selectDialog.init(); this.$refs.selectDialog.init()
}); })
}, },
addForSelect(data) { addForSelect(data) {
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
let t = data[i]; let t = data[i]
if (this["get" + this.currVmodel]) { if(this['get'+this.currVmodel]){
this["get" + this.currVmodel](t); this['get'+this.currVmodel](t)
} }
} }
}, },
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) { dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeDataValue = null; let timeDataValue = null;
let timeValue = Number(timeValueData); let timeValue = Number(timeValueData)
if (timeRule) { if (timeRule) {
if (timeType == 1) { if (timeType == 1) {
timeDataValue = timeValue; timeDataValue = timeValue
} else if (timeType == 2) { } else if (timeType == 2) {
timeDataValue = dataValue; timeDataValue = dataValue
} else if (timeType == 3) { } else if (timeType == 3) {
timeDataValue = new Date().getTime(); timeDataValue = new Date().getTime()
} else if (timeType == 4) { } else if (timeType == 4) {
let previousDate = ""; let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) { if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue); previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime(); timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) { } else if (timeTarget == 3) {
previousDate = getBeforeData(timeValue); previousDate = getBeforeData(timeValue)
timeDataValue = new Date(previousDate).getTime(); timeDataValue = new Date(previousDate).getTime()
} else { } else {
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime(); timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
} }
} else if (timeType == 5) { } else if (timeType == 5) {
let previousDate = ""; let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) { if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue); previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime(); timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) { } else if (timeTarget == 3) {
previousDate = getLaterData(timeValue); previousDate = getLaterData(timeValue)
timeDataValue = new Date(previousDate).getTime(); timeDataValue = new Date(previousDate).getTime()
} else { } else {
timeDataValue = getLaterTime(timeTarget, timeValue).getTime(); timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
} }
} }
} }
return timeDataValue; return timeDataValue;
}, },
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) { time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let format = formatType == "HH:mm" ? "HH:mm:00" : formatType; let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
let timeDataValue = null; let timeDataValue = null
if (timeRule) { if (timeRule) {
if (timeType == 1) { if (timeType == 1) {
timeDataValue = timeValue || "00:00:00"; timeDataValue = timeValue || '00:00:00'
if (timeDataValue.split(":").length == 3) { if (timeDataValue.split(':').length == 3) {
timeDataValue = timeDataValue; timeDataValue = timeDataValue
} else { } else {
timeDataValue = timeDataValue + ":00"; timeDataValue = timeDataValue + ':00'
} }
} else if (timeType == 2) { } else if (timeType == 2) {
timeDataValue = dataValue; timeDataValue = dataValue
} else if (timeType == 3) { } else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format); timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) { } else if (timeType == 4) {
let previousDate = ""; let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue); previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format); timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) { } else if (timeType == 5) {
let previousDate = ""; let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue); previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format); timeDataValue = this.jnpf.toDate(previousDate, format)
} }
} }
return timeDataValue; return timeDataValue;
}, },
dataList() { dataList(){
var _data = this.dataForm; var _data = this.dataForm;
return _data; return _data;
}, },
dataInfo(dataAll) { dataInfo(dataAll){
let _dataAll = dataAll; let _dataAll =dataAll
this.dataForm = _dataAll; this.dataForm = _dataAll
this.isEdit = true; this.isEdit = true
this.dataAll(); this.dataAll()
this.childIndex = -1; this.childIndex=-1
}, },
}, },
}; }
</script> </script>

@ -12,59 +12,37 @@
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="编码"> <el-form-item label="编码">
<el-input v-model="query.code" placeholder="请输入" clearable> <el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="名称"> <el-form-item label="名称">
<el-input v-model="query.name" placeholder="请输入" clearable> <el-input v-model="query.name" placeholder="请输入" clearable> </el-input>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="规格"> <el-form-item label="规格">
<el-input v-model="query.spec" placeholder="请输入" clearable> <el-input v-model="query.spec" placeholder="请输入" clearable> </el-input>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<template v-if="showAll"> <template v-if="showAll">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="库存单位"> <el-form-item label="库存单位">
<JnpfSelect <JnpfSelect v-model="query.unit" placeholder="请选择" clearable
v-model="query.unit"
placeholder="请选择"
clearable
:options="unitOptions" :options="unitOptions"
:props="unitProps" :props="unitProps" multiple >
multiple
>
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
</template> </template>
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()" <el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
>查询</el-button <el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
> <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
<el-button icon="el-icon-refresh-right" @click="reset()"
>重置</el-button
>
<el-button
type="text"
icon="el-icon-arrow-down"
@click="showAll = true"
v-if="!showAll"
>
展开 展开
</el-button> </el-button>
<el-button <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
type="text"
icon="el-icon-arrow-up"
@click="showAll = false"
v-else
>
收起 收起
</el-button> </el-button>
</el-form-item> </el-form-item>
@ -74,178 +52,115 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">
type="primary"
icon="icon-ym icon-ym-btn-add"
v-has="'btn_add'"
@click="addOrUpdateHandle()"
>新增
</el-button> </el-button>
<el-button <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'" >导出
type="text"
icon="icon-ym icon-ym-btn-download"
@click="exportData()"
v-has="'btn_download'"
>导出
</el-button> </el-button>
<el-button <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" v-has="'btn_batchRemove'" >批量删除
type="text"
icon="icon-ym icon-ym-btn-clearn"
@click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'"
>批量删除
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
<el-link <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
icon="icon-ym icon-ym-filter JNPF-common-head-icon" @click="openSuperQuery()" />
:underline="false"
@click="openSuperQuery()"
/>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
effect="dark" <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
:content="$t('common.refresh')" @click="initData()" />
placement="top"
>
<el-link
icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
:underline="false"
@click="initData()"
/>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange"
v-loading="listLoading"
:data="list"
@sort-change="sortChange"
has-c
@selection-change="handleSelectionChange"
:span-method="arraySpanMethod" :span-method="arraySpanMethod"
>
>
<el-table-column <el-table-column
prop="code" prop="code"
label="编码" label="编码" align="left"
align="left" sortable="custom" >
sortable="custom"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
label="名称" label="名称" align="left"
align="left" sortable="custom" >
sortable="custom"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="spec" prop="spec"
label="规格" label="规格" align="left"
align="left" sortable="custom" >
sortable="custom"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="库存单位" prop="unit" algin="left"
label="库存单位" sortable="custom" >
prop="unit"
algin="left"
sortable="custom"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.unit }} {{ scope.row.unit}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作"
<template slot-scope="scope"> fixed="right" width="150" >
<el-button <template slot-scope="scope" >
type="text" <el-button type="text"
@click="addOrUpdateHandle(scope.row)" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'" >编辑
v-has="'btn_edit'"
>编辑
</el-button> </el-button>
<el-button <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">
type="text"
class="JNPF-table-delBtn"
v-has="'btn_remove'"
@click="handleDel(scope.row.id)"
>删除
</el-button> </el-button>
<el-button <el-button type="text" v-has="'btn_detail'"
type="text" @click="goDetail(scope.row.id)">详情
v-has="'btn_detail'"
@click="goDetail(scope.row.id)"
>详情
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
:total="total"
:page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize"
@pagination="initData"
/>
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" /> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
v-if="detailVisible" <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
ref="Detail" <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@refresh="detailVisible = false" @superQuery="superQuery" />
/>
<ToFormDetail
v-if="toFormDetailVisible"
ref="toFormDetail"
@close="toFormDetailVisible = false"
/>
<SuperQuery
v-if="superQueryVisible"
ref="SuperQuery"
:columnOptions="superQueryJson"
@superQuery="superQuery"
/>
</div> </div>
</template> </template>
<script> <script>
import request from "@/utils/request";
import { mapGetters } from "vuex";
import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
import JNPFForm from "./form";
import Detail from "./Detail";
import ExportBox from "@/components/ExportBox";
import ToFormDetail from "@/views/basic/dynamicModel/list/detail";
import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
import { getConfigData } from "@/api/onlineDev/visualDev";
import { getDefaultCurrentValueUserIdAsync } from "@/api/permission/user";
import { getDefaultCurrentValueDepartmentIdAsync } from "@/api/permission/organize";
import columnList from "./columnList";
import { thousandsFormat } from "@/components/Generator/utils/index";
import SuperQuery from "@/components/SuperQuery";
import superQueryJson from "./superQueryJson";
export default { import request from '@/utils/request'
import {mapGetters} from "vuex";
import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
import JNPFForm from './form'
import Detail from './Detail'
import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
export default {
components: { components: {
JNPFForm, JNPFForm,
Detail, Detail,
ExportBox, ExportBox,ToFormDetail , SuperQuery
ToFormDetail,
SuperQuery,
}, },
data() { data() {
return { return {
keyword: "",
keyword:'',
expandsTree: true, expandsTree: true,
refreshTree: true, refreshTree: true,
toFormDetailVisible: false, toFormDetailVisible:false,
expandObj: {}, expandObj:{},
columnOptions: [], columnOptions: [],
mergeList: [], mergeList: [],
exportList: [], exportList:[],
columnList, columnList,
showAll: false, showAll: false,
@ -254,24 +169,23 @@ export default {
uploadBoxVisible: false, uploadBoxVisible: false,
detailVisible: false, detailVisible: false,
query: { query: {
code: undefined, code:undefined,
name: undefined, name:undefined,
spec: undefined, spec:undefined,
unit: undefined, unit:undefined,
}, },
treeProps: { treeProps: {
children: "children", children: 'children',
label: "fullName", label: 'fullName',
value: "id", value: 'id',
isLeaf: "isLeaf", isLeaf: 'isLeaf'
}, },
list: [], list: [],
listLoading: true, listLoading: true,
multipleSelection: [], multipleSelection: [], total: 0,
total: 0,
queryData: {}, queryData: {},
listQuery: { listQuery: {
superQueryJson: "", superQueryJson: '',
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
sort: "desc", sort: "desc",
@ -282,191 +196,189 @@ export default {
flowListVisible: false, flowListVisible: false,
flowList: [], flowList: [],
exportBoxVisible: false, exportBoxVisible: false,
unitOptions: [ unitOptions:[{"fullName":"克","id":"1"},{"fullName":"千克","id":"2"},{"fullName":"吨","id":"3"}],
{ fullName: "克", id: "1" }, unitProps:{"label":"fullName","value":"id" },
{ fullName: "千克", id: "2" }, interfaceRes: {
{ fullName: "吨", id: "3" }, },
], }
unitProps: { label: "fullName", value: "id" },
interfaceRes: {},
};
}, },
computed: { computed: {
...mapGetters(["userInfo"]), ...mapGetters(['userInfo']),
menuId() { menuId() {
return this.$route.meta.modelId || ""; return this.$route.meta.modelId || ''
}, }
}, },
created() { created() {
this.getColumnList(), this.initSearchDataAndListData(); this.getColumnList(),
this.queryData = JSON.parse(JSON.stringify(this.query)); this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
}, },
methods: { methods: {
toDetail(defaultValue, modelId) { toDetail(defaultValue, modelId) {
if (!defaultValue) return; if (!defaultValue) return
getConfigData(modelId).then((res) => { getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return; if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData); let formData = JSON.parse(res.data.formData)
formData.popupType = "general"; formData.popupType = 'general'
this.toFormDetailVisible = true; this.toFormDetailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue); this.$refs.toFormDetail.init(formData, modelId, defaultValue)
}); })
}); })
}, },
toggleTreeExpand(expands) { toggleTreeExpand(expands) {
this.refreshTree = false; this.refreshTree = false
this.expandsTree = expands; this.expandsTree = expands
this.$nextTick(() => { this.$nextTick(() => {
this.refreshTree = true; this.refreshTree = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null); this.$refs.treeBox.setCurrentKey(null)
}); })
}); })
}, },
filterNode(value, data) { filterNode(value, data) {
if (!value) return true; if (!value) return true;
return data[this.treeProps.label].indexOf(value) !== -1; return data[this.treeProps.label].indexOf(value) !== -1;
}, },
loadNode(node, resolve) { loadNode(node, resolve) {
const nodeData = node.data; const nodeData = node.data
const config = { const config ={
treeInterfaceId: "", treeInterfaceId:"",
treeTemplateJson: [], treeTemplateJson:[]
}; }
if (config.treeInterfaceId) { if (config.treeInterfaceId) {
// //
if (config.treeTemplateJson && config.treeTemplateJson.length) { if (config.treeTemplateJson && config.treeTemplateJson.length) {
for (let i = 0; i < config.treeTemplateJson.length; i++) { for (let i = 0; i < config.treeTemplateJson.length; i++) {
const element = config.treeTemplateJson[i]; const element = config.treeTemplateJson[i];
element.defaultValue = nodeData[element.relationField] || ""; element.defaultValue = nodeData[element.relationField] || ''
} }
} }
// //
let query = { let query = {
paramList: config.treeTemplateJson || [], paramList: config.treeTemplateJson || [],
}; }
// //
getDataInterfaceRes(config.treeInterfaceId, query).then((res) => { getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let data = res.data; let data = res.data
if (Array.isArray(data)) { if (Array.isArray(data)) {
resolve(data); resolve(data);
} else { } else {
resolve([]); resolve([]);
} }
}); })
} }
}, },
getColumnList() { getColumnList() {
// //
this.columnOptions = this.transformColumnList(this.columnList); this.columnOptions = this.transformColumnList(this.columnList)
}, },
transformColumnList(columnList) { transformColumnList(columnList) {
let list = []; let list = []
for (let i = 0; i < columnList.length; i++) { for (let i = 0; i < columnList.length; i++) {
const e = columnList[i]; const e = columnList[i];
if (!e.prop.includes("-")) { if (!e.prop.includes('-')) {
list.push(e); list.push(e)
} else { } else {
let prop = e.prop.split("-")[0]; let prop = e.prop.split('-')[0]
let label = e.label.split("-")[0]; let label = e.label.split('-')[0]
let vModel = e.prop.split("-")[1]; let vModel = e.prop.split('-')[1]
let newItem = { let newItem = {
align: "center", align: "center",
jnpfKey: "table", jnpfKey: "table",
prop, prop,
label, label,
children: [], children: []
}; }
e.vModel = vModel; e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
this.$set(this.expandObj, `${prop}Expand`, false); if (!list.some(o => o.prop === prop)) list.push(newItem)
if (!list.some((o) => o.prop === prop)) list.push(newItem);
for (let i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) { if (list[i].prop === prop) {
list[i].children.push(e); list[i].children.push(e)
break; break
} }
} }
} }
} }
this.getMergeList(list); this.getMergeList(list)
this.getExportList(list); this.getExportList(list)
return list; return list
}, },
arraySpanMethod({ column }) { arraySpanMethod({ column }) {
for (let i = 0; i < this.mergeList.length; i++) { for (let i = 0; i < this.mergeList.length; i++) {
if (column.property == this.mergeList[i].prop) { if (column.property == this.mergeList[i].prop) {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan]; return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
} }
} }
}, },
getMergeList(list) { getMergeList(list) {
let newList = JSON.parse(JSON.stringify(list)); let newList = JSON.parse(JSON.stringify(list))
newList.forEach((item) => { newList.forEach(item => {
if (item.children && item.children.length) { if (item.children && item.children.length) {
let child = { let child = {
prop: item.prop + "-child-first", prop: item.prop + '-child-first'
};
item.children.unshift(child);
} }
}); item.children.unshift(child)
newList.forEach((item) => { }
if (item.children && item.children.length) { })
newList.forEach(item => {
if (item.children && item.children.length ) {
item.children.forEach((child, index) => { item.children.forEach((child, index) => {
if (index == 0) { if (index == 0) {
this.mergeList.push({ this.mergeList.push({
prop: child.prop, prop: child.prop,
rowspan: 1, rowspan: 1,
colspan: item.children.length, colspan: item.children.length
}); })
} else { } else {
this.mergeList.push({ this.mergeList.push({
prop: child.prop, prop: child.prop,
rowspan: 0, rowspan: 0,
colspan: 0, colspan: 0
}); })
} }
}); })
} else { } else {
this.mergeList.push({ this.mergeList.push({
prop: item.prop, prop: item.prop,
rowspan: 1, rowspan: 1,
colspan: 1, colspan: 1
}); })
} }
}); })
}, },
getExportList(list) { getExportList(list) {
let exportList = []; let exportList = []
for (let i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
if (list[i].jnpfKey === "table") { if (list[i].jnpfKey === 'table') {
for (let j = 0; j < list[i].children.length; j++) { for (let j = 0; j < list[i].children.length; j++) {
exportList.push(list[i].children[j]); exportList.push(list[i].children[j])
} }
} else { } else {
exportList.push(list[i]); exportList.push(list[i])
} }
} }
this.exportList = exportList; this.exportList = exportList
}, },
goDetail(id) { goDetail(id){
this.detailVisible = true; this.detailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.Detail.init(id); this.$refs.Detail.init(id)
}); })
}, },
sortChange({ column, prop, order }) { sortChange({column, prop, order}) {
this.listQuery.sort = order == "ascending" ? "asc" : "desc"; this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? "" : prop; this.listQuery.sidx = !order ? '' : prop
this.initData(); this.initData()
}, },
async initSearchDataAndListData() { async initSearchDataAndListData() {
await this.initSearchData(); await this.initSearchData()
this.initData(); this.initData()
}, },
// //
async initSearchData() {}, async initSearchData() {
},
initData() { initData() {
this.listLoading = true; this.listLoading = true;
let _query = { let _query = {
@ -474,145 +386,138 @@ export default {
...this.query, ...this.query,
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId: this.menuId, menuId:this.menuId,
moduleId: "534635503241163013", moduleId:'534635503241163013',
type: 1, type:1,
}; };
request({ request({
url: `/api/scm/NxProduct/getList`, url: `/api/scm/NxProduct/getList`,
method: "post", method: 'post',
data: _query, data: _query
}).then((res) => { }).then(res => {
var _list = res.data.list; var _list =res.data.list;
this.list = _list.map((o) => ({ this.list = _list.map(o => ({
...o, ...o,
...this.expandObj, ...this.expandObj,
})); }))
this.total = res.data.pagination.total; this.total = res.data.pagination.total
this.listLoading = false; this.listLoading = false
}); })
}, },
handleDel(id) { handleDel(id) {
this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", { this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: "warning", type: 'warning'
}) }).then(() => {
.then(() => {
request({ request({
url: `/api/scm/NxProduct/${id}`, url: `/api/scm/NxProduct/${id}`,
method: "DELETE", method: 'DELETE'
}).then((res) => { }).then(res => {
this.$message({ this.$message({
type: "success", type: 'success',
message: res.msg, message: res.msg,
onClose: () => { onClose: () => {
this.initData(); this.initData()
}, }
});
}); });
}) })
.catch(() => {}); }).catch(() => {
});
}, },
handelUpload() { handelUpload(){
this.uploadBoxVisible = true; this.uploadBoxVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.UploadBox.init("", "scm/NxProduct"); this.$refs.UploadBox.init("","scm/NxProduct")
}); })
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
const res = val.map((item) => item.id); const res = val.map(item => item.id)
this.multipleSelection = res; this.multipleSelection = res
}, },
handleBatchRemoveDel() { handleBatchRemoveDel() {
if (!this.multipleSelection.length) { if (!this.multipleSelection.length) {
this.$message({ this.$message({
type: "error", type: 'error',
message: "请选择一条数据", message: '请选择一条数据',
duration: 1500, duration: 1500,
});
return;
}
const ids = this.multipleSelection;
this.$confirm("您确定要删除这些数据吗, 是否继续?", "提示", {
type: "warning",
}) })
.then(() => { return
}
const ids = this.multipleSelection
this.$confirm('您确定要删除这些数据吗, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({ request({
url: `/api/scm/NxProduct/batchRemove`, url: `/api/scm/NxProduct/batchRemove`,
data: ids, data: ids,
method: "DELETE", method: 'DELETE'
}).then((res) => { }).then(res => {
this.$message({ this.$message({
type: "success", type: 'success',
message: res.msg, message: res.msg,
onClose: () => { onClose: () => {
this.initData(); this.initData()
}, }
});
}); });
}) })
.catch(() => {}); }).catch(() => {
})
}, },
openSuperQuery() { openSuperQuery() {
this.superQueryVisible = true; this.superQueryVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.SuperQuery.init(); this.$refs.SuperQuery.init()
}); })
}, },
superQuery(queryJson) { superQuery(queryJson) {
this.listQuery.superQueryJson = queryJson; this.listQuery.superQueryJson = queryJson
this.listQuery.currentPage = 1; this.listQuery.currentPage = 1
this.initData(); this.initData()
}, },
addOrUpdateHandle(row, isDetail) { addOrUpdateHandle(row, isDetail) {
let id = row ? row.id : ""; let id = row?row.id:""
this.formVisible = true; this.formVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail, this.list); this.$refs.JNPFForm.init(id, isDetail,this.list)
}); })
}, },
exportData() { exportData() {
this.exportBoxVisible = true; this.exportBoxVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList); this.$refs.ExportBox.init(this.exportList)
}); })
}, },
download(data) { download(data) {
let query = { let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
...data,
...this.listQuery,
...this.query,
menuId: this.menuId,
};
request({ request({
url: `/api/scm/NxProduct/Actions/Export`, url: `/api/scm/NxProduct/Actions/Export`,
method: "post", method: 'post',
data: query, data: query
}).then((res) => { }).then(res => {
if (!res.data.url) return; if (!res.data.url) return
this.jnpf.downloadFile(res.data.url); this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false; this.$refs.ExportBox.visible = false
this.exportBoxVisible = false; this.exportBoxVisible = false
}); })
}, },
search() { search() {
this.listQuery.currentPage = 1; this.listQuery.currentPage=1
this.listQuery.pageSize = 20; this.listQuery.pageSize=20
this.listQuery.sort = "desc"; this.listQuery.sort="desc"
this.listQuery.sidx = ""; this.listQuery.sidx=""
this.initData(); this.initData()
}, },
refresh(isrRefresh) { refresh(isrRefresh) {
this.formVisible = false; this.formVisible = false
if (isrRefresh) this.reset(); if (isrRefresh) this.reset()
}, },
reset() { reset() {
this.query = JSON.parse(JSON.stringify(this.queryData)); this.query = JSON.parse(JSON.stringify(this.queryData))
this.search(); this.search()
}, },
colseFlow(isrRefresh) { colseFlow(isrRefresh) {
this.flowVisible = false; this.flowVisible = false
if (isrRefresh) this.reset(); if (isrRefresh) this.reset()
},
}, },
}; }
}
</script> </script>

File diff suppressed because one or more lines are too long

@ -0,0 +1,16 @@
package jnpf.mapper;
import jnpf.entity.NxProductEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* nxProduct
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-03-11
*/
public interface NxProductMapper extends BaseMapper<NxProductEntity> {
}

@ -0,0 +1,35 @@
package jnpf.service;
import jnpf.model.nxproduct.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* nxProduct
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-03-11
*/
public interface NxProductService extends IService<NxProductEntity> {
List<NxProductEntity> getList(NxProductPagination nxProductPagination);
List<NxProductEntity> getTypeList(NxProductPagination nxProductPagination,String dataType);
NxProductEntity getInfo(String id);
void delete(NxProductEntity entity);
void create(NxProductEntity entity);
boolean update(String id, NxProductEntity entity);
//子表方法
//副表数据方法
String checkForm(NxProductForm form,int i);
void saveOrUpdate(NxProductForm nxProductForm,String id, boolean isSave) throws Exception;
}

@ -0,0 +1,335 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.NxProductMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.nxproduct.*;
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;
import jnpf.database.model.superQuery.SuperJsonModel;
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;
/**
*
* nxProduct
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-03-11
*/
@Service
public class NxProductServiceImpl extends ServiceImpl<NxProductMapper, NxProductEntity> implements NxProductService{
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Override
public List<NxProductEntity> getList(NxProductPagination nxProductPagination){
return getTypeList(nxProductPagination,nxProductPagination.getDataType());
}
/** 列表查询 */
@Override
public List<NxProductEntity> getTypeList(NxProductPagination nxProductPagination,String dataType){
String userId=userProvider.get().getUserId();
List<String> AllIdList =new ArrayList();
List<List<String>> intersectionList =new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? NxProductConstant.getAppColumnData() : NxProductConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0;
int nxProductNum =0;
QueryWrapper<NxProductEntity> nxProductQueryWrapper=new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>();
String superOp ="";
if (ObjectUtil.isNotEmpty(nxProductPagination.getSuperQueryJson())){
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = nxProductPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<NxProductEntity> nxProductSuperWrapper = new QueryWrapper<>();
nxProductSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(nxProductSuperWrapper,NxProductEntity.class,queryJson,"0"));
int nxProductNum1 = nxProductSuperWrapper.getExpression().getNormal().size();
if (nxProductNum1>0){
List<String> nxProductList =this.list(nxProductSuperWrapper).stream().map(NxProductEntity::getId).collect(Collectors.toList());
allSuperList.addAll(nxProductList);
intersectionSuperList.add(nxProductList);
superNum++;
}
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or
if(superOp.equalsIgnoreCase("and")){
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
}else{
allSuperIDlist = allSuperList;
}
}
List<String> allRuleIDlist = new ArrayList<>();
String ruleOp ="";
if (ObjectUtil.isNotEmpty(ruleJson)){
List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0;
QueryWrapper<NxProductEntity> nxProductSuperWrapper = new QueryWrapper<>();
nxProductSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(nxProductSuperWrapper,NxProductEntity.class,ruleJson,"0"));
int nxProductNum1 = nxProductSuperWrapper.getExpression().getNormal().size();
if (nxProductNum1>0){
List<String> nxProductList =this.list(nxProductSuperWrapper).stream().map(NxProductEntity::getId).collect(Collectors.toList());
allRuleList.addAll(nxProductList);
intersectionRuleList.add(nxProductList);
ruleNum++;
}
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or
if(ruleOp.equalsIgnoreCase("and")){
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = true;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object nxProductObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(nxProductQueryWrapper,NxProductEntity.class,nxProductPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(nxProductObj)){
return new ArrayList<>();
} else {
nxProductQueryWrapper = (QueryWrapper<NxProductEntity>)nxProductObj;
if( nxProductQueryWrapper.getExpression().getNormal().size()>0){
nxProductNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object nxProductObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(nxProductQueryWrapper,NxProductEntity.class,nxProductPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(nxProductObj)){
return new ArrayList<>();
} else {
nxProductQueryWrapper = (QueryWrapper<NxProductEntity>)nxProductObj;
if( nxProductQueryWrapper.getExpression().getNormal().size()>0){
nxProductNum++;
}
}
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(nxProductPagination.getCode())){
nxProductNum++;
String value = nxProductPagination.getCode() instanceof List ?
JsonUtil.getObjectToString(nxProductPagination.getCode()) :
String.valueOf(nxProductPagination.getCode());
nxProductQueryWrapper.lambda().like(NxProductEntity::getCode,value);
}
if(ObjectUtil.isNotEmpty(nxProductPagination.getName())){
nxProductNum++;
String value = nxProductPagination.getName() instanceof List ?
JsonUtil.getObjectToString(nxProductPagination.getName()) :
String.valueOf(nxProductPagination.getName());
nxProductQueryWrapper.lambda().like(NxProductEntity::getName,value);
}
if(ObjectUtil.isNotEmpty(nxProductPagination.getSpec())){
nxProductNum++;
String value = nxProductPagination.getSpec() instanceof List ?
JsonUtil.getObjectToString(nxProductPagination.getSpec()) :
String.valueOf(nxProductPagination.getSpec());
nxProductQueryWrapper.lambda().like(NxProductEntity::getSpec,value);
}
if(ObjectUtil.isNotEmpty(nxProductPagination.getUnit())){
nxProductNum++;
List<String> idList = new ArrayList<>();
try {
String[][] unit = JsonUtil.getJsonToBean(nxProductPagination.getUnit(),String[][].class);
for(int i=0;i<unit.length;i++){
if(unit[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(unit[i])));
}
}
}catch (Exception e1){
try {
List<String> unit = JsonUtil.getJsonToList(nxProductPagination.getUnit(),String.class);
if(unit.size()>0){
idList.addAll(unit);
}
}catch (Exception e2){
idList.add(String.valueOf(nxProductPagination.getUnit()));
}
}
nxProductQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(NxProductEntity::getUnit, tt).or();
});
});
}
}
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){
if (intersection.size()==0){
intersection.add("jnpfNullList");
}
nxProductQueryWrapper.lambda().in(NxProductEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
nxProductQueryWrapper.lambda().and(t->t.in(NxProductEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
nxProductQueryWrapper.lambda().and(t->t.in(NxProductEntity::getId, finalAllRuleIDlist));
}
//假删除标志
nxProductQueryWrapper.lambda().isNull(NxProductEntity::getDeletemark);
//排序
if(StringUtil.isEmpty(nxProductPagination.getSidx())){
nxProductQueryWrapper.lambda().orderByDesc(NxProductEntity::getId);
}else{
try {
String sidx = nxProductPagination.getSidx();
String[] strs= sidx.split("_name");
NxProductEntity nxProductEntity = new NxProductEntity();
Field declaredField = nxProductEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
nxProductQueryWrapper="asc".equals(nxProductPagination.getSort().toLowerCase())?nxProductQueryWrapper.orderByAsc(value):nxProductQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<NxProductEntity> page=new Page<>(nxProductPagination.getCurrentPage(), nxProductPagination.getPageSize());
IPage<NxProductEntity> userIPage=this.page(page, nxProductQueryWrapper);
return nxProductPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<NxProductEntity> list = new ArrayList();
return nxProductPagination.setData(list, list.size());
}
}else{
return this.list(nxProductQueryWrapper);
}
}
@Override
public NxProductEntity getInfo(String id){
QueryWrapper<NxProductEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(NxProductEntity::getId,id);
return this.getOne(queryWrapper);
}
@Override
public void create(NxProductEntity entity){
this.save(entity);
}
@Override
public boolean update(String id, NxProductEntity entity){
return this.updateById(entity);
}
@Override
public void delete(NxProductEntity entity){
if(entity!=null){
this.removeById(entity.getId());
}
}
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
@Override
public String checkForm(NxProductForm form,int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id="";
String countRecover = "";
if (isUp){
id = form.getId();
}
//主表字段验证
if(StringUtil.isEmpty(form.getName())){
return "名称不能为空";
}
if(StringUtil.isEmpty(form.getSpec())){
return "规格不能为空";
}
return countRecover;
}
/**
* ()
* @param id
* @param nxProductForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(NxProductForm nxProductForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
nxProductForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(NxProductConstant.getFormData(),nxProductForm),NxProductForm.class);
NxProductEntity entity = JsonUtil.getJsonToBean(nxProductForm, NxProductEntity.class);
if(isSave){
String mainId = RandomUtil.uuId() ;
entity.setCode(generaterSwapUtil.getBillNumber("prodcut", false));
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
entity.setLastModifyTime(null);
entity.setLastModifyUserId(null);
entity.setId(mainId);
entity.setVersion(0);
}else{
entity.setCode(generaterSwapUtil.getBillNumber("prodcut", false));
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
entity.setLastModifyTime(null);
entity.setLastModifyUserId(null);
}
this.saveOrUpdate(entity);
}
}

@ -0,0 +1,366 @@
package jnpf.controller;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.nxproduct.*;
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.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.onlinedev.model.ExcelImFieldModel;
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 lombok.Cleanup;
import jnpf.model.visualJson.config.HeaderModel;
import jnpf.base.model.ColumnDataModel;
import jnpf.base.util.VisualUtils;
import org.springframework.transaction.annotation.Transactional;
/**
* nxProduct
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-03-11
*/
@Slf4j
@RestController
@Tag(name = "nxProduct" , description = "scm")
@RequestMapping("/api/scm/NxProduct")
public class NxProductController {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private NxProductService nxProductService;
@Autowired
private ConfigValueUtil configValueUtil;
/**
*
*
* @param nxProductPagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody NxProductPagination nxProductPagination)throws IOException{
List<NxProductEntity> list= nxProductService.getList(nxProductPagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (NxProductEntity entity : list) {
Map<String, Object> nxProductMap=JsonUtil.entityToMap(entity);
nxProductMap.put("id", nxProductMap.get("id"));
//副表数据
//子表数据
realList.add(nxProductMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, NxProductConstant.getFormData(), NxProductConstant.getColumnData(), nxProductPagination.getModuleId(),false);
//返回对象
PageListVO vo = new PageListVO();
vo.setList(realList);
PaginationVO page = JsonUtil.getJsonToBean(nxProductPagination, PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
*
*
* @param nxProductForm
* @return
*/
@PostMapping()
@Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid NxProductForm nxProductForm) {
String b = nxProductService.checkForm(nxProductForm,0);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
try{
nxProductService.saveOrUpdate(nxProductForm, null ,true);
}catch(Exception e){
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
}
/**
* Excel
*
* @return
*/
@Operation(summary = "导出Excel")
@PostMapping("/Actions/Export")
public ActionResult Export(@RequestBody NxProductPagination nxProductPagination) throws IOException {
if (StringUtil.isEmpty(nxProductPagination.getSelectKey())){
return ActionResult.fail("请选择导出字段");
}
List<NxProductEntity> list= nxProductService.getList(nxProductPagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (NxProductEntity entity : list) {
Map<String, Object> nxProductMap=JsonUtil.entityToMap(entity);
nxProductMap.put("id", nxProductMap.get("id"));
//副表数据
//子表数据
realList.add(nxProductMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, NxProductConstant.getFormData(), NxProductConstant.getColumnData(), nxProductPagination.getModuleId(),false);
String[]keys=!StringUtil.isEmpty(nxProductPagination.getSelectKey())?nxProductPagination.getSelectKey():new String[0];
UserInfo userInfo=userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo);
return ActionResult.success(vo);
}
/**
*
*/
public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){
DownloadVO vo=DownloadVO.builder().build();
List<ExcelExportEntity> entitys=new ArrayList<>();
if(keys.length>0){
for(String key:keys){
switch(key){
case "code" :
entitys.add(new ExcelExportEntity("编码" ,"code"));
break;
case "name" :
entitys.add(new ExcelExportEntity("名称" ,"name"));
break;
case "spec" :
entitys.add(new ExcelExportEntity("规格" ,"spec"));
break;
case "unit" :
entitys.add(new ExcelExportEntity("库存单位" ,"unit"));
break;
case "description" :
entitys.add(new ExcelExportEntity("描述" ,"description"));
break;
case "creatorTime" :
entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime"));
break;
case "creatorUserId" :
entitys.add(new ExcelExportEntity("创建用户" ,"creatorUserId"));
break;
case "lastModifyTime" :
entitys.add(new ExcelExportEntity("修改时间" ,"lastModifyTime"));
break;
case "lastModifyUserId" :
entitys.add(new ExcelExportEntity("修改用户" ,"lastModifyUserId"));
break;
case "photo" :
entitys.add(new ExcelExportEntity("图片" ,"photo"));
break;
default:
break;
}
}
}
ExportParams exportParams = new ExportParams(null, "表单信息");
exportParams.setType(ExcelType.XSSF);
try{
@Cleanup Workbook workbook = new HSSFWorkbook();
if (entitys.size()>0){
if (list.size()==0){
list.add(new HashMap<>());
}
//去除空数据
List<Map<String, Object>> dataList = new ArrayList<>();
for (Map<String, Object> map : list) {
int i = 0;
for (String key : keys) {
//子表
if (key.toLowerCase().startsWith("tablefield")) {
String tableField = key.substring(0, key.indexOf("-" ));
String field = key.substring(key.indexOf("-" ) + 1);
Object o = map.get(tableField);
if (o != null) {
List<Map<String, Object>> childList = (List<Map<String, Object>>) o;
for (Map<String, Object> childMap : childList) {
if (childMap.get(field) != null) {
i++;
}
}
}
} else {
Object o = map.get(key);
if (o != null) {
i++;
}
}
}
if (i > 0) {
dataList.add(map);
}
}
//复杂表头-表头和数据处理
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(NxProductConstant.getColumnData(), ColumnDataModel.class);
List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
dataList = VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList);
}
workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList);
}
String fileName = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
String temporaryFilePath = configValueUtil.getTemporaryFilePath();
FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
vo.setName(fileInfo.getFilename());
vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
} catch (Exception e) {
log.error("信息导出Excel错误:{}", e.getMessage());
e.printStackTrace();
}
return vo;
}
/**
*
* @param ids
* @return
*/
@DeleteMapping("/batchRemove")
@Transactional
@Operation(summary = "批量删除")
public ActionResult batchRemove(@RequestBody String ids){
List<String> idList = JsonUtil.getJsonToList(ids, String.class);
int i =0;
for (String allId : idList){
this.delete(allId);
i++;
}
if (i == 0 ){
return ActionResult.fail("删除失败");
}
return ActionResult.success("删除成功");
}
/**
*
* @param id
* @param nxProductForm
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid NxProductForm nxProductForm,
@RequestParam(value = "isImport", required = false) boolean isImport){
nxProductForm.setId(id);
if (!isImport) {
String b = nxProductService.checkForm(nxProductForm,1);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
}
NxProductEntity entity= nxProductService.getInfo(id);
if(entity!=null){
try{
nxProductService.saveOrUpdate(nxProductForm,id,false);
}catch(Exception e){
return ActionResult.fail("修改数据失败");
}
return ActionResult.success("更新成功");
}else{
return ActionResult.fail("更新失败,数据不存在");
}
}
/**
*
* @param id
* @return
*/
@Operation(summary = "删除")
@DeleteMapping("/{id}")
@Transactional
public ActionResult delete(@PathVariable("id") String id){
NxProductEntity entity= nxProductService.getInfo(id);
if(entity!=null){
//假删除
entity.setDeletemark(1);
nxProductService.update(id,entity);
}
return ActionResult.success("删除成功");
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){
NxProductEntity entity= nxProductService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> nxProductMap=JsonUtil.entityToMap(entity);
nxProductMap.put("id", nxProductMap.get("id"));
//副表数据
//子表数据
nxProductMap = generaterSwapUtil.swapDataDetail(nxProductMap,NxProductConstant.getFormData(),"534635503241163013",false);
return ActionResult.success(nxProductMap);
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "信息")
@GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){
NxProductEntity entity= nxProductService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> nxProductMap=JsonUtil.entityToMap(entity);
nxProductMap.put("id", nxProductMap.get("id"));
//副表数据
//子表数据
nxProductMap = generaterSwapUtil.swapDataForm(nxProductMap,NxProductConstant.getFormData(),NxProductConstant.TABLEFIELDKEY,NxProductConstant.TABLERENAMES);
return ActionResult.success(nxProductMap);
}
}

@ -0,0 +1,51 @@
package jnpf.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.util.Date;
/**
*
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-03-11
*/
@Data
@TableName("nx_product")
public class NxProductEntity {
@TableId(value ="ID" )
private String id;
@TableField(value = "CODE" , updateStrategy = FieldStrategy.IGNORED)
private String code;
@TableField(value = "NAME" , updateStrategy = FieldStrategy.IGNORED)
private String name;
@TableField(value = "SPEC" , updateStrategy = FieldStrategy.IGNORED)
private String spec;
@TableField(value = "UNIT" , updateStrategy = FieldStrategy.IGNORED)
private String unit;
@TableField(value = "DESCRIPTION" , updateStrategy = FieldStrategy.IGNORED)
private String description;
@TableField(value = "PHOTO" , updateStrategy = FieldStrategy.IGNORED)
private String photo;
@TableField("F_CREATOR_TIME")
private Date creatorTime;
@TableField("F_CREATOR_USER_ID")
private String creatorUserId;
@TableField("F_LAST_MODIFY_TIME")
private Date lastModifyTime;
@TableField("F_LAST_MODIFY_USER_ID")
private String lastModifyUserId;
@TableField("F_DELETE_TIME")
private Date deleteTime;
@TableField("F_DELETE_USER_ID")
private String deleteUserId;
@TableField("F_DELETE_MARK")
private Integer deleteMark;
@TableField("F_TENANT_ID")
private String tenantId;
@TableField("F_VERSION")
private Integer version;
@TableField("F_FLOW_ID")
private String flowId;
}

File diff suppressed because one or more lines are too long

@ -0,0 +1,53 @@
package jnpf.model.jnpf;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* nxProduct
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-03-11
*/
@Data
public class NxProductForm {
/** 主键 */
private String id;
/** 乐观锁 **/
@JsonProperty("version")
private Integer version;
/** 编码 **/
@JsonProperty("code")
private String code;
/** 名称 **/
@JsonProperty("name")
private String name;
/** 规格 **/
@JsonProperty("spec")
private String spec;
/** 库存单位 **/
@JsonProperty("unit")
private Object unit;
/** 描述 **/
@JsonProperty("description")
private String description;
/** 创建时间 **/
@JsonProperty("creatorTime")
private String creatorTime;
/** 创建用户 **/
@JsonProperty("creatorUserId")
private String creatorUserId;
/** 修改时间 **/
@JsonProperty("lastModifyTime")
private String lastModifyTime;
/** 修改用户 **/
@JsonProperty("lastModifyUserId")
private String lastModifyUserId;
/** 图片 **/
@JsonProperty("photo")
private Object photo;
}

@ -0,0 +1,42 @@
package jnpf.model.nxproduct;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import jnpf.base.Pagination;
import java.util.List;
/**
*
* nxProduct
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-03-11
*/
@Data
public class NxProductPagination extends Pagination {
/** 查询key */
private String[] selectKey;
/** json */
private String json;
/** 数据类型 0-当前页1-全部数据 */
private String dataType;
/** 高级查询 */
private String superQueryJson;
/** 功能id */
private String moduleId;
/** 菜单id */
private String menuId;
/** 编码 */
@JsonProperty("code")
private Object code;
/** 名称 */
@JsonProperty("name")
private Object name;
/** 规格 */
@JsonProperty("spec")
private Object spec;
/** 库存单位 */
@JsonProperty("unit")
private Object unit;
}
Loading…
Cancel
Save