暂存

src/Form/payvoucher/add.vue

@@ -1,81 +1,181 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="dialogFormVisible = true" >新 建</el-button>
-    <el-dialog title="新 建" :visible.sync="dialogFormVisible" width="500px" append-to-body>
-      <div slot="title" style="font-size: 15px">
-        新增支出凭证
+    <el-drawer
+        title="创建支出凭证"
+        :visible.sync="dialogFormVisible"
+        size="35%"
+        direction="rtl"
+        append-to-body
+        @close="dialogFormVisible = false">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="right" size="mini">
+            <el-col :span="12">
+              <el-form-item label="经销商:" prop="sys_enterpriseid">
+                <el-input v-model="form.enterprisename"  placeholder="请选择经销商" @focus="enterpriseList"></el-input>
+              </el-form-item>
+            </el-col>
+<!--            <el-col :span="12">
+              <el-form-item label="营销账户" prop="sys_enterpriseid">
+                <el-select v-model="form.sa_accountclassid" placeholder="请选择营销账户">
+                  <el-option
+                      v-for="item in enterprises"
+                      :key="item.sys_enterpriseid"
+                      :label="item.enterprisename"
+                      :value="item.sys_enterpriseid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>-->
+            <el-col :span="12" >
+              <el-form-item label="营销账户类型:" prop="sa_accountclassid">
+                <el-select v-model="form.sa_accountclassid" placeholder="请选择营销账户类型" style="width: 100%">
+                  <el-option
+
+                      v-for="item in accountclass"
+                      :key="item.sa_accountclassid"
+                      :label="item.accountname"
+                      :value="item.sa_accountclassid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="支出金额:" prop="amount">
+                <el-input v-model="form.amount" placeholder="请输入支出金额"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态:" >
+                <el-input v-model="form.status" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="分类:" >
+                <el-select v-model="form.sa_accountclassid" placeholder="请选择分类" style="width: 100%">
+                  <el-option
+                      v-for="item in accountclass"
+                      :key="item.sa_accountclassid"
+                      :label="item.accountname"
+                      :value="item.sa_accountclassid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="分类明细:" >
+                <el-select v-model="form.sa_accountclassid" placeholder="请选择分类明细" style="width: 100%">
+                  <el-option
+                      v-for="item in accountclass"
+                      :key="item.sa_accountclassid"
+                      :label="item.accountname"
+                      :value="item.sa_accountclassid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注:" >
+                <el-input v-model="form.remarks" type="textarea" rows="5" placeholder="请输入备注信息"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
       </div>
-      <el-row :gutter="20">
-        <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="right" size="mini">
-          <el-col :span="20">
-            <el-form-item label="合作企业" prop="sys_enterpriseid">
-              <el-select v-model="form.sys_enterpriseid" placeholder="请选择合作企业">
-                <el-option
-                    v-for="item in enterprises"
-                    :key="item.sys_enterpriseid"
-                    :label="item.enterprisename"
-                    :value="item.sys_enterpriseid">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="20" v-show="form.sys_enterpriseid !== ''">
-            <el-form-item label="营销账户类型" prop="sa_accountclassid">
-              <el-select v-model="form.sa_accountclassid" placeholder="请选择营销账户类型">
-                <el-option
-                    v-for="item in accountclass"
-                    :key="item.sa_accountclassid"
-                    :label="item.accountname"
-                    :value="item.sa_accountclassid">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="20">
-            <el-form-item label="支出金额" prop="amount">
-              <el-input v-model="form.amount" placeholder="请输入支出金额"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="20">
-            <el-form-item label="凭证来源" >
-              <el-input v-model="form.source" placeholder="请输入凭证来源"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="20">
-            <el-form-item label="凭证来源说明" >
-              <el-input v-model="form.sourcenote" placeholder="请输入凭证来源说明"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="20">
-            <el-form-item label="备注" >
-              <el-input v-model="form.remarks" placeholder="请输入备注"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
-      <div class="dialog-footer">
+      <div class="fixed__btn__panel">
         <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-drawer>
