品牌库优化显示

jg-waiwang-pro
mhsnet 8 months ago
parent 0968d95143
commit 94e0701e0f

@ -5,11 +5,11 @@ import jnpf.entity.ProductBrandEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* productBrand
* ProductBrand
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-29
* 2024-02-29
*/
public interface ProductBrandMapper extends BaseMapper<ProductBrandEntity> {

@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* productBrand
* ProductBrand
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-29
* 2024-02-29
*/
public interface ProductBrandService extends IService<ProductBrandEntity> {
List<ProductBrandEntity> getList(ProductBrandPagination productBrandPagination);

@ -32,11 +32,11 @@ import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
/**
*
* productBrand
* ProductBrand
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-29
* 2024-02-29
*/
@Service
public class ProductBrandServiceImpl extends ServiceImpl<ProductBrandMapper, ProductBrandEntity> implements ProductBrandService{
@ -299,17 +299,9 @@ public class ProductBrandServiceImpl extends ServiceImpl<ProductBrandMapper, Pro
if(isSave){
String mainId = RandomUtil.uuId() ;
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
entity.setLastModifyTime(null);
entity.setLastModifyUserId(null);
entity.setId(mainId);
entity.setVersion(0);
}else{
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
entity.setLastModifyTime(null);
entity.setLastModifyUserId(null);
}
this.saveOrUpdate(entity);

@ -30,15 +30,15 @@ import jnpf.exception.WorkFlowException;
import org.springframework.transaction.annotation.Transactional;
/**
* productBrand
* ProductBrand
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-29
* @ 2024-02-29
*/
@Slf4j
@RestController
@Tag(name = "productBrand" , description = "scm")
@Tag(name = "ProductBrand" , description = "scm")
@RequestMapping("/api/scm/ProductBrand")
public class ProductBrandController {

@ -6,11 +6,11 @@ import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* productBrand
* ProductBrand
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-29
* @ 2024-02-29
*/
@Data
public class ProductBrandForm {
@ -38,16 +38,16 @@ public class ProductBrandForm {
/** 来源 **/
@JsonProperty("source")
private String source;
/** 创建时间 **/
@JsonProperty("creatorTime")
private String creatorTime;
/** 创建用户 **/
@JsonProperty("creatorUserId")
private String creatorUserId;
/** 修改时间 **/
@JsonProperty("lastModifyTime")
private String lastModifyTime;
/** 创建时间 **/
@JsonProperty("creatorTime")
private String creatorTime;
/** 修改用户 **/
@JsonProperty("lastModifyUserId")
private String lastModifyUserId;
/** 修改时间 **/
@JsonProperty("lastModifyTime")
private String lastModifyTime;
}

@ -7,11 +7,11 @@ import java.util.List;
/**
*
* productBrand
* ProductBrand
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-29
* @ 2024-02-29
*/
@Data
public class ProductBrandPagination extends Pagination {

@ -1,83 +1,73 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
content="详情"/>
<el-page-header @back="goBack" content="详情" />
<div class="options">
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
<el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="24" >
<jnpf-form-tip-item label="品牌名称"
prop="brandName" >
<p>{{dataForm.brandName}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="品牌名称" prop="brandName">
<p>{{ dataForm.brandName }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="品牌类型"
prop="brandType" >
<p>{{dataForm.brandType}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="品牌类型" prop="brandType">
<p>{{ dataForm.brandType }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="LOGO"
prop="brandPic" >
<JnpfUploadImg v-model="dataForm.brandPic"
disabled
detailed :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" >
<el-col :span="24">
<jnpf-form-tip-item label="LOGO" prop="brandPic">
<JnpfUploadImg v-model="dataForm.brandPic" disabled detailed :fileSize="10" sizeUnit="MB"
:limit="9" pathType="defaultPath" :isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="描述"
prop="brandDescription" >
<p>{{dataForm.brandDescription}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="描述" prop="brandDescription">
<p>{{ dataForm.brandDescription }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="状态"
prop="brandStatus" >
<p>{{dataForm.brandStatus}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="状态" prop="brandStatus">
<p>{{ dataForm.brandStatus }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="来源"
prop="source" >
<p>{{dataForm.source}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="来源" prop="source">
<p>{{ dataForm.source }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="修改时间"
prop="lastModifyTime" >
<p>{{dataForm.lastModifyTime}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="修改时间" prop="lastModifyTime">
<p>{{ dataForm.lastModifyTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="修改用户"
prop="lastModifyUserId" >
<p>{{dataForm.lastModifyUserId}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="修改用户" prop="lastModifyUserId">
<p>{{ dataForm.lastModifyUserId }}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-form>
</el-row>
</div>
</transition>
</transition>
</template>
<script>
import request from '@/utils/request'
import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail},
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail },
props: [],
data() {
return {
@ -86,21 +76,21 @@
loading: false,
dataForm: {
id :'',
brandName : '',
brandType : "",
brandPic : [],
brandDescription : '',
brandStatus : "1",
source : "2",
creatorTime : "",
creatorUserId : "",
lastModifyTime : "",
lastModifyUserId : "",
id: '',
brandName: '',
brandType: "",
brandPic: [],
brandDescription: '',
brandStatus: "1",
source: "2",
creatorTime: "",
creatorUserId: "",
lastModifyTime: "",
lastModifyUserId: "",
},
brandTypeProps:{"label":"fullName","value":"enCode" },
brandStatusProps:{"label":"fullName","value":"enCode" },
sourceProps:{"label":"fullName","value":"enCode" },
brandTypeProps: { "label": "fullName", "value": "enCode" },
brandStatusProps: { "label": "fullName", "value": "enCode" },
sourceProps: { "label": "fullName", "value": "enCode" },
}
},
@ -109,7 +99,7 @@
created() {
},
mounted() {},
mounted() { },
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
@ -123,8 +113,8 @@
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
},
@ -135,10 +125,10 @@
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/scm/ProductBrand/detail/'+this.dataForm.id,
url: '/api/scm/ProductBrand/detail/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
@ -149,6 +139,6 @@
})
},
},
}
}
</script>

@ -17,17 +17,15 @@
</el-col>
<el-col :span="6">
<el-form-item label="品牌类型">
<JnpfSelect v-model="query.brandType" placeholder="请选择" clearable
:options="brandTypeOptions"
:props="brandTypeProps" multiple >
<JnpfSelect v-model="query.brandType" placeholder="请选择" clearable :options="brandTypeOptions"
:props="brandTypeProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="状态">
<JnpfSelect v-model="query.brandStatus" placeholder="请选择" clearable
:options="brandStatusOptions"
:props="brandStatusProps" >
:options="brandStatusOptions" :props="brandStatusProps">
</JnpfSelect>
</el-form-item>
</el-col>
@ -56,106 +54,99 @@
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"
>
<el-table-column
prop="brandName"
label="品牌名称" align="left"
>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod">
<el-table-column prop="brandName" label="品牌名称" align="left">
</el-table-column>
<el-table-column
prop="brandType"
label="品牌类型" align="left"
>
<el-table-column prop="brandPic" label="LOGO" align="left">
<template slot-scope="scope">
<el-image style="width: 100px; height: 100px" :src="define.comUrl + scope.row.brandPic[0].url"
:preview-src-list="getImgList(scope.row.brandPic)"></el-image>
</template>
</el-table-column>
<el-table-column
prop="creatorTime"
label="创建时间" align="left"
>
<el-table-column prop="brandType" label="品牌类型" align="left">
</el-table-column>
<el-table-column
prop="lastModifyTime"
label="修改时间" align="left"
>
<el-table-column prop="creatorTime" label="创建时间" align="left">
</el-table-column>
<el-table-column
prop="source"
label="来源" align="left"
>
<el-table-column prop="lastModifyTime" label="修改时间" align="left">
</el-table-column>
<el-table-column
prop="brandStatus"
label="状态" align="left"
>
<el-table-column prop="source" label="来源" align="left">
<template slot-scope="scope">
<span style="color: blue;">{{ scope.row.source }}</span>
</template>
</el-table-column>
<el-table-column label="操作"
fixed="right" width="150" >
<template slot-scope="scope" >
<el-button type="text"
@click="addOrUpdateHandle(scope.row)" >编辑
<el-table-column prop="brandStatus" label="状态" align="left">
<template slot-scope="scope">
<template v-if="scope.row.brandStatus == '启用'">
<span style="color: green;">{{ scope.row.brandStatus }}</span>
</template>
<template v-else>
<span style="color: red;">{{ scope.row.brandStatus }}</span>
</template>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button>
<el-button type="text"
@click="goDetail(scope.row.id)">详情
<el-button type="text" @click="goDetail(scope.row.id)">
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
</div>
</template>
<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'
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 {
export default {
components: {
JNPFForm,
Detail,
ExportBox,ToFormDetail , SuperQuery
ExportBox, ToFormDetail, SuperQuery
},
data() {
return {
keyword:'',
keyword: '',
expandsTree: true,
refreshTree: true,
toFormDetailVisible:false,
expandObj:{},
toFormDetailVisible: false,
expandObj: {},
columnOptions: [],
mergeList: [],
exportList:[],
exportList: [],
columnList,
superQueryVisible: false,
@ -163,9 +154,9 @@
uploadBoxVisible: false,
detailVisible: false,
query: {
brandName:undefined,
brandType:undefined,
brandStatus:undefined,
brandName: undefined,
brandType: undefined,
brandStatus: undefined,
},
treeProps: {
children: 'children',
@ -189,12 +180,12 @@
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
brandTypeOptions:[],
brandTypeProps:{"label":"fullName","value":"enCode" },
brandStatusOptions:[],
brandStatusProps:{"label":"fullName","value":"enCode" },
sourceOptions:[],
sourceProps:{"label":"fullName","value":"enCode" },
brandTypeOptions: [],
brandTypeProps: { "label": "fullName", "value": "enCode" },
brandStatusOptions: [],
brandStatusProps: { "label": "fullName", "value": "enCode" },
sourceOptions: [],
sourceProps: { "label": "fullName", "value": "enCode" },
interfaceRes: {
},
}
@ -241,9 +232,9 @@
},
loadNode(node, resolve) {
const nodeData = node.data
const config ={
treeInterfaceId:"",
treeTemplateJson:[]
const config = {
treeInterfaceId: "",
treeTemplateJson: []
}
if (config.treeInterfaceId) {
//
@ -322,7 +313,7 @@
}
})
newList.forEach(item => {
if (item.children && item.children.length ) {
if (item.children && item.children.length) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
@ -370,13 +361,13 @@
this.brandStatusOptions = res.data.list
})
},
goDetail(id){
goDetail(id) {
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(id)
})
},
sortChange({column, prop, order}) {
sortChange({ column, prop, order }) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
@ -395,16 +386,16 @@
...this.query,
keyword: this.keyword,
dataType: 0,
menuId:this.menuId,
moduleId:'520515441391566853',
type:1,
menuId: this.menuId,
moduleId: '520515441391566853',
type: 1,
};
request({
url: `/api/scm/ProductBrand/getList`,
method: 'post',
data: _query
}).then(res => {
var _list =res.data.list;
var _list = res.data.list;
this.list = _list.map(o => ({
...o,
...this.expandObj,
@ -432,10 +423,10 @@
}).catch(() => {
});
},
handelUpload(){
handelUpload() {
this.uploadBoxVisible = true
this.$nextTick(() => {
this.$refs.UploadBox.init("","scm/ProductBrand")
this.$refs.UploadBox.init("", "scm/ProductBrand")
})
},
openSuperQuery() {
@ -450,10 +441,10 @@
this.initData()
},
addOrUpdateHandle(row, isDetail) {
let id = row?row.id:""
let id = row ? row.id : ""
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail,this.list)
this.$refs.JNPFForm.init(id, isDetail, this.list)
})
},
exportData() {
@ -463,7 +454,7 @@
})
},
download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
request({
url: `/api/scm/ProductBrand/Actions/Export`,
method: 'post',
@ -476,10 +467,10 @@
})
},
search() {
this.listQuery.currentPage=1
this.listQuery.pageSize=20
this.listQuery.sort="desc"
this.listQuery.sidx=""
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.initData()
},
refresh(isrRefresh) {
@ -494,6 +485,10 @@
this.flowVisible = false
if (isrRefresh) this.reset()
},
getImgList(list) {
const newList = list.map(o => this.define.comUrl + o.url)
return newList
}
}
}
</script>

Loading…
Cancel
Save