zhangdan 4 年之前
父节点
当前提交
b942b2c441

+ 34 - 34
src/config/router.config.js

@@ -101,8 +101,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: '平台设置',
-      icon: 'security-scan',
-      permission: 'M_bnSetting_0'
+      icon: 'security-scan'
+      // permission: 'M_bnSetting_0'
     },
     children: [{
       path: '/bnSetting/menusAuth',
@@ -110,8 +110,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "bnSetting" */ '@/views/bnSetting/menusAuthTab.vue'),
       meta: {
         title: '菜单授权',
-        icon: 'property-safety',
-        permission: 'M_bnSetting_0'
+        icon: 'property-safety'
+        // permission: 'M_bnSetting_0'
       }
     }]
   },
@@ -121,8 +121,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: 'APP设置',
-      icon: 'appstore',
-      permission: 'M_appSetting'
+      icon: 'appstore'
+      // permission: 'M_appSetting'
     },
     children: [{
       path: '/appSetting/bannerSetting',
@@ -130,8 +130,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "appSetting" */ '@/views/appSetting/bannerSetting.vue'),
       meta: {
         title: '营销图设置',
-        icon: 'file-image',
-        permission: 'M_banner'
+        icon: 'file-image'
+        // permission: 'M_banner'
       }
     },
     {
@@ -141,8 +141,8 @@ export const asyncRouterMap = [{
       component: RouteView,
       meta: {
         title: '版本设置',
-        icon: 'info-circle',
-        permission: 'M_banben'
+        icon: 'info-circle'
+        // permission: 'M_banben'
       },
       hideChildrenInMenu: true,
       children: [{
@@ -152,8 +152,8 @@ export const asyncRouterMap = [{
           '@/views/appSetting/editionSetting.vue'),
         meta: {
           title: '版本设置列表',
-          icon: 'interaction',
-          permission: 'M_banben'
+          icon: 'interaction'
+          // permission: 'M_banben'
         }
       },
       {
@@ -178,8 +178,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: '菜单管理',
-      icon: 'bars',
-      permission: 'M_menusAuth_0'
+      icon: 'bars'
+      // permission: 'M_menusAuth_0'
     },
     children: [{
       path: '/menusAuth/storeMenus',
@@ -187,8 +187,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "bnSetting" */ '@/views/bnSetting/menu/storeMenus.vue'),
       meta: {
         title: '门店菜单管理',
-        icon: 'shop',
-        permission: 'M_menusAuth_storeMenus'
+        icon: 'shop'
+        // permission: 'M_menusAuth_storeMenus'
       }
     },
     {
@@ -197,8 +197,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "bnSetting" */ '@/views/bnSetting/menu/adminMenus.vue'),
       meta: {
         title: '运营菜单管理',
-        icon: 'appstore',
-        permission: 'M_menusAuth_adminMenus'
+        icon: 'appstore'
+        // permission: 'M_menusAuth_adminMenus'
       }
     },
     {
@@ -207,8 +207,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "auth" */ '@/views/power/menu/menu.vue'),
       meta: {
         title: 'IT菜单管理',
-        icon: 'profile',
-        permission: 'M_menusAuth_menu'
+        icon: 'profile'
+        // permission: 'M_menusAuth_menu'
       }
     }
     ]
@@ -220,8 +220,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: 'IT权限管理',
-      icon: 'lock',
-      permission: 'M_auth_0'
+      icon: 'lock'
+      // permission: 'M_auth_0'
     },
     children: [{
       path: '/auth/userList',
@@ -229,8 +229,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "auth" */ '@/views/power/user/userList.vue'),
       meta: {
         title: '用户管理',
-        icon: 'user',
-        permission: 'M_auth_userList'
+        icon: 'user'
+        // permission: 'M_auth_userList'
       }
     },
     {
@@ -239,8 +239,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "auth" */ '@/views/power/role/roleList.vue'),
       meta: {
         title: '角色管理',
-        icon: 'solution',
-        permission: 'M_auth_roleList'
+        icon: 'solution'
+        // permission: 'M_auth_roleList'
       }
     }
     ]
@@ -251,8 +251,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: '系统设置',
-      icon: 'setting',
-      permission: 'M_setting_0'
+      icon: 'setting'
+      // permission: 'M_setting_0'
     },
     children: [{
       path: '/setting/dataDictionary',
@@ -261,8 +261,8 @@ export const asyncRouterMap = [{
         '@/views/power/dataDictionary/dataDictionary.vue'),
       meta: {
         title: '数据字典管理',
-        icon: 'database',
-        permission: 'M_sys_dataDictionary'
+        icon: 'database'
+        // permission: 'M_sys_dataDictionary'
       }
     },
     {
@@ -271,8 +271,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "setting" */ '@/views/power/register/register.vue'),
       meta: {
         title: '参数管理',
-        icon: 'key',
-        permission: 'M_sys_register'
+        icon: 'key'
+        // permission: 'M_sys_register'
       }
     },
     // {
@@ -292,8 +292,8 @@ export const asyncRouterMap = [{
         '@/views/power/OperateJournal/OperateJournal.vue'),
       meta: {
         title: '操作日志',
-        icon: 'read',
-        permission: 'M_operateJournal'
+        icon: 'read'
+        // permission: 'M_operateJournal'
       }
     }
     ]

+ 149 - 150
src/views/appSetting/addEditionSetting.vue

@@ -1,154 +1,156 @@
 <template>
   <div class="addPage">
-     <div class="formBox">
-       <a-form :form="form" @submit="handleSubmit">
-          <a-row>
-              <a-col :span="24">
-                 <a-form-item
-                   :label-col="formItemLayout.labelCol"
-                   :wrapper-col="formItemLayout.wrapperCol"
-                   label="版本号"
-                 >
-                  <a-input
-                    v-decorator="[
-                      'formData.version',
-                      { initialValue: formData.version,
-                        rules: [{ required: true, message: '请输入版本号' }]
-                      },
-                    ]"
-                    placeholder="请输入版本号"
-                  /> 
-                 </a-form-item>
-             </a-col>
-             <a-col :span="24">
-                 <a-form-item
-                   :label-col="formItemLayout.labelCol"
-                   :wrapper-col="formItemLayout.wrapperCol"
-                   label="请选择更新时间"
-                 >
-                   <a-date-picker
-                      show-time
-                      placeholder="年/月/日 时/分/秒"
-                      v-decorator="[
-                        'formData.updateDate',
-                        { initialValue: formData.updateDate,
-                          rules: [{required: true, message: '请选择更新时间!' }] },
-                      ]" />
-                 </a-form-item>
-             </a-col>
-             <a-col :span="24">
-                 <a-form-item
-                   :label-col="formItemLayout.labelCol"
-                   :wrapper-col="formItemLayout.wrapperCol"
-                   label="强制升级"
-                 >
-                    <a-radio-group
-                      name="radioGroup"
-                      @change="onChange"
-                      v-decorator="[
-                        'formData.forceUpgrade',
-                        {
-                          initialValue: formData.forceUpgrade,
-                          rules: [{ required: true, type: 'number', message: '请选择是否强制升级!' }] },
-                      ]"
-                    >
-                      <a-radio :value="1">是</a-radio>
-                      <a-radio :value="0">否</a-radio>
-                    </a-radio-group>
-                 </a-form-item>
-             </a-col>
-             <a-col :span="24">
-              <a-form-item
-                :label-col="formItemLayout.labelCol"
-                :wrapper-col="formItemLayout.wrapperCol"
-                label="下载链接"
+    <div class="formBox">
+      <a-form :form="form" @submit="handleSubmit">
+        <a-row>
+          <a-col :span="24">
+            <a-form-item
+              :label-col="formItemLayout.labelCol"
+              :wrapper-col="formItemLayout.wrapperCol"
+              label="版本号"
+            >
+              <a-input
+                v-decorator="[
+                  'formData.version',
+                  { initialValue: formData.version,
+                    rules: [{ required: true, message: '请输入版本号' }]
+                  },
+                ]"
+                placeholder="请输入版本号"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item
+              :label-col="formItemLayout.labelCol"
+              :wrapper-col="formItemLayout.wrapperCol"
+              label="请选择更新时间"
+            >
+              <a-date-picker
+                show-time
+                placeholder="年/月/日 时/分/秒"
+                v-decorator="[
+                  'formData.updateDate',
+                  { initialValue: formData.updateDate,
+                    rules: [{required: true, message: '请选择更新时间!' }] },
+                ]" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item
+              :label-col="formItemLayout.labelCol"
+              :wrapper-col="formItemLayout.wrapperCol"
+              label="强制升级"
+            >
+              <a-radio-group
+                name="radioGroup"
+                @change="onChange"
+                v-decorator="[
+                  'formData.forceUpgrade',
+                  {
+                    initialValue: formData.forceUpgrade,
+                    rules: [{ required: true, type: 'number', message: '请选择是否强制升级!' }] },
+                ]"
               >
-                <a-input
+                <a-radio :value="1">是</a-radio>
+                <a-radio :value="0">否</a-radio>
+              </a-radio-group>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item
+              :label-col="formItemLayout.labelCol"
+              :wrapper-col="formItemLayout.wrapperCol"
+              label="下载链接"
+            >
+              <a-input
+                v-decorator="[
+                  'formData.downloadUrl',
+                  { initialValue: formData.downloadUrl,
+                    rules: [{ message: '请输入下载链接' }]
+                  },
+                ]"
+                placeholder="请输入下载链接"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item
+              :label-col="formItemLayout.labelCol"
+              :wrapper-col="formItemLayout.wrapperCol"
+              label="升级内容"
+            >
+
+              <a-textarea
+                placeholder="请输入升级内容"
+                auto-size
+                v-decorator="[
+                  'formData.upgradeContent',
+                  { initialValue: formData.upgradeContent,
+                    rules: [{ required: true, message: '请输入升级内容' }]
+                  },
+                ]"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="24">
+            <a-form-item
+              label="附件"
+              :label-col="formItemLayout.labelCol"
+              :wrapper-col="formItemLayout.wrapperCol"
+            >
+              <div style="display: block;">
+                <Upload
+                  ref="upfile"
+                  :maxNums="1"
+                  :fileSize="100"
                   v-decorator="[
-                    'formData.downloadUrl',
-                    { initialValue: formData.downloadUrl,
-                      rules: [{ message: '请输入下载链接' }]
+                    'formData.attachment',
+                    { initialValue: formData.attachment,
+                      rules: [{ required: true, message: '请上传app安装文件' }]
                     },
                   ]"
