sunyize преди 2 години
родител
ревизия
7e5f149244
променени са 3 файла, в които са добавени 46 реда и са изтрити 62 реда
  1. 6 1
      src/api/api.js
  2. 16 7
      src/views/system/expireDateConfig.vue
  3. 24 54
      src/views/system/modules/expireModal.vue

+ 6 - 1
src/api/api.js

@@ -7,6 +7,9 @@ const addRole = (params)=>postAction("/sys/role/add",params);
 const editRole = (params)=>putAction("/sys/role/edit",params);
 const checkRoleCode = (params)=>getAction("/sys/role/checkRoleCode",params);
 const queryall = (params)=>getAction("/sys/role/queryall",params);
+//过期配置
+const addExpire = (params)=>postAction("/sys/expire/add",params);
+const editExpire = (params)=>putAction("/sys/expire/edit",params);
 
 //用户管理
 const addUser = (params)=>postAction("/sys/user/add",params);
@@ -160,7 +163,9 @@ export {
   saveDeptRolePermission,
   queryMyDepartTreeList,
   getUserNoticeInfo,
-  getDictItemsFromCache
+  getDictItemsFromCache,
+  editExpire,
+  addExpire
 }
 
 

+ 16 - 7
src/views/system/expireDateConfig.vue

@@ -51,11 +51,11 @@
                 <a-menu-item>
                   <a @click="handleEdit(record)">编辑</a>
                 </a-menu-item>
-<!--                <a-menu-item>-->
-<!--                  <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete1(record)">-->
-<!--                    <a>删除</a>-->
-<!--                  </a-popconfirm>-->
-<!--                </a-menu-item>-->
+                <a-menu-item>
+                  <a-popconfirm title="确定删除吗?" @confirm="() => dataDelete(record)">
+                    <a>删除</a>
+                  </a-popconfirm>
+                </a-menu-item>
               </a-menu>
             </a-dropdown>
         </span>
@@ -63,7 +63,7 @@
         </div>
         <!-- 右侧的角色权限配置 -->
         <user-role-modal ref="modalUserRole"></user-role-modal>
-        <role-modal ref="modalForm" @ok="modalFormOk"></role-modal>
+        <expire-modal ref="modalForm" @ok="modalFormOk"></expire-modal>
       </a-card>
     </a-col>
 
@@ -129,7 +129,16 @@
 
     },
     methods: {
-
+      dataDelete(id) {
+        var that = this;
+        deleteAction("/sys/expire/delete", {id: id.id}).then((res) => {
+          if (res.success) {
+            that.$message.success('清空完成!');
+          } else {
+            that.$message.warning('清空失败!');
+          }
+        });
+      },
     }
   }
 </script>

+ 24 - 54
src/views/system/modules/expireModal.vue

@@ -12,13 +12,16 @@
 
     <a-spin :spinning="confirmLoading">
       <a-form-model ref="form"  v-bind="layout"  :model="model" :rules="validatorRules">
-        <a-form-model-item label="配置名称" required prop="roleName">
+        <a-form-model-item label="配置名称" required prop="configName">
           <a-input v-model="model.configName" placeholder="请输入配置名称"/>
         </a-form-model-item>
+<!--        <a-form-model-item label="配置名称" required prop="configName">-->
+<!--          <a-input v-model="model.configNumber" placeholder="请输入配置名称"/>-->
+<!--        </a-form-model-item>-->
 
-        <a-form-model-item label="数值" required prop="roleName">
-          <a-input v-model="model.configNumber" placeholder="请输入数值"/>
-        </a-form-model-item>
+        <a-form-model-item label="数值"    >
+          <a-input-number  v-model="model.configNumber"   :min="1" :max="1000"  :default-value="30"/>
+         </a-form-model-item>
 
       </a-form-model>
     </a-spin>
@@ -26,7 +29,8 @@
 </template>
 
 <script>
-  import {addRole,editRole,duplicateCheck } from '@/api/api'
+  import {addExpire,editExpire } from '@/api/api'
+  import { getAction } from '@api/manage'
   export default {
     name: "expireModal",
     data () {
@@ -34,7 +38,10 @@
         title:"操作",
         visible: false,
         roleDisabled: false,
-        model: {},
+        model: {
+          configName:'',
+          configNumber:''
+        },
         layout: {
           labelCol: { span: 3 },
           wrapperCol: { span: 14 },
@@ -42,12 +49,10 @@
         confirmLoading: false,
         validatorRules:{
           configName: [
-            { required: true, message: '请输入配置名称!' },
-            { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
-            { validator: this.validateRoleName}
+            { required: true,message: '请输入配置名称!'  },
           ],
           configNumber: [
-            { required: true, message: '请输入配置名称!' },
+            { required: true, message: '请输入配置数值!' },
             { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
             { validator: this.validateRoleName}
           ]
@@ -80,6 +85,7 @@
         this.$emit('close');
         this.visible = false;
       },
+
       handleOk () {
         const that = this;
         // 触发表单验证
@@ -87,10 +93,16 @@
           if (valid) {
             that.confirmLoading = true;
             let obj;
+            if(that.model.configNumber==='' ){
+              that.$message.warning("数值不可为空");
+              that.confirmLoading = false;
+              return false;
+            }
+
             if(!this.model.id){
-              obj=addRole(this.model);
+              obj=addExpire(this.model);
             }else{
-              obj=editRole(this.model);
+              obj=editExpire(this.model);
             }
             obj.then((res)=>{
               if(res.success){
@@ -111,49 +123,7 @@
       handleCancel () {
         this.close()
       },
-      validateRoleCode(rule, value, callback){
-        if(/[\u4E00-\u9FA5]/g.test(value)){
-          callback("角色编码不可输入汉字!");
-        }else{
-          let params = {
-            tableName: "sys_role",
-            fieldName: "role_code",
-            fieldVal: value,
-            dataId: this.model.id,
-          };
-          duplicateCheck(params).then((res)=>{
-            if(res.success){
-              callback();
-            }else{
-              callback(res.message);
-            }
-          });
-        }
-      },
-      validatePower(rule, value, callback) {
-        if ( value !=='' && value!==null) {
-          callback();
-        } else {
-          callback("请选择!");
-        }
-      },
-      validateRoleName(rule, value, callback){
 
-          let params = {
-            tableName: "sys_role",
-            fieldName: "role_name",
-            fieldVal: value,
-            dataId: this.model.id,
-          };
-          duplicateCheck(params).then((res)=>{
-            if(res.success){
-              callback();
-            }else{
-              callback(res.message);
-            }
-          });
-
-      }
     }
   }
 </script>