cloud-web-corejs 1.0.54-dev.22 → 1.0.54-dev.220

package/src/views/user/notify_template/list2.vue

@@ -0,0 +1,190 @@
+<template>
+  <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>
+      </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">
+            <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>
+                  <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>
+                  <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="ntCode">
+                  <template v-slot>
+                    <el-input v-model="formData.notifyType" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item :title="$t1('主题')+':'" field="ntName">
+                  <template v-slot>
+                    <el-input v-model="formData.ntName" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item :title="$t1('是否启用')+':'">
+                  <template v-slot>
+                    <el-select v-model="formData.enabled" clearable>
+                      <el-option :value="true" :label="$t1('启用')"></el-option>
+                      <el-option :value="false" :label="$t1('禁用')"></el-option>
+                    </el-select>
+                  </template>
+                </vxe-form-item>
+              </vxe-form>
+            </template>
+          </vxe-grid>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import editView from './edit2.vue';
+
+export default {
+  name: 'notify_template:list2',
+  components: {editView},
+  data() {
+    return {
+      activeName: 'second',
+      dataId: 0,
+      showEdit: false,
+      vxeOption: {},
+      formData: {}
+    };
+  },
+  mounted() {
+    this.initTableList();
+  },
+  methods: {
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    resetEvent() {
+      this.formData = {};
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    openEditDialog(id) {
+      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_notifyTemplate_list-m2',
+        path: USER_PREFIX + '/notify_template/listPage',
+        param: () => {
+          return {
+            ...this.formData,
+            ntType: 1
+          };
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: this.$t1('邮件模板编码'),
+            field: 'notifyType',
+            width: 250,
+            fixed: 'left'
+          },
+          {
+            title: this.$t1('主题'),
+            field: 'ntName',
+            width: 150
+          },
+          {
+            title: this.$t1('是否启用'),
+            field: 'enabled',
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                if (row.enabled) {
+                  return [
+                    <div class="txt-status">
+                      <span>{this.$t1('启用')}</span>
+                    </div>
+                  ];
+                } else {
+                  return [
+                    <div class="txt-status disable">
+                      <span>{this.$t1('禁用')}</span>
+                    </div>
+                  ];
+                }
+              }
+            }
+          },
+          {title: this.$t1('备注'), field: 'remark', width: 150},
+          {
+            title: this.$t1('创建时间'),
+            field: 'createDate',
+            width: 150
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <div>
+                    <a
+                      href="javascript:void(0);"
+                      class="a-link"
+                      onclick={() => {
+                        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>
+                    </a>
+                  </div>
+                ];
+              }
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+    },
+    importExcel() {
+      let that = this;
+      that.$excelImport({
+        prefix: USER_PREFIX,
+        excel: USER_PREFIX + '/excelTemplate/notify_template/notifyTemplate.xlsx',
+        multi: false,
+        saveUrl: USER_PREFIX + '/notify_template/save',
+        callback: () => {
+          that.searchEvent();
+        }
+      });
+    }
+  }
+};
+</script>

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

@@ -64,6 +64,25 @@ export default {
 
       delete queryParam.urlmobile;
       delete queryParam.url;
+
+      if (purl.indexOf('.html') >= 0) {
+        let eUrl = purl;
+        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
+          }
+        }
+
+        location.href = eUrl;
+        return
+      }
+
       delete queryParam.dataId;
       delete queryParam.showWfContent;
       delete queryParam.access_token;
