Browse Source

消息通知界面修改功能优化

master_hella_20240701
ljlong_2630 10 months ago
parent
commit
346aff3b42
  1. 1
      src/views/mes/process/index.vue
  2. 1
      src/views/mes/processroute/index.vue
  3. 1
      src/views/mes/productOffline/index.vue
  4. 8
      src/views/system/mail/template/MailTemplateForm.vue
  5. 3
      src/views/system/notify/template/NotifyTemplateForm.vue
  6. 2
      src/views/system/sms/template/SmsTemplateForm.vue

1
src/views/mes/process/index.vue

@ -247,7 +247,6 @@ const formsSuccess = async (formType,data) => {
// //
const searchTableSuccess = (formField, searchField, val, formRef) => { const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick?.(() => { nextTick?.(() => {
debugger
const setV = {} const setV = {}
if (formField === 'productionLineCode'){ if (formField === 'productionLineCode'){
const concatenatedValues = val.map(item => item['code']).join(',') const concatenatedValues = val.map(item => item['code']).join(',')

1
src/views/mes/processroute/index.vue

@ -160,7 +160,6 @@ const buttonTableClick = async (val, row) => {
const dailogClose=() => { const dailogClose=() => {
console.log('close'); console.log('close');
nextTick?.(()=>{ nextTick?.(()=>{
debugger
getList() getList()
}) })

1
src/views/mes/productOffline/index.vue

@ -80,7 +80,6 @@ const tableColumns = ref(ProductOffline.allSchemas.tableColumns)
// //
const searchTableSuccess = (formField, searchField, val, formRef) => { const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick?.(() => { nextTick?.(() => {
debugger
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
setV['workBillno'] = val[0]['schedulingCode']// setV['workBillno'] = val[0]['schedulingCode']//

8
src/views/system/mail/template/MailTemplateForm.vue

@ -41,10 +41,10 @@ const open = async (type: string, id?: number) => {
try { try {
const data = await MailTemplateApi.getMailTemplate(id) const data = await MailTemplateApi.getMailTemplate(id)
formRef.value.setValues(data) formRef.value.setValues(data)
showReceiver(data)
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
showReceiver(formRef.value)
} }
} }
defineExpose({ open }) // open defineExpose({ open }) // open
@ -136,8 +136,8 @@ const resetReceiverType = () => {
}); });
} }
const showReceiver = (formValue) => { const showReceiver = (data) => {
if(formValue){ if(data){
// receiverType // receiverType
const fieldMap = { const fieldMap = {
1: 'roleIdList', 1: 'roleIdList',
@ -145,7 +145,7 @@ const showReceiver = (formValue) => {
3: 'postIdList', 3: 'postIdList',
4: 'userIdList' 4: 'userIdList'
}; };
const enableField = fieldMap[formValue.receiverType]; const enableField = fieldMap[data.receiverType];
if (enableField) { if (enableField) {
const itemToEnable = allSchemas.formSchema.find(item => item.field === enableField); const itemToEnable = allSchemas.formSchema.find(item => item.field === enableField);
if (itemToEnable) { if (itemToEnable) {

3
src/views/system/notify/template/NotifyTemplateForm.vue

@ -167,10 +167,10 @@ const open = async (type: string, id?: number) => {
formLoading.value = true formLoading.value = true
try { try {
formData.value = await NotifyTemplateApi.getNotifyTemplate(id) formData.value = await NotifyTemplateApi.getNotifyTemplate(id)
showReceiver(formData.value)
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
showReceiver(formData.value)
} }
} }
defineExpose({ open }) // open defineExpose({ open }) // open
@ -189,7 +189,6 @@ const submitForm = async () => {
await NotifyTemplateApi.createNotifyTemplate(data) await NotifyTemplateApi.createNotifyTemplate(data)
message.success('新增成功') message.success('新增成功')
} else { } else {
debugger
await NotifyTemplateApi.updateNotifyTemplate(data) await NotifyTemplateApi.updateNotifyTemplate(data)
message.success('修改成功') message.success('修改成功')
} }

2
src/views/system/sms/template/SmsTemplateForm.vue

@ -178,10 +178,10 @@ const open = async (type: string, id?: number) => {
formLoading.value = true formLoading.value = true
try { try {
formData.value = await SmsTemplateApi.getSmsTemplate(id) formData.value = await SmsTemplateApi.getSmsTemplate(id)
showReceiver(formData.value)
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
showReceiver(formData.value)
} }
// //
channelList.value = await SmsChannelApi.getSimpleSmsChannelList() channelList.value = await SmsChannelApi.getSimpleSmsChannelList()

Loading…
Cancel
Save