Browse Source

feat:手机号登录

snow 1 year ago
parent
commit
40671c0369

+ 56 - 27
src/views/customerService/demandOrder/detail.vue

@@ -8,15 +8,23 @@
              <demand-detail :sitem="sitem" @refresh="refresh" @switchNode="handleSwitchNode" />
            </el-collapse-item>
 
-           <el-collapse-item :title="Number(sitem.status) > 1 ? '评估预算函' :'评估预算函管理'" name="2" v-if="Number(sitem.status) >= 1">
-             <manage-budgeet-letter
+           <el-collapse-item 
+            name="2" 
+            v-if="Number(sitem.status) >= 1"
+            :title="Number(sitem.status) > 1 ? '评估预算函' :'评估预算函管理'" 
+          >
+             <manage-budget-letter
               :sitem="sitem" 
               :readonly="Number(sitem.status) > 1"
-              @selectedChange="handleSelectedChange($event,'budget')" 
+              @selectedChange="handleSelectedChange($event, 'budget')" 
             />
            </el-collapse-item> 
 
-           <el-collapse-item :title="Number(sitem.status) > 2  ? '活动方案' :'活动方案管理'" name="3" v-if="Number(sitem.status) >= 2">
+           <el-collapse-item 
+            name="3" 
+            v-if="Number(sitem.status) >= 2"
+            :title="Number(sitem.status) > 2  ? '活动方案' :'活动方案管理'"
+            >
              <manage-activity-scheme 
               :sitem="sitem" 
               :readonly="Number(sitem.status) > 2"
@@ -24,11 +32,14 @@
             />
            </el-collapse-item> 
            
-           <el-collapse-item :title="Number(sitem.status) > 3 ? '计划预算函' : '计划预算函管理'" name="10" v-if="Number(sitem.status) >= 3">
+           <el-collapse-item 
+            v-if="Number(sitem.status) >= 3"
+            :title="Number(sitem.status) > 3 ? '计划预算函' : '计划预算函管理'" name="10" 
+            >
              <manage-project-letter
               :sitem="sitem" 
               :readonly="Number(sitem.status) > 3"
-              @selectedChange="handleSelectedChange($event,'project')" 
+              @selectedChange="handleSelectedChange($event, 'project')" 
             />
            </el-collapse-item> 
            
@@ -40,12 +51,18 @@
             >
               <credentials-node
                 :readonly="Number(sitem.status) !== 4 && Number(sitem.status) !== 8"
-                :url="sitem.ReqProof ? sitem.ReqProof.filter(({user_type}) => user_type === 1).map(({proof_url}) => proof_url) : ''"
+                :url="sitem.ReqProof 
+                  ? sitem.ReqProof.filter(({user_type}) => user_type === 1).map(({proof_url}) => proof_url) 
+                  : ''"
                 @confirm="handleCustomerConfirm($event)" 
               />
            </el-collapse-item>
 
-           <el-collapse-item title="待平台审核执行凭证" name="5" v-if="Number(sitem.status) === 5">
+           <el-collapse-item
+            v-if="Number(sitem.status) === 5"
+            title="待平台审核执行凭证" 
+            name="5" 
+          >
              <wait-execute-certificate :sitem="sitem" @refresh="initData" />
            </el-collapse-item>
            
@@ -58,15 +75,19 @@
            </el-collapse-item>
            
           <el-collapse-item 
-            :title="Number(sitem.status) >= 9 && Number(sitem.status) !== 11 ? '结算函' : '待客户上传结算函'"
-             v-if="Number(sitem.status) >= 9"
-             name="8" 
+            :title="
+              Number(sitem.status) >= 9 && Number(sitem.status) !== 11 
+              ? '结算函' 
+              : '待客户上传结算函'
+            "
+            v-if="Number(sitem.status) >= 9"
+            name="8" 
           >
              <letter 
+              status="4"
+              ref="letter"
               :id="sitem.id" 
               type="settlement" 
-              ref="letter"
-              status="4"
               :readonly="Number(sitem.status) > 9 && Number(sitem.status) !== 11"
               :requsetMethod="handleUploadLetter" 
               @publish-ok="refresh"
@@ -74,7 +95,11 @@
             />
            </el-collapse-item> 
            
-           <el-collapse-item title="待客户确认结算函" name="9" v-if="Number(sitem.status) === 10">
+           <el-collapse-item 
+            v-if="Number(sitem.status) === 10"
+            title="待客户确认结算函" 
+            name="9" 
+          >
              <normal-node @confirm="handleConfirmSettlement" />
            </el-collapse-item>
           </el-collapse>
