From 1eedb8a57c2eb5c9953dcf058184ebdc6987fbf5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 15:14:21 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/resources/templates/views/admin/shop/parameterSetting-form.html | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 5e8cf8f..3bc488a 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
@@ -41,14 +41,14 @@
<div class="form-group" v-if="paramSetting.type==1">
<label class="col-md-4 control-label">{{paramSetting.name}}</label>
- <div class="col-md-4">
+ <div class="col-md-6">
<el-input v-model="paramSetting.userValue"></el-input>
</div>
</div>
<div class="form-group" v-if="paramSetting.type==2">
<label class="col-md-4 control-label">{{paramSetting.name}}</label>
- <div class="col-md-4" style="float:left;margin-top: 8px;">
+ <div class="col-md-6" style="float:left;margin-top: 8px;">
<el-radio-group v-model="paramSetting.userValue">
<el-radio v-for="item in buttonTypeTwo"
:key="item.value"
@@ -60,7 +60,7 @@
<div class="form-group" v-if="paramSetting.type==3">
<label class="col-md-4 control-label">{{paramSetting.name}}</label>
- <div class="col-md-4">
+ <div class="col-md-6">
<el-select v-model="paramSetting.userValue" placeholder="">
<el-option
v-for="item in buttonTypeThree"
@@ -74,7 +74,7 @@
<div class="form-group" v-if="paramSetting.type==4">
<label class="col-md-4 control-label">{{paramSetting.name}}</label>
- <div class="col-md-4">
+ <div class="col-md-6">
<el-select v-model="paramSetting.userValue" multiple placeholder="请选择">
<el-option
v-for="item in buttonTypeFour"
@@ -88,7 +88,7 @@
<div class="form-group" v-if="paramSetting.type==5">
<label class="col-md-4 control-label">{{paramSetting.name}}</label>
- <div class="col-md-4">
+ <div class="col-md-6">
<el-upload
class="upload-demo"
action="/admin/multipleUploadFile/doUpload"
@@ -108,7 +108,7 @@
<div class="form-group" v-if="paramSetting.type==6">
<label class="col-md-4 control-label">{{paramSetting.name}}</label>
- <div class="col-md-4">
+ <div class="col-md-6">
<el-upload
action="/admin/multipleUploadFile/doUpload"
:show-file-list="false"
@@ -249,14 +249,15 @@
}else if(paramSettings[i].type === 4){
if(paramSettings[i].value != null && paramSettings[i].value != ''){
//下拉框回显
- paramSettings[i].userValue = paramSettings[i].userValue.split(',');
+ if (paramSettings[i].userValue != null && paramSettings[i].userValue != '') {
+ paramSettings[i].userValue = paramSettings[i].userValue.split(',');
+ }
_this.codeName = paramSettings[i].value;
_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){
--
Gitblit v1.9.1