Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev
commit
ffbaa89323
|
@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getChatConversationMy(data.id as number);
|
||||
formData.value = await getChatConversationMy(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getKnowledge(data.id as number);
|
||||
formData.value = await getKnowledge(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getKnowledgeSegment(data.id as number);
|
||||
formData.value = await getKnowledgeSegment(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getApiKey(data.id as number);
|
||||
formData.value = await getApiKey(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getChatRole(data.id as number);
|
||||
formData.value = await getChatRole(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues({ ...data, ...formData.value });
|
||||
} finally {
|
||||
|
|
|
@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getModel(data.id as number);
|
||||
formData.value = await getModel(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getTool(data.id as number);
|
||||
formData.value = await getTool(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -62,7 +62,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getCategory(data.id as number);
|
||||
formData.value = await getCategory(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -83,7 +83,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
modalApi.lock();
|
||||
try {
|
||||
// 获取流程分类数据
|
||||
formData.value = await getCategory(data.id as number);
|
||||
formData.value = await getCategory(data.id);
|
||||
// 仅设置 name 字段
|
||||
await formApi.setValues({
|
||||
name: formData.value.name,
|
||||
|
|
|
@ -24,7 +24,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formConfig.value = await getFormDetail(data.id as number);
|
||||
formConfig.value = await getFormDetail(data.id);
|
||||
setConfAndFields2(
|
||||
formConfig.value,
|
||||
formConfig.value.conf,
|
||||
|
|
|
@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getUserGroup(data.id as number);
|
||||
formData.value = await getUserGroup(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -64,7 +64,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getProcessExpression(data.id as number);
|
||||
formData.value = await getProcessExpression(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getProcessListener(data.id as number);
|
||||
formData.value = await getProcessListener(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -95,7 +95,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = data.id ? await getBusiness(data.id as number) : data;
|
||||
formData.value = data.id ? await getBusiness(data.id) : data;
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -84,7 +84,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
};
|
||||
addStatus();
|
||||
} else {
|
||||
formData.value = await getBusinessStatus(data.id as number);
|
||||
formData.value = await getBusinessStatus(data.id);
|
||||
if (
|
||||
!formData.value?.statuses?.length ||
|
||||
formData.value?.statuses?.length === 0
|
||||
|
|
|
@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getClue(data.id as number);
|
||||
formData.value = await getClue(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getContact(data.id as number);
|
||||
formData.value = await getContact(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -96,7 +96,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getContract(data.id as number);
|
||||
formData.value = await getContract(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -81,7 +81,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
modalApi.lock();
|
||||
try {
|
||||
if (data.id) {
|
||||
data = await getCustomerLimitConfig(data.id as number);
|
||||
data = await getCustomerLimitConfig(data.id);
|
||||
}
|
||||
formData.value = data;
|
||||
// 设置到 values
|
||||
|
|
|
@ -67,7 +67,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getCustomer(data.id as number);
|
||||
formData.value = await getCustomer(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -67,13 +67,13 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
// 加载数据
|
||||
let data = modalApi.getData<CrmProductCategoryApi.ProductCategory>();
|
||||
if (!data) {
|
||||
if (!data || !data.id) {
|
||||
return;
|
||||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
if (data.id) {
|
||||
data = await getProductCategory(data.id as number);
|
||||
data = await getProductCategory(data.id);
|
||||
}
|
||||
// 设置到 values
|
||||
formData.value = data;
|
||||
|
|
|
@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getProduct(data.id as number);
|
||||
formData.value = await getProduct(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getReceivablePlan(data.id as number);
|
||||
formData.value = await getReceivablePlan(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -68,7 +68,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getAccount(data.id as number);
|
||||
formData.value = await getAccount(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -68,7 +68,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getProduct(data.id as number);
|
||||
formData.value = await getProduct(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getProductUnit(data.id as number);
|
||||
formData.value = await getProductUnit(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -68,7 +68,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getCustomer(data.id as number);
|
||||
formData.value = await getCustomer(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getConfig(data.id as number);
|
||||
formData.value = await getConfig(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getDataSourceConfig(data.id as number);
|
||||
formData.value = await getDataSourceConfig(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getFileConfig(data.id as number);
|
||||
formData.value = await getFileConfig(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getBrand(data.id as number);
|
||||
formData.value = await getBrand(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -70,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
modalApi.lock();
|
||||
try {
|
||||
if (data.id) {
|
||||
data = await getCategory(data.id as number);
|
||||
data = await getCategory(data.id);
|
||||
}
|
||||
// 设置到 values
|
||||
formData.value = data;
|
||||
|
|
|
@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getComment(data.id as number);
|
||||
formData.value = await getComment(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -69,7 +69,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getProperty(data.id as number);
|
||||
formData.value = await getProperty(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
if (data && 'id' in data && data.id) {
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getPropertyValue(data.id as number);
|
||||
formData.value = await getPropertyValue(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getArticleCategory(data.id as number);
|
||||
formData.value = await getArticleCategory(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -70,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getArticle(data.id as number);
|
||||
formData.value = await getArticle(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -70,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getBanner(data.id as number);
|
||||
formData.value = await getBanner(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getBargainActivity(data.id as number);
|
||||
formData.value = await getBargainActivity(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getCombinationActivity(data.id as number);
|
||||
formData.value = await getCombinationActivity(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getCouponTemplate(data.id as number);
|
||||
formData.value = await getCouponTemplate(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -79,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getDiscountActivity(data.id as number);
|
||||
formData.value = await getDiscountActivity(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getDiyPage(data.id as number);
|
||||
formData.value = await getDiyPage(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -80,7 +80,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getDiyTemplate(data.id as number);
|
||||
formData.value = await getDiyTemplate(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -77,7 +77,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getReward(data.id as number);
|
||||
formData.value = await getReward(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -104,7 +104,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getSeckillActivity(data.id as number);
|
||||
formData.value = await getSeckillActivity(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getSeckillConfig(data.id as number);
|
||||
formData.value = await getSeckillConfig(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getDeliveryExpress(data.id as number);
|
||||
formData.value = await getDeliveryExpress(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getDeliveryExpressTemplate(data.id as number);
|
||||
formData.value = await getDeliveryExpressTemplate(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getDeliveryPickUpStore(data.id as number);
|
||||
formData.value = await getDeliveryPickUpStore(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getDeliveryPickUpStore(data.id as number);
|
||||
formData.value = await getDeliveryPickUpStore(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getGroup(data.id as number);
|
||||
formData.value = await getGroup(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getLevel(data.id as number);
|
||||
formData.value = await getLevel(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getSignInConfig(data.id as number);
|
||||
formData.value = await getSignInConfig(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getMemberTag(data.id as number);
|
||||
formData.value = await getMemberTag(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -67,7 +67,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
const user = await getUser(data.id as number);
|
||||
const user = await getUser(data.id);
|
||||
if (!user || !user.id) {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getUser(data.id as number);
|
||||
formData.value = await getUser(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getUser(data.id as number);
|
||||
formData.value = await getUser(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getUser(data.id as number);
|
||||
formData.value = await getUser(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getAccount(data.id as number);
|
||||
formData.value = await getAccount(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getPackage(data.id as number);
|
||||
formData.value = await getPackage(data.id);
|
||||
// 转换金额单位
|
||||
formData.value.payPrice = Number.parseFloat(
|
||||
fenToYuan(formData.value.payPrice),
|
||||
|
|
|
@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
if (data && 'id' in data && data.id) {
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getDictData(data.id as number);
|
||||
formData.value = await getDictData(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -69,7 +69,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getDictType(data.id as number);
|
||||
formData.value = await getDictType(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
if (data.id) {
|
||||
modalApi.lock();
|
||||
try {
|
||||
data = await getMenu(data.id as number);
|
||||
data = await getMenu(data.id);
|
||||
} finally {
|
||||
modalApi.unlock();
|
||||
}
|
||||
|
|
|
@ -92,14 +92,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
|
|||
{
|
||||
field: 'id',
|
||||
title: '公告编号',
|
||||
minWidth: 100,
|
||||
},
|
||||
{
|
||||
field: 'title',
|
||||
title: '公告标题',
|
||||
minWidth: 200,
|
||||
},
|
||||
{
|
||||
field: 'type',
|
||||
title: '公告类型',
|
||||
minWidth: 100,
|
||||
cellRender: {
|
||||
name: 'CellDict',
|
||||
props: { type: DICT_TYPE.SYSTEM_NOTICE_TYPE },
|
||||
|
@ -108,6 +111,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
|
|||
{
|
||||
field: 'status',
|
||||
title: '公告状态',
|
||||
minWidth: 100,
|
||||
cellRender: {
|
||||
name: 'CellDict',
|
||||
props: { type: DICT_TYPE.COMMON_STATUS },
|
||||
|
@ -116,6 +120,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
|
|||
{
|
||||
field: 'createTime',
|
||||
title: '创建时间',
|
||||
minWidth: 180,
|
||||
formatter: 'formatDateTime',
|
||||
},
|
||||
{
|
||||
|
|
|
@ -4,7 +4,7 @@ import type { SystemNoticeApi } from '#/api/system/notice';
|
|||
|
||||
import { ref } from 'vue';
|
||||
|
||||
import { Page, useVbenModal } from '@vben/common-ui';
|
||||
import { confirm, Page, useVbenModal } from '@vben/common-ui';
|
||||
import { isEmpty } from '@vben/utils';
|
||||
|
||||
import { message } from 'ant-design-vue';
|
||||
|
@ -45,14 +45,11 @@ function handleEdit(row: SystemNoticeApi.Notice) {
|
|||
async function handleDelete(row: SystemNoticeApi.Notice) {
|
||||
const hideLoading = message.loading({
|
||||
content: $t('ui.actionMessage.deleting', [row.title]),
|
||||
key: 'action_key_msg',
|
||||
duration: 0,
|
||||
});
|
||||
try {
|
||||
await deleteNotice(row.id as number);
|
||||
message.success({
|
||||
content: $t('ui.actionMessage.deleteSuccess', [row.title]),
|
||||
key: 'action_key_msg',
|
||||
});
|
||||
message.success($t('ui.actionMessage.deleteSuccess', [row.title]));
|
||||
onRefresh();
|
||||
} finally {
|
||||
hideLoading();
|
||||
|
@ -61,10 +58,10 @@ async function handleDelete(row: SystemNoticeApi.Notice) {
|
|||
|
||||
/** 批量删除公告 */
|
||||
async function handleDeleteBatch() {
|
||||
await confirm($t('ui.actionMessage.deleteBatchConfirm'));
|
||||
const hideLoading = message.loading({
|
||||
content: $t('ui.actionMessage.deleting'),
|
||||
content: $t('ui.actionMessage.deletingBatch'),
|
||||
duration: 0,
|
||||
key: 'action_process_msg',
|
||||
});
|
||||
try {
|
||||
await deleteNoticeList(checkedIds.value);
|
||||
|
@ -82,21 +79,17 @@ function handleRowCheckboxChange({
|
|||
}: {
|
||||
records: SystemNoticeApi.Notice[];
|
||||
}) {
|
||||
checkedIds.value = records.map((item) => item.id as number);
|
||||
checkedIds.value = records.map((item) => item.id!);
|
||||
}
|
||||
|
||||
/** 推送公告 */
|
||||
async function handlePush(row: SystemNoticeApi.Notice) {
|
||||
const hideLoading = message.loading({
|
||||
content: '正在推送中',
|
||||
key: 'action_process_msg',
|
||||
content: '正在推送中...',
|
||||
});
|
||||
try {
|
||||
await pushNotice(row.id as number);
|
||||
message.success({
|
||||
content: $t('ui.actionMessage.operationSuccess'),
|
||||
key: 'action_key_msg',
|
||||
});
|
||||
message.success($t('ui.actionMessage.operationSuccess'));
|
||||
} finally {
|
||||
hideLoading();
|
||||
}
|
||||
|
@ -152,12 +145,12 @@ const [Grid, gridApi] = useVbenVxeGrid({
|
|||
onClick: handleCreate,
|
||||
},
|
||||
{
|
||||
label: '批量删除',
|
||||
label: $t('ui.actionTitle.deleteBatch'),
|
||||
type: 'primary',
|
||||
danger: true,
|
||||
disabled: isEmpty(checkedIds),
|
||||
icon: ACTION_ICON.DELETE,
|
||||
auth: ['system:notice:delete'],
|
||||
disabled: isEmpty(checkedIds),
|
||||
onClick: handleDeleteBatch,
|
||||
},
|
||||
]"
|
||||
|
|
|
@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getNotice(data.id as number);
|
||||
formData.value = await getNotice(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getNotifyTemplate(data.id as number);
|
||||
formData.value = await getNotifyTemplate(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getOAuth2Client(data.id as number);
|
||||
formData.value = await getOAuth2Client(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getPost(data.id as number);
|
||||
formData.value = await getPost(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -78,7 +78,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
await loadDeptTree();
|
||||
toggleExpandAll();
|
||||
// 设置表单值, 一定要在加载树之后
|
||||
await formApi.setValues(await getRole(data.id as number));
|
||||
await formApi.setValues(await getRole(data.id));
|
||||
} finally {
|
||||
modalApi.unlock();
|
||||
}
|
||||
|
|
|
@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
modalApi.lock();
|
||||
try {
|
||||
// 加载角色菜单
|
||||
const menuIds = await getRoleMenuList(data.id as number);
|
||||
const menuIds = await getRoleMenuList(data.id);
|
||||
await formApi.setFieldValue('menuIds', menuIds);
|
||||
|
||||
await formApi.setValues(data);
|
||||
|
|
|
@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getRole(data.id as number);
|
||||
formData.value = await getRole(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getSmsChannel(data.id as number);
|
||||
formData.value = await getSmsChannel(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getSocialClient(data.id as number);
|
||||
formData.value = await getSocialClient(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getTenant(data.id as number);
|
||||
formData.value = await getTenant(data.id);
|
||||
// 将数组转换为换行符分隔的字符串
|
||||
const formValues = {
|
||||
...formData.value,
|
||||
|
|
|
@ -82,7 +82,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getTenantPackage(data.id as number);
|
||||
formData.value = await getTenantPackage(data.id);
|
||||
await formApi.setValues(data);
|
||||
} finally {
|
||||
modalApi.unlock();
|
||||
|
|
|
@ -58,7 +58,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
const roleIds = await getUserRoleList(data.id as number);
|
||||
const roleIds = await getUserRoleList(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues({
|
||||
...data,
|
||||
|
|
|
@ -64,7 +64,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getUser(data.id as number);
|
||||
formData.value = await getUser(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getConfig(data.id as number);
|
||||
formData.value = await getConfig(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getDataSourceConfig(data.id as number);
|
||||
formData.value = await getDataSourceConfig(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -53,7 +53,6 @@ async function onMaster(row: InfraFileConfigApi.FileConfig) {
|
|||
});
|
||||
try {
|
||||
await updateFileConfigMaster(row.id as number);
|
||||
loadingInstance.close();
|
||||
ElMessage.success($t('ui.actionMessage.operationSuccess'));
|
||||
onRefresh();
|
||||
} catch {
|
||||
|
|
|
@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getFileConfig(data.id as number);
|
||||
formData.value = await getFileConfig(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getBrand(data.id as number);
|
||||
formData.value = await getBrand(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -70,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
modalApi.lock();
|
||||
try {
|
||||
if (data.id) {
|
||||
data = await getCategory(data.id as number);
|
||||
data = await getCategory(data.id);
|
||||
}
|
||||
// 设置到 values
|
||||
formData.value = data;
|
||||
|
|
|
@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getComment(data.id as number);
|
||||
formData.value = await getComment(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -69,7 +69,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getProperty(data.id as number);
|
||||
formData.value = await getProperty(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
if (data && 'id' in data && data.id) {
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getPropertyValue(data.id as number);
|
||||
formData.value = await getPropertyValue(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getArticleCategory(data.id as number);
|
||||
formData.value = await getArticleCategory(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -70,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getArticle(data.id as number);
|
||||
formData.value = await getArticle(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -70,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getBanner(data.id as number);
|
||||
formData.value = await getBanner(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getBargainActivity(data.id as number);
|
||||
formData.value = await getBargainActivity(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getCombinationActivity(data.id as number);
|
||||
formData.value = await getCombinationActivity(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getCouponTemplate(data.id as number);
|
||||
formData.value = await getCouponTemplate(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -79,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getDiscountActivity(data.id as number);
|
||||
formData.value = await getDiscountActivity(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getDiyPage(data.id as number);
|
||||
formData.value = await getDiyPage(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -80,7 +80,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getDiyTemplate(data.id as number);
|
||||
formData.value = await getDiyTemplate(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -77,7 +77,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getReward(data.id as number);
|
||||
formData.value = await getReward(data.id);
|
||||
// 设置到 values
|
||||
if (formData.value) {
|
||||
await formApi.setValues(formData.value);
|
||||
|
|
|
@ -104,7 +104,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getSeckillActivity(data.id as number);
|
||||
formData.value = await getSeckillActivity(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
|
@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
|
|||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getSeckillConfig(data.id as number);
|
||||
formData.value = await getSeckillConfig(data.id);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue