cloud-web-corejs 1.0.54-dev.3 → 1.0.54-dev.30

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;
@@ -62,6 +81,8 @@ export default {
       delete queryParam.thirdparty_info;
       delete queryParam.i18nLang;
 
+
+
       let url = purl + '.vue';
       this.queryParam = queryParam;
       this.showWfContent = true;

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

@@ -45,7 +45,7 @@
               <tr>
                 <th>{{ $t1('附件') }}</th>
                 <td colspan="7">
-                  <baseUpload accept="file" multi="true" :file.sync="sysNoticeAttachmentDTOs"></baseUpload>
+                  <baseUpload accept="file" multi="true" :file.sync="sysNoticeAttachmentDTOs" :auto="true"></baseUpload>
                 </td>
               </tr>
               <tr>

package/src/views/user/system_notice/infoDialog.vue

@@ -51,6 +51,9 @@ export default {
     },
     param: {
       default: null
+    },
+    queryParam: {
+      default: null
     }
   },
   created() {
@@ -102,7 +105,8 @@ export default {
         url: url,
         data: {
           publish: true,
-          current: pageNumber
+          current: pageNumber,
+          ...this.queryParam
         },
         success: res => {
           let page = res.objx;
@@ -121,9 +125,11 @@ export default {
             });
             this.currentRow = currentRow;
             this.currentIndex = currentIndex;
+            this.handleRead(this.currentIndex)
           } else {
             this.currentIndex = 0;
             this.currentRow = page.records.length > 0 ? page.records[0] : {};
+            this.handleRead(this.currentIndex)
           }
         }
       });
@@ -132,6 +138,24 @@ export default {
       this.flag = 0;
       this.currentIndex = index;
       this.currentRow = item;
+      this.handleRead(index)
+    },
+    handleRead(index, callback) {
+      let row = this.page.records[index];
+      if (row.readed !== 1) {
+        this.$http({
+          url: USER_PREFIX + `/system_notice/read`,
+          method: `post`,
+          data: {id: row.id},
+          isLoading: true,
+          success: res => {
+            row.readed = 1;
+            callback && callback()
+          }
+        });
+      } else {
+        callback && callback()
+      }
     },
     initAttachfo() {
       let id = this.currentRow && this.currentRow.id ? this.currentRow.id : '';

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('解锁') }}
@@ -297,7 +297,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 +307,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() {

package/src/views/user/user/form_edit.vue

@@ -116,6 +116,17 @@
             </table>
           </template>
         </baseTabPane>
+        <baseTabPane :label="$t1('表单分类信息')">
+          <template #default>
+            <vxe-grid
+              ref="table-m1"
+              :data="menuKindAuthDTOs"
+              v-bind="vxeOption"
+              @resizable-change="$vxeTableUtil.onColumnWitchChange"
+              @custom="$vxeTableUtil.customHandle"
+            ></vxe-grid>
+          </template>
+        </baseTabPane>
       </baseTabs>
     </el-form>
     <groudDialog v-if="showGroupDialog" :visiable.sync="showGroupDialog"
@@ -170,7 +181,6 @@ export default {
         flag: 8,
         groupCode: null
       },
-      vxeOption: {},
       companyInfoOption: {},
       userRoleOption: {},
       showRoleDialog: false,
@@ -218,7 +228,9 @@ export default {
       showCountryDialog: false,
       userInfo: {},
       userGroups: [],
-      showGroupDialog: false
+      showGroupDialog: false,
+      vxeOption:{},
+      menuKindAuthDTOs:[]
     };
   },
   computed: {
@@ -231,13 +243,11 @@ export default {
   },
   async mounted() {
 
-    // this.getEainsGroupDTO();
-    // await this.initOutUserRoleCode();
-    // await this.initDistributorRole();
     this.getUserInfo()
     this.getUserGroups()
     this.getData();
     this.getConpanyInfo()
+    this.initTableM1();
   },
   methods: {
     getData() {
@@ -431,49 +441,6 @@ export default {
     addCurrentCompany(callback) {
       this.confirmInsertCompany([this.companyInfo], callback);
     },
-    initDistributorRole() {
-      if (this.outUserCodes && this.outUserCodes.length == 1) {
-        return this.$http({
-          url: USER_PREFIX + '/role/list',
-          method: 'post',
-          success: res => {
-            let roleList = res.objx || [];
-            let distributorCode = this.outUserCodes[0];
-            this.distributorRole = roleList.find(item => item.code == distributorCode);
-          }
-        });
-      }
-    },
-    async initOutUserRoleCode() {
-      //初始化外部用户编码
-      return this.$http({
-        url: USER_PREFIX + '/system_parameter/getByCode',
-        method: 'post',
-        data: {"code": "outUserRoleCode"},
-        success: res => {
-          let value = (!res.objx || !res.objx.value) ? "distributor" : res.objx.value;
-          let codes = value.split(',');
-          this.outUserCodes = codes;//外部用户编码
-          this.initRoleDialogParam();//初始化角色弹框的查询参数
-        }
-      });
-    },
-    initRoleDialogParam() {
-      //初始化角色弹框的查询参数
-      if (this.userType == 1) {
-        //企业用户
-        this.roleDialogParam = {
-          queryAll: true,
-          neCodes: [...this.outUserCodes]
-        };
-      } else if (this.userType == 2) {
-        //外部用户
-        this.roleDialogParam = {
-          queryAll: true,
-          eqCodes: [...this.outUserCodes]
-        };
-      }
-    },
     unlock() {
       this.$baseConfirm(this.$t1('您确定要解锁吗？')).then(() => {
         var url = USER_PREFIX + '/user/unlockLoginAccount';
@@ -526,7 +493,47 @@ export default {
           this.userGroups = res.objx?.records || [];
         }
       });
-    }
+    },
+    initTableM1() {
+      const tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'edit-user-menuKind-m1',
+        columns: [
+          {type: 'checkbox', fixed: 'left', width: 48, resizable: false},
+          {
+            title: this.$t1('表单分类名称'),
+            field: 'menuKindName',
+            width: 350,
+            fixed: 'left'
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+      if (this.dataId) {
+        this.$http({
+          aes: true,
+          url: USER_PREFIX + `/menu_kind_auth/list`,
+          method: `post`,
+          data: {
+            userId: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            this.menuKindAuthDTOs = res.objx || [];
+          }
+        });
+      }
+    },
   }
 };
 </script>