From 4e93084b3466fa7fcb8431a67e6552f9bbed831f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 17 Mar 2021 09:44:06 +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 | 113 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 69 insertions(+), 44 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 7ac67c3..b53dc2b 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>
@@ -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"
@@ -143,28 +149,32 @@
width="50">
</el-table-column>
<el-table-column
- prop="code"
- label="产品编号"
- width="100">
+ prop="id"
+ label="ID">
</el-table-column>
<el-table-column
- prop="name"
-
+ prop="title"
label="产品名称">
</el-table-column>
-
<el-table-column
- prop="sealPice"
- label="售价">
+ prop="price"
+ label="价格">
</el-table-column>
<el-table-column
- prop="goodType"
- label="类型">
+ prop="score"
+ label="积分">
</el-table-column>
<el-table-column
- prop="cateName"
- label="分类">
+ prop="attrValues"
+ label="产品属性">
+ </el-table-column>
+ <el-table-column
+ label="是否上架">
+ <template slot-scope="scope">
+ <span v-if="scope.row.status == 1">是</span>
+ <span v-if="scope.row.status == 2">否</span>
+ </template>
</el-table-column>
<el-table-column
width="150"
@@ -196,30 +206,29 @@
width="50">
</el-table-column>
<el-table-column
- prop="shoppingGoods.code"
- label="产品编号"
- width="100">
+ prop="ShopProduct.id"
+ width="280"
+ label="产品ID">
</el-table-column>
-
<el-table-column
- prop="shoppingGoods.name"
+ prop="ShopProduct.title"
width="280"
label="产品名称">
</el-table-column>
<el-table-column
- prop="shoppingGoods.goodType"
+ prop="ShopProduct.attrValues"
width="80"
- label="产品类型">
+ label="产品属性">
</el-table-column>
<el-table-column
- prop="shoppingGoods.sealPice"
+ prop="ShopProduct.price"
label="单价">
</el-table-column>
<el-table-column
prop="address"
label="操作">
<template slot-scope="scope">
- <el-button type="primary" v-if="order.statu!='欠款'"
+ <el-button type="primary"
size="mini"
@click="removeItem(scope.$index, scope.row)">删除
</el-button>
@@ -274,6 +283,8 @@
//表格加载效果
loading: false,
/******搜索表格数据END********/
+ val:'',
+ isShow:true,
fxkg:[],
fxms:[],
sqfs:[],
@@ -292,6 +303,10 @@
let _this = this;
_this.loadParamSetting();
},
+ sqfsChange(val){
+ let _this = this;
+ _this.isShow=(val==2)?true:false;
+ },
loadParamSetting() {
let _this = this;
//加载配置
@@ -303,6 +318,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;
@@ -323,7 +346,7 @@
//判断是否被选中
let selected = false;
this.order.items.forEach(item => {
- if (item.shoppingGoods.id == goods.id) {
+ if (item.ShopProduct.id == goods.id) {
selected = true;
return;
}
@@ -331,7 +354,7 @@
if (!selected) {
//未选中产品加入列表
let item = {};
- item.shoppingGoods = goods;
+ item.ShopProduct = goods;
item.goodsId = goods.id;
item.count = 1;
this.order.items.push(item);
@@ -354,11 +377,12 @@
let submitDate ="";
for (let i = 0; i < _this.order.items.length; i++) {
let goods = _this.order.items[i];
- let goodsId = goods.goodsId;
+ let goodsId = goods.id;
submitDate = submitDate +goodsId+",";
}
+ alert(submitDate);
_this.cpid = submitDate;
- _this.drawer = false
+ _this.drawer = false;
},
/**
* 批量选择产品
@@ -374,7 +398,7 @@
* 行点击事件
*/
handleClickTableRow(row, event, column) {
- this.$refs.dataTable.toggleRowSelection(row);
+ this.pushToSelectGoods(row);
},
/**
* 删除组合产品
@@ -397,7 +421,8 @@
contentType: 'application/x-www-form-urlencoded',
//TODO 优化下拉加载
data: {name: _this.queryKey, limit: 10000},
- url: basePath + "/admin/shoppinggoods/showList",
+ //url: basePath + "/admin/shoppinggoods/showList",
+ url: basePath + "/fenXiao/ruleSetting/selectProduct",
callback: function (data) {
_this.searchTableData = data.rows;
_this.loading = false;
--
Gitblit v1.9.1