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
50fe2f07
Commit
50fe2f07
authored
Sep 27, 2022
by
我在何方
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修复
parent
2d2d8edc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
11 deletions
+12
-11
createLog.vue
src/views/ecw/offer/createLog.vue
+3
-2
prepayDeal.vue
src/views/ecw/order/prepayDeal.vue
+4
-4
splitApply.vue
src/views/ecw/order/splitApply.vue
+5
-5
No files found.
src/views/ecw/offer/createLog.vue
View file @
50fe2f07
...
@@ -14,13 +14,13 @@
...
@@ -14,13 +14,13 @@
<el-date-picker
clearable
v-model=
"form.followUpTime"
value-format=
"yyyy-MM-dd HH:mm:ss"
format=
"yyyy-MM-dd HH:mm:ss"
type=
"datetime"
:placeholder=
"$t('选择跟进时间')"
/>
<el-date-picker
clearable
v-model=
"form.followUpTime"
value-format=
"yyyy-MM-dd HH:mm:ss"
format=
"yyyy-MM-dd HH:mm:ss"
type=
"datetime"
:placeholder=
"$t('选择跟进时间')"
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('客户经理')"
prop=
"followUpSalesmanId"
style=
"width: 46%;display: inline-block;;margin-left:8%"
>
<el-form-item
:label=
"$t('客户经理')"
prop=
"followUpSalesmanId"
style=
"width: 46%;display: inline-block;;margin-left:8%"
>
<el-select
v-model=
"form.followUpSalesmanId"
:placeholder=
"$t('请选择跟进业务员')"
>
<el-select
v-model=
"form.followUpSalesmanId"
:placeholder=
"$t('请选择跟进业务员')"
clearable
>
<el-option
v-for=
"item in creatorData"
<el-option
v-for=
"item in creatorData"
:key=
"item.id"
:label=
"item.nickname"
:value=
"item.id"
/>
:key=
"item.id"
:label=
"item.nickname"
:value=
"item.id"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('联系人')"
prop=
"contacts"
style=
"width: 46%;display: inline-block"
>
<el-form-item
:label=
"$t('联系人')"
prop=
"contacts"
style=
"width: 46%;display: inline-block"
>
<el-select
v-model=
"form.contacts"
:placeholder=
"$t('请选择联系人')"
>
<el-select
v-model=
"form.contacts"
:placeholder=
"$t('请选择联系人')"
clearable
>
<el-option
v-for=
"item in contactsData"
:key=
"item.id"
:label=
"item.name"
:value=
"item.id"
/>
<el-option
v-for=
"item in contactsData"
:key=
"item.id"
:label=
"item.name"
:value=
"item.id"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
:placeholder=
"$t('请选择跟进方式')"
:placeholder=
"$t('请选择跟进方式')"
v-model=
"form.followUpMethod"
v-model=
"form.followUpMethod"
form-type=
"select"
form-type=
"select"
:clearable=
"true"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('客户反馈')"
prop=
"customerFeedback"
>
<el-form-item
:label=
"$t('客户反馈')"
prop=
"customerFeedback"
>
...
...
src/views/ecw/order/prepayDeal.vue
View file @
50fe2f07
...
@@ -187,7 +187,7 @@
...
@@ -187,7 +187,7 @@
</el-row>
</el-row>
<el-row
v-if=
"orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'"
>
<el-row
v-if=
"orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'"
>
<el-form-item
:label=
"$t('处理结果:')"
required
>
<el-form-item
:label=
"$t('处理结果:')"
required
>
<el-select
v-model=
"handlerParams.orderExceptionHandlerResult"
placeholder=
"请选择"
>
<el-select
v-model=
"handlerParams.orderExceptionHandlerResult"
placeholder=
"请选择"
clearable
>
<el-option
v-for=
"dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
<el-option
v-for=
"dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
</el-select>
</el-select>
...
@@ -196,8 +196,8 @@
...
@@ -196,8 +196,8 @@
<el-row
:span=
"8"
v-if=
"orderExceptionData.orderExceptionType=='order_pick_up_exception'&&handlerParams.orderExceptionHandlerResult=='cost_required'"
>
<el-row
:span=
"8"
v-if=
"orderExceptionData.orderExceptionType=='order_pick_up_exception'&&handlerParams.orderExceptionHandlerResult=='cost_required'"
>
<el-form-item
:label=
"$t('送货费用:')"
size=
"medium"
>
<el-form-item
:label=
"$t('送货费用:')"
size=
"medium"
>
<el-input
style=
"width: 100px;"
type=
"text"
v-model=
"handlerParams.amount"
/>
<el-input
style=
"width: 100px;"
type=
"text"
v-model=
"handlerParams.amount"
/>
<el-select
v-model=
"handlerParams.currency"
style=
"width: 100px;margin-left: 10px;"
>
<el-select
v-model=
"handlerParams.currency"
style=
"width: 100px;margin-left: 10px;"
clearable
>
<el-option
v-for=
"dict in getDictDatas('shipping_price_unit')"
<el-option
v-for=
"dict in getDictDatas('shipping_price_unit')
"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
...
@@ -222,7 +222,7 @@
...
@@ -222,7 +222,7 @@
</el-row>
</el-row>
<el-row>
<el-row>
<el-form-item
:label=
"$t('查明原因:')"
required
>
<el-form-item
:label=
"$t('查明原因:')"
required
>
<el-select
v-model=
"handlerParams.orderExceptionHandlerResult"
>
<el-select
v-model=
"handlerParams.orderExceptionHandlerResult"
clearable
>
<el-option
v-for=
"dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
<el-option
v-for=
"dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
</el-select>
</el-select>
...
...
src/views/ecw/order/splitApply.vue
View file @
50fe2f07
...
@@ -187,17 +187,17 @@
...
@@ -187,17 +187,17 @@
<el-form
ref=
"formSplit"
:model=
"form"
:rules=
"rules"
label-width=
"80px"
>
<el-form
ref=
"formSplit"
:model=
"form"
:rules=
"rules"
label-width=
"80px"
>
<el-row>
<el-row>
<el-form-item
:label=
"$t('运输方式')"
>
<el-form-item
:label=
"$t('运输方式')"
>
<dict-selector
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
v-model=
"form.transportId"
formatter=
"number"
/>
<dict-selector
:
clearable=
"true"
:
type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
v-model=
"form.transportId"
formatter=
"number"
/>
</el-form-item>
</el-form-item>
</el-row>
</el-row>
<el-row>
<el-row>
<el-form-item
:label=
"$t('目的仓库:')"
>
<el-form-item
:label=
"$t('目的仓库:')"
>
<el-select
v-model=
"form.destWarehouseId"
:placeholder=
"$t('请选择目的仓库')"
>
<el-select
v-model=
"form.destWarehouseId"
:placeholder=
"$t('请选择目的仓库')"
clearable
>
<el-option
v-for=
"item in importCityList"
:label=
"item.titleZh"
:value=
"item.id"
:key=
"item.id"
></el-option>
<el-option
v-for=
"item in importCityList"
:label=
"item.titleZh"
:value=
"item.id"
:key=
"item.id"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('出货渠道')"
v-if=
"getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass == 'channel'"
>
<el-form-item
:label=
"$t('出货渠道')"
v-if=
"getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass == 'channel'"
>
<el-select
v-model=
"form.channelId"
:placeholder=
"$t('请选择出货渠道')"
>
<el-select
v-model=
"form.channelId"
:placeholder=
"$t('请选择出货渠道')"
clearable
>
<el-option
:disabled=
"getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass != 'channel'"
v-for=
"item in channelData"
:key=
"item.channelId"
:label=
"item.nameZh"
:value=
"item.channelId"
/>
<el-option
:disabled=
"getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass != 'channel'"
v-for=
"item in channelData"
:key=
"item.channelId"
:label=
"item.nameZh"
:value=
"item.channelId"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
...
@@ -214,14 +214,14 @@
...
@@ -214,14 +214,14 @@
<el-form
ref=
"shopForm"
:model=
"shopForm"
:rules=
"shopRules"
label-width=
"80px"
>
<el-form
ref=
"shopForm"
:model=
"shopForm"
:rules=
"shopRules"
label-width=
"80px"
>
<el-row>
<el-row>
<el-form-item
:label=
"$t('中文品名:')"
v-if=
"splitData.length>0"
>
<el-form-item
:label=
"$t('中文品名:')"
v-if=
"splitData.length>0"
>
<el-select
v-model=
"shopForm.prodTitleZh"
:placeholder=
"$t('请选择中文品名')"
@
change=
"changeProdTitleZh"
>
<el-select
v-model=
"shopForm.prodTitleZh"
:placeholder=
"$t('请选择中文品名')"
@
change=
"changeProdTitleZh"
clearable
>
<el-option
v-for=
"item in splitData[0].orderSplitItemBackVOList"
:label=
"item.prodTitleZh"
:value=
"item.prodTitleZh"
:key=
"item.prodTitleZh"
></el-option>
<el-option
v-for=
"item in splitData[0].orderSplitItemBackVOList"
:label=
"item.prodTitleZh"
:value=
"item.prodTitleZh"
:key=
"item.prodTitleZh"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-row>
</el-row>
<el-row>
<el-row>
<el-form-item
:label=
"$t('英文品名:')"
v-if=
"splitData.length>0"
>
<el-form-item
:label=
"$t('英文品名:')"
v-if=
"splitData.length>0"
>
<el-select
v-model=
"shopForm.prodTitleEn"
:placeholder=
"$t('请选择英文品名')"
@
change=
"changeProdTitleEn"
>
<el-select
v-model=
"shopForm.prodTitleEn"
:placeholder=
"$t('请选择英文品名')"
@
change=
"changeProdTitleEn"
clearable
>
<el-option
v-for=
"item in splitData[0].orderSplitItemBackVOList"
:label=
"item.prodTitleEn"
:value=
"item.prodTitleEn"
:key=
"item.prodTitleEn"
></el-option>
<el-option
v-for=
"item in splitData[0].orderSplitItemBackVOList"
:label=
"item.prodTitleEn"
:value=
"item.prodTitleEn"
:key=
"item.prodTitleEn"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
...
...
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