zhangqiOMG 3 年 前
コミット
6a1cde933f

+ 1 - 1
src/Form/marketing2/agent/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="mini" @click="onShow">新 建</el-button>
-    <el-dialog title="创建经销商" :visible.sync="dialogVisible">
+    <el-dialog title="创建经销商" append-to-body :visible.sync="dialogVisible">
       <el-row :gutter="20">
         <el-form :model="form" ref="form" :rules="rules" size="small" label-position="left" label-width="100px" class="demo-form-inline">
           <el-col :span="24">

+ 2 - 2
src/Form/marketing2/agent/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button :type="btnType" size="mini" @click="onShow">编 辑</el-button>
-    <el-dialog title="创建经销商" :visible.sync="dialogVisible">
+    <el-dialog title="创建经销商" append-to-body :visible.sync="dialogVisible">
       <el-row :gutter="20">
         <el-form :model="form" ref="form" :rules="rules" size="small" label-position="left" label-width="100px" class="demo-form-inline">
           <el-col :span="24">
@@ -21,7 +21,7 @@
                     </li>
                   </ul>
                 </div>
-                <el-input slot="reference" v-model="form.enterprisename" @focus="queryEnterpriseArchives" @input.native="onChange"  placeholder="输入企业名称" clearable></el-input>
+                <el-input readonly slot="reference" v-model="form.enterprisename" @focus="queryEnterpriseArchives" @input.native="onChange"  placeholder="输入企业名称" clearable></el-input>
               </el-popover>
             </el-form-item>
           </el-col>

+ 1 - 1
src/HDrpManagement/projectStage/modules/stageDetail.vue

@@ -237,7 +237,7 @@ export default {
       this.stageData = Object.assign({},this.stageData,res.data)
       this.tool.showMessage(res,()=>{
       })
-      // this.getStageData()
+      this.getStageData()
     },
     // 删除工作内容
     async deleteWork (work) {

+ 3 - 2
src/HManagement/marketing2/agent/details/index.vue

@@ -1,5 +1,6 @@
 <template>
   <basicDetails 
+    style="min-width:80vw"
     ref="details"
     :titleText="mainData.enterprisename"
     formPath="marketing2/agent"
@@ -20,7 +21,7 @@
     </div>
     <div slot="slot0" class="container normal-panel">
       <el-button size="small" type="primary" @click="createAgentAccount" class="normal-margin">创建经销商主账号</el-button>
-      <tableLayout :layout="tablecols" :data="mainData.hrs" :custom="false" height="300px"></tableLayout>
+      <tableLayout :layout="tablecols" :data="mainData.hrs" :custom="false" height="calc(100vh - 455px)"></tableLayout>
     </div>
     <div slot="slot1" class="container normal-panel">
       <salescope :data="mainData"></salescope>
@@ -76,7 +77,7 @@ export default {
       this.changeDataStructure()
     },
     pageChange (id,rowindex) {
-      this.$router.replace({path:'/agent_detail',query:{id:id,rowindex:rowindex}})
+      this.$router.replace({path:this.$route.path,query:{id:id,rowindex:rowindex}})
       this.queryMainData(id)
     },
     changeDataStructure () {

+ 1 - 1
src/HManagement/marketing2/agent/details/modules/accountMoney/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- <add v-if="tool.checkAuth($route.name,'agent_update') && !detail" class="normal-margin" @onSuccess="onSuccess"></add> -->
-    <tableLayout :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 495px)">
+    <tableLayout :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 405px)">
       <template v-slot:customcol="scope">
         <p>{{scope.column.data[scope.column.columnname]}}</p>
       </template>

+ 1 - 1
src/HManagement/marketing2/agent/details/modules/address/list.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <addContact @onAddSuccess="listData" :mainData="mainData"></addContact>
-    <tableLayout :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 495px)" fixedName="operation">
+    <tableLayout :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 455px)" fixedName="operation">
       <template v-slot:customcol="scope">
         <p v-if="scope.column.columnname === 'province'">
           {{scope.column.data['province']}}-{{scope.column.data['city']}}-{{scope.column.data['county']}}

