From a2d8b47677fcf9eff87faff1bb89a8674714ddd7 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 14 Jul 2021 15:41:38 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html
index 9582b81..224cacb 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html
@@ -83,6 +83,19 @@
</el-form-item>
</el-col>
+ <el-col :offset="2" :span="10" v-if="form.goodType!='家居产品'">
+ <el-form-item label="业绩规则" prop="achieveRuleId">
+ <el-select v-model="form.achieveRuleId" filterable placeholder="请选择业绩规则">
+ <el-option
+ v-for="item in achieveRulsList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+
</el-row>
<el-row>
@@ -190,8 +203,16 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :offset="2" :span="10">
- <el-form-item prop="carUseCount" label-width="120px" label="最大使用次数" v-if="form.isCourse=='Y'">
+ <el-col :offset="2" :span="3">
+ <el-form-item label="是否无限次数" v-if="form.isCourse=='Y'">
+ <el-radio-group v-model="form.isInfinite">
+ <el-radio label="N">否</el-radio>
+ <el-radio label="Y">是</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :offset="1" :span="5">
+ <el-form-item prop="carUseCount" label-width="120px" label="最大使用次数" v-if="form.isCourse=='Y' && form.isInfinite=='N'">
<el-input v-model="form.carUseCount"></el-input>
</el-form-item>
</el-col>
@@ -201,8 +222,8 @@
<el-col :span="10">
<el-form-item label="充值卡使用范围" label-width="150px" prop="isCourse">
<el-radio-group v-model="form.carIsAll">
- <el-radio label="是">所有产品</el-radio>
- <el-radio label="否">部分产品（设置部分产品则充值卡内的金额只能消费指定范围的产品）</el-radio>
+ <el-radio label="是" value="是">所有产品</el-radio>
+ <el-radio label="否" value="是">部分产品（设置部分产品则充值卡内的金额只能消费指定范围的产品）</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -1089,7 +1110,8 @@
loading_zhk: false,
/******综合卡表格数据END********/
-
+ //提成规则
+ achieveRulsList:[],
//默认充值卡选中项
defaultCates: [],
@@ -1132,10 +1154,13 @@
cardAssembles: [],
//充值卡绑定产品分类
isCourse: 'N',
+ isInfinite : 'N',
carIsAll: '否',
useDateNum : '',
buyDateNum : '',
payMethods : '',
+ achieveRuleId:'',
+
},
submitUrl: '/admin/shoppinggoods/addShoppingGoods',
modifySubmitUrl: '/admin/shoppinggoods/modifyShoppingGoods',
@@ -1144,14 +1169,7 @@
name: [{required: true, message: '请输入商品名称', trigger: 'blur'}],
code: [{required: true, message: '请输入商品编码', trigger: 'blur'}],
cateId: [{required: true, message: '请选择商品分类', trigger: 'blur'}],
- goodsSortId: [{required: true, message: '请选择库存分类', trigger: 'blur'}],
- unit: [{required: true, message: '请填写规格', trigger: 'change'}],
- volume: [{required: true, message: '请填写容量', trigger: 'blur'}],
- measure: [{required: true, message: '请填写单位', trigger: 'change'}],
- isCourse: [{required: true, message: '请选择套餐类型', trigger: 'change'}],
sealPice: [{required: true, message: '请填写售价', trigger: 'blur'}],
- timeLength: [{required: true, message: '请填写服务时长', trigger: 'blur'}],
- isNum : [{ type : 'number', message: '请输入数字', trigger: 'blur' }],
},
},
@@ -1165,6 +1183,7 @@
this.getGoodstype();
this.getDictionary();
this.getShopInfo();
+ this.getAchieveRule();
if(goodType=='家居产品'){
this.getSupplierList();
}
@@ -1183,6 +1202,21 @@
},
methods: {
+
+ /**
+ * 获取规则
+ */
+ getAchieveRule(){
+ let _this = this;
+ AjaxProxy.requst({
+ app: _this,
+ data: {pageNum:1,pageSize:1000},
+ url: basePath + "/admin/achieveRule/selectList",
+ callback: function (data) {
+ _this.achieveRulsList=data.rows;
+ }
+ });
+ },
/**
* 商品分类树形组件格式化
@@ -1555,11 +1589,11 @@
if (this.validFormData()) {
this.$refs[formName].validate((valid) => {
-
+ console.log(valid);
if (valid) {
- if ( _this.form.goodType == '套餐' && _this.form.isCourse == 'Y' && !_this.form.carUseCount) {
+ if ( _this.form.goodType == '套餐' && _this.form.isCourse == 'Y' && _this.form.isInfinite == 'N' && !_this.form.carUseCount) {
this.$message.error('请输入套餐最大使用次数！');
_this.submiting = false;
return false;
--
Gitblit v1.9.1