cuiyouliang/plus-ui
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、按钮风格修改，eslint格式化

Browse Source
This commit is contained in:
cuiyouliang 2025-06-25 15:08:12 +08:00
parent 12522cbf36
commit 2fd90bb4a0
48 changed files with 388 additions and 469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Crontab/day.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<el-form size="small"> <el-form >
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="1"> <el-radio v-model='radioValue' :label="1">
日，允许的通配符[, - * ? / L W] 日，允许的通配符[, - * ? / L W]

2
src/components/Crontab/hour.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<el-form size="small"> <el-form >
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="1"> <el-radio v-model='radioValue' :label="1">
小时，允许的通配符[, - * /] 小时，允许的通配符[, - * /]

6
src/components/Crontab/index.vue
View File

@ -104,9 +104,9 @@
<CrontabResult :ex="crontabValueString"></CrontabResult> <CrontabResult :ex="crontabValueString"></CrontabResult>
<div class="pop_btn"> <div class="pop_btn">
<el-button size="small" type="primary" @click="submitFill">确定</el-button> <el-button type="primary" @click="submitFill">确定</el-button>
<el-button size="small" type="warning" @click="clearCron">重置</el-button> <el-button type="warning" @click="clearCron">重置</el-button>
<el-button size="small" @click="hidePopup">取消</el-button> <el-button @click="hidePopup">取消</el-button>
</div> </div>
</div> </div>
</div> </div>

4
src/components/Crontab/min.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<el-form size="small"> <el-form >
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="1"> <el-radio v-model='radioValue' :label="1">
分钟，允许的通配符[, - * /] 分钟，允许的通配符[, - * /]
@ -113,4 +113,4 @@ export default {
} }
} }
} }
</script> </script>

2
src/components/Crontab/second.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<el-form size="small"> <el-form >
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="1"> <el-radio v-model='radioValue' :label="1">
秒，允许的通配符[, - * /] 秒，允许的通配符[, - * /]

2
src/components/Crontab/year.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<el-form size="small"> <el-form >
<el-form-item> <el-form-item>
<el-radio :label="1" v-model='radioValue'> <el-radio :label="1" v-model='radioValue'>
不填，允许的通配符[, - * /] 不填，允许的通配符[, - * /]

2
src/components/Process/processMeddle.vue
View File

@ -41,7 +41,7 @@
<el-table-column prop="nickName" label="办理人" /> <el-table-column prop="nickName" label="办理人" />
<el-table-column label="操作" align="center" width="160"> <el-table-column label="操作" align="center" width="160">
<template #default="scope"> <template #default="scope">
<el-button type="danger" size="small" icon="Delete" @click="deleteMultiInstanceUser(scope.row)">删除</el-button> <el-button type="danger" icon="Delete" @click="deleteMultiInstanceUser(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

2
src/components/Process/submitVerify.vue
View File

@ -123,7 +123,7 @@
<el-table-column prop="nickName" label="办理人" /> <el-table-column prop="nickName" label="办理人" />
<el-table-column label="操作" align="center" width="160"> <el-table-column label="操作" align="center" width="160">
<template #default="scope"> <template #default="scope">
<el-button type="danger" size="small" icon="Delete" @click="deleteMultiInstanceUser(scope.row)">删除 </el-button> <el-button type="danger" icon="Delete" @click="deleteMultiInstanceUser(scope.row)">删除 </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

38
src/views/act/couponActivity/index.vue
View File

@ -2,22 +2,22 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="100px" size="default" class="ry_form">
<el-form-item label="活动名称" prop="title"> <el-form-item label="活动名称" prop="title">
<el-input v-model="queryParams.title" placeholder="请输入活动名称" clearable size="small" /> <el-input v-model="queryParams.title" placeholder="请输入活动名称" clearable />
</el-form-item> </el-form-item>
<el-form-item label="使用范围" prop="useScope"> <el-form-item label="使用范围" prop="useScope">
<DictRadio v-model="queryParams.useScope" @change="handleQuery" size="small" radioData="coupon_use_scope" :showAll="'all'" /> <DictRadio v-model="queryParams.useScope" @change="handleQuery" radioData="coupon_use_scope" :showAll="'all'" />
</el-form-item> </el-form-item>
<el-form-item label="兑换类型" prop="couponType"> <el-form-item label="兑换类型" prop="couponType">
<DictRadio v-model="queryParams.couponType" @change="handleQuery" size="small" radioData="coupon_exchange_type" :showAll="'all'" /> <DictRadio v-model="queryParams.couponType" @change="handleQuery" radioData="coupon_exchange_type" :showAll="'all'" />
</el-form-item> </el-form-item>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" size="small" @click="handleAdd" v-hasPermi="['act:couponActivity:opt']">新增 </el-button> <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['act:couponActivity:opt']">新增 </el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -53,11 +53,11 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width"> <el-table-column label="操作" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="small" text type="primary" @click="seeCouponList(scope.row)">领取记录 </el-button> <el-button text type="primary" @click="seeCouponList(scope.row)">领取记录 </el-button>
<el-button size="small" text type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['act:couponActivity:opt']">修改 </el-button> <el-button text type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['act:couponActivity:opt']">修改 </el-button>
<el-button <el-button
size="small" text
text type="primary" type="primary"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-if="scope.row.leftCount === scope.row.totalCount" v-if="scope.row.leftCount === scope.row.totalCount"
v-hasPermi="['act:couponActivity:opt']" v-hasPermi="['act:couponActivity:opt']"
@ -103,25 +103,11 @@
</el-form-item> </el-form-item>
<el-form-item label="活动开始时间" prop="beginTime"> <el-form-item label="活动开始时间" prop="beginTime">
<el-date-picker <el-date-picker clearable v-model="form.beginTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择活动开始时间">
clearable
size="small"
v-model="form.beginTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择活动开始时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="活动结束时间" prop="endTime"> <el-form-item label="活动结束时间" prop="endTime">
<el-date-picker <el-date-picker clearable v-model="form.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择活动结束时间">
clearable
size="small"
v-model="form.endTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择活动结束时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="使用范围" prop="useScope"> <el-form-item label="使用范围" prop="useScope">
@ -132,7 +118,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="商品列表" prop="productIds" v-if="[2, 3].includes(form.useScope)"> <el-form-item label="商品列表" prop="productIds" v-if="[2, 3].includes(form.useScope)">
<el-button @click="chooseSku" size="small">选择商品</el-button> <el-button @click="chooseSku">选择商品</el-button>
<el-table :data="productList" class="mt10" max-height="300px" border> <el-table :data="productList" class="mt10" max-height="300px" border>
<el-table-column label="菜品信息"> <el-table-column label="菜品信息">
<template v-slot="{ row }"> <template v-slot="{ row }">

2
src/views/act/couponActivity/receiveList.vue
View File

@ -2,7 +2,7 @@
<el-dialog title="领取记录" v-model="open" width="80%" append-to-body> <el-dialog title="领取记录" v-model="open" width="80%" append-to-body>
<el-form :model="queryParams" :inline="true" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" :inline="true" label-width="100px" size="default" class="ry_form">
<el-form-item label="使用状态" prop="useStatus"> <el-form-item label="使用状态" prop="useStatus">
<DictRadio v-model="queryParams.useStatus" @change="handleQuery" size="small" radioData="activity_coupon_status" :showAll="'all'" /> <DictRadio v-model="queryParams.useStatus" @change="handleQuery" radioData="activity_coupon_status" :showAll="'all'" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="tableList" border> <el-table v-loading="loading" :data="tableList" border>

89
src/views/act/memberCoupon/index.vue
View File

@ -2,98 +2,73 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="活动id" prop="couponActivityId"> <el-form-item label="活动id" prop="couponActivityId">
<el-input v-model="queryParams.couponActivityId" placeholder="请输入活动id" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.couponActivityId" placeholder="请输入活动id" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="用户id" prop="memberId"> <el-form-item label="用户id" prop="memberId">
<el-input v-model="queryParams.memberId" placeholder="请输入用户id" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.memberId" placeholder="请输入用户id" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="活动名称" prop="title"> <el-form-item label="活动名称" prop="title">
<el-input v-model="queryParams.title" placeholder="请输入活动名称" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.title" placeholder="请输入活动名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="使用范围 1全场通用 2指定商品可用 3指定商品不可用" prop="useScope"> <el-form-item label="使用范围 1全场通用 2指定商品可用 3指定商品不可用" prop="useScope">
<el-input <el-input
v-model="queryParams.useScope" v-model="queryParams.useScope"
placeholder="请输入使用范围 1全场通用 2指定商品可用 3指定商品不可用" placeholder="请输入使用范围 1全场通用 2指定商品可用 3指定商品不可用"
clearable clearable
size="small"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="商品id集合，逗号分隔" prop="productIds"> <el-form-item label="商品id集合，逗号分隔" prop="productIds">
<el-input v-model="queryParams.productIds" placeholder="请输入商品id集合，逗号分隔" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productIds" placeholder="请输入商品id集合，逗号分隔" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="优惠券金额" prop="couponAmount"> <el-form-item label="优惠券金额" prop="couponAmount">
<el-input v-model="queryParams.couponAmount" placeholder="请输入优惠券金额" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.couponAmount" placeholder="请输入优惠券金额" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="最低消费金额" prop="minAmount"> <el-form-item label="最低消费金额" prop="minAmount">
<el-input v-model="queryParams.minAmount" placeholder="请输入最低消费金额" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.minAmount" placeholder="请输入最低消费金额" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<template v-if="showMoreCondition"> <template v-if="showMoreCondition">
<el-form-item label="要兑换的积分" prop="useIntegral"> <el-form-item label="要兑换的积分" prop="useIntegral">
<el-input v-model="queryParams.useIntegral" placeholder="请输入要兑换的积分" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.useIntegral" placeholder="请输入要兑换的积分" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="1免费兑换 2积分兑换" prop="couponType"> <el-form-item label="1免费兑换 2积分兑换" prop="couponType">
<el-select v-model="queryParams.couponType" placeholder="请选择1免费兑换 2积分兑换" clearable size="small"> <el-select v-model="queryParams.couponType" placeholder="请选择1免费兑换 2积分兑换" clearable>
<el-option label="请选择字典生成" value="" /> <el-option label="请选择字典生成" value="" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="券开始时间" prop="beginTime"> <el-form-item label="券开始时间" prop="beginTime">
<el-date-picker <el-date-picker clearable v-model="queryParams.beginTime" type="datetime" value-format="yyyy-MM-ddTHH:mm:ss" placeholder="选择券开始时间">
clearable
size="small"
v-model="queryParams.beginTime"
type="datetime"
value-format="yyyy-MM-ddTHH:mm:ss"
placeholder="选择券开始时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="券结束时间" prop="endTime"> <el-form-item label="券结束时间" prop="endTime">
<el-date-picker <el-date-picker clearable v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-ddTHH:mm:ss" placeholder="选择券结束时间">
clearable
size="small"
v-model="queryParams.endTime"
type="datetime"
value-format="yyyy-MM-ddTHH:mm:ss"
placeholder="选择券结束时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="0未使用 1已使用" prop="useStatus"> <el-form-item label="0未使用 1已使用" prop="useStatus">
<el-select v-model="queryParams.useStatus" placeholder="请选择0未使用 1已使用" clearable size="small"> <el-select v-model="queryParams.useStatus" placeholder="请选择0未使用 1已使用" clearable>
<el-option label="请选择字典生成" value="" /> <el-option label="请选择字典生成" value="" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="订单id" prop="orderId"> <el-form-item label="订单id" prop="orderId">
<el-input v-model="queryParams.orderId" placeholder="请输入订单id" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.orderId" placeholder="请输入订单id" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="使用时间" prop="useTime"> <el-form-item label="使用时间" prop="useTime">
<el-date-picker <el-date-picker clearable v-model="queryParams.useTime" type="datetime" value-format="yyyy-MM-ddTHH:mm:ss" placeholder="选择使用时间">
clearable
size="small"
v-model="queryParams.useTime"
type="datetime"
value-format="yyyy-MM-ddTHH:mm:ss"
placeholder="选择使用时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</template> </template>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
<el-button <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" @click="showMoreCondition = !showMoreCondition">{{
:icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" showMoreCondition ? '收起条件' : '展开条件'
size="small" }}</el-button>
@click="showMoreCondition = !showMoreCondition"
>{{ showMoreCondition ? '收起条件' : '展开条件' }}</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" size="small" @click="handleAdd" v-hasPermi="['act:memberCoupon:add']">新增</el-button> <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['act:memberCoupon:add']">新增</el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -127,10 +102,8 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width"> <el-table-column label="操作" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="small" text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['act:memberCoupon:edit']">修改 </el-button> <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['act:memberCoupon:edit']">修改 </el-button>
<el-button size="small" text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['act:memberCoupon:remove']" <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['act:memberCoupon:remove']">删除 </el-button>
>删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -170,25 +143,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="券开始时间" prop="beginTime"> <el-form-item label="券开始时间" prop="beginTime">
<el-date-picker <el-date-picker clearable v-model="form.beginTime" type="datetime" value-format="yyyy-MM-ddTHH:mm:ss" placeholder="选择券开始时间">
clearable
size="small"
v-model="form.beginTime"
type="datetime"
value-format="yyyy-MM-ddTHH:mm:ss"
placeholder="选择券开始时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="券结束时间" prop="endTime"> <el-form-item label="券结束时间" prop="endTime">
<el-date-picker <el-date-picker clearable v-model="form.endTime" type="datetime" value-format="yyyy-MM-ddTHH:mm:ss" placeholder="选择券结束时间">
clearable
size="small"
v-model="form.endTime"
type="datetime"
value-format="yyyy-MM-ddTHH:mm:ss"
placeholder="选择券结束时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="0未使用 1已使用"> <el-form-item label="0未使用 1已使用">
@ -200,7 +159,7 @@
<el-input v-model="form.orderId" placeholder="请输入订单id" /> <el-input v-model="form.orderId" placeholder="请输入订单id" />
</el-form-item> </el-form-item>
<el-form-item label="使用时间" prop="useTime"> <el-form-item label="使用时间" prop="useTime">
<el-date-picker clearable size="small" v-model="form.useTime" type="datetime" value-format="yyyy-MM-ddTHH:mm:ss" placeholder="选择使用时间"> <el-date-picker clearable v-model="form.useTime" type="datetime" value-format="yyyy-MM-ddTHH:mm:ss" placeholder="选择使用时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>

