cloud-web-corejs 1.0.219 → 1.0.220

package/src/utils/vab.js

@@ -15,6 +15,7 @@ import {getToken} from "./auth";
 import XEUtils from "xe-utils";
 
 import prefixConfig from "@/prefixConfig.js";
+import moment from "moment";
 
 let imFun = {
   request,
@@ -203,7 +204,7 @@ install = (Vue, opts = {}) => {
       paddingHeight = 365;
     }
 
-    if ("number" == typeof formType) {
+    if ("number" === typeof formType) {
       height = height - paddingHeight - formHeight * formType;
     } else {
       height = height - paddingHeight;
@@ -329,19 +330,19 @@ install = (Vue, opts = {}) => {
   Vue.prototype.$commonFileUtil = {
     // 文件类型获取与判断接口
     getFileSuffix: function (name) {
-      var i = name.lastIndexOf(".");
+      let i = name.lastIndexOf(".");
       if (i < 0) {
         // 默认是文本类型
         return "";
       }
-      var suffix = name.substring(i + 1, name.length).toLowerCase();
+      let suffix = name.substring(i + 1, name.length).toLowerCase();
       return suffix;
     },
     isBinary: function (suffix) {
-      if (!suffix || suffix == "") {
+      if (!suffix || suffix === "") {
         return false;
       }
-      var fileTypeMap = {
+      let fileTypeMap = {
         bin: true,
         exe: true,
         dll: true,
@@ -350,18 +351,18 @@ install = (Vue, opts = {}) => {
         war: true,
         jar: true,
       };
-      var type = fileTypeMap[suffix];
-      if (undefined == type) {
+      let type = fileTypeMap[suffix];
+      if (undefined === type) {
         return false;
       }
       return true;
     },
     isPicture: function (suffix) {
-      if (!suffix || suffix == "") {
+      if (!suffix || suffix === "") {
         return false;
       }
 
-      var fileTypeMap = {
+      let fileTypeMap = {
         jpg: true,
         jpeg: true,
         png: true,
@@ -371,18 +372,18 @@ install = (Vue, opts = {}) => {
         webp: true
       };
 
-      var type = fileTypeMap[suffix];
-      if (undefined == type) {
+      let type = fileTypeMap[suffix];
+      if (undefined === type) {
         return false;
       }
 
       return true;
     },
     isVideo: function (suffix) {
-      if (!suffix || suffix == "") {
+      if (!suffix || suffix === "") {
         return false;
       }
-      var fileTypeMap = {
+      let fileTypeMap = {
         avi: true,
         mov: true,
         mpeg: true,
@@ -394,18 +395,18 @@ install = (Vue, opts = {}) => {
         ogg: true,
       };
 
-      var type = fileTypeMap[suffix];
-      if (undefined == type) {
+      let type = fileTypeMap[suffix];
+      if (undefined === type) {
         return false;
       }
 
       return true;
     },
     isText: function (suffix) {
-      if (!suffix || suffix == "") {
+      if (!suffix || suffix === "") {
         return false;
       }
-      var fileTypeMap = {
+      let fileTypeMap = {
         txt: true,
         log: true,
         md: true,
@@ -434,18 +435,18 @@ install = (Vue, opts = {}) => {
         yml: true,
       };
 
-      var type = fileTypeMap[suffix];
-      if (undefined == type) {
+      let type = fileTypeMap[suffix];
+      if (undefined === type) {
         return false;
       }
 
       return true;
     },
     isZip: function (suffix) {
-      if (!suffix || suffix == "") {
+      if (!suffix || suffix === "") {
         return false;
       }
-      var fileTypeMap = {
+      let fileTypeMap = {
         zip: true,
         war: true,
         rar: true,
@@ -459,18 +460,18 @@ install = (Vue, opts = {}) => {
         tar: true,
       };
 
-      var type = fileTypeMap[suffix];
-      if (undefined == type) {
+      let type = fileTypeMap[suffix];
+      if (undefined === type) {
         return false;
       }
 
       return true;
     },
     isOffice: function (suffix) {
-      if (!suffix || suffix == "") {
+      if (!suffix || suffix === "") {
         return false;
       }
-      var fileTypeMap = {
+      let fileTypeMap = {
         doc: true,
         docx: true,
         ppt: true,
@@ -479,23 +480,23 @@ install = (Vue, opts = {}) => {
         xlsx: true,
       };
 
-      var type = fileTypeMap[suffix];
-      if (undefined == type) {
+      let type = fileTypeMap[suffix];
+      if (undefined === type) {
         return false;
       }
 
       return true;
     },
     isPdf: function (suffix) {
-      if (!suffix || suffix == "") {
+      if (!suffix || suffix === "") {
         return false;
       }
-      var fileTypeMap = {
+      let fileTypeMap = {
         pdf: true,
       };
 
-      var type = fileTypeMap[suffix];
-      if (undefined == type) {
+      let type = fileTypeMap[suffix];
+      if (undefined === type) {
         return false;
       }
 
@@ -504,8 +505,8 @@ install = (Vue, opts = {}) => {
     isPictureFile: function (fileName) {
       if(!fileName)return false;
       let typeStr = Object.prototype.toString.call(fileName);
-      var suffix = null
-      if (typeStr == "[object Object]") {
+      let suffix = null
+      if (typeStr === "[object Object]") {
         suffix = this.getFileSuffix(fileName.name);
       }else{
         suffix = this.getFileSuffix(fileName);
@@ -513,12 +514,12 @@ install = (Vue, opts = {}) => {
       return this.isPicture(suffix);
     },
     isTextFile: function (fileName) {
-      var suffix = this.getFileSuffix(fileName);
+      let suffix = this.getFileSuffix(fileName);
       return this.isText(suffix);
     },
     getShowUrl(url, showImagePreview) {
-      var index = url.lastIndexOf("/");
-      var filename;
+      let index = url.lastIndexOf("/");
+      let filename;
       if (index >= 0) {
         filename = url.substring(url.lastIndexOf("/") + 1);
       } else {
@@ -532,11 +533,11 @@ install = (Vue, opts = {}) => {
       }
     },
     getFileIconRequire: function (name, showType) {
-      var iconType = this.getDiyFileIconType(name);
+      let iconType = this.getDiyFileIconType(name);
       if (!iconType) {
         iconType = "other";
       }
-      var fileIconNameMap = {
+      let fileIconNameMap = {
         word: "ico-wrod.svg",
         excel: "ico-excel.svg",
         ppt: "ico-ppt.svg",
@@ -556,15 +557,15 @@ install = (Vue, opts = {}) => {
       if (showType) {
         iconType = showType;
       }
-      var fileIcenName = fileIconNameMap[iconType];
+      let fileIcenName = fileIconNameMap[iconType];
       return reqImg(fileIcenName);
     },
     getFileIconPath: function (name, showType) {
-      var iconType = this.getDiyFileIconType(name);
+      let iconType = this.getDiyFileIconType(name);
       if (!iconType) {
         iconType = "other";
       }
-      var fileIconNameMap = {
+      let fileIconNameMap = {
         word: "ico-wrod.svg",
         excel: "ico-excel.svg",
         ppt: "ico-ppt.svg",
@@ -584,12 +585,12 @@ install = (Vue, opts = {}) => {
       if (showType) {
         iconType = showType;
       }
-      var fileIcenName = fileIconNameMap[iconType];
-      var path = "/resources/images/" + fileIcenName;
+      let fileIcenName = fileIconNameMap[iconType];
+      let path = "/resources/images/" + fileIcenName;
       return path;
     },
     getDiyFileIconType: function (name) {
-      var fileIconTypeMap = {
+      let fileIconTypeMap = {
         doc: "word",
         docx: "word",
         xls: "excel",
@@ -620,14 +621,14 @@ install = (Vue, opts = {}) => {
         psd: "psd",
       };
 
-      var suffix = this.getFileSuffix(name);
-      if (suffix == "") {
+      let suffix = this.getFileSuffix(name);
+      if (suffix === "") {
         // 默认是文本类型
         return "";
       }
 
-      var iconType = fileIconTypeMap[suffix];
-      if (undefined == iconType) {
+      let iconType = fileIconTypeMap[suffix];
+      if (undefined === iconType) {
         return "";
       }
       return iconType;
@@ -650,8 +651,8 @@ install = (Vue, opts = {}) => {
       return pathname.slice(lastDotIndex + 1).toLowerCase();
     },
     downloadFile: function () {
-      var filePath, name;
-      var opts;
+      let filePath, name;
+      let opts;
       if (typeof arguments[0] === "string") {
         filePath = arguments[0];
         name = arguments[1];
@@ -661,7 +662,7 @@ install = (Vue, opts = {}) => {
         name = opts.name;
       }
       if (filePath) {
-        var url = null;
+        let url = null;
         if (filePath.indexOf("?") >= 0) {
           url = filePath + "&_d=true";
         } else {
@@ -686,8 +687,8 @@ install = (Vue, opts = {}) => {
   };
 
   Vue.prototype.$openFilePreview = function () {
-    var filePath;
-    var opts;
+    let filePath;
+    let opts;
     if (typeof arguments[0] === "string") {
       filePath = arguments[0];
     } else {
@@ -716,7 +717,7 @@ install = (Vue, opts = {}) => {
 
   function openInNewTab(url) {
     if (!url) return;
-    var a = document.createElement("a");
+    let a = document.createElement("a");
     a.href = url;
     a.target = "_blank";
     document.body.appendChild(a);
@@ -725,8 +726,8 @@ install = (Vue, opts = {}) => {
   }
 
   Vue.prototype.$getFilePreviewUrl = async function (obj, callback) {
-    var filePath;
-    var opts;
+    let filePath;
+    let opts;
     if (typeof obj === "string") {
       filePath = obj;
     } else {
@@ -759,7 +760,7 @@ install = (Vue, opts = {}) => {
       index = index || 0;
       attachments.forEach((item, i) => {
         let typeStr = Object.prototype.toString.call(item);
-        if (typeStr == "[object Object]") {
+        if (typeStr === "[object Object]") {
           if (that.$commonFileUtil.isPictureFile(item.url)) {
             if (i <= index) {
               pictureIndex++;
@@ -794,7 +795,7 @@ install = (Vue, opts = {}) => {
         let currentFile = attachment[index];
         let typeStr = Object.prototype.toString.call(currentFile);
         let url =
-          typeStr == "[object Object]"
+          typeStr === "[object Object]"
             ? currentFile.domain + currentFile.url
             : currentFile;
         if (that.$commonFileUtil.isPictureFile(url)) {
@@ -805,7 +806,7 @@ install = (Vue, opts = {}) => {
       } else {
         let typeStr = Object.prototype.toString.call(attachment);
         let url =
-          typeStr == "[object Object]"
+          typeStr === "[object Object]"
             ? attachment.domain + attachment.url
             : attachment;
         if (that.$commonFileUtil.isPictureFile(url)) {
@@ -834,7 +835,7 @@ install = (Vue, opts = {}) => {
     let parentTarget = target.$attrs["parent-target"] || target.$parent;
     let originTarget = parentTarget.$refs._viewDialog ? parentTarget : target;
     let updateParam =
-      param != null && param.updateParam != null ? param.updateParam : {};
+      param !== null && param !== undefined && param.updateParam !== null && param.updateParam !== undefined ? param.updateParam : {};
     for (let key in updateParam) {
       originTarget.$emit("update:" + key, updateParam[key]);
     }
@@ -847,14 +848,14 @@ install = (Vue, opts = {}) => {
   Vue.prototype.$baseStartPickerOptions = function (value, type) {
     return {
       disabledDate: (time) => {
-        if (value != null && value != "") {
+        if (value !== null && value !== undefined && value !== "") {
           let date = new Date(value.replace(/-/g, "/"));
-          if (!type || type == "date") {
+          if (!type || type === "date") {
             date.setDate(date.getDate() + 1);
             return time.getTime() >= date.getTime();
-          } else if (type == "year") {
+          } else if (type === "year") {
             return time.getYear() > date.getYear();
-          } else if (type == "month") {
+          } else if (type === "month") {
             date.setMonth(date.getMonth() + 1);
             return time.getTime() >= date.getTime();
           }
@@ -868,7 +869,7 @@ install = (Vue, opts = {}) => {
   Vue.prototype.$baseEndPickerOptions = function (value, format) {
     return {
       disabledDate: (time) => {
-        if (value != null && value != "") {
+        if (value !== null && value !== undefined && value !== "") {
           let date = new Date(value.replace(/-/g, "/"));
           return time.getTime() < date.getTime();
         } else {
@@ -1043,20 +1044,20 @@ install = (Vue, opts = {}) => {
 
   //数字精确位数
   Vue.prototype.$currency = function (value, priceScale, priceRoundType) {
-    if (value != null) {
-      if (priceScale == null) {
+    if (value !== null  && value  !== undefined) {
+      if (priceScale === null  || priceScale  === undefined) {
         priceScale = 2;
       }
-      if (priceRoundType == null) {
+      if (priceRoundType === null  || priceRoundType  === undefined) {
         priceRoundType = "roundHalfUp";
       }
-      var price;
-      if (priceRoundType == "roundHalfUp") {
+      let price;
+      if (priceRoundType === "roundHalfUp") {
         price = (
           Math.round(value * Math.pow(10, priceScale)) /
           Math.pow(10, priceScale)
         ).toFixed(priceScale);
-      } else if (priceRoundType == "roundUp") {
+      } else if (priceRoundType === "roundUp") {
         price = (
           Math.ceil(value * Math.pow(10, priceScale)) / Math.pow(10, priceScale)
         ).toFixed(priceScale);
@@ -1240,16 +1241,25 @@ install = (Vue, opts = {}) => {
     }
     let $i18n = that.$i18n;
     let value = zhValue;
-    if ($i18n.locale == "zh") {
+    if ($i18n.locale === "zh") {
       value = zhValue;
-    } else if ($i18n.locale == "en") {
+    } else if ($i18n.locale === "en") {
       value = enValue;
     }
     return value;
   };
 
+  Vue.prototype.$utcToLocal = function (utcTime) {
+    if(!utcTime)return utcTime;
+    let offsetHours = this.$store.getters.utcTransformOffset;// 时区偏移量，单位：小时
+    if(!offsetHours || offsetHours === 0)return utcTime;
+    let localTime = moment(utcTime).add(offsetHours, "hours");
+    return localTime.format("YYYY-MM-DD HH:mm:ss");
+  };
+
   Vue.prototype.$window = window;
 };
+
 window && Object.assign(window, imFun.prefixConfig);
 if (typeof window !== "undefined" && window.Vue) {
   install(window.Vue);

package/src/views/user/user/edit.vue

@@ -285,6 +285,34 @@
                     {{ user.locked ? $t1("是") : $t1("否") }}
                   </td>
                 </tr>
+                <tr>
+                  <th>
+                    {{ $t1("地区") }}
+                  </th>
+                  <td colspan="3">
+                    <el-form-item
+                      prop="areaName"
+                      :rules="[{ required: false, trigger: 'blur' }]"
+                    >
+                      <el-input
+                        class="search-input"
+                        v-model="user.areaName"
+                        clearable
+                        @clear="
+                          user.areaName = null;
+                          user.areaId = null;
+                        "
+                        v-el-readonly
+                      >
+                        <i
+                          slot="suffix"
+                          class="el-input__icon el-icon-search"
+                          @click="showAreaDialog = true"
+                        ></i>
+                      </el-input>
+                    </el-form-item>
+                  </td>
+                </tr>
                 <tr v-if="userType == 2">
                   <th>
                     {{ $t1("签约人") }}
@@ -504,6 +532,12 @@
       @confirm="confirmCountry"
       multi="false"
     />
+    <areaDialog
+      v-if="showAreaDialog"
+      :visiable.sync="showAreaDialog"
+      @confirm="confirmArea"
+      multi="false"
+    />
   </div>
 </template>
 
@@ -519,6 +553,7 @@ export default {
     saleOrgDialog: () => import("../../../views/user/sale_org/dialog.vue"),
     positionDialog: () => import("../../../views/user/position/dialog.vue"),
     countryDialog: () => import("../../../views/user/country/dialog.vue"),
+    areaDialog: () => import("../../../views/user/area/dialog.vue"),
     tempStorageButton,
   },
   props: ["_dataId", "userType", "flag"],
@@ -558,6 +593,8 @@ export default {
         userType: null,
         countryName: null,
         countryCode: null,
+        areaName: null,
+        areaId: null,
       },
       companyTableData: [],
       vxeOption: {},
@@ -608,6 +645,7 @@ export default {
         saveConfirm: () => {},
       },
       showCountryDialog: false,
+      showAreaDialog: false,
     };
   },
   computed: {
@@ -1285,6 +1323,13 @@ export default {
         (item) => item.companyCode == companyCode
       );
     },
+    confirmArea(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        this.user.areaId = row.id;
+        this.user.areaName = row.fullName;
+      }
+    },
   },
 };
 </script>