Browse Source

代码上传

zhangqiOMG 2 years ago
parent
commit
c35eb62540

+ 32 - 1
src/HManagement/accountManage/modules/account_add.vue

@@ -19,6 +19,25 @@
                 <el-input  v-model="form.name" autocomplete="off" placeholder="输入用户名称"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="用户类型" label-width="100px" prop="name">
+                <el-select
+                  style="width: 100%"
+                  size="small"
+                  v-model="form.usertype"
+                  placeholder="请选择"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in sys_options"
+                    :label="item.remarks"
+                    :value="item.value"
+                    :key="item.rowindex"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            
             <el-col :span="24">
               <el-form-item label="授权角色" label-width="100px" prop="roleids">
                 <!-- <el-input v-model="form.sex" autocomplete="off" placeholder="输入性别"></el-input> -->
@@ -44,7 +63,7 @@
 </template>
 
 <script>
-
+import {mapGetters} from 'vuex'
 export default {
   data () {
     return {
@@ -72,10 +91,16 @@ export default {
       options:[]
     }
   },
+  computed:{
+    ...mapGetters({
+      sys_options:'sys_options'
+    })
+  },
   methods:{
     onShow () {
       this.drawer = true
       this.rolelist()
+      this.usertype()
     },
     
     async rolelist () {
@@ -122,7 +147,13 @@ export default {
     },
     onClose () {
       this.$refs['form'].resetFields()
+    },
+    usertype () {
+      this.$store.dispatch('optiontypeselect','usertype')
     }
+  },
+  mounted () {
+
   }
 }
 

+ 2 - 2
src/HManagement/accountManage/modules/account_edit.vue

@@ -10,7 +10,7 @@
           <el-form :model="form" :rules="rules" ref="form"  size="mini" label-position="left">
             <el-col :span="12">
               <el-form-item label="账号" label-width="100px">
-                <el-input v-model="form.accountno" readonly autocomplete="off" placeholder="输入账号"></el-input>
+                <el-input v-model="form.accountno" disabled autocomplete="off" placeholder="输入账号"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -20,7 +20,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="用户类型" label-width="100px">
-                <el-input v-model="form.usertypename" readonly autocomplete="off" placeholder="用户类型"></el-input>
+                <el-input v-model="form.usertypename" disabled autocomplete="off" placeholder="用户类型"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">

+ 0 - 1
src/HManagement/accountManage/modules/list.vue

@@ -143,7 +143,6 @@ export default {
     //获取用户类型
     async getRoleData() {
       let param = {
-          "accesstoken": "4a6559d45d2a4c6e0ebac2c803344106",
           "classname": "sysmanage.develop.optiontype.optiontype",
           "method": "optiontypeselect",
           "content": {

+ 1 - 1
src/components/layout/modules/header.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="flex">
-  <div class="logo">YOS后端管理平台</div>
+  <div class="logo">美大营销管理平台</div>
   <div class="right-operation">
     <el-dropdown>
       <span class="el-dropdown-link">

+ 2 - 0
src/components/selectAgent/area/list.vue

@@ -163,6 +163,8 @@ export default {
   padding: 16px;
   font-size: 14px;
   /* width:300px; */
+  height: 400px;
+  overflow-y: scroll;
   background: #FAFAFA;
 }
 </style>

+ 1 - 1
src/components/selectAgent/index.vue

@@ -6,7 +6,7 @@
         <!-- 营销区域列表 -->
         <areaTree ref="arealist" style="width:200px" @onClick="onClick">
         </areaTree>
-        <div class="main" style="flex:1 0 auto;">
+        <div class="main" style="flex:1">
           <agent ref="agent">
             <template v-slot:detail="scope">
               <div class="inline-16">

+ 2 - 1
src/router/HManagement.js

@@ -98,7 +98,8 @@ const HManagement = [
     name: 'salermag',
     meta: {
       title: '新建业务员',
-      ast_nav: true
+      ast_nav: true,
+      keeproute: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/saler/modules/add_saler.vue')
   }, {

+ 26 - 20
vue.config.js

@@ -1,24 +1,30 @@
 
 module.exports = {
-    outputDir:"yos",
-    lintOnSave: false,
-    productionSourceMap:false,
-    publicPath: './',
-    devServer: {
-      open: true,
-      // host: '192.168.4.170',
-      host: 'localhost',
-      port: 8080,
-      proxy: {
-        '/apis': {
-          // target: 'http://121.37.152.76:8080',  // target host
-          target: 'https://meida.cnyunl.com',
-          ws: true,  // proxy websockets 
-          changeOrigin: true,  // needed for virtual hosted sites
-          pathRewrite: {
-              '^/apis': ''  // rewrite path
-          }
-        },
-      }
+  outputDir:"yos",
+  lintOnSave: false,
+  productionSourceMap:false,
+  publicPath: './',
+  devServer: {
+    open: true,
+    // host: '192.168.4.170',
+    host: 'localhost',
+    port: 8080,
+    proxy: {
+      '/apis': {
+        // target: 'http://121.37.152.76:8080',  // target host
+        target: 'https://meida.cnyunl.com',
+        ws: true,  // proxy websockets 
+        changeOrigin: true,  // needed for virtual hosted sites
+        pathRewrite: {
+            '^/apis': ''  // rewrite path
+        }
+      },
     }
+  },
+  chainWebpack(config) {
+		config.plugin('html').tap((args) => { //标题
+			args[0].title = '美大营销管理平台';
+			return args;
+		})
+	},
 }

+ 1 - 1
yos/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.037e8072.js"></script><link href="css/app.83be7ebe.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.aec0fbe6.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>美大营销管理平台</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.92d1213b.js"></script><link href="css/app.83be7ebe.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.611f618f.js" nomodule></script></head><body><noscript><strong>We're sorry but 美大营销管理平台 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

File diff suppressed because it is too large
+ 0 - 0
yos/js/702.a6cda3be.js


Some files were not shown because too many files changed in this diff