4
src/views/aws/systemStatistics/index.vue
View File

@ -15,8 +15,8 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>

4
src/views/components/IndexOrderPanelGroup/TopProduct.vue
View File

@ -6,7 +6,7 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<div style="font-size: large"> <div style="font-size: large">
<el-radio-group v-model="params.statType" size="small" @change="getData"> <el-radio-group v-model="params.statType" @change="getData">
<el-radio-button label="2">商品销量榜</el-radio-button> <el-radio-button label="2">商品销量榜</el-radio-button>
<el-radio-button label="1">规格销量榜</el-radio-button> <el-radio-button label="1">规格销量榜</el-radio-button>
</el-radio-group> </el-radio-group>
@ -14,7 +14,7 @@
</el-col> </el-col>
<el-col :span="18"> <el-col :span="18">
<div style="text-align: right"> <div style="text-align: right">
<el-radio-group v-model="params.type" size="small" @change="getData"> <el-radio-group v-model="params.type" @change="getData">
<el-radio-button label="0">今日</el-radio-button> <el-radio-button label="0">今日</el-radio-button>
<el-radio-button label="7">近七日</el-radio-button> <el-radio-button label="7">近七日</el-radio-button>
<el-radio-button label="30">近三十日</el-radio-button> <el-radio-button label="30">近三十日</el-radio-button>

2
src/views/dashboard/OrderLineChart.vue
View File

@ -8,7 +8,7 @@
</el-col> </el-col>
<el-col :span="18"> <el-col :span="18">
<div style="text-align: right"> <div style="text-align: right">
<el-radio-group v-model="params.type" size="small" @change="orderStat"> <el-radio-group v-model="params.type" @change="orderStat">
<el-radio-button label="1">近七日</el-radio-button> <el-radio-button label="1">近七日</el-radio-button>
<el-radio-button label="2">近三十日</el-radio-button> <el-radio-button label="2">近三十日</el-radio-button>
</el-radio-group> </el-radio-group>

36
src/views/monitor/job/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="任务名称" prop="jobName"> <el-form-item label="任务名称" prop="jobName">
<el-input v-model="queryParams.jobName" placeholder="请输入任务名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.jobName" placeholder="请输入任务名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
@ -15,30 +15,26 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" size="small" @click="handleAdd" v-hasPermi="['monitor:job:add']">新增</el-button> <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['monitor:job:add']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="Edit" size="small" :disabled="single" @click="handleUpdate" v-hasPermi="['monitor:job:edit']" <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate" v-hasPermi="['monitor:job:edit']">修改</el-button>
>修改</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="Delete" size="small" :disabled="multiple" @click="handleDelete" v-hasPermi="['monitor:job:remove']" <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['monitor:job:remove']">删除</el-button>
>删除</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="Download" size="small" @click="handleExport" v-hasPermi="['monitor:job:export']">导出</el-button> <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['monitor:job:export']">导出</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="info" plain icon="Operation" size="small" @click="handleJobLog" v-hasPermi="['monitor:job:query']">日志</el-button> <el-button type="info" plain icon="Operation" @click="handleJobLog" v-hasPermi="['monitor:job:query']">日志</el-button>
</el-col> </el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -61,13 +57,9 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="small" text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['monitor:job:edit']">修改</el-button> <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['monitor:job:edit']">修改</el-button>
<el-button size="small" text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['monitor:job:remove']">删除</el-button> <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['monitor:job:remove']">删除</el-button>
<el-dropdown <el-dropdown @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']">
size="small"
@command="(command) => handleCommand(command, scope.row)"
v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']"
>
<span class="el-dropdown-link"> <i class="el-icon-d-arrow-right el-icon--right"></i>更多 </span> <span class="el-dropdown-link"> <i class="el-icon-d-arrow-right el-icon--right"></i>更多 </span>
<template v-slot:dropdown> <template v-slot:dropdown>
<el-dropdown-menu> <el-dropdown-menu>
@ -132,7 +124,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="执行策略" prop="misfirePolicy"> <el-form-item label="执行策略" prop="misfirePolicy">
<el-radio-group v-model="form.misfirePolicy" size="small"> <el-radio-group v-model="form.misfirePolicy">
<el-radio-button label="1">立即执行</el-radio-button> <el-radio-button label="1">立即执行</el-radio-button>
<el-radio-button label="2">执行一次</el-radio-button> <el-radio-button label="2">执行一次</el-radio-button>
<el-radio-button label="3">放弃执行</el-radio-button> <el-radio-button label="3">放弃执行</el-radio-button>
@ -141,7 +133,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否并发" prop="concurrent"> <el-form-item label="是否并发" prop="concurrent">
<el-radio-group v-model="form.concurrent" size="small"> <el-radio-group v-model="form.concurrent">
<el-radio-button label="0">允许</el-radio-button> <el-radio-button label="0">允许</el-radio-button>
<el-radio-button label="1">禁止</el-radio-button> <el-radio-button label="1">禁止</el-radio-button>
</el-radio-group> </el-radio-group>
@ -170,7 +162,7 @@
<!-- 任务日志详细 --> <!-- 任务日志详细 -->
<el-dialog title="任务详细" v-model:visible="openView" width="700px" append-to-body> <el-dialog title="任务详细" v-model:visible="openView" width="700px" append-to-body>
<el-form ref="form" :model="form" label-width="120px" size="small"> <el-form ref="form" :model="form" label-width="120px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="任务编号：">{{ form.jobId }}</el-form-item> <el-form-item label="任务编号：">{{ form.jobId }}</el-form-item>

20
src/views/monitor/job/log.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="任务名称" prop="jobName"> <el-form-item label="任务名称" prop="jobName">
<el-input v-model="queryParams.jobName" placeholder="请输入任务名称" clearable style="width: 240px" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.jobName" placeholder="请输入任务名称" clearable style="width: 240px" @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
@ -26,25 +26,23 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="Delete" size="small" :disabled="multiple" @click="handleDelete" v-hasPermi="['monitor:job:remove']" <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['monitor:job:remove']">删除</el-button>
>删除</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="Delete" size="small" @click="handleClean" v-hasPermi="['monitor:job:remove']">清空</el-button> <el-button type="danger" plain icon="Delete" @click="handleClean" v-hasPermi="['monitor:job:remove']">清空</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="Download" size="small" @click="handleExport" v-hasPermi="['monitor:job:export']">导出</el-button> <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['monitor:job:export']">导出</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="Close" size="small" @click="handleClose">关闭</el-button> <el-button type="warning" plain icon="Close" @click="handleClose">关闭</el-button>
</el-col> </el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -72,7 +70,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="small" text type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['monitor:job:query']">详细</el-button> <el-button text type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['monitor:job:query']">详细</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -81,7 +79,7 @@
<!-- 调度日志详细 --> <!-- 调度日志详细 -->
<el-dialog title="调度日志详细" v-model:visible="open" width="700px" append-to-body> <el-dialog title="调度日志详细" v-model:visible="open" width="700px" append-to-body>
<el-form ref="form" :model="form" label-width="100px" size="small"> <el-form ref="form" :model="form" label-width="100px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="日志序号：">{{ form.jobLogId }}</el-form-item> <el-form-item label="日志序号：">{{ form.jobLogId }}</el-form-item>

4
src/views/oms/aftersale/detail.vue
View File

@ -4,7 +4,7 @@
<el-card> <el-card>
<el-descriptions title="订单信息" :column="2" border label-class-name="my-label" contentClassName="my-content"> <el-descriptions title="订单信息" :column="2" border label-class-name="my-label" contentClassName="my-content">
<template v-slot:extra> <template v-slot:extra>
<el-button size="small" @click="$router.back()">返回</el-button> <el-button @click="$router.back()">返回</el-button>
</template> </template>
<el-descriptions-item label="订单号">{{ orderDetail.orderSn }}</el-descriptions-item> <el-descriptions-item label="订单号">{{ orderDetail.orderSn }}</el-descriptions-item>
<el-descriptions-item label="用户昵称">{{ orderDetail.nickName }}</el-descriptions-item> <el-descriptions-item label="用户昵称">{{ orderDetail.nickName }}</el-descriptions-item>
@ -53,7 +53,7 @@
<el-table-column label="退货快递号" prop="refundWaybillCode"></el-table-column> <el-table-column label="退货快递号" prop="refundWaybillCode"></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="small" text type="primary" icon="Edit" @click="handleWatch(scope.row)">查看</el-button> <el-button text type="primary" icon="Edit" @click="handleWatch(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

39
src/views/oms/aftersale/index.vue
View File