+ 1 - 1
src/HManagement/marketing2/agent/details/modules/contact/list.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <addContact @onAddSuccess="listData" :mainData="mainData"></addContact>
-    <tableLayout :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 495px)" fixedName="operation">
+    <tableLayout :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 455px)" fixedName="operation">
       <template v-slot:customcol="scope">
         <p v-if="scope.column.columnname === 'province'">
           {{scope.column.data['province']}}-{{scope.column.data['city']}}-{{scope.column.data['county']}}

+ 1 - 1
src/HManagement/marketing2/agent/details/modules/saleclass/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <add-sale-class class="normal-margin" @addSuccess="getClassList" v-if="tool.checkAuth($route.name,'add_saleClass') && !detail"/>
-    <tableLayout v-if="saleClassList" :layout="tablecols" :data="saleClassList" :custom="false" height="calc(100vh - 495px)" fixedName="operation">
+    <tableLayout v-if="saleClassList" :layout="tablecols" :data="saleClassList" :custom="false" height="calc(100vh - 405px)" fixedName="operation">
       <template v-slot:opreation="scope">
         <Del v-if="tool.checkAuth($route.name,'delete')" :id="scope.data.sys_enterprise_saleclassid" @onSuccess="getClassList"/>
       </template>

+ 1 - 1
src/HManagement/marketing2/agent/details/modules/salescope/list.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <add v-if="tool.checkAuth($route.name,'update') && !detail" class="normal-margin" @onSuccess="onSuccess"></add>
-    <tableLayout :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 495px)">
+    <tableLayout :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 455px)">
       <template v-slot:customcol="scope">
         <p>{{scope.column.data[scope.column.columnname]}}</p>
       </template>

+ 2 - 1
src/HManagement/marketing2/agent/index.vue

@@ -27,7 +27,8 @@
         ref="basicLayout" 
         formPath="marketing2/agent"
         tableName="agentTable" 
-        idName="sa_agentsid" 
+        idName="sa_agentsid"
+        detailPath="HManagement/marketing2/agent/details"
         :apiId="{query:20221011144903,del:20221011145003}"
         :autoQuery="false"
         :options="options">

+ 44 - 66
src/components/normal-basic-layout/details/index.vue

@@ -1,8 +1,8 @@
 <template>
-  <div class="container">
-    <div class="container normal-panel normal-margin flex-align-stretch flex-between">
+  <div>
+    <div class="container normal-panel flex-align-stretch flex-between sticky">
       <div>
-        <div class="flex-align-center">
+        <div class="flex-align-center normal-margin">
           <p class="appname inline-16">{{routerName}}</p>
           <div class="flex-align-center">
             <p class="normal-title inline-16">{{titleText}}</p>
@@ -12,65 +12,51 @@
             </div>
           </div>
         </div>
-        <div v-if="tags">
-          <el-tag style="margin-right:10px" v-for="item in tags" :key="item.index" size="mini" effect="light">{{item}}</el-tag>
-        </div>
-        <div v-else>
-          <slot name="tags"></slot>
-        </div>
+        <tagTemp ref="tag" :onwertable="idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess"></tagTemp>
       </div>
       <div style="display:flex">
         <cpEdit v-if="tool.checkAuth($route.name,'update')" :formPath="formPath" :data="editData" btnType="default" @onAddSuccess="onSuccess"></cpEdit>
         <slot name="customOperation"></slot>
       </div>
     </div>
-    <el-row :gutter="20">
-      <el-col :span="18">
-        <div class="container normal-panel normal-margin">
-          <el-descriptions title="基本信息" :column="4">
+    <div style="box-sizing: border-box;padding:20px">
+      <el-row :gutter="20">
+        <el-col :span="18">
+          <div class="container normal-panel normal-margin">
+            <el-descriptions title="基本信息" :column="4">
               <el-descriptions-item v-for="item in mainAreaData" :key="item.index" :label="item.label">{{item.value?item.value:'--'}}</el-descriptions-item>
