Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

# Conflicts:
#	src/style/style.css

src/Form/marketing2/agent/add.vue

@@ -3,46 +3,33 @@
     <el-button type="primary" size="small" @click="onShow">新 建</el-button>
     <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="right" label-width="100px" class="demo-form-inline">
+        <el-form :model="form" ref="form" :rules="rules" :status-icon="false"	 size="small" label-position="right" label-width="100px" class="demo-form-inline">
           <el-col :span="24">
             <p class="normal-title normal-margin">企业信息</p>
           </el-col>
           <el-col :span="12">
             <el-form-item label="企业名称" prop="enterprisename">
-              <el-popover
-                placement="bottom"
-                width="100%"
-                v-model="visible">
-                <div>
-                  <ul class="enterprisePanel">
-                    <li v-for="item in ENlist" :key="item.sys_enterpriseid" @click="chooseEnterprise(item)">
-                      <p>{{item.enterprisename}}</p>
-                      <small>{{item.province}}-{{item.city}}-{{item.county}}</small>
-                    </li>
-                  </ul>
-                </div>
-                <el-input slot="reference" v-model="form.enterprisename" @focus="queryEnterpriseArchives" @input.native="onChange"  placeholder="输入企业名称" clearable></el-input>
-              </el-popover>
+              <enterprise @rowClick="chooseEnterprise"></enterprise>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="省市县">
-              <p class="enterpriseText">{{enterprise.province?enterprise.province:'--'}}</p>
+              <p class="enterpriseText">{{enterprise.province?enterprise.province:''}}</p>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="联系人">
-              <p class="enterpriseText">{{enterprise.contact?enterprise.contact:'--'}}</p>
+              <p class="enterpriseText">{{enterprise.contact?enterprise.contact:''}}</p>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="联系方式">
-              <p class="enterpriseText">{{enterprise.phonenumber?enterprise.phonenumber:'--'}}</p>
+              <p class="enterpriseText">{{enterprise.phonenumber?enterprise.phonenumber:''}}</p>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="详细地址">
-              <p class="enterpriseText">{{enterprise.address?enterprise.address:'--'}}</p>
+              <p class="enterpriseText">{{enterprise.address?enterprise.address:''}}</p>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -120,8 +107,10 @@
 </template>
 
 <script>
+import enterprise from '@/template/enterprise/index.vue'
 import selectAgent from '@/components/selectAgent/index.vue'
 
