Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
peizhen-vue
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PeiZhen-Java
peizhen-vue
Commits
c1e60fce
Commit
c1e60fce
authored
Oct 25, 2023
by
裴梁博
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/v1/plb' into 'master'
Feature/v1/plb See merge request
!8
parents
f8b4e46d
f4e43380
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
294 additions
and
66 deletions
+294
-66
src/api/index.js
+10
-2
src/views/goods/index.vue
+7
-1
src/views/index.vue
+67
-2
src/views/mallManagement/apply/index.vue
+36
-6
src/views/operation/business/index.vue
+0
-0
src/views/operation/news/index.vue
+5
-1
src/views/orderManagement/dbghOrder/index.vue
+31
-9
src/views/orderManagement/dbmyOrder/index.vue
+38
-10
src/views/orderManagement/dbwzOrder/index.vue
+31
-16
src/views/orderManagement/order/index.vue
+38
-10
src/views/orderManagement/zyphOrder/index.vue
+31
-9
No files found.
src/api/index.js
View file @
c1e60fce
...
@@ -122,4 +122,13 @@ export function employeesSetWorkHourPut(data) {
...
@@ -122,4 +122,13 @@ export function employeesSetWorkHourPut(data) {
method
:
"put"
,
method
:
"put"
,
data
:
data
,
data
:
data
,
});
});
}
}
\ No newline at end of file
// 机构
export
function
companyListGet
(
query
)
{
return
request
({
url
:
`/system/data/companyList`
,
method
:
"get"
,
params
:
query
,
});
}
src/views/goods/index.vue
View file @
c1e60fce
...
@@ -313,7 +313,13 @@
...
@@ -313,7 +313,13 @@
<imageUpload
<imageUpload
v-if=
"VisitorData.cover"
v-if=
"VisitorData.cover"
v-model=
"VisitorData.cover"
v-model=
"VisitorData.cover"
:limit=
"VisitorData.cover.split(',').length"
:limit=
"
VisitorData.cover &&
VisitorData.cover.split(',') &&
VisitorData.cover.split(',').length
? VisitorData.cover.split(',').length
: 1
"
:isShowTip=
"false"
:isShowTip=
"false"
:disabled=
"true"
:disabled=
"true"
></imageUpload>
></imageUpload>
...
...
src/views/index.vue
View file @
c1e60fce
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<div
class=
"index-content-nav-item-top"
>
<div
class=
"index-content-nav-item-top"
>
<h3>
所属城市
</h3>
<h3>
所属城市
</h3>
</div>
</div>
<h2>
{{
cityName
?
cityName
:
''
}}
</h2>
<h2>
{{
cityName
?
cityName
:
""
}}
</h2>
</div>
</div>
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
...
@@ -188,6 +188,40 @@
...
@@ -188,6 +188,40 @@
>
>
</el-option>
</el-option>
</el-select>
</el-select>
<template
v-if=
"user.roleId != 3"
>
<el-select
v-model=
"cityId"
placeholder=
"请选择城市"
style=
"margin-left: 15px; width: 10em"
filterable
clearable=
""
@
change=
"changeCtypChange"
>
<el-option
v-for=
"item in cityVoList"
:key=
"item.id"
:label=
"item.name"
:value=
"item.id"
>
</el-option>
</el-select>
<el-select
v-model=
"companyId"
placeholder=
"请选择机构"
style=
"margin-left: 15px; width: 10em"
filterable
clearable=
""
@
change=
"orderQuantityEchartsAxios"
>
<el-option
v-for=
"item in companyList"
:key=
"item.id"
:label=
"item.name"
:value=
"item.id"
>
</el-option>
</el-select>
</
template
>
</div>
</div>
</div>
</div>
<!-- <h2>总量:{{ sumF }}</h2> -->
<!-- <h2>总量:{{ sumF }}</h2> -->
...
@@ -232,6 +266,7 @@
...
@@ -232,6 +266,7 @@
import
*
as
echarts
from
"echarts"
;
import
*
as
echarts
from
"echarts"
;
require
(
"echarts/theme/macarons"
);
// echarts theme
require
(
"echarts/theme/macarons"
);
// echarts theme
import
resize
from
"./dashboard/mixins/resize"
;
import
resize
from
"./dashboard/mixins/resize"
;
import
{
cityVoListGET
}
from
"@/api/hispotalManage/hospital"
;
const
animationDuration
=
3000
;
const
animationDuration
=
3000
;
import
{
import
{
dataUserGet
,
dataUserGet
,
...
@@ -240,17 +275,22 @@ import {
...
@@ -240,17 +275,22 @@ import {
platformRevenueGet
,
platformRevenueGet
,
orderQuantityGet
,
orderQuantityGet
,
orderQuantityEchartsGet
,
orderQuantityEchartsGet
,
companyListGet
,
}
from
"@/api/index.js"
;
}
from
"@/api/index.js"
;
import
{
mapGetters
}
from
"vuex"
;
import
{
mapGetters
}
from
"vuex"
;
export
default
{
export
default
{
name
:
"Index"
,
name
:
"Index"
,
mixins
:
[
resize
],
mixins
:
[
resize
],
computed
:
{
computed
:
{
...
mapGetters
([
"user"
,
"cityName"
]),
...
mapGetters
([
"user"
,
"cityName"
]),
},
},
data
()
{
data
()
{
return
{
return
{
// 版本号
// 版本号
companyId
:
""
,
companyList
:
[],
cityVoList
:
[],
cityId
:
""
,
version
:
"4.8.0"
,
version
:
"4.8.0"
,
valueA
:
1
,
valueA
:
1
,
sumA
:
0
,
sumA
:
0
,
...
@@ -290,6 +330,7 @@ export default {
...
@@ -290,6 +330,7 @@ export default {
this
.
dataEmployeesAxios
();
this
.
dataEmployeesAxios
();
if
(
this
.
user
.
roleId
!=
3
)
{
if
(
this
.
user
.
roleId
!=
3
)
{
this
.
saleroomAxios
();
this
.
saleroomAxios
();
this
.
cityVoListAxios
();
}
}
this
.
platformRevenueAxios
();
this
.
platformRevenueAxios
();
this
.
orderQuantityAxios
();
this
.
orderQuantityAxios
();
...
@@ -303,6 +344,28 @@ export default {
...
@@ -303,6 +344,28 @@ export default {
this
.
chart
=
null
;
this
.
chart
=
null
;
},
},
methods
:
{
methods
:
{
changeCtypChange
()
{
this
.
companyId
=
''
this
.
companyList
=
[]
this
.
companyListAxios
()
},
async
companyListAxios
()
{
const
data_back
=
await
companyListGet
({
cityId
:
this
.
cityId
});
const
{
code
,
data
}
=
data_back
;
if
(
code
===
200
)
{
this
.
companyList
=
data
;
this
.
orderQuantityEchartsAxios
()
}
},
async
cityVoListAxios
()
{
const
data_back
=
await
cityVoListGET
();
const
{
code
,
data
}
=
data_back
;
if
(
code
===
200
)
{
this
.
cityVoList
=
data
;
}
},
changeDataer
(
e
)
{
changeDataer
(
e
)
{
console
.
log
(
"changeDataer"
,
e
);
console
.
log
(
"changeDataer"
,
e
);
if
(
!
e
)
{
if
(
!
e
)
{
...
@@ -319,6 +382,8 @@ export default {
...
@@ -319,6 +382,8 @@ export default {
async
orderQuantityEchartsAxios
()
{
async
orderQuantityEchartsAxios
()
{
let
params
=
{
let
params
=
{
type
:
this
.
valueF
,
type
:
this
.
valueF
,
cityId
:
this
.
cityId
,
companyId
:
this
.
companyId
,
};
};
if
([
0
,
1
].
includes
(
this
.
valueF
))
{
if
([
0
,
1
].
includes
(
this
.
valueF
))
{
}
else
if
(
this
.
valueF
==
2
)
{
}
else
if
(
this
.
valueF
==
2
)
{
...
...
src/views/mallManagement/apply/index.vue
View file @
c1e60fce
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: ‘巴博尔’ 2164119982@qq.com
* @Author: ‘巴博尔’ 2164119982@qq.com
* @Date: 2023-09-11 15:43:21
* @Date: 2023-09-11 15:43:21
* @LastEditors: ‘巴博尔’ 2164119982@qq.com
* @LastEditors: ‘巴博尔’ 2164119982@qq.com
* @LastEditTime: 2023-
09-15 18:30:08
* @LastEditTime: 2023-
10-25 11:33:19
* @FilePath: \peizhen-vue\src\views\mallManagement\apply\index.vue
* @FilePath: \peizhen-vue\src\views\mallManagement\apply\index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
-->
...
@@ -148,7 +148,13 @@
...
@@ -148,7 +148,13 @@
<imageUpload
<imageUpload
v-if=
"row.businessLicense"
v-if=
"row.businessLicense"
v-model=
"row.businessLicense"
v-model=
"row.businessLicense"
:limit=
"row.businessLicense.split(',').length"
:limit=
"
row.businessLicense &&
row.businessLicense.split(',') &&
row.businessLicense.split(',').length
? row.businessLicense.split(',').length
: 1
"
:isShowTip=
"false"
:isShowTip=
"false"
:disabled=
"true"
:disabled=
"true"
></imageUpload>
></imageUpload>
...
@@ -166,7 +172,13 @@
...
@@ -166,7 +172,13 @@
<imageUpload
<imageUpload
v-if=
"row.foodBusinessLicense"
v-if=
"row.foodBusinessLicense"
v-model=
"row.foodBusinessLicense"
v-model=
"row.foodBusinessLicense"
:limit=
"row.foodBusinessLicense.split(',').length"
:limit=
"
row.foodBusinessLicense &&
row.foodBusinessLicense.split(',') &&
row.foodBusinessLicense.split(',').length
? row.foodBusinessLicense.split(',').length
: 1
"
:isShowTip=
"false"
:isShowTip=
"false"
:disabled=
"true"
:disabled=
"true"
></imageUpload>
></imageUpload>
...
@@ -184,7 +196,13 @@
...
@@ -184,7 +196,13 @@
<imageUpload
<imageUpload
v-if=
"row.drugBusinessLicense"
v-if=
"row.drugBusinessLicense"
v-model=
"row.drugBusinessLicense"
v-model=
"row.drugBusinessLicense"
:limit=
"row.drugBusinessLicense.split(',').length"
:limit=
"
row.drugBusinessLicense &&
row.drugBusinessLicense.split(',') &&
row.drugBusinessLicense.split(',').length
? row.drugBusinessLicense.split(',').length
: 1
"
:isShowTip=
"false"
:isShowTip=
"false"
:disabled=
"true"
:disabled=
"true"
></imageUpload>
></imageUpload>
...
@@ -202,7 +220,13 @@
...
@@ -202,7 +220,13 @@
<imageUpload
<imageUpload
v-if=
"row.medicalBusinessLicense"
v-if=
"row.medicalBusinessLicense"
v-model=
"row.medicalBusinessLicense"
v-model=
"row.medicalBusinessLicense"
:limit=
"row.medicalBusinessLicense.split(',').length"
:limit=
"
row.medicalBusinessLicense &&
row.medicalBusinessLicense.split(',') &&
row.medicalBusinessLicense.split(',').length
? row.medicalBusinessLicense.split(',').length
: 1
"
:isShowTip=
"false"
:isShowTip=
"false"
:disabled=
"true"
:disabled=
"true"
></imageUpload>
></imageUpload>
...
@@ -220,7 +244,13 @@
...
@@ -220,7 +244,13 @@
<imageUpload
<imageUpload
v-if=
"row.twoMedicalBusinessLicense"
v-if=
"row.twoMedicalBusinessLicense"
v-model=
"row.twoMedicalBusinessLicense"
v-model=
"row.twoMedicalBusinessLicense"
:limit=
"row.twoMedicalBusinessLicense.split(',').length"
:limit=
"
row.twoMedicalBusinessLicense &&
row.twoMedicalBusinessLicense.split(',') &&
row.twoMedicalBusinessLicense.split(',').length
? twoMedicalBusinessLicense.split(',').length
: 1
"
:isShowTip=
"false"
:isShowTip=
"false"
:disabled=
"true"
:disabled=
"true"
></imageUpload>
></imageUpload>
...
...
src/views/operation/business/index.vue
View file @
c1e60fce
This diff is collapsed.
Click to expand it.
src/views/operation/news/index.vue
View file @
c1e60fce
...
@@ -105,7 +105,11 @@
...
@@ -105,7 +105,11 @@
<imageUpload
<imageUpload
v-if=
"row.cover"
v-if=
"row.cover"
v-model=
"row.cover"
v-model=
"row.cover"
:limit=
"row.cover.split(',').length"
:limit=
"
row.cover && row.cover.split(',') && row.cover.split(',').length
? row.cover.split(',').length
: 1
"
:isShowTip=
"false"
:isShowTip=
"false"
:disabled=
"true"
:disabled=
"true"
></imageUpload>
></imageUpload>
...
...
src/views/orderManagement/dbghOrder/index.vue
View file @
c1e60fce
...
@@ -144,7 +144,9 @@
...
@@ -144,7 +144,9 @@
</el-table-column>
</el-table-column>
<el-table-column
label=
"接单人"
align=
"center"
prop=
"ename"
key=
"ename"
>
<el-table-column
label=
"接单人"
align=
"center"
prop=
"ename"
key=
"ename"
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
<span
v-if=
"row.ename"
>
{{
row
.
ename
}}
</span>
<el-button
v-if=
"row.ename"
type=
"text"
@
click=
"clickSeeEM(row)"
>
查看
</el-button
>
<span
v-else
>
未接单
</span>
<span
v-else
>
未接单
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
@@ -240,13 +242,6 @@
...
@@ -240,13 +242,6 @@
width=
"170"
width=
"170"
>
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
<!--
<imageUpload
v-if=
"row.voucher"
v-model=
"row.voucher"
:limit=
"row.voucher.split(',').length"
:isShowTip=
"false"
:disabled=
"true"
></imageUpload>
-->
<span>
<span>
<el-button
<el-button
v-if=
"row.voucher"
v-if=
"row.voucher"
...
@@ -398,12 +393,34 @@
...
@@ -398,12 +393,34 @@
<imageUpload
<imageUpload
v-if=
"VisitorData.voucher"
v-if=
"VisitorData.voucher"
v-model=
"VisitorData.voucher"
v-model=
"VisitorData.voucher"
:limit=
"VisitorData.voucher.split(',').length"
:limit=
"
VisitorData.voucher &&
VisitorData.voucher.split(',') &&
VisitorData.voucher.split(',').length
? VisitorData.voucher.split(',').length
: 1
"
:isShowTip=
"false"
:isShowTip=
"false"
:disabled=
"true"
:disabled=
"true"
></imageUpload>
></imageUpload>
</el-dialog>
</el-dialog>
</
template
>
</
template
>
<
template
v-if=
"openEMInfo"
>
<el-dialog
title=
"接单人信息"
:visible
.
sync=
"openEMInfo"
width=
"600px"
append-to-body
>
<div
class=
"contl"
>
<div
class=
"contl-item"
>
<p
class=
"contl-item-label"
>
姓名:
</p>
<p
class=
"contl-item-rig"
>
{{
VisitorData
.
ename
}}
</p>
</div>
</div>
</el-dialog>
</
template
>
</div>
</div>
</template>
</template>
...
@@ -420,6 +437,7 @@ export default {
...
@@ -420,6 +437,7 @@ export default {
name
:
"DbghOrder"
,
name
:
"DbghOrder"
,
data
()
{
data
()
{
return
{
return
{
openEMInfo
:
false
,
openArticleInfoImg
:
false
,
openArticleInfoImg
:
false
,
openArticleInfo
:
false
,
openArticleInfo
:
false
,
openArticle
:
false
,
openArticle
:
false
,
...
@@ -476,6 +494,10 @@ export default {
...
@@ -476,6 +494,10 @@ export default {
this
.
getList
();
this
.
getList
();
},
},
methods
:
{
methods
:
{
clickSeeEM
(
row
)
{
this
.
openEMInfo
=
true
;
this
.
VisitorData
=
row
;
},
clickSeeVisitorImg
(
row
)
{
clickSeeVisitorImg
(
row
)
{
this
.
openArticleInfoImg
=
true
;
this
.
openArticleInfoImg
=
true
;
this
.
VisitorData
=
row
;
this
.
VisitorData
=
row
;
...
...
src/views/orderManagement/dbmyOrder/index.vue
View file @
c1e60fce
...
@@ -139,7 +139,13 @@
...
@@ -139,7 +139,13 @@
v-model=
"row.prescriptionAttachment"
v-model=
"row.prescriptionAttachment"
:isShowTip=
"false"
:isShowTip=
"false"
:disabled=
"true"
:disabled=
"true"
:limit=
"row.prescriptionAttachment.split(',').length"
:limit=
"
row.prescriptionAttachment &&
row.prescriptionAttachment.split(',') &&
row.prescriptionAttachment.split(',').length
? row.prescriptionAttachment.split(',').length
: 1
"
/>
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
@@ -179,7 +185,9 @@
...
@@ -179,7 +185,9 @@
/>
/>
<el-table-column
label=
"接单人"
align=
"center"
prop=
"ename"
key=
"ename"
>
<el-table-column
label=
"接单人"
align=
"center"
prop=
"ename"
key=
"ename"
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
<span
v-if=
"row.ename"
>
{{
row
.
ename
}}
</span>
<el-button
v-if=
"row.ename"
type=
"text"
@
click=
"clickSeeEM(row)"
>
查看
</el-button
>
<span
v-else
>
未接单
</span>
<span
v-else
>
未接单
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
@@ -281,13 +289,6 @@
...
@@ -281,13 +289,6 @@
width=
"170"
width=
"170"
>
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
<!--
<imageUpload
v-if=
"row.voucher"
v-model=
"row.voucher"
:limit=
"row.voucher.split(',').length"
:isShowTip=
"false"
:disabled=
"true"
></imageUpload>
-->
<span>
<span>
<el-button
<el-button
v-if=
"row.voucher"
v-if=
"row.voucher"
...
@@ -506,12 +507,34 @@
...
@@ -506,12 +507,34 @@
<imageUpload
<imageUpload
v-if=
"VisitorData.voucher"
v-if=
"VisitorData.voucher"
v-model=
"VisitorData.voucher"
v-model=
"VisitorData.voucher"
:limit=
"VisitorData.voucher.split(',').length"
:limit=
"
VisitorData.voucher &&
VisitorData.voucher.split(',') &&
VisitorData.voucher.split(',').length
? VisitorData.voucher.split(',').length
: 1
"
:isShowTip=
"false"
:isShowTip=
"false"
:disabled=
"true"
:disabled=
"true"
></imageUpload>
></imageUpload>
</el-dialog>
</el-dialog>
</
template
>
</
template
>
<
template
v-if=
"openEMInfo"
>
<el-dialog
title=
"接单人信息"
:visible
.
sync=
"openEMInfo"
width=
"600px"
append-to-body
>
<div
class=
"contl"
>
<div
class=
"contl-item"
>
<p
class=
"contl-item-label"
>
姓名:
</p>
<p
class=
"contl-item-rig"
>
{{
VisitorData
.
ename
}}
</p>
</div>
</div>
</el-dialog>
</
template
>
</div>
</div>
</template>
</template>
...
@@ -528,6 +551,7 @@ export default {
...
@@ -528,6 +551,7 @@ export default {
name
:
"DbmyOrder"
,
name
:
"DbmyOrder"
,
data
()
{
data
()
{
return
{
return
{
openEMInfo
:
false
,
openArticleInfoImg
:
false
,
openArticleInfoImg
:
false
,
openArticleInfo
:
false
,
openArticleInfo
:
false
,
openArticle
:
false
,
openArticle
:
false
,
...
@@ -594,6 +618,10 @@ export default {
...
@@ -594,6 +618,10 @@ export default {
this
.
getList
();
this
.
getList
();
},
},
methods
:
{
methods
:
{
clickSeeEM
(
row
)
{
this
.
openEMInfo
=
true
;
this
.
VisitorData
=
row
;
},
clickSeeVisitorImg
(
row
)
{
clickSeeVisitorImg
(
row
)
{
this
.
openArticleInfoImg
=
true
;
this
.
openArticleInfoImg
=
true
;
this
.
VisitorData
=
row
;
this
.
VisitorData
=
row
;
...
...
src/views/orderManagement/dbwzOrder/index.vue
View file @
c1e60fce
...
@@ -107,13 +107,6 @@
...
@@ -107,13 +107,6 @@
:show-overflow-tooltip=
"true"
:show-overflow-tooltip=
"true"
/>
/>
<el-table-column
<el-table-column
label=
"科室"
align=
"center"
prop=
"title"
key=
"title"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"订单价"
label=
"订单价"
align=
"center"
align=
"center"
prop=
"payMoney"
prop=
"payMoney"
...
@@ -137,7 +130,9 @@
...
@@ -137,7 +130,9 @@
</el-table-column>
</el-table-column>
<el-table-column
label=
"接单人"
align=
"center"
prop=
"ename"
key=
"ename"
>
<el-table-column
label=
"接单人"
align=
"center"
prop=
"ename"
key=
"ename"
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
<span
v-if=
"row.ename"
>
{{
row
.
ename
}}
</span>
<el-button
v-if=
"row.ename"
type=
"text"
@
click=
"clickSeeEM(row)"
>
查看
</el-button
>
<span
v-else
>
未接单
</span>
<span
v-else
>
未接单
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
@@ -338,13 +333,6 @@
...
@@ -338,13 +333,6 @@
:show-overflow-tooltip=
"true"
:show-overflow-tooltip=
"true"
>
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
<!--
<imageUpload
v-if=
"row.voucher"
v-model=
"row.voucher"
:limit=
"row.voucher.split(',').length"
:isShowTip=
"false"
:disabled=
"true"
></imageUpload>
-->
<span>
<span>
<el-button
<el-button
v-if=
"row.voucher"
v-if=
"row.voucher"
...
@@ -551,12 +539,34 @@
...
@@ -551,12 +539,34 @@
<imageUpload
<imageUpload
v-if=
"VisitorData.voucher"
v-if=
"VisitorData.voucher"
v-model=
"VisitorData.voucher"
v-model=
"VisitorData.voucher"
:limit=
"VisitorData.voucher.split(',').length"
:limit=
"
VisitorData.voucher &&
VisitorData.voucher.split(',') &&
VisitorData.voucher.split(',').length
? VisitorData.voucher.split(',').length
: 1
"
:isShowTip=
"false"
:isShowTip=
"false"
:disabled=
"true"
:disabled=
"true"
></imageUpload>
></imageUpload>
</el-dialog>
</el-dialog>
</
template
>
</
template
>
<
template
v-if=
"openEMInfo"
>
<el-dialog
title=
"接单人信息"
:visible
.
sync=
"openEMInfo"
width=
"600px"
append-to-body
>
<div
class=
"contl"
>
<div
class=
"contl-item"
>
<p
class=
"contl-item-label"
>
姓名:
</p>
<p
class=
"contl-item-rig"
>
{{
VisitorData
.
ename
}}
</p>
</div>
</div>
</el-dialog>
</
template
>
</div>
</div>
</template>
</template>
...
@@ -573,6 +583,7 @@ export default {
...
@@ -573,6 +583,7 @@ export default {
name
:
"DbwzOrder"
,
name
:
"DbwzOrder"
,
data
()
{
data
()
{
return
{
return
{
openEMInfo
:
false
,
openArticleInfoImg
:
false
,
openArticleInfoImg
:
false
,
openArticleInfo
:
false
,
openArticleInfo
:
false
,
openArticle
:
false
,
openArticle
:
false
,
...
@@ -636,6 +647,10 @@ export default {
...
@@ -636,6 +647,10 @@ export default {
this
.
getList
();
this
.
getList
();
},
},
methods
:
{
methods
:
{
clickSeeEM
(
row
)
{
this
.
openEMInfo
=
true
;
this
.
VisitorData
=
row
;
},
clickSeeVisitor
(
row
)
{
clickSeeVisitor
(
row
)
{
this
.
openArticleInfo
=
true
;
this
.
openArticleInfo
=
true
;
this
.
VisitorData
=
row
.
userVsitorVo
;
this
.
VisitorData
=
row
.
userVsitorVo
;
...
...
src/views/orderManagement/order/index.vue
View file @
c1e60fce
...
@@ -145,11 +145,19 @@
...
@@ -145,11 +145,19 @@
</el-table-column>
</el-table-column>
<el-table-column
label=
"接单人"
align=
"center"
prop=
"ename"
key=
"ename"
>
<el-table-column
label=
"接单人"
align=
"center"
prop=
"ename"
key=
"ename"
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
<span
v-if=
"row.ename"
>
{{
row
.
ename
}}
</span>
<el-button
v-if=
"row.ename"
type=
"text"
@
click=
"clickSeeEM(row)"
>
查看
</el-button
>
<span
v-else
>
未接单
</span>
<span
v-else
>
未接单
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"备注"
align=
"center"
prop=
"remark"
key=
"remark"
width=
"120"
>
<el-table-column
label=
"备注"
align=
"center"
prop=
"remark"
key=
"remark"
width=
"120"
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
<el-button
<el-button
v-if=
"row.remark"
v-if=
"row.remark"
...
@@ -248,13 +256,6 @@
...
@@ -248,13 +256,6 @@
width=
"170"
width=
"170"
>
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
<!--
<imageUpload
v-if=
"row.voucher"
v-model=
"row.voucher"
:limit=
"row.voucher.split(',').length"
:isShowTip=
"false"
:disabled=
"true"
></imageUpload>
-->
<span>
<span>
<el-button
<el-button
v-if=
"row.voucher"
v-if=
"row.voucher"
...
@@ -415,12 +416,34 @@
...
@@ -415,12 +416,34 @@
<imageUpload
<imageUpload
v-if=
"VisitorData.voucher"
v-if=
"VisitorData.voucher"
v-model=
"VisitorData.voucher"
v-model=
"VisitorData.voucher"
:limit=
"VisitorData.voucher.split(',').length"
:limit=
"
VisitorData.voucher &&
VisitorData.voucher.split(',') &&
VisitorData.voucher.split(',').length
? VisitorData.voucher.split(',').length
: 1
"
:isShowTip=
"false"
:isShowTip=
"false"
:disabled=
"true"
:disabled=
"true"
></imageUpload>
></imageUpload>
</el-dialog>
</el-dialog>
</
template
>
</
template
>
<
template
v-if=
"openEMInfo"
>
<el-dialog
title=
"接单人信息"
:visible
.
sync=
"openEMInfo"
width=
"600px"
append-to-body
>
<div
class=
"contl"
>
<div
class=
"contl-item"
>
<p
class=
"contl-item-label"
>
姓名:
</p>
<p
class=
"contl-item-rig"
>
{{
VisitorData
.
ename
}}
</p>
</div>
</div>
</el-dialog>
</
template
>
</div>
</div>
</template>
</template>
...
@@ -437,6 +460,7 @@ export default {
...
@@ -437,6 +460,7 @@ export default {
name
:
"Order"
,
name
:
"Order"
,
data
()
{
data
()
{
return
{
return
{
openEMInfo
:
false
,
openArticleInfoImg
:
false
,
openArticleInfoImg
:
false
,
openArticleInfo
:
false
,
openArticleInfo
:
false
,
openArticle
:
false
,
openArticle
:
false
,
...
@@ -496,6 +520,10 @@ export default {
...
@@ -496,6 +520,10 @@ export default {
this
.
getList
();
this
.
getList
();
},
},
methods
:
{
methods
:
{
clickSeeEM
(
row
)
{
this
.
openEMInfo
=
true
;
this
.
VisitorData
=
row
;
},
clickSeeVisitorImg
(
row
)
{
clickSeeVisitorImg
(
row
)
{
this
.
openArticleInfoImg
=
true
;
this
.
openArticleInfoImg
=
true
;
this
.
VisitorData
=
row
;
this
.
VisitorData
=
row
;
...
...
src/views/orderManagement/zyphOrder/index.vue
View file @
c1e60fce
...
@@ -144,7 +144,9 @@
...
@@ -144,7 +144,9 @@
</el-table-column>
</el-table-column>
<el-table-column
label=
"接单人"
align=
"center"
prop=
"ename"
key=
"ename"
>
<el-table-column
label=
"接单人"
align=
"center"
prop=
"ename"
key=
"ename"
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
<span
v-if=
"row.ename"
>
{{
row
.
ename
}}
</span>
<el-button
v-if=
"row.ename"
type=
"text"
@
click=
"clickSeeEM(row)"
>
查看
</el-button
>
<span
v-else
>
未接单
</span>
<span
v-else
>
未接单
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
@@ -256,13 +258,6 @@
...
@@ -256,13 +258,6 @@
width=
"170"
width=
"170"
>
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
<!--
<imageUpload
v-if=
"row.voucher"
v-model=
"row.voucher"
:limit=
"row.voucher.split(',').length"
:isShowTip=
"false"
:disabled=
"true"
></imageUpload>
-->
<span>
<span>
<el-button
<el-button
v-if=
"row.voucher"
v-if=
"row.voucher"
...
@@ -429,12 +424,34 @@
...
@@ -429,12 +424,34 @@
<imageUpload
<imageUpload
v-if=
"VisitorData.voucher"
v-if=
"VisitorData.voucher"
v-model=
"VisitorData.voucher"
v-model=
"VisitorData.voucher"
:limit=
"VisitorData.voucher.split(',').length"
:limit=
"
VisitorData.voucher &&
VisitorData.voucher.split(',') &&
VisitorData.voucher.split(',').length
? VisitorData.voucher.split(',').length
: 1
"
:isShowTip=
"false"
:isShowTip=
"false"
:disabled=
"true"
:disabled=
"true"
></imageUpload>
></imageUpload>
</el-dialog>
</el-dialog>
</
template
>
</
template
>
<
template
v-if=
"openEMInfo"
>
<el-dialog
title=
"接单人信息"
:visible
.
sync=
"openEMInfo"
width=
"600px"
append-to-body
>
<div
class=
"contl"
>
<div
class=
"contl-item"
>
<p
class=
"contl-item-label"
>
姓名:
</p>
<p
class=
"contl-item-rig"
>
{{
VisitorData
.
ename
}}
</p>
</div>
</div>
</el-dialog>
</
template
>
</div>
</div>
</template>
</template>
...
@@ -451,6 +468,7 @@ export default {
...
@@ -451,6 +468,7 @@ export default {
name
:
"ZyphOrder"
,
name
:
"ZyphOrder"
,
data
()
{
data
()
{
return
{
return
{
openEMInfo
:
false
,
openArticleInfoImg
:
false
,
openArticleInfoImg
:
false
,
openArticleInfo
:
false
,
openArticleInfo
:
false
,
openArticle
:
false
,
openArticle
:
false
,
...
@@ -512,6 +530,10 @@ export default {
...
@@ -512,6 +530,10 @@ export default {
this
.
getList
();
this
.
getList
();
},
},
methods
:
{
methods
:
{
clickSeeEM
(
row
)
{
this
.
openEMInfo
=
true
;
this
.
VisitorData
=
row
;
},
clickSeeVisitorImg
(
row
)
{
clickSeeVisitorImg
(
row
)
{
this
.
openArticleInfoImg
=
true
;
this
.
openArticleInfoImg
=
true
;
this
.
VisitorData
=
row
;
this
.
VisitorData
=
row
;
...
...
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