angelo
/
web-retail-admin
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test

This commit is contained in:
woody 2025-07-03 09:10:58 +08:00
parent edfcac2fa4 73a53f63a1
commit 7d0692c803
3 changed files with 86 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
View File

@ -119,15 +119,28 @@
</el-form-item>
</el-col>
<el-col v-if="form.specialArea == 43" :span="8">
<el-form-item :label="'复购区域分红'" prop="specialArea">
<el-input-number
<el-form-item :label="'区域分红方式'" prop="areaIncomeType">
<el-select v-model="form.areaIncomeType" :disabled="methods == 0" clearable @change="handleAreaIncomeTypeChange">
<el-option label="比率" :value="1" />
<el-option label="比值" :value="2" />
</el-select>
</el-form-item>
</el-col>
<el-col v-if="form.specialArea == 43" :span="8">
<el-form-item label="复购区域分红" prop="areaIncome">
<el-input
v-model="form.areaIncome"
type="number"
style="width: 100%"
:controls="false"
clearable
:disabled="methods == 0"
:placeholder="'请输入'"
/>
>
<template v-if="form.areaIncomeType == 1" slot="append">
<span>%</span>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
@ -870,6 +883,7 @@ export default {
memberCode: ''
}
],
areaIncomeType: undefined,
waresSpecsPackList: [{ key: '', value: '' }]
},
moren: '/goodsManage/goodsRelease/jcsz',
@ -991,6 +1005,12 @@ export default {
waresName: [
{ required: true, message: '请输入商品名称', trigger: 'blur' }
],
areaIncomeType: [
{ required: true, message: '请选择区域分红方式', trigger: 'change' }
],
areaIncome: [
{ required: true, message: '请输入复购区域分红', trigger: 'blur' }
],
sortStatus: [{ required: true, message: '请选择', trigger: 'change' }],
waresCode: [{ required: true, message: '', trigger: 'blur' }],
sellingPoints: [
@ -1129,6 +1149,11 @@ export default {
this.authorityList = res.data
})
},
handleAreaIncomeTypeChange(val) {
if (val == 1) {
this.form.areaIncome = 0.5
}
},
// getWaresSort() {
// api.waresSort().then((res) => {
// this.form.sort = res.data
@ -1323,6 +1348,10 @@ export default {
}
})
} else {
this.$message({
message: '请填写完整信息',
type: 'warning'
})
return false
}
})
@ -1417,7 +1446,15 @@ export default {
this.form.pkAreaClassify = value[value.length - 1]
},
selSpecial(e) {
if (e == 43) {
this.$set(this.form, 'areaIncomeType', 2)
}
this.get_hierarchy_list(e)
console.log(
'%c [ e ]-1435',
'font-size:13px; background:#7eb846; color:#c2fc8a;',
e
)
if (
e == 3 ||
e == 26 ||

38
src/views/goodsManage/goodsRelease/jcsz.vue
View File

@ -113,15 +113,28 @@
</el-form-item>
</el-col>
<el-col v-if="form.specialArea == 43" :span="8">
<el-form-item :label="'复购区域分红'" prop="specialArea">
<el-input-number
<el-form-item :label="'区域分红方式'" prop="areaIncomeType">
<el-select v-model="form.areaIncomeType" :disabled="methods == 0" clearable @change="handleAreaIncomeTypeChange">
<el-option label="比率" :value="1" />
<el-option label="比值" :value="2" />
</el-select>
</el-form-item>
</el-col>
<el-col v-if="form.specialArea == 43" :span="8">
<el-form-item :label="'复购区域分红'" prop="areaIncome">
<el-input
v-model="form.areaIncome"
type="number"
style="width: 100%"
:controls="false"
clearable
:disabled="methods == 0"
:placeholder="'请输入'"
/>
>
<template v-if="form.areaIncomeType == 1" slot="append">
<span>%</span>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
@ -759,6 +772,7 @@ export default {
bzList: [],
areaIncome: 0,
pkGuaranteeLabel: [],
areaIncomeType: undefined,
specialArea: '',
checkList: [],
waresMemberAuthorizeList: [],
@ -887,6 +901,12 @@ export default {
postMoneyList3: [],
levelList: [],
rules: {
areaIncomeType: [
{ required: true, message: '请选择区域分红方式', trigger: 'change' }
],
areaIncome: [
{ required: true, message: '请输入复购区域分红', trigger: 'blur' }
],
waresName: [
{ required: true, message: '请输入商品名称', trigger: 'blur' }
],
@ -1026,6 +1046,11 @@ export default {
this.authorityList = res.data
})
},
handleAreaIncomeTypeChange(val) {
if (val == 1) {
this.form.areaIncome = 0.5
}
},
// getWaresSort() {
// api.waresSort().then((res) => {
// this.form.sort = res.data
@ -1117,6 +1142,10 @@ export default {
}
})
} else {
this.$message({
message: '请填写完整信息',
type: 'warning'
})
return false
}
})
@ -1211,6 +1240,9 @@ export default {
this.form.pkAreaClassify = value[value.length - 1]
},
selSpecial(e) {
if (e == 43) {
this.$set(this.form, 'areaIncomeType', 2)
}
this.get_hierarchy_list(e)
if (
e == 3 ||

22
theme/index.css
View File

@ -1831,7 +1831,7 @@
.el-input-group__append,
.el-input-group__prepend {
background-color: #c8161d;
/* background-color: #c8161d; */
color: #909399;
vertical-align: middle;
display: table-cell;
@ -3428,7 +3428,7 @@
.el-input-group__append,
.el-input-group__prepend {
background-color: #c8161d;
/* background-color: #c8161d; */
color: #909399;
vertical-align: middle;
display: table-cell;
@ -5522,7 +5522,7 @@
.el-input-group__append,
.el-input-group__prepend {
background-color: #c8161d;
/* background-color: #c8161d; */
color: #909399;
vertical-align: middle;
display: table-cell;
@ -5959,7 +5959,7 @@
.el-input-group__append,
.el-input-group__prepend {
background-color: #c8161d;
/* background-color: #c8161d; */
color: #909399;
vertical-align: middle;
display: table-cell;
@ -7567,7 +7567,7 @@
.el-input-group__append,
.el-input-group__prepend {
background-color: #c8161d;
/* background-color: #c8161d; */
color: #909399;
vertical-align: middle;
display: table-cell;
@ -12728,7 +12728,7 @@
.el-input-group__append,
.el-input-group__prepend {
background-color: #c8161d;
/* background-color: #c8161d; */
color: #909399;
vertical-align: middle;
display: table-cell;
@ -14788,7 +14788,7 @@
.el-input-group__append,
.el-input-group__prepend {
background-color: #c8161d;
/* background-color: #c8161d; */
color: #909399;
vertical-align: middle;
display: table-cell;
@ -16367,7 +16367,7 @@
.el-input-group__append,
.el-input-group__prepend {
background-color: #c8161d;
/* background-color: #c8161d; */
color: #909399;
vertical-align: middle;
display: table-cell;
@ -19342,7 +19342,7 @@
.el-input-group__append,
.el-input-group__prepend {
background-color: #c8161d;
/* background-color: #c8161d; */
color: #909399;
vertical-align: middle;
display: table-cell;
@ -25450,7 +25450,7 @@
.el-input-group__append,
.el-input-group__prepend {
background-color: #c8161d;
/* background-color: #c8161d; */
color: #909399;
vertical-align: middle;
display: table-cell;
@ -27727,7 +27727,7 @@
.el-input-group__append,
.el-input-group__prepend {
background-color: #c8161d;
/* background-color: #c8161d; */
color: #909399;
vertical-align: middle;
display: table-cell;