diff --git a/src/api/school/place/index.js b/src/api/school/place/index.js index 6e61327..f0c1dec 100644 --- a/src/api/school/place/index.js +++ b/src/api/school/place/index.js @@ -35,5 +35,5 @@ export const updatePlaceStatus = async (id, status) => { id, status } - return request.put({ url: '/admin-api/crm/sch-place/update-status', data: data }) + return request.put({ url: '/admin-api/crm/sch-place/status/update', data: data }) } diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index f78267d..d3a00bf 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -233,6 +233,7 @@ export default defineComponent({ vModel={formModel.value[item.field]} {...(autoSetPlaceholder && setTextPlaceholder(item))} {...setComponentProps(item)} + filterable format={item.component == 'DatePicker' ? 'YYYY-MM-DD' : null} value-format={item.component == 'DatePicker' ? 'YYYY-MM-DD' : null} style={baseSty + item.componentProps?.style} diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue index 689bcc0..bcb6b3c 100644 --- a/src/views/Clue/Order/Comp/MallOrderList.vue +++ b/src/views/Clue/Order/Comp/MallOrderList.vue @@ -152,7 +152,7 @@ class="mr-10px" link style="padding: 0; margin-left: 0" - v-if="scope.row.isPayoff == false" + v-if="scope.row.isPayoff == '未结清'" v-hasPermi="['clue:order:return']" @click="feeBack(scope.row)" > diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue index 35c5190..58ab559 100644 --- a/src/views/Clue/Order/Comp/OrderList.vue +++ b/src/views/Clue/Order/Comp/OrderList.vue @@ -115,12 +115,22 @@ class="mr-10px" link style="padding: 0; margin-left: 0" - v-if="scope.row.isPayoff == false" + v-if="scope.row.isPayoff == '未结清'" v-hasPermi="['clue:order:return']" @click="feeBack(scope.row)" > 回款 + + 添加支出 + + @@ -152,6 +163,7 @@ import { getClassTypePage } from '@/api/school/class' import DialogOrder from './DialogOrder.vue' import DialogFeeback from './DialogFeeback.vue' import DialogAfterSale from './DialogAfterSale.vue' +import DialogExtraFee from './DialogExtraPay.vue' import { removeNullField } from '@/utils' @@ -257,6 +269,11 @@ function feeBack(row) { feedbackDialog.value.open(row.signId) } +const extraFeeDialog = ref() +function handleAddFee(row) { + extraFeeDialog.value.open(row.signId) +} + // 取消登记 async function cancelDeal(row) { try { diff --git a/src/views/Clue/Set/Comp/GeneralSet.vue b/src/views/Clue/Set/Comp/GeneralSet.vue index 6d6060d..7f5f92d 100644 --- a/src/views/Clue/Set/Comp/GeneralSet.vue +++ b/src/views/Clue/Set/Comp/GeneralSet.vue @@ -18,7 +18,7 @@ - +