xiaoyong931011
2022-03-28 063d2e89cfa0738eb4d7f94c91583a1891d2a1d1
20220324
1 files added
11 files modified
245 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/common/actions/BusParameterSettingsAction.java 10 ●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java 10 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/service/BusParameterSettingService.java 12 ●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/enums/TextMessageTypeEnum.java 49 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java 7 ●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java 6 ●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java 6 ●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceHelper.java 10 ●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 11 ●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java 10 ●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/parameterSetting-form.html 100 ●●●●● patch | view | raw | blame | history
zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java 14 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/BusParameterSettingsAction.java
@@ -7,10 +7,10 @@
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.enums.BooleanEnum;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.ParameterSettings;
import com.matrix.system.hive.dao.ParameterSettingsDao;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -124,7 +124,13 @@
                BusParameterSettings newParam=new BusParameterSettings();
                newParam.setParamCode(parameterSetting.getCode());
                newParam.setCompanyId(user.getCompanyId());
                newParam.setParamValue(parameterSetting.getUserValue());
                if(parameterSetting.getUserValue().equals(BooleanEnum.TRUE.getDisplayName())){
                    newParam.setParamValue(String.valueOf(BooleanEnum.TRUE.getValue()));
                }else if(parameterSetting.getUserValue().equals(BooleanEnum.FALSE.getDisplayName())){
                    newParam.setParamValue(String.valueOf(BooleanEnum.FALSE.getValue()));
                }else{
                    newParam.setParamValue(parameterSetting.getUserValue());
                }
                if(type==SHOP){
                    newParam.setShopId(user.getShopId());
                }
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
@@ -593,6 +593,16 @@
     */
    public static final String WX_ORDER_NOTICE_DINGDING_TOKEN = "wxOrderNoticeDingdingToken";
    /**
     * 系统名称
     */
    public static final String ADMIN_SYSTEM_TITLE = "ADMIN_SYSTEM_TITLE";
    /**
     * 品牌名称
     */
    public static final String ADMIN_BRAND_TITLE = "ADMIN_BRAND_TITLE";
zq-erp/src/main/java/com/matrix/system/common/service/BusParameterSettingService.java
@@ -1,19 +1,12 @@
package com.matrix.system.common.service;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysCompany;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.fenxiao.constant.FenxiaoSettingConstant;
import com.matrix.system.score.constant.ScoreSettingConstant;
import com.matrix.system.enums.BooleanEnum;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@Service
@@ -31,7 +24,8 @@
        return (
                Objects.nonNull(busParameterSettings)
                && StringUtils.isNotBlank(busParameterSettings.getParamValue())
                && AppConstance.IS_Y.equals(busParameterSettings.getParamValue())
//                && AppConstance.IS_Y.equals(busParameterSettings.getParamValue())
                && BooleanEnum.TRUE.getValue().equals(busParameterSettings.getParamValue())
                );
    }
zq-erp/src/main/java/com/matrix/system/enums/TextMessageTypeEnum.java
New file
@@ -0,0 +1,49 @@
package com.matrix.system.enums;
import com.google.common.collect.Lists;
import com.matrix.core.enums.EnumApiShowAble;
import com.matrix.core.enums.EnumsShowVo;
import java.util.List;
import java.util.stream.Collectors;
/**
 * 短信平台
 */