-          </el-descriptions>
-        </div>
-        <div  class="my-tabs">
-          <el-tabs v-model="activeName" type="card">
-            <el-tab-pane v-for="(tab,index) in tabs" :key="index" :label="tab" :name="'tab' + index"></el-tab-pane>
-            <el-tab-pane label="附件" name="file"></el-tab-pane>
-            <el-tab-pane label="操作记录" name="log"></el-tab-pane>
-          </el-tabs>
-        </div>
-        <div v-show="'tab'+index === activeName" v-for="(item,index) in tabs" :key="index">
-          <slot :name="'slot' + index"></slot>
-        </div>
-        <div class="container normal-panel" v-show="activeName === 'file'">
-          <attachmentList :attinfos="attinfo_attachment" @onSuccess="queryAttments">
-            <upload slot="upload" :folderid="folderid"
-              :bindData="{ ownertable: idname.slice(0, idname.length - 2), ownerid: editData[idname], usetype: 'default' }"
-              @onSuccess="queryAttments"></upload>
-          </attachmentList>
-        </div>
-        <slot name="custom"></slot>
-      </el-col>
-      <el-col :span="6">
-        <group :ownertable="idname"></group>
-        <follow-up :ownertable="idname"></follow-up>
-      </el-col>
-    </el-row>
+            </el-descriptions>
+          </div>
+          <tabTemp :tabs="tabs" :editData="editData" :idname="idname">
+            <div :slot="'slot' + index" v-for="(tab,index) in tabs" :key="tab.index">
+              <slot :name="'slot' + index"></slot>
+            </div>
+          </tabTemp>
+          <slot name="custom"></slot>
+        </el-col>
+        <el-col :span="6">
+          <group :ownertable="idname"></group>
+          <follow-up :ownertable="idname"></follow-up>
+        </el-col>
+        
+      </el-row>
+    </div>
     
   </div>
 </template>
 
 <script>
 import cpEdit from '../modules/cpEdit.vue'