@ -3,19 +3,19 @@
<div v-show="show"> <div v-show="show">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="申请状态" prop="status"> <el-form-item label="申请状态" prop="status">
<DictRadio v-model="queryParams.status" radioData="oms_aftersale_status" size="small" :show-all="'all'" @change="handleQuery"></DictRadio> <DictRadio v-model="queryParams.status" radioData="oms_aftersale_status" :show-all="'all'" @change="handleQuery"></DictRadio>
</el-form-item> </el-form-item>
<el-form-item label="售后类型" prop="type"> <el-form-item label="售后类型" prop="type">
<DictRadio v-model="queryParams.type" radioData="oms_aftersale_type" size="small" :show-all="'all'" @change="handleQuery"></DictRadio> <DictRadio v-model="queryParams.type" radioData="oms_aftersale_type" :show-all="'all'" @change="handleQuery"></DictRadio>
</el-form-item> </el-form-item>
<el-form-item label="订单号" prop="orderSn"> <el-form-item label="订单号" prop="orderSn">
<el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单号" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单号" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="售后单号" prop="id"> <el-form-item label="售后单号" prop="id">
<el-input v-model.trim="queryParams.id" placeholder="请输入售后单号" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model.trim="queryParams.id" placeholder="请输入售后单号" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="会员手机号" prop="userPhone"> <el-form-item label="会员手机号" prop="userPhone">
<el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="Time"> <el-form-item label="创建时间" prop="Time">
<el-date-picker <el-date-picker
@ -23,7 +23,6 @@
type="datetimerange" type="datetimerange"
:picker-options="pickerOptions" :picker-options="pickerOptions"
range-separator="至" range-separator="至"
size="small"
format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期" start-placeholder="开始日期"
@ -35,8 +34,8 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="omsAftersaleList" @selection-change="handleSelectionChange" border> <el-table v-loading="loading" :data="omsAftersaleList" @selection-change="handleSelectionChange" border>
@ -75,25 +74,23 @@
<el-table-column label="处理人员" prop="handleMan" width="100" /> <el-table-column label="处理人员" prop="handleMan" width="100" />
<el-table-column label="订单编号/操作" class-name="small-padding fixed-width" width="220" fixed="right"> <el-table-column label="订单编号/操作" class-name="small-padding fixed-width" width="220" fixed="right">
<template v-slot="scope"> <template v-slot="scope">
<div> <!-- <div>
{{ scope.row.orderSn }} {{ scope.row.orderSn }}
<el-link @click="copy(scope.row.orderSn)" :underline="false"><i class="el-icon-document-copy el-icon--right"></i></el-link> <el-link @click="copy(scope.row.orderSn)" :underline="false"><i class="el-icon-document-copy el-icon&#45;&#45;right"></i></el-link>
</div> </div>-->
<el-button size="small" text type="primary" @click="handleDetail(scope.row.id)" v-hasPermi="['oms:aftersale:query']" <el-button text type="primary" @click="handleDetail(scope.row.orderId)" v-hasPermi="['oms:aftersale:query']">详情 </el-button>
>详情 <el-button text type="primary" @click="showLog(scope.row.orderId)" v-hasPermi="['oms:aftersale:log']">日志 </el-button>
</el-button>
<el-button size="small" text type="primary" @click="showLog(scope.row.orderId)" v-hasPermi="['oms:aftersale:log']">日志 </el-button>
<el-button <el-button
size="small" text
text type="primary" type="primary"
@click="approve(scope.row, 1)" @click="approve(scope.row, 1)"
v-if="scope.row.aftersaleStatus == 0" v-if="scope.row.aftersaleStatus == 0"
v-hasPermi="['manager:oms:aftersale:update']" v-hasPermi="['manager:oms:aftersale:update']"
>同意 >同意
</el-button> </el-button>
<el-button <el-button
size="small" text
text type="primary" type="primary"
@click="handleOpen(scope.row, 2)" @click="handleOpen(scope.row, 2)"
class="red" class="red"
v-if="scope.row.aftersaleStatus == 0" v-if="scope.row.aftersaleStatus == 0"
@ -101,8 +98,8 @@
>拒绝 >拒绝
</el-button> </el-button>
<el-button <el-button
size="small" text
text type="primary" type="primary"
@click="confirmReceive(scope.row, 3)" @click="confirmReceive(scope.row, 3)"
v-if="scope.row.aftersaleStatus == 1 && scope.row.applyRefundType == 2" v-if="scope.row.aftersaleStatus == 1 && scope.row.applyRefundType == 2"
v-hasPermi="['manager:oms:aftersale:update']" v-hasPermi="['manager:oms:aftersale:update']"

22
src/views/oms/aftersaleItem/index.vue
View File

@ -2,29 +2,29 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="MEMBER_ID" prop="memberId"> <el-form-item label="MEMBER_ID" prop="memberId">
<el-input v-model="queryParams.memberId" placeholder="请输入MEMBER_ID" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.memberId" placeholder="请输入MEMBER_ID" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="订单id" prop="orderId"> <el-form-item label="订单id" prop="orderId">
<el-input v-model="queryParams.orderId" placeholder="请输入订单id" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.orderId" placeholder="请输入订单id" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="子订单id" prop="orderItemId"> <el-form-item label="子订单id" prop="orderItemId">
<el-input v-model="queryParams.orderItemId" placeholder="请输入子订单id" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.orderItemId" placeholder="请输入子订单id" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="退款金额" prop="returnAmount"> <el-form-item label="退款金额" prop="returnAmount">
<el-input v-model="queryParams.returnAmount" placeholder="请输入退款金额" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.returnAmount" placeholder="请输入退款金额" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="退货数量" prop="quantity"> <el-form-item label="退货数量" prop="quantity">
<el-input v-model="queryParams.quantity" placeholder="请输入退货数量" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.quantity" placeholder="请输入退货数量" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" size="small" @click="handleAdd" v-hasPermi="['oms:aftersaleItem:add']">新增</el-button> <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oms:aftersaleItem:add']">新增</el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -37,10 +37,8 @@
<el-table-column label="退货数量" align="center" prop="quantity" /> <el-table-column label="退货数量" align="center" prop="quantity" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="small" text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oms:aftersaleItem:edit']">修改</el-button> <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oms:aftersaleItem:edit']">修改</el-button>
<el-button size="small" text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oms:aftersaleItem:remove']" <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oms:aftersaleItem:remove']">删除</el-button>
>删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

4
src/views/oms/order/detail.vue
View File

@ -5,7 +5,7 @@
<template v-slot:header> <template v-slot:header>
<div class="clearfix"> <div class="clearfix">
<span style="font-size: 16px; font-weight: bold">订单进程</span> <span style="font-size: 16px; font-weight: bold">订单进程</span>
<el-button style="float: right" size="small" @click="$router.back()">返回</el-button> <el-button style="float: right" @click="$router.back()">返回</el-button>
</div> </div>
</template> </template>
<el-steps :active="active" align-center> <el-steps :active="active" align-center>
@ -18,7 +18,7 @@
<el-card class="mt10"> <el-card class="mt10">
<el-descriptions title="订单信息" :column="2" border label-class-name="my-label" contentClassName="my-content"> <el-descriptions title="订单信息" :column="2" border label-class-name="my-label" contentClassName="my-content">
<!-- <template slot="extra">--> <!-- <template slot="extra">-->
<!-- <el-button size="small" @click="$router.back()">返回</el-button>--> <!-- <el-button @click="$router.back()">返回</el-button>-->
<!-- </template>--> <!-- </template>-->
<el-descriptions-item label="订单编号">{{ orderDetail.orderSn }}</el-descriptions-item> <el-descriptions-item label="订单编号">{{ orderDetail.orderSn }}</el-descriptions-item>
<el-descriptions-item label="用户名称">{{ orderDetail.userName }}</el-descriptions-item> <el-descriptions-item label="用户名称">{{ orderDetail.userName }}</el-descriptions-item>

81
src/views/oms/order/index.vue
View File

