Skip to content

P
peizhen-vue
Commit 56773b3c by ‘巴博尔’
Options

修改

parent 0e978c59
Showing with 389 additions and 258 deletions
src/views/goods/index.vue
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
key="title" key="title"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="商品类别" align="center" prop="categoryName" /> <el-table-column label="商品类别" align="center" prop="typeName" />
<el-table-column label="标签" align="center" prop="list" key="list"> <el-table-column label="标签" align="center" prop="list" key="list">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<i class="el el-tag" v-for="(item, index) in row.list" :key="index">{{ <i class="el el-tag" v-for="(item, index) in row.list" :key="index">{{
......
src/views/orderManagement/dbghOrder/index.vue
...@@ -169,16 +169,16 @@ ...@@ -169,16 +169,16 @@
<el-table-column <el-table-column
label="当前状态" label="当前状态"
align="center" align="center"
prop="tstatus" prop="ystatus"
key="tstatus" key="ystatus"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<span v-if="row.tstatus == 0">已发布</span> <span v-if="row.ystatus == 0">已发布</span>
<span v-if="row.tstatus == 1">已接单</span> <span v-if="row.ystatus == 1">已接单</span>
<span v-if="row.tstatus == 2">已完成</span> <span v-if="row.ystatus == 2">已完成</span>
<span v-if="row.tstatus == 3">退款中</span> <span v-if="row.ystatus == 3">退款中</span>
<span v-if="row.tstatus == 4">已退款</span> <span v-if="row.ystatus == 4">已退款</span>
<span v-if="row.tstatus == 6">进行中</span> <span v-if="row.ystatus == 6">进行中</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -192,15 +192,15 @@ ...@@ -192,15 +192,15 @@
<el-table-column <el-table-column
label="订单状态" label="订单状态"
align="center" align="center"
prop="ystatus" prop="tstatus"
key="ystatus" key="tstatus"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<span v-if="row.ystatus == 0">待支付</span> <span v-if="row.tstatus == 0">待支付</span>
<span v-if="row.ystatus == 1">已支付</span> <span v-if="row.tstatus == 1">已支付</span>
<span v-if="row.ystatus == 2">已完成</span> <span v-if="row.tstatus == 2">已完成</span>
<span v-if="row.ystatus == 7">已取消</span> <span v-if="row.tstatus == 7">已取消</span>
<span v-if="row.ystatus == 8">已退款</span> <span v-if="row.tstatus == 8">已退款</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -237,7 +237,26 @@ ...@@ -237,7 +237,26 @@
prop="voucher" prop="voucher"
key="voucher" key="voucher"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> 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"
type="text"
@click="clickSeeVisitorImg(row)"
>点击查看</el-button
>
</span>
</template>
</el-table-column>
<el-table-column <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
...@@ -364,6 +383,23 @@ ...@@ -364,6 +383,23 @@
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
<template v-if="openArticleInfoImg">
<el-dialog
title="凭证图片"
:visible.sync="openArticleInfoImg"
width="600px"
append-to-body
>
<imageUpload
v-if="VisitorData.voucher"
v-model="VisitorData.voucher"
:limit="VisitorData.voucher.split(',').length"
:isShowTip="false"
:disabled="true"
></imageUpload>
</el-dialog>
</template>
</div> </div>
</template> </template>
...@@ -380,6 +416,7 @@ export default { ...@@ -380,6 +416,7 @@ export default {
name: "DbghOrder", name: "DbghOrder",
data() { data() {
return { return {
openArticleInfoImg: false,
openArticleInfo: false, openArticleInfo: false,
openArticle: false, openArticle: false,
openArticleTitle: "", openArticleTitle: "",
...@@ -427,6 +464,7 @@ export default { ...@@ -427,6 +464,7 @@ export default {
sex: "", sex: "",
idcard: "", idcard: "",
isAdult: "", isAdult: "",
voucher: "",
}, },
}; };
}, },
...@@ -434,6 +472,11 @@ export default { ...@@ -434,6 +472,11 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
clickSeeVisitorImg(row) {
this.$set(this.VisitorData, "voucher", undefined);
this.openArticleInfoImg = true;
this.VisitorData = row;
},
clickSeeROWrEM(text, title) { clickSeeROWrEM(text, title) {
this.openArticle = true; this.openArticle = true;
this.rowArticle = this.replaceSpecialChar(text); this.rowArticle = this.replaceSpecialChar(text);
......
src/views/orderManagement/dbmyOrder/index.vue
...@@ -208,30 +208,32 @@ ...@@ -208,30 +208,32 @@
<el-table-column <el-table-column
label="当前状态" label="当前状态"
align="center" align="center"
prop="tstatus" prop="ystatus"
key="tstatus" key="ystatus"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<span v-if="row.tstatus == 0">已发布</span> <span v-if="row.ystatus == 0">已发布</span>
<span v-if="row.tstatus == 1">已接单</span> <span v-if="row.ystatus == 1">已接单</span>
<span v-if="row.tstatus == 2">已完成</span> <span v-if="row.ystatus == 2">已完成</span>
<span v-if="row.tstatus == 3">退款中</span> <span v-if="row.ystatus == 3">退款中</span>
<span v-if="row.tstatus == 4">已退款</span> <span v-if="row.ystatus == 4">已退款</span>
<span v-if="row.tstatus == 6">进行中</span> <span v-if="row.ystatus == 6">进行中</span>
<span v-if="row.ystatus == 7">待邮寄原件</span>
<span v-if="row.ystatus == 8">已邮寄原件</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="订单状态" label="订单状态"
align="center" align="center"
prop="ystatus" prop="tstatus"
key="ystatus" key="tstatus"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<span v-if="row.ystatus == 0">待支付</span> <span v-if="row.tstatus == 0">待支付</span>
<span v-if="row.ystatus == 1">已支付</span> <span v-if="row.tstatus == 1">已支付</span>
<span v-if="row.ystatus == 2">已完成</span> <span v-if="row.tstatus == 2">已完成</span>
<span v-if="row.ystatus == 7">已取消</span> <span v-if="row.tstatus == 7">已取消</span>
<span v-if="row.ystatus == 8">已退款</span> <span v-if="row.tstatus == 8">已退款</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -276,7 +278,26 @@ ...@@ -276,7 +278,26 @@
prop="voucher" prop="voucher"
key="voucher" key="voucher"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> 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"
type="text"
@click="clickSeeVisitorImg(row)"
>点击查看</el-button
>
</span>
</template>
</el-table-column>
<el-table-column <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
...@@ -470,6 +491,23 @@ ...@@ -470,6 +491,23 @@
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
<template v-if="openArticleInfoImg">
<el-dialog
title="凭证图片"
:visible.sync="openArticleInfoImg"
width="600px"
append-to-body
>
<imageUpload
v-if="VisitorData.voucher"
v-model="VisitorData.voucher"
:limit="VisitorData.voucher.split(',').length"
:isShowTip="false"
:disabled="true"
></imageUpload>
</el-dialog>
</template>
</div> </div>
</template> </template>
...@@ -486,6 +524,7 @@ export default { ...@@ -486,6 +524,7 @@ export default {
name: "DbmyOrder", name: "DbmyOrder",
data() { data() {
return { return {
openArticleInfoImg: false,
openArticleInfo: false, openArticleInfo: false,
openArticle: false, openArticle: false,
openArticleTitle: "", openArticleTitle: "",
...@@ -543,6 +582,7 @@ export default { ...@@ -543,6 +582,7 @@ export default {
sex: "", sex: "",
idcard: "", idcard: "",
isAdult: "", isAdult: "",
voucher: "",
}, },
}; };
}, },
...@@ -550,6 +590,11 @@ export default { ...@@ -550,6 +590,11 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
clickSeeVisitorImg(row) {
this.$set(this.VisitorData, "voucher", undefined);
this.openArticleInfoImg = true;
this.VisitorData = row;
},
clickSeeROWrEM(text, title) { clickSeeROWrEM(text, title) {
this.openArticle = true; this.openArticle = true;
this.rowArticle = this.replaceSpecialChar(text); this.rowArticle = this.replaceSpecialChar(text);
......
src/views/orderManagement/dbwzOrder/index.vue
...@@ -267,30 +267,30 @@ ...@@ -267,30 +267,30 @@
<el-table-column <el-table-column
label="当前状态" label="当前状态"
align="center" align="center"
prop="tstatus" prop="ystatus"
key="tstatus" key="ystatus"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<span v-if="row.tstatus == 0">已发布</span> <span v-if="row.ystatus == 0">已发布</span>
<span v-if="row.tstatus == 1">已接单</span> <span v-if="row.ystatus == 1">已接单</span>
<span v-if="row.tstatus == 2">已完成</span> <span v-if="row.ystatus == 2">已完成</span>
<span v-if="row.tstatus == 3">退款中</span> <span v-if="row.ystatus == 3">退款中</span>
<span v-if="row.tstatus == 4">已退款</span> <span v-if="row.ystatus == 4">已退款</span>
<span v-if="row.tstatus == 6">进行中</span> <span v-if="row.ystatus == 6">进行中</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="订单状态" label="订单状态"
align="center" align="center"
prop="ystatus" prop="tstatus"
key="ystatus" key="tstatus"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<span v-if="row.ystatus == 0">待支付</span> <span v-if="row.tstatus == 0">待支付</span>
<span v-if="row.ystatus == 1">已支付</span> <span v-if="row.tstatus == 1">已支付</span>
<span v-if="row.ystatus == 2">已完成</span> <span v-if="row.tstatus == 2">已完成</span>
<span v-if="row.ystatus == 7">已取消</span> <span v-if="row.tstatus == 7">已取消</span>
<span v-if="row.ystatus == 8">已退款</span> <span v-if="row.tstatus == 8">已退款</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -334,8 +334,27 @@ ...@@ -334,8 +334,27 @@
align="center" align="center"
prop="voucher" prop="voucher"
key="voucher" key="voucher"
width="170"
:show-overflow-tooltip="true" :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"
type="text"
@click="clickSeeVisitorImg(row)"
>点击查看</el-button
>
</span>
</template>
</el-table-column>
<el-table-column <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
...@@ -516,6 +535,23 @@ ...@@ -516,6 +535,23 @@
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
<template v-if="openArticleInfoImg">
<el-dialog
title="凭证图片"
:visible.sync="openArticleInfoImg"
width="600px"
append-to-body
>
<imageUpload
v-if="VisitorData.voucher"
v-model="VisitorData.voucher"
:limit="VisitorData.voucher.split(',').length"
:isShowTip="false"
:disabled="true"
></imageUpload>
</el-dialog>
</template>
</div> </div>
</template> </template>
...@@ -532,6 +568,7 @@ export default { ...@@ -532,6 +568,7 @@ export default {
name: "DbwzOrder", name: "DbwzOrder",
data() { data() {
return { return {
openArticleInfoImg: false,
openArticleInfo: false, openArticleInfo: false,
openArticle: false, openArticle: false,
openArticleTitle: "", openArticleTitle: "",
...@@ -586,6 +623,7 @@ export default { ...@@ -586,6 +623,7 @@ export default {
sex: "", sex: "",
idcard: "", idcard: "",
isAdult: "", isAdult: "",
voucher: "",
}, },
}; };
}, },
...@@ -593,6 +631,11 @@ export default { ...@@ -593,6 +631,11 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
clickSeeVisitorImg(row) {
this.$set(this.VisitorData, "voucher", undefined);
this.openArticleInfoImg = true;
this.VisitorData = row;
},
clickSeeROWrEM(text, title) { clickSeeROWrEM(text, title) {
this.openArticle = true; this.openArticle = true;
this.rowArticle = this.replaceSpecialChar(text); this.rowArticle = this.replaceSpecialChar(text);
......
src/views/orderManagement/order/index.vue
...@@ -173,26 +173,41 @@ ...@@ -173,26 +173,41 @@
key="phone" key="phone"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="当前状态" align="center" prop="tstatus" key="tstatus"> <el-table-column
label="当前状态"
align="center"
prop="ystatus"
key="ystatus"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<span v-if="row.tstatus == 0">已发布</span> <span v-if="row.ystatus == 0">已发布</span>
<span v-if="row.tstatus == 1">已接单</span> <span v-if="row.ystatus == 1">已接单</span>
<span v-if="row.tstatus == 2">已完成</span> <span v-if="row.ystatus == 2">已完成</span>
<span v-if="row.tstatus == 3">退款中</span> <span v-if="row.ystatus == 3">退款中</span>
<span v-if="row.tstatus == 4">已退款</span> <span v-if="row.ystatus == 4">已退款</span>
<span v-if="row.tstatus == 6">进行中</span> <span v-if="row.ystatus == 6">进行中</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单状态" align="center" prop="ystatus" key="ystatus"> <el-table-column
label="订单状态"
align="center"
prop="tstatus"
key="tstatus"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<span v-if="row.ystatus == 0">待支付</span> <span v-if="row.tstatus == 0">待支付</span>
<span v-if="row.ystatus == 1">已支付</span> <span v-if="row.tstatus == 1">已支付</span>
<span v-if="row.ystatus == 2">已完成</span> <span v-if="row.tstatus == 2">已完成</span>
<span v-if="row.ystatus == 7">已取消</span> <span v-if="row.tstatus == 7">已取消</span>
<span v-if="row.ystatus == 8">已退款</span> <span v-if="row.tstatus == 8">已退款</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否好评" align="center" prop="isSatisfaction" key="isSatisfaction"> <el-table-column
label="是否好评"
align="center"
prop="isSatisfaction"
key="isSatisfaction"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- 0-未评价，1-好评，2-差评 --> <!-- 0-未评价，1-好评，2-差评 -->
<span v-if="row.isSatisfaction == 0">未评价</span> <span v-if="row.isSatisfaction == 0">未评价</span>
...@@ -229,7 +244,26 @@ ...@@ -229,7 +244,26 @@
prop="voucher" prop="voucher"
key="voucher" key="voucher"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> 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"
type="text"
@click="clickSeeVisitorImg(row)"
>点击查看</el-button
>
</span>
</template>
</el-table-column>
<el-table-column <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
...@@ -365,6 +399,23 @@ ...@@ -365,6 +399,23 @@
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
<template v-if="openArticleInfoImg">
<el-dialog
title="凭证图片"
:visible.sync="openArticleInfoImg"
width="600px"
append-to-body
>
<imageUpload
v-if="VisitorData.voucher"
v-model="VisitorData.voucher"
:limit="VisitorData.voucher.split(',').length"
:isShowTip="false"
:disabled="true"
></imageUpload>
</el-dialog>
</template>
</div> </div>
</template> </template>
...@@ -381,6 +432,7 @@ export default { ...@@ -381,6 +432,7 @@ export default {
name: "Order", name: "Order",
data() { data() {
return { return {
openArticleInfoImg: false,
openArticleInfo: false, openArticleInfo: false,
openArticle: false, openArticle: false,
openArticleTitle: "", openArticleTitle: "",
...@@ -431,6 +483,7 @@ export default { ...@@ -431,6 +483,7 @@ export default {
sex: "", sex: "",
idcard: "", idcard: "",
isAdult: "", isAdult: "",
voucher: "",
}, },
}; };
}, },
...@@ -438,6 +491,11 @@ export default { ...@@ -438,6 +491,11 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
clickSeeVisitorImg(row) {
this.$set(this.VisitorData, "voucher", undefined);
this.openArticleInfoImg = true;
this.VisitorData = row;
},
clickSeeROWrEM(text, title) { clickSeeROWrEM(text, title) {
this.openArticle = true; this.openArticle = true;
this.rowArticle = this.replaceSpecialChar(text); this.rowArticle = this.replaceSpecialChar(text);
......
src/views/orderManagement/zqghOrder/index.vue
...@@ -126,8 +126,8 @@ ...@@ -126,8 +126,8 @@
<el-table-column <el-table-column
label="医生" label="医生"
align="center" align="center"
prop="doName" prop="serviceName"
key="doName" key="serviceName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
...@@ -158,15 +158,15 @@ ...@@ -158,15 +158,15 @@
<el-table-column <el-table-column
label="订单状态" label="订单状态"
align="center" align="center"
prop="ystatus" prop="tstatus"
key="ystatus" key="tstatus"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<span v-if="row.ystatus == 0">待支付</span> <span v-if="row.tstatus == 0">待支付</span>
<span v-if="row.ystatus == 1">已支付</span> <span v-if="row.tstatus == 1">已支付</span>
<span v-if="row.ystatus == 2">已完成</span> <span v-if="row.tstatus == 2">已完成</span>
<span v-if="row.ystatus == 7">已取消</span> <span v-if="row.tstatus == 7">已取消</span>
<span v-if="row.ystatus == 8">已退款</span> <span v-if="row.tstatus == 8">已退款</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
src/views/orderManagement/zyphOrder/index.vue
...@@ -185,30 +185,30 @@ ...@@ -185,30 +185,30 @@
<el-table-column <el-table-column
label="当前状态" label="当前状态"
align="center" align="center"
prop="tstatus" prop="ystatus"
key="tstatus" key="ystatus"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<span v-if="row.tstatus == 0">已发布</span> <span v-if="row.ystatus == 0">已发布</span>
<span v-if="row.tstatus == 1">已接单</span> <span v-if="row.ystatus == 1">已接单</span>
<span v-if="row.tstatus == 2">已完成</span> <span v-if="row.ystatus == 2">已完成</span>
<span v-if="row.tstatus == 3">退款中</span> <span v-if="row.ystatus == 3">退款中</span>
<span v-if="row.tstatus == 4">已退款</span> <span v-if="row.ystatus == 4">已退款</span>
<span v-if="row.tstatus == 6">进行中</span> <span v-if="row.ystatus == 6">进行中</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="订单状态" label="订单状态"
align="center" align="center"
prop="ystatus" prop="tstatus"
key="ystatus" key="tstatus"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<span v-if="row.ystatus == 0">待支付</span> <span v-if="row.tstatus == 0">待支付</span>
<span v-if="row.ystatus == 1">已支付</span> <span v-if="row.tstatus == 1">已支付</span>
<span v-if="row.ystatus == 2">已完成</span> <span v-if="row.tstatus == 2">已完成</span>
<span v-if="row.ystatus == 7">已取消</span> <span v-if="row.tstatus == 7">已取消</span>
<span v-if="row.ystatus == 8">已退款</span> <span v-if="row.tstatus == 8">已退款</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -253,7 +253,26 @@ ...@@ -253,7 +253,26 @@
prop="voucher" prop="voucher"
key="voucher" key="voucher"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> 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"
type="text"
@click="clickSeeVisitorImg(row)"
>点击查看</el-button
>
</span>
</template>
</el-table-column>
<el-table-column <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
...@@ -395,6 +414,23 @@ ...@@ -395,6 +414,23 @@
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
<template v-if="openArticleInfoImg">
<el-dialog
title="凭证图片"
:visible.sync="openArticleInfoImg"
width="600px"
append-to-body
>
<imageUpload
v-if="VisitorData.voucher"
v-model="VisitorData.voucher"
:limit="VisitorData.voucher.split(',').length"
:isShowTip="false"
:disabled="true"
></imageUpload>
</el-dialog>
</template>
</div> </div>
</template> </template>
...@@ -411,6 +447,7 @@ export default { ...@@ -411,6 +447,7 @@ export default {
name: "ZyphOrder", name: "ZyphOrder",
data() { data() {
return { return {
openArticleInfoImg: false,
openArticleInfo: false, openArticleInfo: false,
openArticle: false, openArticle: false,
openArticleTitle: "", openArticleTitle: "",
...@@ -463,6 +500,7 @@ export default { ...@@ -463,6 +500,7 @@ export default {
sex: "", sex: "",
idcard: "", idcard: "",
isAdult: "", isAdult: "",
voucher: "",
}, },
}; };
}, },
...@@ -470,6 +508,11 @@ export default { ...@@ -470,6 +508,11 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
clickSeeVisitorImg(row) {
this.$set(this.VisitorData, "voucher", undefined);
this.openArticleInfoImg = true;
this.VisitorData = row;
},
clickSeeROWrEM(text, title) { clickSeeROWrEM(text, title) {
this.openArticle = true; this.openArticle = true;
this.rowArticle = this.replaceSpecialChar(text); this.rowArticle = this.replaceSpecialChar(text);
......
src/views/system/user/index.vue
...@@ -186,8 +186,8 @@ ...@@ -186,8 +186,8 @@
<el-table-column <el-table-column
label="角色" label="角色"
align="center" align="center"
key="deptName" key="roleName"
prop="dept.deptName" prop="roleName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<!-- <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" /> --> <!-- <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" /> -->
...@@ -201,18 +201,18 @@ ...@@ -201,18 +201,18 @@
></el-switch> ></el-switch>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column <!-- <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
prop="createTime" prop="createTime"
width="160" width="160"
/> /> -->
<el-table-column <!-- <el-table-column
label="更新时间" label="更新时间"
align="center" align="center"
prop="updateTime" prop="updateTime"
width="160" width="160"
/> /> -->
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
...@@ -274,7 +274,13 @@ ...@@ -274,7 +274,13 @@
</el-row> </el-row>
<!-- 添加或修改用户配置对话框 --> <!-- 添加或修改用户配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body> <template v-if="open">
<el-dialog
:title="title"
:visible.sync="open"
width="600px"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
...@@ -295,16 +301,6 @@ ...@@ -295,16 +301,6 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12">
<el-form-item label="归属部门" prop="deptId">
<treeselect
v-model="form.deptId"
:options="deptOptions"
:show-count="true"
placeholder="请选择归属部门"
/>
</el-form-item>
</el-col> -->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
...@@ -331,134 +327,7 @@ ...@@ -331,134 +327,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="角色"> <el-form-item label="角色">
<el-select <el-select v-model="form.roleIds" placeholder="请选择角色">
v-model="form.roleIds"
multiple
placeholder="请选择角色"
>
<el-option
v-for="item in roleOptions"
:key="item.roleId"
:label="item.roleName"
:value="item.roleId"
:disabled="item.status == 1"
></el-option>
</el-select>
</el-form-item>
</el-col>
<template v-if="title === '修改'">
<el-col :span="24">
<el-form-item label="创建时间" prop="createTime">
<el-input v-model="form.createTime" disabled />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="更新时间" prop="updateTime">
<el-input v-model="form.updateTime" disabled />
</el-form-item>
</el-col>
</template>
<!-- <el-col :span="12">
<el-form-item label="手机号码" prop="phonenumber">
<el-input
v-model="form.phonenumber"
placeholder="请输入手机号码"
maxlength="11"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-input
v-model="form.email"
placeholder="请输入邮箱"
maxlength="50"
/>
</el-form-item>
</el-col> -->
</el-row>
<!-- <el-row>
<el-col :span="12">
<el-form-item
v-if="form.userId == undefined"
label="用户名称"
prop="userName"
>
<el-input
v-model="form.userName"
placeholder="请输入用户名称"
maxlength="30"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
v-if="form.userId == undefined"
label="用户密码"
prop="password"
>
<el-input
v-model="form.password"
placeholder="请输入用户密码"
type="password"
maxlength="20"
show-password
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="用户性别">
<el-select v-model="form.sex" placeholder="请选择性别">
<el-option
v-for="dict in dict.type.sys_user_sex"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio
>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="岗位">
<el-select
v-model="form.postIds"
multiple
placeholder="请选择岗位"
>
<el-option
v-for="item in postOptions"
:key="item.postId"
:label="item.postName"
:value="item.postId"
:disabled="item.status == 1"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="角色">
<el-select
v-model="form.roleIds"
multiple
placeholder="请选择角色"
>
<el-option <el-option
v-for="item in roleOptions" v-for="item in roleOptions"
:key="item.roleId" :key="item.roleId"
...@@ -470,23 +339,13 @@ ...@@ -470,23 +339,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注">
<el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
></el-input>
</el-form-item>
</el-col>
</el-row> -->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template>
<!-- 用户导入对话框 --> <!-- 用户导入对话框 -->
<el-dialog <el-dialog
...@@ -547,18 +406,18 @@ import { getToken } from "@/utils/auth"; ...@@ -547,18 +406,18 @@ import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
const equalToPassword = (rule, value, callback) => {
if (this.form.password !== value) {
callback(new Error("两次输入的密码不一致"));
} else {
callback();
}
};
export default { export default {
name: "User", name: "User",
dicts: ["sys_normal_disable", "sys_user_sex"], dicts: ["sys_normal_disable", "sys_user_sex"],
components: { Treeselect }, components: { Treeselect },
data() { data() {
const equalToPassword = (rule, value, callback) => {
if (this.form.password !== value) {
callback(new Error("两次输入的密码不一致"));
} else {
callback();
}
};
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: true,
...@@ -591,7 +450,10 @@ export default { ...@@ -591,7 +450,10 @@ export default {
// 角色选项 // 角色选项
roleOptions: [], roleOptions: [],
// 表单参数 // 表单参数
form: {}, form: {
password: undefined,
passwordT: undefined,
},
defaultProps: { defaultProps: {
children: "children", children: "children",
label: "label", label: "label",
...@@ -791,6 +653,29 @@ export default { ...@@ -791,6 +653,29 @@ export default {
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.$set(this.rules, "password", [
{ required: true, message: "用户密码不能为空", trigger: "blur" },
{
min: 5,
max: 20,
message: "用户密码长度必须介于 5 和 20 之间",
trigger: "blur",
},
]);
this.$set(this.rules, "passwordT", [
{ required: true, message: "确认密码不能为空", trigger: "blur" },
{
required: true,
validator: (rule, value, callback) => {
if (this.form.password !== value) {
callback(new Error("两次输入的密码不一致"));
} else {
callback();
}
},
trigger: "blur",
},
]);
this.reset(); this.reset();
getUser().then((response) => { getUser().then((response) => {
this.postOptions = response.data.posts; this.postOptions = response.data.posts;
...@@ -803,6 +688,8 @@ export default { ...@@ -803,6 +688,8 @@ export default {
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.$delete(this.rules, "password");
this.$delete(this.rules, "passwordT");
this.reset(); this.reset();
const userId = row.userId || this.ids; const userId = row.userId || this.ids;
getUser(userId).then((response) => { getUser(userId).then((response) => {
...@@ -810,12 +697,18 @@ export default { ...@@ -810,12 +697,18 @@ export default {
this.postOptions = response.data.posts; this.postOptions = response.data.posts;
this.roleOptions = response.data.roles; this.roleOptions = response.data.roles;
this.$set(this.form, "postIds", response.data.postIds); this.$set(this.form, "postIds", response.data.postIds);
this.$set(this.form, "roleIds", response.data.roleIds); this.$set(
this.form,
"roleIds",
response.data && response.data.roleIds && response.data.roleIds.length
? response.data.roleIds[0]
: ""
);
this.open = true; this.open = true;
// this.title = "修改用户"; // this.title = "修改用户";
this.title = "修改"; this.title = "修改";
this.$set(this.form, "password", ''); this.$set(this.form, "password", "");
this.$set(this.form, "passwordT", ''); this.$set(this.form, "passwordT", "");
}); });
}, },
/** 重置密码按钮操作 */ /** 重置密码按钮操作 */
...@@ -843,14 +736,20 @@ export default { ...@@ -843,14 +736,20 @@ export default {
submitForm: function () { submitForm: function () {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
let arr = [];
arr[0] = this.form.roleIds;
let params = {
...this.form,
roleIds: arr,
};
if (this.form.userId != undefined) { if (this.form.userId != undefined) {
updateUser(this.form).then((response) => { updateUser(params).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addUser(this.form).then((response) => { addUser(params).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
......
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