From 9974b1fffff1cad712b7c30fb4c708ef45ec4b8c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 17 Mar 2021 09:44:03 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html | 64 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html
index 85ec8de..4b6da5c 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html
@@ -36,6 +36,7 @@
</template>
</el-col>
</el-row>
+
<el-row style="margin-top: 20px;">
<el-col>
<template v-for="paramSettingTwo in fxms">
@@ -51,13 +52,14 @@
</template>
</el-col>
</el-row>
+
<el-row style="margin-top: 20px;">
<el-col>
<template v-for="paramSettingThree in sqfs">
<el-form-item>
<span slot="label">{{paramSettingThree.paramName}}</span>
<el-col>
- <el-radio-group v-model="paramSettingThree.paramValue">
+ <el-radio-group v-model="paramSettingThree.paramValue" @change="sqfsChange">
<div style="margin-top: 12px;"><el-radio :label="'1'">无需申请满足条件自动成为分销员</el-radio></div>
<div style="margin-top: 20px;"><el-radio :label="'2'">需要客户主动申请</el-radio></div>
</el-radio-group>
@@ -66,22 +68,8 @@
</template>
</el-col>
</el-row>
- <el-row style="margin-top: 20px;">
- <el-col>
- <template v-for="paramSettingFour in shfs">
- <el-form-item>
- <span slot="label">{{paramSettingFour.paramName}}</span>
- <el-col>
- <el-radio-group v-model="paramSettingFour.paramValue">
- <div style="margin-top: 12px;"><el-radio :label="'1'">系统自动审核</el-radio></div>
- <div style="margin-top: 20px;"><el-radio :label="'2'">人工审核</el-radio></div>
- </el-radio-group>
- </el-col>
- </el-form-item >
- </template>
- </el-col>
- </el-row>
- <el-row style="margin-top: 20px;">
+
+ <el-row v-show="isShow" style="margin-top: 20px;">
<el-col>
<template v-for="paramSettingFive in sqtj">
<el-form-item>
@@ -94,8 +82,8 @@
<el-radio :label="'3'">消费指定产品可成为分销员</el-radio>
<div style="display:flex;align-items: center;">
<el-button type="primary" @click="drawer = true">设置产品</el-button>
- <el-input style="width:100px;" v-model="paramSettingFive.paramValue1"></el-input>
- <el-input style="width:100px;display: block;" v-model="cpid"></el-input>
+ <el-input style="width:100px;display: none;" v-model="paramSettingFive.paramValue1"></el-input>
+ <el-input style="width:100px;display: none;" v-model="cpid"></el-input>
</div>
</div>
<div style="margin-top: 25px;display:flex;align-items: center;">
@@ -111,6 +99,24 @@
</template>
</el-col>
</el-row>
+
+ <el-row v-show="isShow" style="margin-top: 20px;">
+ <el-col>
+ <template v-for="paramSettingFour in shfs">
+ <el-form-item>
+ <span slot="label">{{paramSettingFour.paramName}}</span>
+ <el-col>
+ <el-radio-group v-model="paramSettingFour.paramValue">
+ <div style="margin-top: 12px;"><el-radio :label="'1'">系统自动审核</el-radio></div>
+ <div style="margin-top: 20px;"><el-radio :label="'2'">人工审核</el-radio></div>
+ </el-radio-group>
+ </el-col>
+ </el-form-item >
+ </template>
+ </el-col>
+ </el-row>
+
+
<el-drawer
title="业绩设置"
:visible.sync="drawer"
@@ -274,6 +280,8 @@
//表格加载效果
loading: false,
/******搜索表格数据END********/
+ val:'',
+ isShow:true,
fxkg:[],
fxms:[],
sqfs:[],
@@ -292,6 +300,10 @@
let _this = this;
_this.loadParamSetting();
},
+ sqfsChange(val){
+ let _this = this;
+ _this.isShow=(val==2)?true:false;
+ },
loadParamSetting() {
let _this = this;
//加载配置
@@ -303,6 +315,14 @@
_this.fxkg = data.mapInfo.fxkg;
_this.fxms = data.mapInfo.fxms;
_this.sqfs = data.mapInfo.sqfs;
+ if(_this.sqfs.length > 0){
+ let paramssqfs = _this.sqfs[0].paramValue;
+ if(paramssqfs == 2){
+ _this.isShow = true;
+ }else{
+ _this.isShow = false;
+ }
+ }
_this.shfs = data.mapInfo.shfs;
_this.sqtj = data.mapInfo.sqtj;
//_this.order.items = data.mapInfo.order;
@@ -481,17 +501,11 @@
let paramValue = paramSetting.paramValue;
let paramValue1;
let paramValue2;
-
- alert(paramValue);
if(paramValue === '3'){
paramValue1 = _this.cpid;
}else if(paramValue === '4'){
paramValue2 = paramSetting.paramValue2;
}
- alert(paramValue1);
-
- alert(paramValue2);
-
let obj = {
paramCode: paramCode,
paramValue: paramValue,
--
Gitblit v1.9.1