+    <enterprise
+        :visible="visibleEnterprise"
+        :index="index"
+        :sa_projectid="form.sa_projectid"
+        v-if="visibleEnterprise"
+        @onEnterprise="onEnterprise">
+    </enterprise>
+    <!--    <el-dialog title="新 建" :visible.sync="dialogFormVisible" width="500px" append-to-body>
+          <div slot="title" style="font-size: 15px">
+            新增支出凭证
+          </div>
+          <el-row :gutter="20">
+            <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="right" size="mini">
+              <el-col :span="20">
+                <el-form-item label="合作企业" prop="sys_enterpriseid">
+                  <el-select v-model="form.sys_enterpriseid" placeholder="请选择合作企业">
+                    <el-option
+                        v-for="item in enterprises"
+                        :key="item.sys_enterpriseid"
+                        :label="item.enterprisename"
+                        :value="item.sys_enterpriseid">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="20" v-show="form.sys_enterpriseid !== ''">
+                <el-form-item label="营销账户类型" prop="sa_accountclassid">
+                  <el-select v-model="form.sa_accountclassid" placeholder="请选择营销账户类型">
+                    <el-option
+                        v-for="item in accountclass"
+                        :key="item.sa_accountclassid"
+                        :label="item.accountname"
+                        :value="item.sa_accountclassid">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="20">
+                <el-form-item label="支出金额" prop="amount">
+                  <el-input v-model="form.amount" placeholder="请输入支出金额"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="20">
+                <el-form-item label="凭证来源" >
+                  <el-input v-model="form.source" placeholder="请输入凭证来源"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="20">
+                <el-form-item label="凭证来源说明" >
+                  <el-input v-model="form.sourcenote" placeholder="请输入凭证来源说明"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="20">
+                <el-form-item label="备注" >
+                  <el-input v-model="form.remarks" placeholder="请输入备注"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-form>
+          </el-row>
+          <div class="dialog-footer">
+            <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+            <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
+          </div>
+        </el-dialog>-->
   </div>
 </template>
 
 <script>