-import followUp from './modules/followUp/followUp'
-import group from './modules/group/group'
-import upload from '@/components/upload/hw_obs_upload.vue'
-import attachmentList from '@/components/attachment_list/index.vue'
+import followUp from './modules/followUp/followUp.vue'
+import tagTemp from './modules/tags/tag.vue'
+import tabTemp from './modules/tabs/tab.vue'
+
+import group from './modules/group/group.vue'
+
 export default {
   props:['titleText','mainAreaData','turnPageId','idname','formPath','editData','tags','tabs'],
   data () {
     return {
-      activeName:'tab0',
-      folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
       routerName:'',
       rowindex:0,
       total:0,
@@ -84,16 +70,15 @@ export default {
             "condition": ""
           }
         }
-      },
-      attinfo_attachment:[]
+      }
     }
   },
   components:{
     cpEdit,
     followUp,
     group,
-    upload,
-    attachmentList
+    tagTemp,
+    tabTemp
   },
   methods:{
     async queryData (pageNumber) {
@@ -102,35 +87,21 @@ export default {
       const res = await this.$api.requested(this.param)
       this.total = res.total
       this.$emit('pageChange',res.data[0][this.idname],res.data[0].rowindex)
+      this.$refs['tag'].queryTag()
     },
     next () {
       this.rowindex += 1
       this.queryData(this.rowindex)
+      
     },
     previous () {
       this.rowindex -= 1
       this.queryData(this.rowindex)
+      
     },
     onSuccess () {
       this.$emit('onEditSuccess')
     },
-    async queryAttments () {
-      const res = await this.$api.requested({
-        "classname": "system.attachment.Attachment",
-        "method": "queryFileLink",
-        "content": {
-          "ownertable": this.idname.slice(0, this.idname.length - 2),
-          "ownerid": this.editData[this.idname],
-          "usetype":""
-        }
-      })
-      this.attinfo_attachment = res.data
-    }
-  },
-  watch: {
-    editData () {
-      this.queryAttments()
-    }
   },
   mounted () {
   },
@@ -152,4 +123,11 @@ export default {
   padding: 2px 10px;
   font-size: 12px;
 }
+.my-tabs{
+  background:#eeeeee
+}
+.sticky{
+  position: sticky;
+  top:0;
+}
 </style>

+ 1 - 1
src/components/normal-basic-layout/details/modules/followUp/addLog.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="default" size="mini" @click="dialogFormVisible = true">新 建</el-button>
-    <el-dialog title="创建跟进日志" width="600px" :visible.sync="dialogFormVisible">
+    <el-dialog title="创建跟进日志" width="600px" append-to-body :visible.sync="dialogFormVisible">
       <el-form :model="form" label-position="top" label-width="80px">
         <el-form-item label="跟进日志">
           <el-input type="textarea" :rows="3" v-model="form.content" placeholder="请输入跟进日志" autocomplete="off"></el-input>

+ 9 - 7
src/components/normal-basic-layout/details/modules/followUp/followUp.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="normal-panel">
-    <div class="container flex-align-center flex-between normal-margin">
+  <div class="normal-panel follow__panel">
+    <div class="container flex-align-center flex-between normal-margin sticky">
       <p>跟进动态</p>
       <addLog :ownertable="ownertable" @onSuccess="queryLogs"></addLog>
     </div>
-    <div  class="scroll-panel container">
+    <div  class="container">
       <div v-if="logList.length === 0">
         <el-empty description="暂无记录"></el-empty>
       </div>
@@ -131,10 +131,6 @@ export default {
   border-bottom: 1px solid #f1f2f3;
   margin-bottom:16px;
 }
-.scroll-panel{
-  max-height: 700px;
-  overflow-y:scroll ;
-}
 .file__link{
   color:#999;
   font-size: 12px;
@@ -148,4 +144,10 @@ export default {
 .pionter{
   cursor: pointer;
 }
+.sticky{
+  position: sticky;
+  top:0px;
+  background: #fff;
+  z-index: 9999;
+}
 </style>

+ 10 - 7
src/components/normal-basic-layout/details/modules/group/group.vue

@@ -1,21 +1,23 @@
 <template>
-  <div class="container normal-panel normal-margin">
+<div>
+  <div  v-for="item in list" :key="item.index" class="container normal-panel normal-margin">
     <div class="flex-align-center flex-between normal-margin">
-      <p>负责团队</p>
+      <p>{{item.teamname}}</p>
       <accountDialog :ownertable="ownertable" @onSuccess="queryGroup"></accountDialog>
     </div>
     <div>
-      <p v-if="list.length === 0" class="avatar" style="background:#999;">无</p>
-      <el-tooltip v-for="item in list" :key="item.index" effect="dark" :content="item.name" placement="top-start">
-        <p class="avatar inline-16" :class="item.isleader === 1?'leader':''" >{{item.name.substr(0, 1)}}
+      <p v-if="item.team.length === 0" class="avatar" style="background:#999;">无</p>
+      <el-tooltip v-for="men in item.team" :key="men.index" effect="dark" :content="men.name" placement="top-start">
+        <p class="avatar inline-16" :class="men.isleader === 1?'leader':''" >{{men.name.substr(0, 1)}}
           <span class="avatar__model">
-            <i style="margin-right:5px" class="el-icon-user" @click="setLeader(item)"></i>
-            <i class="el-icon-delete" @click="deleteGroupAccount(item)"></i>
+            <i style="margin-right:5px" class="el-icon-user" @click="setLeader(men)"></i>
+            <i class="el-icon-delete" @click="deleteGroupAccount(men)"></i>
           </span>
         </p>
       </el-tooltip>
     </div>
   </div>
+</div>
 </template>
 
 <script>
@@ -41,6 +43,7 @@ export default {
         }
       })
       this.list = res.data
+      console.log(res.data,'----')
     },
     async setLeader (item) {
       const res = await this.$api.requested({

+ 1 - 1
src/components/normal-basic-layout/details/modules/group/select_account.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="default" size="mini" @click="onShow(dialogTableVisible = true)">添 加</el-button>
-    <el-dialog title="选择团队人员" :visible.sync="dialogTableVisible" width="600px">
+    <el-dialog title="选择团队人员" append-to-body :visible.sync="dialogTableVisible" width="600px">
       <el-form size="small" inline label-position="left" label-width="50px" :model="search">
         <el-form-item label="搜索">
           <el-input v-model="params.content.where.condition" prefix-icon="el-icon-search" placeholder="员工名称" @clear="listData(params.content.pageNumber = 1)" @keyup.native.enter="listData(params.content.pageNumber = 1)" clearable></el-input>

+ 65 - 0
src/components/normal-basic-layout/details/modules/tabs/tab.vue

@@ -0,0 +1,65 @@
+<template>
+  <div>
+    <div class="my-tabs">
+      <el-tabs v-model="activeName" type="card">
+        <el-tab-pane v-for="(tab,index) in tabs" :key="index" :label="tab" :name="'tab' + index"></el-tab-pane>
+        <el-tab-pane label="附件" name="file"></el-tab-pane>
+        <el-tab-pane label="操作记录" name="log"></el-tab-pane>
+      </el-tabs>
+    </div>
+
+    <div v-show="'tab'+index === activeName" v-for="(item,index) in tabs" :key="index">
+      <slot :name="'slot' + index"></slot>
+    </div>
+
+    <div class="container normal-panel" v-show="activeName === 'file'">
+      <attachmentList :attinfos="attinfo_attachment" @onSuccess="queryAttments">
+        <upload slot="upload" :folderid="folderid"
+          :bindData="{ ownertable: idname.slice(0, idname.length - 2), ownerid: editData[idname], usetype: 'default' }"
+          @onSuccess="queryAttments"></upload>
+      </attachmentList>
+    </div>
+  </div>
+</template>
+
+<script>
+import attachmentList from '@/components/attachment_list/index.vue'
+import upload from '@/components/upload/hw_obs_upload.vue'
+
+export default {
+  props:['tabs','editData','idname'],
+  components:{
+    attachmentList,
+    upload
+  },
+  data () {
+    return {
+      activeName:'tab0',
+      attinfo_attachment:[],
+      folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
+    }
+  },
+  methods:{
+    async queryAttments () {
+      const res = await this.$api.requested({
+        "classname": "system.attachment.Attachment",
+        "method": "queryFileLink",
+        "content": {
+          "ownertable": this.idname.slice(0, this.idname.length - 2),
+          "ownerid": this.editData[this.idname],
+          "usetype":""
+        }
+      })
+      this.attinfo_attachment = res.data
+    }
+  },
+  watch: {
+    editData () {
+      this.queryAttments()
+    }
+  },
+}
+
+</script>
+<style>
+</style>

+ 60 - 0
src/components/normal-basic-layout/details/modules/tags/tag.vue

@@ -0,0 +1,60 @@
+<template>
+  <div>
+    标签展示:
+    <el-tag style="margin-right:10px" v-for="item in option" :key="item.rowindex" size="mini" :type="hasTas(item)?'primary':'info'" :effect="hasTas(item)?'dark':'plain'" @click.native="addTag(item)">{{item.tag}}</el-tag>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['onwertable'],
+  data () {
+    return {
+      datatag:[],
+      option:[]
+    }
+  },
+  methods:{
+    async queryTag () {
+      const res  = await this.$api.requested({
+        "id": 20220929085401,
+        "content": {
+          "ownertable":this.onwertable,
+          "ownerid":this.$route.query.id
+        }
+      })
+      this.option = res.data.option
+      this.datatag = res.data.datatag
+    },
+    async addTag (item) {
+      if (this.hasTas(item.tag)) {
+        console.log(1)
+        this.datatag = this.datatag.filter(e=>{
+          return e !== item.tag
+        })
+      } else {
+        this.datatag.push(item.tag)
+      }
+      const res  = await this.$api.requested({
+        "id": 20220929090901,
+        "content": {
+          "ownertable":this.onwertable,
+          "ownerid":this.$route.query.id,
+          "datatag":this.datatag
+        }
+      })
+      res.code === 1?this.queryTag():''
+    },
+    hasTas (item) {
+      let _isSame =  this.datatag.some(tag=>tag === item.tag)
+      return _isSame
+    }
+  },
+  mounted () {
+    this.queryTag()
+  }
+}
+
+</script>
+<style>
+</style>

+ 38 - 2
src/components/normal-basic-layout/drawerDetail/index.vue

@@ -1,12 +1,48 @@
 <template>
-  <div></div>
+  <div>
+    <el-button size="small" type="text" @click="onShow(drawer=true)">详 情d</el-button>
+    <el-drawer
+      title="我是标题"
+      :visible.sync="drawer"
+      :with-header="false"
+      direction="rtl"
+      size="80%">
+      <div class="detail__panel">
+       <component :is="formComponent"></component>
+      </div>
+    </el-drawer>
+  </div>
 </template>
 
 <script>
 export default {
-
+  props:['data','detailPath','idName'],
+  components:{
+  },
+  computed:{
+		formComponent(){
+      return ()=>import(`../../../${this.detailPath}/index.vue`)
+		}
+	},
+  data () {
+    return {
+      drawer:false
+    }
+  },
+  methods:{
+    onShow () {
+      this.$router.replace({path:this.$route.path,query:{id:this.data[this.idName],rowindex:this.data.rowindex}})
+    }
+  }
 }
 
 </script>
 <style>
+</style>
+<style scoped>
+.detail__panel{
+  background:#eeeeee;
+  overflow-y: scroll;
+  height:100vh;
+}
 </style>

+ 6 - 5
src/components/normal-basic-layout/index.vue

@@ -24,10 +24,7 @@
       </div>
       <div class="flex-align-center flex-between">
         <div class="flex-align-center">
-          <el-input placeholder="请输入内容" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" style="width:350px" size="mini" class="input-with-select" clearable>
-            <el-select v-if="options.length > 0" v-model="select" slot="prepend" style="width:100px" placeholder="请选择" @change="selectChange">
-              <el-option v-for="item in options" :key="item.index" :label="item.label" :value="item.value"></el-option>
-            </el-select>
+          <el-input placeholder="请输入内容" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" style="width:300px" size="mini" class="input-with-select" clearable>
             <el-button slot="append" icon="el-icon-search" @click="listData(param.content.pageNumber = 1)">查 询</el-button>
           </el-input>&nbsp;
           <slot name="custom"></slot>
@@ -45,6 +42,7 @@
       </template>
       <template v-slot:opreation="scope">
         <cpEdit v-if="tool.checkAuth($route.name,'update')" :data="scope.data" btnType="text" :formPath="formPath" @onAddSuccess="listData(param.content.pageNumber = 1)"></cpEdit>
+        <drawerTemp v-if="detailPath" :data="scope.data" :detailPath="detailPath" :idName="idName"></drawerTemp>
         <slot :data="scope" name="tbOpreation"></slot>
       </template>
     </tableComponent>
@@ -66,14 +64,17 @@
 
 <script>
 import excel from '@/components/export_excel/index.vue'
+
 export default {
-  props:['tableName','idName','tableData','apiId','formPath','options','autoQuery'],
+  props:['tableName','idName','tableData','apiId','formPath','options','autoQuery','detailPath'],
   components:{
     tableComponent: () => import('./modules/table.vue'),
     setColumn: () => import('./modules/setColumn.vue'),
     cpAdd: () => import('./modules/cpAdd'),
     cpEdit: () => import('./modules/cpEdit'),
     setFixed: () => import('./modules/setFixed'),
+    drawerTemp:() =>  import('./drawerDetail/index'),
+
     excel
   },
   data () {

+ 2 - 2
src/components/scopeOfAuthority/modules/mar_auth.vue

@@ -87,8 +87,8 @@ export default {
         "classname": "webmanage.sale.salearea.salearea",
         "method": "query_area_auth",
         "content": {
-            "obiectId":  this.$route.query.id?this.$route.query.id:this.obiectId,
-            "obiectName": this.obiectName
+          "obiectId":  this.$route.query.id?this.$route.query.id:this.obiectId,
+          "obiectName": this.obiectName
         },
 
       })

+ 1 - 1
src/style/style.css

@@ -148,4 +148,4 @@ ul{
   background-color: #4F7BFD !important;
   color:#fff !important;
   border-radius:3px
-}
+}