This commit is contained in:
qsh
2024-06-25 16:58:37 +08:00
parent b6bd32430b
commit 93d7f2b43d
7 changed files with 53 additions and 12 deletions

View File

@@ -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)"
>

View File

@@ -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)"
>
回款
</el-button>
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:order:add-fee']"
@click="handleAddFee(scope.row)"
>
添加支出
</el-button>
<el-button
type="primary"
class="mr-10px"
@@ -139,6 +149,7 @@
<DialogOrder ref="orderDetailDialog" />
<DialogFeeback ref="feedbackDialog" />
<DialogAfterSale ref="afterSaleDialog" />
<DialogExtraFee ref="extraFeeDialog" />
</div>
</template>
@@ -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 {

View File

@@ -18,7 +18,7 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="getConfig('deliveryAutoStartPurchaseConfig')">
<el-form-item v-if="getConfig('deliveryAutoStartPurchaseConfig') && props.appType == 2">
<template #label>
<Tooltip
v-if="getConfig('deliveryAutoStartPurchaseConfig').remark"
@@ -66,6 +66,13 @@ import * as ConfigApi from '@/api/system/set'
const message = useMessage()
const props = defineProps({
appType: {
type: Number,
default: 1
}
})
const form = ref({})
const configList = ref([])

View File

@@ -34,7 +34,7 @@
<OtherPayType v-if="tabIndex == 37" />
</el-tab-pane>
<el-tab-pane label="常规设置" :name="40" v-if="checkPermi(['clue:setting:general-setting'])">
<GeneralSet v-if="tabIndex == 40" />
<GeneralSet v-if="tabIndex == 40" :appType="appStore.getAppInfo?.instanceType" />
</el-tab-pane>
<!-- <el-tab-pane label="消息通知" :name="50" v-if="checkPermi(['mall:setting:prod'])">
<MsgSend v-if="tabIndex == 50" />
@@ -56,6 +56,10 @@ import OtherPayType from './Comp/OtherPayType.vue'
import GeneralSet from './Comp/GeneralSet.vue'
import { checkPermi } from '@/utils/permission'
import { useAppStore } from '@/store/modules/app'
const appStore = useAppStore()
const tabIndex = ref(0)
</script>