Browse Source

企业管理增加vip等信息

ljb 9 months ago
parent
commit
7ac6395865
3 changed files with 161 additions and 28 deletions
  1. 8 0
      src/api/system/tenant.js
  2. 0 2
      src/store/modules/user.js
  3. 153 26
      src/views/system/tenant.vue

+ 8 - 0
src/api/system/tenant.js

@@ -121,3 +121,11 @@ export const remove = ids => {
   });
 };
 
+// 获取vip年度
+export const getVipYears = () => {
+  return request({
+    url: '/api/kd-system/tenant/vip-years',
+    method: 'get',
+  });
+};
+

+ 0 - 2
src/store/modules/user.js

@@ -57,9 +57,7 @@ const user = {
   actions: {
     //根据用户名登录
     LoginByUsername({commit}, userInfo) {
-      console.log("111:",userInfo.password)
       return new Promise((resolve, reject) => {
-        console.log("222:",encrypt(userInfo.password))
         loginByUsername(userInfo.tenantId, userInfo.deptId, userInfo.roleId, userInfo.username, encrypt(userInfo.password), userInfo.type, userInfo.key, userInfo.code).then(res => {
           const data = res.data;
           if (data.error_description) {

+ 153 - 26
src/views/system/tenant.vue

@@ -124,6 +124,7 @@
                 slot="expireTime">
         <el-tag>{{ row.expireTime ? row.expireTime : '不限制' }}</el-tag>
       </template>
+
     </avue-crud>
     <el-dialog title="租户授权配置"
                append-to-body
@@ -178,7 +179,15 @@ import {validatenull} from "@/util/validate";
 
 export default {
   data() {
+    let yearList = [];
+    for(let i=2015; i<=2035; i++) {
+      yearList.push({
+        value: String(i),
+        label: i+'年'
+      });
+    }
     return {
+      yearList,
       form: {},
       selectionList: [],
       query: {},
@@ -205,8 +214,9 @@ export default {
         selection: true,
         addBtn: false,
         viewBtn: true,
+        labelWidth: 120,
         menuWidth: 380,
-        dialogWidth: 900,
+        dialogWidth: 600,
         dialogClickModal: false,
         column: [
           {
@@ -224,7 +234,20 @@ export default {
             }]
           },
           {
-            label: "租户名称",
+            label: "登录名",
+            prop: "uscc",
+            search: true,
+            width: 180,
+            span: 24,
+            placeholder: "填写统一社会信用代码",
+            rules: [{
+              required: true,
+              message: "填写统一社会信用代码",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "企业名称",
             prop: "tenantName",
             search: true,
             width: 180,
@@ -236,13 +259,73 @@ export default {
             }]
           },
           {
-            label: "联系人",
+            label: '所属省份',
+            prop: 'province',
+            type: 'select',
+            props: {
+              label: 'name',
+              value: 'code'
+            },
+            cascader: ['city'],
+            dicUrl: '/api/kd-system/region/select',
+            span: 24,
+            hide: true,
+            rules: [{
+              required: true,
+              message: '请选择所属省'
+            }],
+          },
+          {
+            label: '所属地市',
+            prop: 'city',
+            type: 'select',
+            props: {
+              label: 'name',
+              value: 'code'
+            },
+            cascader: ['district'],
+            dicFlag: false,
+            dicUrl: '/api/kd-system/region/select?code={{province}}',
+            span: 24,
+            hide: true,
+            rules: [{
+              required: true,
+              message: '请选择所属地市'
+            }],
+          },
+          {
+            label: '所属区县',
+            prop: 'district',
+            props: 'name',
+            type: 'select',
+            props: {
+              label: 'name',
+              value: 'code'
+            },
+            dicFlag: false,
+            dicUrl: '/api/kd-system/region/select?code={{city}}',
+            span: 24,
+            hide: true,
+            rules: [{
+              required: true,
+              message: '请选择所属区县'
+            }],
+          },
+          {
+            label: '省市区',
+            prop: 'regionName',
+            display: false,
+            width: 200,
+            overHidden: true,
+          },
+          {
+            label: "企业管理员",
             prop: "linkman",
             width: 100,
             search: true,
             rules: [{
               required: true,
-              message: "请输入联系人",
+              message: "请输入企业管理员",
               trigger: "blur"
             }]
           },
@@ -250,9 +333,40 @@ export default {
             label: "联系电话",
             prop: "contactNumber",
             width: 150,
+            rules: [{
+              required: true,
+              message: "请输入联系电话",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "营销员",
+            prop: "saleman",
+            span: 24,
+            align: "center",
+            rules: [{
+              required: true,
+              message: "请输入营销员",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "vip年度",
+            prop: "vipYears",
+            type: "select",
+            multiple: true,
+            span: 24,
+            width: 200,
+            dicData: yearList,
+            overHidden: true,
+            rules: [{
+              required: true,
+              message: "请选择vip年度",
+              trigger: "blur"
+            }]
           },
           {
-            label: "联系地址",
+            label: "备注说明",
             prop: "address",
             span: 24,
             minRows: 2,
@@ -275,25 +389,25 @@ export default {
             addDisplay: false,
             editDisplay: false,
           },
-          {
-            label: "绑定域名",
-            prop: "domainUrl",
-            span: 24,
-          },
-          {
-            label: "系统背景",
-            prop: "backgroundUrl",
-            type: 'upload',
-            listType: 'picture-img',
-            dataType: 'string',
-            action: '/api/kd-resource/oss/endpoint/put-file',
-            propsHttp: {
-              res: 'data',
-              url: 'link',
-            },
-            hide: true,
-            span: 24,
-          },
+          // {
+          //   label: "绑定域名",
+          //   prop: "domainUrl",
+          //   span: 24,
+          // },
+          // {
+          //   label: "系统背景",
+          //   prop: "backgroundUrl",
+          //   type: 'upload',
+          //   listType: 'picture-img',
+          //   dataType: 'string',
+          //   action: '/api/kd-resource/oss/endpoint/put-file',
+          //   propsHttp: {
+          //     res: 'data',
+          //     url: 'link',
+          //   },
+          //   hide: true,
+          //   span: 24,
+          // },
         ]
       },
       data: [],
@@ -410,6 +524,9 @@ export default {
       });
     },
     rowSave(row, done, loading) {
+      let params = { ...row };
+      params.regionCode = row.district;
+      params.vipYears = JSON.stringify(params.vipYears.split(','))
       add(row).then(() => {
         this.onLoad(this.page);
         this.$message({
@@ -423,7 +540,10 @@ export default {
       });
     },
     rowUpdate(row, index, done, loading) {
-      update(row).then(() => {
+      let params = { ...row };
+      params.regionCode = row.district;
+      params.vipYears = JSON.stringify(params.vipYears.split(','))
+      update(params).then(() => {
         this.onLoad(this.page);
         this.$message({
           type: "success",
@@ -710,7 +830,14 @@ export default {
       ).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
-        this.data = data.records;
+        this.data = data.records.map(item => {
+          let vipYears = [];
+          if (!!item.vipYears) {
+            vipYears = JSON.parse(item.vipYears);
+          }
+          item.vipYears = vipYears.join(",");
+          return item;
+        });
         this.loading = false;
         this.selectionClear();
       });