Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-app-operator-master
Commits
70af7de0
Commit
70af7de0
authored
Jun 23, 2022
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化路线价格
parent
36f59792
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
83 additions
and
30 deletions
+83
-30
index.vue
src/components/Inputor/index.vue
+45
-0
edit.vue
src/views/ecw/coupon/edit.vue
+2
-2
edit.vue
src/views/ecw/productPrice/edit.vue
+36
-28
No files found.
src/components/Inputor/index.vue
0 → 100644
View file @
70af7de0
<
template
>
<el-input
v-model=
"valueSync"
:type=
"type"
:clearable=
"clearable"
:placeholder=
"placeholder"
/>
</
template
>
<
script
>
export
default
{
data
(){
return
{
valueSync
:
null
}
},
props
:{
type
:
String
,
value
:
[
String
,
Number
],
clearable
:
Boolean
,
placeholder
:
String
,
default
:
String
,
// 默认值
},
computed
:{
},
watch
:{
valueSync
(
val
){
this
.
$emit
(
'
input
'
,
val
)
},
value
(
value
){
this
.
valueSync
=
value
this
.
setDefault
()
}
},
created
(){
this
.
valueSync
=
this
.
value
this
.
setDefault
()
},
methods
:{
setDefault
(){
if
(
!
this
.
default
){
return
false
}
if
(
this
.
valueSync
==
null
||
this
.
valueSync
==
''
){
this
.
valueSync
=
this
.
default
}
}
}
}
</
script
>
\ No newline at end of file
src/views/ecw/coupon/edit.vue
View file @
70af7de0
...
@@ -251,10 +251,10 @@
...
@@ -251,10 +251,10 @@
<el-form-item
label=
"是否发送站内信"
prop=
"isSiteContent"
>
<el-form-item
label=
"是否发送站内信"
prop=
"isSiteContent"
>
<dict-selector
form-type=
"radio"
:type=
"DICT_TYPE.ECW_YESNO"
v-model=
"form.isSiteContent"
/>
<dict-selector
form-type=
"radio"
:type=
"DICT_TYPE.ECW_YESNO"
v-model=
"form.isSiteContent"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"
*
中文内容"
prop=
"contentZh"
:rules=
'[{required: true, message: "不能为空"}]'
>
<el-form-item
label=
"中文内容"
prop=
"contentZh"
:rules=
'[{required: true, message: "不能为空"}]'
>
<editor
v-model=
"form.contentZh"
:min-height=
"192"
/>
<editor
v-model=
"form.contentZh"
:min-height=
"192"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"
*
英文内容"
prop=
"contentEn"
:rules=
'[{required: true, message: "不能为空"}]'
>
<el-form-item
label=
"英文内容"
prop=
"contentEn"
:rules=
'[{required: true, message: "不能为空"}]'
>
<editor
v-model=
"form.contentEn"
:min-height=
"192"
/>
<editor
v-model=
"form.contentEn"
:min-height=
"192"
/>
</el-form-item>
</el-form-item>
<el-form-item
<el-form-item
...
...
src/views/ecw/productPrice/edit.vue
View file @
70af7de0
...
@@ -28,38 +28,42 @@
...
@@ -28,38 +28,42 @@
<el-form-item
label=
"默认运费"
prop=
"transportPrice"
>
<el-form-item
label=
"默认运费"
prop=
"transportPrice"
>
<el-row
:gutter=
"20"
>
<el-row
:gutter=
"20"
>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-select
v-model=
"form.transportPriceUnit"
>
<selector
v-model=
"form.transportPriceUnit"
:options=
"currencyList"
label-field=
"titleZh"
value-field=
"id"
defaultable
style=
"width:100px"
/>
<!--
<el-select
v-model=
"form.transportPriceUnit"
>
<el-option
v-for=
"currency in currencyList"
:key=
"currency.id"
:label=
"currency.titleZh"
:value=
"currency.id"
/>
<el-option
v-for=
"currency in currencyList"
:key=
"currency.id"
:label=
"currency.titleZh"
:value=
"currency.id"
/>
</el-select>
</el-select>
-->
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<
el-input
v-model.number=
"form.transportPrice"
type=
"number"
placeholder=
"整数或者两位小数"
/>
<
inputor
default=
"0"
v-model.number=
"form.transportPrice"
type=
"number"
placeholder=
"整数或者两位小数"
/>
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-select
v-model=
"form.transportVolumeUnit"
>
/
<selector
v-model=
"form.transportVolumeUnit"
:options=
"unitList"
label-field=
"titleZh"
value-field=
"id"
defaultable
style=
"width:100px"
/>
<!--
<el-select
v-model=
"form.transportVolumeUnit"
>
<el-option
v-for=
"unit in unitList"
:key=
"unit.id"
:label=
"unit.titleZh"
:value=
"unit.id"
/>
<el-option
v-for=
"unit in unitList"
:key=
"unit.id"
:label=
"unit.titleZh"
:value=
"unit.id"
/>
</el-select>
</el-select>
-->
</el-col>
</el-col>
</el-row>
</el-row>
</el-form-item>
</el-form-item>
<el-form-item
label=
"默认清关费"
prop=
"clearancePrice"
>
<el-form-item
label=
"默认清关费"
prop=
"clearancePrice"
>
<el-row
:gutter=
"20"
>
<el-row
:gutter=
"20"
>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-select
v-model=
"form.clearancePriceUnit"
>
<selector
v-model=
"form.clearancePriceUnit"
:options=
"currencyList"
label-field=
"titleZh"
value-field=
"id"
defaultable
style=
"width:100px"
/>
<!--
<el-select
v-model=
"form.clearancePriceUnit"
>
<el-option
v-for=
"currency in currencyList"
:key=
"currency.id"
:label=
"currency.titleZh"
:value=
"currency.id"
/>
<el-option
v-for=
"currency in currencyList"
:key=
"currency.id"
:label=
"currency.titleZh"
:value=
"currency.id"
/>
</el-select>
</el-select>
-->
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<
el-input
v-model.number=
"form.clearancePrice"
type=
"number"
placeholder=
"整数或者两位小数"
/>
<
inputor
default=
"0"
v-model.number=
"form.clearancePrice"
type=
"number"
placeholder=
"整数或者两位小数"
/>
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-select
v-model=
"form.clearanceVolumeUnit"
>
/
<selector
v-model=
"form.clearanceVolumeUnit"
:options=
"unitList"
label-field=
"titleZh"
value-field=
"id"
defaultable
style=
"width:100px"
/>
<!--
<el-select
v-model=
"form.clearanceVolumeUnit"
>
<el-option
v-for=
"unit in unitList"
:key=
"unit.id"
:label=
"unit.titleZh"
:value=
"unit.id"
/>
<el-option
v-for=
"unit in unitList"
:key=
"unit.id"
:label=
"unit.titleZh"
:value=
"unit.id"
/>
</el-select>
</el-select>
-->
</el-col>
</el-col>
</el-row>
</el-row>
</el-form-item>
</el-form-item>
...
@@ -68,38 +72,43 @@
...
@@ -68,38 +72,43 @@
<el-form-item
:label=
"getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + '运费'"
:key=
"specialIndex + 'transport'"
>
<el-form-item
:label=
"getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + '运费'"
:key=
"specialIndex + 'transport'"
>
<el-row
:gutter=
"20"
>
<el-row
:gutter=
"20"
>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-select
v-model=
"special.transportPriceUnit"
>
<selector
v-model=
"special.transportPriceUnit"
:options=
"currencyList"
label-field=
"titleZh"
value-field=
"id"
defaultable
style=
"width:100px"
/>
<!--
<el-select
v-model=
"special.transportPriceUnit"
>
<el-option
v-for=
"currency in currencyList"
:key=
"currency.id"
:label=
"currency.titleZh"
:value=
"currency.id"
/>
<el-option
v-for=
"currency in currencyList"
:key=
"currency.id"
:label=
"currency.titleZh"
:value=
"currency.id"
/>
</el-select>
</el-select>
-->
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<
el-input
v-model.number=
"special.transportPrice"
type=
"number"
placeholder=
"整数或者两位小数"
/>
<
inputor
default=
"0"
v-model.number=
"special.transportPrice"
type=
"number"
placeholder=
"整数或者两位小数"
/>
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-select
v-model=
"special.transportVolumeUnit"
>
/
<selector
v-model=
"special.transportVolumeUnit"
:options=
"unitList"
label-field=
"titleZh"
value-field=
"id"
defaultable
style=
"width:100px"
/>
<!--
<el-select
v-model=
"special.transportVolumeUnit"
>
<el-option
v-for=
"unit in unitList"
:key=
"unit.id"
:label=
"unit.titleZh"
:value=
"unit.id"
/>
<el-option
v-for=
"unit in unitList"
:key=
"unit.id"
:label=
"unit.titleZh"
:value=
"unit.id"
/>
</el-select>
</el-select>
-->
</el-col>
</el-col>
</el-row>
</el-row>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + '清关费'"
:key=
"specialIndex + 'clearance'"
>
<el-form-item
:label=
"getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + '清关费'"
:key=
"specialIndex + 'clearance'"
>
<el-row
:gutter=
"20"
>
<el-row
:gutter=
"20"
>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-select
v-model=
"special.clearancePriceUnit"
>
<selector
v-model=
"special.clearancePriceUnit"
:options=
"currencyList"
label-field=
"titleZh"
value-field=
"id"
defaultable
style=
"width:100px"
/>
<!--
<el-select
v-model=
"special.clearancePriceUnit"
>
<el-option
v-for=
"currency in currencyList"
:key=
"currency.id"
:label=
"currency.titleZh"
:value=
"currency.id"
/>
<el-option
v-for=
"currency in currencyList"
:key=
"currency.id"
:label=
"currency.titleZh"
:value=
"currency.id"
/>
</el-select>
</el-select>
-->
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<
el-input
v-model.number=
"special.clearancePrice"
type=
"number"
placeholder=
"整数或者两位小数"
/>
<
inputor
default=
"0"
v-model.number=
"special.clearancePrice"
type=
"number"
placeholder=
"整数或者两位小数"
/>
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-select
v-model=
"special.clearanceVolumeUnit"
>
/
<selector
v-model=
"special.clearanceVolumeUnit"
:options=
"unitList"
label-field=
"titleZh"
value-field=
"id"
defaultable
style=
"width:100px"
/>
<!--
<el-select
v-model=
"special.clearanceVolumeUnit"
>
<el-option
v-for=
"unit in unitList"
:key=
"unit.id"
:label=
"unit.titleZh"
:value=
"unit.id"
/>
<el-option
v-for=
"unit in unitList"
:key=
"unit.id"
:label=
"unit.titleZh"
:value=
"unit.id"
/>
</el-select>
</el-select>
-->
</el-col>
</el-col>
</el-row>
</el-row>
</el-form-item>
</el-form-item>
...
@@ -107,7 +116,7 @@
...
@@ -107,7 +116,7 @@
<el-form-item
label=
"是否预付"
prop=
"advanceStatus"
>
<el-form-item
label=
"是否预付"
prop=
"advanceStatus"
>
<dict-selector
:type=
"DICT_TYPE.ADVANCE_STATUS"
v-model=
"form.advanceStatus"
/>
<dict-selector
form-type=
"radio"
:type=
"DICT_TYPE.ADVANCE_STATUS"
v-model=
"form.advanceStatus"
/>
<!-- <el-radio-group v-model="form.advanceStatus">
<!-- <el-radio-group v-model="form.advanceStatus">
<el-radio v-for="advanceDict in advanceStatusDictDatas" :key="advanceDict.value" :label="parseInt(advanceDict.value)">{{advanceDict.label}}</el-radio>
<el-radio v-for="advanceDict in advanceStatusDictDatas" :key="advanceDict.value" :label="parseInt(advanceDict.value)">{{advanceDict.label}}</el-radio>
</el-radio-group> -->
</el-radio-group> -->
...
@@ -126,9 +135,7 @@
...
@@ -126,9 +135,7 @@
</el-form-item>
</el-form-item>
<el-form-item
label=
"每日入仓上限"
prop=
"dayLimit"
>
<el-form-item
label=
"每日入仓上限"
prop=
"dayLimit"
>
<el-input
v-model.number=
"form.dayLimit"
type=
"number"
>
<el-input
v-model.number=
"form.dayLimit"
type=
"number"
style=
"width:100px"
/>
立方米
<
template
slot=
"append"
>
立方米
</
template
>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"货柜位置"
prop=
"containerLocation"
>
<el-form-item
label=
"货柜位置"
prop=
"containerLocation"
>
...
@@ -139,9 +146,7 @@
...
@@ -139,9 +146,7 @@
</el-form-item>
</el-form-item>
<el-form-item
label=
"方数要求"
prop=
"square"
>
<el-form-item
label=
"方数要求"
prop=
"square"
>
<el-input
v-model.number=
"form.square"
type=
"number"
>
<el-input
v-model.number=
"form.square"
type=
"number"
style=
"width:200px"
/>
<!-- <template slot="append">立方米</template> -->
</el-input>
</el-form-item>
</el-form-item>
</el-card>
</el-card>
...
@@ -163,8 +168,11 @@ import { getCurrencyList } from '@/api/ecw/currency';
...
@@ -163,8 +168,11 @@ import { getCurrencyList } from '@/api/ecw/currency';
import
{
getUnitList
}
from
'
@/api/ecw/unit
'
;
import
{
getUnitList
}
from
'
@/api/ecw/unit
'
;
import
ProductSelector
from
'
@/components/ProductSelector
'
import
ProductSelector
from
'
@/components/ProductSelector
'
import
{
arrryToKeyedObjectBy
}
from
'
@/utils/index
'
import
{
arrryToKeyedObjectBy
}
from
'
@/utils/index
'
import
Selector
from
'
@/components/Selector
'
import
Inputor
from
'
@/components/Inputor
'
export
default
{
export
default
{
components
:
{
RoutersSelector
,
ProductSelector
},
components
:
{
RoutersSelector
,
ProductSelector
,
Selector
,
Inputor
},
data
(){
data
(){
return
{
return
{
selectedRoutes
:
[],
// 勾选的路线渠道
selectedRoutes
:
[],
// 勾选的路线渠道
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment