2023-2-22

src/Form/EnterpriseArchives/add.vue

@@ -21,10 +21,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="省市县" prop="value">
+              <el-form-item label="省市县" prop="province">
                 <el-cascader
                   style="width:100%"
-                  v-model="form.value"
+                  v-model="form.province"
                   :options="basicData.data().areaData"
                   @change="cascaderChange" clearable>
                 </el-cascader>
@@ -120,7 +120,7 @@ export default {
         taxno: [
           { required: true, message: '输入税号', trigger: 'blur' },
         ],
-        value: [
+        province: [
           { required: true, message: '选择省市县', trigger: 'change' },
         ],
         address:[
@@ -150,14 +150,14 @@ export default {
       this.agent_level = res.data
     },
     cascaderChange (val) {
-      if (val.length === 1) 
-        return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
-      this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
-      
+      this.form.province = val
     },
     onSubmit () {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
+          this.form.city = this.form.province[1]
+          this.form.county = this.form.province[2]
+          this.form.province = this.form.province[0]
           const res = await this.$api.requested({
           "id": 20220920084101,
           "content":this.form

src/Form/EnterpriseArchives/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <el-button :size="btnSize?btnSize:'mini'" :type="btnType?btnType:'text'" @click="onShow">编 辑</el-button>
-    <el-drawer title="编辑档案" direction="rtl" append-to-body :visible.sync="dialogFormVisible" :show-close="false" size="600px">
+    <el-button size="mini" type="primary" @click="onShow">编 辑</el-button>
+    <el-drawer title="新建档案" direction="rtl" append-to-body :visible.sync="dialogFormVisible" :show-close="false" size="600px">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
@@ -21,10 +21,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="省市县" prop="value">
+              <el-form-item label="省市县" prop="province">
                 <el-cascader
                   style="width:100%"
-                  v-model="form.value"
+                  v-model="form.province"
                   :options="basicData.data().areaData"
                   @change="cascaderChange" clearable>
                 </el-cascader>
@@ -35,7 +35,25 @@
                 <el-input v-model="form.taxno" placeholder="输入税号"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="!hideGrade">
+            <el-col :span="12">
+              <el-form-item label="免运费额度" prop="freefreightamount">
+                <el-input v-model.number="form.freefreightamount" placeholder="请输入免运费额度"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="可退货天数" prop="limitreturnday">
+                <el-input v-model.number="form.limitreturnday" placeholder="请输入订单可退货天数"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="开票节点" prop="invoicingpoint">
+                <el-radio-group v-model="form.invoicingpoint">
+                  <el-radio :label="1">订单审核</el-radio>
+                  <el-radio :label="2">发货</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
               <el-form-item label="企业等级">
                 <el-select style="width:100%" v-model="form.grade" placeholder="请选择">
                   <el-option
@@ -66,14 +84,27 @@
 <script>
 import {mapGetters} from 'vuex'
 export default {
-  props:['data','btnType','btnSize','hideGrade'],
+  props:['data'],
   data () {
     return {
       dialogFormVisible:false,
       form:{
-        enterprisename:'',
-        value:[],
-        sys_enterpriseid:0
+        "address": "",
+        "city": "",
+        "changeby": "",
+        "county": "",
+        "phonenumber": "",
+        "sys_enterpriseid": 0,
+        "enterprisename": "",
+        "province": "",
+        "contact": "",
+        "taxno": "",
+        "limitreturnday": "", //订单可退货天数
+        "freefreightamount": "", //免运费额度
+        "latitude": "", //纬度
+        "longitude": "", //经度
+        "invoicingpoint": 1, //开票节点（1:订单审核：2:发货）
+        "saleclassauth": 1 //是否需要经营授权,默认1
       },
       agent_level:[],
       rules:{
@@ -90,12 +121,18 @@ export default {
         taxno: [
           { required: true, message: '输入税号', trigger: 'blur' },
         ],
-        value: [
+        province: [
           { required: true, message: '选择省市县', trigger: 'change' },
         ],
         address:[
           { required: true, message: '输入详细地址', trigger: 'blur' },
         ],
+        freefreightamount:[
+          {type:'number',message:'请输入数字',trigger:'blur'}
+        ],
+        limitreturnday:[
+          {type:'number',message:'请输入数字',trigger:'blur'}
+        ],
       }
     }
   },
@@ -106,30 +143,27 @@ export default {
   },
   methods:{
     onShow () {
-      this.query_sysoptions()
-      this.$store.dispatch('queryArealist')
-      let arr = ['province','city','county']
-      arr.forEach(e=>{
-        this.data[e] !== '' ?this.form.value.push(this.data[e]):''
-      })
       this.form = Object.assign({},this.form,this.data)
-      this.form.value = [this.data.province, this.data.city, this.data.county]
+      if (this.form.province) {
+        this.form.province = [this.form.province,this.form.city,this.form.county]
+      }
       this.dialogFormVisible = true
-      
+      this.query_sysoptions()
     },
     async query_sysoptions () {
       const res = await this.$store.dispatch('optiontypeselect','agentgrade')
       this.agent_level = res.data
     },
     cascaderChange (val) {
-      if (val.length === 1) 
-        return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
-      this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
+      this.form.province = val
       
     },
     onSubmit () {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
+          this.form.city = this.form.province[1]
+          this.form.county = this.form.province[2]
+          this.form.province = this.form.province[0]
           const res = await this.$api.requested({
           "id": 20220920084101,
           "content":this.form

src/HDrpManagement/ProductGroupMag/modules/addGroupDetail.vue

@@ -70,7 +70,7 @@ export default {
   },
   methods: {
     async getDetail() {
-      this.params.content.sa_itemgroupid = this.rowData.sa_itemgroupid
+      this.params.content.sa_itemgroupid = this.$route.query.id
       let res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total

src/HDrpManagement/aftersalesBill/components/add.vue

@@ -6,16 +6,16 @@
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
             <el-col :span="24">
-              <el-form-item label="经销商:" prop="enterprisename">
-                  <selectAgent ref="agent" @selectRow="agentChange">
-                    <el-input readonly type="text" slot="input" size="small" @focus="$refs.agent.visible=true" v-model="form.enterprisename"></el-input>
+              <el-form-item label="选择企业:" prop="enterprisename">
+                  <selectAgent :qiyi="true" ref="agent" @selectRow="agentChange">
+                    <el-input readonly type="text" placeholder="请选择企业" slot="input" size="small" @focus="$refs.agent.visible=true" v-model="form.enterprisename"></el-input>
                   </selectAgent>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="订单号:" prop="sonum">
                 <selectOrder ref="order" @selectRow="orderChange">
-                    <el-input readonly type="text" slot="input" size="small" @focus="$refs.order.listData(),$refs.order.visible=true" v-model="form.sonum"></el-input>
+                    <el-input readonly type="text" slot="input" placeholder="请选择订单" size="small" @focus="$refs.order.listData(),$refs.order.visible=true" v-model="form.sonum"></el-input>
                 </selectOrder>
               </el-form-item>
             </el-col>
@@ -40,7 +40,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="返退原因:" prop="reason">
-                <el-input type="textarea" size="small" v-model="form.reason"></el-input>
+                <el-input type="textarea" placeholder="返退原因" size="small" v-model="form.reason"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -60,7 +60,7 @@
 </template>
 
 <script>
-import selectAgent from '@/template/selectAgent/index'
+import selectAgent from './selectAgent'
 import selectOrder from './selectOrder'
 export default {
   name: "add",
@@ -92,7 +92,7 @@ export default {
         type:[
           { required: true, message: '请选择返退单类型', trigger: 'change'}
         ],
-      }
+      },
     }
   },
   watch: {

src/HDrpManagement/aftersalesBill/components/edit.vue

@@ -6,9 +6,9 @@
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
             <el-col :span="24">
-              <el-form-item label="经销商:" prop="enterprisename">
-                  <selectAgent ref="agent" @selectRow="agentChange">
-                    <el-input readonly type="text" slot="input" size="small" @focus="$refs.agent.visible=true" v-model="form.enterprisename"></el-input>
+              <el-form-item label="选择企业:" prop="enterprisename">
+                  <selectAgent :qiyi="true" ref="agent" @selectRow="agentChange">
+                    <el-input readonly type="text" placeholder="请选择企业" slot="input" size="small" @focus="$refs.agent.visible=true" v-model="form.enterprisename"></el-input>
                   </selectAgent>
               </el-form-item>
             </el-col>
@@ -60,7 +60,7 @@
 </template>
 
 <script>
-import selectAgent from '@/template/selectAgent/index'
+import selectAgent from './selectAgent'
 import selectOrder from './selectOrder'
 export default {
   name: "add",

src/HDrpManagement/aftersalesBill/components/selectAgent.vue

@@ -0,0 +1,111 @@
+<template>
+  <div> 
+    <el-dialog :visible.sync="visible" append-to-body width="50%">
+      <div class="flex-align-center flex-between mt-10">
+        <el-input style="width:200px" size="small"  suffix-icon="el-icon-search" v-model="param.content.where.condition" placeholder="搜索" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
+      </div>
+      <div>
+        <el-table
+          ref="multipleTable"
+          :data="tableData"
+          style="width: 100%"
+          size="mini"
+          height="50vh"
+          border>
+          <el-table-column
+            prop="enterprisename"
+            :label="qiyi ? '企业名称' : '经销商名称'"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="agentnum"
+            :label="qiyi ? '编号' : '经销商编号'"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="contact"
+            label="联系人">
+          </el-table-column>
+          <el-table-column
+            label="地址">
+            <template slot-scope="scope">
+              {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="selectRow(scope.row)">选 择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="margin-top:16px;text-align:right">
+          <el-pagination
+            background
+            small
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="param.content.pageSize"
+            layout="total, prev, pager, next, jumper"
+            :total="total">
+          </el-pagination>
+        </div>
+      </div>
+    </el-dialog>
+    <slot name="input"></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['customParam','qiyi'],
+  data () {
+    return {
+      visible:false,
+      param:{
+        "id":20230221170804,
+        "content": {
+          'pageNumber':1,
+          "pageSize":20,
+          where: {
+            condition:''
+          }
+        }
+      },
+      tableData: [],
+      total:0,
+      currentPage:0
+    }
+  },
+  methods:{
+    async listData () {
+      const res = await this.$api.requested(this.customParam ? this.customParam : this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      console.log(this.tableData);
+      
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+    selectRow (row) {
+      this.$emit('selectRow',row)
+    }
+  },
+  created () {
+    this.listData()
+  },
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/logistics/details/index.vue

@@ -16,14 +16,9 @@
         <div slot="tags">
         </div>
         <div slot="customOperation" >
-<<<<<<< HEAD
-          <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'confirmRec')" :disabled="mainData.status === '收货'" @click="onConfimRec">确认收货</el-button>
-          <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.status === '收货'" @click="onCheck">{{mainData.status === '审核'?'反审':'审核'}}</el-button>
-=======
           <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update')" :data="mainData" @onSuccess="queryMainData(),$refs.dispatch.listData()"/>
           <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'confirmRec')" :disabled="mainData.status !== '收货'" @click="onConfimRec">确认收货</el-button>
           <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.status !== '收货'" @click="onCheck">{{mainData.status === '审核'?'反审':'审核'}}</el-button>
->>>>>>> f9c8967a8aa0821b6d96a17a6ea9db06adb24d7d
         </div>
         <div slot="slot0" >
           <defalutInfo :mainData="mainData" ref="info"></defalutInfo>

src/HDrpManagement/orderManage/details/tabs/defaultInfo.vue

@@ -5,7 +5,7 @@
       <el-descriptions-item label="账户名称">{{ mainData.accountclass?mainData.accountclass.accountname:"--" }}</el-descriptions-item>
       <el-descriptions-item label="使用金额">{{ mainData.accountclass?mainData.accountclass.amount:"--" }}</el-descriptions-item>
       <el-descriptions-item label="是否使用返利金">{{ mainData.accountclass?mainData.accountclass.rebate_used ? '是' : '否' : '--' }}</el-descriptions-item>
-      <el-descriptions-item label="返利金使用金额">{{ mainData.accountclass?mainData.accountclass.rebate_amount:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="返利金使用金额">{{ mainData.accountclass?mainData.accountclass.rebateamount:"--" }}</el-descriptions-item>
     </el-descriptions>
     <el-descriptions  class="normal-margin" border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">开票信息</div>

src/HDrpManagement/orderManage/details/tabs/dispatch.vue

@@ -20,7 +20,7 @@
       </el-table-column>
       <el-table-column
         prop="billdate"
-        label="单据日期">
+        label="发货日期">
       </el-table-column>
       <el-table-column
         prop="address"

src/HDrpManagement/payvoucher/components/enterprise.vue

@@ -9,6 +9,15 @@
       <div slot="title" style="font-size: 15px">
         选择企业
       </div>
+      <div class="flex-align-center flex-between mt-10">
+        <el-input 
+          style="width:200px" 
+          size="small"  
+          suffix-icon="el-icon-search" 
+          v-model="params.content.where.condition" 
+          placeholder="搜索" 
+          @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>
+      </div>
       <layout_table
           ref="projectTable"
           :layout="tablecols"

src/HDrpManagement/recvoucher/components/enterprise.vue

@@ -10,6 +10,15 @@
       <div slot="title" style="font-size: 15px">
         选择单位
       </div>
+      <div class="flex-align-center flex-between mt-10">
+        <el-input 
+          style="width:200px" 
+          size="small"  
+          suffix-icon="el-icon-search" 
+          v-model="params.content.where.condition" 
+          placeholder="搜索" 
+          @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>
+      </div>
       <layout_table
           ref="projectTable"
           :layout="tablecols"

src/HDrpManagement/serveBill/components/add.vue

@@ -11,7 +11,7 @@
             <el-col :span="12">
               <el-form-item label="经销商:" prop="enterprisename">
                   <selectAgent :customParam="agentParam" ref="agent" @selectRow="agentChange">
-                    <el-input readonly type="text" slot="input" size="mini" @focus="$refs.agent.visible=true" v-model="form.enterprisename"></el-input>
+                    <el-input :disabled="accountInfo.usertype!=1 && accountInfo.usertype!=0" readonly type="text" slot="input" size="mini" @focus="$refs.agent.visible=true" v-model="form.enterprisename"></el-input>
                   </selectAgent>
               </el-form-item>
             </el-col>
@@ -138,13 +138,14 @@ export default {
       serveClassList:[],
       customerclass:[],
       systemapp:[],
+      accountInfo: JSON.parse(window.sessionStorage.getItem('accountinfo')),
       form:{
         "sa_serviceorderid":0,     //sa_brandid<=0时 为新增
         "servicetype":"",
         "sa_orderid":0,
         "sonum":"",
-        "sys_enterpriseid":"",
-        "enterprisename":"",
+        "sys_enterpriseid":'',
+        "enterprisename":'',
         "remarks":"",
         "class1":"",
         "class2":"",
@@ -245,6 +246,11 @@ export default {
     this.systemapp = res1.data
     console.log(this.customerclass,this.systemapp);
     
+  },
+  mounted () {
+    this.form.sys_enterpriseid = this.accountInfo.usertype != 1 && this.accountInfo.usertype != 0 ? this.accountInfo.enterprise.sys_enterpriseid : ''
+    this.form.enterprisename = this.accountInfo.usertype != 1 && this.accountInfo.usertype != 0 ? this.accountInfo.enterprise.enterprisename : ''
+    
   }
 }
 </script>

src/HManagement/EnterpriseArchives/modules/details.vue

@@ -23,6 +23,7 @@
 </template>
 
 <script>
+import { log } from '@antv/g2plot/lib/utils'
 export default {
   data () {
     return {
@@ -39,6 +40,8 @@ export default {
         }
       })
       this.mainData = res.data
+      console.log(this.mainData);
+      
       this.changeDataStructure()
     },
     pageChange (id,rowindex) {

src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -109,6 +109,7 @@ export default {
     }
   },
   mounted () {
+    this.queryClass()
     this.queryAgentiInfo()
     this.queryBrands()
   }

src/SDrpManagement/salerOrder/details/index.vue

@@ -90,6 +90,8 @@ export default {
       })
       this.mainData = res.data
       this.changeDataStructure()
+      console.log(this.mainData);
+      
     },
     changeDataStructure() {
       let that = this
@@ -160,6 +162,10 @@ export default {
           label:'企业名称',
           value:this.mainData.enterprisename
         },
+        // {
+        //   label:'收货地址',
+        //   value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}-${this.mainData.address}`
+        // },
         {
           label:'备注',
           value:this.mainData.remarks

src/SDrpManagement/salerOrder/details/tabs/defaultInfo.vue

@@ -17,8 +17,8 @@
     </el-descriptions>
     <el-descriptions class="normal-margin"  border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">收货信息</div>
-      <el-descriptions-item label="联系人">{{ mainData.contacts?mainData.contacts.name:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="联系电话">{{ mainData.contacts?mainData.contacts.phonenumber:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="收货人">{{ mainData.contacts?mainData.contacts.name:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="收货人电话">{{ mainData.contacts?mainData.contacts.phonenumber:"--" }}</el-descriptions-item>
       <el-descriptions-item label="地址">{{ mainData.contacts?`${mainData.contacts.province}${mainData.contacts.city}${mainData.contacts.county}${mainData.contacts.address}`:'--'}}</el-descriptions-item>
     </el-descriptions>
 <!--    <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content">

src/SDrpManagement/salerOrder/index.vue

@@ -42,6 +42,9 @@
           <span style="color:#52C41A" v-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#b2c0ea" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname=='address'">
+          {{`${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}-${scope.data.column.data.address}`}}
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>

src/SDrpManagement/sinvoiceapp/detail/tab/invoiceOrder/components/addorderline.vue

@@ -2,6 +2,15 @@
   <div>
     <el-button v-if="tool.checkAuth($route.name,'InvioceOrder')" :disabled="status !== '新建'" style="margin-bottom:10px" size="small" type="primary" @click="onShow">添加订单行</el-button>
     <el-dialog title="可添加订单" append-to-body :visible.sync="dialogTableVisible">
+      <div class="flex-align-center flex-between mt-10">
+        <el-input 
+          style="width:200px" 
+          size="small"  
+          suffix-icon="el-icon-search" 
+          v-model="param.content.where.condition" 
+          placeholder="搜索" 
+          @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
+      </div>
       <el-table :data="list" size="mini" border>
         <el-table-column prop="sonum" label="订单号" width="150"></el-table-column>
         <el-table-column prop="enterprisename" show-overflow-tooltip label="企业名称" width="150"></el-table-column>

src/template/multipleRole/index.vue

@@ -10,7 +10,7 @@
         <div class="flex-align-center">
           <el-input size="small"  suffix-icon="el-icon-search" v-model="param.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>&nbsp;
         </div>
-        <el-button type="primary" size="mini" @click="onSbmit" :disabled="selectRowArr.length == 0">批量添加</el-button>
+        <el-button type="primary" size="mini" @click="onSbmit" :disabled="selectRowId.length == 0">批量添加</el-button>
       </div>
       <div class="produtMag-panel" style="margin-top: 10px">
         <el-table
@@ -64,9 +64,8 @@
 </template>
 
 <script>
-import { log } from '@antv/g2plot/lib/utils'
 export default {
-  props:[],
+  props:['data'],
   components:{
   },
   data () {
@@ -86,9 +85,22 @@ export default {
       currentPage:0,
       selectTotal:0,
       total:0,
-      selectRowArr:[]
+      selectRowId:[]
     }
   },
+  watch: {
+    list (val) {
+      this.list.forEach((row) => {
+        this.selectRowId.forEach(item => {
+          if (row[this.idName] == item[this.idName]) {
+            this.$nextTick(() => {
+              this.$refs["tables"].toggleRowSelection(row, true);
+            })
+          }
+        })
+      });    
+    },
+  },
   methods:{
     async listData () {
       this.param.content.sa_salesforecastbillid = this.$route.query.id
@@ -99,17 +111,17 @@ export default {
       this.currentPage = res.pageNumber
     },
     selectionChange (arrs,arr) {
-      let index = this.selectRowArr.findIndex(item => item.roleid == arr.roleid)
+      let index = this.selectRowId.findIndex(item => item == arr.roleid)
       if (index != -1) {
-        this.selectRowArr.splice(index,1)
+        this.selectRowId.splice(index,1)
       } else {
-        this.selectRowArr.push(arr)
+        this.selectRowId.push(arr.roleid)
       }
-      console.log(this.selectRowArr);
+      console.log(this.selectRowId);
       
     },
     onSbmit () {
-      this.$emit('onResult',this.selectRowArr)
+      this.$emit('onResult',this.selectRowId)
       this.drawer = false
     },
     handleSizeChange(val) {

src/template/selectAgent/index.vue

@@ -14,12 +14,12 @@
           border>
           <el-table-column
             prop="enterprisename"
-            label="经销商名称"
+            :label="qiyi ? '企业名称' : '经销商名称'"
             width="180">
           </el-table-column>
           <el-table-column
             prop="agentnum"
-            label="经销商编号"
+            :label="qiyi ? '编号' : '经销商编号'"
             width="180">
           </el-table-column>
           <el-table-column
@@ -59,7 +59,7 @@
 
 <script>
 export default {
-  props:['customParam'],
+  props:['customParam','qiyi'],
   data () {
     return {
       visible:false,

src/utils/basic-data.js

@@ -46,7 +46,6 @@ function getEnterpriseList () {
       sessionStorage.setItem('active_modules', JSON.stringify(active_modules))
       store.dispatch('setActiveApp',{name:active_modules.apps[0].systemappname,app:active_modules.apps[0],val:''})
       reslove()
-  
     })
   })
 }

src/views/login/login.vue

@@ -138,11 +138,11 @@ export default {
         this.checked?localStorage.setItem('phonenumber',this.loginForm.phonenumber):localStorage.clear('phonenumber')
 
         sessionStorage.setItem('account_list',JSON.stringify(res.account_list))
-
         sessionStorage.setItem('active_account',JSON.stringify(res.account_list[0]))
         this.basicData.query_userauth().then(()=>{
           this.basicData.querySite_Parameter()
           this.$router.push({path:'/main'})
+          this.getAccountInfo()
         })
       } else {
         this.$notify({
@@ -153,6 +153,16 @@ export default {
        
       }
     },
+    /* 获取账户信息 */
+    async getAccountInfo () {
+      let res = await this.$api.requested({
+        "classname": "common.usercenter.usercenter",
+        "method": "queryUserMsg",
+        "content": {
+        }
+      })
+      window.sessionStorage.setItem('accountinfo',JSON.stringify(res.data))
+    },
     // 账号密码登录
     async loginbyaccount () {
       const res = await this.$api.loginbyaccount({
@@ -171,6 +181,7 @@ export default {
         this.basicData.query_userauth().then(()=>{
           this.basicData.querySite_Parameter()
           this.$router.push({path:'/main'})
+          this.getAccountInfo()
         })
       } else {
         this.$notify({

src/views/message/index.vue

@@ -5,10 +5,10 @@
         <div class="left">
           <div class="select">
             <div class="select_left">
-              <div @click="selectFun('系统')"
-                :style="currentItem==0 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">系统消息</div>
               <div @click="selectFun('应用')"
                 :style="currentItem==1 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">应用消息</div>
+              <div @click="selectFun('系统')"
+                :style="currentItem==0 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">系统消息</div>
             </div>
             <div class="select_right">
               <el-button @click="allRead" size="small">全部阅读</el-button>
@@ -46,7 +46,7 @@ export default {
   name: '',
   data () {
     return {
-      currentItem: 0,
+      currentItem: 1,
       param: {
         "classname": "system.message.Message",
         "method": "queryMessage",