git
/
fuyuan-housekeeping-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【师傅列表】 优化# 移除接单状态字段

dev1.0
kaeery 2025-01-22 19:03:51 +08:00
parent dec27219c9
commit 4d7b6c15a9
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/master_worker/edit.vue
View File

@ -67,7 +67,7 @@
<el-form-item label="详细地址:"> <el-form-item label="详细地址:">
<el-input class="ls-input" type="textarea" v-model="formData.address" placeholder="选填，请输入详细地址" :rows="6"></el-input> <el-input class="ls-input" type="textarea" v-model="formData.address" placeholder="选填，请输入详细地址" :rows="6"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="接单状态:" prop="isReceiveOrder"> <!-- <el-form-item label="接单状态:" prop="isReceiveOrder">
<el-switch <el-switch
v-model="formData.isReceiveOrder" v-model="formData.isReceiveOrder"
:active-text="!formData.isReceiveOrder ? '启用' : '停用'" :active-text="!formData.isReceiveOrder ? '启用' : '停用'"
@ -75,7 +75,7 @@
:inactive-value="1" :inactive-value="1"
disabled disabled
/> />
</el-form-item> </el-form-item> -->
<!-- <el-form-item label="运营师傅:"> <!-- <el-form-item label="运营师傅:">
<el-switch <el-switch
v-model="formData.isOperational" v-model="formData.isOperational"

4
src/views/master_worker/index.vue
View File

@ -117,7 +117,7 @@
</el-popover> </el-popover>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="接单状态" min-width="80"> <!-- <el-table-column label="接单状态" min-width="80">
<template #default="scope"> <template #default="scope">
<el-switch <el-switch
v-model="scope.row.isReceiveOrder" v-model="scope.row.isReceiveOrder"
@ -127,7 +127,7 @@
disabled disabled
/> />
</template> </template>
</el-table-column> </el-table-column> -->
<!-- <el-table-column label="运营师傅" min-width="80"> <!-- <el-table-column label="运营师傅" min-width="80">
<template #default="scope"> <template #default="scope">
<el-switch <el-switch

12
src/views/order/lists/detail.vue
View File

@ -14,7 +14,7 @@
</div> </div>
</template> </template>
<!-- 订单信息 --> <!-- 订单信息 -->
<el-form :inline="true" :model="formData" label-width="auto"> <el-form :inline="true" :model="formData" label-width="auto" class="order-form">
<el-form-item label="订单状态: "> <el-form-item label="订单状态: ">
<div class="content text-warning">{{ formData.orderStatusName || '-' }}</div> <div class="content text-warning">{{ formData.orderStatusName || '-' }}</div>
</el-form-item> </el-form-item>
@ -56,6 +56,11 @@
<el-form-item label="商家备注: "> <el-form-item label="商家备注: ">
<div class="w-[300px] break-words">{{ formData.orderRemarks! || '-' }}</div> <div class="w-[300px] break-words">{{ formData.orderRemarks! || '-' }}</div>
</el-form-item> </el-form-item>
<el-form-item label="退款原因: " v-if="formData.orderStatus == 4">
<div class="content">
{{ formData?.orderRefundDetailVo?.refundReason || '-' }}
</div>
</el-form-item>
</el-form> </el-form>
<!-- Button Group Start --> <!-- Button Group Start -->
<div class="button-group"> <div class="button-group">
@ -451,7 +456,6 @@ watch(
() => formData.value.staffId, () => formData.value.staffId,
newVal => { newVal => {
if (newVal) { if (newVal) {
console.log('watch', newVal)
const { provinceId, cityId, districtId } = formData.value const { provinceId, cityId, districtId } = formData.value
areaValue.value = [provinceId, cityId, districtId] areaValue.value = [provinceId, cityId, districtId]
handleSelect(areaValue.value) handleSelect(areaValue.value)
@ -558,4 +562,8 @@ onMounted(async () => {
.button-group { .button-group {
border-top: 1px solid #f2f2f2; border-top: 1px solid #f2f2f2;
} }
.order-form {
display: grid;
grid-template-columns: repeat(2, 1fr);
}
</style> </style>