فهرست منبع

取消确认弹窗 以及非必填字段的列表回显

zhangdan 4 سال پیش
والد
کامیت
1c4f3d326c

+ 2 - 2
src/views/appSetting/addEditionSetting.vue

@@ -62,14 +62,14 @@
           <a-col :span="24">
             <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="升级内容">
               <a-textarea
-                placeholder="请输入升级内容500个字以内"
+                placeholder="请输入升级内容(最多500个字符)"
                 :maxLength="500"
                 id="addEditionSetting-upgradeContent"
                 auto-size
                 v-decorator="[
                   'formData.upgradeContent',
                   { initialValue: formData.upgradeContent,getValueFromEvent: $filterEmpty,
-                    rules: [{ required: true, message: '请输入升级内容500个字以内' }]
+                    rules: [{ required: true, message: '请输入升级内容(最多500个字符)' }]
                   },
                 ]" />
             </a-form-item>

+ 9 - 6
src/views/appSetting/bannerSetting.vue

@@ -49,9 +49,9 @@
           <a-input
             id="bannerSetting-title"
             :maxLength="30"
-            v-decorator="['formData.title', { initialValue: formData.title,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入轮播图名称30个字以内!' }] }]"
+            v-decorator="['formData.title', { initialValue: formData.title,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入轮播图名称(最多30个字符)!' }] }]"
             :disabled="disabled"
-            placeholder="请输入轮播图名称30个字以内"
+            placeholder="请输入轮播图名称(最多30个字符)"
             allowClear
           />
         </a-form-item>
@@ -117,9 +117,9 @@
             <img v-else :src="formData.photoPath" style="width:100px ;height: auto;" />
           </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" id="bannerSetting-submit">保存</a-button>
-          <a-button @click="close()" style="margin-left: 8px" id="bannerSetting-close">取消</a-button>
+        <a-form-item :wrapper-col="{ span: 12, offset: 6}" style="text-align: center;">
+          <a-button type="primary" html-type="submit" v-if="!disabled" id="bannerSetting-submit" style="margin-right: 15px">保存</a-button>
+          <a-button @click="close()" style="margin-left: 15px" id="bannerSetting-close">取消</a-button>
         </a-form-item>
       </a-form>
     </a-modal>
@@ -171,7 +171,10 @@ export default {
           title: '跳转链接',
           width: 100,
           dataIndex: 'url',
-          align: 'center'
+          align: 'center',
+          customRender: (text) => {
+            return text || '--'
+          }
         },
         {
           title: '状态',

+ 6 - 2
src/views/appSetting/editionSetting.vue

@@ -13,10 +13,11 @@
       :data="loadData"
       bordered
     >
+      <!-- 操作 -->
       <span slot="action" slot-scope="text, record">
         <template>
           <a-icon v-if="currentDate < new Date(record.publicDate).getTime()" type="edit" id="editionSetting-handleEdit" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="handleEdit(record)" />
-          <span v-if="currentDate > new Date(record.publicDate).getTime()">-</span>
+          <span v-if="currentDate > new Date(record.publicDate).getTime()">--</span>
         </template>
       </span>
       <template slot="upgradeContent" slot-scope="text, record">
@@ -80,7 +81,10 @@ export default {
           title: '下载地址',
           width: 200,
           dataIndex: 'downloadUrl',
-          align: 'center'
+          align: 'center',
+          customRender: (text) => {
+            return text || '--'
+					  }
         },
         {
           title: '更新时间',

+ 3 - 11
src/views/power/OperateJournal/OperateJournal.vue

@@ -2,7 +2,7 @@
   <a-card :bordered="false">
     <div class="operateJournal">
       <!-- 搜索框 -->
-      <div class="table-page-search-wrapper">
+      <div class="table-page-search-wrapper" style="margin-bottom: 15px;">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
@@ -17,7 +17,7 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="操作人"><a-input allowClear v-model.trim="searchData.queryWord" :maxLength="30" placeholder="请输入30个字以内" id="OperateJournal-queryWord"/></a-form-item>
+              <a-form-item label="操作人"><a-input allowClear v-model.trim="searchData.queryWord" :maxLength="30" placeholder="请输入" id="OperateJournal-queryWord"/></a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)" id="OperateJournal-refreshTable">查询</a-button>
@@ -121,15 +121,7 @@ export default {
       this.$refs.table.refresh(true)
     }
   }
-  // beforeRouteEnter (to, from, next) {
-  //   next(vm => {
-  //     // const todayDate= [getDate.getToday().starttime, getDate.getToday().endtime]
-  // 	// console.log(todayDate)
-  // 	// vm.searchData.beginDate = getDate.getToday().starttime
-  // 	// vm.searchData.endDate = getDate.getToday().endtime
-  // 	// console.log(vm.searchData.beginDate, '--------------',  vm.searchData.endDate )
-  //   })
-  // }
+
 }
 </script>
 

+ 1 - 11
src/views/power/role/menuModal.vue

@@ -103,17 +103,7 @@ export default {
     },
     // 取消
     handleCancel () {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          _this.clear()
-          _this.cancel()
-        }
-      })
+      this.cancel()
     },
     clear () {
       this.form.resetFields()

+ 2 - 5
src/views/power/role/roleList.vue

@@ -45,11 +45,11 @@
       </span>
       <!-- 角色描述 -->
       <template slot="remarks" slot-scope="text, record">
-        <span :title="record.remarks" style="display: inline-block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{ record.remarks }}</span>
+        <span :title="record.remarks" style="display: inline-block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{ record.remarks ?record.remarks : '--' }}</span>
       </template>
       <!-- 操作 -->
       <span slot="action" slot-scope="text, record">
-        <a-icon type="key" title="菜单权限" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="openMenuModal(record)" />
+        <a-icon type="setting" title="菜单权限" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="openMenuModal(record)" />
         <a-icon type="edit" title="编辑" :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}" @click="handleEdit(record)" />
         <a-icon
           type="delete"
@@ -57,9 +57,6 @@
           :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
           v-if="!record.isEnable"
           @click="delect(record)" />
-        <!-- <a class="action-button menu-text" @click="openMenuModal(record)" id="roleList-openMenuModal">菜单权限</a>
-        <a class="action-button" @click="handleEdit(record)" id="roleList-handleEdit">修改</a>
-        <a v-if="!record.isEnable" class="action-button red-text" @click="delect(record)" id="roleList-delect">删除</a> -->
       </span>
     </s-table>
     <roleModal :visible="showModal" :data="itemData" @refresh="refreshTable" @close="showModal = false"></roleModal>

+ 7 - 17
src/views/power/role/roleModal.vue

@@ -5,13 +5,13 @@
         <!-- 用户名称 -->
         <a-form-item label="角色名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-input
-            placeholder="请输入角色名称30个字以内"
+            placeholder="请输入角色名称(最多30个字符)"
             allowClear
             :maxLength="30"
             id="roleModal-name"
             v-decorator="['formData.name', {
               initialValue: formData.name,getValueFromEvent: $filterEmpty,