@ -2,14 +2,7 @@
<div class="app-container" v-if="show"> <div class="app-container" v-if="show">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="订单类型" prop="orderType"> <el-form-item label="订单类型" prop="orderType">
<DictRadio <DictRadio v-model="queryParams.type" radioData="oms_order_type" :radioList="orderTypeMap" :show-all="'all'" @change="handleQuery">
v-model="queryParams.type"
radioData="oms_order_type"
:radioList="orderTypeMap"
size="small"
:show-all="'all'"
@change="handleQuery"
>
</DictRadio> </DictRadio>
</el-form-item> </el-form-item>
<el-form-item label="订单状态" prop="status"> <el-form-item label="订单状态" prop="status">
@ -18,7 +11,6 @@
:radioList="orderStatusMap" :radioList="orderStatusMap"
v-model="queryParams.status" v-model="queryParams.status"
radioData="oms_order_status" radioData="oms_order_status"
size="small"
:show-all="'all'" :show-all="'all'"
:filter="['11', '12', '13', '14']" :filter="['11', '12', '13', '14']"
@change="handleQuery" @change="handleQuery"
@ -30,7 +22,6 @@
v-model="queryParams.withdrawStatus" v-model="queryParams.withdrawStatus"
radioData="oms_withdraw_staus" radioData="oms_withdraw_staus"
:radioList="orderWithdrawMap" :radioList="orderWithdrawMap"
size="small"
:show-all="'all'" :show-all="'all'"
@change="handleQuery" @change="handleQuery"
> >
@ -42,23 +33,22 @@
v-model="queryParams.aftersaleStatus" v-model="queryParams.aftersaleStatus"
radioData="oms_aftersale_status" radioData="oms_aftersale_status"
:radioList="orderAftersaleMap" :radioList="orderAftersaleMap"
size="small"
:show-all="'all'" :show-all="'all'"
@change="handleQuery" @change="handleQuery"
> >
</DictRadio> </DictRadio>
</el-form-item> </el-form-item>
<el-form-item label="订单编号" prop="id"> <el-form-item label="订单编号" prop="id">
<el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单编号" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单编号" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="交易流水号" prop="orderSn"> <el-form-item label="交易流水号" prop="orderSn">
<el-input v-model.trim="queryParams.userPhone" placeholder="请输入交易流水号" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model.trim="queryParams.userPhone" placeholder="请输入交易流水号" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="会员手机号" prop="userPhone"> <el-form-item label="会员手机号" prop="userPhone">
<el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="省市区" prop="provinces"> <el-form-item label="省市区" prop="provinces">
<address-selector v-model="queryParams.provinces" size="small"></address-selector> <address-selector v-model="queryParams.provinces"></address-selector>
</el-form-item> </el-form-item>
<el-form-item label="下单时间" prop="Time"> <el-form-item label="下单时间" prop="Time">
<el-date-picker <el-date-picker
@ -66,7 +56,6 @@
type="datetimerange" type="datetimerange"
:picker-options="pickerOptions" :picker-options="pickerOptions"
range-separator="至" range-separator="至"
size="small"
format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期" start-placeholder="开始日期"
@ -78,8 +67,8 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -190,8 +179,8 @@
<template v-slot="scope"> <template v-slot="scope">
<div> <div>
<span>{{ scope.row.decrypt ? scope.row.receiverName : getHiddenName(scope.row.receiverName) }} {{ scope.row.receiverPhone }}</span> <span>{{ scope.row.decrypt ? scope.row.receiverName : getHiddenName(scope.row.receiverName) }} {{ scope.row.receiverPhone }}</span>
<el-button size="small" text type="primary" @click="handleWatch(scope.row)" style="margin-left: 10px">查看 </el-button> <el-button text type="primary" @click="handleWatch(scope.row)" style="margin-left: 10px">查看 </el-button>
<el-button size="small" text type="primary" @click="handleUpdate(scope.row)">修改 </el-button> <el-button text type="primary" @click="handleUpdate(scope.row)">修改 </el-button>
</div> </div>
<div> <div>
<span>{{ scope.row.receiverProvince }}{{ scope.row.receiverCity }}{{ scope.row.receiverDistrict }}</span> <span>{{ scope.row.receiverProvince }}{{ scope.row.receiverCity }}{{ scope.row.receiverDistrict }}</span>
@ -203,9 +192,7 @@
<template v-slot="scope"> <template v-slot="scope">
<div> <div>
<span v-if="scope.row.merchantNote" class="note-title" style="margin-right: 10px">平台备注</span> <span v-if="scope.row.merchantNote" class="note-title" style="margin-right: 10px">平台备注</span>
<el-button size="small" text type="primary" @click="handleSaveNote(scope.row)" <el-button text type="primary" @click="handleSaveNote(scope.row)">{{ scope.row.merchantNote ? '修改' : '添加平台备注' }} </el-button>
>{{ scope.row.merchantNote ? '修改' : '添加平台备注' }}
</el-button>
</div> </div>
<div v-if="scope.row.merchantNote">{{ scope.row.merchantNote }}</div> <div v-if="scope.row.merchantNote">{{ scope.row.merchantNote }}</div>
<div v-if="scope.row.note" class="note-title">买家备注</div> <div v-if="scope.row.note" class="note-title">买家备注</div>
@ -233,11 +220,11 @@
<div>实付： ￥{{ scope.row.payAmount }}</div> <div>实付： ￥{{ scope.row.payAmount }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="150" align="center" fixed="right"> <el-table-column label="操作" class-name="small-padding fixed-width" width="250" align="center" fixed="right">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="small" text type="primary" @click="goDetail(scope.row)" v-hasPermi="['oms:order:query']">详情 </el-button> <el-button text type="primary" @click="goDetail(scope.row)" v-hasPermi="['oms:order:query']">详情 </el-button>
<el-button size="small" text type="primary" @click="showLog(scope.row.id)" v-hasPermi="['oms:order:log']">记录 </el-button> <el-button text type="primary" @click="showLog(scope.row.id)" v-hasPermi="['oms:order:log']">记录 </el-button>
<el-button size="small" text type="primary" @click="handleDelivery(scope.row)">核销 </el-button> <el-button text type="primary" @click="handleDelivery(scope.row)">核销 </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -245,16 +232,22 @@
<!-- 核销对话框 --> <!-- 核销对话框 -->
<el-dialog :title="deliveryObj.title" v-model="deliveryObj.open" width="500px" append-to-body> <el-dialog :title="deliveryObj.title" v-model="deliveryObj.open" width="500px" append-to-body>
<el-form ref="deliveryForm" :model="deliveryObj.form" :rules="deliveryObj.rules" label-width="100px"> <el-form ref="deliveryForm" :model="deliveryObj.form" :rules="deliveryObj.rules" label-width="100px">
<!-- <el-form-item label="快递公司" prop="expressName">
<el-select v-model="deliveryObj.form.expressName" placeholder="请选择快递公司" clearable size="small" filterable>
&lt;!&ndash; <el-option v-for="(item, index) in experssList" :label="item.expressName" :value="item.expressCode"/>&ndash;&gt;
<el-option label="顺丰速运" value="1" />
<el-option label="申通快递" value="2" />
<el-option label="圆通快递" value="2" />
</el-select>
</el-form-item>-->
<el-form-item label="商家ID" prop="usedMerchantId"> <el-form-item label="商家ID" prop="usedMerchantId">
<el-input v-model="deliveryObj.form.usedMerchantId" placeholder="请输入待核销商家ID" controls-position="right" :min="0" /> <!-- <el-input v-model="deliveryObj.form.usedMerchantId" placeholder="请输入待核销商家ID" controls-position="right" :min="0" />-->
<el-select
v-model="deliveryObj.form.usedMerchantId"
class="min-w-244px"
clearable
filterable
reserve-keyword
placeholder="请选择待核销商家"
>
<el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
<template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
</el-select>
</el-form-item>
<el-form-item label="核销码" prop="codeValue">
<el-input v-model="deliveryObj.form.codeValue" disabled />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template v-slot:footer> <template v-slot:footer>
@ -273,8 +266,8 @@
</el-form> </el-form>
<template v-slot:footer> <template v-slot:footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button type="primary" size="small" @click="submitNoteForm()"> 确认修改 </el-button> <el-button type="primary" @click="submitNoteForm()"> 确认修改 </el-button>
<el-button size="small" @click="cancelNote">取 消</el-button> <el-button @click="cancelNote">取 消</el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
@ -312,8 +305,8 @@
</el-form> </el-form>
<template v-slot:footer> <template v-slot:footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button type="primary" size="small" @click="asyncOk"> 确认修改 </el-button> <el-button type="primary" @click="asyncOk"> 确认修改 </el-button>
<el-button size="small" @click="modifyReceiverInfo.open = false">取 消</el-button> <el-button @click="modifyReceiverInfo.open = false">取 消</el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
@ -334,6 +327,7 @@ import {
import AddressSelector from '@/views/components/AddressSelector/index.vue'; import AddressSelector from '@/views/components/AddressSelector/index.vue';
import dateUtil, { dateFormat } from '@/utils/DateUtil'; import dateUtil, { dateFormat } from '@/utils/DateUtil';
import { useUserStore } from '@/store/modules/user'; import { useUserStore } from '@/store/modules/user';
import { getTenantList } from '@/api/login.js';
export default { export default {
name: 'OmsOrder', name: 'OmsOrder',
@ -390,6 +384,7 @@ export default {
startTime: null, startTime: null,
endTime: null endTime: null
}, },
tenantList: [],
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
@ -656,6 +651,12 @@ export default {
handleDelivery(row) { handleDelivery(row) {
this.deliveryObj.form.codeValue = row.code; this.deliveryObj.form.codeValue = row.code;
this.deliveryObj.open = true; this.deliveryObj.open = true;
this.initTenantList();
},
async initTenantList() {
const { data } = await getTenantList(false);
const { voList = [] } = data;
this.tenantList = voList || [];
}, },
submitDelivery() { submitDelivery() {
if (!this.deliveryObj.form.codeValue) { if (!this.deliveryObj.form.codeValue) {

18
src/views/oms/orderDeliveryHistory/index.vue
View File

@ -2,23 +2,23 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="140px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="140px" size="default" class="ry_form">
<el-form-item label="订单id" prop="orderId"> <el-form-item label="订单id" prop="orderId">
<el-input v-model="queryParams.orderId" placeholder="请输入订单id" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.orderId" placeholder="请输入订单id" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="物流公司(配送方式)" prop="deliveryCompany"> <el-form-item label="物流公司(配送方式)" prop="deliveryCompany">
<el-input v-model="queryParams.deliveryCompany" placeholder="请输入物流公司(配送方式)" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.deliveryCompany" placeholder="请输入物流公司(配送方式)" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="物流单号" prop="deliverySn"> <el-form-item label="物流单号" prop="deliverySn">
<el-input v-model="queryParams.deliverySn" placeholder="请输入物流单号" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.deliverySn" placeholder="请输入物流单号" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" size="small" @click="handleAdd" v-hasPermi="['oms:orderDeliveryHistory:add']">新增</el-button> <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oms:orderDeliveryHistory:add']">新增</el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -29,10 +29,8 @@
<el-table-column label="物流单号" align="center" prop="deliverySn" /> <el-table-column label="物流单号" align="center" prop="deliverySn" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="small" text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oms:orderDeliveryHistory:edit']" <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oms:orderDeliveryHistory:edit']">修改</el-button>
>修改</el-button <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oms:orderDeliveryHistory:remove']"
>
<el-button size="small" text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oms:orderDeliveryHistory:remove']"
>删除</el-button >删除</el-button
> >
</template> </template>

47
src/views/oms/orderItem/index.vue
View File

@ -2,61 +2,58 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="130px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="130px" size="default" class="ry_form">
<el-form-item label="订单id" prop="orderId"> <el-form-item label="订单id" prop="orderId">
<el-input v-model="queryParams.orderId" placeholder="请输入订单id" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.orderId" placeholder="请输入订单id" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="PRODUCT_ID" prop="productId"> <el-form-item label="PRODUCT_ID" prop="productId">
<el-input v-model="queryParams.productId" placeholder="请输入PRODUCT_ID" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productId" placeholder="请输入PRODUCT_ID" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="商品编码" prop="outProductId"> <el-form-item label="商品编码" prop="outProductId">
<el-input v-model="queryParams.outProductId" placeholder="请输入商品编码" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.outProductId" placeholder="请输入商品编码" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="商品sku id" prop="skuId"> <el-form-item label="商品sku id" prop="skuId">
<el-input v-model="queryParams.skuId" placeholder="请输入商品sku id" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.skuId" placeholder="请输入商品sku id" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="sku编码" prop="outSkuId"> <el-form-item label="sku编码" prop="outSkuId">
<el-input v-model="queryParams.outSkuId" placeholder="请输入sku编码" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.outSkuId" placeholder="请输入sku编码" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="商品快照id" prop="productSnapshotId"> <el-form-item label="商品快照id" prop="productSnapshotId">
<el-input v-model="queryParams.productSnapshotId" placeholder="请输入商品快照id" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productSnapshotId" placeholder="请输入商品快照id" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="sku快照id" prop="skuSnapshotId"> <el-form-item label="sku快照id" prop="skuSnapshotId">
<el-input v-model="queryParams.skuSnapshotId" placeholder="请输入sku快照id" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.skuSnapshotId" placeholder="请输入sku快照id" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<template v-if="showMoreCondition"> <template v-if="showMoreCondition">
<el-form-item label="展示图片" prop="pic"> <el-form-item label="展示图片" prop="pic">
<el-input v-model="queryParams.pic" placeholder="请输入展示图片" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.pic" placeholder="请输入展示图片" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="PRODUCT_NAME" prop="productName"> <el-form-item label="PRODUCT_NAME" prop="productName">
<el-input v-model="queryParams.productName" placeholder="请输入PRODUCT_NAME" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productName" placeholder="请输入PRODUCT_NAME" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="销售价格" prop="salePrice"> <el-form-item label="销售价格" prop="salePrice">
<el-input v-model="queryParams.salePrice" placeholder="请输入销售价格" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.salePrice" placeholder="请输入销售价格" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="采购价" prop="purchasePrice"> <el-form-item label="采购价" prop="purchasePrice">
<el-input v-model="queryParams.purchasePrice" placeholder="请输入采购价" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.purchasePrice" placeholder="请输入采购价" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="购买数量" prop="quantity"> <el-form-item label="购买数量" prop="quantity">
<el-input v-model="queryParams.quantity" placeholder="请输入购买数量" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.quantity" placeholder="请输入购买数量" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="商品分类id" prop="productCategoryId"> <el-form-item label="商品分类id" prop="productCategoryId">
<el-input v-model="queryParams.productCategoryId" placeholder="请输入商品分类id" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productCategoryId" placeholder="请输入商品分类id" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
</template> </template>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
<el-button <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" @click="showMoreCondition = !showMoreCondition">{{
:icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" showMoreCondition ? '收起条件' : '展开条件'
size="small" }}</el-button>
@click="showMoreCondition = !showMoreCondition"
>{{ showMoreCondition ? '收起条件' : '展开条件' }}</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" size="small" @click="handleAdd" v-hasPermi="['oms:orderItem:add']">新增</el-button> <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oms:orderItem:add']">新增</el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -77,10 +74,10 @@
<el-table-column label="商品分类id" align="center" prop="productCategoryId" /> <el-table-column label="商品分类id" align="center" prop="productCategoryId" />
<!-- <el-table-column label="商品sku属性:[{"key":"颜色","value":"颜色"},{"key":"容量","value":"4G"}]" align="center" prop="spData" />--> <!-- <el-table-column label="商品sku属性:[{"key":"颜色","value":"颜色"},{"key":"容量","value":"4G"}]" align="center" prop="spData" />-->
<el-table-column label="商品sku属性:" align="center" prop="spData" /> <el-table-column label="商品sku属性:" align="center" prop="spData" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" width="200" fixed="right" align="center" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="small" text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oms:orderItem:edit']">修改</el-button> <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oms:orderItem:edit']">修改</el-button>
<el-button size="small" text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oms:orderItem:remove']">删除</el-button> <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oms:orderItem:remove']">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

12
src/views/oms/orderOperateHistory/index.vue
View File

@ -2,14 +2,14 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="订单号" prop="orderId"> <el-form-item label="订单号" prop="orderId">
<el-input v-model="queryParams.orderSn" placeholder="请输入订单号" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.orderSn" placeholder="请输入订单号" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="订单状态" prop="status"> <el-form-item label="订单状态" prop="status">
<DictRadio v-model="queryParams.status" radioData="oms_order_status" size="small" :show-all="'all'"></DictRadio> <DictRadio v-model="queryParams.status" radioData="oms_order_status" :show-all="'all'"></DictRadio>
</el-form-item> </el-form-item>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -32,13 +32,13 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<!-- <el-button--> <!-- <el-button-->
<!-- size="small"--> <!-- -->
<!-- text type="primary"--> <!-- text type="primary"-->
<!-- icon="Edit"--> <!-- icon="Edit"-->
<!-- @click="handleUpdate(scope.row)"--> <!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['oms:orderOperateHistory:edit']"--> <!-- v-hasPermi="['oms:orderOperateHistory:edit']"-->
<!-- >修改</el-button>--> <!-- >修改</el-button>-->
<el-button size="small" text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oms:orderOperateHistory:remove']" <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oms:orderOperateHistory:remove']"
>删除</el-button >删除</el-button
> >
</template> </template>

47
src/views/oms/wechatPaymentHistory/index.vue
View File

@ -2,62 +2,53 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="payment_id" prop="paymentId"> <el-form-item label="payment_id" prop="paymentId">
<el-input v-model="queryParams.paymentId" placeholder="请输入payment_id" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.paymentId" placeholder="请输入payment_id" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="用户 ID" prop="memberId"> <el-form-item label="用户 ID" prop="memberId">
<el-input v-model="queryParams.memberId" placeholder="请输入用户 ID" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.memberId" placeholder="请输入用户 ID" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="OPENID" prop="openid"> <el-form-item label="OPENID" prop="openid">
<el-input v-model="queryParams.openid" placeholder="请输入OPENID" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.openid" placeholder="请输入OPENID" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="真实姓名，提现需要" prop="realName"> <el-form-item label="真实姓名，提现需要" prop="realName">
<el-input v-model="queryParams.realName" placeholder="请输入真实姓名，提现需要" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.realName" placeholder="请输入真实姓名，提现需要" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="标题|商品名称" prop="title"> <el-form-item label="标题|商品名称" prop="title">
<el-input v-model="queryParams.title" placeholder="请输入标题|商品名称" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.title" placeholder="请输入标题|商品名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="订单号 支付时是payId 其他为orderId" prop="orderId"> <el-form-item label="订单号 支付时是payId 其他为orderId" prop="orderId">
<el-input <el-input v-model="queryParams.orderId" placeholder="请输入订单号 支付时是payId 其他为orderId" clearable @keyup.enter="handleQuery" />
v-model="queryParams.orderId"
placeholder="请输入订单号 支付时是payId 其他为orderId"
clearable
size="small"
@keyup.enter="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="金额，单位分" prop="money"> <el-form-item label="金额，单位分" prop="money">
<el-input v-model="queryParams.money" placeholder="请输入金额，单位分" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.money" placeholder="请输入金额，单位分" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<template v-if="showMoreCondition"> <template v-if="showMoreCondition">
<el-form-item label="交易类型" prop="opType"> <el-form-item label="交易类型" prop="opType">
<el-select v-model="queryParams.opType" placeholder="请选择交易类型" clearable size="small"> <el-select v-model="queryParams.opType" placeholder="请选择交易类型" clearable>
<el-option label="请选择字典生成" value="" /> <el-option label="请选择字典生成" value="" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="paymentStatus"> <el-form-item label="状态" prop="paymentStatus">
<el-select v-model="queryParams.paymentStatus" placeholder="请选择状态" clearable size="small"> <el-select v-model="queryParams.paymentStatus" placeholder="请选择状态" clearable>
<el-option label="请选择字典生成" value="" /> <el-option label="请选择字典生成" value="" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="附加数据" prop="attach"> <el-form-item label="附加数据" prop="attach">
<el-input v-model="queryParams.attach" placeholder="请输入附加数据" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.attach" placeholder="请输入附加数据" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
</template> </template>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
<el-button <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" @click="showMoreCondition = !showMoreCondition">{{
:icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" showMoreCondition ? '收起条件' : '展开条件'
size="small" }}</el-button>
@click="showMoreCondition = !showMoreCondition"
>{{ showMoreCondition ? '收起条件' : '展开条件' }}</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" size="small" @click="handleAdd" v-hasPermi="['pms:wechatPaymentHistory:add']">新增</el-button> <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['pms:wechatPaymentHistory:add']">新增</el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -77,10 +68,8 @@
<el-table-column label="响应内容" align="center" prop="responseBody" /> <el-table-column label="响应内容" align="center" prop="responseBody" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="small" text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['pms:wechatPaymentHistory:edit']" <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['pms:wechatPaymentHistory:edit']">修改</el-button>
>修改</el-button <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['pms:wechatPaymentHistory:remove']"
>
<el-button size="small" text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['pms:wechatPaymentHistory:remove']"
>删除</el-button >删除</el-button
> >
</template> </template>

16
src/views/pms/brand/index.vue
View File

@ -2,20 +2,20 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="状态" prop="showStatus"> <el-form-item label="状态" prop="showStatus">
<DictRadio v-model="queryParams.showStatus" @change="handleQuery" size="small" radioData="sys_normal_disable" :showAll="'all'" /> <DictRadio v-model="queryParams.showStatus" @change="handleQuery" radioData="sys_normal_disable" :showAll="'all'" />
</el-form-item> </el-form-item>
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="queryParams.nameLike" placeholder="名称" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.nameLike" placeholder="名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" size="small" @click="handleAdd">新增</el-button> <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -35,8 +35,8 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width"> <el-table-column label="操作" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="small" text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button> <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button>
<el-button size="small" text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button> <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -47,7 +47,7 @@
<el-dialog :title="title" v-model="open" width="50%" append-to-body> <el-dialog :title="title" v-model="open" width="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-one"> <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-one">
<el-form-item label="状态"> <el-form-item label="状态">
<DictRadio v-model="form.showStatus" size="small" radioData="sys_normal_disable" /> <DictRadio v-model="form.showStatus" radioData="sys_normal_disable" />
</el-form-item> </el-form-item>
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="form.name" placeholder="名称" /> <el-input v-model="form.name" placeholder="名称" />

2
src/views/pms/product/AddProduct.vue
View File

@ -56,7 +56,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="上架状态"> <el-form-item label="上架状态">
<DictRadio v-model="form.publishStatus" size="small" radioData="pms_publish_status" /> <DictRadio v-model="form.publishStatus" radioData="pms_publish_status" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

40
src/views/pms/product/index.vue
View File

@ -3,29 +3,29 @@
<div v-show="show"> <div v-show="show">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="上架状态" prop="publishStatus"> <el-form-item label="上架状态" prop="publishStatus">
<DictRadio v-model="queryParams.publishStatus" @change="handleQuery" size="small" radioData="pms_publish_status" :showAll="'all'" /> <DictRadio v-model="queryParams.publishStatus" @change="handleQuery" radioData="pms_publish_status" :showAll="'all'" />
</el-form-item> </el-form-item>
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="queryParams.nameLike" placeholder="请输入商品名称" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.nameLike" placeholder="请输入商品名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="品牌" prop="brandName"> <el-form-item label="品牌" prop="brandName">
<el-input v-model="queryParams.brandNameLike" placeholder="请输入品牌名称" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.brandNameLike" placeholder="请输入品牌名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="分类" prop="productCategoryName"> <el-form-item label="分类" prop="productCategoryName">
<el-input v-model="queryParams.productCategoryNameLike" placeholder="请输入分类名称" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productCategoryNameLike" placeholder="请输入分类名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="编码" prop="outProductId"> <el-form-item label="编码" prop="outProductId">
<el-input v-model="queryParams.outProductId" placeholder="请输入商品编码" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.outProductId" placeholder="请输入商品编码" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" size="small" @click="handleAdd">新增</el-button> <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -107,11 +107,11 @@
</el-table-column>--> </el-table-column>-->
<el-table-column label="操作" class-name="small-padding fixed-width" width="150" align="center" fixed="right"> <el-table-column label="操作" class-name="small-padding fixed-width" width="150" align="center" fixed="right">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="small" text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button> <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button>
<el-button size="small" text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button> <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
</template> </template>
<!-- <template v-slot="scope"> <!-- <template v-slot="scope">
<el-button size="small" text type="primary" @click="showProductEditModal(scope.row)">编辑</el-button> <el-button text type="primary" @click="showProductEditModal(scope.row)">编辑</el-button>
</template>--> </template>-->
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -121,16 +121,16 @@
<el-dialog title="编辑商品详情" v-model="productModalInfo.open" width="600px" append-to-body> <el-dialog title="编辑商品详情" v-model="productModalInfo.open" width="600px" append-to-body>
<el-form label-width="auto" :rules="productEditRules" :model="productModalInfo.data" ref="editForm" size="default"> <el-form label-width="auto" :rules="productEditRules" :model="productModalInfo.data" ref="editForm" size="default">
<el-form-item label="昵称" prop="nickname"> <el-form-item label="昵称" prop="nickname">
<el-input v-model.trim="productModalInfo.data.nickname" placeholder="请输入会员昵称" size="small" /> <el-input v-model.trim="productModalInfo.data.nickname" placeholder="请输入会员昵称" />
</el-form-item> </el-form-item>
<el-form-item label="密码" prop="password"> <el-form-item label="密码" prop="password">
<el-input v-model.trim="productModalInfo.data.password" placeholder="请输入会员密码" size="small" /> <el-input v-model.trim="productModalInfo.data.password" placeholder="请输入会员密码" />
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="phone"> <el-form-item label="手机号" prop="phone">
<el-input v-model.trim="productModalInfo.data.phone" placeholder="请输入会员手机号" size="small" /> <el-input v-model.trim="productModalInfo.data.phone" placeholder="请输入会员手机号" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="mark"> <el-form-item label="备注" prop="mark">
<el-input v-model.trim="productModalInfo.data.mark" placeholder="请输入备注" size="small" /> <el-input v-model.trim="productModalInfo.data.mark" placeholder="请输入备注" />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-switch <el-switch
@ -144,22 +144,22 @@
</el-form-item> </el-form-item>
<el-form-item label="头像" prop="avatar"> <el-form-item label="头像" prop="avatar">
<!-- 暂时先用输入框组件，后续OSS上传功能好了迁移到上传upload组件--> <!-- 暂时先用输入框组件，后续OSS上传功能好了迁移到上传upload组件-->
<el-input v-model.trim="productModalInfo.data.avatar" placeholder="请输入头像" size="small" /> <el-input v-model.trim="productModalInfo.data.avatar" placeholder="请输入头像" />
</el-form-item> </el-form-item>
<el-form-item label="性别" prop="gender"> <el-form-item label="性别" prop="gender">
<DictRadio v-model="productModalInfo.data.gender" radioData="sys_user_sex" size="small" :show-all="'all'" /> <DictRadio v-model="productModalInfo.data.gender" radioData="sys_user_sex" :show-all="'all'" />
</el-form-item> </el-form-item>
<el-form-item label="地址" prop="address"> <el-form-item label="地址" prop="address">
<AddressSelector v-model="productModalInfo.data.fullArea" style="width: 100%" /> <AddressSelector v-model="productModalInfo.data.fullArea" style="width: 100%" />
</el-form-item> </el-form-item>
<el-form-item label="生日" prop="birthday"> <el-form-item label="生日" prop="birthday">
<el-input v-model.trim="productModalInfo.data.birthday" placeholder="请选择生日" size="small" /> <el-input v-model.trim="productModalInfo.data.birthday" placeholder="请选择生日" />
</el-form-item> </el-form-item>
<el-form-item label="用户等级" prop="level"> <el-form-item label="用户等级" prop="level">
<el-input v-model.trim="productModalInfo.data.level" placeholder="请输入用户等级" size="small" /> <el-input v-model.trim="productModalInfo.data.level" placeholder="请输入用户等级" />
</el-form-item> </el-form-item>
<el-form-item label="剩余积分" prop="integral"> <el-form-item label="剩余积分" prop="integral">
<el-input v-model.trim="productModalInfo.data.integral" placeholder="请输入剩余积分" size="small" /> <el-input v-model.trim="productModalInfo.data.integral" placeholder="请输入剩余积分" />
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-col :span="12"> </el-col> <el-col :span="12"> </el-col>

4
src/views/pms/product/productSelect.vue
View File

@ -2,13 +2,13 @@
<el-dialog :title="chooseSkuObj.title" v-model="chooseSkuObj.open" :width="chooseSkuObj.width" append-to-body> <el-dialog :title="chooseSkuObj.title" v-model="chooseSkuObj.open" :width="chooseSkuObj.width" append-to-body>
<el-form ref="auditForm" inline :model="chooseSkuObj.queryParams" label-width="80px"> <el-form ref="auditForm" inline :model="chooseSkuObj.queryParams" label-width="80px">
<el-form-item label="菜品名称" prop="nameLike"> <el-form-item label="菜品名称" prop="nameLike">
<el-input size="small" placeholder="请输入菜品名称" v-model="chooseSkuObj.queryParams.nameLike" clearable /> <el-input placeholder="请输入菜品名称" v-model="chooseSkuObj.queryParams.nameLike" clearable />
</el-form-item> </el-form-item>
<el-form-item label="菜品分类" prop="productCategoryName"> <el-form-item label="菜品分类" prop="productCategoryName">
<product-category-select v-model="chooseSkuObj.queryParams.categoryId"></product-category-select> <product-category-select v-model="chooseSkuObj.queryParams.categoryId"></product-category-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" size="small" @click="getSkuList">搜索</el-button> <el-button type="primary" icon="Search" @click="getSkuList">搜索</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table

18
src/views/pms/productCategory/index.vue
View File

@ -2,21 +2,21 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="状态" prop="showStatus"> <el-form-item label="状态" prop="showStatus">
<DictRadio v-model="queryParams.showStatus" @change="handleQuery" size="small" radioData="sys_show_status" :showAll="'all'" /> <DictRadio v-model="queryParams.showStatus" @change="handleQuery" radioData="sys_show_status" :showAll="'all'" />
</el-form-item> </el-form-item>
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="queryParams.nameLike" placeholder="名称" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.nameLike" placeholder="名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" size="small" @click="handleAdd">新增 </el-button> <el-button type="primary" plain icon="Plus" @click="handleAdd">新增 </el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -42,8 +42,8 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width"> <el-table-column label="操作" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="small" text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button> <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button>
<el-button size="small" text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除 </el-button> <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除 </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -58,7 +58,7 @@
<oss-image-upload v-model="form.icon" :limit="1" /> <oss-image-upload v-model="form.icon" :limit="1" />
</el-form-item> </el-form-item>
<el-form-item label="状态"> <el-form-item label="状态">
<DictRadio v-model="form.showStatus" size="small" radioData="sys_show_status" /> <DictRadio v-model="form.showStatus" radioData="sys_show_status" />
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort"> <el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" placeholder="排序" /> <el-input v-model="form.sort" placeholder="排序" />
@ -146,7 +146,7 @@ export default {
listPmsProductCategory(query, pageReq).then((response) => { listPmsProductCategory(query, pageReq).then((response) => {
const { records, total } = response.data || {}; const { records, total } = response.data || {};
this.pmsProductCategoryList = records; this.pmsProductCategoryList = records;
this.total = total this.total = total;
this.loading = false; this.loading = false;
}); });
}, },