@@ -84,10 +109,9 @@
   </div>
 </template>
 <script>
-import asyncRequest from "@/apis/service/customerService/demandOrder";
-import privateField from '@/mixins/privateField'
 import DemandDetail from "./components/demandDetail/index.vue"
-import ManageBudgeetLetter from "./components/manageBudgetLetter.vue"
+import ManageBudgetLetter from "./components/manageBudgetLetter.vue"
+import asyncRequest from "@/apis/service/customerService/demandOrder"
 import ManageProjectLetter from "./components/manageProjectLetter.vue"
 import WaitSupplierConfirm from "./components/waitSupplierConfirm.vue"
 import WaitCustomerConfirm from "./components/waitCustomerConfirm.vue"
@@ -95,41 +119,46 @@ import SettlementLetter from "./components/settlementLetter/index.vue"
 import ManageActivityScheme from "./components/manageActivityScheme.vue"
 import WaitExecuteCertificate from "./components/waitExecuteCertificate.vue"
 
-import { mapGetters } from "vuex";
-import { statusList } from "./columns";
-import resToken from "@/mixins/resToken";
+import resToken from "@/mixins/resToken"
+import { statusList } from "./columns"
+import { mapGetters } from "vuex"
 
 export default {
   components: { 
     DemandDetail, 
     SettlementLetter,
     ManageProjectLetter,
-    ManageBudgeetLetter, 
+    ManageBudgetLetter, 
     WaitSupplierConfirm, 
     WaitCustomerConfirm, 
     ManageActivityScheme, 
     WaitExecuteCertificate
   },
   name: "demandOrderDetail",
-  mixins: [resToken, privateField],
+  mixins: [resToken],
   computed: {
     ...mapGetters([
       "tablebtnSize", 
-      "searchSize",
       "private_field", 
       "isSupertube",
-      "size",
+      "searchSize",
+      "size"
     ]),
     powers() {
       const { btnList } = this.$store.getters;
-      const tran = btnList.find((item) => item.menu_route == "demandOrderDetail") || {};
+
+      const tran = btnList.find(
+        (item) => item.menu_route == "demandOrderDetail"
+      ) || {};
+      
       const { action } = tran ?? {};
       return action ?? [];
     },
     ppowers() {
       const { roleProcess } = this.$store.getters;
-      const tran = roleProcess.find((i) => i.process_type === "YJD") || {};
+      const tran = roleProcess.find(RE => RE.process_type === "YJD") || {};
       const { action } = tran ?? {};
+      
       return action ?? [];
     },
   },
@@ -177,7 +206,7 @@ export default {
       await this.initData();
       this.loading = false;
     },
-    handleSelectedChange(val,key){
+    handleSelectedChange(val, key){
       this.selected[key] = val
       console.log(val)
     },

+ 19 - 6
src/views/customerService/invoiceApply/components/createInvoiceApply.vue

@@ -3,12 +3,20 @@
       <el-row>
         <el-col :span="24">
           <el-form-item label="需求订单" prop="req_id">
-            <el-input placeholder="请选择需求订单" @focus="demandVisible = true" v-if="!demandInfo"/>
+            <el-input 
+              v-if="!demandInfo"
+              placeholder="请选择需求订单" 
+              @focus="demandVisible = true" 
+            />
+
             <div style="display:flex" v-else>
               <demand-detail :id="demandInfo.id" />
-
               <el-tooltip placement="top" content="重新选择需求订单">
-                <i class="el-icon-circle-close" style="font-size:18px;margin:0px 10px;cursor:pointer" @click="handleDemandChange(null)" />
+                <i 
+                  class="el-icon-circle-close" 
+                  style="font-size:18px;margin:0px 10px;cursor:pointer"
+                  @click="handleDemandChange(null)" 
+                />
               </el-tooltip>
             </div>
           </el-form-item>
@@ -49,7 +57,10 @@
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="发票抬头" prop="invoice_id">
+          <el-form-item 
+            label="发票抬头" 
+            prop="invoice_id"
+          >
             <search-invoice-title 
               :value.sync="ruleForm.invoice_id" 
               @change="_invoiceInfo => invoiceInfo = _invoiceInfo" 
@@ -82,8 +93,10 @@
       <el-button size="mini" type="primary" @click="onSubmit">保存</el-button>
     </div>
 
-    <demand-modal :visible.sync="demandVisible" @change="handleDemandChange" />
-    
+    <demand-modal 
+      :visible.sync="demandVisible" 
+      @change="handleDemandChange" 
+    />
   </el-form>
 </template>
 

+ 62 - 26
src/views/customerService/invoiceApply/components/demandModal.vue

@@ -1,5 +1,14 @@
 <template>
-  <el-dialog :visible="visible" title="选择需求订单" center width="1024px" top="60px" @close="handleClose" :close-on-click-modal="false">
+  <el-dialog 
+    :close-on-click-modal="false"
+    :visible="visible" 
+    title="选择需求订单" 
+    width="1024px" 
+    top="60px" 
+    center
+
+    @close="handleClose" 
+  >
     <div class="demand-order">
       <ex-table
         :table="table"
@@ -25,22 +34,37 @@
         <template #table-header>
           <el-row style="width:100%">
             <el-col :span="5">
-              <el-input v-model="parmValue.reqCode" size="mini" placeholder="需求订单编号" />
+              <el-input 
+                size="mini" 
+                v-model="parmValue.reqCode" 
+                placeholder="需求订单编号" 
+              />
             </el-col>
 
-            <el-col :span="3" style="width:125px" class="fr">
-              <el-button size="mini" type="warning" @click="reset">重置</el-button>
-              <el-button size="mini" type="primary" @click="searchList">搜索</el-button>
+            <el-col :span="3" style="width: 125px" class="fr">
+              <el-button 
+                size="mini" 
+                type="warning" 
+                @click="reset"
+                >重置</el-button>
+              <el-button 
+                size="mini" 
+                type="primary"
+                @click="searchList"
+              >搜索</el-button>
             </el-col>
           </el-row>
         </template>
         
-        <template #req_demand="{scope}">{{
-          scope.row.req_demand_name.map(({name}) => name).join("+") || '--'
-          }}</template>
+        <template #req_demand="{scope}">
+          <span v-if="scope.row.req_demand_name">
+            {{scope.row.req_demand_name.
+              map(({ name }) => name).join("+") || '--'}}
+          </span>
+        </template>
 
           <template #actTime="{ scope }">