@@ -74,7 +93,6 @@ export default {
       let url = purl + '.vue';
       this.queryParam = queryParam;
       this.showWfContent = true;
-      await this.initI18n();
       // this.wfContent = require('@/views' + url).default;
       let t = "@base/views";
       let urlArr = [
@@ -82,25 +100,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.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);
-      return indexUtil.initI18nMessage("business", lang, true);
+      await indexUtil.initI18nMessage("business", lang, true);
     },
     login() {
       let token = this.$route.query.access_token;

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

@@ -8,6 +8,8 @@
 </template>
 
 <script>
+import {getToken} from "@base/utils/auth";
+
 export default {
   name: 'outLink',
   data() {
@@ -36,6 +38,21 @@ export default {
             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;

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

@@ -55,6 +55,25 @@ export default {
 
       delete queryParam.urlmobile;
       delete queryParam.url;
+
+      if (purl.indexOf('.html') >= 0) {
+        let eUrl = purl;
+        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
+          }
+        }
+
+        location.href = eUrl;
+        return
+      }
+
       delete queryParam.dataId;
       delete queryParam.showWfContent;
       delete queryParam.access_token;
@@ -72,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

@@ -33,11 +33,11 @@
                     <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>
@@ -96,11 +96,11 @@ export default {
             width: 150,
             fixed: 'left'
           },
-          {
+          /* {
             field: 'code',
             title: this.$t1('岗位编码'),
             width: 250
-          },
+          }, */
           {title: this.$t1('所属组织'), field: 'companyName', width: 150},
           {
             field: 'enabled',

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

@@ -114,13 +114,13 @@ export default {
             width: 250
           },
           {
-            field: 'createDate',
-            title: this.$t1('创建时间'),
+            field: '_createBy',
+            title: this.$t1('创建人'),
             width: 150
           },
           {
-            field: '_createBy',
-            title: this.$t1('创建人'),
+            field: 'createDate',
+            title: this.$t1('创建时间'),
             width: 150
           },
           {
@@ -128,6 +128,11 @@ export default {
             title: this.$t1('更新人'),
             width: 150
           },
+          {
+            field: 'modifyDate',
+            title: this.$t1('更新时间'),
+            width: 150
+          },
           {
             width: 47,
             fixed: 'right',

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
           },

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

@@ -12,7 +12,7 @@
     v-el-drag-dialog
     v-el-dialog-center
   >
-    <div class="cont" style="height:450px">
+    <div class="cont" style="height:65vh">
       <vxe-grid
         class="is-pointer"
         ref="table-m1"

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

@@ -34,11 +34,11 @@
                     <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>
@@ -106,11 +106,11 @@ export default {
             sortable: true,
             fixed: 'left'
           },
-          {
+          /* {
             title: this.$t1('角色编码'),
             field: 'code',
             width: 150
-          },
+          }, */
           {
             title: this.$t1('角色描述'),
             field: 'description',

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

@@ -12,7 +12,7 @@
     v-el-drag-dialog
     v-el-dialog-center
   >
-    <div class="cont" style="height:450px">
+    <div class="cont" style="height:65vh">
       <vxe-grid
         class="is-pointer"
         ref="table-m1"

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

@@ -7,7 +7,10 @@
                     @custom="$vxeTableUtil.customHandle">
             <template #form>
               <div class="clearfix screen-btns">
-                <div class="fl"></div>
+                <div class="fl">
+                  <base-table-export :option="{ title: $t1('机构导出'), targetRef: 'table-m1', conditionExport: false}"
+                                     :parent-target="_self"/>
+                </div>
                 <div class="fr">
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
                               plain>{{ $t1('重置') }}

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

@@ -12,7 +12,7 @@
     v-el-drag-dialog
     v-el-dialog-center
   >
-    <div class="cont" style="height:450px">
+    <div class="cont" style="height:65vh">
       <vxe-grid
         class="is-pointer"
         ref="table-m1"

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

@@ -7,7 +7,7 @@
           {{ dataId ? $t1('查看用户') : $t1('新增用户') }}
         </div>
         <div class="fr">
-          <!--          <temp-storage-button :option="tempStorageOption" v-if="!dataId"></temp-storage-button>-->
+          <temp-storage-button :option="tempStorageOption" v-if="!dataId"></temp-storage-button>
           <base-input-export :option="exportOption" :parent-target="_self" v-if="dataId"/>
           <el-button type="primary" plain class="button-sty" icon="el-icon-unlock" @click="unlock" v-if="user.locked"
                      v-hasPermi="'user:unlock'">{{ $t1('解锁') }}
@@ -136,14 +136,14 @@
                     <el-input size="small" v-model="user.email" maxlength="200" clearable/>
                   </el-form-item>
                 </td>
-                <th v-if="flag!=='2'">
-                  GUID
-                </th>
-                <td v-if="flag!=='2'">
-                  <el-form-item prop="guid" :rules="[{ required: false, trigger: 'blur' }]">
-                    <el-input size="small" v-model="user.guid" maxlength="200" clearable/>
-                  </el-form-item>
-                </td>
+                <!--                <th v-if="flag!=='2'">
+                                  GUID
+                                </th>
+                                <td v-if="flag!=='2'">
+                                  <el-form-item prop="guid" :rules="[{ required: false, trigger: 'blur' }]">
+                                    <el-input size="small" v-model="user.guid" maxlength="200" clearable/>
+                                  </el-form-item>
+                                </td>-->
                 <th>{{ $t1('地址') }}</th>
                 <td colspan="3">
                   <el-input size="small" v-model="user.address" class="b" maxlength="255" clearable/>
@@ -215,12 +215,19 @@
                   </el-button>
                 </div>
                 <div class="title-form">
-                  <span v-if="flag==='2'">
+                  <span>
                     <el-form-item label="GUID" :prop="'userCompanyInfoDTOs.'+index1+'.guid'"
                                   :rules="[{ required: false, trigger: 'blur' }]">
                     <el-input size="small" v-model="item.guid" maxlength="200" clearable/>
                   </el-form-item>
                   </span>
+                  <span>
+                    <el-form-item label="是否默认组织" :prop="'userCompanyInfoDTOs.'+index1+'.defaults'"
+                                  :rules="[{ required: false, trigger: 'blur' }]">
+                      <el-checkbox v-model="item.defaults"
+                                   @change="changeCompanyDefault(item)"></el-checkbox>
+                  </el-form-item>
+                  </span>
                 </div>
                 <div class="m-2">
                   <div class="d-item" style="width: 65%;">
@@ -297,7 +304,7 @@
 
 <script>
 import xeUtils from "xe-utils";
-/*import tempStorageButton from "@base/components/tempStorage/index.vue";*/
+import tempStorageButton from "@base/components/tempStorage/index.vue";
 
 
 export default {
@@ -307,8 +314,8 @@ export default {
     companyDialog: () => import('../../../views/user/company_info/dialog.vue'),
     saleOrgDialog: () => import('../../../views/user/sale_org/dialog.vue'),
     positionDialog: () => import('../../../views/user/position/dialog.vue'),
-    countryDialog: () => import('../../../views/user/country/dialog.vue')/*,
-    tempStorageButton*/
+    countryDialog: () => import('../../../views/user/country/dialog.vue'),
+    tempStorageButton
   },
   props: ['_dataId', 'userType', 'flag'],
   data() {
@@ -590,12 +597,13 @@ export default {
                     disabled={disabled}
                     onchange={() => {
                       this.gridSaleOrgDataMap[row.companyCode].forEach((item, index) => {
-                        if (index == rowIndex) {
-                          item.defaults = true;
-                        } else {
+                        if (index !== rowIndex) {
                           item.defaults = false;
                         }
                       });
+                      this.$nextTick(()=>{
+                        row.defaults = true;
+                      })
                     }}
                   />
                 ];
@@ -698,7 +706,7 @@ export default {
       if (rows.length > 0) {
         let outUserCodes = this.outUserCodes;
         if (this.userType === 1) {
-          //企业用户
+          //组织用户
           rows = rows.filter(row => !outUserCodes.includes(row.code));
         } else if (this.userType === 2) {
           //外部用户
@@ -754,7 +762,7 @@ export default {
         });
         var items = [];
         rows.forEach(row => {
-          const item = {companyCode: row.companyCode, companyName: row.companyName, guid: null};
+          const item = {companyCode: row.companyCode, companyName: row.companyName, guid: null, defaults: false};
           if (!map[item.companyCode]) {
             items.push(item);
           }
@@ -763,6 +771,9 @@ export default {
         });
         // $grid.insertAt(items, -1);
         this.user.userCompanyInfoDTOs.splice(0, 0, ...items);
+        if (this.user.userCompanyInfoDTOs.length == 1) {
+          this.user.userCompanyInfoDTOs[0].defaults = true
+        }
         // this.user.userCompanyInfoDTOs = this.user.userCompanyInfoDTOs.concat(items);
       }
       callback && callback();
@@ -973,7 +984,7 @@ export default {
     initRoleDialogParam() {
       //初始化角色弹框的查询参数
       if (this.userType == 1) {
-        //企业用户
+        //组织用户
         this.roleDialogParam = {
           queryAll: true,
           neCodes: [...this.outUserCodes]
@@ -1015,6 +1026,15 @@ export default {
         this.user.countryName = row.countryName;
         this.user.countryCode = row.countryCode;
       }
+    },
+    changeCompanyDefault(item) {
+      let companyCode = item.companyCode
+      if (item.defaults) {
+        this.user.userCompanyInfoDTOs.forEach(row => {
+          row.defaults = row.companyCode == companyCode;
+        })
+      }
+
     }
   }
 };