-              rules: [{ required: true, message: '请输入角色名称30个字以内!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
+              rules: [{ required: true, message: '请输入角色名称(最多30个字符)!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
           />
         </a-form-item>
 
@@ -42,15 +42,15 @@
                 rules: [] },
             ]"
             style="min-height: 60px;"
-            placeholder="输入内容为500个字以内"
+            placeholder="请输入角色描述(最多500个字符)"
             autosize />
         </a-form-item>
 
-        <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-          <a-button type="primary" @click="handleSubmit()" id="roleModal-handleSubmit">
+        <a-form-item :wrapper-col="{ span: 24, offset: 10 }">
+          <a-button type="primary" @click="handleSubmit()" id="roleModal-handleSubmit" :style="{ marginRight: '15px' }">
             保存
           </a-button>
-          <a-button :style="{ marginLeft: '8px' }" @click="handleCancel()" id="roleModal-handleCancel">
+          <a-button :style="{ marginLeft: '15px' }" @click="handleCancel()" id="roleModal-handleCancel">
             取消
           </a-button>
         </a-form-item>
@@ -123,17 +123,7 @@ export default {
     },
     // 取消
     handleCancel () {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          _this.clear()
-          _this.cancel()
-        }
-      })
+      this.cancel()
     },
     clear () {
       this.form.resetFields()

+ 3 - 12
src/views/power/user/userList.vue

@@ -59,10 +59,10 @@
           @change="changeFlagHandle(text, record)"
           id="userList-changeFlagHandle" />
       </span>
-      <div slot="roleNames" slot-scope="text, record" :title="record.roleNames">
+      <!-- <div slot="roleNames" slot-scope="text, record" :title="record.roleNames">
         <span v-if="record.roleNames">{{ record.roleNames.substr(0,12) + '...' }}</span>
         <span v-else>无</span>
-      </div>
+      </div> -->
       <span slot="action" slot-scope="text, record">
         <a-icon
           type="edit"
@@ -82,13 +82,6 @@
           :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
           v-if="record.loginFlag==0"
           @click="delect(record)"/>
-        <!-- <template>
-          <div>
-            <a class="action-button" @click="handleEdit(record)" id="userList-handleEdit">修改</a>
-            <a v-if="record.loginFlag" class="action-button reset-text" @click="resetPassword(record)" id="userList-resetPassword">重置密码</a>
-            <a v-if="!record.loginFlag" class="action-button red-text" @click="delect(record)" id="userList-delect">删除</a>
-          </div>
-        </template> -->
       </span>
     </s-table>
     <userModal :visible="showModal" @refresh="$refs.table.refresh(true)" :data="itemData" @close="showModal = false"></userModal>
@@ -153,9 +146,7 @@ export default {
         title: '角色',
         width: '100',
         align: 'center',
-        scopedSlots: {
-          customRender: 'roleNames'
-        }
+        dataIndex: 'roleNames'
       },
       {
         title: '状态',

+ 10 - 21
src/views/power/user/userModal.vue

@@ -7,13 +7,13 @@
             <!-- 用户名称 -->
             <a-form-item label="用户名称" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
               <a-input
-                placeholder="请输入用户名称30个字以内"
-				allowClear
+                placeholder="请输入用户名称(最多30个字符)"
+                allowClear
                 id="userModal-name"
                 :maxLength="30"
                 v-decorator="['formData.name', {
                   initialValue: formData.name,getValueFromEvent: $filterEmpty,
-                  rules: [{ required: true, message: '请输入用户名称30个字以内!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
+                  rules: [{ required: true, message: '请输入用户名称(最多30个字符)!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
               />
             </a-form-item>
           </a-col>
@@ -22,7 +22,7 @@
             <a-form-item label="手机号码" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
               <a-input
                 placeholder="请输入手机号码"
-				allowClear
+                allowClear
                 :maxLength="11"
                 id="userModal-phone"
                 v-decorator="['formData.phone', {
@@ -84,7 +84,7 @@
                 mode="multiple"
                 style="width: 100%"
                 placeholder="请选择角色"
-				allowClear
+                allowClear
               >
                 <a-select-option
                   v-for="item in roleList"
@@ -110,17 +110,16 @@
                     rules: [] },
                 ]"
                 style="min-height: 50px;"
-                placeholder="输入内容为500个字以内"
+                placeholder="请输入备注(最多500个字符)"
                 autosize />
             </a-form-item>
           </a-col>
         </a-row>
-
-        <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-          <a-button type="primary" @click="handleSubmit()" id="userModal-handleSubmit">
+        <a-form-item :wrapper-col="{ span: 24, offset: 10}">
+          <a-button type="primary" @click="handleSubmit()" id="userModal-handleSubmit" :style="{ marginRight: '15px' }">
             保存
           </a-button>
-          <a-button :style="{ marginLeft: '8px' }" @click="handleCancel()" id="userModal-handleCancel">
+          <a-button :style="{ marginLeft: '15px' }" @click="handleCancel()" id="userModal-handleCancel">
             取消
           </a-button>
         </a-form-item>
@@ -200,17 +199,7 @@ export default {
     },
     // 取消
     handleCancel () {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          _this.clear()
-          _this.cancel()
-        }
-      })
+      this.cancel()
     },
     clear () {
       this.form.resetFields()