合并分支 'release' 到 'master'

更新企微侧边栏查看合并请求 !7

合并分支 'release' 到 'master'
更新企微侧边栏查看合并请求 !7
ab7d311f · 毛细亚 · 333a0caa · fa19a499 · ab7d311f · ab7d311f
--- a/company_app/index.html
+++ b/company_app/index.html
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><meta http-equiv="pragma" content="no-cache"><meta http-equiv="cache-control" content="no-cache"><meta http-equiv="expires" content="0"><meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9"/><title>company_app</title><script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script><script defer="defer" src="static/js/chunk-vendors.72a90e47.js"></script><script defer="defer" src="static/js/app.003145b5.js"></script><link href="static/css/chunk-vendors.8e901099.css" rel="stylesheet"><link href="static/css/app.8a15faf7.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
\ No newline at end of file
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><meta http-equiv="pragma" content="no-cache"><meta http-equiv="cache-control" content="no-cache"><meta http-equiv="expires" content="0"><meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9"/><title>company_app</title><script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script><script defer="defer" src="static/js/chunk-vendors.b6398f5b.js"></script><script defer="defer" src="static/js/app.d81b1aba.js"></script><link href="static/css/chunk-vendors.8e901099.css" rel="stylesheet"><link href="static/css/app.6be676a0.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
\ No newline at end of file
--- a/src/api/works.js
+++ b/src/api/works.js
@@ -242,4 +242,12 @@ export function clearTaskUnReadData(data) {
    method: 'post',
    data
  })
-}
\ No newline at end of file
+}
+// 删除共享信息
+export function shareInfoDel(data) {
+  return request({
+    url: returnApi('/external_user/shareInfoDel'),
+    method: 'post',
+    data
+  })
+}
--- a/src/main.js
+++ b/src/main.js
@@ -62,6 +62,39 @@ Vue.prototype.$lodash = _;
 Vue.prototype.$moment = moment;
 Vue.prototype.$ww = ww;
 Vue.prototype.$clone = deepClone // vue原型挂载递归拷贝方法
+
+// 设置全局 Message 默认显示时间为 2 秒
+Vue.prototype.$message = function(options) {
+  if (typeof options === 'string') {
+    return ElementUI.Message({
+      message: options,
+      duration: 1000
+    });
+  } else {
+    return ElementUI.Message({
+      duration: 1000,
+      ...options
+    });
+  }
+};
+
+// 设置各种类型的 Message 默认显示时间
+['success', 'warning', 'info', 'error'].forEach(type => {
+  Vue.prototype.$message[type] = function(options) {
+    if (typeof options === 'string') {
+      return ElementUI.Message[type]({
+        message: options,
+        duration: 1000
+      });
+    } else {
+      return ElementUI.Message[type]({
+        duration: 1000,
+        ...options
+      });
+    }
+  };
+});
+
 new Vue({
  router,
  store,

--- a/src/views/components/ApplyRecords/AreaTransferApply.vue
+++ b/src/views/components/ApplyRecords/AreaTransferApply.vue
@@ -401,7 +401,10 @@ export default {
      }
    },
    formatImg(html) {
-      return html.replaceAll(/<img/g, '<img style="max-width:100px;"')
+      if (html) {
+        return html.replaceAll(/<img/g, '<img style="max-width:100px;"')
+      }
+      return html
    },
    switchStateText(status) {
      switch (status) {

--- a/src/views/components/ApplyRecords/TerminaTranfer.vue
+++ b/src/views/components/ApplyRecords/TerminaTranfer.vue
@@ -332,7 +332,10 @@ export default {
      }
    },
    formatImg(html) {
-      return html.replaceAll(/<img/g, '<img style="max-width:100px;"')
+      if (html) {
+        return html.replaceAll(/<img/g, '<img style="max-width:100px;"')
+      }
+      return html
    },
    switchStateText(status) {
      switch (status) {

--- a/src/views/components/order/searchUser.vue
+++ b/src/views/components/order/searchUser.vue
@@ -95,6 +95,10 @@
        this.$emit('result', value, valueItem)
      },
      requestAccountList() {
+        if (this.accountSelect == '') {
+          this.$message.warning('暂无关联的账号，请先去关联账号!')
+          return false
+        }
        roleList({ role_name: this.resulte, member_id: this.accountSelect, ...this.pageInfo }).then((res) => {
          this.loading = false
          this.searchUserOption = this.searchUserOption.concat(res.data.data)

--- a/src/views/components/roleInfo/approval.vue
+++ b/src/views/components/roleInfo/approval.vue
@@ -417,7 +417,10 @@
        }
      },
      formatImg(html) {
-        return html.replaceAll(/<img/g, '<img style="max-width:100px;"')
+        if (html) {
+          return html.replaceAll(/<img/g, '<img style="max-width:100px;"')
+        }
+        return html
      },
      switchStateText(status) {
        switch (status) {

--- a/src/views/components/roleInfo/report.vue
+++ b/src/views/components/roleInfo/report.vue
@@ -422,7 +422,10 @@
        }
      },
      formatImg(html) {
-        return html.replaceAll(/<img/g, '<img style="max-width:100px;"')
+        if (html) {
+          return html.replaceAll(/<img/g, '<img style="max-width:100px;"')
+        }
+        return html
      },
      switchStateText(status) {
        switch (status) {