18
src/views/pms/sku/index.vue
View File

@ -2,26 +2,26 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="PRODUCT_ID" prop="productId"> <el-form-item label="PRODUCT_ID" prop="productId">
<el-input v-model="queryParams.productId" placeholder="请输入PRODUCT_ID" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productId" placeholder="请输入PRODUCT_ID" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="sku编码" prop="outSkuId"> <el-form-item label="sku编码" prop="outSkuId">
<el-input v-model="queryParams.outSkuId" placeholder="请输入sku编码" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.outSkuId" placeholder="请输入sku编码" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="PRICE" prop="price"> <el-form-item label="PRICE" prop="price">
<el-input v-model="queryParams.price" placeholder="请输入PRICE" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.price" placeholder="请输入PRICE" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="展示图片" prop="pic"> <el-form-item label="展示图片" prop="pic">
<el-input v-model="queryParams.pic" placeholder="请输入展示图片" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.pic" placeholder="请输入展示图片" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" size="small" @click="handleAdd" v-hasPermi="['pms:sku:add']">新增</el-button> <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['pms:sku:add']">新增</el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -34,8 +34,8 @@
<el-table-column label="商品销售属性，json格式" align="center" prop="spData" /> <el-table-column label="商品销售属性，json格式" align="center" prop="spData" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="small" text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['pms:sku:edit']">修改</el-button> <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['pms:sku:edit']">修改</el-button>
<el-button size="small" text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['pms:sku:remove']">删除</el-button> <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['pms:sku:remove']">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

