From 8e360ac1e4ee762c5eea88f976484291fc363903 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 24 Mar 2022 11:23:19 +0800
Subject: [PATCH] 20220324
---
zq-erp/src/main/java/com/matrix/system/enums/WeekTypeEnum.java | 52 +++++++++++++
zq-erp/src/main/resources/templates/views/admin/shop/parameterSetting-form.html | 139 ++++++++++++++++++++++++----------
zq-erp/src/main/java/com/matrix/system/enums/WhetherTypeEnum.java | 49 ++++++++++++
3 files changed, 200 insertions(+), 40 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/enums/WeekTypeEnum.java b/zq-erp/src/main/java/com/matrix/system/enums/WeekTypeEnum.java
new file mode 100644
index 0000000..35b67fd
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/enums/WeekTypeEnum.java
@@ -0,0 +1,52 @@
+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 WeekTypeEnum implements EnumApiShowAble {
+
+
+ WEEK_TYPE_ONE(1, "星期一"),
+ WEEK_TYPE_TWO(2, "星期二"),
+ WEEK_TYPE_THREE(3, "星期三"),
+ WEEK_TYPE_FOUR(4, "星期四"),
+ WEEK_TYPE_FIVE(5, "星期五"),
+ WEEK_TYPE_SIX(6, "星期六"),
+ WEEK_TYPE_SEVEN(7, "星期日");
+
+ private Integer value;
+
+ private String displayName;
+
+ WeekTypeEnum(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 "weekType";
+ }
+
+ @Override
+ public List<EnumsShowVo> getEnumsShowVos() {
+ return Lists.newArrayList(values()).stream().map(item ->
+ EnumsShowVo.builder()
+ .displayName(item.getDisplayName())
+ .value(item.value)
+ .build()
+ ).collect(Collectors.toList());
+ }
+}
diff --git a/zq-erp/src/main/java/com/matrix/system/enums/WhetherTypeEnum.java b/zq-erp/src/main/java/com/matrix/system/enums/WhetherTypeEnum.java
new file mode 100644
index 0000000..440060e
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/enums/WhetherTypeEnum.java
@@ -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 WhetherTypeEnum implements EnumApiShowAble {
+
+ WHETHER_YES(1, "是"),
+ WHETHER_NO(2, "否");
+
+ private Integer value;
+
+ private String displayName;
+
+ WhetherTypeEnum(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 "whetherType";
+ }
+
+ @Override
+ public List<EnumsShowVo> getEnumsShowVos() {
+ return Lists.newArrayList(values()).stream().map(item ->
+ EnumsShowVo.builder()
+ .displayName(item.getDisplayName())
+ .value(item.value)
+ .build()
+ ).collect(Collectors.toList());
+ }
+}
diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/parameterSetting-form.html b/zq-erp/src/main/resources/templates/views/admin/shop/parameterSetting-form.html
index 0fbaf6f..3d653c1 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/parameterSetting-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/shop/parameterSetting-form.html
@@ -34,11 +34,6 @@
<template v-for="paramSetting in paramSettings">
- <div v-if="paramSetting.type==4" class="form-group">
- <label class="col-md-2 control-label">{{paramSetting.name}}</label>
- </div>
-
-
<div class="form-group" v-if="paramSetting.type==1">
<label class="col-md-2 control-label">{{paramSetting.name}}</label>
<div class="col-md-8">
@@ -46,36 +41,70 @@
</div>
</div>
-
<div class="form-group" v-if="paramSetting.type==2">
<label class="col-md-2 control-label">{{paramSetting.name}}</label>
<div class="col-md-8">
- <el-select v-model="paramSetting.userValue" placeholder="请选择">
- <el-option
- v-for="item in paramSetting.value"
- :key="item"
- :label="item"
- :value="item">
- </el-option>
- </el-select>
+ <el-radio-group v-model="paramSetting.userValue">
+ <el-radio v-for="item in buttonType"
+ :key="item.value"
+ :label="item.displayName"
+ :value="item.value"></el-radio>
+ </el-radio-group>
</div>
</div>
<div class="form-group" v-if="paramSetting.type==3">
<label class="col-md-2 control-label">{{paramSetting.name}}</label>
<div class="col-md-8">
- <el-checkbox-group v-model="paramSetting.userValue">
- <template v-for="item in paramSetting.value">
- <el-checkbox v-bind:label="item" v-bind:value="item"></el-checkbox>
- </template>
- </el-checkbox-group>
+ <el-select v-model="paramSetting.userValue" placeholder="">
+ <el-option
+ v-for="item in buttonType"
+ :key="item.value"
+ :label="item.displayName"
+ :value="item.displayName">
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+
+ <div class="form-group" v-if="paramSetting.type==4">
+ <label class="col-md-2 control-label">{{paramSetting.name}}</label>
+ <div class="col-md-8">
+ <el-select v-model="paramSetting.userValue" multiple placeholder="请选择">
+ <el-option
+ v-for="item in buttonType"
+ :key="item.value"
+ :label="item.displayName"
+ :value="item.displayName">
+ </el-option>
+ </el-select>
</div>
</div>
<div class="form-group" v-if="paramSetting.type==5">
<label class="col-md-2 control-label">{{paramSetting.name}}</label>
<div class="col-md-8">
- <el-input type="textarea" :rows="2" v-model="paramSetting.userValue"></el-input>
+<!-- <el-select v-model="paramSetting.userValue" placeholder="">-->
+<!-- <el-option-->
+<!-- v-for="item in buttonType"-->
+<!-- :key="item.value"-->
+<!-- :label="item.displayName"-->
+<!-- :value="item.value">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+ <el-upload
+ class="upload-demo"
+ action="/admin/multipleUploadFile/doUpload"
+ :on-preview="handlePreview"
+ :on-remove="handleRemove"
+ :before-remove="beforeRemove"
+ multiple
+ :limit="3"
+ :on-exceed="handleExceed"
+ :file-list="fileList">
+ <el-button size="small" type="primary">点击上传</el-button>
+ <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+ </el-upload>
</div>
</div>
@@ -116,6 +145,9 @@
warehouses: [],
shops: [],
categoryList: [],
+ buttonType:[],
+ fileList:[],
+ codeName:'',
},
created: function () {
this.loadInfo();
@@ -137,15 +169,7 @@
data: {},
url: basePath + '/admin/busParameterSettings/getAllCategoryList',
callback: function (data) {
-
let categoryList = data.rows;
- for (let i = 0; i < categoryList.length; i++) {
- if (categoryList[i].type == 3) {
- if (categoryList[i].value) {
- categoryList[i].value = categoryList[i].value.split(",");
- }
- }
- }
console.log(categoryList);
_this.categoryList = categoryList;
_this.currentCategory = categoryList[0];
@@ -154,6 +178,19 @@
});
},
+ //获取枚举列表
+ loadEnum(codeName){
+ let _this = this;
+ //获取枚举列表
+ AjaxProxy.requst({
+ app: _this,
+ url: basePath + '/common/data/getEnums',
+ data:{"enumCodes":[_this.codeName]},
+ callback: function (data) {
+ _this.buttonType = data.data[''+_this.codeName+''];
+ }
+ });
+ },
//改变编辑页面，切换页面元素
changeCategory(index) {
@@ -171,15 +208,27 @@
callback: function (data) {
let paramSettings = data.rows;
for (let i = 0; i < paramSettings.length; i++) {
- if (paramSettings[i].type == 3) {
- paramSettings[i].value = paramSettings[i].value.split(",");
- if (paramSettings[i].userValue) {
- paramSettings[i].userValue = paramSettings[i].userValue.split(",");
+ if (paramSettings[i].type === 2) {
+ if(paramSettings[i].value != null && paramSettings[i].value != ''){
+ _this.codeName = paramSettings[i].value;
+ _this.loadEnum(_this.codeName);
}
- } else if (paramSettings[i].type == 2) {
- paramSettings[i].value = paramSettings[i].value.split(",");
-
- }
+ }else if(paramSettings[i].type === 3){
+ if(paramSettings[i].value != null && paramSettings[i].value != ''){
+ _this.codeName = paramSettings[i].value;
+ _this.loadEnum(_this.codeName);
+ }
+ }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);
+ }
+ }else if(paramSettings[i].type === 5){
+ if(paramSettings[i].value != null && paramSettings[i].value != ''){
+ }
+ }
}
_this.paramSettings = paramSettings;
console.log("over");
@@ -187,24 +236,34 @@
});
},
- submit() {
+ handleRemove(file, fileList) {
+ console.log(file, fileList);
+ },
+ handlePreview(file) {
+ console.log(file);
+ },
+ handleExceed(files, fileList) {
+ this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+ },
+ beforeRemove(file, fileList) {
+ return this.$confirm(`确定移除 ${ file.name }？`);
+ },
+ submit() {
console.log("提交");
let _this = this;
let submitDate = [];
for (let i = 0; i < _this.paramSettings.length; i++) {
let paramSetting = _this.paramSettings[i];
-
let userValue = paramSetting.userValue;
- if (paramSetting.type == 3) {
+ if (paramSetting.type == 4) {
userValue = paramSetting.userValue.join(",");
}
let obj = {
code: paramSetting.code,
userValue: userValue
}
-
submitDate.push(obj);
}
--
Gitblit v1.9.1