Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica.cloud.web-education-admin
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
提交
打开侧边栏
com.pica.cloud.education.frontend
pica.cloud.web-education-admin
提交
52d497b6
提交
52d497b6
编写于
7月 14, 2021
作者:
vino
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
增加销售方式
上级
1ca3b05c
变更
6
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
163 行增加
和
44 行删除
+163
-44
create-good.vue
src/views/goods/create-good.vue
+94
-32
forms.js
src/views/goods/forms.js
+3
-1
goods-manage.vue
src/views/goods/goods-manage.vue
+5
-4
order-detail.vue
src/views/goods/order-detail.vue
+2
-0
order-manage.vue
src/views/goods/order-manage.vue
+48
-4
rules.js
src/views/goods/rules.js
+11
-3
未找到文件。
src/views/goods/create-good.vue
浏览文件 @
52d497b6
...
...
@@ -647,6 +647,23 @@
<div
class=
"basic-item-icon"
>
<div
class=
"part-tit"
>
销售信息
</div>
<div
class=
"inline"
>
<el-form-item
label=
"销售方式"
prop=
"saleType"
>
<el-select
v-model=
"formData.saleType"
placeholder=
"请选择销售方式"
size=
"small"
@
change=
"getSaleType(formData.saleType,2)"
>
<el-option
v-for=
"item in saleTypeList"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
></el-option>
</el-select>
</el-form-item>
</div>
<div
class=
"inline"
v-if=
"formData.saleType == 1"
>
<el-form-item
label=
"零售价"
prop=
"optPrice"
>
<el-col
:span=
"20"
>
<el-input
...
...
@@ -654,25 +671,25 @@
size=
"small"
v-model=
"formData.optPrice"
placeholder=
"请输入零售价"
></el-input>
<!--
<span
class=
"word-num"
>
{{
(
formData
.
name
).
replace
(
/
\s
+/g
,
""
).
length
}}
/60
</span>
-->
</el-col>
</el-form-item>
<!--
<el-form-item
label=
"折扣价"
prop=
"name"
>
</div>
<div
class=
"inline"
v-if=
"formData.saleType == 2"
>
<el-form-item
label=
"批发价"
prop=
"optPrice"
>
<el-col
:span=
"20"
>
<el-input
size=
"small
"
v-model=
"formData.name
"
placeholder=
"请输入折扣价
"
@
input=
"$forceUpdate();
"
size=
"small
"
v-model=
"formData.optPrice
"
placeholder=
"请输入批发价"
></el-input>
</el-col>
</el-form-item>
-->
</el-form-item>
</div>
<div
class=
"inline"
>
<el-form-item
label=
"库存"
prop=
"
name
"
class=
"required-label"
>
<el-form-item
label=
"库存"
prop=
"
stock
"
class=
"required-label"
>
<el-col
:span=
"20"
>
<div
class=
"stock-com"
>
<span
class=
"sp sp-l"
@
click=
"changeStock(1)"
:class=
"
{'opac':formData.stock == 0}">
<i
class=
"el-icon-minus"
></i></span>
...
...
@@ -692,8 +709,8 @@
</el-form-item>
</div>
<div
class=
"inline"
>
<el-form-item
label=
"最小起购件数"
prop=
"
name
"
class=
"required-label"
>
<div
class=
"inline"
v-if=
"formData.saleType == 1"
>
<el-form-item
label=
"最小起购件数"
prop=
"
leastCount
"
class=
"required-label"
>
<el-col
:span=
"20"
>
<div
class=
"stock-com"
>
<span
class=
"sp sp-l"
@
click=
"minusCount(1)"
><i
class=
"el-icon-minus"
></i></span>
...
...
@@ -705,8 +722,8 @@
</el-form-item>
</div>
<div
class=
"inline"
v-if=
"formData.leastCount > 1"
>
<el-form-item
label=
"递增方式"
prop=
"incrType"
>
<div
class=
"inline"
v-if=
"formData.
saleType == 1 && formData.
leastCount > 1"
>
<el-form-item
label=
"递增方式"
>
<el-col
:span=
"24"
>
<el-radio
size=
"mini"
v-model=
"formData.incrType"
:label=
"2"
>
倍数递增
</el-radio>
<el-radio
v-model=
"formData.incrType"
:label=
"1"
>
1件递增
</el-radio>
...
...
@@ -714,8 +731,8 @@
</el-form-item>
</div>
<div
class=
"inline"
>
<el-form-item
label=
"单次购买上限"
prop=
"
name
"
class=
"required-label"
>
<div
class=
"inline"
v-if=
"formData.saleType == 1"
>
<el-form-item
label=
"单次购买上限"
prop=
"
mostCount
"
class=
"required-label"
>
<el-col
:span=
"20"
style=
"width: 300%;"
>
<div
class=
"stock-com"
style=
"width: 500px;"
>
<span
class=
"sp sp-l"
@
click=
"minusCount(2)"
><i
class=
"el-icon-minus"
></i></span>
...
...
@@ -730,8 +747,8 @@
</div>
<div
class=
"inline"
>
<el-form-item
label=
"第三方商品编码"
prop=
"externalGoodsCode"
>
<div
class=
"inline"
v-if=
"formData.saleType == 1"
>
<el-form-item
label=
"第三方商品编码"
>
<el-col
:span=
"20"
>
<el-input
size=
"small"
...
...
@@ -741,18 +758,31 @@
</el-col>
</el-form-item>
</div>
</div>
</el-form>
<div
class=
"inline"
v-if=
"formData.saleType == 2"
>
<el-form-item
label=
"最小起批"
prop=
"minWhole"
class=
"required-label"
>
<el-col
:span=
"20"
>
<div
class=
"stock-com"
>
<span
class=
"sp sp-l"
@
click=
"minusCount(3)"
><i
class=
"el-icon-minus"
></i></span>
<span
class=
"sp sp-c"
>
{{
formData
.
minWhole
}}
</span>
<span
class=
"sp sp-r"
@
click=
"plusCount(3)"
><i
class=
"el-icon-plus"
></i></span>
</div>
<p
class=
"error-message"
v-if=
"formData.minWhole
<
=
0
"
>
最小起购件数不能为0
</p>
</el-col>
</el-form-item>
</div>
<el-form
ref=
"formData"
:model=
"formData"
:rules=
"rules"
label-width=
"150px"
label-suffix=
":"
class=
"basic-form"
>
<div
class=
"basic-item-icon"
>
</div>
<!--
</el-form>
-->
<!--
<el-form-->
<!-- ref="formData"-->
<!-- :model="formData"-->
<!-- :rules="rules"-->
<!-- label-width="150px"-->
<!-- label-suffix=":"-->
<!-- class="basic-form"-->
<!-- >-->
<div
class=
"basic-item-icon"
v-if=
"formData.saleType == 1"
>
<div
class=
"part-tit"
>
限购条件
</div>
<div
v-for=
"(item, index) in buyLimitDtoList"
:key=
"index"
>
<el-form-item
label=
"限制条件"
>
...
...
@@ -895,6 +925,15 @@
label
:
'年'
,
value
:
365
,
}],
saleTypeList
:
[
{
value
:
1
,
label
:
"零售"
},
{
value
:
2
,
label
:
"批发"
}],
checkPackageIdList
:
[{
name
:
'其他'
,
content
:
0
}],
hospitalTypeList
:
[{
label
:
'村卫生室'
,
value
:
1
},{
label
:
'乡镇卫生院/中心'
,
value
:
2
}],
// 医疗机构类型
checkTypeList
:
[{
label
:
'常规检测'
,
value
:
1
}],
// 检测类型
...
...
@@ -985,7 +1024,7 @@
this
.
checkPackageIdList
=
res
.
data
;
})
}
debugger
;
//
debugger;
// 判空
if
(
this
.
formData
.
leastCount
==
null
||
this
.
formData
.
leastCount
===
''
)
{
this
.
formData
.
leastCount
=
1
;
...
...
@@ -1186,6 +1225,10 @@
this
.
fileIntrList
=
this
.
getImges
(
imageList
,
2
)
});
},
// 销售方式
getSaleType
(
saleType
,
type
){
},
getGoodsTypes
(
goodsType
,
type
){
this
.
goodsType
=
goodsType
;
...
...
@@ -1378,12 +1421,23 @@
}
let
isTrue
=
false
;
formNameList
.
map
(
item
=>
{
this
.
$refs
[
item
].
validate
((
valid
)
=>
{
// formNameList.map(item=>{
// this.$refs[item].validate((valid,object) => {
// isTrue = valid;
// if (!valid) return false;
// });
// });
let
item
=
""
;
for
(
let
i
=
0
;
i
<
formNameList
.
length
;
i
++
){
item
=
formNameList
[
i
];
this
.
$refs
[
item
].
validate
((
valid
,
object
)
=>
{
isTrue
=
valid
;
if
(
!
valid
)
return
false
;
});
});
if
(
!
isTrue
){
return
;
}
}
if
(
!
isTrue
){
return
false
;
...
...
@@ -1592,6 +1646,11 @@
this
.
formData1
.
mostCount
=
this
.
formData
.
mostCount
;
}
}
else
if
(
type
===
3
){
if
(
this
.
formData
.
minWhole
>=
2
)
{
this
.
formData
.
minWhole
-=
1
;
}
}
// if (this.formData.mostCount
<
this
.
formData
.
leastCount
)
{
// this.formData.mostCount = this.formData.leastCount;
// }
...
...
@@ -1604,6 +1663,9 @@
this
.
formData
.
mostCount
+=
1
;
this
.
formData1
.
mostCount
=
this
.
formData
.
mostCount
;
}
else
if
(
type
===
3
){
this
.
formData
.
minWhole
+=
1
;
}
// if (this.formData.mostCount
<
this
.
formData
.
leastCount
)
{
// this.formData.mostCount = this.formData.leastCount;
// }
...
...
src/views/goods/forms.js
浏览文件 @
52d497b6
...
...
@@ -63,7 +63,9 @@ const form = {
externalGoodsCode
:
''
,
leastCount
:
1
,
mostCount
:
-
1
,
incrType
:
1
incrType
:
1
,
saleType
:
1
,
minWhole
:
0
};
...
...
src/views/goods/goods-manage.vue
浏览文件 @
52d497b6
...
...
@@ -66,14 +66,14 @@
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
label=
"销售方式"
v-if=
"commissionFlag == 2"
>
<el-form-item
label=
"销售方式"
>
<el-select
v-model=
"searchForm.saleType"
placeholder=
"请选择
分佣
方式"
placeholder=
"请选择
销售
方式"
size=
"small"
clearable
>
<el-option
v-for=
"item in
commission
TypeList"
v-for=
"item in
sale
TypeList"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
...
...
@@ -154,9 +154,10 @@
<span
v-if=
"scope.row.proxyCommissionType == 2"
>
{{
scope
.
row
.
proxyCommissionPrice
|
priceNum
}}
元
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"saleTypeStr"
label=
"销售方式"
width=
"170"
align=
"center"
>
</el-table-column>
<el-table-column
prop=
"saleTime"
label=
"发布时间"
width=
"170"
align=
"center"
>
</el-table-column>
<el-table-column
label=
"操作"
width=
"200"
align=
"center"
fixed=
"right"
>
<
template
slot-scope=
"scope"
>
<div
v-if=
"scope.row.commissionFlag == 2"
>
...
...
src/views/goods/order-detail.vue
浏览文件 @
52d497b6
...
...
@@ -71,6 +71,7 @@
<p
v-if=
"showStatus == 1 || showStatus == 2 || showStatus == 3"
>
招募人:
{{
orderDetailData
.
ownerName
}}
</p>
<p
v-if=
"showStatus == 1 || showStatus == 2 || showStatus == 3"
>
所属药代:
{{
orderDetailData
.
brokerName
}}
</p>
<p>
下单人手机号:
{{
orderDetailData
.
prescriberMobile
}}
</p>
<p>
订单类型:
{{
orderDetailData
.
saleTypeStr
}}
</p>
<!--
<p>
发货时间:
{{
orderDetailData
.
sendTime
}}
</p>
-->
<!--
<p>
成交时间:
{{
orderDetailData
.
finishTime
}}
</p>
-->
</div>
...
...
@@ -183,6 +184,7 @@
brokerName
:
''
,
//药代名称
prescriberMobile
:
''
,
//下单人手机号
// showStatus: null,//订单展示状态,1已完成,2已发货,3待发货,4待支付,5交易关闭
saleTypeStr
:
''
,
// 订单类型
},
rulesExpress
:
{
expressName
:
[
...
...
src/views/goods/order-manage.vue
浏览文件 @
52d497b6
...
...
@@ -5,7 +5,7 @@
<div
class=
"header-title"
>
订单管理
</div>
<el-form
ref=
"searchForm"
:model=
"searchForm"
label-width=
"80px"
label-suffix=
":"
:inline=
"true"
>
<el-row
:gutter=
"30"
type=
"flex"
style=
"margin-top: 10px"
>
<el-col
:span=
"
18
"
>
<el-col
:span=
"
24
"
>
<el-form-item
label=
"商品名称"
>
<el-input
v-model=
"searchForm.goodsName"
size=
"small"
placeholder=
"请输入商品名称"
></el-input>
</el-form-item>
...
...
@@ -21,7 +21,7 @@
</el-col>
</el-row>
<el-row
:gutter=
"30"
type=
"flex"
style=
"margin-top: 10px"
>
<el-col
:span=
"
18
"
>
<el-col
:span=
"
24
"
>
<el-form-item
label=
"下单时间"
class=
"t-b"
>
<el-date-picker
v-model=
"createRangeTime"
...
...
@@ -41,7 +41,6 @@
placeholder=
"请输入招募人"
@
change=
"changeOwner"
clearable
style=
"width:110%;height: 32px;line-height: 32px;"
>
<el-option
v-for=
"item in brokerOwnerList"
...
...
@@ -57,7 +56,6 @@
id=
"statusSelector"
placeholder=
"请输入药代姓名"
clearable
style=
"width:110%;height: 32px;line-height: 32px;"
>
<el-option
v-for=
"item in brokerList"
...
...
@@ -67,7 +65,37 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"订单类型"
>
<el-select
v-model=
"searchForm.saleType"
placeholder=
"请选择订单类型"
size=
"small"
clearable
>
<el-option
v-for=
"item in saleTypeList"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<!--
<el-col
:span=
"6"
>
-->
<!--
<el-form-item
label=
"订单类型"
>
-->
<!--
<el-select-->
<!-- v-model="searchForm.saleType"-->
<!-- placeholder="请选择订单类型"-->
<!-- size="small"-->
<!-- clearable>-->
<!--
<el-option-->
<!-- v-for="item in saleTypeList"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- >
</el-option>
-->
<!--
</el-select>
-->
<!--
</el-form-item>
-->
<!--
</el-col>
-->
<el-col
:span=
"6"
style=
"text-align: right"
>
<el-button
type=
"primary"
size=
"small"
@
click=
"searchList"
>
查询
</el-button>
<el-button
type=
"default"
size=
"small"
@
click=
"resetForm"
style=
"margin-left:0;"
>
重置
</el-button>
...
...
@@ -118,6 +146,8 @@
<p
v-for=
"(item, index) in scope.row.priceList"
:key=
"index"
class=
"p-normal"
>
¥
{{
item
|
toFixed2
}}
</p>
</
template
>
</el-table-column>
<el-table-column
prop=
"saleTypeStr"
label=
"销售方式"
width=
"170"
align=
"center"
>
</el-table-column>
<el-table-column
prop=
"createTime"
label=
"下单时间"
min-width=
"100"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
createTime
}}
</span>
...
...
@@ -349,6 +379,7 @@
ownerId
:
''
,
pageNo
:
1
,
pageSize
:
10
,
saleType
:
0
,
},
totalRows
:
0
,
tableData
:
[],
...
...
@@ -425,6 +456,19 @@
value
:
2
,
},
],
saleTypeList
:
[
{
value
:
0
,
label
:
"全部"
},
{
value
:
1
,
label
:
"零售"
},
{
value
:
2
,
label
:
"批发"
}],
ownerId
:
''
,
brokerList
:[],
brokerOwnerList
:[],
...
...
src/views/goods/rules.js
浏览文件 @
52d497b6
const
checkBarcode
=
(
rule
,
value
,
cb
)
=>
{
const
valedBarcode
=
new
RegExp
(
"[
\\
u4E00-
\\
u9FFF]+"
,
"g"
);
const
valedBarcode
=
new
RegExp
(
"[
\\
u4E00-
\\
u9FFF]+"
,
"g"
);
if
(
value
&&
valedBarcode
.
test
(
value
))
cb
(
new
Error
(
'条形码不能输入中文'
));
cb
();
};
...
...
@@ -100,7 +100,16 @@ const rules = {
{ required: true, message: "
请选择商品类型
", trigger: "
change
" }
],
optPrice: [
{ required: true, message: "
请输入零售价
", trigger: "
blur
" },
{ required: true, message: "
请输入价格
", trigger: "
blur
" },
],
saleType:[
{ required: true, message: "
请选择销售方式
", trigger: "
change
" }
],
stock: [
{ required: true, message: "
请输入库存
", trigger: "
blur
" },
],
minWhole: [
{ required: true, message: "
请输入最小起批
", trigger: "
blur
" },
],
// introduce: [
// { required: true, message: "
请输入圈子介绍
", trigger: "
blur
" },
...
...
@@ -119,4 +128,3 @@ export const originRules1 = rules1;
export const originRules2 = rules2;
export const originRules = rules;
\ No newline at end of file
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录