38
src/views/system/tenant/index.vue
View File

@ -193,7 +193,20 @@
<el-input v-model="form.bankCard" placeholder="请输入银行卡号" /> <el-input v-model="form.bankCard" placeholder="请输入银行卡号" />
</el-form-item> </el-form-item>
<el-form-item label="邀请人" prop="inviteUserId"> <el-form-item label="邀请人" prop="inviteUserId">
<el-input v-model="form.inviteUserId" placeholder="请输入邀请人" /> <!-- <el-input v-model="form.inviteUserId" placeholder="请输入邀请人" />-->
<el-select
v-model="form.inviteUserId"
placeholder="请选择邀请人"
filterable
remote
reserve-keyword
:remote-method="getUserListByName"
:loading="userSelectLoading"
clearable
style="width: 100%"
>
<el-option v-for="item in userSelectOption" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
@ -222,6 +235,8 @@ import {
syncTenantDict, syncTenantDict,
getTenantBannelList getTenantBannelList
} from '@/api/system/tenant'; } from '@/api/system/tenant';
import { listUmsMember } from '@/api/ums/member';
import { selectTenantPackage } from '@/api/system/tenantPackage'; import { selectTenantPackage } from '@/api/system/tenantPackage';
import { useUserStore } from '@/store/modules/user'; import { useUserStore } from '@/store/modules/user';
import { TenantForm, TenantQuery, TenantVO, TenantModal } from '@/api/system/tenant/types'; import { TenantForm, TenantQuery, TenantVO, TenantModal } from '@/api/system/tenant/types';
@ -248,6 +263,9 @@ const bannedDataParams = ref({
size: 10 size: 10
}); });
const userSelectLoading = ref(false);
const userSelectOption = ref([]);
// 用户封禁记录 // 用户封禁记录
const tenantBannedInfo = ref<TenantModal>({ const tenantBannedInfo = ref<TenantModal>({
total: 0, total: 0,
@ -288,6 +306,7 @@ const initFormData: TenantForm = {
bankCard: '', bankCard: '',
inviteUserId: '' inviteUserId: ''
}; };
const data = reactive<PageData<TenantForm, TenantQuery>>({ const data = reactive<PageData<TenantForm, TenantQuery>>({
form: { ...initFormData }, form: { ...initFormData },
queryParams: { queryParams: {
@ -327,6 +346,23 @@ const getTenantPackage = async () => {
packageList.value = res.data; packageList.value = res.data;
}; };
// 查询人员列表
const getUserListByName = (params: string) => {
if (params) {
userSelectLoading.value = true;
const query = { current: 1, size: 200, nickname: params };
const pageReq = { current: 1, size: 200 };
listUmsMember(query, pageReq).then((response) => {
const { records = [] } = response.data || {};
userSelectOption.value = records || [];
userSelectLoading.value = false;
});
} else {
userSelectOption.value = [];
userSelectLoading.value = false;
}
};
/** 查询租户列表 */ /** 查询租户列表 */
const getList = async () => { const getList = async () => {
loading.value = true; loading.value = true;

2
src/views/system/user/profile/thirdParty.vue
View File

@ -12,7 +12,7 @@
<el-table-column label="绑定时间" width="180" align="center" prop="createTime" /> <el-table-column label="绑定时间" width="180" align="center" prop="createTime" />
<el-table-column label="操作" width="80" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" width="80" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-button size="small" text type="primary" @click="unlockAuth(scope.row)">解绑</el-button> <el-button text type="primary" @click="unlockAuth(scope.row)">解绑</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

5
src/views/ums/feedback/index.vue
View File

@ -3,7 +3,6 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker <el-date-picker
size="small"
v-model="dateRange" v-model="dateRange"
style="width: 240px" style="width: 240px"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -16,13 +15,13 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="处理状态"> <el-form-item label="处理状态">
<el-select v-model="queryParams.status" clearable size="small"> <el-select v-model="queryParams.status" clearable>
<el-option value="0" label="未处理" /> <el-option value="0" label="未处理" />
<el-option value="1" label="已处理" /> <el-option value="1" label="已处理" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>

39
src/views/ums/member/index.vue
View File

@ -4,7 +4,6 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker <el-date-picker
size="small"
v-model="dateRange" v-model="dateRange"
style="width: 240px" style="width: 240px"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -17,24 +16,24 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="会员ID" prop="id"> <el-form-item label="会员ID" prop="id">
<el-input v-model.trim="queryParams.id" placeholder="请输入会员id" clearable size="small" /> <el-input v-model.trim="queryParams.id" placeholder="请输入会员id" clearable />
</el-form-item> </el-form-item>
<el-form-item label="昵称" prop="nickname"> <el-form-item label="昵称" prop="nickname">
<el-input v-model.trim="queryParams.nickname" placeholder="请输入昵称" clearable size="small" /> <el-input v-model.trim="queryParams.nickname" placeholder="请输入昵称" clearable />
</el-form-item> </el-form-item>
<el-form-item label="手机号码" prop="phone"> <el-form-item label="手机号码" prop="phone">
<el-input v-model.trim="queryParams.phone" placeholder="请输入手机号码" clearable size="small" /> <el-input v-model.trim="queryParams.phone" placeholder="请输入手机号码" clearable />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="mark"> <el-form-item label="备注" prop="mark">
<el-select v-model="queryParams.hasMark" clearable size="small"> <el-select v-model="queryParams.hasMark" clearable>
<el-option value="1" label="有备注" /> <el-option value="1" label="有备注" />
<el-option value="0" label="无备注" /> <el-option value="0" label="无备注" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
<!-- <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="small" @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>--> <!-- <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>-->
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -122,9 +121,9 @@
<el-button size="small" text type="primary" @click="handleUserDelete(scope.row)">删除 </el-button> <el-button size="small" text type="primary" @click="handleUserDelete(scope.row)">删除 </el-button>
<el-button size="small" text type="primary" @click="goWithdrawInfoPage(scope.row)">提现记录 </el-button> <el-button size="small" text type="primary" @click="goWithdrawInfoPage(scope.row)">提现记录 </el-button>
<el-button size="small" text type="primary" @click="showChargeInfoModal(scope.row, true)">充值记录 </el-button> <el-button size="small" text type="primary" @click="showChargeInfoModal(scope.row, true)">充值记录 </el-button>
<!-- <el-button size="small" text type="primary" @click="showStatistics(scope.row.id)" v-hasPermi="['ums:member:statistics']">查看数据 </el-button> <!-- <el-button text type="primary" @click="showStatistics(scope.row.id)" v-hasPermi="['ums:member:statistics']">查看数据 </el-button>
<el-button size="small" text type="primary" @click="goOrder(scope.row.phoneEncrypted)">查看下单</el-button> <el-button text type="primary" @click="goOrder(scope.row.phoneEncrypted)">查看下单</el-button>
<el-button size="small" text type="primary" @click="goCart(scope.row.phoneEncrypted)">查看购物车</el-button>--> <el-button text type="primary" @click="goCart(scope.row.phoneEncrypted)">查看购物车</el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -423,16 +422,16 @@
<el-dialog title="编辑会员信息" v-model="userAccountEditModal.open" width="500px" append-to-body> <el-dialog title="编辑会员信息" v-model="userAccountEditModal.open" width="500px" append-to-body>
<el-form label-width="auto" :rules="userEditRules" :model="userAccountEditModal.data" ref="editForm" size="default"> <el-form label-width="auto" :rules="userEditRules" :model="userAccountEditModal.data" ref="editForm" size="default">
<el-form-item label="昵称" prop="nickname"> <el-form-item label="昵称" prop="nickname">
<el-input v-model.trim="userAccountEditModal.data.nickname" placeholder="请输入会员昵称" size="small" /> <el-input v-model.trim="userAccountEditModal.data.nickname" placeholder="请输入会员昵称" />
</el-form-item> </el-form-item>
<el-form-item label="密码" prop="password"> <el-form-item label="密码" prop="password">
<el-input v-model.trim="userAccountEditModal.data.password" placeholder="请输入会员密码" size="small" /> <el-input v-model.trim="userAccountEditModal.data.password" placeholder="请输入会员密码" />
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="phone"> <el-form-item label="手机号" prop="phone">
<el-input v-model.trim="userAccountEditModal.data.phone" placeholder="请输入会员手机号" size="small" /> <el-input v-model.trim="userAccountEditModal.data.phone" placeholder="请输入会员手机号" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="mark"> <el-form-item label="备注" prop="mark">
<el-input v-model.trim="userAccountEditModal.data.mark" placeholder="请输入备注" size="small" /> <el-input v-model.trim="userAccountEditModal.data.mark" placeholder="请输入备注" />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-switch <el-switch
@ -446,22 +445,22 @@
</el-form-item> </el-form-item>
<el-form-item label="头像" prop="avatar"> <el-form-item label="头像" prop="avatar">
<!-- 暂时先用输入框组件，后续OSS上传功能好了迁移到上传upload组件--> <!-- 暂时先用输入框组件，后续OSS上传功能好了迁移到上传upload组件-->
<el-input v-model.trim="userAccountEditModal.data.avatar" placeholder="请输入头像" size="small" /> <el-input v-model.trim="userAccountEditModal.data.avatar" placeholder="请输入头像" />
</el-form-item> </el-form-item>
<el-form-item label="性别" prop="gender"> <el-form-item label="性别" prop="gender">
<DictRadio v-model="userAccountEditModal.data.gender" radioData="sys_user_sex" size="small" :show-all="'all'" /> <DictRadio v-model="userAccountEditModal.data.gender" radioData="sys_user_sex" :show-all="'all'" />
</el-form-item> </el-form-item>
<el-form-item label="地址" prop="address"> <el-form-item label="地址" prop="address">
<AddressSelector v-model="userAccountEditModal.data.fullArea" style="width: 100%" /> <AddressSelector v-model="userAccountEditModal.data.fullArea" style="width: 100%" />
</el-form-item> </el-form-item>
<el-form-item label="生日" prop="birthday"> <el-form-item label="生日" prop="birthday">
<el-input v-model.trim="userAccountEditModal.data.birthday" placeholder="请选择生日" size="small" /> <el-input v-model.trim="userAccountEditModal.data.birthday" placeholder="请选择生日" />
</el-form-item> </el-form-item>
<el-form-item label="用户等级" prop="level"> <el-form-item label="用户等级" prop="level">
<el-input v-model.trim="userAccountEditModal.data.level" placeholder="请输入用户等级" size="small" /> <el-input v-model.trim="userAccountEditModal.data.level" placeholder="请输入用户等级" />
</el-form-item> </el-form-item>
<el-form-item label="剩余积分" prop="integral"> <el-form-item label="剩余积分" prop="integral">
<el-input v-model.trim="userAccountEditModal.data.integral" placeholder="请输入剩余积分" size="small" /> <el-input v-model.trim="userAccountEditModal.data.integral" placeholder="请输入剩余积分" />
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-col :span="12"> </el-col> <el-col :span="12"> </el-col>

8
src/views/ums/member/withdraw.vue
View File

@ -45,7 +45,7 @@
<el-table-column label="审核时间" prop="auditTime" width="100" /> <el-table-column label="审核时间" prop="auditTime" width="100" />
<el-table-column label="操作" fixed="right" width="80"> <el-table-column label="操作" fixed="right" width="80">
<template v-slot="scope"> <template v-slot="scope">
<el-button v-if="scope.row.auditStatus == '0'" size="small" text type="primary" @click="showAuditModal(scope.row)">审批</el-button> <el-button v-if="scope.row.auditStatus == '0'" text type="primary" @click="showAuditModal(scope.row)">审批</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -66,7 +66,7 @@
<el-row> <el-row>
<el-col :span="4">审核结果</el-col> <el-col :span="4">审核结果</el-col>
<el-col :span="20"> <el-col :span="20">
<el-select v-model="auditStatus" size="small"> <el-select v-model="auditStatus">
<el-option v-show="item.value != '0'" v-for="item in userWithdrawAuditMap" :value="item.value" :label="item.label" /> <el-option v-show="item.value != '0'" v-for="item in userWithdrawAuditMap" :value="item.value" :label="item.label" />
</el-select> </el-select>
</el-col> </el-col>
@ -80,8 +80,8 @@
<el-row class="mt6"> <el-row class="mt6">
<el-col :span="12"></el-col> <el-col :span="12"></el-col>
<el-col :span="12"> <el-col :span="12">
<el-button type="default" size="small" @click="resetAuditForm">取消</el-button> <el-button type="default" @click="resetAuditForm">取消</el-button>
<el-button type="primary" size="small" @click="confirmSubmitAudit">确认</el-button> <el-button type="primary" @click="confirmSubmitAudit">确认</el-button>
</el-col> </el-col>
</el-row> </el-row>
</el-dialog> </el-dialog>

33
src/views/ums/memberAddress/index.vue
View File

@ -2,37 +2,34 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="收货人姓名" prop="name"> <el-form-item label="收货人姓名" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入收货人姓名" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.name" placeholder="请输入收货人姓名" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="phone"> <el-form-item label="手机号" prop="phone">
<el-input v-model="queryParams.phone" placeholder="请输入手机号" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.phone" placeholder="请输入手机号" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="邮政编码" prop="postCode"> <el-form-item label="邮政编码" prop="postCode">
<el-input v-model="queryParams.postCode" placeholder="请输入邮政编码" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.postCode" placeholder="请输入邮政编码" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="省份/直辖市" prop="province"> <el-form-item label="省份/直辖市" prop="province">
<el-input v-model="queryParams.province" placeholder="请输入省份/直辖市" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.province" placeholder="请输入省份/直辖市" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="城市" prop="city"> <el-form-item label="城市" prop="city">
<el-input v-model="queryParams.city" placeholder="请输入城市" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.city" placeholder="请输入城市" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<template v-if="showMoreCondition"> <template v-if="showMoreCondition">
<el-form-item label="区" prop="district"> <el-form-item label="区" prop="district">
<el-input v-model="queryParams.district" placeholder="请输入区" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.district" placeholder="请输入区" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="详细地址" prop="detailAddress"> <el-form-item label="详细地址" prop="detailAddress">
<el-input v-model="queryParams.detailAddress" placeholder="请输入详细地址" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.detailAddress" placeholder="请输入详细地址" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
</template> </template>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
<el-button <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" @click="showMoreCondition = !showMoreCondition">{{
:icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" showMoreCondition ? '收起条件' : '展开条件'
size="small" }}</el-button>
@click="showMoreCondition = !showMoreCondition"
>{{ showMoreCondition ? '收起条件' : '展开条件' }}</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -42,7 +39,7 @@
<!-- type="primary"--> <!-- type="primary"-->
<!-- plain--> <!-- plain-->
<!-- icon="Plus"--> <!-- icon="Plus"-->
<!-- size="small"--> <!-- -->
<!-- @click="handleAdd"--> <!-- @click="handleAdd"-->
<!-- v-hasPermi="['ums:memberAddress:add']"--> <!-- v-hasPermi="['ums:memberAddress:add']"-->
<!-- >新增</el-button>--> <!-- >新增</el-button>-->
@ -70,14 +67,14 @@
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">--> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-button--> <!-- <el-button-->
<!-- size="small"--> <!-- -->
<!-- text type="primary"--> <!-- text type="primary"-->
<!-- icon="Edit"--> <!-- icon="Edit"-->
<!-- @click="handleUpdate(scope.row)"--> <!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['ums:memberAddress:edit']"--> <!-- v-hasPermi="['ums:memberAddress:edit']"-->
<!-- >修改</el-button>--> <!-- >修改</el-button>-->
<!-- <el-button--> <!-- <el-button-->
<!-- size="small"--> <!-- -->
<!-- text type="primary"--> <!-- text type="primary"-->
<!-- icon="Delete"--> <!-- icon="Delete"-->
<!-- @click="handleDelete(scope.row)"--> <!-- @click="handleDelete(scope.row)"-->

12
src/views/ums/memberCart/index.vue
View File

@ -2,14 +2,14 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="用户手机号" prop="phone"> <el-form-item label="用户手机号" prop="phone">
<el-input v-model="queryParams.phone" placeholder="用户手机号" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.phone" placeholder="用户手机号" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="商品名称" prop="productName"> <el-form-item label="商品名称" prop="productName">
<el-input v-model="queryParams.productName" placeholder="商品名称" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productName" placeholder="商品名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -68,14 +68,14 @@
<!-- <el-table-column label="操作" class-name="small-padding fixed-width">--> <!-- <el-table-column label="操作" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-button--> <!-- <el-button-->
<!-- size="small"--> <!-- -->
<!-- text type="primary"--> <!-- text type="primary"-->
<!-- icon="Edit"--> <!-- icon="Edit"-->
<!-- @click="handleUpdate(scope.row)"--> <!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['ums:memberCart:edit']"--> <!-- v-hasPermi="['ums:memberCart:edit']"-->
<!-- >修改</el-button>--> <!-- >修改</el-button>-->
<!-- <el-button--> <!-- <el-button-->
<!-- size="small"--> <!-- -->
<!-- text type="primary"--> <!-- text type="primary"-->
<!-- icon="Delete"--> <!-- icon="Delete"-->
<!-- @click="handleDelete(scope.row)"--> <!-- @click="handleDelete(scope.row)"-->

18
src/views/ums/memberLogininfor/index.vue
View File

@ -2,19 +2,19 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
<el-form-item label="会员手机号" prop="phone"> <el-form-item label="会员手机号" prop="phone">
<el-input v-model="queryParams.phone" placeholder="请输入会员手机号" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.phone" placeholder="请输入会员手机号" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="登录IP地址" prop="ipaddr"> <el-form-item label="登录IP地址" prop="ipaddr">
<el-input v-model="queryParams.ipaddr" placeholder="请输入登录IP地址" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.ipaddr" placeholder="请输入登录IP地址" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="登录地点" prop="loginLocation"> <el-form-item label="登录地点" prop="loginLocation">
<el-input v-model="queryParams.loginLocation" placeholder="请输入登录地点" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.loginLocation" placeholder="请输入登录地点" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="浏览器类型" prop="browser"> <el-form-item label="浏览器类型" prop="browser">
<el-input v-model="queryParams.browser" placeholder="请输入浏览器类型" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.browser" placeholder="请输入浏览器类型" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="操作系统" prop="os"> <el-form-item label="操作系统" prop="os">
<el-input v-model="queryParams.os" placeholder="请输入操作系统" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.os" placeholder="请输入操作系统" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="登录时间"> <el-form-item label="登录时间">
<el-date-picker <el-date-picker
@ -30,8 +30,8 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -50,9 +50,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width"> <el-table-column label="操作" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="small" text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['ums:memberLogininfor:remove']" <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['ums:memberLogininfor:remove']">删除 </el-button>
>删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

57
src/views/ums/memberWechat/index.vue
View File

@ -2,63 +2,53 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="140px" size="default" class="ry_form"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="140px" size="default" class="ry_form">
<el-form-item label="MEMBER_ID" prop="memberId"> <el-form-item label="MEMBER_ID" prop="memberId">
<el-input v-model="queryParams.memberId" placeholder="请输入MEMBER_ID" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.memberId" placeholder="请输入MEMBER_ID" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="unionid" prop="unionid"> <el-form-item label="unionid" prop="unionid">
<el-input v-model="queryParams.unionid" placeholder="请输入unionid" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.unionid" placeholder="请输入unionid" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="openid" prop="openid"> <el-form-item label="openid" prop="openid">
<el-input v-model="queryParams.openid" placeholder="请输入openid" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.openid" placeholder="请输入openid" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="小程序唯一ID" prop="routineOpenid"> <el-form-item label="小程序唯一ID" prop="routineOpenid">
<el-input v-model="queryParams.routineOpenid" placeholder="请输入小程序唯一身份ID" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.routineOpenid" placeholder="请输入小程序唯一身份ID" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="用户分组ID" prop="groupid"> <el-form-item label="用户分组ID" prop="groupid">
<el-input v-model="queryParams.groupid" placeholder="请输入用户所在的分组ID" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.groupid" placeholder="请输入用户所在的分组ID" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="用户标签ID" prop="tagidList"> <el-form-item label="用户标签ID" prop="tagidList">
<el-input v-model="queryParams.tagidList" placeholder="请输入用户被打上的标签ID列表" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.tagidList" placeholder="请输入用户被打上的标签ID列表" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="用户是否关注" prop="subscribe"> <el-form-item label="用户是否关注" prop="subscribe">
<el-input v-model="queryParams.subscribe" placeholder="请输入用户是否订阅该公众号" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.subscribe" placeholder="请输入用户是否订阅该公众号" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<template v-if="showMoreCondition"> <template v-if="showMoreCondition">
<el-form-item label="用户订阅公众号时间" prop="subscribeTime"> <el-form-item label="用户订阅公众号时间" prop="subscribeTime">
<el-input v-model="queryParams.subscribeTime" placeholder="请输入关注公众号时间" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.subscribeTime" placeholder="请输入关注公众号时间" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="小程序用户会话密匙" prop="sessionKey"> <el-form-item label="小程序用户会话密匙" prop="sessionKey">
<el-input v-model="queryParams.sessionKey" placeholder="请输入小程序用户会话密匙" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.sessionKey" placeholder="请输入小程序用户会话密匙" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="过期时间" prop="expiresIn"> <el-form-item label="过期时间" prop="expiresIn">
<el-input v-model="queryParams.expiresIn" placeholder="请输入过期时间" clearable size="small" @keyup.enter="handleQuery" /> <el-input v-model="queryParams.expiresIn" placeholder="请输入过期时间" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="过期时间" prop="expireTime"> <el-form-item label="过期时间" prop="expireTime">
<el-date-picker <el-date-picker clearable v-model="queryParams.expireTime" type="datetime" value-format="yyyy-MM-ddTHH:mm:ss" placeholder="选择过期时间">
clearable
size="small"
v-model="queryParams.expireTime"
type="datetime"
value-format="yyyy-MM-ddTHH:mm:ss"
placeholder="选择过期时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</template> </template>
<el-form-item class="flex_one tr"> <el-form-item class="flex_one tr">
<el-button type="primary" icon="Search" size="small" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" size="small" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
<el-button <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" @click="showMoreCondition = !showMoreCondition">{{
:icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" showMoreCondition ? '收起条件' : '展开条件'
size="small" }}</el-button>
@click="showMoreCondition = !showMoreCondition"
>{{ showMoreCondition ? '收起条件' : '展开条件' }}</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" size="small" @click="handleAdd" v-hasPermi="['ums:memberWechat:add']">新增</el-button> <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['ums:memberWechat:add']">新增</el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -83,8 +73,8 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="small" text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['ums:memberWechat:edit']">修改</el-button> <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['ums:memberWechat:edit']">修改</el-button>
<el-button size="small" text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['ums:memberWechat:remove']">删除</el-button> <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['ums:memberWechat:remove']">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -131,14 +121,7 @@
<el-input v-model="form.refreshToken" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.refreshToken" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
<el-form-item label="过期时间" prop="expireTime"> <el-form-item label="过期时间" prop="expireTime">
<el-date-picker <el-date-picker clearable v-model="form.expireTime" type="datetime" value-format="yyyy-MM-ddTHH:mm:ss" placeholder="选择过期时间">
clearable
size="small"
v-model="form.expireTime"
type="datetime"
value-format="yyyy-MM-ddTHH:mm:ss"
placeholder="选择过期时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>

12
src/views/workflow/leave/index.vue
View File

@ -60,22 +60,18 @@
<template #default="scope"> <template #default="scope">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'"> <el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
<el-button v-hasPermi="['workflow:leave:edit']" size="small" type="primary" icon="Edit" @click="handleUpdate(scope.row)" <el-button v-hasPermi="['workflow:leave:edit']" type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
>修改</el-button
>
</el-col> </el-col>
<el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'"> <el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
<el-button v-hasPermi="['workflow:leave:remove']" size="small" type="primary" icon="Delete" @click="handleDelete(scope.row)" <el-button v-hasPermi="['workflow:leave:remove']" type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
>删除</el-button
>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button> <el-button type="primary" icon="View" @click="handleView(scope.row)">查看</el-button>
</el-col> </el-col>
<el-col :span="1.5" v-if="scope.row.status === 'waiting'"> <el-col :span="1.5" v-if="scope.row.status === 'waiting'">
<el-button size="small" type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.id)">撤销</el-button> <el-button type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.id)">撤销</el-button>
</el-col> </el-col>
</el-row> </el-row>
</template> </template>

12
src/views/workflow/processDefinition/index.vue
View File

@ -92,21 +92,19 @@
<template #default="scope"> <template #default="scope">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除流程</el-button> <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除流程</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button link type="primary" size="small" icon="CopyDocument" @click="handleCopyDef(scope.row)">复制流程</el-button> <el-button link type="primary" icon="CopyDocument" @click="handleCopyDef(scope.row)">复制流程</el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button link type="primary" v-if="scope.row.isPublish === 0" icon="Pointer" size="small" @click="design(scope.row)" <el-button link type="primary" v-if="scope.row.isPublish === 0" icon="Pointer" @click="design(scope.row)">流程设计</el-button>
>流程设计</el-button <el-button link type="primary" v-else icon="View" @click="designView(scope.row)">查看流程</el-button>
>
<el-button link type="primary" v-else icon="View" size="small" @click="designView(scope.row)">查看流程</el-button>
</el-col> </el-col>
<el-col v-if="scope.row.isPublish !== 1" :span="1.5"> <el-col v-if="scope.row.isPublish !== 1" :span="1.5">
<el-button link type="primary" size="small" icon="CircleCheck" @click="handlePublish(scope.row)">发布流程</el-button> <el-button link type="primary" icon="CircleCheck" @click="handlePublish(scope.row)">发布流程</el-button>
</el-col> </el-col>
</el-row> </el-row>
</template> </template>

12
src/views/workflow/processInstance/index.vue
View File

@ -101,24 +101,24 @@
<el-popover :ref="`popoverRef${scope.$index}`" trigger="click" placement="left" :width="300"> <el-popover :ref="`popoverRef${scope.$index}`" trigger="click" placement="left" :width="300">
<el-input v-model="deleteReason" resize="none" :rows="3" type="textarea" placeholder="请输入作废原因" /> <el-input v-model="deleteReason" resize="none" :rows="3" type="textarea" placeholder="请输入作废原因" />
<div style="text-align: right; margin: 5px 0px 0px 0px"> <div style="text-align: right; margin: 5px 0px 0px 0px">
<el-button size="small" text @click="cancelPopover(scope.$index)">取消</el-button> <el-button text @click="cancelPopover(scope.$index)">取消</el-button>
<el-button size="small" type="primary" @click="handleInvalid(scope.row)">确认</el-button> <el-button type="primary" @click="handleInvalid(scope.row)">确认</el-button>
</div> </div>
<template #reference> <template #reference>
<el-button type="danger" size="small" icon="CircleClose">作废</el-button> <el-button type="danger" icon="CircleClose">作废</el-button>
</template> </template>
</el-popover> </el-popover>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)">删除 </el-button> <el-button type="danger" icon="Delete" @click="handleDelete(scope.row)">删除 </el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button> <el-button type="primary" icon="View" @click="handleView(scope.row)">查看</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" size="small" icon="Document" @click="handleInstanceVariable(scope.row)"> 变量 </el-button> <el-button type="primary" icon="Document" @click="handleInstanceVariable(scope.row)"> 变量 </el-button>
</el-col> </el-col>
</el-row> </el-row>
</template> </template>

4
src/views/workflow/task/allTaskWaiting.vue
View File

@ -78,10 +78,10 @@
<template #default="scope"> <template #default="scope">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5" v-if="tab === 'waiting' || tab === 'finish'"> <el-col :span="1.5" v-if="tab === 'waiting' || tab === 'finish'">
<el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button> <el-button type="primary" icon="View" @click="handleView(scope.row)">查看</el-button>
</el-col> </el-col>
<el-col :span="1.5" v-if="tab === 'waiting'"> <el-col :span="1.5" v-if="tab === 'waiting'">
<el-button type="primary" size="small" icon="Setting" @click="handleMeddle(scope.row)">流程干预 </el-button> <el-button type="primary" icon="Setting" @click="handleMeddle(scope.row)">流程干预 </el-button>
</el-col> </el-col>
</el-row> </el-row>
</template> </template>

10
src/views/workflow/task/myDocument.vue
View File

@ -68,20 +68,18 @@
<template #default="scope"> <template #default="scope">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'cancel' || scope.row.flowStatus === 'back'"> <el-col :span="1.5" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'cancel' || scope.row.flowStatus === 'back'">
<el-button type="primary" size="small" icon="Edit" @click="handleOpen(scope.row, 'update')">编辑</el-button> <el-button type="primary" icon="Edit" @click="handleOpen(scope.row, 'update')">编辑</el-button>
</el-col> </el-col>
<el-col :span="1.5" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'cancel' || scope.row.flowStatus === 'back'"> <el-col :span="1.5" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'cancel' || scope.row.flowStatus === 'back'">
<el-button type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button> <el-button type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" size="small" icon="View" @click="handleOpen(scope.row, 'view')">查看</el-button> <el-button type="primary" icon="View" @click="handleOpen(scope.row, 'view')">查看</el-button>
</el-col> </el-col>
<el-col :span="1.5" v-if="scope.row.flowStatus === 'waiting'"> <el-col :span="1.5" v-if="scope.row.flowStatus === 'waiting'">
<el-button type="primary" size="small" icon="Notification" @click="handleCancelProcessApply(scope.row.businessId)" <el-button type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.businessId)">撤销</el-button>
>撤销</el-button
>
</el-col> </el-col>
</el-row> </el-row>
</template> </template>

2
src/views/workflow/task/taskCopyList.vue
View File

@ -45,7 +45,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="200"> <el-table-column label="操作" align="center" width="200">
<template #default="scope"> <template #default="scope">
<el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button> <el-button type="primary" icon="View" @click="handleView(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

2
src/views/workflow/task/taskFinish.vue
View File

@ -64,7 +64,7 @@
<el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column> <el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
<el-table-column label="操作" align="center" width="200"> <el-table-column label="操作" align="center" width="200">
<template #default="scope"> <template #default="scope">
<el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button> <el-button type="primary" icon="View" @click="handleView(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

2
src/views/workflow/task/taskWaiting.vue
View File

@ -61,7 +61,7 @@
<el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column> <el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
<el-table-column label="操作" align="center" width="200"> <el-table-column label="操作" align="center" width="200">
<template #default="scope"> <template #default="scope">
<el-button type="primary" size="small" icon="Edit" @click="handleOpen(scope.row)">办理</el-button> <el-button type="primary" icon="Edit" @click="handleOpen(scope.row)">办理</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>