消息配置修改

i18n/locale/zh-CN.js

@@ -1191,7 +1191,10 @@ export default {
     status: '启用状态',
     code: '编码',
     template: '模板',
+    title:'标题',
     departmentIds: '部门Id',
     departments: '部门',
+    color:'颜色',
+    icon:'图标',
   }
 }

pages/basicData/messageConfig/add.vue

@@ -26,7 +26,7 @@
 
       <Col :span="12">
         <FormItem :label="l('departments')" prop="departmentIds">
-          <DepartmentSelect v-model="entity.departmentIds"/>
+          <DepartmentSelect v-model="entity.departmentIds" />
         </FormItem>
       </Col>
 
@@ -45,6 +45,23 @@
           <Dictionary code="message.config.isInner" v-model="entity.isEmail" type="radio"></Dictionary>
         </FormItem>
       </Col>
+      <Col :span="12">
+        <FormItem :label="l('title')" prop="title">
+          <Input v-model="entity.title"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="6">
+        <FormItem :label="l('color')" prop="color">
+          <Input v-model="entity.color">
+            <ColorPicker v-model="entity.color" slot="prepend" transfer size="small" recommend />
+          </Input>
+        </FormItem>
+      </Col>
+      <Col :span="6">
+        <FormItem :label="l('icon')" prop="icon">
+          <InputIcon v-model="entity.icon"></InputIcon>
+        </FormItem>
+      </Col>
       <Col :span="24">
         <FormItem :label="l('template')" prop="template">
           <Input v-model="entity.template" type="textarea" :rows="5"></Input>
