Skip to content

P
peizhen-vue
Commit c1e60fce by 裴梁博
Options

Merge branch 'feature/v1/plb' into 'master' 

Feature/v1/plb

See merge request !8
parents f8b4e46d f4e43380
Showing with 294 additions and 66 deletions
src/api/index.js
......@@ -122,4 +122,13 @@ export function employeesSetWorkHourPut(data) {
method: "put",
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
......@@ -313,7 +313,13 @@
<imageUpload
v-if="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"
:disabled="true"
></imageUpload>
......
src/views/index.vue
......@@ -8,7 +8,7 @@
<div class="index-content-nav-item-top">
<h3>所属城市</h3>
</div>
<h2>{{cityName ? cityName : ''}}</h2>
<h2>{{ cityName ? cityName : "" }}</h2>
</div>
</el-col>
<el-col :span="4">
......@@ -188,6 +188,40 @@
>
</el-option>
</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>
<!-- <h2>总量：{{ sumF }}</h2> -->
......@@ -232,6 +266,7 @@
import * as echarts from "echarts";
require("echarts/theme/macarons"); // echarts theme
import resize from "./dashboard/mixins/resize";
import { cityVoListGET } from "@/api/hispotalManage/hospital";
const animationDuration = 3000;
import {
dataUserGet,
......@@ -240,17 +275,22 @@ import {
platformRevenueGet,
orderQuantityGet,
orderQuantityEchartsGet,
companyListGet,
} from "@/api/index.js";
import { mapGetters } from "vuex";
export default {
name: "Index",
mixins: [resize],
computed: {
...mapGetters(["user","cityName"]),
...mapGetters(["user", "cityName"]),
},
data() {
return {
// 版本号
companyId: "",
companyList: [],
cityVoList: [],
cityId: "",
version: "4.8.0",
valueA: 1,
sumA: 0,
......@@ -290,6 +330,7 @@ export default {
this.dataEmployeesAxios();
if (this.user.roleId != 3) {
this.saleroomAxios();
this.cityVoListAxios();
}
this.platformRevenueAxios();
this.orderQuantityAxios();
......@@ -303,6 +344,28 @@ export default {
this.chart = null;
},
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) {
console.log("changeDataer", e);
if (!e) {
......@@ -319,6 +382,8 @@ export default {
async orderQuantityEchartsAxios() {
let params = {
type: this.valueF,
cityId: this.cityId,
companyId: this.companyId,
};
if ([0, 1].includes(this.valueF)) {
} else if (this.valueF == 2) {
......
src/views/mallManagement/apply/index.vue
......@@ -2,7 +2,7 @@
* @Author: ‘巴博尔’ 2164119982@qq.com
* @Date: 2023-09-11 15:43:21
* @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
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
......@@ -148,7 +148,13 @@
<imageUpload
v-if="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"
:disabled="true"
></imageUpload>
......@@ -166,7 +172,13 @@
<imageUpload
v-if="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"
:disabled="true"
></imageUpload>
......@@ -184,7 +196,13 @@
<imageUpload
v-if="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"
:disabled="true"
></imageUpload>
......@@ -202,7 +220,13 @@
<imageUpload
v-if="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"
:disabled="true"
></imageUpload>
......@@ -220,7 +244,13 @@
<imageUpload
v-if="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"
:disabled="true"
></imageUpload>
......
src/views/operation/news/index.vue
......@@ -105,7 +105,11 @@
<imageUpload
v-if="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"
:disabled="true"
></imageUpload>
......
src/views/orderManagement/dbghOrder/index.vue
......@@ -144,7 +144,9 @@
</el-table-column>
<el-table-column label="接单人" align="center" prop="ename" key="ename">
<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>
</template>
</el-table-column>
......@@ -240,13 +242,6 @@
width="170"
>
<template slot-scope="{ row }">
<!-- <imageUpload
v-if="row.voucher"
v-model="row.voucher"
:limit="row.voucher.split(',').length"
:isShowTip="false"
:disabled="true"
></imageUpload> -->
<span>
<el-button
v-if="row.voucher"
......@@ -398,12 +393,34 @@
<imageUpload
v-if="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"
:disabled="true"
></imageUpload>
</el-dialog>
</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>
</template>
......@@ -420,6 +437,7 @@ export default {
name: "DbghOrder",
data() {
return {
openEMInfo: false,
openArticleInfoImg: false,
openArticleInfo: false,
openArticle: false,
......@@ -476,6 +494,10 @@ export default {
this.getList();
},
methods: {
clickSeeEM(row) {
this.openEMInfo = true;
this.VisitorData = row;
},
clickSeeVisitorImg(row) {
this.openArticleInfoImg = true;
this.VisitorData = row;
......
src/views/orderManagement/dbmyOrder/index.vue
......@@ -139,7 +139,13 @@
v-model="row.prescriptionAttachment"
:isShowTip="false"
:disabled="true"
:limit="row.prescriptionAttachment.split(',').length"
:limit="
row.prescriptionAttachment &&
row.prescriptionAttachment.split(',') &&
row.prescriptionAttachment.split(',').length
? row.prescriptionAttachment.split(',').length
: 1
"
/>
</template>
</el-table-column>
......@@ -179,7 +185,9 @@
/>
<el-table-column label="接单人" align="center" prop="ename" key="ename">
<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>
</template>
</el-table-column>
......@@ -281,13 +289,6 @@
width="170"
>
<template slot-scope="{ row }">
<!-- <imageUpload
v-if="row.voucher"
v-model="row.voucher"
:limit="row.voucher.split(',').length"
:isShowTip="false"
:disabled="true"
></imageUpload> -->
<span>
<el-button
v-if="row.voucher"
......@@ -506,12 +507,34 @@
<imageUpload
v-if="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"
:disabled="true"
></imageUpload>
</el-dialog>
</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>
</template>
......@@ -528,6 +551,7 @@ export default {
name: "DbmyOrder",
data() {
return {
openEMInfo: false,
openArticleInfoImg: false,
openArticleInfo: false,
openArticle: false,
......@@ -594,6 +618,10 @@ export default {
this.getList();
},
methods: {
clickSeeEM(row) {
this.openEMInfo = true;
this.VisitorData = row;
},
clickSeeVisitorImg(row) {
this.openArticleInfoImg = true;
this.VisitorData = row;
......
src/views/orderManagement/dbwzOrder/index.vue
......@@ -107,13 +107,6 @@
:show-overflow-tooltip="true"
/>
<el-table-column
label="科室"
align="center"
prop="title"
key="title"
:show-overflow-tooltip="true"
/>
<el-table-column
label="订单价"
align="center"
prop="payMoney"
......@@ -137,7 +130,9 @@
</el-table-column>
<el-table-column label="接单人" align="center" prop="ename" key="ename">
<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>
</template>
</el-table-column>
......@@ -338,13 +333,6 @@
:show-overflow-tooltip="true"
>
<template slot-scope="{ row }">
<!-- <imageUpload
v-if="row.voucher"
v-model="row.voucher"
:limit="row.voucher.split(',').length"
:isShowTip="false"
:disabled="true"
></imageUpload> -->
<span>
<el-button
v-if="row.voucher"
......@@ -551,12 +539,34 @@
<imageUpload
v-if="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"
:disabled="true"
></imageUpload>
</el-dialog>
</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>
</template>
......@@ -573,6 +583,7 @@ export default {
name: "DbwzOrder",
data() {
return {
openEMInfo: false,
openArticleInfoImg: false,
openArticleInfo: false,
openArticle: false,
......@@ -636,6 +647,10 @@ export default {
this.getList();
},
methods: {
clickSeeEM(row) {
this.openEMInfo = true;
this.VisitorData = row;
},
clickSeeVisitor(row) {
this.openArticleInfo = true;
this.VisitorData = row.userVsitorVo;
......
src/views/orderManagement/order/index.vue
......@@ -145,11 +145,19 @@
</el-table-column>
<el-table-column label="接单人" align="center" prop="ename" key="ename">
<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>
</template>
</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 }">
<el-button
v-if="row.remark"
......@@ -248,13 +256,6 @@
width="170"
>
<template slot-scope="{ row }">
<!-- <imageUpload
v-if="row.voucher"
v-model="row.voucher"
:limit="row.voucher.split(',').length"
:isShowTip="false"
:disabled="true"
></imageUpload> -->
<span>
<el-button
v-if="row.voucher"
......@@ -415,12 +416,34 @@
<imageUpload
v-if="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"
:disabled="true"
></imageUpload>
</el-dialog>
</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>
</template>
......@@ -437,6 +460,7 @@ export default {
name: "Order",
data() {
return {
openEMInfo: false,
openArticleInfoImg: false,
openArticleInfo: false,
openArticle: false,
......@@ -496,6 +520,10 @@ export default {
this.getList();
},
methods: {
clickSeeEM(row) {
this.openEMInfo = true;
this.VisitorData = row;
},
clickSeeVisitorImg(row) {
this.openArticleInfoImg = true;
this.VisitorData = row;
......
src/views/orderManagement/zyphOrder/index.vue
......@@ -144,7 +144,9 @@
</el-table-column>
<el-table-column label="接单人" align="center" prop="ename" key="ename">
<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>
</template>
</el-table-column>
......@@ -256,13 +258,6 @@
width="170"
>
<template slot-scope="{ row }">
<!-- <imageUpload
v-if="row.voucher"
v-model="row.voucher"
:limit="row.voucher.split(',').length"
:isShowTip="false"
:disabled="true"
></imageUpload> -->
<span>
<el-button
v-if="row.voucher"
......@@ -429,12 +424,34 @@
<imageUpload
v-if="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"
:disabled="true"
></imageUpload>
</el-dialog>
</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>
</template>
......@@ -451,6 +468,7 @@ export default {
name: "ZyphOrder",
data() {
return {
openEMInfo: false,
openArticleInfoImg: false,
openArticleInfo: false,
openArticle: false,
......@@ -512,6 +530,10 @@ export default {
this.getList();
},
methods: {
clickSeeEM(row) {
this.openEMInfo = true;
this.VisitorData = row;
},
clickSeeVisitorImg(row) {
this.openArticleInfoImg = true;
this.VisitorData = row;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment