From 7f4157d6a4983fa57c212e1286181d0d292c78d3 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 25 Mar 2022 12:28:24 +0800 Subject: [PATCH] Merge branch 'buttonmodify' into feature/订单服务单代码改造 --- zq-erp/src/main/resources/templates/views/admin/shop/parameterSetting-form.html | 192 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 152 insertions(+), 40 deletions(-) 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..c93a906 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 @@ -14,6 +14,11 @@ <link rel="stylesheet" th:href="@{/plugin/bootstrap-3.3.5/css/bootstrap.min.css}"> <link th:href="@{/css/styleOne/style.min.css}" rel="stylesheet" type="text/css"/> </head> +<style> + .el-upload__input { + display: none !important; + } +</style> <body> <div class="ibox-content" id="app" v-cloak> @@ -34,11 +39,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 +46,97 @@ </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-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> + + <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> + <el-dialog :visible.sync="dialogVisible"> + <img width="100%" :src="dialogImageUrl" alt=""> + </el-dialog> </div> </div> @@ -107,6 +168,10 @@ var app = new Vue({ el: '#app', data: { + dialogImageUrl: '', + dialogVisible: false, + disabled: false, + form: { warehouseId: '', shopId: '', @@ -116,6 +181,9 @@ warehouses: [], shops: [], categoryList: [], + buttonType:[], + fileList:[], + codeName:'', }, created: function () { this.loadInfo(); @@ -137,15 +205,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 +214,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 +244,29 @@ 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 != ''){ + } + }else if(paramSettings[i].type === 6){ + _this.file.push(paramSettings[i].userValue); + } } _this.paramSettings = paramSettings; console.log("over"); @@ -187,24 +274,49 @@ }); }, - 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 }?`); + }, + handleRemove(file) { + console.log(file); + }, + handlePictureCardPreview(file) { + this.dialogImageUrl = file.url; + this.dialogVisible = true; + }, + handleDownload(file) { + console.log(file); + }, + 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(","); + } + + if (paramSetting.type == 6) { + userValue = _this.dialogImageUrl; + alert(_this.dialogImageUrl); } let obj = { code: paramSetting.code, userValue: userValue } - submitDate.push(obj); } -- Gitblit v1.9.1