-            {{getActTime(scope.row)}} , 共{{scope.row.act_day_count}}天
+            {{getActTime(scope.row)}} , 共{{scope.row.act_dat_count}}天
           </template>
 
           <template #participant="{ scope }">
@@ -56,15 +80,23 @@
         <template #status="{ scope }">
           <el-tag
             size="mini"
-            v-text="(demandStatusOptions.find((item) => item.value == String(scope.row.status)) || {}).label || '--'
+            v-text="
+              (demandStatusOptions.find((item) => item.value == String(scope.row.status)) || {}).label || '--'
             "
           />
         </template>
       </ex-table>
 
       <div class="flex-end">
-        <el-button type="primary" size="mini" @click="onConfirmDemand">保存</el-button>
+        <el-button 
+          size="mini" 
+          type="primary" 
+          @click="onConfirmDemand"
+        >
+          保存
+        </el-button>
       </div>
+
     </div>
   </el-dialog>
 </template>
@@ -75,6 +107,7 @@ import asyncRequest from "@/apis/service/customerService/demandOrder";
 import { demandStatusOptions } from '@/assets/js/statusList'
 import { columns } from "./_columns"
 import dayjs from 'dayjs';
+
 export default {
   props:['visible'],
   mixins:[ pageInfo ],
@@ -97,25 +130,18 @@ export default {
   data(){
     return {
       demandStatusOptions,
+      loading: false,
       columns,
       size: 'mini',
       parmValue: {
         reqCode: "",
         page:1
       },
-      loading: false,
       tableData: [],
       selected: [],
       table: {},
-      pageInfo: {
-        size:10,
-        curr:1,
-        total:0
-      },
-      table: {
-        stripe: true,
-        border: true,
-      }
+      pageInfo: { size: 10, curr: 1, total: 0 },
+      table: { stripe: true, border: true }
     }
   },
   methods:{
@@ -135,7 +161,7 @@ export default {
     },
     reset(){
       this.parmValue = {
-        reqCode:""
+        reqCode: ""
       }
 
       this.searchList()
@@ -162,9 +188,19 @@ export default {
       this.loading = false;
     },
     getActTime(item){
-      const { act_time, act_day_count } = item;
-      const end_time = dayjs(act_time).subtract(Number(act_day_count) - Number(act_day_count) * 2,'day').format('MM.DD')
-      return `${dayjs(act_time).format('MM.DD')} ~ ${end_time}`
+      const { 
+        act_time, 
+        act_day_count 
+      } = item;
+      
+      const end_time = dayjs(act_time)
+        .subtract(Number(act_day_count) - Number(act_day_count) * 2, 'day')
+        .format('MM.DD')
+      
+      return `
+        ${dayjs(act_time).format('MM.DD')} ~ 
+        ${end_time}
+      `
     },
     onConfirmDemand(){
       if(this.selected.length === 0){
@@ -177,7 +213,7 @@ export default {
         return
       }
 
-      this.$emit('change',this.selected[0])
+      this.$emit('change', this.selected[0])
       this._visible = false
     }
   }

+ 20 - 9
src/views/customerService/invoiceApply/detail.vue

@@ -4,7 +4,11 @@
       <el-tabs v-model="projectTabs" v-loading="loading">
         <el-tab-pane label="开票申请详情" name="1">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
-            <el-collapse-item title="创建开票申请" name="2" v-if="id === 'add'">
+            <el-collapse-item 
+              v-if="id === 'add'"
+              title="创建开票申请" 
+              name="2" 
+            >
               <create-invoice-apply />
             </el-collapse-item>
 
@@ -20,7 +24,6 @@
                   <template #company>
                     <div style="display:flex">
                       <p style="margin-right:5px">{{sitem.companyName}}</p>
-
                       <el-tooltip :content="'客户公司编号 : ' + sitem.companyNo" placement="top">
                         <i class="el-icon-warning-outline" />
                       </el-tooltip>
@@ -28,13 +31,13 @@
                   </template>
 
                   <template #title>
-                    <div style="display:flex;height:23px">
+                    <div style="display: flex;height: 23px">
                       <p style="margin-right:5px">{{sitem.invoice_title}}</p>
 
                       <el-popover placement="top" trigger="hover">
                         <show-data-table 
                           :sitem="sitem"
-                          style="padding: -5px 0 10px 0"
+                          style="padding: -5px 0px 10px 0px"
                           :columns="invoiceColumns"
                         >
                           <template #tel>
@@ -63,22 +66,30 @@
 
                   <template #invoice_type>
                     <el-tag size="mini">
-                      {{(openInvoiceTypeList.find(({value}) => value === sitem.invoice_type) || {}).label || '--'}}
+                      {{
+                        (openInvoiceTypeList.find(({value}) => value === sitem.invoice_type) 
+                          ||
+                        {}).label || '--'
+                      }}
                     </el-tag>
                   </template>
                 </show-data-table>
               </el-collapse-item>
 
-              <el-collapse-item title="需求订单详情" name="3">
+              <el-collapse-item title="需求订单详情" name="3" v-if="sitem && sitem.req_id">
                 <demand-detail :id="sitem.req_id" />
               </el-collapse-item>
               
-              <el-collapse-item title="发票申请管理" name="5" v-if="Number(sitem.status) === 2 || Number(sitem.status) === 3">
+              <el-collapse-item 
+                v-if="sitem && (Number(sitem.status) === 2 || Number(sitem.status) === 3)"
+                title="发票申请管理" 
+                name="5" 
+              >
                 <upload-invoice-node 
+                  :isNormalType="String(sitem.invoice_type) === '1'"
                   :requestMethod="handleInvoiceUpload" 
                   :code="sitem.invNo"
                   invType="1"
-                  :isNormalType="String(sitem.invoice_type) === '1'"
                 />
               </el-collapse-item>
             </template>
@@ -95,8 +106,8 @@ import asyncRequest from "@/apis/service/customerService/invoiceApply";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
 
-import CreateInvoiceApply from "./components/createInvoiceApply.vue"
 import { invoiceTypeList, openInvoiceTypeList } from '@/assets/js/statusList';
+import CreateInvoiceApply from "./components/createInvoiceApply.vue"
 
 export default {
   name: "invoiceApplyDetail",

+ 13 - 7
src/views/customerService/invoiceApply/index.vue

@@ -141,7 +141,11 @@
               </el-col>
 
               <div class="fr">
-                <el-button type="success" size="mini" @click="linkToCreateInvoice">添加</el-button>
+                <el-button 
+                  size="mini" 
+                  type="success" 
+                  @click="linkToCreateInvoice">
+                  添加</el-button>
               </div>
             </el-row>
 
@@ -156,9 +160,7 @@
                   @change="
                     pageInfo.curr = 1;
                     parmValue.page = 1;
-                    searchList();
-                  "
-                >
+                    searchList();">
                   <el-option />
                 </el-select>
               </el-col>
@@ -168,8 +170,12 @@
        <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="(statusList.find((item) => item.id == scope.row.status) || {}).type || ''"
-            v-text="(statusList.find((item) => item.id == scope.row.status) || {}).label || '--'"
+            :type="
+              (statusList.find((item) => item.id == scope.row.status) || {}).type || ''
+            "
+            v-text="
+              (statusList.find((item) => item.id == scope.row.status) || {}).label || '--'
+            "
           ></el-tag>
        </template>
 
@@ -265,8 +271,8 @@ export default {
       // 表格 - 分页
       pageInfo: {
         size: 15,
-        curr: 1,
         total: 0,
+        curr: 1
       },
       // 表格 - 列参数
       columns: listCol,

+ 73 - 76
src/views/customerService/workbench/index.vue

@@ -4,40 +4,39 @@
         <div class="workbench-main__search">
           <div style="width: 100%">
             <el-row>
-              <!-- <el-col :span="4" style="width: 351px;"> -->
-                <!-- <period-date-picker
-                  :start="parmValue.addtime_start"
-                  :end="parmValue.addtime_end"
-                  :width="'160px'"
-                  :size="searchSize"
-                  placeholder="创建"
-                  @timeReturned="(evt) => handleTime(evt, 'create')"
-                /> -->
-              <!-- </el-col> -->
-
                <el-col :span="4" style="padding-right:10px">
-                <el-select v-model="parmValue.status" style="width:100%" size="mini" placeholder="订单状态" @change="
-                  pageInfo.curr = 1;
-                  parmValue.page = 1;
-                  searchList();
+                <el-select 
+                  v-model="parmValue.status" 
+                  style="width:100%" 
+                  size="mini" 
+                  placeholder="订单状态" 
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
                 ">
                   <el-option v-for="status in statusOptions" 
                     :key="status.value" 
                     :value="status.value" 
                     :label="status.label"
-                   />
+                  />
                 </el-select>
               </el-col>
 
              <el-col :span="4" style="padding-right:10px">
-                <search-activity-type style="width:100%" size="mini" :value.sync="parmValue.demandProject" placeholder="活动类型" @change="
+                <search-activity-type 
+                  style="width:100%" 
+                  size="mini" 
+                  :value.sync="parmValue.demandProject" 
+                  placeholder="活动类型" 
+                  @change="
                    pageInfo.curr = 1;
                    parmValue.page = 1;
                    searchList();
-                  " />
+                  " 
+                />
               </el-col>
 
-
               <el-col :span="4">
                 <search-people-number 
                   size="mini" 
@@ -45,10 +44,11 @@
                   :value.sync="parmValue.participant" 
                   placeholder="活动人数"  
                   @change="
-                  pageInfo.curr = 1;
-                  parmValue.page = 1;
-                  searchList();
-                " />
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  " 
+                />
               </el-col>
                             
               <el-col :span="3" style="width: 66px; float: right">
@@ -74,43 +74,25 @@
             </el-row>
 
             <el-row style="margin-top:10px">
-              <!-- <el-col :span="4" style="width: 341px;">
-                <period-date-picker
-                  :start="parmValue[act_start]"
-                  :end="parmValue[act_end]"
-                  :width="'154px'"
-                  :size="searchSize"
-                  @timeReturned="evt => handleTime(evt,'activity')"
-                  placeholder="活动"
-                />
-              </el-col> -->
-
-
               <el-col :span="4" style="padding-right:10px">
-                <el-input size="mini" placeholder="需求编号" v-model="parmValue.reqCode" @change="
-                pageInfo.curr = 1;
-                parmValue.page = 1;
-                searchList();
-               "/>
+                <el-input 
+                  size="mini" 
+                  placeholder="需求编号" 
+                  v-model="parmValue.reqCode" 
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                "/>
               </el-col>
 
               <el-col :span="4" style="padding-right:10px">
                 <el-input v-model="parmValue.req_tel" size="mini" placeholder="联系电话" @change="
-                pageInfo.curr = 1;
-                parmValue.page = 1;
-                searchList();
-               "/>
-              </el-col>
-
-
-
-              <!-- <el-col :span="4">
-                <search-demand style="width:100%" size="mini" :value.sync="parmValue.activityDemand"  @change="
                   pageInfo.curr = 1;
                   parmValue.page = 1;
                   searchList();
-                " />
-              </el-col> -->
+               "/>
+              </el-col>
             </el-row>
           </div>
         </div>
@@ -125,30 +107,45 @@
               :key="item"
              
             >
-              <div  @click="wantTo(item.id)">
-              <div class="task-card__header">
-                <h3>{{item.reqCode}}</h3>
-                <h3 style="margin-left:10px">{{item.shortname}}</h3>
-              </div>
-
-              <div class="task-card__header">
-                <span>{{getActTime(item)}} , 共{{item.act_day_count}}天</span>
-              </div>
-              <div class="task-card__content text-color">
-                {{item.req_demand_name.map(({name}) => name).join("+") || '--'}}
-              </div>
-
-              <div class="task-card__content text-color">
-                <span>{{item.require_item_name}} </span> ,
-                <span v-if="Number(item.participant_max) === 0">{{item.participant_min}}+人</span>
-                <span v-else>{{item.participant_min}} ~ {{item.participant_max}}人</span>
-              </div>
-
-              <div class="task-card__content">
-                <el-tag class="status" size="mini" style="font-size:12px" :type="statusOptions.find(_item => _item.value === String(item.status)).type">
-                  {{ statusOptions.find(_item => _item.value === String(item.status)).label }}
-                </el-tag>
-              </div>
+              <div @click="wantTo(item.id)">
+                <div class="task-card__header">
+                  <h3>
+                    {{item.reqCode}}
+                  </h3>
+                  <h3 style="margin-left:10px">
+                    {{item.shortname}}
+                  </h3>
+                </div>
+
+                <div class="task-card__header">
+                  <span>{{getActTime(item)}} , 共{{item.act_day_count}}天</span>
+                </div>
+                <div class="task-card__content text-color">
+                  {{item.req_demand_name.map(({name}) => name).join("+") || '--'}}
+                </div>
+
+                <div class="task-card__content text-color">
+                  <span>{{item.require_item_name}} </span> ,
+                  
+                  <span v-if="Number(item.participant_max) === 0">
+                    {{item.participant_min}}+人
+                  </span>
+                  
+                  <span v-else>
+                    {{item.participant_min}} ~ {{item.participant_max}}人
+                  </span>
+                </div>
+
+                <div class="task-card__content">
+                  <el-tag 
+                    class="status" 
+                    size="mini" 
+                    style="font-size:12px" 
+                    :type="statusOptions.find(_item => _item.value === String(item.status)).type"
+                  >
+                    {{ statusOptions.find(_item => _item.value === String(item.status)).label }}
+                  </el-tag>
+                </div>
               </div>
             </el-col>
 

+ 13 - 6
src/views/login/index.vue

@@ -165,7 +165,7 @@ export default {
       }
     };
 
-    const validateCode = (rule, value, callback) => {
+    const validateCode = (_, value, callback) => {
       if (value === "") {
         callback(new Error("验证码不能为空!"));
       } else {
@@ -184,12 +184,12 @@ export default {
       loginBeian: urlConfig.loginBeian,
       loginBeianUrl: urlConfig.loginBeianUrl,
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "17744520493",
+        password: "",
         code: "",
       },
       loginRules: {
-        // username: [{ required: true, trigger: "blur", validator: validateUsername }],
+        username: [{ required: true, trigger: "blur", validator: validateUsername }],
         password: [{ required: true, trigger: "blur", validator: validatePassword }],
         code: [{ required: true, trigger: "blur", validator: validateCode }],
       },
@@ -270,8 +270,8 @@ export default {
       this.$nextTick(() => {
         this.$refs.password.focus();
       });
+
     },
-    // 生成随机数
     randomNum(min, max) {
       max = max + 1;
       return Math.floor(Math.random() * (max - min) + min);
@@ -291,7 +291,14 @@ export default {
     async handleLogin() {
       try {
         await this.$refs.loginForm.validate();
-        const response = await this.$store.dispatch("user/login", this.loginForm);
+
+        const { username, password } = this.loginForm
+        
+        const response = await this.$store.dispatch("user/login", {
+          username: username,
+          password
+        });
+
         const { code } = response;
         if (Number(code) === 1) this.getMenu();
         this.loading = false;