Compare commits

..

No commits in common. 'a5448406790187b702f75eb5daba5cf016cb80f9' and '247c6ed4a09d267dbaf06995c26a450068af0977' have entirely different histories.

  1. 1
      src/components/Dialog/src/Dialog.vue
  2. 4
      src/views/Clue/Order/Comp/DialogFeebackAudit.vue
  3. 2
      src/views/Clue/Order/Comp/SchoolSettle.vue

@ -67,7 +67,6 @@ const emit = defineEmits(['close'])
destroy-on-close destroy-on-close
draggable draggable
lock-scroll lock-scroll
append-to-body
v-bind="getBindValue" v-bind="getBindValue"
@close="emit('close')" @close="emit('close')"
> >

@ -48,7 +48,7 @@
</template> </template>
<script name="DialogFeebackAudit" setup> <script name="DialogFeebackAudit" setup>
import { getFollowUserList } from '@/api/clue' import { getFollowUserList } from '@/api/clue'
import { auditPayment, getPaymentDetail } from '@/api/clue/payment' import { auditPayment } from '@/api/clue/payment'
import { dateFormatter, formatDate } from '@/utils/formatTime' import { dateFormatter, formatDate } from '@/utils/formatTime'
import {} from '@/utils/formatTime' import {} from '@/utils/formatTime'
const message = useMessage() // const message = useMessage() //
@ -126,7 +126,7 @@ const open = async (row) => {
dialogTitle.value = '回款审核' dialogTitle.value = '回款审核'
resetForm(row.id) resetForm(row.id)
// //
orderInfo.value = await getPaymentDetail({ id: row.id }) orderInfo.value = { ...row }
// //
getFollowInfo(row.clueId) getFollowInfo(row.clueId)
} }

@ -133,7 +133,7 @@
<el-form-item> <el-form-item>
<el-button @click="handleSearch" v-hasPermi="['clue:order:settle-search']">查询</el-button> <el-button @click="handleSearch" v-hasPermi="['clue:order:settle-search']">查询</el-button>
<el-button @click="handleReset" v-hasPermi="['clue:order:settle-reset']">重置</el-button> <el-button @click="handleReset" v-hasPermi="['clue:order:settle-reset']">重置</el-button>
<el-button @click="batchSettle" v-hasPermi="['clue:order:settle-batch-audit']"> <el-button @click="batchSettle" v-hasPermi="['clue:order:settle-settle-batch-audit']">
批量结算 批量结算
</el-button> </el-button>
</el-form-item> </el-form-item>

Loading…
Cancel
Save