-                  placeholder="请输入下载链接"
-                />
-              </a-form-item> 
-             </a-col>
-              <a-col :span="24">
-               <a-form-item
-                 :label-col="formItemLayout.labelCol"
-                 :wrapper-col="formItemLayout.wrapperCol"
-                 label="升级内容"
-               >
-                
-                 <a-textarea placeholder="请输入升级内容" auto-size  
-                 v-decorator="[
-                     'formData.upgradeContent',
-                     { initialValue: formData.upgradeContent,
-                       rules: [{ required: true, message: '请输入升级内容' }]
-                     },
-                   ]"
-                   />
-               </a-form-item> 
-              </a-col>
-           </a-row>
-           <a-row>
-             <a-col :span="24">
-               <a-form-item
-                 label="附件"
-                 :label-col="formItemLayout.labelCol"
-                 :wrapper-col="formItemLayout.wrapperCol"
-                 >
-                 <div style="display: block;">
-                   <Upload
-                     ref="upfile"
-                     :maxNums="1"
-                     :fileSize="100"
-                     v-decorator="[
-                         'formData.attachment',
-                         { initialValue: formData.attachment,
-                           rules: [{ required: true, message: '请上传app安装文件' }]
-                         },
-                       ]"
-                     fileType="application/vnd.android.package-archive"
-                     upText="附件上传">
-                   </Upload>
-                 </div>
-                 <div style="line-height: 16px;clear: both;padding-top: 10px;color: #999;">(上传apk格式文件)</div>
-               </a-form-item>
-             </a-col>
-           </a-row>
-           <a-form-item :label-col="formTailLayout.labelCol" :wrapper-col="formTailLayout.wrapperCol">
-             <a-button htmlType="submit" type="primary">
-               保存
-             </a-button>
-             <a-button style="margin-left: 20px;" @click="cansel">
-               返回列表
-             </a-button>
-           </a-form-item>
-         </a-form>
-     </div>
+                  fileType="application/vnd.android.package-archive"
+                  upText="附件上传">
+                </Upload>
+              </div>
+              <div style="line-height: 16px;clear: both;padding-top: 10px;color: #999;">(上传apk格式文件)</div>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-form-item :label-col="formTailLayout.labelCol" :wrapper-col="formTailLayout.wrapperCol">
+          <a-button htmlType="submit" type="primary">
+            保存
+          </a-button>
+          <a-button style="margin-left: 20px;" @click="cansel">
+            返回列表
+          </a-button>
+        </a-form-item>
+      </a-form>
+    </div>
   </div>
 </template>
 
 <script>
 import { Upload } from '@/components'