@@ -66,8 +83,7 @@ export default {
       if (!value) {
         return callback(new Error("编号不能为空"));
       }
-      Api.list(value).then(r => {
-        console.log(r.result)
+      Api.list(value).then((r) => {
         if (r.result.length > 0) {
           return callback(new Error("编号已经存在"));
         } else {
@@ -94,12 +110,19 @@ export default {
         isEmail: 0,
         roles: "",
         users: "",
-        departments:"",
+        departments: "",
         status: 1,
+        template: "",
+        title: "",
+        color: "",
+        // icon: "",
       },
       rules: {
         categoryName: [{ required: true, message: "必填", trigger: "blur" }],
-        code: [{ required: true, message: "必填", trigger: "blur" }, { validator: validateCode, trigger: "blur" }],
+        code: [
+          { required: true, message: "必填", trigger: "blur" },
+          { validator: validateCode, trigger: "blur" },
+        ],
       },
     };
   },
@@ -114,9 +137,9 @@ export default {
   },
   methods: {
     handleSubmit() {
-      this.entity.userIds =  this.entity.userIds.toString();
-      this.entity.roleIds =  this.entity.roleIds.toString();
-      this.entity.departmentIds =  this.entity.departmentIds.toString();
+      this.entity.userIds = this.entity.userIds.toString();
+      this.entity.roleIds = this.entity.roleIds.toString();
+      this.entity.departmentIds = this.entity.departmentIds.toString();
 
       this.$refs.form.validate((v) => {
         if (v) {
@@ -164,4 +187,4 @@ export default {
     },
   },
 };
-</script>
+</script>
\ No newline at end of file

pages/basicData/messageConfig/edit.vue

@@ -26,7 +26,7 @@
 
       <Col :span="12">
         <FormItem :label="l('departments')" prop="departmentIds">
-          <DepartmentSelect v-model="entity.departmentIds"/>
+          <DepartmentSelect v-model="entity.departmentIds" />
         </FormItem>
       </Col>
 
@@ -45,6 +45,23 @@
           <Dictionary code="message.config.isInner" v-model="entity.isEmail" type="radio"></Dictionary>
         </FormItem>
       </Col>
+      <Col :span="12">
+        <FormItem :label="l('title')" prop="title">
+          <Input v-model="entity.title"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="6">
+        <FormItem :label="l('color')" prop="color">
+          <Input v-model="entity.color">
+            <ColorPicker v-model="entity.color" slot="prepend" transfer size="small" recommend />
+          </Input>
+        </FormItem>
+      </Col>
+      <Col :span="6">
+        <FormItem :label="l('icon')" prop="icon">
+          <InputIcon v-model="entity.icon"></InputIcon>
+        </FormItem>
+      </Col>
       <Col :span="24">
         <FormItem :label="l('template')" prop="template">
           <Input v-model="entity.template" type="textarea" :rows="5"></Input>
@@ -64,7 +81,9 @@ export default {
   data() {
     return {
       disabled: false,
-      entity: {},
+      entity: {
+        color:""
+      },
       rules: {
         name: [{ required: true, message: "必填", trigger: "blur" }],
       },
@@ -84,10 +103,12 @@ export default {
   methods: {
     load(v) {
       Api.get({ id: v }).then((r) => {
-        r.result.userIds = this.$u.toIntArray(r.result.userIds);      
-        r.result.roleIds = this.$u.toIntArray(r.result.roleIds);   
-        r.result.departmentIds = this.$u.toIntArray(r.result.departmentIds); 
-
+        r.result.userIds = this.$u.toIntArray(r.result.userIds);
+        r.result.roleIds = this.$u.toIntArray(r.result.roleIds);
+        r.result.departmentIds = this.$u.toIntArray(r.result.departmentIds);
+        if(r.result.color == null){
+          r.result.color = "";
+        }
         this.entity = r.result;
       });
     },

pages/basicData/messageConfig/index.vue

@@ -4,7 +4,7 @@
       <template slot="easySearch">
         <Form ref="formInline" :model="easySearch" inline>
           <FormItem prop="keys">
-            <Input placeholder="请输入关键字分类名称" v-model="easySearch.keys.value" />
+            <Input placeholder="请输入关键字名称" v-model="easySearch.keys.value" />
           </FormItem>
           <FormItem>
             <Button type="primary" @click="search">查询</Button>
@@ -111,6 +111,13 @@ export default {
           easy: true,
           high: true,
         },
+        {
+          key: "title",
+          title: this.l("title"),
+          align: "left",
+          easy: true,
+          high: true,
+        },
         {
           key: "template",
           title: this.l("template"),
@@ -118,6 +125,7 @@ export default {
           easy: true,
           high: true,
         },
+
         // {
         //   key: "roles",
         //   title: this.l("roles"),

pages/basicData/messageConfig/search.vue

@@ -6,18 +6,22 @@
           <Input v-model="condition.id.value"></Input>
         </FormItem>
       </Col>
-       <Col :span="12" :v-if="condition.code.show">
+      <Col :span="12" :v-if="condition.code.show">
         <FormItem :label="l('code')" prop="code">
           <Input v-model="condition.code.value"></Input>
         </FormItem>
       </Col>
-     
+
       <Col :span="12" :v-if="condition.categoryName.show">
         <FormItem :label="l('categoryName')" prop="categoryName">
           <Input v-model="condition.categoryName.value"></Input>
         </FormItem>
       </Col>
-
+      <Col :span="12" :v-if="condition.status.show">
+        <FormItem :label="l('status')" prop="status">
+          <Dictionary code="message.config.status" v-model="condition.status.value" type="radio"></Dictionary>
+        </FormItem>
+      </Col>
       <Col :span="12" :v-if="condition.isInner.show">
         <FormItem :label="l('isInner')" prop="isInner">
           <Dictionary code="message.config.isInner" v-model="condition.isInner.value" type="radio"></Dictionary>
@@ -28,14 +32,6 @@
           <Dictionary code="message.config.isInner" v-model="condition.isEmail.value" type="radio"></Dictionary>
         </FormItem>
       </Col>
-    
-      <Col :span="12" :v-if="condition.status.show">
-        <FormItem :label="l('status')" prop="status">
-           <Dictionary code="message.config.status" v-model="condition.status.value" type="radio"></Dictionary>
-        </FormItem>
-      </Col>
-     
-   
     </Row>
   </Form>
 </template>