public enum TextMessageTypeEnum implements EnumApiShowAble {
    TEXT_MESSAGE_TYPE_HYWX(1, "互亿无线"),
    TEXT_MESSAGE_TYPE_ALYDX(2, "阿里云短信");
    private  Integer value;
    private  String displayName;
    TextMessageTypeEnum(Integer value, String displayName) {
        this.value = value;
        this.displayName = displayName;
    }
    public Integer getValue() {
        return value;
    }
    public String getDisplayName() {
        return displayName;
    }
    @Override
    public String getEnumCode() {
        return "textMessageType";
    }
    @Override
    public List<EnumsShowVo> getEnumsShowVos() {
        return Lists.newArrayList(values()).stream().map(item ->
                EnumsShowVo.builder()
                        .displayName(item.getDisplayName())
                        .value(item.value)
                        .build()
        ).collect(Collectors.toList());
    }
}
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
@@ -1,6 +1,5 @@
package com.matrix.system.hive.action;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSON;
import com.matrix.component.asyncmessage.AsyncMessageManager;
import com.matrix.core.exception.GlobleException;
@@ -21,6 +20,7 @@
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.enums.BooleanEnum;
import com.matrix.system.enums.OperationButtonEnum;
import com.matrix.system.enums.OperationFunctionEnum;
import com.matrix.system.hive.action.util.QueryUtil;
@@ -502,8 +502,11 @@
        SysOrder order = orderService.findById(id);
        BusParameterSettings shopManageAbleCancelDfkOrder = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.SHOP_MANAGE_ABLE_CANCEL_DFK_ORDER, order.getCompanyId());
//        if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
//                && shopManageAbleCancelDfkOrder.getParamValue().equals(Dictionary.FLAG_YES)) {
        if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
                && shopManageAbleCancelDfkOrder.getParamValue().equals(Dictionary.FLAG_YES)) {
                && BooleanEnum.TRUE.getValue().equals(shopManageAbleCancelDfkOrder.getParamValue())) {
            if (!Dictionary.ORDER_STATU_DFK.equals(order.getStatu())) {
                return new AjaxResult(AjaxResult.STATUS_FAIL, "您只能取消待付款订单");
            }
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
@@ -26,6 +26,7 @@
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.enums.BooleanEnum;
import com.matrix.system.enums.OperationButtonEnum;
import com.matrix.system.enums.OperationFunctionEnum;
import com.matrix.system.hive.action.util.QueryUtil;
@@ -546,8 +547,11 @@
        SysProjServices checkProjServices = sysProjServicesDao.selectById(services.getId());
        BusParameterSettings shopManageAbleCancelDfkOrder = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.SHOP_MANAGE_ABLE_CANCEL_DFK_ORDER, checkProjServices.getCompanyId());
//        if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
//                && shopManageAbleCancelDfkOrder.getParamValue().equals(Dictionary.FLAG_YES)) {
        if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
                && shopManageAbleCancelDfkOrder.getParamValue().equals(Dictionary.FLAG_YES)) {
                    && BooleanEnum.TRUE.getValue().equals(shopManageAbleCancelDfkOrder.getParamValue())) {
            if (!checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DYY)
                    && !checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DQR)) {
                return new AjaxResult(AjaxResult.STATUS_FAIL, "您只能取消待预约订单");
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
@@ -16,6 +16,7 @@
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.SysUsersDao;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.enums.BooleanEnum;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.util.CollectionUtils;
@@ -380,7 +381,10 @@
            if (shopManageJjcpasConsume == null) {
                shopManageJjcpasConsume = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.SHOP_MANAGE_JJCPAS_CONSUME, pageOrder.getCompanyId());
            }
            if (AppConstance.IS_Y.equals(shopManageJjcpasConsume.getParamValue())) {
//            if (AppConstance.IS_Y.equals(shopManageJjcpasConsume.getParamValue())) {
//                achieveNew.setHisConsume(achieveNew.getGoodsCash());
//            }
            if (BooleanEnum.TRUE.getValue().equals(shopManageJjcpasConsume.getParamValue())) {
                achieveNew.setHisConsume(achieveNew.getGoodsCash());
            }
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceHelper.java
@@ -12,7 +12,6 @@
import com.google.common.collect.Lists;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
@@ -22,6 +21,7 @@
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.service.OperationLogService;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.enums.BooleanEnum;
import com.matrix.system.enums.OperationButtonEnum;
import com.matrix.system.enums.OperationFunctionEnum;
import com.matrix.system.hive.bean.*;
@@ -31,7 +31,10 @@
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.plugin.util.MoneyUtil;
import com.matrix.system.hive.pojo.CzXkVo;
import com.matrix.system.hive.service.*;
import com.matrix.system.hive.service.CodeService;
import com.matrix.system.hive.service.MoneyCardUseService;
import com.matrix.system.hive.service.SysInstoreInfoService;
import com.matrix.system.hive.service.SysProjUseService;
import com.matrix.system.score.constant.ScoreSettingConstant;
import com.matrix.system.score.entity.ScoreVipDetail;
import com.matrix.system.score.service.ScoreVipDetailService;
@@ -345,7 +348,8 @@
    public void addOutStore(SysOrder order) {
        BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, order.getCompanyId());
        if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
//        if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
        if (BooleanEnum.TRUE.getValue().equals(manageStockSetting.getParamValue())) {
            List<SysOutStoreItem> storeItemList = new ArrayList<>();
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -9,7 +9,6 @@
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.OrderListDto;
@@ -29,9 +28,11 @@
import com.matrix.system.enums.OperationFunctionEnum;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.dto.*;
import com.matrix.system.hive.dto.GoodsSealLimitDto;
import com.matrix.system.hive.dto.MoneyCardOperationDto;
import com.matrix.system.hive.dto.ProjUseOperationDto;
import com.matrix.system.hive.dto.SysOrderItemDto;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.plugin.util.MoneyUtil;
import com.matrix.system.hive.pojo.CzXkVo;
import com.matrix.system.hive.service.*;
import com.matrix.system.score.service.ScoreVipDetailService;
@@ -41,7 +42,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -617,7 +617,8 @@
        }
        BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, sysOrder.getCompanyId());
        if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
