cloud-web-corejs 1.0.54-dev.800 → 1.0.54-dev.802

package/src/views/user/outLink/cc_form_view.vue

@@ -45,10 +45,6 @@ const CC_CONFIG = {
   formCode: "patentApply_edit",
   // 写死的单据 ID，新建为 0
   dataId: "0",
-  // 换取 tp 的后台接口（需后台提供：入参 appId/appKey/account/callNo，出参 tp）
-  tpApi: USER_PREFIX + "/thirdparty_auth/getTpByCallCenter",
-  // 业务系统固定下发的 appid，链接未带时用它兜底
-  defaultAppId: "6789B4BBAF71D4F9D79E0912856E04E",
 };
 
 /** 透传给业务表单的参数（form_outLinkView 会 v-bind 到目标组件上） */
@@ -73,7 +69,12 @@ export default {
       let keys = Object.keys(query);
       for (let name of names) {
         let key = keys.find((k) => k.toLowerCase() === name.toLowerCase());
-        if (key && query[key] !== "" && query[key] !== undefined && query[key] !== null) {
+        if (
+          key &&
+          query[key] !== "" &&
+          query[key] !== undefined &&
+          query[key] !== null
+        ) {
           return query[key];
         }
       }
@@ -81,69 +82,71 @@ export default {
     },
     resolveParams() {
       return {
-        appId: this.pickQuery("appid", "appId") || CC_CONFIG.defaultAppId,
-        appKey: this.pickQuery("appkey", "appKey"),
+        appid: this.pickQuery("appid"),
+        appkey: this.pickQuery("appkey"),
         account: this.pickQuery("account"),
-        callNo: this.pickQuery("callNo", "callno", "phone"),
+        callNo: this.pickQuery("callNo"),
       };
     },
-    /** 兼容后台把 tp 放在 objx 字符串 / objx.tp / objx.thirdpartyInfo 三种返回形态 */
-    resolveTp(res) {
-      let objx = res && res.objx;
-      if (!objx) return "";
-      if (typeof objx === "string") return objx;
-      return objx.tp || objx.thirdpartyInfo || objx.thirdparty_info || "";
-    },
     start() {
       this.errMsg = "";
       let params = this.resolveParams();
-      let missing = ["appId", "appKey", "account"].filter((key) => !params[key]);
+      let missing = ["appkey", "account"].filter((key) => !params[key]);
       if (missing.length) {
-        this.errMsg = "缺少必要参数：" + missing.join("、") + "，请检查呼叫中心跳转链接";
+        this.errMsg =
+          "缺少必要参数：" + missing.join("、") + "，请检查呼叫中心跳转链接";
         return;
       }
-      this.getTp(params);
+      this.getToken(params);
     },
-    getTp(params) {
+    getToken(params) {
       this.loading = true;
       this.$http({
-        url: CC_CONFIG.tpApi,
+        url: USER_PREFIX + "/auth/login",
         method: "post",
-        data: params,
+        data: {
+          custom: "true",
+          loginFlag: 1,
+          appkey: params.appkey,
+          account: params.account,
+        },
         // 无 token 场景，且自行接管提示与遮罩
         useToken: false,
         isLoading: false,
         failMsg: false,
         errorMsg: false,
         success: (res) => {
-          let tp = this.resolveTp(res);
-          if (!tp) {
+          let token = res.objx;
+          if (!token) {
             this.loading = false;
-            this.errMsg = "身份信息(tp)获取失败：接口未返回 tp";
+            this.errMsg = "身份信息(token)获取失败：接口未返回 token";
             return;
           }
-          this.redirect(params, tp);
+          this.redirect(params, token);
         },
         fail: (res) => {
           this.loading = false;
-          this.errMsg = "身份信息(tp)获取失败：" + ((res && (res.content || res.msg)) || "接口返回异常");
+          this.errMsg =
+            "身份信息(token)获取失败：" +
+            ((res && (res.content || res.msg)) || "接口返回异常");
         },
         error: (err) => {
           this.loading = false;
-          this.errMsg = "身份信息(tp)获取失败：" + ((err && err.message) || "网络异常");
+          this.errMsg =
+            "身份信息(token)获取失败：" + ((err && err.message) || "网络异常");
         },
       });
     },
-    redirect(params, tp) {
+    redirect(params, token) {
       this.loadingText = "正在打开单据…";
       let query = {
         url: CC_CONFIG.formUrl,
         formCode: CC_CONFIG.formCode,
         dataId: CC_CONFIG.dataId,
-        tp: tp,
+        access_token: token,
       };
       // 来电号码等业务参数透传给表单，供表单脚本取用
-      let source = { ...params, agentId: params.appKey };
+      let source = { ...params, agentId: params.appkey };
       PASS_THROUGH.forEach((key) => {
         if (source[key]) {
           query[key] = source[key];

package/src/views/user/wf/wf_manage/list.vue

@@ -312,6 +312,18 @@
                     </el-select>
                   </template>
                 </vxe-form-item>
+                <vxe-form-item
+                  :title="$t1('禁用用户') + ':'"
+                  field="disabledUserName"
+                >
+                  <template v-slot>
+                    <el-input
+                      v-model="formData2.disabledUserName"
+                      size="small"
+                      clearable
+                    />
+                  </template>
+                </vxe-form-item>
               </vxe-form>
             </template>
           </vxe-grid>
@@ -675,7 +687,11 @@ export default {
                 owner: res.owner,
                 targetPath: res.targetPath,
                 bizParams: this.param,
-                viewMeta: { visibleKey: "showWfContent", defaultShowWfContent: true, viewType: 1 },
+                viewMeta: {
+                  visibleKey: "showWfContent",
+                  defaultShowWfContent: true,
+                  viewType: 1,
+                },
               }
             : null;
         this.wfContent = res.component;