commit
1cf88c1ecf
|
@ -417,7 +417,7 @@ class MessageCenter(CoreModel):
|
|||
content = models.TextField(verbose_name="内容",help_text="内容")
|
||||
target_type=models.IntegerField(default=0,verbose_name="目标类型",help_text="目标类型")
|
||||
target_user = models.ManyToManyField(to=Users,related_name="target_user",blank=True,db_constraint=False,verbose_name="目标用户",help_text="目标用户")
|
||||
target_dept = models.ManyToManyField(to=Dept, null=True, blank=True, db_constraint=False,
|
||||
target_dept = models.ManyToManyField(to=Dept, blank=True, db_constraint=False,
|
||||
verbose_name="目标部门", help_text="目标部门")
|
||||
target_role = models.ManyToManyField(to=Role, blank=True, db_constraint=False,
|
||||
verbose_name="目标角色", help_text="目标角色")
|
||||
|
|
|
@ -61,6 +61,8 @@ class DeptInitSerializer(CustomModelSerializer):
|
|||
"parent": menu_data['parent']
|
||||
}
|
||||
instance_obj = Dept.objects.filter(**filter_data).first()
|
||||
if instance_obj and not self.initial_data.get('reset'):
|
||||
continue
|
||||
serializer = DeptInitSerializer(instance_obj, data=menu_data, request=self.request)
|
||||
serializer.is_valid(raise_exception=True)
|
||||
serializer.save()
|
||||
|
|
|
@ -53,6 +53,8 @@ class DictionaryInitSerializer(CustomModelSerializer):
|
|||
"parent": data['parent']
|
||||
}
|
||||
instance_obj = Dictionary.objects.filter(**filter_data).first()
|
||||
if instance_obj and not self.initial_data.get('reset'):
|
||||
continue
|
||||
serializer = DictionaryInitSerializer(instance_obj, data=data, request=self.request)
|
||||
serializer.is_valid(raise_exception=True)
|
||||
serializer.save()
|
||||
|
|
|
@ -85,6 +85,8 @@ class MenuInitSerializer(CustomModelSerializer):
|
|||
"component_name": menu_data['component_name'],
|
||||
}
|
||||
instance_obj = Menu.objects.filter(**filter_data).first()
|
||||
if instance_obj and not self.initial_data.get('reset'):
|
||||
continue
|
||||
serializer = MenuInitSerializer(instance_obj, data=menu_data, request=self.request)
|
||||
serializer.is_valid(raise_exception=True)
|
||||
serializer.save()
|
||||
|
|
|
@ -69,6 +69,8 @@ class SystemConfigInitSerializer(CustomModelSerializer):
|
|||
"parent": data['parent']
|
||||
}
|
||||
instance_obj = SystemConfig.objects.filter(**filter_data).first()
|
||||
if instance_obj and not self.initial_data.get('reset'):
|
||||
continue
|
||||
serializer = SystemConfigInitSerializer(instance_obj, data=data, request=self.request)
|
||||
serializer.is_valid(raise_exception=True)
|
||||
serializer.save()
|
||||
|
|
|
@ -48,6 +48,7 @@ class CoreInitialize:
|
|||
continue
|
||||
filter_data[key] = value
|
||||
instance = model.objects.filter(**filter_data).first()
|
||||
data["reset"] = self.reset
|
||||
serializer = Serializer(instance, data=data, request=self.request)
|
||||
serializer.is_valid(raise_exception=True)
|
||||
serializer.save()
|
||||
|
|
|
@ -16,7 +16,8 @@ function webSocketOnError (e) {
|
|||
title: '',
|
||||
message: 'WebSocket连接发生错误' + JSON.stringify(e),
|
||||
type: 'error',
|
||||
duration: 0
|
||||
position: 'bottom-right',
|
||||
duration: 3000
|
||||
})
|
||||
}
|
||||
function webSocketOnMessage (e) {
|
||||
|
|
|
@ -398,15 +398,15 @@ Vue.prototype.commonEndColumns = function (param = {}) {
|
|||
key: 'is_deleted',
|
||||
width: 160,
|
||||
search: {
|
||||
disabled: !showData.is_deleted.showForm,
|
||||
disabled: !showData.is_deleted.showForm
|
||||
},
|
||||
show: showData.is_deleted.showTable,
|
||||
type: 'radio',
|
||||
dict: {
|
||||
data:[{label:"是",value:true},{label:"否",value:false}]
|
||||
data: [{ label: '是', value: true }, { label: '否', value: false }]
|
||||
},
|
||||
form: {
|
||||
disabled: !showData.is_deleted.showForm,
|
||||
disabled: !showData.is_deleted.showForm
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
import util from '@/libs/util'
|
||||
|
||||
/**
|
||||
* 对请求参数进行过滤
|
||||
*@param that=>this
|
||||
|
|
|
@ -15,7 +15,6 @@ export const crudOptions = (vm) => {
|
|||
{
|
||||
title: 'id',
|
||||
key: 'id',
|
||||
sortable: true,
|
||||
width: 100,
|
||||
form: { disabled: true }
|
||||
},
|
||||
|
@ -33,7 +32,7 @@ export const crudOptions = (vm) => {
|
|||
message: '必填项'
|
||||
}
|
||||
],
|
||||
component: { span: 24 }
|
||||
component: { span: 24, placeholder: '请输入标题' }
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue