校验问题处理

manager/src/views/distribution/dataJson.js

@@ -24,11 +24,11 @@ export const cashStatusList = [
         label:'待处理'
     },
     {
-        value:'REFUSE',
+        value:'FAIL_AUDITING',
         label:'拒绝'
     },
     {
-        value:'PASS',
+        value:'VIA_AUDITING',
         label:'通过'
     }
 ]
@@ -46,4 +46,4 @@ export const orderStatusList = [
         value:'COMPLETE_CASH',
         label:'提现完成'
     }
-]
+]

manager/src/views/distribution/distributionCash.vue

@@ -1,24 +1,27 @@
 <template>
   <div>
     <Card>
-      <Row @keydown.enter.native="handleSearch" >
-        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-          <Form-item label="会员名称">
-            <Input class="search-input" v-model="searchForm.memberName"></Input>
+        <Form ref="searchForm" :model="searchForm"  class="search-form">
+          <Form-item label="会员名称"  class="flex" prop="memberName">
+            <Input
+              type="text" v-model="searchForm.memberName"
+              style="width: 200px"></Input>
           </Form-item>
-          <Form-item label="编号">
-            <Input class="search-input" v-model="searchForm.sn"></Input>
+          <Form-item label="编号" class="flex">
+            <Input
+              type="text" v-model="searchForm.sn"
+              style="width: 200px"></Input>
           </Form-item>
-          <Form-item label="状态" style="margin-left: -20px">
-            <Select v-model="searchForm.distributionCashStatus" style="width:150px;">
+          <Form-item label="状态"
+                     style="width: 200px">
+            <Select v-model="searchForm.distributionCashStatus" clearable style="width: 150px">
                 <Option v-for="item in cashStatusList" :value="item.value" :key="item.value">{{ item.label }}</Option>
             </Select>
           </Form-item>
-          <Form-item style="margin-left:-35px;" class="br">
+          <Form-item>
             <Button @click="handleSearch" type="primary">搜索</Button>
           </Form-item>
         </Form>
-      </Row>
       <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></Table>
       <Row type="flex" justify="end" class="page padding-row">
         <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]" size="small" show-total show-elevator show-sizer></Page>

manager/src/views/distribution/distributionOrder.vue

@@ -2,7 +2,7 @@
   <div>
     <Card>
       <Form ref="searchForm" @keydown.enter.native="handleSearch" :model="searchForm" inline :label-width="70" class="search-form">
-        <Form-item label="订单编号" prop="orderSn">
+        <Form-item label="订单编号"  prop="orderSn">
           <Input
             type="text"
             v-model="searchForm.orderSn"
@@ -86,6 +86,8 @@
         searchForm: { // 搜索框初始化对象
           pageNumber: 1, // 当前页数
           pageSize: 10, // 页面大小
+          sort:"create_time",
+          order:"desc"
         },
         columns: [
           {

manager/src/views/page/article-manage/ArticleCategory.vue

@@ -65,14 +65,14 @@
             />
           </FormItem>
         </div>
-        <FormItem label="分类名称" prop="name">
+        <FormItem label="分类名称" prop="articleCategoryName">
           <Input
             v-model="formAdd.articleCategoryName"
             clearable
             style="width: 100%"
           />
         </FormItem>
-        <FormItem label="排序值" prop="sort" style="width: 345px">
+        <FormItem label="排序值" prop="sort">
           <InputNumber v-model="formAdd.sort"></InputNumber>
         </FormItem>
       </Form>
@@ -94,7 +94,7 @@ import {
 } from "@/api/pages";
 import TreeTable from "@/views/my-components/tree-table/Table/Table";
 import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
-
+import { regular } from "@/utils";
 export default {
   name: "lili-components",
   components: {
@@ -119,7 +119,15 @@ export default {
         level: 0,
       },
       // 表单验证规则
-      formValidate: {},
+      formValidate: {
+        articleCategoryName:[
+          regular.REQUIRED,
+        ],
+        sort:[
+          regular.REQUIRED,
+          regular.INTEGER
+        ]
+      },
       columns: [
         {
           title: "分类名称",