+import enterprise from '@/HDrpManagement/payvoucher/components/enterprise'
 export default {
   name: "add",
+  components:{enterprise},
   data(){
     return {
       dialogFormVisible:false,
+      visibleEnterprise:false,
+      index:'',
       form:{
         sa_cashbillid:0,
+        enterprisename:'',
         sys_enterpriseid:'',
         sa_accountclassid:'',
         type:0,
         amount:'',
         source:'',
         sourcenote:'',
-        remarks:''
+        remarks:'',
+        status:'新建'
       },
       rules:{
         sys_enterpriseid:[
@@ -109,20 +209,18 @@ export default {
         })
       })
     },
-    async enterprisesList(){
-      const res = await this.$api.requested({
-        "id": "20221008164103",
-        "version":1,
-        "content": {
-          "where":{
-            "condition":""
-          }
-        }
-      })
-      console.log(res)
-      this.enterprises = res.data
-      console.log(this.enterprises)
+    enterpriseList(){
+      this.visibleEnterprise = true
     },
+    /*经销商列表*/
+    onEnterprise(data){
+      this.visible = false
+      console.log("企业信息",data)
+      this.form.sys_enterpriseid = data.sys_enterpriseid
+      this.form.enterprisename = data.enterprisename
+
+    },
+    /*账户类型*/
     async accountList(id){
       const res = await this.$api.requested({
         "id": "20221008164203",
@@ -133,10 +231,25 @@ export default {
       })
       console.log(res)
       this.accountclass = res.data
+    },
+    /*分类*/
+    async classList(){
+      const res = await this.$api.requested({
+        "classname": "sysmanage.develop.optiontype.optiontype",
+        "method": "optiontypeselect",
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "typename": "cashbillpaytype",
+          "parameter": {
+          }
+        }
+      })
+      console.log("支出凭证分类",res)
     }
   },
   created() {
-    this.enterprisesList()
+    this.classList()
   },
   watch:{
     "form.sys_enterpriseid":function (val){

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -19,9 +19,9 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24" style="margin-bottom: 20px">
-              <label class="inline-16">可选商品</label>
-              <el-input placeholder="请输入搜索内容" suffix-icon="el-icon-search" v-model="search" @keyup.native.enter="queryClick" @clear="clearData()" style="width:260px" size="small" class="input-with-select inline-16" clearable>
+            <el-col :span="24" style="margin-bottom: 20px;margin-top: 22px">
+              <label class="inline-16" style="font-size: 14px">可选商品:</label>
+              <el-input  placeholder="请输入搜索内容" suffix-icon="el-icon-search" v-model="search" @keyup.native.enter="queryClick" @clear="clearData()" style="width:260px;float: right" size="small" class="input-with-select inline-16" clearable>
               </el-input>
             </el-col>
             <el-col :span="24">

src/HDrpManagement/ProductGroupMag/modules/edit.vue

@@ -19,9 +19,9 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24" style="margin-bottom: 20px">
-              <label class="inline-16">可选商品</label>
-              <el-input placeholder="请输入搜索内容" suffix-icon="el-icon-search" v-model="search" @keyup.native.enter="queryClick" @clear="clearData()" style="width:260px" size="small" class="input-with-select inline-16" clearable>
+            <el-col :span="24" style="margin-bottom: 20px;margin-top: 22px">
+              <label class="inline-16" style="font-size: 14px">可选商品:</label>
+              <el-input placeholder="请输入搜索内容" suffix-icon="el-icon-search" v-model="search" @keyup.native.enter="queryClick" @clear="clearData()" style="width:260px;float: right" size="small" class="input-with-select inline-16" clearable>
               </el-input>
             </el-col>
             <el-col :span="24">

src/HDrpManagement/payvoucher/components/enterprise.vue

@@ -0,0 +1,139 @@
+<template>
+  <div>
+    <el-dialog
+        title="新 建"
+        :visible.sync="dialogProjectVisible"
+        append-to-body
+        width="900px">
+      <div slot="title" style="font-size: 15px">
+        选择单位
+      </div>
+      <layout_table
+          ref="projectTable"
+          :layout="tablecols"
+          :data="list"
+          :opwidth="200"
+          :custom="false"
+          :height="320"
+          :checkbox="true"
+          :onRow="row"
+          @rowClick="rowClick"
+          @onRow="onRow"
+      >
+      </layout_table>
+      <div style="margin-top:16px;text-align:right">
+        <el-pagination
+            background
+            small
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="params.content.pageSize"
+            layout="total, prev, pager, next, jumper"
+            :total="total">
+        </el-pagination>
+      </div>
+      <div class="dialog-footer">
+        <el-button size="small" @click="onColes" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="warning" class="normal-btn-width btn-warning"  @click="onSubmit">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import layout_table from '../components/table'
+export default {
+  name: "enterprise",
+  props:["visible","index"],
+  data(){
+    return {
+      dialogProjectVisible:false,
+      bill_id:"",
+      tablecols:[],
+      list:[],
+      total:0,
+      currentPage:0,
+      row:"",
+      params:{
+        "id": 20220920083901,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": "",
+            "type":1,//1:经销商，2：客户，3：其他，不传查全部,4:查询项目缔约方，sa_projectid必传
+            "sa_projectid":""
+          }
+        }
+      }
+    }
+  },
+  components:{layout_table},
+  mounted() {
+    console.log(this.visible)
+    this.dialogProjectVisible = true
+    console.log(this.index)
+    this.listData()
+  },
+  methods:{
+    async listData(){
+        const res = await this.$api.requested(this.params)
+        this.list = res.data
+        this.total = res.total
+        console.log(this.list[0])
+        if (this.index !== ''){
+          this.toggleSelection([this.list[this.index]])
+        }
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.listData()
+    },
+    onColes(){
+      this.dialogProjectVisible = false
+      this.$emit("onEnterprise")
+    },
+    onRow(row){
+
+      this.row = row
+    },
+    onSubmit(){
+
+      this.dialogProjectVisible = false
+      this.$emit("onEnterprise",this.row)
+
+    },
+    toggleSelection(rows) {
+      console.log("保存")
+      console.log(rows)
+      if (rows) {
+        rows.forEach(row => {
+          this.$refs.projectTable.$refs.tables.setCurrentRow(row);
+        });
+      } else {
+        this.$refs.projectTable.$refs.tables.clearSelection();
+      }
+    },
+    rowClick(row){
+      console.log("选中")
+      console.log(row)
+    }
+
+  },
+
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name).enterpriseTable.tablecols
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/payvoucher/components/table.vue

@@ -0,0 +1,97 @@
+<template>
+  <div>
+    <el-table ref="tables"
+              :row-class-name="tableClassName"
+              v-loading="loading" highlight-current-row
+              :data="data"
+              :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini"
+              :height="height" @row-click="rowClick" style="width:100%"
+               border
+              @select="select"
+      >
+      <el-table-column
+          type="selection"
+          width="55" @handleSelectionChange="handleSelectionChange"  v-if="checkbox">
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width">
+        <template slot-scope="scope">
+          <!-- 自定义表格显示内容 -->
+          <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
+          <!-- 否则就是默认 -->
+          <span v-else>{{scope.row[col.columnname]}}</span>
+          <!-- 操作结构内容 -->
+          <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import {mapGetters} from "vuex"
+export default {
+  /*
+    layout:表结构数据;
+    data:表渲染数据;
+    custom:是否启用自定义结构;
+    opwidth:操作列宽度
+  */
+  props:['layout','data','custom','height','checkbox','onRow'],
+  data () {
+    return {
+      list:[],
+      bill_id:""
+    }
+  },
+  computed:{
+    ...mapGetters({
+      loading:'loading'
+    })
+  },
+  methods:{
+    rowClick (row) {
+      this.$emit('rowClick',row)
+    },
+    tableClassName ({row,rowIndex}) {
+      row.index = rowIndex
+    },
+    select(selection, row){
+      console.log(row)
+      this.bill_id = row.id;
+      this.$emit("onRow",row)
+      // 清除 所有勾选项
+      this.$refs.tables.clearSelection()
+      // 当表格数据都没有被勾选的时候 就返回
+      // 主要用于将当前勾选的表格状态清除
+      if(selection.length === 0) return
+      this.$refs.tables.toggleRowSelection(row, true);
+    },
+    handleSelectionChange(val) {
+      if (val.length >= 2){
+        this.$refs.tables.clearSelection();
+      }
+      this.$emit('checkboxCallBack',val)
+    },
+    isCheck(row,rowIndex) {
+
+    },
+    setCurrentRow(row){
+      console.log("执行力")
+      console.log(row)
+      /*this.$refs.tables.setCurrentRow(row);*/
+    },
+    toggleRowSelection(row, selected){
+
+    }
+  },
+  mounted () {
+    // this.listData()
+    console.log("初始化输出")
+    console.log(this.onRow)
+  }
+}
+
+</script>
+<style>
+
+</style>

src/HDrpManagement/payvoucher/index.vue

@@ -3,15 +3,27 @@
     <basicLayout ref="list" formPath="payvoucher" tableName="payvoucherTable" idName="sa_cashbillid" :apiId="{query:20221010102903,del:20221009103203}" :options="options">
       <div slot="custom" style="display:flex">
         <label class="search__label " style="margin: auto;width: 90px;">营销账户类型:</label>
-        <el-select class="inline-16" @change="selectChange" v-model="selectParam.status" placeholder="请选择状态" size="small" clearable>
-          <el-option :key="1" :value="0" label="新建"></el-option>
-          <el-option :key="2" :value="1" label="审核"></el-option>
+        <el-select class="inline-16" @change="selectChange" v-model="selectParam.accountname" placeholder="请选择营销账户类型" size="small" clearable>
+          <el-option v-for="(item,index) in accountNameList" :key="index" :value="item.value" :label="item.value"></el-option>
         </el-select>
         <label class="search__label " style="margin: auto;width: 35px;">状态:</label>
         <el-select class="inline-16" @change="selectChange" v-model="selectParam.status" placeholder="请选择状态" size="small" clearable>
           <el-option :key="1" :value="0" label="新建"></el-option>
           <el-option :key="2" :value="1" label="审核"></el-option>
         </el-select>
+        <label class="search__label" style="margin: auto;width: 65px;">单据日期:</label>
+        <el-date-picker
+            style="margin-right: 10px !important;"
+            size="small"
+            @change="selectChange"
+            value-format="yyyy-MM-dd"
+            v-model="dateSelect"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            clearable>
+        </el-date-picker>
       </div>
       <template v-slot:tbList="scope">
         <div>
@@ -46,8 +58,12 @@ export default {
       ],
       selectParam: {
         status:'',
-        accountname:''
-      }
+        accountname:'',
+        begindate:'',
+        enddate:''
+      },
+      accountNameList:[],
+      dateSelect:''
     }
   },
   methods:{
@@ -67,27 +83,40 @@ export default {
     /*营销账户类型*/
     async accountList(){
       const res = await this.$api.requested({
-        "id": 20220901092401,
+        "classname": "sysmanage.develop.optiontype.optiontype",
+        "method": "optiontypeselect",
         "content": {
           "pageNumber": 1,
           "pageSize": 20,
-          "where":{
-            "condition":"accountname"
+          "typename": "accountname",
+          "parameter": {
           }
         }
       })
+      console.log("营销账户类型",res)
+      this.accountNameList = res.data
     },
     selectChange(){
-      console.log(this.selectParam)
       if (this.selectParam.status === 0){
         this.selectParam.status = '新建'
       }else{
         this.selectParam.status = '审核'
       }
+      if (this.dateSelect !== '' && this.dateSelect !== null){
+        this.selectParam.begindate = this.dateSelect[0]
+        this.selectParam.enddate = this.dateSelect[1]
+      }else {
+        this.selectParam.begindate = ''
+        this.selectParam.enddate = ''
+      }
       this.$refs.list.param.content.where = this.selectParam
       this.$refs.list.param.content.phonenumber = 1
       this.$refs.list.listData()
-    }
+    },
+
+  },
+  mounted() {
+    this.accountList()
   }
 }
 </script>