+selectAgent
 export default {
   data () {
     return {
@@ -160,6 +149,7 @@ export default {
     }
   },
   components:{
+    enterprise,
     selectAgent
   },
   methods:{
@@ -281,6 +271,6 @@ export default {
 .enterpriseText{
   height: 34px;
   line-height: 34px;
-  font-weight: 500;
+  /* font-weight: 500; */
 }
 </style>

src/HDrpManagement/ProductGroupMag/modules/table.vue

@@ -3,7 +3,9 @@
     <el-table ref="tables"  @select="aaaa" @select-all="selectAll" v-loading="loading" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" style="width:100%"  border>
         <el-table-column
         type="selection"
-        width="55">
+        width="45"
+        align="center"
+        fixed>
       </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" :fixed="col.columnname === fixedName?'right':false">
         <template slot-scope="scope">
@@ -21,8 +23,6 @@
 
 <script>
 import {mapGetters} from "vuex"
-import { log } from '@antv/g2plot/lib/utils'
-import { P } from '@antv/g2plot'
 export default {
   /*
     layout:表结构数据;

src/HDrpManagement/publicCustomer/modules/detail.vue

@@ -32,10 +32,10 @@
       <div slot="slot0" >
         <detailed ref="detailed"></detailed>
       </div>
-      <div slot="slot1" class="container normal-panel">
+      <div slot="slot1">
         <contacts :data="mainData" v-if="flag"></contacts>
       </div>
-      <div slot="slot2" class="container normal-panel">
+      <div slot="slot2">
         <address_manage :data="mainData"  v-if="flag"></address_manage>
       </div>
       <!-- <div slot="slot0" class="container normal-panel">

src/HDrpManagement/publicCustomer/modules/detail/addressManage/list.vue

@@ -1,16 +1,18 @@
 <template>
   <div>
-    <add class="normal-margin" :data="data" @insertSuccess="onSuccess" style="float: left;"></add>
-    <div style="width: 20%;float: left;margin-left: 2%">
-      <el-input
-          placeholder="请输入内容"
-          v-model="search"
-          clearable
-          @clear="clearData()"
-          size="mini"
-          @keyup.enter.native="queryClick()">
-        <i slot="prefix" class="el-icon-search" @click="queryClick()"></i>
-      </el-input>
+    <div class="flex-align-center normal-margin">
+      <add class="inline-16" :data="data" @insertSuccess="onSuccess"></add>
+      <div>
+        <el-input
+            placeholder="请输入内容"
+            v-model="search"
+            clearable
+            @clear="clearData()"
+            size="small"
+            suffix-icon="el-icon-search"
+            @keyup.enter.native="queryClick()">
+        </el-input>
+      </div>
     </div>
     <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  :height="tableHieght" >
       <template v-slot:customcol="scope">

src/HDrpManagement/publicCustomer/modules/detail/addressManage/modules/add.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="primary" @click="onshow">新增客户地址</el-button>
+    <el-button size="small" type="primary" @click="onshow">新增客户地址</el-button>
     <el-dialog
         :visible.sync="dialogFormVisible"
         width="900px"

src/HDrpManagement/publicCustomer/modules/detail/contacts/list.vue

@@ -1,16 +1,18 @@
 <template>
   <div>
-    <add class="normal-margin" :data="data" @insertSuccess="onSuccess" style="float: left;"></add>
-    <div style="width: 20%;float: left;margin-left: 2%">
-      <el-input
-          placeholder="请输入内容"
-          v-model="search"
-          clearable
-          @clear="clearData()"
-          size="mini"
-          @keyup.enter.native="queryClick()">
-        <i slot="prefix" class="el-icon-search" @click="queryClick()"></i>
-      </el-input>
+    <div class="flex-align-center normal-margin">
+      <add class="inline-16" :data="data" @insertSuccess="onSuccess"></add>
+      <div>
+        <el-input
+            placeholder="请输入内容"
+            v-model="search"
+            clearable
+            @clear="clearData()"
+            size="small"
+            suffix-icon="el-icon-search"
+            @keyup.enter.native="queryClick()">
+        </el-input>
+      </div>
     </div>
     <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  :height="tableHieght" >
       <template v-slot:customcol="scope">

src/HDrpManagement/publicCustomer/modules/detail/contacts/modules/add.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="primary" @click="onshow">新增联系人</el-button>
+    <el-button size="small" type="primary" @click="onshow">新增联系人</el-button>
     <el-dialog
         :visible.sync="dialogFormVisible"
         width="900px"

src/HDrpManagement/publicCustomer/modules/detail/detailedData.vue

@@ -1,8 +1,9 @@
 <template>
-  <div class="container normal-panel">
-    <div class="container normal-panel">
-      <el-descriptions title="基本信息">
-        <el-descriptions-item label="客户名称">{{ basic.enterprisename?basic.enterprisename:"--" }}</el-descriptions-item>
+  <div>
+    <div class="normal-margin">
+      <el-descriptions :column="2" labelClassName="my-label" contentClassName="my-content" border>
+        <div slot="title" class="my-label__title">基本信息</div>
+        <el-descriptions-item  label="客户名称">{{ basic.enterprisename?basic.enterprisename:"--" }}</el-descriptions-item>
         <el-descriptions-item label="客户编号">{{ basic.sa_customersid?basic.sa_customersid:"--" }}</el-descriptions-item>
         <el-descriptions-item label="企业简称">{{ basic.abbreviation?basic.abbreviation:"--"}}</el-descriptions-item>
         <el-descriptions-item label="客户类型">{{ basic.type?basic.type:"--" }}</el-descriptions-item>
@@ -17,8 +18,9 @@
       </el-descriptions>
     </div>
 
-    <div class="container normal-panel">
-      <el-descriptions title="系统信息">
+    <div>
+      <el-descriptions :column="2" labelClassName="my-label" contentClassName="my-content" border>
+        <div slot="title" class="my-label__title">系统信息</div>
         <el-descriptions-item label="创建人">{{ system.createby?system.createby:"--" }}</el-descriptions-item>
         <el-descriptions-item label="创建时间">{{ system.createdate?system.createdate:"--" }}</el-descriptions-item>
         <el-descriptions-item label="最近跟进人">{{ system.followby?system.followby:"--" }}</el-descriptions-item>

src/components/newLayout/modules/header.vue

@@ -122,8 +122,11 @@ export default {
   mounted () {
     this.siteInfos()
     this.getWeather()
-    this.accountList = JSON.parse(sessionStorage.getItem('account_list'))
+    
     this.accountInfo = JSON.parse(sessionStorage.getItem('active_account'))
+    this.accountList = JSON.parse(sessionStorage.getItem('account_list')).filter(e=>{
+      return e.siteid !== this.accountInfo.siteid
+    })
   },
 }
 

src/components/newLayout/modules/navRight.vue

@@ -61,7 +61,7 @@ export default {
       // this.$emit('getModules',at_sys_modules,type)
 
       this.$store.dispatch('setActiveApp',{name:app.name,app:at_app,val:''})
-      this.$router.replace({path:app.path})
+      this.$router.push({path:app.path})
     },
   },
   mounted () {
@@ -74,6 +74,11 @@ export default {
 </style>
 <style scoped>
 .nav-right{
-  position:relative;right:0;top:0;height:100%;background:rgba(0, 0,0,.3);z-index:9999;
+  position:relative;
+  right:0;
+  top:0;
+  width: 60px;
+  height:100%;
+  background:rgba(0, 0,0,.3);z-index:9999;
 }
 </style>

src/components/normal-basic-layout/details/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="container normal-panel sticky">
+    <div style="margin:10px 10px 0 10px;border-radius:5px" class="container normal-panel sticky">
       <div class="flex-align-center flex-between normal-margin">
         <div class="flex-align-center" style="flex:1 0 auto">
           <p style="font-size:30px;font-weight:300">{{titleText?titleText:'##'}}</p>
@@ -24,8 +24,8 @@
         </el-descriptions>
       </div>
     </div>
-    <div style="box-sizing: border-box;padding:20px">
-      <el-row :gutter="20">
+    <div style="box-sizing: border-box;padding:10px">
+      <el-row :gutter="10">
         <el-col :span="acitveApp.isdatateam?19:acitveApp.isdatafollowup?19:24">
           <tabTemp :tabs="tabs" :editData="editData" :idname="idname" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)">
             <div :slot="'slot' + index" v-for="(tab,index) in tabs" :key="tab.index">
@@ -35,7 +35,7 @@
           <slot name="custom"></slot>
         </el-col>
         <el-col :span="5">
-          <group v-if="acitveApp.isdatateam" ref="group" class="normal-margin" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess"></group>
+          <group v-if="acitveApp.isdatateam" ref="group" style="margin-bottom:10px" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess"></group>
           <follow-up v-if="acitveApp.isdatafollowup" ref="follow" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)"></follow-up>
         </el-col>
         

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

@@ -161,4 +161,7 @@ export default {
 .dot{
   background:#fff;height:10px;width:10px;border-radius:100%;border:2px solid #3874F6;
 }
+.normal-panel{
+  border-radius: 5px;
+}
 </style>

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

@@ -232,4 +232,7 @@ export default {
   height: 100%;
   width: 100%;
 }
+.normal-panel{
+  border-radius: 5px;
+}
 </style>

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

@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <div class="normal-panel">
+  <div class="normal-panel tab__panel">
+    <div>
       <el-tabs v-model="activeName">
         <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>
@@ -12,7 +12,7 @@
       <slot :name="'slot' + index"></slot>
     </div>
 
-    <div class="container normal-panel" v-show="activeName === 'file'">
+    <div v-show="activeName === 'file'">
       <attachmentList :attinfos="attinfo_attachment" @onSuccess="queryAttments">
         <upload slot="upload" :folderid="folderid"
           :bindData="{ ownertable: ownertable, ownerid: editData[idname], usetype: 'default' }"
@@ -65,4 +65,16 @@ export default {
 
 </script>
 <style>
+.tab__panel .el-tabs__item{
+  color:#999
+}
+.tab__panel  .el-tabs__item.is-active {
+  color:#3874f6
+}
+</style>
+<style scoped>
+.tab__panel{
+  padding:0 10px 10px 10px;
+  border-radius:5px;
+}
 </style>

src/components/normal-basic-layout/modules/table.vue

@@ -1,13 +1,14 @@
 <template>
   <div>
-    <el-table border stripe ref="tables" :row-class-name="tableClassName" v-loading="loading" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" @row-click="rowClick" height="calc(100vh - 330px)" style="width:100%;" @selection-change="handleSelectionChange" >
+    <el-table border stripe ref="tables" :row-class-name="tableClassName" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" @row-click="rowClick" height="calc(100vh - 330px)" style="width:100%;" @selection-change="handleSelectionChange" >
       <div slot="empty">
         <el-empty :image="require('../../../assets/empty.svg')" :image-size="250">
         </el-empty>
       </div>
       <el-table-column
         type="selection"
-        width="45" 
+        width="45"
+        align="center"
         @handleSelectionChange="handleSelectionChange">
       </el-table-column>
       <el-table-column  v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width ? col.width : 0" :min-width="col.width ? col.width : 0" :fixed="checkFixed(col.columnname)">

src/components/selectAgent/index.vue

@@ -42,6 +42,7 @@ export default {
   },
   
   methods:{
+    onShow () {},
     onClick (data) {
       console.log(this.value.enyerprisename)
       this.areaInfo = data

src/style/style.css

@@ -157,17 +157,24 @@ ul{
 }
 
 .my-label{
-  width: 80px;
+  width: 150px !important;
   font-size: 14px;
   color:rgb(163, 163, 163) !important;
 }
 .my-content{
   font-size: 14px;
-  color:#666 !important;
+  color:#999 !important;
+  width: 800px;
+}
+.my-label__title{
+  color:#666;
 }
 .el-drawer__wrapper{
   right:60px !important;
 }
+.el-drawer__header{
+  margin-bottom: 20px !important;
+}
 .fixed__btn__panel{
   position: absolute;
   display: flex;
@@ -179,9 +186,12 @@ ul{
   text-align: center;
   border-top:1px solid #f1f2f3;
   background-color: #fff;
+  box-shadow: 0 -5px 5px rgba(0, 0, 0, .05);
 }
 .drawer__panel{
-  padding:0 16px;
+  border-top:1px solid #eeeeee;
+
+  padding:20px 16px;
   margin-bottom:72px
 }
 .el-notification.right{
@@ -189,12 +199,12 @@ ul{
 }
 .search__label{
   display: inline-block;
-  width: 80px;
+  width: 100px;
   font-size: 14px;
   color:rgb(163, 163, 163) !important;
   margin-right: 10px;
-}
 
+}
 .label_center {
   display: flex;
   align-items: center;

src/template/enterprise/index.vue

@@ -0,0 +1,102 @@
+<template>
+  <div>
+    <el-popover
+      placement="bottom"
+      width="100%"
+      v-model="visible">
+      <div>
+        <div class="inline-16" style="margin-bottom:10px">
+          <el-input suffix-icon="el-icon-search" size="small" v-model="params.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="queryEnterpriseArchives(params.content.pageNumber = 1)" @clear="queryEnterpriseArchives(params.content.pageNumber = 1)" clearable></el-input> 
+        </div>
+        <el-table
+          :data="ENlist"
+          stripe
+          style="width: 100%"
+          height="300"
+          border>
+          <el-table-column
+            prop="enterprisename"
+            label="企业名称"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="contact"
+            label="联系人"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="phone"
+            label="联系电话">
+          </el-table-column>
+          <el-table-column>
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" @click="rowClick(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="params.content.pageSize"
+            layout="total, prev, pager, next, jumper"
+            :total="total">
+          </el-pagination>
+        </div>
+      </div>
+      <el-input :validate-event="false" slot="reference" v-model="form.enterprisename" @focus="queryEnterpriseArchives"  placeholder="输入企业名称" clearable></el-input>
+    </el-popover>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      ENlist:[],
+      total:0,
+      currentPage:0,
+      form:{},
+      params:{
+        "id": 20220920083901,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 10,
+          "where": {
+            "condition": ''
+          }
+        }
+      },
+      visible:false
+    }
+  },
+  methods:{
+    async queryEnterpriseArchives () {
+      const res = await this.$api.requested(this.params)
+      this.ENlist = res.data
+    },
+    handleSizeChange(val) {
+      this.params.content.pageSize = val
+      this.queryEnterpriseArchives()
+    },
+    handleCurrentChange(val) {
+      this.params.content.pageNumber = val
+      this.queryEnterpriseArchives()
+    },
+    rowClick (row) {
+      this.visible = false
+      this.form.enterprisename = row.enterprisename
+      this.$emit('rowClick',row)
+    }
+  },
+  mounted () {
+    // this.queryEnterpriseArchives()
+  }
+}
+
+</script>
+<style>
+</style>

src/template/menber/index.vue

@@ -6,7 +6,7 @@
     </div>
   </el-input> -->
   <div class="search_input normal-margin">
-    <div class="tag flex-align-center" style="margin:0 5px 5px 0" type="primary" size="mini" closable v-for="item in selected" :key="item.index">
+    <div class="tag flex-align-center" type="primary" size="mini" closable v-for="item in selected" :key="item.index">
       <div class="avatar-mini">
         <img class="avatar__image" v-if="item.headpic" :src="item.headpic" alt="">
         <p v-else>{{item.name.substr(0, 1)}}</p>
@@ -31,6 +31,7 @@
 			<i class="el-icon-check iconCheck" v-if="showSelelctIcon(item)"></i>
 		</div>
 	</div>
+  <el-empty v-if="tableData.length === 0" description="暂无数据" :image-size="40"></el-empty>
 	<el-button size="mini" type="primary" style="margin-top:16px;float:right" @click="onSelect">确 定</el-button>
  	<div style="margin-top:16px;text-align:left">
     <el-pagination
@@ -118,7 +119,7 @@ export default {
   display: flex;
   align-items: center;
   flex-wrap: wrap;
-  padding: 5px 5px 0 5px;
+  padding: 8px 8px 0 8px;
   border: 1px solid #f1f2f3;
   border-radius: 5px;
 }
@@ -127,7 +128,8 @@ export default {
   min-width: 100px;
   border:none;
   outline: none;
-  margin-bottom: 5px;
+  margin-bottom: 8px;
+  color:#666
 }
 .menber__item{
 	width: calc(100% - 20px);
@@ -187,6 +189,7 @@ export default {
   color:#666;
   padding: 5px;
   border-radius: 3px;
+  margin:0 5px 8px 0;
   background: #b5e4ff6e;
   cursor: pointer;
 }

src/template/product/index.vue

@@ -98,9 +98,9 @@ export default {
           "pageNumber": 1,
           "pageSize": 20,
             "sa_itemgroupid":0,
-          "where": {
-            "condition": ''
-          }
+            "where": {
+              "condition": ''
+            }
         }
       },
       tableSelectData:[],

src/views/login/login.vue

@@ -216,6 +216,21 @@ export default {
   background: rgba(0, 0, 0, 0.1);
   box-shadow: 2px 8px 8px 0 rgb(0 0 0 / 10%) inset;
 }
+.login-form .el-tabs__item{
+  color: #ffffff7d;
+}
+.login-form  .el-tabs__item.is-active {
+  color:#fff
+}
+.login-form  .el-tabs__nav-wrap::after {
+  background-color: #e4e7ed33;
+}
+.login-form .el-tabs__active-bar{
+  background-color: #fff;
+}
+.login-form .el-checkbox__input.is-checked+.el-checkbox__label {
+  color:#fff
+}
 </style>
 <style scoped>
 .logo{