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
58c674ff
Commit
58c674ff
authored
Nov 30, 2024
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/pre-release' into pre-release
parents
c45f35e1
e2244531
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
26 additions
and
26 deletions
+26
-26
edit.vue
src/views/ecw/customer/edit.vue
+3
-3
editIndirect.vue
src/views/ecw/customer/editIndirect.vue
+3
-3
index.vue
src/views/ecw/customer/index.vue
+6
-6
index.vue
src/views/ecw/customerConfirm/index.vue
+6
-6
index.vue
src/views/ecw/customerToBeAssigned/index.vue
+3
-3
index.vue
src/views/ecw/myCustomerService/index.vue
+3
-3
index.vue
src/views/ecw/oceanCustomer/index.vue
+2
-2
No files found.
src/views/ecw/customer/edit.vue
View file @
58c674ff
...
@@ -198,9 +198,9 @@
...
@@ -198,9 +198,9 @@
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('常用提货网点')"
prop=
"pickupPoints"
>
<el-form-item
:label=
"$t('常用提货网点')"
prop=
"pickupPoints"
>
<el-select
v-model=
"form.pickupPoints"
multiple
filterable
clearable
:placeholder=
"$t('请选择')"
>
<el-select
filterable
multiple
v-model=
"form.pickupPoints"
:placeholder=
"$t('请选择提货网点')"
>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
/>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
:value=
"parseInt(dict.value)"
/>
</el-select>
>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
...
src/views/ecw/customer/editIndirect.vue
View file @
58c674ff
...
@@ -37,9 +37,9 @@
...
@@ -37,9 +37,9 @@
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('常用提货网点')"
prop=
"pickupPoint"
>
<el-form-item
:label=
"$t('常用提货网点')"
prop=
"pickupPoint"
>
<el-select
v-model=
"form.pickupPoints"
multiple
filterable
clearable
:placeholder=
"$t('请选择')"
>
<el-select
filterable
multiple
v-model=
"form.pickupPoints"
:placeholder=
"$t('请选择提货网点')"
>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
/>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
:value=
"parseInt(dict.value)"
/>
</el-select>
>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"13"
v-show=
"form.type && form.type.indexOf('2') !== -1"
>
<el-col
:span=
"13"
v-show=
"form.type && form.type.indexOf('2') !== -1"
>
...
...
src/views/ecw/customer/index.vue
View file @
58c674ff
...
@@ -57,9 +57,9 @@
...
@@ -57,9 +57,9 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('常用提货网点')"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('常用提货网点')"
v-show=
"showSearch"
>
<el-select
v-model=
"form.pickupPoints"
multiple
filterable
clearable
:placeholder=
"$t('请选择')"
>
<el-select
filterable
multiple
v-model=
"form.pickupPoints"
:placeholder=
"$t('请选择提货网点')"
>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
/>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
:value=
"parseInt(dict.value)"
/>
</el-select>
>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('创建人')"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('创建人')"
v-show=
"showSearch"
>
<el-select
filterable
v-model=
"queryParams.founder"
>
<el-select
filterable
v-model=
"queryParams.founder"
>
...
@@ -459,9 +459,9 @@
...
@@ -459,9 +459,9 @@
<!-- </el-col>-->
<!-- </el-col>-->
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('常用提货网点')"
prop=
"pickupPoint"
>
<el-form-item
:label=
"$t('常用提货网点')"
prop=
"pickupPoint"
>
<el-select
v-model=
"form.pickupPoints"
multiple
filterable
clearable
:placeholder=
"$t('请选择')"
>
<el-select
filterable
multiple
v-model=
"form.pickupPoints"
:placeholder=
"$t('请选择提货网点')"
>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
/>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
:value=
"parseInt(dict.value)"
/>
</el-select>
>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
...
...
src/views/ecw/customerConfirm/index.vue
View file @
58c674ff
...
@@ -58,9 +58,9 @@
...
@@ -58,9 +58,9 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('常用提货网点')"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('常用提货网点')"
v-show=
"showSearch"
>
<el-select
v-model=
"form.pickupPoints"
multiple
filterable
clearable
:placeholder=
"$t('请选择')"
>
<el-select
filterable
multiple
v-model=
"form.pickupPoints"
:placeholder=
"$t('请选择提货网点')"
>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
/>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
:value=
"parseInt(dict.value)"
/>
</el-select>
>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('创建人')"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('创建人')"
v-show=
"showSearch"
>
<el-select
v-model=
"queryParams.founder"
>
<el-select
v-model=
"queryParams.founder"
>
...
@@ -438,9 +438,9 @@
...
@@ -438,9 +438,9 @@
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('常用提货网点')"
prop=
"pickupPoint"
>
<el-form-item
:label=
"$t('常用提货网点')"
prop=
"pickupPoint"
>
<el-select
v-model=
"form.pickupPoints"
multiple
filterable
clearable
:placeholder=
"$t('请选择')"
>
<el-select
filterable
multiple
v-model=
"form.pickupPoints"
:placeholder=
"$t('请选择提货网点')"
>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
/>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
:value=
"parseInt(dict.value)"
/>
</el-select>
>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
...
...
src/views/ecw/customerToBeAssigned/index.vue
View file @
58c674ff
...
@@ -58,9 +58,9 @@
...
@@ -58,9 +58,9 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('常用提货网点')"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('常用提货网点')"
v-show=
"showSearch"
>
<el-select
v-model=
"form.pickupPoints"
multiple
filterable
clearable
:placeholder=
"$t('请选择')"
>
<el-select
filterable
multiple
v-model=
"form.pickupPoints"
:placeholder=
"$t('请选择提货网点')"
>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
/>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
:value=
"parseInt(dict.value)"
/>
</el-select>
>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('创建人')"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('创建人')"
v-show=
"showSearch"
>
<el-select
v-model=
"queryParams.founder"
>
<el-select
v-model=
"queryParams.founder"
>
...
...
src/views/ecw/myCustomerService/index.vue
View file @
58c674ff
...
@@ -58,9 +58,9 @@
...
@@ -58,9 +58,9 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('常用提货网点')"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('常用提货网点')"
v-show=
"showSearch"
>
<el-select
v-model=
"form.pickupPoints"
multiple
filterable
clearable
:placeholder=
"$t('请选择')"
>
<el-select
filterable
multiple
v-model=
"form.pickupPoints"
:placeholder=
"$t('请选择提货网点')"
>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
/>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
:value=
"parseInt(dict.value)"
/>
</el-select>
>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('创建人')"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('创建人')"
v-show=
"showSearch"
>
<el-select
v-model=
"queryParams.founder"
>
<el-select
v-model=
"queryParams.founder"
>
...
...
src/views/ecw/oceanCustomer/index.vue
View file @
58c674ff
...
@@ -59,8 +59,8 @@
...
@@ -59,8 +59,8 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('常用提货网点')"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('常用提货网点')"
v-show=
"showSearch"
>
<el-select
v-model=
"form.pickupPoints"
multiple
filterable
clearable
:placeholder=
"$t('请选择')"
>
<el-select
filterable
multiple
v-model=
"form.pickupPoints"
:placeholder=
"$t('请选择提货网点')"
>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
/>
<el-option
v-for=
"dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)"
:key=
"dict.value"
:label=
"isChinese ? dict.label : dict.labelEn"
:value=
"parseInt(dict.value)"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('创建人')"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('创建人')"
v-show=
"showSearch"
>
...
...
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