src/HDrpManagement/recvoucher/index.vue

@@ -1,7 +1,30 @@
 <template>
   <div>
     <basicLayout ref="list" formPath="recvoucher" tableName="recvoucherTable" idName="sa_cashbillid" :apiId="{query:20221009102903,del:20221009103203}" :options="options">
-      <div slot="custom"></div>
+      <div slot="custom" style="display:flex">
+        <label class="search__label " style="margin: auto;width: 90px;">营销账户类型:</label>
+        <el-select class="inline-16" @change="selectChange" v-model="selectParam.accountname" placeholder="请选择营销账户类型" size="small" clearable>
+          <el-option v-for="(item,index) in accountNameList" :key="index" :value="item.value" :label="item.value"></el-option>
+        </el-select>
+        <label class="search__label " style="margin: auto;width: 35px;">状态:</label>
+        <el-select class="inline-16" @change="selectChange" v-model="selectParam.status" placeholder="请选择状态" size="small" clearable>
+          <el-option :key="1" :value="0" label="新建"></el-option>
+          <el-option :key="2" :value="1" label="审核"></el-option>
+        </el-select>
+        <label class="search__label" style="margin: auto;width: 65px;">单据日期:</label>
+        <el-date-picker
+            style="margin-right: 10px !important;"
+            size="small"
+            @change="selectChange"
+            value-format="yyyy-MM-dd"
+            v-model="dateSelect"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            clearable>
+        </el-date-picker>
+      </div>
       <template v-slot:tbList="scope">
         <div>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