//        if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
        if (BooleanEnum.TRUE.getValue().equals(manageStockSetting.getParamValue())) {
            // 家居产品退库存
            if (CollectionUtils.isNotEmpty(returnGoodsList)) {
                LogUtil.info("订单退款:退产品库存:{}", JSON.toJSONString(returnGoodsList));
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
@@ -21,6 +21,7 @@
import com.matrix.system.common.service.BusParameterSettingService;
import com.matrix.system.common.service.OperationLogService;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.enums.BooleanEnum;
import com.matrix.system.enums.OperationButtonEnum;
import com.matrix.system.enums.OperationFunctionEnum;
import com.matrix.system.hive.bean.*;
@@ -1025,7 +1026,8 @@
        if (CollectionUtils.isNotEmpty(projServicesVo.getOutStoreItem())) {
            BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, projServicesVo.getCompanyId());
            if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
//            if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
            if (BooleanEnum.TRUE.getValue().equals(manageStockSetting.getParamValue())) {
                for (SysOutStoreItem item : projServicesVo.getOutStoreItem()) {
                    if (item.getAmount() != null && item.getAmount() > 0) {
                        return true;
@@ -1164,7 +1166,11 @@
        boolean flag = false;
        if (CollUtil.isNotEmpty(settings)) {
            for (ParameterSettings setting : settings) {
                if (step.equals(setting.getCode()) && Dictionary.FLAG_YES.equals(setting.getUserValue())) {
//                if (step.equals(setting.getCode()) && Dictionary.FLAG_YES.equals(setting.getUserValue())) {
//                    flag = true;
//                    break;
//                }
                if (step.equals(setting.getCode()) && BooleanEnum.TRUE.getValue().equals(setting.getUserValue())) {
                    flag = true;
                    break;
                }
zq-erp/src/main/resources/templates/views/admin/shop/parameterSetting-form.html
@@ -50,10 +50,10 @@
                        <label class="col-md-2 control-label">{{paramSetting.name}}</label>
                        <div class="col-md-8">
                            <el-radio-group v-model="paramSetting.userValue">
                                <el-radio v-for="item in buttonType"
                                <el-radio v-for="item in buttonTypeTwo"
                                          :key="item.value"
                                          :label="item.displayName"
                                          :value="item.value"></el-radio>
                                          :value="item.displayName"></el-radio>
                            </el-radio-group>
                        </div>
                    </div>
@@ -63,7 +63,7 @@
                        <div class="col-md-8">
                            <el-select v-model="paramSetting.userValue" placeholder="">
                                <el-option
                                        v-for="item in buttonType"
                                        v-for="item in buttonTypeThree"
                                        :key="item.value"
                                        :label="item.displayName"
                                        :value="item.displayName">
@@ -77,7 +77,7 @@
                        <div class="col-md-8">
                            <el-select v-model="paramSetting.userValue" multiple placeholder="请选择">
                                <el-option
                                        v-for="item in buttonType"
                                        v-for="item in buttonTypeFour"
                                        :key="item.value"
                                        :label="item.displayName"
                                        :value="item.displayName">
@@ -93,10 +93,11 @@
                                    class="upload-demo"
                                    action="/admin/multipleUploadFile/doUpload"
                                    :on-preview="handlePreview"
                                    :on-success="uploadSuccess"
                                    :on-remove="handleRemove"
                                    :before-remove="beforeRemove"
                                    multiple
                                    :limit="3"
                                    :limit="1"
                                    :on-exceed="handleExceed"
                                    :file-list="fileList">
                                <el-button size="small" type="primary">点击上传</el-button>
@@ -108,35 +109,13 @@
                    <div class="form-group" v-if="paramSetting.type==6">
                        <label class="col-md-2 control-label">{{paramSetting.name}}</label>
                        <div class="col-md-8">
                            <el-upload action="/admin/multipleUploadFile/doUpload"
                                        list-type="picture-card"
                                        :auto-upload="false">
                                <i slot="default" class="el-icon-plus"></i>
                                <img v-if="paramSetting.userValue" :src="paramSetting.userValue" style="max-width: 300px;">
                                <div slot="file" slot-scope="{file}">
                                    <img class="el-upload-list__item-thumbnail"
                                            :src="file.url" alt="" >
                                    <span class="el-upload-list__item-actions">
                                    <span class="el-upload-list__item-preview"
                                            @click="handlePictureCardPreview(file)" >
                                      <i class="el-icon-zoom-in"></i>
                                    </span>
<!--                                    <span v-if="!disabled"-->
<!--                                            class="el-upload-list__item-delete"-->
<!--                                            @click="handleDownload(file)" >-->
<!--                                      <i class="el-icon-download"></i>-->
<!--                                    </span>-->
                                    <span v-if="!disabled"
                                            class="el-upload-list__item-delete"
                                            @click="handleRemove(file)" >
                                      <i class="el-icon-delete"></i>
                                    </span>
                                  </span>
                                </div>
                            <el-upload
                                    action="/admin/multipleUploadFile/doUpload"
                                    :show-file-list="false"
                                    :on-success="imageLineSuccess">
                                <img v-if="imageLine" :src="imageLine" style="max-width: 300px;">
                                <el-button size="small" type="primary">点击上传</el-button>
                            </el-upload>
                            <el-dialog :visible.sync="dialogVisible">
                                <img width="100%" :src="dialogImageUrl" alt="">
                            </el-dialog>
                        </div>
                    </div>
@@ -168,10 +147,6 @@
    var app = new Vue({
        el: '#app',
        data: {
            dialogImageUrl: '',
            dialogVisible: false,
            disabled: false,
            form: {
                warehouseId: '',
                shopId: '',
@@ -181,9 +156,13 @@
            warehouses: [],
            shops: [],
            categoryList: [],
            buttonType:[],
            buttonTypeThree:[],
            buttonTypeFour:[],
            buttonTypeTwo:[],
            fileList:[],
            codeName:'',
            imageLine:'',
            type:2,
        },
        created: function () {
            this.loadInfo();
@@ -215,7 +194,7 @@
            },
            //获取枚举列表
            loadEnum(codeName){
            loadEnum(codeName,type){
                let _this = this;
                //获取枚举列表
                AjaxProxy.requst({
@@ -223,7 +202,13 @@
                    url: basePath + '/common/data/getEnums',
                    data:{"enumCodes":[_this.codeName]},
                    callback: function (data) {
                        _this.buttonType = data.data[''+_this.codeName+''];
                        if(_this.type === 3){
                            _this.buttonTypeThree = data.data[''+_this.codeName+''];
                        }else if(_this.type === 4){
                            _this.buttonTypeFour = data.data[''+_this.codeName+''];
                        }else if(_this.type === 2){
                            _this.buttonTypeTwo = data.data[''+_this.codeName+''];
                        }
                    }
                });
            },
@@ -246,26 +231,36 @@
                        for (let i = 0; i < paramSettings.length; i++) {
                           if (paramSettings[i].type === 2) {
                                if(paramSettings[i].value != null && paramSettings[i].value != ''){
                                    if(paramSettings[i].userValue === '1'){
                                        paramSettings[i].userValue = '是';
                                    }else if(paramSettings[i].userValue === '2'){
                                        paramSettings[i].userValue = '否';
                                    }
                                    _this.codeName = paramSettings[i].value;
                                    _this.loadEnum(_this.codeName);
                                    _this.type = paramSettings[i].type;
                                    _this.loadEnum(_this.codeName,_this.type);
                                }
                           }else if(paramSettings[i].type === 3){
                               if(paramSettings[i].value != null && paramSettings[i].value != ''){
                                   _this.codeName = paramSettings[i].value;
                                   _this.loadEnum(_this.codeName);
                                   _this.type = paramSettings[i].type;
                                   _this.loadEnum(_this.codeName,_this.type);
                               }
                           }else if(paramSettings[i].type === 4){
                               if(paramSettings[i].value != null && paramSettings[i].value != ''){
                                   //下拉框回显
                                   paramSettings[i].userValue = paramSettings[i].userValue.split(',');
                                   _this.codeName = paramSettings[i].value;
                                   _this.loadEnum(_this.codeName);
                                   _this.type = paramSettings[i].type;
                                   _this.loadEnum(_this.codeName,_this.type);
                               }
                           }else if(paramSettings[i].type === 5){
                               if(paramSettings[i].value != null && paramSettings[i].value != ''){
                                    alert(paramSettings[i].userValue+"----类型");
                                   _this.fileList.push(paramSettings[i].userValue);
                               }
                           }else if(paramSettings[i].type === 6){
                                   _this.file.push(paramSettings[i].userValue);
                                   _this.imageLine = paramSettings[i].userValue;
                           }
                        }
                        _this.paramSettings = paramSettings;
@@ -281,20 +276,16 @@
                console.log(file);
            },
            handleExceed(files, fileList) {
                this.$message.warning(`当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`);
                this.$message.warning(`当前限制选择 1 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`);
            },
            beforeRemove(file, fileList) {
                return this.$confirm(`确定移除 ${ file.name }?`);
            },
            handleRemove(file) {
                console.log(file);
            uploadSuccess(res, file) {
                this.imageLine = res.path;
            },
            handlePictureCardPreview(file) {
                this.dialogImageUrl = file.url;
                this.dialogVisible = true;
            },
            handleDownload(file) {
                console.log(file);
            imageLineSuccess(res, file) {
                this.imageLine = res.path;
            },
            submit() {
@@ -310,8 +301,7 @@
                    }
                    if (paramSetting.type == 6) {
                        userValue = _this.dialogImageUrl;
                        alert(_this.dialogImageUrl);
                        userValue = _this.imageLine;
                    }
                    let obj = {
                        code: paramSetting.code,
zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
@@ -126,6 +126,20 @@
        newSetting11.setCategory("店务配置");
        newSettings.add(newSetting11);
        ParameterSettings newSetting12=new ParameterSettings();
        newSetting11.setCode(AppConstance.ADMIN_SYSTEM_TITLE);
        newSetting11.setName("系统名称");
        newSetting11.setType(1);
        newSetting11.setCategory("品牌设置");
        newSettings.add(newSetting12);
        ParameterSettings newSetting13=new ParameterSettings();
        newSetting11.setCode(AppConstance.ADMIN_BRAND_TITLE);
        newSetting11.setName("品牌名称");
        newSetting11.setType(1);
        newSetting11.setCategory("品牌设置");
        newSettings.add(newSetting13);
        for (ParameterSettings newSetting : newSettings) {
            List<ParameterSettings> parameterSettings = parameterSettingsDao.selectByModel(newSetting);
            if(CollectionUtil.isEmpty(parameterSettings)){