cxc/yshop-pro-vue3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决代码冲突

Browse Source
This commit is contained in:
黄少君
2023-11-14 17:57:33 +08:00
parent 3b2609e9a6
commit 12742d345f
231 changed files with 180 additions and 143121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/mall/order/storeOrder/index.ts
View File

@ -98,11 +98,7 @@ export const exportStoreOrder = async (params) => {
}
export const getLogistic = async (param1,param2) => {
<<<<<<< HEAD
return await request.get({ url: `/order/express/getLogistic?shipperCode=` + param1 + `&logisticCode=` + param2})
=======
return await request.get({ url: `/order/express/getLogistic?shipperCode=` + param2 + `&logisticCode=` + param1})
>>>>>>> master
}
export const getOrderHtml = async (param1,param2) => {

28
src/api/mall/product/shippingTemplates/index.ts
View File

@ -1,10 +1,6 @@
import request from '@/config/axios'
<<<<<<< HEAD
export interface ShippingTemplatesVO {
=======
export interface DiscountCouponVO {
>>>>>>> master
id: number
name: string
type: boolean
@ -15,55 +11,31 @@ export interface DiscountCouponVO {
}
// 查询运费模板列表
<<<<<<< HEAD
export const getShippingTemplatesPage = async (params: ShippingTemplatesPageReqVO) => {
=======
export const getDiscountCouponPage = async (params: DiscountCouponPageReqVO) => {
>>>>>>> master
return await request.get({ url: `/product/shipping-templates/page`, params })
}
// 查询运费模板详情
<<<<<<< HEAD
export const getShippingTemplates = async (id: number) => {
=======
export const getDiscountCoupon = async (id: number) => {
>>>>>>> master
return await request.get({ url: `/product/shipping-templates/get?id=` + id })
}
// 新增运费模板
<<<<<<< HEAD
export const createShippingTemplates = async (data,id) => {
=======
export const createDiscountCoupon = async (data,id) => {
>>>>>>> master
return await request.post({ url: `/product/shipping-templates/create/`+ id, data })
}
// 修改运费模板
<<<<<<< HEAD
export const updateShippingTemplates = async (data: ShippingTemplatesVO) => {
=======
export const updateDiscountCoupon = async (data: DiscountCouponVO) => {
>>>>>>> master
return await request.put({ url: `/product/shipping-templates/update`, data })
}
// 删除运费模板
<<<<<<< HEAD
export const deleteShippingTemplates = async (id: number) => {
=======
export const deleteDiscountCoupon = async (id: number) => {
>>>>>>> master
return await request.delete({ url: `/product/shipping-templates/delete?id=` + id })
}
// 导出运费模板 Excel
<<<<<<< HEAD
export const exportShippingTemplates = async (params) => {
=======
export const exportDiscountCoupon = async (params) => {
>>>>>>> master
return await request.download({ url: `/product/shipping-templates/export-excel`, params })
}

3
src/api/mall/product/storeProductReply/index.ts
View File

@ -45,11 +45,8 @@ export const deleteStoreProductReply = async (id: number) => {
export const exportStoreProductReply = async (params) => {
return await request.download({ url: `/product/store-product-reply/export-excel`, params })
}
<<<<<<< HEAD
=======
// 回复评价
export const replyEvaluation = async (data) => {
return await request.post({ url: `/product/store-product-reply/merchantReply`, data })
}
>>>>>>> master

4
src/api/tools/material.js
View File

@ -9,10 +9,6 @@ import request from '@/config/axios'
export async function getPage(query) {
return await request.get({
url: '/shop/material/page',
<<<<<<< HEAD
=======
>>>>>>> master
params: query
})
}

36
src/components/Materials/src/Materials.vue
View File

@ -46,11 +46,7 @@
@click="toSeleteMaterial">
<Icon icon="ep:plus" />
</div>
<<<<<<< HEAD
=======
<el-image-viewer v-if="imgViewerVisible" @close="closeImgViewer" :url-list="value" />
>>>>>>> master
<el-dialog title="图片素材库" append-to-body v-model="listDialogVisible" width="70%">
<el-container>
<el-aside width="100px">
@ -136,11 +132,7 @@
:z-index="9999"
/>
<div>
<<<<<<< HEAD
<el-checkbox class="material-name" :label="item.url"> 选择 </el-checkbox>
=======
<el-checkbox class="material-name" :label="item"> 选择 </el-checkbox>
>>>>>>> master
<el-row>
<el-col :span="24" class="col-do">
<el-button type="text" size="medium" @click="materialDel(item)"
@ -229,11 +221,7 @@ const headers = ref({
Authorization: 'Bearer ' + getAccessToken(),
})
//const value = ref(props.value)
<<<<<<< HEAD
const dialogVisible = ref(false)
=======
const imgViewerVisible = ref(false)
>>>>>>> master
const url = ref('')
const listDialogVisible = ref(false)
const listDialogVisible2 = ref(false)
@ -263,11 +251,7 @@ const value = computed({
return props.modelValue
}
return [props.modelValue]
<<<<<<< HEAD
=======
>>>>>>> master
}
})
@ -288,11 +272,6 @@ function moveMaterial(index, type) {
}
}
function zoomMaterial(index) {
<<<<<<< HEAD
dialogVisible.value = true
url.value = value.value[index]
}
=======
imgViewerVisible.value = true
url.value = value.value[index]
}
@ -302,7 +281,6 @@ function closeImgViewer(){
imgViewerVisible.value = false
}
>>>>>>> master
function deleteMaterial(index) {
// 修改为新的提示
ElMessageBox.confirm('是否确认删除？', '提示', {
@ -409,13 +387,8 @@ function getMaterialPage(initPage) {
getPage(
Object.assign(
{
<<<<<<< HEAD
page: initPage.currentPage - 1,
size: initPage.pageSize,
=======
pageNo: initPage.currentPage,
pageSize: initPage.pageSize,
>>>>>>> master
descs: initPage.descs,
ascs: initPage.ascs,
sort: 'create_time,desc'
@ -503,11 +476,7 @@ function beforeUpload(file) {
const emit = defineEmits(['update:modelValue'])
function sureUrls() {
urls.value.forEach((item) => {
<<<<<<< HEAD
value.value[value.value.length] = item
=======
value.value[value.value.length] = item.url
>>>>>>> master
})
listDialogVisible.value = false
if (urls.value.length > 1 || props.num > 1) {
@ -515,13 +484,8 @@ function sureUrls() {
} else {
emit('update:modelValue', value.value[0])
}
<<<<<<< HEAD
=======
>>>>>>> master
}
</script>

5
src/locales/zh-CN.ts
View File

@ -446,14 +446,9 @@ export default {
preview: '预览'
},
shop: {
<<<<<<< HEAD
productRuleAdd: '请添加规格名称！',
productRuleAttrAdd: '请添加属性！',
=======
productRuleAdd: '请添加规格！',
productRuleValue: '请添加规格值！',
productRuleAttrAdd: '请添加属性！',
productRuleConfirm: '请先确认当前所设置的规格！',
>>>>>>> master
}
}

8
src/views/Login/components/LoginForm.vue
View File

@ -9,11 +9,7 @@
label-width="120px"
size="large"
>
<<<<<<< HEAD
<el-row style="maring-left: -10px; maring-right: -10px">>
=======
<el-row style="maring-left: -10px; maring-right: -10px">
>>>>>>> master
<el-col :span="24" style="padding-left: 10px; padding-right: 10px">
<el-form-item>
<LoginFormTitle style="width: 100%" />
@ -83,11 +79,7 @@
mode="pop"
@success="handleLogin"
/>
<<<<<<< HEAD
=======
>>>>>>> master
</el-row>
</el-form>
</template>

3
src/views/infra/apiAccessLog/index.vue
View File

@ -7,10 +7,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="用户编号" prop="userId">
<el-input

3
src/views/infra/apiErrorLog/index.vue
View File

@ -9,10 +9,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="用户编号" prop="userId">
<el-input

3
src/views/infra/codegen/index.vue
View File

@ -10,10 +10,7 @@
:model="queryParams"
class="-mb-15px"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="表名称" prop="tableName">
<el-input

3
src/views/infra/config/index.vue
View File

@ -9,10 +9,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="参数名称" prop="name">
<el-input

3
src/views/infra/file/index.vue
View File

@ -8,10 +8,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="文件路径" prop="path">
<el-input

3
src/views/infra/fileConfig/index.vue
View File

@ -9,10 +9,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="配置名" prop="name">
<el-input

3
src/views/infra/job/index.vue
View File

@ -11,10 +11,7 @@
ref="queryFormRef"
:inline="true"
label-width="100px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="任务名称" prop="name">
<el-input

3
src/views/infra/job/logger/index.vue
View File

@ -11,10 +11,7 @@
ref="queryFormRef"
:inline="true"
label-width="120px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="处理器的名字" prop="handlerName">
<el-input

10
src/views/mall/cart/storeCart/index.vue
View File

@ -7,30 +7,20 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="用户昵称" prop="nickname">
<el-input
v-model="queryParams.nickname"
<<<<<<< HEAD
placeholder="请输入用户用户昵称"
=======
placeholder="请输入用户昵称"
>>>>>>> master
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<<<<<<< HEAD
=======
<el-form-item style="margin-bottom: 0;display: none">
<el-input />
</el-form-item>
>>>>>>> master
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>

7
src/views/mall/member/user/index.vue
View File

@ -16,10 +16,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="用户昵称" prop="nickname">
<el-input
@ -196,11 +193,7 @@ const openForm = (type: string, id?: number) => {
} else if (type == 'yue') {
formRef2.value.open(type, id)
}
<<<<<<< HEAD
=======
>>>>>>> master
}

7
src/views/mall/member/userAddress/index.vue
View File

@ -7,10 +7,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="姓名" prop="realName">
<el-input
@ -47,15 +44,11 @@
<el-table-column label="收货人所在市" align="center" prop="city" />
<el-table-column label="收货人所在区" align="center" prop="district" />
<el-table-column label="收货人详细地址" align="center" prop="detail" />
<<<<<<< HEAD
<el-table-column label="是否默认" align="center" prop="isDefault" />
=======
<el-table-column label="是否默认" align="center">
<template #default="scope">
<span>{{scope.row.isDefault ? '是' : '否'}}</span>
</template>
</el-table-column>
>>>>>>> master
<el-table-column
label="添加时间"
align="center"

7
src/views/mall/order/electronicsOrder/ElectronicsOrderForm.vue
View File

@ -24,17 +24,10 @@
<el-form-item label="运费支付方式" prop="paytype">
<el-select v-model="formData.paytype" placeholder="选择运费支付方式" >
<el-option label="运费支付方式" value="" />
<<<<<<< HEAD
<el-option label="现付" value="1"/>
<el-option label="到付" value="2"/>
<el-option label="月结" value="3"/>
<el-option label="第三方付(仅SF支持)" value="4"/>
=======
<el-option label="现付" :value="1"/>
<el-option label="到付" :value="2"/>
<el-option label="月结" :value="3"/>
<el-option label="第三方付(仅SF支持)" :value="4"/>
>>>>>>> master
</el-select>
</el-form-item>
<el-form-item label="线下网点客户号" prop="customerName">

3
src/views/mall/order/electronicsOrder/index.vue
View File

@ -7,10 +7,7 @@
ref="queryFormRef"
:inline="true"
label-width="75px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="面单名称" prop="title">
<el-input

3
src/views/mall/order/express/index.vue
View File

@ -7,10 +7,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="公司编码" prop="code">
<el-input

28
src/views/mall/order/storeAfterSales/OrderDetail.vue
View File

@ -3,11 +3,7 @@
<div>
<el-descriptions title="订单信息" :column="2">
<el-descriptions-item label="订单号">{{ DetailData.orderCode }}</el-descriptions-item>
<<<<<<< HEAD
<el-descriptions-item label="服务类型">
=======
<el-descriptions-item label="服务类型">
>>>>>>> master
<span v-if="DetailData.serviceType==0">仅退款</span>
<span v-if="DetailData.serviceType==1">退货退款 </span>
</el-descriptions-item>
@ -25,15 +21,10 @@
<el-descriptions-item label="退款金额">{{ DetailData.refundAmount }}</el-descriptions-item>
<el-descriptions-item label="申请原因">{{ DetailData.reasons }}</el-descriptions-item>
<el-descriptions-item label="说明">{{ DetailData.explains }}</el-descriptions-item>
<<<<<<< HEAD
<el-descriptions-item label="说明图片">
<el-image style="width: 100px; height: 100px" :src="DetailData.explainImg" />
=======
<el-descriptions-item label="说明图片" v-if="DetailData.explainImg">
<div class="img-list">
<el-image style="width: 100px; height: 100px" v-for="(item,index) in DetailData.explainImgList" :key="index" :src="item" />
</div>
>>>>>>> master
</el-descriptions-item>
<el-descriptions-item label="创建时间">{{ formatDate(DetailData.createTime)}}</el-descriptions-item>
</el-descriptions>
@ -44,10 +35,6 @@
</el-descriptions>
<el-descriptions title="用户退货物流信息" :column="2">
<el-descriptions-item label="快递公司">{{ DetailData.deliveryName }}</el-descriptions-item>
<<<<<<< HEAD
<el-descriptions-item label="快递单号">{{ DetailData.deliverySn }} <el-button type="primary">物流追踪</el-button></el-descriptions-item>
</el-descriptions>
=======
<el-descriptions-item label="快递单号">{{ DetailData.deliverySn }} <el-button type="primary" @click="getLogistic(DetailData.deliverySn,DetailData.shipperCode)">物流追踪</el-button></el-descriptions-item>
</el-descriptions>
<div class="logisticResult" v-for="(item, index) of logisticResult" :key="index">
@ -56,7 +43,6 @@
<p>{{item.acceptTime}}</p>
</div>
>>>>>>> master
<!-- <el-button @click="innerDrawer = true">Click me!</el-button>
<el-drawer
v-model="innerDrawer"
@ -72,30 +58,21 @@
<script setup lang="ts">
import * as StoreAfterSalesApi from '@/api/mall/order/storeAfterSales'
import { formatDate } from '@/utils/formatTime'
<<<<<<< HEAD
=======
import * as StoreOrderApi from "@/api/mall/order/storeOrder";
>>>>>>> master
const { t } = useI18n() // 国际化
// const message = useMessage() // 消息弹窗
const dialogTitle = ref('') // 弹窗的标题
const drawer = ref(false)
<<<<<<< HEAD
const DetailData = ref({})
=======
const DetailData = ref({
explainImgList: []
})
const logisticResult = ref({})
>>>>>>> master
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
drawer.value = true
dialogTitle.value = t('action.' + type)
DetailData.value = await StoreAfterSalesApi.getStoreAfterSales(id)
<<<<<<< HEAD
=======
DetailData.value.explainImgList = DetailData.value.explainImg.split(',')
}
@ -106,18 +83,13 @@ const getLogistic = async(deliverySn,deliveryId) => {
}
logisticResult.value = res.traces
console.log(logisticResult.value, 'logisticResult')
>>>>>>> master
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
</script>
<style scoped>
<<<<<<< HEAD
</style>
=======
.logisticResult {
p {
font-size: 12px;
}
}
</style>
>>>>>>> master

65
src/views/mall/order/storeAfterSales/index.vue
View File

@ -12,10 +12,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="订单号" prop="orderCode">
<el-input
@ -40,11 +37,7 @@
<el-table-column label="订单号" align="center" prop="orderCode" width="190" />
<el-table-column label="用户id｜昵称" align="center" width="120" >
<template #default="scope">
<<<<<<< HEAD
<span>{{ scope.row.uid }}|{{ scope.row.userRespVO.nickname }}</span>
=======
<span>{{ scope.row.userId }}|{{ scope.row.userRespVO?.nickname }}</span>
>>>>>>> master
</template>
</el-table-column>
<el-table-column label="商品信息" align="center" prop="userAddress" width="350">
@ -67,21 +60,6 @@
</el-table-column>
<el-table-column label="状态" align="center" prop="state" >
<template #default="scope">
<<<<<<< HEAD
<span v-if="scope.row.state==0">等待审核</span>
<span v-if="scope.row.state==1">已审核 </span>
<span v-if="scope.row.state==2">用户已发货</span>
<span v-if="scope.row.state==3">退款成功</span>
</template>
</el-table-column>
<el-table-column label="售后状态" align="center" prop="salesState">
<template #default="scope">
<span v-if="scope.row.salesState==0">正常</span>
<span v-if="scope.row.salesState==1">用户取消 </span>
<span v-if="scope.row.salesState==2">商家拒绝</span>
</template>
</el-table-column>
=======
<span v-if="scope.row.state==0">等待审核</span>
<span v-if="scope.row.state==1">已审核 </span>
<span v-if="scope.row.state==2">用户已发货</span>
@ -97,7 +75,6 @@
<!-- <span v-if="scope.row.salesState==2">商家拒绝</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
>>>>>>> master
<el-table-column
label="添加时间"
align="center"
@ -112,23 +89,9 @@
type="danger"
@click="openForm('update', scope.row.id)"
v-hasPermi="['order:store-after-sales:update']"
<<<<<<< HEAD
>
审核
</el-button>
<el-button
v-if="scope.row.serviceType == 1 && scope.row.state == 2"
link
type="danger"
@click="handlePay(scope.row.id)"
v-hasPermi="['order:store-after-sales:update']"
>
同意退款
=======
v-if="scope.row.state==0 || scope.row.state == 2"
>
{{scope.row.state==0?'审核':'收货审核'}}
>>>>>>> master
</el-button>
<el-button
link
@ -161,10 +124,6 @@ import * as StoreAfterSalesApi from '@/api/mall/order/storeAfterSales'
import StoreAfterSalesForm from './StoreAfterSalesForm.vue'
import OrderDetail from './OrderDetail.vue'
import type { TabsPaneContext } from 'element-plus'
<<<<<<< HEAD
// const message = useMessage() // 消息弹窗
=======
>>>>>>> master
// const { t } = useI18n() // 国际化
const loading = ref(true) // 列表的加载中
@ -189,11 +148,7 @@ const getList = async () => {
element.storeOrderCartInfoDOList.forEach((e, n) => {
data.list[index].storeOrderCartInfoDOList[n].cartInfo = eval('(' + e.cartInfo + ')')
})
<<<<<<< HEAD
=======
>>>>>>> master
});
list.value = data.list
total.value = data.total
@ -215,22 +170,6 @@ const handleClick = (tab: TabsPaneContext, event: Event) => {
getList()
}
<<<<<<< HEAD
/** 确认付款按钮操作 */
const handlePay = async (id: number) => {
try {
// 删除的二次确认
await message.confirm('确认已收到货立即退款')
// 发起删除
await StoreAfterSalesApi.payStoreAfterSales(id)
message.success(t('common.updateSuccess'))
// 刷新列表
await getList()
} catch {}
}
=======
>>>>>>> master
/** 重置按钮操作 */
@ -248,11 +187,7 @@ const openForm = (type: string, id?: number) => {
} else {
formRef.value.open(type, id)
}
<<<<<<< HEAD
=======
>>>>>>> master
}

12
src/views/mall/order/storeOrder/OrderDetail.vue
View File

@ -11,11 +11,7 @@
<el-descriptions-item label="订单号">{{ DetailData.orderId }}</el-descriptions-item>
<el-descriptions-item label="订单状态">{{ DetailData.statusStr }}</el-descriptions-item>
<el-descriptions-item label="商品总数">{{ DetailData.totalNum }}</el-descriptions-item>
<<<<<<< HEAD
<el-descriptions-item label="商品总价">{{ DetailData.totalPrice }}</el-descriptions-item>
=======
<el-descriptions-item label="商品总价">{{ DetailData.cost }}</el-descriptions-item>
>>>>>>> master
<el-descriptions-item label="支付邮费">{{ DetailData.payPostage }}</el-descriptions-item>
<el-descriptions-item label="优惠券金额">{{ DetailData.couponPrice }}</el-descriptions-item>
<el-descriptions-item label="积分抵扣">{{ DetailData.useIntegral }}</el-descriptions-item>
@ -73,11 +69,7 @@ const open = async (type: string, id?: number) => {
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
const getLogistic = async(deliverySn,deliveryId) => {
<<<<<<< HEAD
const res = await StoreOrderApi.getLogistic(deliverySn, deliveryId)
=======
const res = await StoreOrderApi.getLogistic(deliverySn, deliveryId)
>>>>>>> master
if (res.success == "false") {
message.error(res.reason)
}
@ -85,8 +77,4 @@ const getLogistic = async(deliverySn,deliveryId) => {
}
</script>
<style scoped>
<<<<<<< HEAD
</style>
=======
</style>
>>>>>>> master

40
src/views/mall/order/storeOrder/OrderSend.vue
View File

@ -18,11 +18,7 @@
<el-radio label="face">电子面单</el-radio>
</el-radio-group>
</el-form-item>
<<<<<<< HEAD
<el-form-item label="快递公司" prop="deliverySn" v-show="isShow">
=======
<el-form-item label="快递公司" prop="deliverySn" v-if="isShow">
>>>>>>> master
<el-select v-model="formData.deliverySn" placeholder="选择快递公司" @change="selectExpress" >
<el-option label="选择快递公司" value="" />
<el-option
@ -33,17 +29,10 @@
/>
</el-select>
</el-form-item>
<<<<<<< HEAD
<el-form-item label="快递单号" prop="deliveryId" v-show="isShow">
<el-input v-model="formData.deliveryId" placeholder="请输入快递单号" class="input-width" />
</el-form-item>
<el-form-item label="电子面单模板" prop="deliverySn" v-show="!isShow">
=======
<el-form-item label="快递单号" prop="deliveryId" v-if="isShow">
<el-input v-model="formData.deliveryId" placeholder="请输入快递单号" class="input-width" />
</el-form-item>
<el-form-item label="电子面单模板" prop="electId" v-if="!isShow">
>>>>>>> master
<el-select v-model="electId" placeholder="选择子面单模板" @change="selectOrder">
<el-option label="选择子面单模板" :value="0" />
<el-option
@ -61,11 +50,7 @@
<span v-html="printHtml"></span>
</div>
<<<<<<< HEAD
=======
>>>>>>> master
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" v-show="isShow" :disabled="formLoading">确 定</el-button>
@ -117,11 +102,7 @@ const formData = ref({
refundReasonWap: undefined,
refundReason: undefined,
refundPrice: undefined,
<<<<<<< HEAD
deliverySn: undefined,
=======
deliverySn: '',
>>>>>>> master
deliveryName: undefined,
deliveryType: 'normal',
deliveryId: undefined,
@ -145,10 +126,7 @@ const formData = ref({
isSystemDel: undefined
})
const formRules = reactive({
<<<<<<< HEAD
=======
deliverySn: [{ required: true, message: '快递公司不能为空', trigger: 'change' }],
>>>>>>> master
deliveryId: [{ required: true, message: '快递单号不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
@ -185,17 +163,11 @@ const print = ref({
closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
clickMounted() { console.log('点击v-print绑定的按钮了！') }
})
<<<<<<< HEAD
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
=======
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
isShow.value = true
electId.value = 0
>>>>>>> master
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
@ -228,11 +200,7 @@ const submitForm = async () => {
data.updateType = formType.value
await StoreOrderApi.updateStoreOrder(data)
message.success(t('common.updateSuccess'))
<<<<<<< HEAD
=======
>>>>>>> master
dialogVisible.value = false
// 发送操作成功的事件
emit('success')
@ -296,11 +264,7 @@ const resetForm = () => {
refundReasonWap: undefined,
refundReason: undefined,
refundPrice: undefined,
<<<<<<< HEAD
deliverySn: undefined,
=======
deliverySn: '',
>>>>>>> master
deliveryName: undefined,
deliveryType: 'normal',
deliveryId: undefined,
@ -330,8 +294,4 @@ const resetForm = () => {
.input-width {
width: 50%;
}
<<<<<<< HEAD
</style>
=======
</style>
>>>>>>> master

27
src/views/mall/order/storeOrder/index.vue
View File

@ -33,10 +33,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="订单号" prop="orderId">
<el-input
@ -77,11 +74,7 @@
class="!w-240px"
/>
</el-form-item>
<<<<<<< HEAD
=======
>>>>>>> master
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@ -96,11 +89,7 @@
</el-button>
</el-form-item>
</el-form>
<<<<<<< HEAD
=======
>>>>>>> master
</ContentWrap>
<!-- 列表 -->
@ -110,11 +99,7 @@
<el-table-column label="订单号" align="center" prop="orderId" width="190" />
<el-table-column label="用户id｜昵称" align="center" width="120" >
<template #default="scope">
<<<<<<< HEAD
<span>{{ scope.row.uid }}|{{ scope.row.userRespVO.nickname }}</span>
=======
<span>{{ scope.row.uid }}|{{ scope.row.userRespVO?.nickname }}</span>
>>>>>>> master
</template>
</el-table-column>
<el-table-column label="用户姓名|电话" align="center" prop="realName" width="150">
@ -290,11 +275,7 @@ const getList = async () => {
element.storeOrderCartInfoDOList.forEach((e, n) => {
data.list[index].storeOrderCartInfoDOList[n].cartInfo = eval('(' + e.cartInfo + ')')
})
<<<<<<< HEAD
=======
>>>>>>> master
});
list.value = data.list
//console.log("aa:",list.value)
@ -340,11 +321,7 @@ const openForm = (type: string, id?: number) => {
formRef5.value.open(type, id)
}
<<<<<<< HEAD
=======
>>>>>>> master
}
/** 删除按钮操作 */
@ -445,8 +422,4 @@ onMounted(() => {
text-align: left;
}
<<<<<<< HEAD
</style>
=======
</style>
>>>>>>> master

7
src/views/mall/order/storeOrderElectronics/index.vue
View File

@ -7,10 +7,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="订单编号" prop="orderSn">
<el-input
@ -30,11 +27,7 @@
class="!w-240px"
/>
</el-form-item>
<<<<<<< HEAD
=======
>>>>>>> master
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>

3
src/views/mall/product/brand/index.vue
View File

@ -7,10 +7,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="品牌名称" prop="name">
<el-input

3
src/views/mall/product/category/index.vue
View File

@ -7,10 +7,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="分类名称" prop="name">
<el-input

4
src/views/mall/product/discountCoupon/DiscountCouponForm.vue
View File

@ -6,6 +6,7 @@
:rules="formRules"
label-width="130px"
v-loading="formLoading"
:disabled="visitDetail"
>
<el-row :gutter="24" type="flex">
<el-col :xl="18" :lg="18" :md="18" :sm="24" :xs="24">
@ -351,9 +352,10 @@ const initCouponForm = () => {
}
const formData = ref(initCouponForm())
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
const open = async (type: string, id?: number, disabled) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
visitDetail.value = disabled
idList.value = []
formType.value = type
formData.value = initCouponForm()

13
src/views/mall/product/discountCoupon/index.vue
View File

@ -43,7 +43,12 @@
<span v-else-if="scope.row.couponType == 2">折扣券</span>
</template>
</el-table-column>
<el-table-column label="优惠金额" align="center" prop="couponValue" />
<el-table-column label="优惠金额" align="center">
<template #default="scope">
<span v-if="scope.row.couponType == 1">满减{{scope.row.couponValue}}元</span>
<span v-else-if="scope.row.couponType == 2">打{{scope.row.discount}}折</span>
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
@ -55,10 +60,10 @@
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
@click="openForm('detail', scope.row.id)"
v-hasPermi="['product:discount-coupon:update']"
>
编辑
查看详情
</el-button>
<el-button
link
@ -129,7 +134,7 @@ const resetQuery = () => {
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
formRef.value.open(type, id, id ? true : false)
}
/** 删除按钮操作 */

3
src/views/mall/product/shippingTemplates/index.vue
View File

@ -7,10 +7,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="模板名称" prop="name">
<el-input

78
src/views/mall/product/storeProduct/StoreProductForm.vue
View File

@ -51,11 +51,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="商品简介" prop="store_info">
<<<<<<< HEAD
<el-input type="textarea" rows="5" v-model="formValidate.store_info" placeholder="请输入商品简介" />
=======
<el-input type="textarea" rows="5" maxlength="200" show-word-limit v-model="formValidate.store_info" placeholder="请输入商品简介" />
>>>>>>> master
</el-form-item>
</el-tab-pane>
<el-tab-pane label="商品规格" name="two">
@ -85,12 +81,8 @@
</div>
<div class="rulesBox">
<el-tag type="dot" closable color="primary" v-for="(j, indexn) in item.detail" :key="indexn" :name="j" class="mr20" @close="handleRemove2(item.detail,indexn)">{{j}}</el-tag>
<<<<<<< HEAD
<el-input placeholder="请输入属性名称" v-model="item.detail.attrsVal"
=======
<el-input placeholder="请输入属性名称"
v-model="item.detail.attrsVal"
>>>>>>> master
style="width: 150px">
<template #append>
<el-button type="primary" @click="createAttr(item.detail.attrsVal,index)">添加</el-button>
@ -129,13 +121,8 @@
<!-- 多规格表格-->
<el-col :span="24">
<el-form-item label="商品属性：" class="labeltop">
<<<<<<< HEAD
<el-table :data="manyFormValidate" size="small" style="width: 90%;">
<el-table-column type="myindex" v-for="(item,index) in formValidate.header" :key="index" :label="item.title" :property="item.slot" align="center">
=======
<el-table v-if="showTable" :data="manyFormValidate" size="small" style="width: 90%;">
<el-table-column type="myindex" v-for="(item) in formValidate.header" :key="item.key" :label="item.title" :property="item.slot" align="center">
>>>>>>> master
<template #default="scope">
<div v-if="scope.column.property == 'pic'" align="center">
<Materials v-model="scope.row[scope.column.property]" num="1" type="image" :width="60" :height="60" />
@ -211,22 +198,14 @@
</el-form-item>
</el-col>
</el-tab-pane>
<<<<<<< HEAD
<el-tab-pane label="商品详情" name="three">
=======
<el-tab-pane label="商品详情" name="three">
>>>>>>> master
<el-form-item label="产品描述">
<vue-ueditor-wrap v-model="formValidate.description" :config="myConfig" @before-init="addCustomDialog" style="width: 90%;" />
</el-form-item>
</el-tab-pane>
<el-tab-pane label="物流设置" name="four">
<el-form-item label="运费设置">
<<<<<<< HEAD
<el-radio-group v-model="postageSet">
=======
<el-radio-group v-model="postageSet" @change="postageSetChang">
>>>>>>> master
<el-radio :label="false">规定邮费</el-radio>
<el-radio :label="true">运费模板</el-radio>
</el-radio-group>
@ -235,12 +214,7 @@
<el-input class="input-width" v-model="formValidate.postage" placeholder="请输入邮费" />
</el-form-item>
<el-form-item label="运费模板" prop="temp_id" v-show="postageSet">
<<<<<<< HEAD
<el-select v-model="formValidate.temp_id" class="mr20">
<el-option :value="0" label="选择运费模板" />
=======
<el-select v-model="formValidate.temp_id" class="mr20" placeholder="请选择运费模板">
>>>>>>> master
<el-option v-for="(item,index) in templateList" :value="item.id" :key="index" :label="item.name"/>
</el-select>
</el-form-item>
@ -401,12 +375,8 @@ const formRules = reactive({
store_info: [{ required: true, message: '商品简介不能为空', trigger: 'blur' }],
keyword: [{ required: true, message: '关键字不能为空', trigger: 'blur' }],
cate_id: [{ required: true, message: '分类id不能为空', trigger: 'blur' }],
<<<<<<< HEAD
price: [{ required: true, message: '商品价格不能为空', trigger: 'blur' }]
=======
price: [{ required: true, message: '商品价格不能为空', trigger: 'blur' }],
// temp_id: [{ required: true, message: '运费模板不能为空', trigger: 'change' }]
>>>>>>> master
})
const ruleList = ref([])
const attrs = ref([])
@ -528,11 +498,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
const submitForm = async () => {
// 校验表单
<<<<<<< HEAD
if (!formRef) return
=======
if (!formRef) return
>>>>>>> master
// const valid = await formRef.value.validate()
formRef.value.validate((valid, fields) => {
if (valid) {
@ -556,14 +522,10 @@ const submitForm = async () => {
formValidate.value.attrs = manyFormValidate.value;
}
if(formValidate.value.spec_type === 1 && manyFormValidate.value.length===0){
<<<<<<< HEAD
message.warning('请点击生成规格！');
=======
return message.warning('请点击生成规格！');
}
if(postageSet.value && !formValidate.value.temp_id){
return message.warning('请选择运费模板！');
>>>>>>> master
}
await StoreProductApi.createStoreProduct(formValidate.value)
dialogVisible.value = false
@ -598,27 +560,6 @@ const upTab = () => {
}
const downTab = () => {
<<<<<<< HEAD
if (activeName.value == 'one') {
activeName.value = 'two'
return
}
if (activeName.value == 'two') {
activeName.value = 'three'
return
}
if (activeName.value == 'three') {
activeName.value = 'four'
return
}
if (activeName.value == 'four') {
activeName.value = 'five'
return
}
}
=======
formRef.value.validate().then(() => {
if (activeName.value == 'one') {
activeName.value = 'two'
@ -640,7 +581,6 @@ if (activeName.value == 'one') {
}
>>>>>>> master
/** 重置表单 */
const resetForm = () => {
@ -683,8 +623,6 @@ const resetForm = () => {
isIntegral: undefined,
integral: undefined
}
<<<<<<< HEAD
=======
formValidate.value = {
imageArr: [],
@ -728,7 +666,6 @@ const resetForm = () => {
selectRule: ''
}
attrs.value = []
>>>>>>> master
formRef.value?.resetFields()
}
@ -792,18 +729,12 @@ const getInfo = (id) => {
}
const route = useRoute()
<<<<<<< HEAD
// 立即生成
const generate = () => {
StoreProductApi.isFormatAttr(formValidate.value.id, { attrs: attrs.value }).then(res => {
=======
const showTable = ref(true)
// 立即生成
const generate = () => {
StoreProductApi.isFormatAttr(formValidate.value.id, { attrs: attrs.value }).then(res => {
showTable.value = false
console.log(res)
>>>>>>> master
manyFormValidate.value = res.value;
let headerdel = {
title: '操作',
@ -813,10 +744,7 @@ const generate = () => {
};
res.header.push(headerdel);
formValidate.value.header = res.header;
<<<<<<< HEAD
=======
console.log(formValidate.value)
>>>>>>> master
//this.formValidate.attrs = res.attr;
let header = res.header;
header.pop();
@ -826,10 +754,7 @@ const generate = () => {
});
oneFormBatch.value[0].pic = formValidate.value.image;
}
<<<<<<< HEAD
=======
showTable.value = true
>>>>>>> master
}).catch(res => {
console.log('err:'+res)
})
@ -953,8 +878,6 @@ const clearAttr = () => {
formDynamic.attrsVal = ''
}
<<<<<<< HEAD
=======
const postageSetChang = (val)=>{
console.log(val)
if(val){
@ -964,7 +887,6 @@ const postageSetChang = (val)=>{
}
}
>>>>>>> master
</script>

17
src/views/mall/product/storeProduct/index.vue
View File

@ -15,10 +15,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="商品名称" prop="storeName">
<el-input
@ -170,11 +167,7 @@ const tableTabs = ref([
title: '已售罄产品',
name: '3',
},
<<<<<<< HEAD
=======
>>>>>>> master
])
@ -204,16 +197,10 @@ const handleClick = (tab: TabsPaneContext, event: Event) => {
queryParams.stock = 1
getList()
}
<<<<<<< HEAD
if (tab.paneName == '2') {
queryParams.isShow = 0
=======
if (tab.paneName == '2') {
queryParams.isShow = 0
queryParams.stock = 1
>>>>>>> master
getList()
}
@ -286,11 +273,7 @@ const handleExport = async () => {
/** 初始化 **/
onMounted(() => {
<<<<<<< HEAD
=======
>>>>>>> master
getList()
})

3
src/views/mall/product/storeProductRelation/index.vue
View File

@ -7,10 +7,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="用户昵称" prop="nickname">
<el-input

25
src/views/mall/product/storeProductReply/index.vue
View File

@ -7,10 +7,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="用户昵称" prop="nickname">
<el-input
@ -32,10 +29,6 @@
<ContentWrap>
<el-table v-loading="loading" :data="list">
<el-table-column label="评论ID" align="center" prop="id" />
<<<<<<< HEAD
<el-table-column label="用户昵称" align="center" prop="nickname" />
<el-table-column label="用户头像" align="center" prop="avatar" />
=======
<el-table-column label="商品名称" align="center">
<template #default="scope">
<span>{{(JSON.parse(scope.row.cartInfo)).productInfo.storeName}}</span>
@ -47,7 +40,6 @@
<el-image :src="scope.row.avatar"/>
</template>
</el-table-column>
>>>>>>> master
<el-table-column label="商品分数" align="center" prop="productScore" />
<el-table-column label="服务分数" align="center" prop="serviceScore" />
<el-table-column label="评论内容" align="center" prop="comment" />
@ -69,11 +61,7 @@
<el-button
link
type="primary"
<<<<<<< HEAD
@click="openForm('update', scope.row.id)"
=======
@click="openForm(scope.row.id)"
>>>>>>> master
v-hasPermi="['product:store-product-reply:update']"
>
回复
@ -96,21 +84,13 @@
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<<<<<<< HEAD
</ContentWrap>
=======
<reply-form ref="formRef" @success="getList"/>
</ContentWrap>
>>>>>>> master
</template>
<script setup lang="ts" name="StoreProductReply">
import { dateFormatter } from '@/utils/formatTime'
<<<<<<< HEAD
=======
import ReplyForm from "./ReplyForm.vue";
>>>>>>> master
import * as StoreProductReplyApi from '@/api/mall/product/storeProductReply'
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
@ -151,13 +131,8 @@ const resetQuery = () => {
/** 添加/修改操作 */
const formRef = ref()
<<<<<<< HEAD
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
=======
const openForm = (id: number) => {
formRef.value.open(id)
>>>>>>> master
}
/** 删除按钮操作 */

41
src/views/mall/shop/storeProductRule/StoreProductRuleForm.vue
View File

@ -1,9 +1,5 @@
<template>
<<<<<<< HEAD
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1000px">
=======
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1000px" @close="handleClose">
>>>>>>> master
<el-form
ref="formRef"
:model="formData"
@ -32,11 +28,7 @@
{{ j }}
</el-tag>
<el-input placeholder="请输入属性名称" v-model="item.detail.attrsVal"
<<<<<<< HEAD
style="width: 170px">
=======
style="width: 240px">
>>>>>>> master
<template #append><el-button type="primary" @click="createAttr(item.detail.attrsVal,index)">添加</el-button></template>
</el-input>
</div>
@ -121,8 +113,6 @@ const submitForm = async () => {
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
<<<<<<< HEAD
=======
if (!isBtn.value && !formData.value.ruleValue.length) {
message.success(t('shop.productRuleAdd'))
return
@ -131,7 +121,6 @@ const submitForm = async () => {
message.success(t('shop.productRuleConfirm'))
return
}
>>>>>>> master
// 提交请求
formLoading.value = true
try {
@ -143,43 +132,28 @@ const submitForm = async () => {
await StoreProductRuleApi.createStoreProductRule(data,data.id)
message.success(t('common.updateSuccess'))
}
<<<<<<< HEAD
dialogVisible.value = false
=======
dialogVisible.value = false
formData.value.ruleValue = []
>>>>>>> master
// 发送操作成功的事件
emit('success')
} finally {
formLoading.value = false
}
}
<<<<<<< HEAD
=======
let arr = []
>>>>>>> master
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
ruleName: undefined,
<<<<<<< HEAD
ruleValue: undefined
}
formRef.value?.resetFields()
}
var arr = []
=======
ruleValue: []
}
formRef.value?.resetFields()
arr = []
}
>>>>>>> master
const handleRemove = (index) => {
formData.value.ruleValue.splice(index, 1);
arr.splice(index, 1);
@ -199,8 +173,6 @@ const createAttr = (num, idx) => {
message.success(t('shop.productRuleAttrAdd'))
}
}
<<<<<<< HEAD
=======
const handleClose = ()=>{
formData.value = {
@ -211,7 +183,6 @@ const handleClose = ()=>{
attrsName.value = ''
attrsVal.value = ''
}
>>>>>>> master
const addBtn = () => {
isBtn.value = true
}
@ -222,10 +193,6 @@ const createAttrName = () => {
value: attrsName.value,
detail: [attrsVal.value]
}
<<<<<<< HEAD
=======
>>>>>>> master
arr.push(data)
formData.value.ruleValue = arr
var hash = {}
@ -238,19 +205,11 @@ const createAttrName = () => {
attrsName.value = ''
attrsVal.value = ''
isBtn.value = false
<<<<<<< HEAD
} else {
message.success(t('shop.productRuleAdd'))
}
=======
} else {
message.success(t('shop.productRuleAdd'))
}
>>>>>>> master
}
const offAttrName = () => {
isBtn.value = false

3
src/views/mall/shop/storeProductRule/index.vue
View File

@ -7,10 +7,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="规格名称" prop="ruleName">
<el-input

3
src/views/message/wechatTemplate/index.vue
View File

@ -7,10 +7,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="模板名" prop="name">
<el-input

3
src/views/mp/account/index.vue
View File

@ -9,10 +9,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="名称" prop="name">
<el-input

3
src/views/mp/user/index.vue
View File

@ -9,10 +9,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="公众号" prop="accountId">
<WxAccountSelect @change="onAccountChanged" />

3
src/views/system/dict/data/index.vue
View File

@ -6,10 +6,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="字典名称" prop="dictType">
<el-select v-model="queryParams.dictType" class="!w-240px">

3
src/views/system/dict/index.vue
View File

@ -7,10 +7,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="字典名称" prop="name">
<el-input

3
src/views/system/errorCode/index.vue
View File

@ -9,10 +9,7 @@
ref="queryFormRef"
:inline="true"
label-width="90px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="错误码类型" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择错误码类型" clearable>

3
src/views/system/loginlog/index.vue
View File

@ -9,10 +9,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="用户名称" prop="username">
<el-input

3
src/views/system/menu/index.vue
View File

@ -7,10 +7,7 @@
:model="queryParams"
class="-mb-15px"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="菜单名称" prop="name">
<el-input

3
src/views/system/notice/index.vue
View File

@ -7,10 +7,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="公告标题" prop="title">
<el-input

3
src/views/system/notify/message/index.vue
View File

@ -9,10 +9,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="用户编号" prop="userId">
<el-input

3
src/views/system/notify/template/index.vue
View File

@ -9,10 +9,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="模板名称" prop="name">
<el-input

3
src/views/system/oauth2/client/index.vue
View File

@ -9,10 +9,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="应用名" prop="name">
<el-input

3
src/views/system/oauth2/token/index.vue
View File

@ -9,10 +9,7 @@
ref="queryFormRef"
:inline="true"
label-width="90px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="用户编号" prop="userId">
<el-input

3
src/views/system/operatelog/index.vue
View File

@ -9,10 +9,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="系统模块" prop="module">
<el-input

3
src/views/system/post/index.vue
View File

@ -7,10 +7,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="岗位名称" prop="name">
<el-input

3
src/views/system/role/index.vue
View File

@ -10,10 +10,7 @@
:model="queryParams"
class="-mb-15px"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="角色名称" prop="name">
<el-input

3
src/views/system/sensitiveWord/index.vue
View File

@ -7,10 +7,7 @@
:model="queryParams"
class="-mb-15px"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="敏感词" prop="name">
<el-input

3
src/views/system/sms/channel/index.vue
View File

@ -8,10 +8,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="短信签名" prop="signature">
<el-input

3
src/views/system/sms/log/index.vue
View File

@ -9,10 +9,7 @@
ref="queryFormRef"
:inline="true"
label-width="100px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="手机号" prop="mobile">
<el-input

3
src/views/system/sms/template/index.vue
View File

@ -9,10 +9,7 @@
ref="queryFormRef"
:inline="true"
label-width="150px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="短信类型" prop="type">
<el-select

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

@ -9,10 +9,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="租户名" prop="name">
<el-input

3
src/views/system/tenantPackage/index.vue
View File

@ -9,10 +9,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="套餐名" prop="name">
<el-input

3
src/views/system/user/index.vue
View File

@ -15,10 +15,7 @@
ref="queryFormRef"
:inline="true"
label-width="68px"
<<<<<<< HEAD
=======
@submit.enter.prevent
>>>>>>> master
>
<el-form-item label="用户名称" prop="username">
<el-input