cloud-web-corejs 1.0.54-dev.636 → 1.0.54-dev.638

package/src/utils/vab.js

@@ -7,11 +7,11 @@ function reqImg(a) {
 
 import request from "./request";
 import * as lodash from "lodash";
-import {Loading, Message, MessageBox, Notification, Form} from "element-ui";
+import { Loading, Message, MessageBox, Notification, Form } from "element-ui";
 import store from "../store";
 import ElImageViewer from "../components/VabUpload/image-viewer";
 
-import {getToken} from "./auth";
+import { getToken } from "./auth";
 import XEUtils from "xe-utils";
 
 import prefixConfig from "@/prefixConfig.js";
@@ -61,10 +61,14 @@ install = (Vue, opts = {}) => {
     if (opts.addCreateInfo === null || opts.addCreateInfo === undefined) {
       option.addCreateInfo = defaultOption.addCreateInfo;
     }
-    if (opts.queryCreateInfo === null || opts.queryCreateInfo === undefined || opts.queryCreateInfo === true) {
+    if (
+      opts.queryCreateInfo === null ||
+      opts.queryCreateInfo === undefined ||
+      opts.queryCreateInfo === true
+    ) {
       option.queryCreateInfo = defaultOption.queryCreateInfo;
     }
-    if(opts.queryCreateInfo === false){
+    if (opts.queryCreateInfo === false) {
       option.queryCreateInfo = "0";
     }
     return this.$http(option);
@@ -142,7 +146,7 @@ install = (Vue, opts = {}) => {
     return loading;
   };
   /* 全局Message */
-  Vue.prototype.$baseMessage = ({message, type, onClose}) => {
+  Vue.prototype.$baseMessage = ({ message, type, onClose }) => {
     imFun.Message({
       offset: 60,
       showClose: true,
@@ -369,7 +373,7 @@ install = (Vue, opts = {}) => {
         gif: true,
         bmp: true,
         mpg: true,
-        webp: true
+        webp: true,
       };
 
       let type = fileTypeMap[suffix];
@@ -503,12 +507,12 @@ install = (Vue, opts = {}) => {
       return true;
     },
     isPictureFile: function (fileName) {
-      if(!fileName)return false;
+      if (!fileName) return false;
       let typeStr = Object.prototype.toString.call(fileName);
-      let suffix = null
+      let suffix = null;
       if (typeStr === "[object Object]") {
         suffix = this.getFileSuffix(fileName.name);
-      }else{
+      } else {
         suffix = this.getFileSuffix(fileName);
       }
       return this.isPicture(suffix);
@@ -634,17 +638,17 @@ install = (Vue, opts = {}) => {
       return iconType;
     },
     getFileExtension(urlString) {
-      if(!urlString)return null
+      if (!urlString) return null;
       const url = new URL(urlString);
       // 获取路径部分，例如 "/images/photo.jpg"
       const pathname = url.pathname;
 
       // 使用 lastIndexOf 找到最后一个点的位置
-      const lastDotIndex = pathname.lastIndexOf('.');
+      const lastDotIndex = pathname.lastIndexOf(".");
 
       // 如果没有点，或者点在最后一位（即没有后缀），返回空字符串
       if (lastDotIndex === -1 || lastDotIndex === pathname.length - 1) {
-        return '';
+        return "";
       }
 
       // 截取点之后的部分
@@ -670,7 +674,7 @@ install = (Vue, opts = {}) => {
         }
         if (name) {
           let fileSuffix = this.getFileExtension(filePath);
-          if(fileSuffix && !name.endsWith("."+fileSuffix)){
+          if (fileSuffix && !name.endsWith("." + fileSuffix)) {
             name = name + "." + fileSuffix;
           }
 
@@ -835,7 +839,12 @@ install = (Vue, opts = {}) => {
     let parentTarget = target.$attrs["parent-target"] || target.$parent;
     let originTarget = parentTarget.$refs._viewDialog ? parentTarget : target;
     let updateParam =
-      param !== null && param !== undefined && param.updateParam !== null && param.updateParam !== undefined ? 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]);
     }
@@ -932,7 +941,6 @@ install = (Vue, opts = {}) => {
   Vue.prototype.$baseMul = baseMul;
   Vue.prototype.$baseDiv = baseDiv;
 
-
   /**
    * 格式化数字为带千分位的字符串。
    *
@@ -957,25 +965,25 @@ install = (Vue, opts = {}) => {
    * formatNumber(1000, { fixed: true, digits: 0 });   // "1,000"
    */
   function formatNumber(value, options = {}) {
-    if (value === null || value === undefined || value === '') {
-      return '';
+    if (value === null || value === undefined || value === "") {
+      return "";
     }
 
     const {
       fixed = false,
       digits = 2,
-      thousandsSeparator = ',',
-      decimalSeparator = '.'
+      thousandsSeparator = ",",
+      decimalSeparator = ".",
     } = options;
 
-    const isNumber = typeof value === 'number';
+    const isNumber = typeof value === "number";
     let str = String(value).trim();
 
     // Normalize ".123" → "0.123"
     if (str.charCodeAt(0) === 46) {
-      str = '0' + str;
-    } else if (str.startsWith('-.')) {
-      str = '-0.' + str.slice(2);
+      str = "0" + str;
+    } else if (str.startsWith("-.")) {
+      str = "-0." + str.slice(2);
     }
 
     let intPart, decPart, isNegative;
@@ -986,9 +994,9 @@ install = (Vue, opts = {}) => {
       if (num !== num) return str;
 
       const fixedStr = num.toFixed(digits);
-      const dotIndex = fixedStr.indexOf('.');
+      const dotIndex = fixedStr.indexOf(".");
       intPart = dotIndex === -1 ? fixedStr : fixedStr.slice(0, dotIndex);
-      decPart = dotIndex === -1 ? '' : fixedStr.slice(dotIndex + 1);
+      decPart = dotIndex === -1 ? "" : fixedStr.slice(dotIndex + 1);
       isNegative = intPart.charCodeAt(0) === 45;
       if (isNegative) intPart = intPart.slice(1);
     } else {
@@ -997,18 +1005,18 @@ install = (Vue, opts = {}) => {
       isNegative = s.charCodeAt(0) === 45;
       if (isNegative) s = s.slice(1);
 
-      const dotIndex = s.indexOf('.');
+      const dotIndex = s.indexOf(".");
       intPart = dotIndex === -1 ? s : s.slice(0, dotIndex);
-      decPart = dotIndex === -1 ? '' : s.slice(dotIndex + 1);
+      decPart = dotIndex === -1 ? "" : s.slice(dotIndex + 1);
 
-      if (intPart === '') intPart = '0';
+      if (intPart === "") intPart = "0";
       if (!/^\d+$/.test(intPart)) return str;
     }
 
     // 千分位（始终应用）
     let fmtInt = intPart;
-    if (intPart !== '0') {
-      let out = '';
+    if (intPart !== "0") {
+      let out = "";
       for (let i = intPart.length - 1, c = 0; i >= 0; i--, c++) {
         if (c > 0 && c % 3 === 0) out = thousandsSeparator + out;
         out = intPart[i] + out;
@@ -1017,11 +1025,11 @@ install = (Vue, opts = {}) => {
     }
 
     // 拼接
-    let result = isNegative ? '-' + fmtInt : fmtInt;
+    let result = isNegative ? "-" + fmtInt : fmtInt;
     if (decPart) {
       result += decimalSeparator + decPart;
     } else if (fixed && digits > 0) {
-      result += decimalSeparator + '0'.repeat(digits);
+      result += decimalSeparator + "0".repeat(digits);
     }
 
     return result;
@@ -1037,18 +1045,23 @@ install = (Vue, opts = {}) => {
     crypto.getRandomValues(buf);
     buf[6] = (buf[6] & 0x0f) | 0x40; // version 4
     buf[8] = (buf[8] & 0x3f) | 0x80; // variant RFC4122
-    const hex = Array.from(buf, b => b.toString(16).padStart(2, '0')).join('');
-    return `${hex.slice(0,8)}-${hex.slice(8,12)}-${hex.slice(12,16)}-${hex.slice(16,20)}-${hex.slice(20)}`;
+    const hex = Array.from(buf, (b) => b.toString(16).padStart(2, "0")).join(
+      ""
+    );
+    return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(
+      12,
+      16
+    )}-${hex.slice(16, 20)}-${hex.slice(20)}`;
   }
   Vue.prototype.$generateUUID = generateUUID;
 
   //数字精确位数
   Vue.prototype.$currency = function (value, priceScale, priceRoundType) {
-    if (value !== null  && value  !== undefined) {
-      if (priceScale === null  || priceScale  === undefined) {
+    if (value !== null && value !== undefined) {
+      if (priceScale === null || priceScale === undefined) {
         priceScale = 2;
       }
-      if (priceRoundType === null  || priceRoundType  === undefined) {
+      if (priceRoundType === null || priceRoundType === undefined) {
         priceRoundType = "roundHalfUp";
       }
       let price;
@@ -1087,24 +1100,24 @@ install = (Vue, opts = {}) => {
       success: (res) => {
         let dicts = res.objx || [];
         let dictMap = {};
-        for(let item of dicts){
+        for (let item of dicts) {
           dictMap[item.sn] = item.value;
         }
         /* dicts.forEach((item) => {
           dictMap[item.sn] = item.value;
         }); */
         option.success &&
-        option.success({
-          dicts,
-          dictMap,
-        });
+          option.success({
+            dicts,
+            dictMap,
+          });
       },
     });
   };
 
   imFun.Form.methods.$baseValidate = function (callback, opt) {
     let that = this;
-    that.validate((valid, obj,c,d) => {
+    that.validate((valid, obj, c, d) => {
       if (!valid && (!opt || opt.errorTip !== false)) {
         this.$message({
           message: this.$t2("必填项不能为空", "system.message.required"),
@@ -1120,8 +1133,8 @@ install = (Vue, opts = {}) => {
   function scrollToFirstError(formTarget) {
     // 获取第一个验证失败的字段
     // let formTarget = this.$refs['renderForm'];
-    const firstErrorField = Object.keys(formTarget.fields).find(key => {
-      return formTarget.fields[key].validateState === 'error';
+    const firstErrorField = Object.keys(formTarget.fields).find((key) => {
+      return formTarget.fields[key].validateState === "error";
     });
 
     if (firstErrorField) {
@@ -1131,19 +1144,18 @@ install = (Vue, opts = {}) => {
       if (dom) {
         // 滚动到该字段位置
         dom.scrollIntoView({
-          behavior: 'smooth',
-          block: 'center'
+          behavior: "smooth",
+          block: "center",
         });
 
         // 添加高亮效果
-        dom.classList.add('highlight');
+        dom.classList.add("highlight");
 
         // 3秒后移除高亮效果
         setTimeout(() => {
-          dom.classList.remove('highlight');
+          dom.classList.remove("highlight");
         }, 3000);
       }
-
     }
   }
 
@@ -1184,7 +1196,7 @@ install = (Vue, opts = {}) => {
       });
     };
     getDownloadDomian((domain) => {
-      if(fileName){
+      if (fileName) {
         fileWhole.fileName = fileName;
       }
       that.$http({
@@ -1223,13 +1235,16 @@ install = (Vue, opts = {}) => {
     let lang = that.$i18n.locale;
     const i18n = that.$i18n;
     if (lang === "zh") {
-      let val = i18n._t(path, lang, {zh: {[path]: path}}, null, values);
+      let val = i18n._t(path, lang, { zh: { [path]: path } }, null, values);
       return val;
     } else {
-      if(!i18n.te(path)){
-        return i18n._t(path, lang, {zh: {[path]: path}}, null, values);
-      }else{
-        return i18n.t(path, values) || i18n._t(path, lang, {zh: {[path]: path}}, null, values);
+      if (!i18n.te(path)) {
+        return i18n._t(path, lang, { zh: { [path]: path } }, null, values);
+      } else {
+        return (
+          i18n.t(path, values) ||
+          i18n._t(path, lang, { zh: { [path]: path } }, null, values)
+        );
       }
     }
   };
@@ -1250,9 +1265,9 @@ install = (Vue, opts = {}) => {
   };
 
   Vue.prototype.$utcToLocal = function (utcTime) {
-    if(!utcTime)return utcTime;
-    let offsetHours = this.$store.getters.utcTransformOffset;// 时区偏移量，单位：小时
-    if(!offsetHours || offsetHours === 0)return 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");
   };

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

@@ -347,6 +347,47 @@
                     </el-form-item>
                   </td>
                 </tr>
+                <tr>
+                  <th>{{ $t1("坐席ID") }}</th>
+                  <td>
+                    <el-input
+                      size="small"
+                      v-model="user.agentId"
+                      maxlength="200"
+                      clearable
+                    />
+                  </td>
+                  <th>{{ $t1("技能组ID") }}</th>
+                  <td>
+                    <el-input
+                      size="small"
+                      v-model="user.groupId"
+                      maxlength="200"
+                      clearable
+                    />
+                  </td>
+                  <th>{{ $t1("手机/sip号") }}</th>
+                  <td>
+                    <el-input
+                      size="small"
+                      v-model="user.voipAccount"
+                      maxlength="200"
+                      clearable
+                    />
+                  </td>
+                  <th>{{ $t1("登录方式") }}</th>
+                  <td>
+                    <el-select
+                      size="small"
+                      v-model="user.callWay"
+                      maxlength="200"
+                      clearable
+                    >
+                      <el-option label="sip话机" value="2"></el-option>
+                      <el-option label="手机" value="3"></el-option>
+                    </el-select>
+                  </td>
+                </tr>
                 <tr>
                   <th>{{ $t1("头像") }}</th>
                   <td colspan="7">
@@ -464,7 +505,9 @@
                             <i
                               slot="suffix"
                               class="el-input__icon el-icon-search"
-                              @click="openSelectPositionDialog(row, rowIndex, $table)"
+                              @click="
+                                openSelectPositionDialog(row, rowIndex, $table)
+                              "
                             ></i>
                           </el-input>
                           <template v-else>
@@ -570,7 +613,8 @@ export default {
     var validatePass2 = (rule, value, callback) => {
       const isPassRequired = !this.dataId;
       const rePassword = value != undefined ? value : "";
-      const password = this.user.password != undefined ? this.user.password : "";
+      const password =
+        this.user.password != undefined ? this.user.password : "";
 
       if (isPassRequired && rePassword == "") {
         callback(new Error(this.$t1("确认密码不能为空")));
@@ -605,8 +649,12 @@ export default {
       showSaleOrgDialog: false,
       showPositionDialog: false,
       saleOrgPositionIndex: 0,
-      passRules: [{ validator: validatePass, trigger: "blur", required: false }],
-      pass2Rules: [{ validator: validatePass2, trigger: "blur", required: false }],
+      passRules: [
+        { validator: validatePass, trigger: "blur", required: false },
+      ],
+      pass2Rules: [
+        { validator: validatePass2, trigger: "blur", required: false },
+      ],
       activeName: "first",
       userCustomerListDTO: {
         userCustomerDTOs: [],
@@ -733,7 +781,8 @@ export default {
       this.$refs.editForm.$baseValidate((valid) => {
         if (valid) {
           this.$baseConfirm(this.$t1("您确定要保存吗？")).then(() => {
-            var url = USER_PREFIX + (this.isEdit ? "/user/update" : "/user/save");
+            var url =
+              USER_PREFIX + (this.isEdit ? "/user/update" : "/user/save");
             let formData = this.getReqFormData();
             this.$http({
               url: url,
@@ -1169,7 +1218,8 @@ export default {
             oItems.push(map[item.positionId]);
           }
         });
-        tableData[saleOrgPositionIndex].userSaleOrgPositionDTOs = oItems.concat(items);
+        tableData[saleOrgPositionIndex].userSaleOrgPositionDTOs =
+          oItems.concat(items);
       } else {
         tableData[saleOrgPositionIndex].userSaleOrgPositionDTOs = [];
       }
@@ -1248,7 +1298,9 @@ export default {
           success: (res) => {
             let roleList = res.objx || [];
             let distributorCode = this.outUserCodes[0];
-            this.distributorRole = roleList.find((item) => item.code == distributorCode);
+            this.distributorRole = roleList.find(
+              (item) => item.code == distributorCode
+            );
           },
         });
       }
@@ -1260,7 +1312,8 @@ export default {
         method: "post",
         data: { code: "outUserRoleCode" },
         success: (res) => {
-          let value = !res.objx || !res.objx.value ? "distributor" : res.objx.value;
+          let value =
+            !res.objx || !res.objx.value ? "distributor" : res.objx.value;
           let codes = value.split(",");
           this.outUserCodes = codes; //外部用户编码
           this.initRoleDialogParam(); //初始化角色弹框的查询参数