Merge branch 'dev' of http://192.168.1.218:3000/lianghanqiang/ldt-manger-web into update_bills

src/page/login/index.vue

@@ -83,6 +83,7 @@
     props: [],
     methods: {
       initType(){
+        //let domain = "http://ldt-mall.guosen-fumao.cn";
         let domain = getTopUrl();
         switch (domain) {
           case "http://ldt.guosen-fumao.cn":

src/page/login/userlogin.vue

@@ -168,6 +168,7 @@
       this.refreshCode();
     },
     mounted() {
+      //let domain = "http://ldt-mall.guosen-fumao.cn";
       let domain = getTopUrl();
       switch (domain) {
         case "http://ldt.guosen-fumao.cn":

src/views/ldt_notice/notice.vue

@@ -27,227 +27,309 @@
                    @click="handleDelete">删 除
         </el-button>
       </template>
+      <template slot="senderTypeSearch">
+        <el-select v-model="senderType" placeholder="请选择发送者类型">
+          <el-option v-if="userInfo.tenant_id === '000000'"
+                     v-for="item in userInfo.tenant_id !== '000000' ? senderTypeMall : senderTypeAdmin"
+                     :key="item.value"
+                     :label="item.label"
+                     :value="item.value">
+          </el-option>
+        </el-select>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/ldt_notice/notice";
-  import {mapGetters} from "vuex";
+import {add, getDetail, getList, remove, update} from "@/api/ldt_notice/notice";
+import {mapGetters} from "vuex";
 
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      loading: true,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      senderTypeMall: [
+        {
+          label: "商场",
+          value: "MALL"
         },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "标题",
-              prop: "title",
-              rules: [{
-                required: true,
-                message: "请输入标题",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "内容",
-              prop: "content",
-              rules: [{
-                required: true,
-                message: "请输入内容",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "发送人",
-              prop: "sender",
-              rules: [{
-                required: true,
-                message: "请输入发送人",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "接收人",
-              prop: "receiver",
-              rules: [{
-                required: true,
-                message: "请输入接收人",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "是否已读（0：未读  1：已读）",
-              prop: "isRead",
-              rules: [{
-                required: true,
-                message: "请输入是否已读（0：未读  1：已读）",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "发送人类型（商户，平台）",
-              prop: "senderType",
-              rules: [{
-                required: true,
-                message: "请输入发送人类型（商户，平台）",
-                trigger: "blur"
-              }]
-            },
-          ]
+        {
+          label: "商家",
+          value: "SHOP"
+        }
+      ],
+      senderTypeAdmin: [
+        {
+          label: "平台",
+          value: "PLATFORM"
         },
-        data: []
+        {
+          label: "商场",
+          value: "MALL"
+        },
+        {
+          label: "商家",
+          value: "SHOP"
+        }
+      ],
+      senderType: "",
+      selectionList: [],
+      option: {
+        height: 'auto',
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        viewBtn: true,
+        selection: true,
+        addBtn: false,
+        editBtn: false,
+        delBtn: false,
+        dialogClickModal: false,
+        column: [
+          {
+            label: "标题",
+            prop: "title",
+            rules: [{
+              required: true,
+              message: "请输入标题",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "发送人",
+            prop: "sender",
+            rules: [{
+              required: true,
+              message: "请输入发送人",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "接收人",
+            prop: "receiver",
+            rules: [{
+              required: true,
+              message: "请输入接收人",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "发送者类型",
+            prop: "senderType",
+            type: "select",
+            search: true,
+            searchLabelWidth: 90,
+            searchslot: true,
+            dicData: [
+              {
+                label: "商家",
+                value: "SHOP"
+              },
+              {
+                label: "平台",
+                value: "PLATFORM"
+              },
+              {
+                label: "商场",
+                value: "MALL"
+              }
+            ],
+            rules: [{
+              required: true,
+              message: "请输入发送类型（商户，平台,商场）",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "是否已读",
+            prop: "isRead",
+            type: "switch",
+            search: true,
+            dicData: [
+              {
+                label: "未读",
+                value: false
+              },
+              {
+                label: "已读",
+                value: true
+              }
+            ],
+            rules: [{
+              required: true,
+              message: "请输入是否已读",
+              trigger: "blur"
+            }],
+          },
+          {
+            label: "内容",
+            prop: "content",
+            component: 'AvueUeditor',
+            options: {
+              action: '/api/blade-resource/oss/endpoint/put-file',
+              props: {
+                res: "data",
+                url: "link",
+              }
+            },
+            hide: true,
+            minRows: 6,
+            span: 24,
+            rules: [{
+              required: true,
+              message: "请输入内容",
+              trigger: "blur"
+            }]
+          },
+        ]
+      },
+      data: []
+    };
+  },
+  computed: {
+    ...mapGetters(["permission", "userInfo"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(this.permission.notice_add, false),
+        viewBtn: this.vaildData(this.permission.notice_view, false),
+        delBtn: this.vaildData(this.permission.notice_delete, false),
+        editBtn: this.vaildData(this.permission.notice_edit, false)
       };
     },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.notice_add, false),
-          viewBtn: this.vaildData(this.permission.notice_view, false),
-          delBtn: this.vaildData(this.permission.notice_delete, false),
-          editBtn: this.vaildData(this.permission.notice_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    rowSave(row, done, loading) {
+      add(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-        return ids.join(",");
-      }
+        done();
+      }, error => {
+        loading();
+        window.console.log(error);
+      });
     },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
+    rowUpdate(row, index, done, loading) {
+      update(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        done();
+      }, error => {
+        loading();
+        console.log(error);
+      });
+    },
+    rowDel(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
         });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
+          this.$refs.crud.toggleSelection();
         });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
+    },
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
         });
       }
+      done();
+    },
+    searchReset() {
+      this.senderType = "";
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.senderType = '';
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      this.query.senderType = this.senderType;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
     }
-  };
+  }
+};
 </script>
 
 <style>