cloud-web-corejs 1.0.54-dev.54 → 1.0.54-dev.541

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

@@ -1,48 +1,104 @@
 <template>
   <div>
-    <div id="containt" style="margin-bottom: -4px;" v-if="type==1">
-      <iframe v-if="url" :src="url" style="width: 100%;height:calc(100vh - 40px)"></iframe>
+    <div id="containt" style="margin-bottom: -4px" v-if="type == 1">
+      <iframe
+        v-if="url"
+        :src="url"
+        style="width: 100%; height: calc(100vh - 40px)"
+      ></iframe>
     </div>
-    <component :is="content" v-if="type==2"></component>
+    <component :is="content" v-if="type == 2"></component>
   </div>
 </template>
 
 <script>
+import { getToken } from "@base/utils/auth";
+
 export default {
-  name: 'outLink',
+  name: "outLink",
   data() {
     return {
       url: null,
       content: null,
-      type: 0
+      type: 0,
     };
   },
   mounted() {
     let url = this.$route.query.url;
     let route = this.$route.query.route;
     if (route) {
-      this.content = require('@/views' + route).default;
+      this.content = require("@/views" + route).default;
       this.type = 2;
     } else {
-      if (url.indexOf('dw=true') >= 0) {
+      let params = this.getCustomReqUrlAndCleanUrl(url);
+      let reqUrl = params.custom_req_url;
+      if (reqUrl) {
+        this.$http({
+          url: reqUrl,
+          method: `post`,
+          data: { thirdUrl: params.newUrl },
+          isLoading: true,
+          // modalStrictly: true,
+          success: (res) => {
+            this.url = res.objx;
+            this.type = 1;
+          },
+        });
+      } else if (url.indexOf("dw=true") >= 0) {
         this.$http({
           url: USER_PREFIX + `/dw_auth/getDwAsc`,
           method: `post`,
           data: {},
           isLoading: true,
           // modalStrictly: true,
-          success: res => {
-            this.url = url.replace('dw=true', 'dw=' + res.objx.dw) + '&param=' + res.objx.param;
+          success: (res) => {
+            this.url =
+              url.replace("dw=true", "dw=" + res.objx.dw) + "&param=" + res.objx.param;
+            this.type = 1;
+          },
+        });
+      } else if (url.indexOf("token=platform_token") >= 0) {
+        this.$http({
+          url: YX_PREFIX + `/fundPlatform/getToken`,
+          method: `post`,
+          data: {},
+          isLoading: true,
+          success: (res) => {
+            this.url = url.replace("token=platform_token", "token=" + res.objx);
             this.type = 1;
-          }
+          },
         });
+      } else if (url.indexOf("token=true") >= 0) {
+        let token = getToken();
+        this.url = url.replace("token=true", "token=" + token);
+        this.type = 1;
       } else {
         this.url = url;
         this.type = 1;
       }
     }
   },
-  methods: {}
+  methods: {
+    getCustomReqUrlAndCleanUrl(url) {
+      // 直接使用正则表达式匹配
+      const match = url.match(/[?&]custom_req_url=([^&?#]+)/);
+      if (match) {
+        const customReqUrl = decodeURIComponent(match[1]);
+        // 移除匹配到的参数部分
+        const newUrl = url.replace(match[0], match[0].startsWith("?") ? "?" : "");
+
+        return {
+          custom_req_url: customReqUrl,
+          newUrl: newUrl.replace(/\?$/, "").replace(/\?&/, "?"),
+        };
+      }
+
+      return {
+        custom_req_url: "",
+        newUrl: url,
+      };
+    },
+  },
 };
 </script>
 

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

@@ -56,17 +56,17 @@ export default {
       delete queryParam.urlmobile;
       delete queryParam.url;
 
-      if(purl.indexOf('.html')>=0){
+      if (purl.indexOf('.html') >= 0) {
         let eUrl = purl;
-        let pstr = Object.keys(queryParam).map(key=>{
-          return key+"="+queryParam[key]
+        let pstr = Object.keys(queryParam).map(key => {
+          return key + "=" + queryParam[key]
         }).join("&")
 
-        if(pstr){
-          if(purl.indexOf('.html?')>=0){
-            eUrl = eUrl+'&'+pstr
-          }else{
-            eUrl = eUrl+'?'+pstr
+        if (pstr) {
+          if (purl.indexOf('.html?') >= 0) {
+            eUrl = eUrl + '&' + pstr
+          } else {
+            eUrl = eUrl + '?' + pstr
           }
         }
 
@@ -81,8 +81,6 @@ export default {
       delete queryParam.thirdparty_info;
       delete queryParam.i18nLang;
 
-
-
       let url = purl + '.vue';
       this.queryParam = queryParam;
       this.showWfContent = true;
@@ -93,27 +91,34 @@ export default {
         '/user/form/view/list.vue',
         '/user/form/view/edit.vue'
       ]
-      if (urlArr.includes(url)) {
-        this.wfContent = require('@base/views' + url).default;
-      } else if (url.startsWith(t)) {
-        let path = url.slice(t.length);
-        this.wfContent = require('@base/views' + path).default;
-      } else {
-        this.wfContent = require('@/views' + url).default;
-      }
-
-      this.initI18n();
-
+      this.initUserInfo(() => {
+        this.initI18n();
+        if (urlArr.includes(url)) {
+          this.wfContent = require('@base/views' + url).default;
+        } else if (url.startsWith(t)) {
+          let path = url.slice(t.length);
+          this.wfContent = require('@base/views' + path).default;
+        } else {
+          this.wfContent = require('@/views' + url).default;
+        }
+      })
+    },
+    initUserInfo(callback) {
+      this.$store
+        .dispatch('user/getInfo2')
+        .then(() => {
+          callback && callback();
+        });
     },
     getI18nLang() {
       let i18nLang = this.$route.query.i18nLang || "zh";
       return i18nLang;
     },
-    initI18n() {
+    async initI18n() {
       let lang = this.getI18nLang();
       this.$i18n.locale = lang // 设置给本地的i18n插件
       localStorage.setItem("i18n-lang", lang);
-      indexUtil.initI18nMessage("business", lang, true);
+      await indexUtil.initI18nMessage("business", lang, true);
     },
     login() {
       let token = this.$route.query.access_token;

package/src/views/user/position/list.vue

@@ -2,42 +2,77 @@
   <div id="containt">
     <el-tabs v-model="activeName" class="tab-box">
       <el-tab-pane :label="$t1('常规')" name="first">
-        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :parent-target="_self"
-                  @reload="$reloadHandle"></editView>
+        <editView
+          v-if="showEdit"
+          visible-key="showEdit"
+          :_dataId.sync="dataId"
+          :parent-target="_self"
+          @reload="$reloadHandle"
+        ></editView>
       </el-tab-pane>
       <el-tab-pane :label="$t1('列表')" name="second">
         <div class="grid-height">
-          <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
-                    @custom="$vxeTableUtil.customHandle">
+          <vxe-grid
+            ref="table-m1"
+            v-bind="vxeOption"
+            @resizable-change="$vxeTableUtil.onColumnWitchChange"
+            @custom="$vxeTableUtil.customHandle"
+          >
             <template #form>
               <div class="clearfix screen-btns">
                 <div class="fl">
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
-                    {{ $t1('新增') }}
+                  <vxe-button
+                    status="primary"
+                    class="button-sty"
+                    icon="el-icon-plus"
+                    @click="openEditDialog"
+                  >
+                    {{ $t1("新增") }}
                   </vxe-button>
-                  <base-table-export :option="{ title: $t1('岗位导出'), targetRef: 'table-m1'}" :parent-target="_self"/>
+                  <base-table-export
+                    :option="{ title: $t1('岗位导出'), targetRef: 'table-m1' }"
+                    :parent-target="_self"
+                  />
                 </div>
                 <div class="fr">
-                  <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                              plain>{{ $t1('重置') }}
+                  <vxe-button
+                    icon="el-icon-brush"
+                    class="button-sty"
+                    @click="resetEvent"
+                    type="text"
+                    status="primary"
+                    plain
+                    >{{ $t1("重置") }}
                   </vxe-button>
-                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
-                    {{ $t1('搜索') }}
+                  <vxe-button
+                    status="warning"
+                    icon="el-icon-search"
+                    class="button-sty"
+                    @click="searchEvent"
+                  >
+                    {{ $t1("搜索") }}
                   </vxe-button>
                 </div>
               </div>
-              <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
-                        @submit="searchEvent" @reset="searchEvent">
-                <vxe-form-item :title="$t1('岗位名称')+':'" field="name">
+              <vxe-form
+                ref="form"
+                class="screen-box"
+                title-width="92px"
+                title-align="right"
+                :data="formData"
+                @submit="searchEvent"
+                @reset="searchEvent"
+              >
+                <vxe-form-item :title="$t1('岗位名称') + ':'" field="name">
                   <template v-slot>
-                    <el-input v-model="formData.name" size="small" clearable/>
+                    <el-input v-model="formData.name" size="small" clearable />
                   </template>
                 </vxe-form-item>
-                <vxe-form-item :title="$t1('岗位编码')+':'" field="code">
+                <!-- <vxe-form-item :title="$t1('岗位编码')+':'" field="code">
                   <template v-slot>
                     <el-input v-model="formData.code" size="small" clearable/>
                   </template>
-                </vxe-form-item>
+                </vxe-form-item> -->
               </vxe-form>
             </template>
           </vxe-grid>
@@ -48,18 +83,18 @@
 </template>
 
 <script>
-import editView from './edit.vue';
+import editView from "./edit.vue";
 
 export default {
-  name: 'position:list',
-  components: {editView},
+  name: "position:list",
+  components: { editView },
   data() {
     return {
-      activeName: 'second',
+      activeName: "second",
       dataId: 0,
       showEdit: false,
       vxeOption: {},
-      formData: {}
+      formData: {},
     };
   },
   mounted() {
@@ -67,85 +102,85 @@ export default {
   },
   methods: {
     searchEvent() {
-      this.$refs['table-m1'].commitProxy('reload');
+      this.$refs["table-m1"].commitProxy("reload");
     },
     resetEvent() {
       this.formData = {};
-      this.$refs['table-m1'].commitProxy('reload');
+      this.$refs["table-m1"].commitProxy("reload");
     },
     openEditDialog(id) {
-      this.dataId = !id || typeof id == 'object' ? 0 : id;
-      this.activeName = 'first';
-      this.$openEditView('showEdit');
+      this.dataId = !id || typeof id == "object" ? 0 : id;
+      this.activeName = "first";
+      this.$openEditView("showEdit");
     },
     initTableList() {
       let that = this;
       let tableOption = {
         vue: this,
-        tableRef: 'table-m1',
-        tableName: 'basic_position_list-m2',
-        path: USER_PREFIX + '/position/listCurrentPage',
+        tableRef: "table-m1",
+        tableName: "basic_position_list-m2",
+        path: USER_PREFIX + "/position/listCurrentPage",
         param: () => {
           return this.formData;
         },
         columns: [
-          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
           {
-            title: this.$t1('岗位名称'),
-            field: 'name',
+            title: this.$t1("岗位名称"),
+            field: "name",
             width: 150,
-            fixed: 'left'
+            fixed: "left",
           },
-          {
+          /* {
             field: 'code',
             title: this.$t1('岗位编码'),
             width: 250
-          },
-          {title: this.$t1('所属组织'), field: 'companyName', width: 150},
+          }, */
+          { title: this.$t1("所属组织"), field: "companyName", width: 150 },
           {
-            field: 'enabled',
-            title: this.$t1('是否启用'),
+            field: "enabled",
+            title: this.$t1("是否启用"),
             width: 150,
             slots: {
-              default: ({row}) => {
+              default: ({ row }) => {
                 if (row.enabled) {
                   return [
                     <div class="txt-status">
-                      <span>{this.$t1('启用')}</span>
-                    </div>
+                      <span>{this.$t1("启用")}</span>
+                    </div>,
                   ];
                 } else {
                   return [
                     <div class="txt-status disable">
-                      <span>{this.$t1('禁用')}</span>
-                    </div>
+                      <span>{this.$t1("禁用")}</span>
+                    </div>,
                   ];
                 }
-              }
-            }
+              },
+            },
           },
           {
-            field: 'createDate',
-            title: this.$t1('创建时间'),
-            width: 150
+            field: "createDate",
+            title: this.$t1("创建时间"),
+            width: 150,
           },
           {
-            field: '_createBy',
-            title: this.$t1('创建人'),
-            width: 150
+            field: "_createBy",
+            title: this.$t1("创建人"),
+            width: 150,
           },
           {
-            field: '_modifyBy',
-            title: this.$t1('更新人'),
-            width: 150
+            field: "_modifyBy",
+            title: this.$t1("更新人"),
+            width: 150,
           },
           {
             width: 47,
-            fixed: 'right',
-            title: '',
+            fixed: "right",
+            title: "",
             sortable: false,
             slots: {
-              default: ({row}) => {
+              default: ({ row }) => {
                 return [
                   <div>
                     <a
@@ -155,19 +190,40 @@ export default {
                         this.openEditDialog(row.id);
                       }}
                     >
-                      <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
-                                  popper-class="tooltip-skin">
-                        <i class="el-icon-edit"/>
+                      <el-tooltip
+                        enterable={false}
+                        effect="dark"
+                        content={this.$t1("查看")}
+                        placement="top"
+                        popper-class="tooltip-skin"
+                      >
+                        <i class="el-icon-edit" />
                       </el-tooltip>
                     </a>
-                  </div>
+                  </div>,
                 ];
-              }
-            }
-          }
-        ]
+              },
+            },
+          },
+        ],
+        config: {
+          loadingConfig: {
+            icon: "vxe-icon-indicator roll",
+            text: "正在拼命加载中...",
+          },
+          slots: {
+            loading() {
+              return `<div class="vxe-loading tttt">
+                <div class="vxe-loading__text">{this.loadingConfig.text}</div>
+                <div class="vxe-loading__icon">
+                  <i class={this.loadingConfig.icon}></i>
+                </div>
+              </div>`;
+            },
+          },
+        },
       };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         this.vxeOption = opts;
       });
     },
@@ -175,14 +231,14 @@ export default {
       let that = this;
       that.$excelImport({
         prefix: USER_PREFIX,
-        excel: USER_PREFIX + '/excelTemplate/position/position.xlsx',
+        excel: USER_PREFIX + "/excelTemplate/position/position.xlsx",
         multi: false,
-        saveUrl: USER_PREFIX + '/position/save',
+        saveUrl: USER_PREFIX + "/position/save",
         callback: () => {
           that.searchEvent();
-        }
+        },
       });
-    }
-  }
+    },
+  },
 };
 </script>

package/src/views/user/project_tag/dialog.vue

@@ -144,19 +144,24 @@ export default {
             field: 'tagRemark',
             width: 250
           },
+          {
+            field: 'createBy',
+            title: this.$t1('创建人'),
+            width: 150
+          },
           {
             field: 'createDate',
             title: this.$t1('创建时间'),
             width: 150
           },
           {
-            field: '_createBy',
-            title: this.$t1('创建人'),
+            field: 'modifyBy',
+            title: this.$t1('更新人'),
             width: 150
           },
           {
-            field: '_modifyBy',
-            title: this.$t1('更新人'),
+            field: 'modifyDate',
+            title: this.$t1('更新时间'),
             width: 150
           },
           {

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

@@ -46,11 +46,11 @@
             </tr>
             <tr>
               <th>{{ $t1('创建人') }}</th>
-              <td>{{ projectTag._createBy }}</td>
+              <td>{{ projectTag.createBy }}</td>
               <th>{{ $t1('创建时间') }}</th>
               <td>{{ projectTag.createDate }}</td>
               <th>{{ $t1('更新人') }}</th>
-              <td>{{ projectTag._modifyBy }}</td>
+              <td>{{ projectTag.modifyBy }}</td>
               <th>{{ $t1('更新时间') }}</th>
               <td>{{ projectTag.modifyDate }}</td>
             </tr>

package/src/views/user/project_tag/list.vue

@@ -113,19 +113,24 @@ export default {
             field: 'tagRemark',
             width: 250
           },
+          {
+            field: 'createBy',
+            title: this.$t1('创建人'),
+            width: 150
+          },
           {
             field: 'createDate',
             title: this.$t1('创建时间'),
             width: 150
           },
           {
-            field: '_createBy',
-            title: this.$t1('创建人'),
+            field: 'modifyBy',
+            title: this.$t1('更新人'),
             width: 150
           },
           {
-            field: '_modifyBy',
-            title: this.$t1('更新人'),
+            field: 'modifyDate',
+            title: this.$t1('更新时间'),
             width: 150
           },
           {

package/src/views/user/push_setting/list.vue

@@ -32,7 +32,7 @@
                     <el-input v-model="formData.dataType" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="推送企业编码:" field="pushCompanyCode">
+                <vxe-form-item title="推送组织编码:" field="pushCompanyCode">
                   <template v-slot>
                     <el-input v-model="formData.pushCompanyCode" size="small" clearable/>
                   </template>
@@ -142,7 +142,7 @@ export default {
             fixed: 'left'
           },
           {
-            title: '推送企业编码',
+            title: '推送组织编码',
             field: 'pushCompanyCode',
             width: 150
           },