-import { saveItem,editItem} from '@/api/editionSetting.js'
+import { saveItem, editItem } from '@/api/editionSetting.js'
 import moment from 'moment'
 
 const formItemLayout = {
-            labelCol: { span: 3 },
-            wrapperCol: { span: 6 },
-          };
+  labelCol: { span: 3 },
+  wrapperCol: { span: 6 }
+}
 const formTailLayout = {
-  wrapperCol: {offset: 5 },
-};
+  wrapperCol: { offset: 5 }
+}
 export default {
   name: 'AddeditionSetting',
   components: {
     Upload
   },
- 
+
   data () {
     return {
       formItemLayout,
@@ -159,12 +161,12 @@ export default {
         updateDate: null,
         downloadUrl: '',
         forceUpgrade: '0',
-        upgradeContent:'',
-        attachment:''
+        upgradeContent: '',
+        attachment: ''
       },
-      applyName:'IT后台',
-      applyCode:'zyit',
-      mode1:'time',
+      applyName: 'IT后台',
+      applyCode: 'zyit',
+      mode1: 'time'
     }
   },
   methods: {
@@ -174,41 +176,38 @@ export default {
       const _this = this
       this.form.validateFields((err, values) => {
         if (!err) {
-          let query = this.$route.query
-          console.log(this.formData, values.formData,{applyName:'IT后台', applyCode:'zyit'})
-          const formData = Object.assign({}, this.formData, values.formData,{applyName:'IT后台'},{applyCode:'zyit'})
+          const query = this.$route.query
+          const formData = Object.assign({}, this.formData, values.formData, { applyName: 'IT后台' }, { applyCode: 'zyit' })
           formData.updateDate = formData.updateDate.format('YYYY-MM-DD HH:mm:ss')
-          console.log(formData)
           saveItem(formData).then(res => {
-            console.log(res, 'rrrrrrrrr')
+            // console.log(res, 'rrrrrrrrr')
             if (res.status == 200) {
               _this.$message.success(res.message ? res.message : '保存成功')
               _this.$router.push({ name: 'editionSetting_list' })
             } else {
               _this.$message.error(res.message)
             }
-            
           })
         }
       })
     },
     // 返回列表
-    cansel() {
+    cansel () {
       this.$router.push({ name: 'editionSetting_list' })
     },
     // 选择时间
-    handleOpenChange1(open) {
+    handleOpenChange1 (open) {
       console.log(open)
       if (open) {
-        this.mode1 = 'time';
+        this.mode1 = 'time'
       }
     },
     // 改变默认选项
-    onChange(e){
-      console.log('radio checked', e.target.value);
+    onChange (e) {
+      console.log('radio checked', e.target.value)
     }
   },
-  
+
   beforeRouteEnter (to, from, next) {
     next(vm => {
       console.log(111)
@@ -234,14 +233,14 @@ export default {
 }
 </script>
 
-<style lang="less"> 
+<style lang="less">
   .addPage{
     .formBox{
       padding:34px 0 10px;
       flex-grow: 1;
       background: #fff;
       border-radius: 5px;
-     
+
     }
   }
 </style>

+ 348 - 305
src/views/appSetting/bannerSetting.vue

@@ -1,319 +1,362 @@
 <template>
-	<a-card :bordered="false">
-		<div class="add">
-			<a-button type="primary" icon="plus" class="addBtn" @click="showModal">新建</a-button>
-		</div>
-		<v-select ref="position" style="display: none;" code="ADVERT_POSITION"></v-select>
-		<!-- table列表 -->
-		<s-table ref="table" size="default" :rowKey="(row)=> row.id" :showPagination="false" :columns="columns" :data="loadData"
-		 bordered>
-			<!-- 广告图位置 -->
-			<span slot="position" slot-scope="text,record">
-				{{ $refs.position.getNameByCode(text) }}
-			</span>
-			<span slot="action" slot-scope="text, record">
-				<template>
-					<a-icon type="eye" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="handleEdit(record, 1)" />
-					<a-icon type="edit" v-if="record.status == '0'" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="handleEdit(record, 0)" />
-					<a-icon type="delete" v-if="record.status == '0'" style="font-size: 20px;color: red;padding: 0 10px;" @click="delect(record)" />
-				</template>
-			</span>
-			<span slot="status" slot-scope="text,record">
-				<a-switch checkedChildren="启用" unCheckedChildren="禁用" v-model=" record.status==1 ? true : false " @change="changeFlagHandle(text, record)" />
-			</span>
-		</s-table>
-		<!-- 弹窗 -->
-		<a-modal :title="title" :visible="visible" :footer="null" :closable="closable" @cancel="close" width="45%">
-			<a-form id="components-form-demo-validate-other" :form="form" ref="form" v-bind="formItemLayout" @submit="handleSubmit">
-				<a-form-item label="名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-					<a-input :maxLength="32" v-decorator="['formData.title', { initialValue:formData.title,rules: [{ required: true, message: '请输入轮播图名称32个字以内!' }] }]"
-					 :disabled="disabled" placeholder="请输入轮播图名称32个字以内" />
-				</a-form-item>
-				<a-form-item required label="广告图位置" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-					<v-select ref="position" code="ADVERT_POSITION" v-model="formData.position" allowClear placeholder="请选择广告图位置"
-					 :disabled="disabled"></v-select>
-				</a-form-item>
-				<a-form-item label="跳转链接" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-					<a-input v-decorator="['formData.url', { initialValue:formData.url,rules: [{ required: false, message: '请填写跳转链接!' }] }]"
-					 :disabled="disabled" placeholder="请输入跳转链接" />
-				</a-form-item>
-				<a-form-item label="排序" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-					<a-input type="number" v-decorator="['formData.sort', { initialValue:formData.sort, rules: [{ required: true, message: '请排序!' }] }]"
-					 :disabled="disabled" placeholder="请输入序号值" />
-				</a-form-item>
-				<a-form-item label="状态" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-					<a-radio-group :disabled="disabled" v-decorator="['formData.status', { initialValue:formData.status,rules: [{ required: true, message: '请选择状态!' }] }]">
-						<a-radio value="1">
-							启用
-						</a-radio>
-						<a-radio value="0">
-							禁用
-						</a-radio>
-					</a-radio-group>
-				</a-form-item>
-				<a-form-item label="上传图片" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-					<div style="border: 1px solid #eee;overflow: hidden;padding: 8px 8px  0;">
-						<Upload v-if="title != '查看详情'" v-decorator="[
+  <a-card :bordered="false">
+    <div class="add">
+      <a-button type="primary" icon="plus" class="addBtn" @click="showModal">新建</a-button>
+    </div>
+    <v-select ref="position" style="display: none;" code="ADVERT_POSITION"></v-select>
+    <!-- table列表 -->
+    <s-table
+      ref="table"
+      size="default"
+      :rowKey="(row)=> row.id"
+      :showPagination="false"
+      :columns="columns"
+      :data="loadData"
+      bordered>
+      <!-- 广告图位置 -->
+      <span slot="position" slot-scope="text,record">
+        {{ $refs.position.getNameByCode(text) }}
+      </span>
+      <span slot="action" slot-scope="text, record">
+        <template>
+          <a-icon type="eye" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="handleEdit(record, 1)" />
+          <a-icon type="edit" v-if="record.status == '0'" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="handleEdit(record, 0)" />
+          <a-icon type="delete" v-if="record.status == '0'" style="font-size: 20px;color: red;padding: 0 10px;" @click="delect(record)" />
+        </template>
+      </span>
+      <span slot="status" slot-scope="text,record">
+        <a-switch checkedChildren="启用" unCheckedChildren="禁用" v-model=" record.status==1 ? true : false " @change="changeFlagHandle(text, record)" />
+      </span>
+    </s-table>
+    <!-- 弹窗 -->
+    <a-modal
+      :title="title"
+      :visible="visible"
+      :footer="null"
+      :closable="closable"
+      @cancel="close"
+      width="45%">
+      <a-form
+        id="components-form-demo-validate-other"
+        :form="form"
+        ref="form"
+        v-bind="formItemLayout"
+        @submit="handleSubmit"
+        :hideRequiredMark="hideRequiredMark">
+        <a-form-item label="名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+          <a-input
+            :maxLength="32"
+            v-decorator="['formData.title', { initialValue:formData.title,rules: [{ required: true, message: '请输入轮播图名称32个字以内!' }] }]"
+            :disabled="disabled"
+            placeholder="请输入轮播图名称32个字以内" />
+        </a-form-item>
+        <a-form-item required label="广告图位置" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+          <v-select
+            ref="position"
+            code="ADVERT_POSITION"
+            v-model="formData.position"
+            allowClear
+            placeholder="请选择广告图位置"
+            :disabled="disabled"></v-select>
+        </a-form-item>
+        <a-form-item label="跳转链接" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+          <a-input
+            v-decorator="['formData.url', { initialValue:formData.url,rules: [{ required: false, message: '请填写跳转链接!' }] }]"
+            :disabled="disabled"
+            placeholder="请输入跳转链接" />
+        </a-form-item>
+        <a-form-item label="排序" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+          <a-input
+            type="number"
+            v-decorator="['formData.sort', { initialValue:formData.sort, rules: [{ required: true, message: '请排序!' }] }]"
+            :disabled="disabled"
+            placeholder="请输入序号值" />
+        </a-form-item>
+        <a-form-item label="状态" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+          <a-radio-group :disabled="disabled" v-decorator="['formData.status', { initialValue:formData.status,rules: [{ required: true, message: '请选择状态!' }] }]">
+            <a-radio value="1">
+              启用
+            </a-radio>
+            <a-radio value="0">
+              禁用
+            </a-radio>
+          </a-radio-group>
+        </a-form-item>
+        <a-form-item label="上传图片" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+          <div style="border: 1px solid #eee;overflow: hidden;padding: 8px 8px  0;">
+            <Upload
+              v-if="title != '查看详情'"
+              v-decorator="[
                 'formData.photo',
                 {
                   initialValue: formData.photo,
                   rules: [{required: true,message: '请上传轮播图!'}]
                 }]"
-						 ref="bannerImage" :fileSize="0.25" :disabled="disabled" @change="getbannerImage" listType="picture-card" upText="上传图片">
-						</Upload>
-						<img v-else :src="formData.photo" style="width:100px ;height: auto; margin-bottom: 8px;" />
-					</div>
-				</a-form-item>
-				<a-form-item :wrapper-col="{ span: 12, offset: 5 }" style="text-align: center;">
-					<a-button type="primary" html-type="submit" v-if="!disabled">
-						保存
-					</a-button>
-					<a-button @click="close()" style="margin-left: 8px">
-						返回列表
-					</a-button>
-				</a-form-item>
-			</a-form>
-		</a-modal>
-		</div>
-	</a-card>
+              ref="bannerImage"
+              :fileSize="0.25"
+              :disabled="disabled"
+              @change="getbannerImage"
+              listType="picture-card"
+              upText="上传图片">
+            </Upload>
+            <img v-else :src="formData.photo" style="width:100px ;height: auto; margin-bottom: 8px;" />
+          </div>
+        </a-form-item>
+        <a-form-item :wrapper-col="{ span: 12, offset: 5 }" style="text-align: center;">
+          <a-button type="primary" html-type="submit" v-if="!disabled">
+            保存
+          </a-button>
+          <a-button @click="close()" style="margin-left: 8px">
+            返回列表
+          </a-button>
+        </a-form-item>
+      </a-form>
+    </a-modal>
+    </div>
+  </a-card>
 </template>
 
 <script>
-	import {
-		Upload,
-		STable,
-		VSelect
-	} from '@/components'
-	import {
-		getBannerSettingList,
-		changeStatus,
-		deleteItem,
-		saveItem
-	} from '@/api/bannerSetting.js'
+import {
+  Upload,
+  STable,
+  VSelect
+} from '@/components'
+import {
+  getBannerSettingList,
+  changeStatus,
+  deleteItem,
+  saveItem
+} from '@/api/bannerSetting.js'
 
-	export default {
-		components: {
-			STable,
-			Upload,
-			VSelect
-		},
-		data() {
-			return {
-				// 表头
-				columns: [{
-						title: '序号',
-						dataIndex: 'no',
-						minWidth: '40',
-						align: 'center'
-					},
-					{
-						title: '操作',
-						// dataIndex: 'action',
-						minWidth: '100',
-						align: 'center',
-						scopedSlots: {
-							customRender: 'action'
-						}
-					},
-					{
-						title: '状态',
-						minWidth: '100',
-						dataIndex: 'status',
-						align: 'center',
-						scopedSlots: {
-							customRender: 'status'
-						}
-					},
-					{
-						title: '广告图位置',
-						minWidth: '100',
-						dataIndex: 'position',
-						align: 'center',
-						scopedSlots: {
-							customRender: 'position'
-						}
-					},
-					{
-						title: '名称',
-						minWidth: '100',
-						dataIndex: 'title',
-						align: 'center'
-					},
-					{
-						title: '排序',
-						minWidth: '100',
-						dataIndex: 'sort',
-						align: 'center'
-					},
-					{
-						title: '跳转链接',
-						minWidth: '200',
-						dataIndex: 'url',
-						align: 'center'
-					}
-				],
-				// 加载数据方法 必须为 Promise 对象
-				loadData: parameter => {
-					return getBannerSettingList({
-							bannerType: 'app'
-						})
-						.then(res => {
-							console.log(res, '1111')
-							const no = 0
-							for (let i = 0; i < res.data.length; i++) {
-								const _item = res.data[i]
-								_item.no = no + i + 1
-								_item.releaseStatus = _item.releaseStatus + '' === 'FB'
-							}
-							return res.data
-						})
-				},
+export default {
+  components: {
+    STable,
+    Upload,
+    VSelect
+  },
+  data () {
+    return {
+      // 表头
+      columns: [{
+        title: '序号',
+        dataIndex: 'no',
+        minWidth: '40',
+        align: 'center'
+      },
+      {
+        title: '操作',
+        // dataIndex: 'action',
+        minWidth: '100',
+        align: 'center',
+        scopedSlots: {
+          customRender: 'action'
+        }
+      },
+      {
+        title: '状态',
+        minWidth: '100',
+        dataIndex: 'status',
+        align: 'center',
+        scopedSlots: {
+          customRender: 'status'
+        }
+      },
+      {
+        title: '广告图位置',
+        minWidth: '100',
+        dataIndex: 'position',
+        align: 'center',
+        scopedSlots: {
+          customRender: 'position'
+        }
+      },
+      {
+        title: '名称',
+        minWidth: '100',
+        dataIndex: 'title',
+        align: 'center'
+      },
+      {
+        title: '排序',
+        minWidth: '100',
+        dataIndex: 'sort',
+        align: 'center'
+      },
+      {
+        title: '跳转链接',
+        minWidth: '200',
+        dataIndex: 'url',
+        align: 'center'
+      }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return getBannerSettingList({
+          bannerType: 'app'
+        })
+          .then(res => {
+            // console.log(res, '1111')
+            const no = 0
+            for (let i = 0; i < res.data.length; i++) {
+              const _item = res.data[i]
+              _item.no = no + i + 1
+              // _item.releaseStatus = _item.releaseStatus + '' === 'FB'
+            }
+            return res.data
+          })
+      },
 
-				title: '编辑',
-				closable: true,
-				visible: false,
-				confirmLoading: false,
-				formLayout: 'horizontal',
-				form: this.$form.createForm(this),
-				formItemLayout: {
-					labelCol: {
-						span: 6
-					},
-					wrapperCol: {
-						span: 14
-					}
-				},
-				formData: {
-					title: '', // 标题
-					photo: '', // banner图片
-					url: '', // 图片路径
-					status: '', // 状态
-					sort: '', // 排序
-					position: '' // 广告图位置
-				},
-				bannerType: 'app',
-				disabled: false,
-				value: '',
-				id: '',
-				isShow: true,
-			}
-		},
-
-		beforeCreate() {
-			this.form = this.$form.createForm(this, {
-				name: 'validate_other'
-			})
-		},
-		methods: {
-			showModal() {
-				this.disabled = false
-				delete this.formData.id
-				this.visible = true
-				this.title = '新增'
-			},
-			getbannerImage(data) {
-				this.formData.photo = data
-			},
-			// 点击保存;
-			handleSubmit(e) {
-				e.preventDefault()
-				const _this = this
-				this.form.validateFields((err, values) => {
-					if (!err) {
-						console.log('Received values of form: ', values, this.formData)
-						const formData = Object.assign({}, this.formData, values.formData, {
-							bannerType: 'app'
-						})
-						console.log(formData, _this.radioGroup)
-						saveItem(formData, _this.radioGroup).then(res => {
-							console.log(res, 'rrrrrrrrr')
-							if (res.status == 200) {
-								_this.$message.success(res.message ? res.message : '保存成功')
-								_this.$refs.table.refresh()
-								_this.close()
-							} else {
-								_this.$message.error(res.message)
-							}
-						})
-					}
-				})
-			},
-			close() {
-				this.visible = false
-				this.formData.title = ''
-				this.formData.photo = ''
-				this.formData.url = ''
-				this.formData.status = ''
-				this.formData.sort = ''
-				this.formData.position = ''
-				this.title = '新增'
-				this.$refs.bannerImage.setFileList('')
-				this.form.resetFields()
-			},
-			// 赋值
-			assignment(row) {
-				this.formData.id = row.id
-				this.formData.title = row.title
-				this.formData.photo = row.photo
-				this.formData.url = row.url
-				this.formData.status = row.status
-				this.formData.sort = row.sort
-				this.formData.position = row.position
-			},
-			// 0 修改,1 查看详情
-			handleEdit(row, type) {
-				console.log(row)
-				const _this = this
-				if (type == 1) {
-					this.title = '查看详情'
-				} else if (type == 0) {
-					this.title = '编辑'
-				}
-				this.assignment(row)
-				this.disabled = type == 1
-				this.visible = true
-				console.log(this.formData.photo)
-				setTimeout(() => {
-					_this.$refs.bannerImage.setFileList(this.formData.photo)
-				}, 500)
-			},
-			// 删除
-			delect(row) {
-				const _this = this
-				this.$confirm({
-					title: '警告',
-					content: '删除后无法恢复,确认删除?',
-					okText: '确定',
-					cancelText: '取消',
-					onOk() {
-						deleteItem({
-							id: row.id
-						}).then(res => {
-							if (res.status == 200) {
-								_this.$message.success('删除成功')
-								_this.$refs.table.refresh()
-							}
-						})
-					}
-				})
-			},
-			// 更改启用禁用状态
-			changeFlagHandle(text, record) {
-				const _data = {
-					id: record.id,
-					flag: record.status == 1 ? '0' : '1'
-				}
-				changeStatus(_data).then(res => {
-					if (res.status == '200') {
-						this.$message.success('修改成功')
-						this.$refs.table.refresh()
-					} else {
-						record.status = !record.status
-					}
-				})
-			}
-		}
-	}
+      title: '编辑',
+      closable: true,
+      visible: false,
+      confirmLoading: false,
+      formLayout: 'horizontal',
+      hideRequiredMark: false, // 是否显示必填的* 默认显示
+      form: this.$form.createForm(this),
+      formItemLayout: {
+        labelCol: {
+          span: 6
+        },
+        wrapperCol: {
+          span: 14
+        }
+      },
+      formData: {
+        title: '', // 标题
+        photo: '', // banner图片
+        url: '', // 图片路径
+        status: '', // 状态
+        sort: '', // 排序
+        position: '' // 广告图位置
+      },
+      bannerType: 'app',
+      disabled: false,
+      value: '',
+      id: '',
+      isShow: true
+    }
+  },
+  beforeCreate () {
+    this.form = this.$form.createForm(this, {
+      name: 'validate_other'
+    })
+  },
+  methods: {
+    showModal () {
+      this.disabled = false
+      delete this.formData.id
+      this.visible = true
+      this.title = '新增'
+	  this.hideRequiredMark = false
+    },
+    getbannerImage (data) {
+      this.formData.photo = data
+    },
+    // 点击保存;
+    handleSubmit (e) {
+      e.preventDefault()
+      const _this = this
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          console.log('Received values of form: ', values, this.formData)
+          const formData = Object.assign({}, this.formData, values.formData, {
+            bannerType: 'app'
+          })
+          console.log(formData, _this.radioGroup)
+          saveItem(formData, _this.radioGroup).then(res => {
+            console.log(res, 'rrrrrrrrr')
+            if (res.status == 200) {
+              _this.$message.success(res.message ? res.message : '保存成功')
+              _this.$refs.table.refresh()
+              _this.close()
+            } else {
+              _this.$message.error(res.message)
+            }
+          })
+        }
+      })
+    },
+    close () {
+      this.visible = false
+      this.formData.title = ''
+      this.formData.photo = ''
+      this.formData.url = ''
+      this.formData.status = ''
+      this.formData.sort = ''
+      this.formData.position = ''
+      this.title = '新增'
+      this.$refs.bannerImage.setFileList('')
+      this.form.resetFields()
+    },
+    // 赋值
+    assignment (row) {
+      this.formData.id = row.id
+      this.formData.title = row.title
+      this.formData.photo = row.photo
+      this.formData.url = row.url
+      this.formData.status = row.status
+      this.formData.sort = row.sort
+      this.formData.position = row.position
+    },
+    // 0 修改,1 查看详情
+    handleEdit (row, type) {
+      console.log(row)
+      const _this = this
+      if (type == 1) {
+        this.title = '查看详情'
+        this.hideRequiredMark = true
+      } else if (type == 0) {
+        this.title = '编辑'
+        this.hideRequiredMark = false
+      }
+      this.assignment(row)
+      this.disabled = type == 1
+      this.visible = true
+      console.log(this.formData.photo)
+      setTimeout(() => {
+        _this.$refs.bannerImage.setFileList(this.formData.photo)
+      }, 500)
+    },
+    // 删除
+    delect (row) {
+      const _this = this
+      this.$confirm({
+        title: '警告',
+        content: '删除后无法恢复,确认删除?',
+        okText: '确定',
+        cancelText: '取消',
+        onOk () {
+          deleteItem({
+            id: row.id
+          }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+            } else {
+              _this.$message.error(res.message)
+            }
+          })
+        }
+      })
+    },
+    // 更改启用禁用状态
+    changeFlagHandle (text, record) {
+      const _data = {
+        id: record.id,
+        flag: record.status == 1 ? '0' : '1'
+      }
+      changeStatus(_data).then(res => {
+        if (res.status == '200') {
+          this.$message.success('修改成功')
+          this.$refs.table.refresh()
+        } else {
+          record.status = !record.status
+        }
+      })
+    }
+  }
+}
 </script>
 
 <style scoped>

+ 103 - 103
src/views/appSetting/editionSetting.vue

@@ -13,119 +13,119 @@
       :data="loadData"
       bordered
     >
-    <span slot="action" slot-scope="text, record">
-      <template>
-        <a-icon type="edit" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="handleEdit(record)" />
+      <span slot="action" slot-scope="text, record">
+        <template>
+          <a-icon type="edit" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="handleEdit(record)" />
+        </template>
+      </span>
+      <template slot="upgradeContent" slot-scope="text, record">
+        <span :title="record.upgradeContent" style="display: inline-block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{ record.upgradeContent }}</span>
+
       </template>
-    </span>
-    <template slot="upgradeContent" slot-scope="text, record">
-      <span :title="record.upgradeContent" style="display: inline-block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; width: 200px;">{{record.upgradeContent}}</span>
-      
-    </template>
-    <span slot="forceUpgrade" slot-scope="text, record">
-      <template>
-        <span v-if= " text == '1'">是</span>
-        <span v-if= " text == '0'">否</span>
-      </template> 
-    </span>
+      <span slot="forceUpgrade" slot-scope="text">
+        <template>
+          <span v-if=" text == '1'">是</span>
+          <span v-if=" text == '0'">否</span>
+        </template>
+      </span>
     </s-table>
   </a-card>
 </template>
 
 <script>
-  import {STable} from '@/components'
-  import {getEditionSettingList} from '@/api/editionSetting.js'
-  export default{
-    name:'EditionSetting',
-    components:{STable},
-    data(){
-      return{
-        columns:[
-          {
-            title: '序号',
-            dataIndex: 'no',
-            width:"40",
-            align:'center'
-          },
-          {
-            title: '创建时间',
-            width:"100",
-            dataIndex: 'createDate',
-            align:'center'
-          },
-          {
-            title: '版本号',
-            width:"40",
-            dataIndex:'version',
-            align:'center'
-          },
-          {
-            title: '强制升级',
-            width:"40",
-            dataIndex:'forceUpgrade',
-            align:'center',
-            scopedSlots: { customRender: 'forceUpgrade' }
-          },
-          {
-            title: '升级内容',
-            width:'200',
-            dataIndex:'upgradeContent',
-            align:'center',
-            ellipsis: true  ,//内容超过宽度 自动出现省略号
-            scopedSlots: { customRender: 'upgradeContent' }
-            
-          },
-          {
-            title: '下载地址',
-            width:'200',
-            dataIndex:'downloadUrl',
-            align:'center'
-          },
-          {
-            title: '更新时间',
-            width:'100',
-            dataIndex:'updateDate',
-            align:'center'
-          },
-          {
-            title: '操作',
-            // dataIndex: 'action',
-            width:"40",
-            align:'center',
-            scopedSlots: { customRender: 'action' }
-          },
-        ],
-        applyCode:'zyit',
-        applyName:'IT后台',
-        // 获取列表数据
-        loadData: parameter => {
-          return getEditionSettingList(Object.assign(parameter, {applyCode:'zyit'}))
-            .then(res => {
-              console.log(res,'1111')
-              const no = (res.data.pageNo - 1) * res.data.pageSize
-              for (let i = 0; i < res.data.list.length; i++) {
-                const _item = res.data.list[i]
-                _item.no = no + i + 1
-                _item.releaseStatus = _item.releaseStatus + '' === 'FB'
-              }
-              return res.data
-            })
+import { STable } from '@/components'
+import { getEditionSettingList } from '@/api/editionSetting.js'
+export default {
+  name: 'EditionSetting',
+  components: { STable },
+  data () {
+    return {
+      columns: [
+        {
+          title: '序号',
+          dataIndex: 'no',
+          minWidth: '40',
+          align: 'center'
         },
-        id:''
-      }
-    },
-    methods:{
-      openModal(){
-        this.$router.push({ name: 'editionSetting_add' })
+        {
+          title: '创建时间',
+          minWidth: '100',
+          dataIndex: 'createDate',
+          align: 'center'
+        },
+        {
+          title: '版本号',
+          minWidth: '40',
+          dataIndex: 'version',
+          align: 'center'
+        },
+        {
+          title: '强制升级',
+          minWidth: '40',
+          dataIndex: 'forceUpgrade',
+          align: 'center',
+          scopedSlots: { customRender: 'forceUpgrade' }
+        },
+        {
+          title: '升级内容',
+          minWidth: '200',
+          dataIndex: 'upgradeContent',
+          align: 'center',
+          ellipsis: true, // 内容超过宽度 自动出现省略号
+          scopedSlots: { customRender: 'upgradeContent' }
+
+        },
+        {
+          title: '下载地址',
+          minWidth: '200',
+          dataIndex: 'downloadUrl',
+          align: 'center'
+        },
+        {
+          title: '更新时间',
+          minWidth: '100',
+          dataIndex: 'updateDate',
+          align: 'center'
+        },
+        {
+          title: '操作',
+          // dataIndex: 'action',
+          minWidth: '40',
+          align: 'center',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      applyCode: 'zyit',
+      applyName: 'IT后台',
+      // 获取列表数据
+      loadData: parameter => {
+        return getEditionSettingList(Object.assign(parameter, { applyCode: 'zyit' }))
+          .then(res => {
+            // console.log(res,'1111')
+            const no = (res.data.pageNo - 1) * res.data.pageSize
+            for (let i = 0; i < res.data.list.length; i++) {
+              const _item = res.data.list[i]
+              _item.no = no + i + 1
+              // _item.releaseStatus = _item.releaseStatus + '' === 'FB'
+            }
+            return res.data
+          })
       },
-      //操作修改
-      handleEdit(row){
-        console.log(row)
-        this.$router.push({ name: 'editionSetting_add', query: { id: row.id } })
-        // this.formData=Object.assign({},this.formData,row)
-      }
+      id: ''
+    }
+  },
+  methods: {
+	 // 新增
+    openModal () {
+      this.$router.push({ name: 'editionSetting_add' })
+    },
+    // 编辑
+    handleEdit (row) {
+      console.log(row)
+      this.$router.push({ name: 'editionSetting_edit', query: { id: row.id } })
     }
   }
+}
 </script>
 
 <style scoped>

+ 0 - 2
src/views/power/role/menuModal.vue

@@ -2,7 +2,6 @@
   <div>
     <a-modal class="modalBox" :title="roleName" v-model="isshow" @cancle="cancel">
       <a-form class="form-box" style="max-height: 600px;" :form="form" @submit="handleSubmit">
-
         <a-tree
           checkable
           @check="onCheck"
@@ -12,7 +11,6 @@
           v-model="checkedKeys"
           :treeData="treeData"
         />
-
       </a-form>
       <a-form-item :wrapper-col="{ offset: 15 }">
         <a-button type="primary" @click="handleSubmit()">

+ 6 - 6
src/views/power/role/roleList.vue

@@ -79,6 +79,12 @@ export default {
           width: '40',
           align: 'center'
         },
+        {
+		  title: '创建时间',
+		  dataIndex: 'createDate',
+		  width: '120',
+		  align: 'center'
+        },
         {
           title: '角色名称',
           dataIndex: 'name',
@@ -97,12 +103,6 @@ export default {
           align: 'center',
           scopedSlots: { customRender: 'status' }
         },
-        {
-          title: '创建时间',
-          dataIndex: 'createDate',
-          width: '120',
-          align: 'center'
-        },
         {
           title: '操作',
           width: '100',

+ 7 - 7
src/views/power/user/userList.vue

@@ -40,7 +40,7 @@
       bordered
     >
       <span slot="status" slot-scope="text, record">
-        <a-switch checkedChildren="" unCheckedChildren="" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
+        <a-switch checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
       </span>
       <div slot="roleNames" slot-scope="text, record" :title="record.roleNames">
         <span v-if="record.roleNames">{{ record.roleNames.substr(0,12) + '...' }}</span>
@@ -87,6 +87,12 @@ export default {
           width: '40',
           align: 'center'
         },
+        {
+		  title: '创建时间',
+		  dataIndex: 'createDate',
+		  width: '120',
+		  align: 'center'
+        },
         {
           title: '用户名称',
           dataIndex: 'name',
@@ -111,12 +117,6 @@ export default {
           align: 'center',
           scopedSlots: { customRender: 'status' }
         },
-        {
-          title: '创建时间',
-          dataIndex: 'createDate',
-          width: '120',
-          align: 'center'
-        },
         {
           title: '操作',
           width: '100',