@@ -32,7 +55,15 @@ export default {
           label:'审核',
           value:'审核'
         }
-      ]
+      ],
+      selectParam: {
+        status:'',
+        accountname:'',
+        begindate:'',
+        enddate:''
+      },
+      accountNameList:[],
+      dateSelect:''
     }
   },
   methods:{
@@ -48,7 +79,42 @@ export default {
       this.tool.showMessage(res,()=>{
         this.$refs.list.listData()
       })
-    }
+    },/*营销账户类型*/
+    async accountList(){
+      const res = await this.$api.requested({
+        "classname": "sysmanage.develop.optiontype.optiontype",
+        "method": "optiontypeselect",
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "typename": "accountname",
+          "parameter": {
+          }
+        }
+      })
+      console.log("营销账户类型",res)
+      this.accountNameList = res.data
+    },
+    selectChange(){
+      if (this.selectParam.status === 0){
+        this.selectParam.status = '新建'
+      }else{
+        this.selectParam.status = '审核'
+      }
+      if (this.dateSelect !== '' && this.dateSelect !== null){
+        this.selectParam.begindate = this.dateSelect[0]
+        this.selectParam.enddate = this.dateSelect[1]
+      }else {
+        this.selectParam.begindate = ''
+        this.selectParam.enddate = ''
+      }
+      this.$refs.list.param.content.where = this.selectParam
+      this.$refs.list.param.content.phonenumber = 1
+      this.$refs.list.listData()
+    },
+  },
+  mounted() {
+    this.accountList()
   }
 }
 </script>

src/style/style.css

@@ -187,22 +187,15 @@ ul{
 .el-notification.right{
   right:70px !important;
 }
-<<<<<<< HEAD
-=======
-
->>>>>>> 05a9622c4006e6e256bf92bebf8922dea785cf95
 .search__label{
   display: inline-block;
   width: 80px;
   font-size: 14px;
   color:rgb(163, 163, 163) !important;
-<<<<<<< HEAD
-=======
   margin-right: 10px;
 }
 
 .label_center {
   display: flex;
   align-items: center;
->>>>>>> 05a9622c4006e6e256bf92bebf8922dea785cf95
 }