From 7ed6ff612b5dfcf351bf415e6579fc580c451b50 Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Mon, 6 Jun 2022 18:50:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E9=93=BE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=81=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E3=80=81=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=AE=A1=E7=90=86=E3=80=81=E4=B8=9A=E5=8A=A1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/Common/permission.js              |  13 +
 .../src/api/jichuxinxi/brandManagement.js     |  44 +-
 .../src/components/ButtonBar/index.vue        | 124 +++
 .../src/layout/components/AppMain.vue         |   2 +-
 .../anrui-base-ui/src/styles/index.scss       |  26 +-
 .../changshangguanli/changshangguanli.vue     | 886 ++++++++++--------
 .../changshangguanli/changshangguanliAdd.vue  | 116 ++-
 .../changshangguanli/changshanglook.vue       |  18 +-
 .../guakaogongsiguanli/guakaogongsiguanli.vue | 212 +++--
 .../jingxiaoshangguanli/jingxiaoshangAdd.vue  |  45 +-
 .../jingxiaoshangguanli.vue                   | 194 +++-
 .../anrui-base-ui/src/views/login/login.vue   |   2 +-
 .../views/pinpai/pinpaiguanli/pinpaiAdd.vue   | 437 +++++----
 .../pinpai/pinpaiguanli/pinpaiguanli.vue      | 408 ++++----
 .../zifang/zifangzhengce/zifangzhengce.vue    |  14 +-
 .../xiaoshouzhengce/xiaoshouzhengce.vue       |   2 +-
 .../xiaoshouzhengce/xiaoshouzhengceAdd.vue    |  25 +-
 .../hegezhengtaizhang/hegezhengInfo.vue       |   5 +-
 .../hegezhengtaizhang/hegezhengtaizhang.vue   |  22 +-
 .../hegezhengtaizhangAdd.vue                  |  21 +-
 .../src/api/system/departments/departments.js |  14 +-
 .../organizationManage/organizationManage.vue | 155 ++-
 22 files changed, 1744 insertions(+), 1041 deletions(-)
 create mode 100644 anrui-base/anrui-base-ui/src/api/Common/permission.js
 create mode 100644 anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue

diff --git a/anrui-base/anrui-base-ui/src/api/Common/permission.js b/anrui-base/anrui-base-ui/src/api/Common/permission.js
new file mode 100644
index 0000000000..5c3b5622ca
--- /dev/null
+++ b/anrui-base/anrui-base-ui/src/api/Common/permission.js
@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+// 请求按钮权限
+export default {
+
+  // 查询分页列表，输入当前路径和userSid，返回
+  buttonPermission: function(params) {
+    return request({
+      url: '/demopackage/v1/demo/buttonPermission',
+      method: 'post',
+      data: params
+    })
+  }
+}
diff --git a/anrui-base/anrui-base-ui/src/api/jichuxinxi/brandManagement.js b/anrui-base/anrui-base-ui/src/api/jichuxinxi/brandManagement.js
index 2caa144ef4..5d21bd0f8c 100644
--- a/anrui-base/anrui-base-ui/src/api/jichuxinxi/brandManagement.js
+++ b/anrui-base/anrui-base-ui/src/api/jichuxinxi/brandManagement.js
@@ -52,26 +52,35 @@ export function brandLike(data) {
 
 // 品牌详情以及修改回显
 export function details(data) {
-    return request({
-        url: '/base/v1/basevehiclebrand/details/' + data,
-        method: 'get'
-    })
+  return request({
+    url: '/base/v1/basevehiclebrand/details/' + data,
+    method: 'get'
+  })
 }
-
 // 品牌类型
 export function dictType(data) {
-    return request({
-        url: '/portal/v1/dictcommons/typeValues',
-        method: 'get',
-        params: data
-    })
- }
+  return request({
+    url: '/portal/v1/dictcommons/typeValues',
+    method: 'get',
+    params: data
+  })
+}
+
+// 查询所有分公司
+export function getListOrg(params) {
+  return request({
+    url: 'portal/v1/sysorganization/getListOrg',
+    method: 'get',
+    params: params
+  })
+}
+
 //导出
 export function basefinbankExportExcel(data) {
   return request({
-    url: '/base/v1/basevehiclebrand/exportExcel?sids='+ data,
+    url: '/base/v1/basevehiclebrand/exportExcel?sids=' + data,
     method: 'get',
-    responseType: 'blob' ,// 表明返回服务器返回的数据类型
+    responseType: 'blob',// 表明返回服务器返回的数据类型
     data: qs.stringify(data),
     // headers: {
     //   'Content-Type': 'application/json',
@@ -97,6 +106,15 @@ export function selectListOrg(data) {
     })
 }
 
+// 分公司
+export function getUseOrgByUserSid(params) {
+  return request({
+    url: 'portal/v1/sysorganization/getUseOrgByUserSid',
+    method: 'get',
+    params: params
+  })
+}
+
 // 厂商
 export function namesDown(data) {
     return request({
diff --git a/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue b/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue
new file mode 100644
index 0000000000..d5546a8afa
--- /dev/null
+++ b/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue
@@ -0,0 +1,124 @@
+<template>
+  <!--标题按钮部分开始-->
+  <div class="tab-header webtop">
+    <!--标题-->
+    <div>{{ viewTitle }}</div>
+    <!--start 按钮部分开始 :icon="item.icon"-->
+    <div>
+      <el-button v-for="item in btnList" :key="item.btnKey" :type="item.type" :size="item.size" :disabled="btndisabled"
+                 @click="btnHandle(item.btnKey)">
+        <svg-icon :iconClass="item.icon"/>
+        {{ item.btnLabel }}
+      </el-button>
+    </div>
+    <!--end 按钮部分结束-->
+  </div>
+  <!--标题按钮部分结束-->
+</template>
+
+<script>
+export default {
+  name: 'ButtonBar',
+  props: {
+    viewTitle: String,
+    btndisabled: {type: Boolean, default: false}
+  },
+  data() {
+    return {
+      currentPath: this.$route.path,
+      userSid: this.$store.getters.userInfo ? this.$store.getters.userInfo.userSid : '',
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'submit',
+          btnKey: 'doSubmit',
+          btnLabel: '提交'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'Import',
+          btnKey: 'doImport',
+          btnLabel: '导入'
+        },
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'build',
+          btnLabel: '导出'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ]
+    }
+  },
+  created: function () {
+    this.initPermission()
+  },
+  methods: {
+    initPermission() {
+      console.log('*******************当前路径    ' + this.currentPath)
+      console.log('*******************当前用户    ' + this.userSid)
+      const params = {
+        currentPath: this.currentPath,
+        userSid: this.userSid
+      }
+      // req
+      //   .buttonPermission(params)
+      //   .then(resp => {
+      //     if (resp.success) {
+      //       this.btnList = resp.data
+      //     }
+      //   })
+      //   .catch(e => {
+      //     console.log('请求权限按钮组出错：' + e)
+      //   })
+    },
+    btnHandle(btnKey) {
+      this.$emit('btnhandle', btnKey)
+    },
+    setButtonList(value) {
+      this.btnList = value
+    }
+  }
+}
+</script>
+
+<style scoped>
+.svg-icon {
+  width: 1.2em;
+  height: 1.2em;
+  vertical-align: -0.16em;
+  fill: currentColor;
+  overflow: hidden;
+  margin-right: 3px;
+}
+</style>
diff --git a/anrui-base/anrui-base-ui/src/layout/components/AppMain.vue b/anrui-base/anrui-base-ui/src/layout/components/AppMain.vue
index a8f3718274..6e2882598c 100644
--- a/anrui-base/anrui-base-ui/src/layout/components/AppMain.vue
+++ b/anrui-base/anrui-base-ui/src/layout/components/AppMain.vue
@@ -31,7 +31,7 @@ export default {
   /* margin-left:10px; */
   padding: 0 10px;
   overflow-x: hidden;
-  overflow-y: auto;
+  overflow-y: hidden;
 }
 .fixed-header+.app-main {
   padding-top: 50px;
diff --git a/anrui-base/anrui-base-ui/src/styles/index.scss b/anrui-base/anrui-base-ui/src/styles/index.scss
index e74499658e..a397ac77e4 100644
--- a/anrui-base/anrui-base-ui/src/styles/index.scss
+++ b/anrui-base/anrui-base-ui/src/styles/index.scss
@@ -105,7 +105,9 @@ div:focus {
 .app-container {margin: 5px;
   background-color: #fff;
 }
-.listcon{height: calc(100vh - 425px);overflow-y: auto;overflow-x: hidden;}
+// 设置了滚动区域
+.main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 186px);}
+.listcon{height: calc(100vh - 425px);overflow-y: hidden;overflow-x: hidden;}
 .listconadd{height: calc(100vh - 200px);overflow-y: auto;overflow-x: hidden;}
 .listconsub{height: calc(100vh - 310px);overflow-y: auto;overflow-x: hidden;}
 .listconsubjxs{height: calc(100vh - 300px);overflow-y: auto;overflow-x: hidden;}
@@ -149,11 +151,11 @@ div:focus {
 	padding: 20px 0;
   // height: calc(100vh - 200px);overflow-y: auto;
 	.title {
-		padding: 10px;font-weight: bold;		
+		padding: 10px;font-weight: bold;
     font-size: 20px;
     background-color: $header-bg;
-    text-align: center;	
-    color: #ffffff;	
+    text-align: center;
+    color: #ffffff;
 	}
   .el-row {
       display:flex;
@@ -172,7 +174,7 @@ div:focus {
         }
       }
 
-		}  
+		}
     .footer{margin: 20px;}
 }
 
@@ -180,11 +182,11 @@ div:focus {
 .forminfo {
 	padding: 20px 0;
 	.title {
-		padding: 10px;font-weight: bold;		
+		padding: 10px;font-weight: bold;
     font-size: 20px;
     background-color: $header-bg;
-    text-align: center;	
-    color: #ffffff;	
+    text-align: center;
+    color: #ffffff;
 	}
   .el-row {
       display:flex;
@@ -197,19 +199,19 @@ div:focus {
         border-bottom: 1px solid $table-border-color;
         padding: 0px 15px 0px 15px !important;
         min-height: 50px;
-        line-height: 50px;  
-        font-size: 14px;    
+        line-height: 50px;
+        font-size: 14px;
 
       }
 
-		}  
+		}
     .footer{margin: 20px;}
 }
 
 .el-form-item__error {
     z-index: 100;
 }
-.bluezi{color: $header-bg;}
+.bluezi{color: $header-bg;cursor:pointer;}
 // 经销商添加样式
 .titcon{
   display: flex;flex-direction: row;justify-content: space-around; background-color: #0294d7;flex: 3;
diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
index 3f7f8fc738..4a3644a18c 100644
--- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
+++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
@@ -2,90 +2,82 @@
   <div class="app-container">
 <!--    <changshang />-->
     <div v-show="viewState === 1">
-      <div class="tab-header webtop">
-        <div>厂商管理</div>
-        <div>
-          <el-button type="primary" size="small" @click="handleCreate()">新增</el-button>
-          <el-button type="primary" size="small" @click="handleUpdate()">修改</el-button>
-          <el-button type="danger" size="small" @click="handleDelete()">删除</el-button>
-          <el-button type="success" size="small" @click="handleDaoChu()">导出</el-button>
+      <button-bar view-title="厂商管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="main-content">
+        <div class="searchcon">
+        <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+        <div v-show="isSearchShow" class="search">
+          <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="80px" class="tab-header">
+            <el-form-item label="厂商名称">
+              <el-autocomplete v-model="listQuery.manufacturerName" :fetch-suggestions="querySearchAsync"
+                               style="width: 300px" placeholder="请输入厂商名称" @select="handleSelect">
+                <i slot="suffix" class="el-icon-edit el-input__icon" @click="inputclear"/>
+                <template slot-scope="{ item }">
+                  <div style="paddingg:5px;background-color:Azure;">
+                    <span>厂商名称：</span>
+                    <span style="color:red">{{ item.manufacturerName }} </span><br>
+                  </div>
+                </template>
+              </el-autocomplete>
+            </el-form-item>
+            <el-form-item label="厂商类别">
+              <el-select v-model="listQuery.supplyType" class="filter-item" clearable placeholder="请选择厂商类别"
+                         style="width: 300px;">
+                <el-option v-for="item in typeOptions" :key="item.dictKey" :label="item.dictValue"
+                           :value="item.dictKey"/>
+              </el-select>
+            </el-form-item>
+          </el-form>
+          <div class="btn" style="text-align: center;">
+            <el-button type="primary" @click="handleFilter">查询</el-button>
+            <el-button type="primary" @click="handleReset">重置</el-button>
+          </div>
         </div>
       </div>
-    <div class="searchcon">
-      <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
-      <div v-show="isSearchShow" class="search">
-        <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="80px" class="tab-header">
-          <el-form-item label="厂商名称">
-            <el-autocomplete v-model="listQuery.manufacturerName" :fetch-suggestions="querySearchAsync"
-              style="width: 300px" placeholder="请输入厂商名称" @select="handleSelect">
-              <i slot="suffix" class="el-icon-edit el-input__icon" @click="inputclear" />
-              <template slot-scope="{ item }">
-                <div style="paddingg:5px;background-color:Azure;">
-                  <span>厂商名称：</span>
-                  <span style="color:red">{{ item.manufacturerName }} </span><br>
-                </div>
-              </template>
-            </el-autocomplete>
-          </el-form-item>
-          <el-form-item label="厂商类别">
-            <el-select v-model="listQuery.supplyType" class="filter-item" clearable placeholder="请选择厂商类别"
-              style="width: 300px;">
-              <el-option v-for="item in typeOptions" :key="item.dictKey" :label="item.dictValue"
-                :value="item.dictKey" />
-            </el-select>
-          </el-form-item>
-          <el-button type="primary" @click="handleFilter">查询</el-button>
-        </el-form>
+        <div class="listtop">
+        <div class="tit">厂商信息列表</div>
+        <!-- 翻页分页 -->
+        <pageye v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
+                class="pagination" @pagination="getList"/>
+      </div>
+        <div>
+        <el-table :key="tableKey" v-loading="listLoading" :data="list" border fit highlight-current-row
+                  style="width: 100%;" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" align="center" width="50"/>
+          <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
+          <el-table-column prop="jc" label="厂商名称" align="center">
+            <template slot-scope="scope">
+              <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.manufacturerName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="厂商通讯地址" width="380" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.manufacturerAddress }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="厂商办公电话" width="200" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.manufacturerTelePhone }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="联系人姓名" width="180" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.contactName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="联系电话" width="200" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.contactMobile }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+        <div class="pages">
+        <!-- 翻页 -->
+        <pagination v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
+                    class="pagination" @pagination="getList"/>
+      </div>
       </div>
-    </div>
-    <div class="listtop">
-      <div class="tit">厂商信息列表</div>
-      <!-- 翻页分页 -->
-      <pageye v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
-        class="pagination" @pagination="getList" />
-    </div>
-    <div>
-      <el-table :key="tableKey" v-loading="listLoading" :data="list" border fit highlight-current-row
-        style="width: 100%;" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" align="center" width="50" />
-        <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-        <el-table-column prop="jc" label="厂商名称" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.manufacturerName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="厂商通讯地址" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.manufacturerAddress }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="厂商电话" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.manufacturerTelePhone }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="联系人姓名" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.contactName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="联系电话" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.contactMobile }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="{row}">
-            <el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="pages">
-      <!-- 翻页 -->
-      <pagination v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
-        class="pagination" @pagination="getList" />
-    </div>
     </div>
 
     <changshangguanli-add v-show="viewState == 2 || viewState == 3"  ref="divadd" @doback="resetState"
@@ -96,185 +88,235 @@
 </template>
 
 <script>
-  import {
-    mapGetters
-  } from 'vuex'
-  import {
-    pagerList,
-    deleteBySids,
-    getNamesDownes,
-    basefinbankExportExcel
-  } from '@/api/jichuxinxi/basemanufacturer'  //接口
-  import {
-    setXiu,
-    setLook
-  } from '@/utils/baocun' //本地储存
-  import {
-    typeValues
-  } from '@/api/jichuxinxi/dictcommons' //数据字典的接口
-  // import { getFileType, parseDate, parseTime, ConvertMenuState } from "@/utils";
-  // import { findButtonByUserId } from '@/api/sys/permission'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import {
-    delUser
-  } from '@/api/system/user/Auser'
-  import ChangshangguanliAdd from "@/views/changshang/changshangguanli/changshangguanliAdd.vue";
-  import changshanglook from "@/views/changshang/changshangguanli/changshanglook";
+import {mapGetters} from 'vuex'
+import {basefinbankExportExcel, deleteBySids, getNamesDownes, pagerList} from '@/api/jichuxinxi/basemanufacturer' //接口
+import {setXiu} from '@/utils/baocun' //本地储存
+import {typeValues} from '@/api/jichuxinxi/dictcommons' //数据字典的接口
+// import { getFileType, parseDate, parseTime, ConvertMenuState } from "@/utils";
+// import { findButtonByUserId } from '@/api/sys/permission'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+// import ButtonBar from '/src/components/ButtonBar/index.vue'
+import ChangshangguanliAdd from "@/views/changshang/changshangguanli/changshangguanliAdd.vue";
+import changshanglook from "@/views/changshang/changshangguanli/changshanglook";
+import ButtonBar from "@/components/ButtonBar";
 
-  export default {
-    name: 'changshangguanli',
-    components: {
-      ChangshangguanliAdd,
-      changshanglook,
-      Pagination,
-      pageye
-    },
-    directives: {
-      drag: {
-        // 指令的定义
-        bind: function(el) {
-          const odiv = el // 获取当前元素
-          el.onmousedown = (e) => {
-            // 算出鼠标相对元素的位置
-            const disX = e.clientX - odiv.offsetLeft
-            const disY = e.clientY - odiv.offsetTop
-            let left = ''
-            let top = ''
-            document.onmousemove = (e) => {
-              // 用鼠标的位置减去鼠标相对元素的位置，得到元素的位置
-              left = e.clientX - disX
-              top = e.clientY - disY
-              // 绑定元素位置到positionX和positionY上面
-              // 移动当前元素
-              odiv.style.left = left + 'px'
-              odiv.style.top = top + 'px'
-            }
-            document.onmouseup = (e) => {
-              document.onmousemove = null
-              document.onmouseup = null
-            }
+export default {
+  name: 'changshangguanli',
+  components: {
+    ButtonBar,
+    ChangshangguanliAdd,
+    changshanglook,
+    Pagination,
+    pageye
+  },
+  directives: {
+    drag: {
+      // 指令的定义
+      bind: function (el) {
+        const odiv = el // 获取当前元素
+        el.onmousedown = (e) => {
+          // 算出鼠标相对元素的位置
+          const disX = e.clientX - odiv.offsetLeft
+          const disY = e.clientY - odiv.offsetTop
+          let left = ''
+          let top = ''
+          document.onmousemove = (e) => {
+            // 用鼠标的位置减去鼠标相对元素的位置，得到元素的位置
+            left = e.clientX - disX
+            top = e.clientY - disY
+            // 绑定元素位置到positionX和positionY上面
+            // 移动当前元素
+            odiv.style.left = left + 'px'
+            odiv.style.top = top + 'px'
+          }
+          document.onmouseup = (e) => {
+            document.onmousemove = null
+            document.onmouseup = null
           }
         }
-      },
-      // 注册一个局部的自定义指令 v-focus
-      focus: {
-        // 指令的定义
-        inserted: function(el) {
-          // 聚焦元素
-          el.querySelector('input').focus()
-        },
+      }
+    },
+    // 注册一个局部的自定义指令 v-focus
+    focus: {
+      // 指令的定义
+      inserted: function (el) {
+        // 聚焦元素
+        el.querySelector('input').focus()
       },
     },
-    data() {
-      return {
-        viewState:1,
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        sids: [],
-        // 查询 -----------
-        tableKey: 0,
-        list: [],
-        total: 1,
-        // FormLoading: false,
-        listLoading: false,
-        listQuery: {
-          supplyType: '',
-          manufacturerName: '',
-          current: 1,
-          size: 20
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
         },
-        xuanzeshuju: {},
-        // selectDate: undefined,
-        temp: {}, // 添加和修改
-        templook: {}, // 查看实体
-        textMap: {
-          update: '修改',
-          create: '新增'
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
         },
-        dialogFormVisible: false, // 添加修改对话框状态
-        dialogFormShowVisible: false, // 查看对话框默认关闭状态
-        dialogStatus: '', // 对话框状态
-        supplyType: 'supplyType',
-        typeOptions: [],
-        tureArrys: [{
-            value: 1,
-            label: '是'
-          },
-          {
-            value: 0,
-            label: '否'
-          }
-        ],
-        fenzuOptions: [{
-            value: '1',
-            label: '单位'
-          },
-          {
-            value: '2',
-            label: '个人'
-          }
-        ],
-        tiaojian: '',
-        rules: {
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'build',
+          btnLabel: '导出'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
         }
-        // ------------------------------------
-      }
-    },
-    computed: {
-      ...mapGetters([
-        'id',
-        'roles',
-        'rolesIds',
-        'departmentId',
-        'departmentCode'
-      ])
+      ],
+      viewState: 1,
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      sids: [],
+      // 查询 -----------
+      tableKey: 0,
+      list: [],
+      total: 1,
+      // FormLoading: false,
+      listLoading: false,
+      listQuery: {
+        supplyType: '',
+        manufacturerName: '',
+        current: 1,
+        size: 20
+      },
+      xuanzeshuju: {},
+      // selectDate: undefined,
+      temp: {}, // 添加和修改
+      templook: {}, // 查看实体
+      textMap: {
+        update: '修改',
+        create: '新增'
+      },
+      dialogFormVisible: false, // 添加修改对话框状态
+      dialogFormShowVisible: false, // 查看对话框默认关闭状态
+      dialogStatus: '', // 对话框状态
+      supplyType: 'supplyType',
+      typeOptions: [],
+      tureArrys: [{
+        value: 1,
+        label: '是'
+      },
+        {
+          value: 0,
+          label: '否'
+        }
+      ],
+      fenzuOptions: [{
+        value: '1',
+        label: '单位'
+      },
+        {
+          value: '2',
+          label: '个人'
+        }
+      ],
+      tiaojian: '',
+      rules: {}
+      // ------------------------------------
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'id',
+      'roles',
+      'rolesIds',
+      'departmentId',
+      'departmentCode'
+    ])
+  },
+  mounted() {
+    this.$refs["btnbar"].setButtonList(this.btnList)
+  },
+  created() {
+    // 初始化变量
+    this.init()
+    // 加载列表
+    this.getList()
+    this.factoryMill()
+  },
+  watch: {
+    listQuery: function (n, o) {
+    }
+  },
+  methods: {
+    resetState() {
+      this.viewState = 1
     },
-    created() {
-      // 初始化变量
-      this.init()
-      // 加载列表
-      this.getList()
-      this.factoryMill()
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'toEdit':
+          this.toEdit()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doExport':
+          this.doExport()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
     },
-    watch:{
-      listQuery: function(n, o) {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
       }
     },
-    methods: {
-      resetState() {
-        this.viewState = 1
-      },
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
-        } else {
-          this.searchxianshitit = '显示查询条件'
+    init() {
+      this.searchData()
+    },
+    searchData() {
+      getNamesDownes({
+        name: this.listQuery.manufacturerName
+      }).then((res) => {
+        // console.log('88888888888', res)
+        if (res.code === '200') {
+          this.YongHu = res.data
         }
-      },
-      init() {
-        this.searchData()
-      },
-      searchData() {
-        getNamesDownes({
-          name: this.listQuery.manufacturerName
-        }).then((res) => {
-          // console.log('88888888888', res)
-          if(res.code === '200'){
-            this.YongHu =res.data
-          }
-        })
-      },
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      // 查询列表信息
-      getList() {
+      })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
         this.listLoading = true
         pagerList({
           current: this.listQuery.current,
@@ -298,32 +340,41 @@
             this.total = 0
           }
         })
-      },
-      // 查询按钮
-      handleFilter() {
-        this.listQuery.current = 1
-        this.getList()
-      },
-      // ----------------------------------方法--------------------
-      // 添加前数据初始化
-      resetTemp() {
-        this.temp = {
-          manufacturerName: '', //			false	string
-          manufacturerAddress: '', //			false	string
-          manufacturerTelePhone: '', //			false	string
-          contactName: '', //
-          contactMobile: '', //
-        }
-      },
-      // 文本模糊查询
-      querySearchAsync(queryString, cb) {
-        console.log('查询条件：', queryString)
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery = {
+        supplyType: '',
+        manufacturerName: '',
+        current: 1,
+        size: 20
+      }
+      this.getList()
+    },
+    // ----------------------------------方法--------------------
+    // 添加前数据初始化
+    resetTemp() {
+      this.temp = {
+        manufacturerName: '', //			false	string
+        manufacturerAddress: '', //			false	string
+        manufacturerTelePhone: '', //			false	string
+        contactName: '', //
+        contactMobile: '', //
+      }
+    },
+    // 文本模糊查询
+    querySearchAsync(queryString, cb) {
+      console.log('查询条件：', queryString)
 
-        if (
-          queryString != null &&
-          queryString != undefined &&
-          queryString !== ''
-        ) {
+      if (
+        queryString != null &&
+        queryString != undefined &&
+        queryString !== ''
+      ) {
           // this.searchData({
           //   name: queryString
           // })
@@ -335,152 +386,164 @@
               cb(response.data)
             }
           })
-        } else {
-          cb(this.YongHu)
+      } else {
+        cb(this.YongHu)
+      }
+    },
+    handleSelect(e) {
+      // 选择：
+      // console.log('选择：' + JSON.stringify(e))
+      this.listQuery.manufacturerName = e.manufacturerName
+      //   this.listQuery.brandCode = e.sid
+    },
+    // 清空信息
+    inputclear() {
+      this.listQuery.manufacturerName = ''
+      this.getList()
+      //   this.listQuery.brandCode = ''
+    },
+    // 打开添加对话框
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divadd'].showAdd()
+      /* if (this.$store.state.counter === 0) {
+         this.$store.state.counter
+         // console.log('打开添加对话框', this.$store.state.counter)
+         this.$router.push({
+           path: '/changshang/changshangguanliAdd/0',
+         })
+       } else {
+         this.$store.state.counter = 0
+         this.$router.push({
+           path: '/changshang/changshangguanliAdd/0',
+         })
+       }*/
+    },
+    // 提交添加数据
+    factoryMill() {
+      typeValues({
+        type: this.supplyType
+      }).then((response) => {
+        if (response.code === '200') {
+          this.typeOptions = response.data
         }
-      },
-      handleSelect(e) {
-        // 选择：
-        // console.log('选择：' + JSON.stringify(e))
-        this.listQuery.manufacturerName = e.manufacturerName
-        //   this.listQuery.brandCode = e.sid
-      },
-      // 清空信息
-      inputclear() {
-        this.listQuery.manufacturerName = ''
-        this.getList()
-        //   this.listQuery.brandCode = ''
-      },
-      // 打开添加对话框
-      handleCreate() {
-        this.viewState = 2
-        this.$refs['divadd'].showAdd()
-       /* if (this.$store.state.counter === 0) {
-          this.$store.state.counter
-          // console.log('打开添加对话框', this.$store.state.counter)
-          this.$router.push({
-            path: '/changshang/changshangguanliAdd/0',
-          })
-        } else {
-          this.$store.state.counter = 0
-          this.$router.push({
-            path: '/changshang/changshangguanliAdd/0',
-          })
-        }*/
-      },
-      // 提交添加数据
-      factoryMill() {
-        typeValues({
-          type: this.supplyType
-        }).then((response) => {
-          if (response.code === '200') {
-            this.typeOptions = response.data
-          }
-        })
-      },
-      //勾选/
-      handleSelectionChange(row) {
-        const aa = []
-        const cc = []
-        row.forEach((element) => {
-          aa.push(element.sid)
-          cc.push(element.manufacturerName, element.sid, element.supplyType)
+      })
+    },
+    //勾选/
+    handleSelectionChange(row) {
+      const aa = []
+      const cc = []
+      row.forEach((element) => {
+        aa.push(element.sid)
+        cc.push(element.manufacturerName, element.sid, element.supplyType)
+      })
+      this.sids = aa
+      this.tiaojian = this.sids.toString()
+      this.xuanzeshuju = cc
+      setXiu(this.sids)
+    },
+    // 根据本行ID删除数据
+    doDel() {
+      if (this.sids.length > 0) {
+        const _this = this
+        const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
-        this.sids = aa
-        this.tiaojian = this.sids.toString()
-        this.xuanzeshuju = cc
-        setXiu(this.sids)
-      },
-      // 根据本行ID删除数据
-      handleDelete() {
-        if (this.sids.length > 0) {
-          deleteBySids(this.sids).then((response) => {
-            // console.log('3455', response)
-            if (response.code === '200') {
-              this.$notify({
-                title: '提示',
-                message: '删除成功',
-                type: 'success',
-                duration: 2000,
+          .then(() => {
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+            deleteBySids(this.sids)
+              .then(resp => {
+                if (resp.success && resp.code == '200') {
+                  loading.close()
+                  _this.$message({type: 'success', message: resp.msg, showClose: true})
+                  _this.getList()
+                } else {
+                  loading.close()
+                  // _this.$message({ type: 'error', message: resp.msg, showClose: true })
+                }
               })
-              this.getList()
-            } else {
-              this.$notify({
-                title: '删除失败',
-                message: response.msg,
-                type: 'error',
+              .catch(e => {
+                loading.close()
               })
-            }
           })
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '没有选择厂商!!',
-            type: 'error',
-            duration: 2000,
+          .catch(() => {
           })
-          return
-        }
+      } else {
+        this.$message({type: 'error', message: '没有选择厂商!!', showClose: true})
+        return
+      }
 
-      },
-      // 打开修改
-      handleUpdate() {
-        this.$store.state.counter = 1
-        // console.log(this.sids, '打开修改')
-        if (this.sids.length === 1) {
+    },
+    // 打开修改
+    toEdit() {
+      this.$store.state.counter = 1
+      // console.log(this.sids, '打开修改')
+      if (this.sids.length === 1) {
         /*  this.dialogStatus = 'update'
           this.$router.push({
             path: `/changshang/changshangguanliAdd/${this.sids[0]}`,
           })*/
 
-          // this.dialogStatus = 'update'
-          this.viewState = 3
-          const sid = this.sids[0]
-          const row = this.row
-          this.$refs['divadd'].showEdit(sid, row)
-          // this.$router.push({
-          //   path: `/cheliang/chexingAdd/${this.sids[0]}`
-          // })
-        } else if (this.sids.length > 1) {
-          this.$notify({
-            title: '提示',
-            message: '不能选中多个商家修改!!',
-            type: 'info',
-            duration: 2000,
-          })
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '没有选择厂商!!',
-            type: 'error',
-            duration: 2000,
-          })
-          return
-        }
-      },
-      // 打开查看
-      handleCheck(row) {
-        this.viewState = 4
-        this.$refs['divinfo'].showInfo(row.sid)
-      },
-      // 导出
-      handleDaoChu() {
-        basefinbankExportExcel(this.sids).then((res) => {
-          const blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-          })
-          const objectUrl = URL.createObjectURL(blob)
-          window.location.href = objectUrl
-          this.$notify({
-            title: '提示',
-            message: '导出成功',
-            type: 'success',
-            duration: 2000,
-          })
+        // this.dialogStatus = 'update'
+        this.viewState = 3
+        const sid = this.sids[0]
+        const row = this.row
+        this.$refs['divadd'].showEdit(sid, row)
+        // this.$router.push({
+        //   path: `/cheliang/chexingAdd/${this.sids[0]}`
+        // })
+      } else if (this.sids.length > 1) {
+        this.$notify({
+          title: '提示',
+          message: '不能选中多个商家修改!!',
+          type: 'info',
+          duration: 2000,
         })
-      },
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '没有选择厂商!!',
+          type: 'error',
+          duration: 2000,
+        })
+        return
+      }
     },
-  }
+    // 打开查看
+    handleCheck(row) {
+      this.viewState = 4
+      this.$refs['divinfo'].showInfo(row.sid)
+    },
+    // 导出
+    doExport() {
+      basefinbankExportExcel(this.sids).then((res) => {
+        const blob = new Blob([res], {
+          type: 'application/vnd.ms-excel'
+        })
+        const objectUrl = URL.createObjectURL(blob)
+        window.location.href = objectUrl
+        this.$notify({
+          title: '提示',
+          message: '导出成功',
+          type: 'success',
+          duration: 2000,
+        })
+      })
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route);
+      this.$router.go(-1)
+    }
+  },
+}
 </script>
 <style scoped>
   /deep/ .el-collapse {
@@ -500,4 +563,19 @@
   /deep/ .el-collapse-item__header {
     border-bottom: 0px solid #e6ebf5;
   }
+
+  .btn {
+    padding: 15px 0 15px 0;
+    border: 1px solid #e0e3eb;
+  }
+
+  .tab-header {
+    background-color: #edf1f7;
+    padding: 8px 20px;
+    margin-bottom: 0 !important;
+  }
+
+  .tab-header /deep/ .el-form-item {
+    margin-bottom: 10px;
+  }
 </style>
diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue
index c92eadefd4..6ab1e19117 100644
--- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue
+++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue
@@ -1,24 +1,25 @@
 <template>
   <div class="app-container">
     <div class="tab-header webtop">
-      <div >
+      <div>
         <div v-if="stateId == '0'">【新增】厂商信息</div>
         <div v-else>【修改】厂商信息</div>
       </div>
       <div>
-        <el-button  type="primary" size="small" @click="handleCreate()">保存</el-button>
-        <el-button type="primary" size="small" @click="handleReturn()">返回</el-button>
+        <el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
       </div>
     </div>
-      <!-- 新增 修改 -->
-      <div  class="listconsub" style="height: auto;">
-        <el-form ref="dataForm" :title="textMap[dialogStatus]" :model="temp" label-position="right" label-width="190px" class="formadd" :rules="rules">
+    <!-- 新增 修改 -->
+    <div class="listconsub">
+      <el-form ref="dataForm" :title="textMap[dialogStatus]" :model="temp" label-position="right" label-width="190px"
+               class="formadd" :rules="rules">
         <div class="title">供应厂商信息</div>
         <el-row>
           <el-col :span="12">
             <el-form-item prop="manufacturerName">
               <span slot="label">厂商名称：</span>
-              <el-input v-model="temp.manufacturerName" maxlength="20" placeholder="" class="addinputw" clearable />
+              <el-input v-model="temp.manufacturerName" maxlength="20" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -38,7 +39,7 @@
           <el-col :span="12">
             <el-form-item prop="manufacturerAddress">
               <span slot="label">厂商通讯地址：</span>
-              <el-input v-model="temp.manufacturerAddress" maxlength="20" placeholder="" class="addinputw" clearable />
+              <el-input v-model="temp.manufacturerAddress" maxlength="80" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -51,7 +52,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item prop="manufacturerTelePhone">
-              <span slot="label">厂商电话：</span>
+              <span slot="label">厂商办公电话：</span>
               <el-input v-model="temp.manufacturerTelePhone" maxlength="20" placeholder="" class="addinputw"
                         clearable />
             </el-form-item>
@@ -80,7 +81,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item prop="contactMobile">
-              <span slot="label">手机号：</span>
+              <span slot="label">联系人手机号：</span>
               <el-input v-model="temp.contactMobile" maxlength="11" placeholder="" class="addinputw" clearable />
             </el-form-item>
           </el-col>
@@ -88,7 +89,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item prop="contactTelePhone">
-              <span slot="label">办公电话：</span>
+              <span slot="label">联系人办公电话：</span>
               <el-input v-model="temp.contactTelePhone" maxlength="13" placeholder="" class="addinputw" clearable />
             </el-form-item>
           </el-col>
@@ -141,26 +142,31 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item prop="useOrgArry">
+            <el-form-item prop="useOrgValue">
               <span slot="label">使用组织：</span>
-              <el-cascader v-model="useOrgArry" class="addinputw" @change="usrOrgArryChange" :options="options"
-                           :props="props" />
+              <el-select v-model="useOrgValue" collapse-tags multiple placeholder="请选择" filterable clearable
+                         class="addinputw"
+                         @change="getuseOrg">
+                <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+              </el-select>
+              <!--              <el-cascader v-model="useOrgArry" class="addinputw" @change="usrOrgArryChange" :options="options"-->
+              <!--                           :props="props" />-->
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item>
               <span slot="label">地区：</span>
-              <el-select v-model="temp.province" filterable placeholder="请选择省" class="filter-item" style="width: 220px"
+              <el-select v-model="temp.province" filterable placeholder="请选择省" class="filter-item" style="width: 130px"
                          @change="getShen">
-                <el-option v-for="item in inputProvinceList" :key="item.sid" :label="item.name" :value="item.sid" />
+                <el-option v-for="item in inputProvinceList" :key="item.sid" :label="item.name" :value="item.sid"/>
               </el-select>
-              <el-select v-model="temp.city" filterable placeholder="请选择市" class="filter-item" style="width: 220px"
+              <el-select v-model="temp.city" filterable placeholder="请选择市" class="filter-item" style="width: 130px"
                          @change="getShi">
-                <el-option v-for="item in inputCityList" :key="item.sid" :label="item.name" :value="item.sid" />
+                <el-option v-for="item in inputCityList" :key="item.sid" :label="item.name" :value="item.sid"/>
               </el-select>
-              <el-select v-model="temp.county" filterable placeholder="请选择县" class="filter-item" style="width: 220px"
+              <el-select v-model="temp.county" filterable placeholder="请选择县" class="filter-item" style="width: 130px"
                          @change="getQu">
-                <el-option v-for="item in inputCountyList" :key="item.sid" :label="item.name" :value="item.sid" />
+                <el-option v-for="item in inputCountyList" :key="item.sid" :label="item.name" :value="item.sid"/>
               </el-select>
               <!-- <el-input v-model="temp.region" maxlength="25" placeholder="" class="addinputw" clearable /> -->
             </el-form-item>
@@ -352,6 +358,7 @@ import {details, SaveList, selectListOrg, Update,} from "@/api/jichuxinxi/basema
 import {getCity, getCounty, getProvince} from '@/api/portal/areaPicker' // 省市区
 import {typeValues} from "@/api/jichuxinxi/dictcommons";
 import {getLook, getXiu, setuser} from "@/utils/baocun";
+import {getListOrg} from "@/api/jichuxinxi/brandManagement";
 
 export default {
   name: "ChangshangguanliAdd1",
@@ -365,7 +372,7 @@ export default {
       callback(new Error("请输入邮箱"));
     };
     var validCascader = (rule, value, callback) => {
-      if (this.useOrgArry.length == 0) {
+      if (this.useOrgValue.length == 0) {
         callback(new Error('请填写使用组织'))
       } else {
         callback();
@@ -419,6 +426,8 @@ export default {
       province: [],
       city: [],
       county: [],
+      useOrgValue: [],
+      useOrg_list:[],
       FormLoading: false,
       listLoading: false,
       dataArr: [],
@@ -511,7 +520,7 @@ export default {
         }],
         manufacturerTelePhone: [{
           required: true,
-          validator: checkSubmit,
+          validator: checkBanGongDianHua,
           trigger: 'blur'
         }],
         contactName: [{
@@ -534,7 +543,7 @@ export default {
           message: '请填写供应类别',
           trigger: 'blur'
         }],
-        useOrgArry: [{
+        useOrgValue: [{
           required: true,
           validator: validCascader,
           trigger: "change"
@@ -559,6 +568,7 @@ export default {
     this.gertXiaLa4();
     this.getZuZhi();
     this.huoquSheng()
+    this.getListOrgAll()
     // this.init();
   },
   methods: {
@@ -629,6 +639,31 @@ export default {
       console.log('税分类', bb)
       this.temp1.taxClassificationValue = bb.name
     },
+    // 所有分公司
+    getListOrgAll() {
+      getListOrg().then((res) => {
+        if (res.success) {
+          this.useOrg_list = res.data
+        }
+      })
+    },
+    getuseOrg(val) {
+      console.log('选择的使用组织', val)
+      let choosetItem = []
+      val.forEach((ele) => {
+        choosetItem = this.useOrg_list.filter((item) => ele == item.sid)
+      })
+      console.log('chooseItem', choosetItem)
+      const useOrg = []
+      const useOrgName = []
+      choosetItem.forEach((e) => {
+        useOrg.push(e.sid)
+        useOrgName.push(e.name)
+      })
+      this.temp.useOrg = useOrg.join()
+      this.temp.useOrgName = useOrgName.join()
+      console.log('使用组织name：', this.temp.useOrgName, '使用组织sid：', this.temp.useOrg)
+    },
     showAdd() {
       this.temp = {}
       this.temp1 = {}
@@ -658,6 +693,11 @@ export default {
             this.temp = response.data.baseManufacturerDto
             this.temp1 = response.data.baseManufacturerFinanceDto
             this.temp2 = response.data.baseManufacturerBankDto
+            if (this.temp.useOrg.search(',') == '-1') {
+              this.useOrgValue = this.temp.useOrg.split(" ")
+            } else {
+              this.useOrgValue = this.temp.useOrg.split(",")
+            }
           }
         })
       }else if(typeof(sid) != "undefined"){
@@ -797,10 +837,12 @@ export default {
       this.setDetaList()
     },
     // 返回
-    handleReturn() {
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
       this.temp = {}
       this.temp1 = {}
       this.temp2 = {}
+      this.useOrgArry = []
       //  this.$router.go(-1)
       this.$emit('doback')
     },
@@ -823,16 +865,18 @@ export default {
     },
     // --- 循环查询
     findOrgId(id, options) {
-      for (var i = 0; i < options.length; i++) {
-        if (id == options[i].sid) {
-          this.select_temp = options[i].name // 保存找到的内容
-          return true
-        } else {
-          // 判断是否最后一级
-          if (options[i].children !== undefined) {
-            // 不是的话查询下一级
-            if (this.findOrgId(id, options[i].children)) {
-              return true
+      if (options) {
+        for (var i = 0; i < options.length; i++) {
+          if (id == options[i].sid) {
+            this.select_temp = options[i].name // 保存找到的内容
+            return true
+          } else {
+            // 判断是否最后一级
+            if (options[i].children !== undefined) {
+              // 不是的话查询下一级
+              if (this.findOrgId(id, options[i].children)) {
+                return true
+              }
             }
           }
         }
@@ -898,7 +942,7 @@ export default {
                   type: "success",
                   duration: 2000
                 })
-                this.handleReturn()
+                this.handleReturn('true')
               } else {
                 this.$notify({
                   title: "提示",
@@ -932,7 +976,7 @@ export default {
                   type: "success",
                   duration: 2000
                 })
-                this.handleReturn()
+                this.handleReturn('true')
               } else {
                 this.$notify({
                   title: "失败",
diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue
index 580915c085..2e17817172 100644
--- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue
+++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue
@@ -4,12 +4,12 @@
       <div>厂商管理详情</div>
       <div>
         <!-- <el-button type="primary" size="small" @click="dialogStatus==='create'?handleCreate():updateData()">保存</el-button> -->
-        <el-button type="primary" size="small" @click="handleReturn()"
+        <el-button type="info" size="small" @click="handleReturn()"
           >返回</el-button
         >
       </div>
     </div>
-    <div  class="listconsub" style="height: auto;">
+    <div  class="listconsub">
       <el-form ref="dataForm" :title="textMap[dialogStatus]" :model="temp" label-position="right" label-width="190px" class="formadd" :rules="rules">
         <div class="title">供应厂商信息</div>
         <el-row>
@@ -49,7 +49,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item prop="manufacturerTelePhone">
-              <span slot="label">厂商电话：</span>
+              <span slot="label">厂商办公电话：</span>
               <span>{{temp.manufacturerTelePhone}}</span>
             </el-form-item>
           </el-col>
@@ -77,7 +77,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item prop="contactMobile">
-              <span slot="label">手机号：</span>
+              <span slot="label">联系人手机号：</span>
               <span>{{temp.contactMobile}}</span>
             </el-form-item>
           </el-col>
@@ -85,7 +85,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item prop="contactTelePhone">
-              <span slot="label">办公电话：</span>
+              <span slot="label">联系人办公电话：</span>
               <span>{{temp.contactTelePhone}}</span>
             </el-form-item>
           </el-col>
@@ -126,7 +126,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item prop="useOrgArry">
+            <el-form-item prop="useOrgName">
               <span slot="label">使用组织：</span>
               <span>{{temp.useOrgName }}</span>
             </el-form-item>
@@ -356,16 +356,16 @@ export default {
           { required: true, message: "请填写厂商通讯地址", trigger: "blur" },
         ],
         manufacturerTelePhone: [
-          { required: true, message: "请填写厂商电话", trigger: "blur" },
+          { required: true, message: "请填写厂商办公电话", trigger: "blur" },
         ],
         contactName: [
           { required: true, message: "请填写联系人名字", trigger: "blur" },
         ],
         contactMobile: [
-          { required: true, message: "请填写手机号", trigger: "blur" },
+          { required: true, message: "请填写联系人手机号", trigger: "blur" },
         ],
         contactTelePhone: [
-          { required: true, message: "请填写办公电话", trigger: "blur" },
+          { required: true, message: "请填写联系人办公电话", trigger: "blur" },
         ],
         weChatID: [
           { required: true, message: "请填写微信号", trigger: "blur" },
diff --git a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue
index 44f3277c30..a9ccc7f8c4 100644
--- a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue
+++ b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue
@@ -1,48 +1,44 @@
 <template>
   <div class="app-container">
     <div v-show="viewState ==1">
-      <div class="tab-header webtop">
-        <div>挂靠公司管理</div>
-        <div>
-          <el-button type="primary" size="small" @click="handleCreate()">新建</el-button>
-          <el-button type="primary" size="small" @click="handleUpdate()">编辑</el-button>
-          <el-button type="danger" size="small" @click="handleDelete()">删除</el-button>
-          <el-button type="primary" size="small" @click="handleDaoChu()">导出</el-button>
-          <el-button type="info" size="small">关闭</el-button>
+      <button-bar view-title="挂靠公司管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="企业名称">
+                <el-input v-model="listQuery.params.orgName" placeholder="请输入企业名称" clearable class="filter-item"/>
+              </el-form-item>
+              <el-form-item label="状态">
+                <el-select v-model="listQuery.params.state" class="filter-item" clearable placeholder="请选择状态">
+                  <el-option v-for="item in states" :key="item.value" :label="item.label" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" @click="handleFilter">查询</el-button>
+              <el-button type="primary" @click="handleReset">重置</el-button>
+            </div>
+          </div>
         </div>
-      </div>
-      <div class="searchcon">
-        <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
-        <div v-show="isSearchShow" class="search">
-          <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
-            <el-form-item label="企业名称">
-              <el-input v-model="listQuery.params.orgName" placeholder="请输入企业名称" clearable class="filter-item"/>
-            </el-form-item>
-            <el-form-item label="状态">
-              <el-select v-model="listQuery.params.state" class="filter-item" clearable placeholder="请选择状态">
-                <el-option v-for="item in states" :key="item.value" :label="item.label" :value="item.value"/>
-              </el-select>
-            </el-form-item>
-            <el-button type="primary" @click="handleFilter">查询</el-button>
-            <el-button type="primary" @click="handleReset">重置</el-button>
-          </el-form>
+        <div class="listtop">
+          <div class="tit">挂靠公司信息列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+                  :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
-      </div>
-      <div class="listtop">
-        <div class="tit">挂靠公司信息列表</div>
-        <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
-      </div>
-      <div class="">
-        <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
-          <el-table-column width="50px" type="selection" align="center"/>
-          <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
-          <el-table-column label="企业名称" align="center">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.orgName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="登记注册号码" align="center">
-            <template slot-scope="scope">
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
+                    @selection-change="handleSelectionChange">
+            <el-table-column width="50px" type="selection" align="center"/>
+            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="企业名称" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.orgName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="登记注册号码" align="center">
+              <template slot-scope="scope">
               <span>{{ scope.row.registNum }}</span>
             </template>
           </el-table-column>
@@ -66,18 +62,20 @@
               <span class="bluezi" @click="handleRenwu(row)">{{ scope.row.code }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="250px" class-name="small-padding fixed-width">
-            <template slot-scope="{row}">
-              <!-- <el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button> -->
-              <el-button size="mini" type="primary" @click="handleShenHeLiuCheng(row)">发起审核流程</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div class="pages">
-        <div class="tit"/>
-        <!-- 翻页 -->
-        <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+            <el-table-column label="操作" align="center" width="250px" class-name="small-padding fixed-width">
+              <template slot-scope="{row}">
+                <!-- <el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button> -->
+                <el-button size="mini" type="primary" @click="handleShenHeLiuCheng(row)">发起审核流程</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+                      :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
       </div>
     </div>
     <guakaogongsiAdd v-show="viewState == 2 || viewState ==3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
@@ -86,19 +84,22 @@
 </template>
 
 <script>
-import { pagerList, deleteBySids } from '@/api/jichuxinxi/baseaffiliatcompany'
-import { setuser } from '@/utils/baocun'
+import {deleteBySids, pagerList} from '@/api/jichuxinxi/baseaffiliatcompany'
+import {setuser} from '@/utils/baocun'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import guakaogongsiAdd from './guakaogongsiAdd.vue'
 import guakaogongsiInfo from './guakaogongsiInfo.vue'
+import ButtonBar from '@/components/ButtonBar/index.vue'
+
 export default {
   name: 'Guakaogongsiguanli',
   components: {
     Pagination,
     pageye,
     guakaogongsiAdd,
-    guakaogongsiInfo
+    guakaogongsiInfo,
+    ButtonBar
   },
 
   data() {
@@ -107,17 +108,44 @@ export default {
       searchxianshitit: '显示查询条件',
       viewState: 1,
       // --按钮菜单-------
-      menuState: {
-        add: false, // 添加
-        edit: false, // 编辑
-        delete: false, // 删除
-        view: false, // 查看
-        audit: false, // 审核
-        input: false, // 导入
-        output: false, // 导出
-        upload: false, // 同步
-        release: false // 下发
-      },
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'build',
+          btnLabel: '导出'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
       // 查询 -----------
       tableKey: 0,
       sids: [],
@@ -141,6 +169,9 @@ export default {
       states: []
     }
   },
+  mounted() {
+    this.$refs["btnbar"].setButtonList(this.btnList)
+  },
   created() {
     // 初始化变量
     this.init()
@@ -169,6 +200,28 @@ export default {
       //   }
       // })
     },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'toEdit':
+          this.toEdit()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doExport':
+          this.doExport()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
     // 序号
     indexMethod(index) {
       var pagestart = (this.listQuery.current - 1) * this.listQuery.size
@@ -223,7 +276,7 @@ export default {
       console.log('this.sids000000', this.sdies)
     },
     // 打开添加
-    handleCreate() {
+    toAdd() {
       // this.$router.push({
       //   path: '/guakaogongsi/guakaogongsiAdd/0'
       // })
@@ -231,7 +284,7 @@ export default {
       this.$refs['divAdd'].showAdd()
     },
     // 打开修改
-    handleUpdate() {
+    toEdit() {
       if (this.sids.length === 1) {
         this.dialogStatus = 'update'
         this.viewState = 3
@@ -266,7 +319,7 @@ export default {
       this.$refs['divInfo'].showInfo(scope.sid)
     },
     // 根据本行ID删除数据
-    handleDelete() {
+    doDel() {
       if (this.sdies.length > 0) {
         deleteBySids(this.sdies).then((response) => {
           console.log('3455', response)
@@ -300,7 +353,7 @@ export default {
       this.viewState = 1
     },
     // 导出
-    handleDaoChu(row) {
+    doExport(row) {
       this.$confirm('确定要导出数据, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -343,6 +396,11 @@ export default {
       //   })
       // })
     },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route);
+      this.$router.go(-1)
+    }
+
   },
 }
 </script>
@@ -368,4 +426,18 @@ export default {
 .searchli {
   padding: 5px 100px;
 }
+.btn {
+  padding: 15px 0 15px 0;
+  border: 1px solid #e0e3eb;
+}
+
+.tab-header {
+  background-color: #edf1f7;
+  padding: 8px 20px;
+  margin-bottom: 0 !important;
+}
+
+.tab-header /deep/ .el-form-item {
+  margin-bottom: 10px;
+}
 </style>
diff --git a/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangAdd.vue b/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangAdd.vue
index eaf7dc9fff..cb59c7465f 100644
--- a/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangAdd.vue
+++ b/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangAdd.vue
@@ -215,7 +215,11 @@
             <span>使用组织<span style="color: red">*</span></span>
           </el-col>
           <el-col :span="8">
-            <el-input v-model="temp.useOrgName" maxlength="18" placeholder="" class="addinputw" clearable readonly/>
+            <el-select v-model="useOrgValue" collapse-tags multiple placeholder="请选择" filterable clearable class="addinputw"
+                       @change="getuseOrg">
+              <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+            </el-select>
+<!--            <el-input v-model="temp.useOrgName" maxlength="18" placeholder="" class="addinputw" clearable readonly/>-->
 <!--            <el-form-item prop="useOrgArry">-->
 <!--              <el-cascader v-model="useOrgArry" class="addinputw" @change="usrOrgArryChange" :options="options" :props="props"/>-->
 <!--            </el-form-item>-->
@@ -558,6 +562,7 @@ import { namesDownBySid } from '@/api/jichuxinxi/basevehiclemodel'
 import { getNamesDownes } from '@/api/jichuxinxi/basemanufacturer' // 所属厂商模糊查询
 import { postDownload } from '@/api/business/beiAn'
 import multifileUpload from '@/components/uploadFile/multifileUpload.vue'
+import {getListOrg} from "@/api/jichuxinxi/brandManagement";
 export default {
   name: 'jingxiaoshangAdd',
   components: {
@@ -596,6 +601,8 @@ export default {
     return {
       viewTitle: '',
       status: '',
+      useOrgValue: [],
+      useOrg_list: [], //分公司
       distributorLevel: [],
       distributorType: [],
       distributorType1: [],
@@ -639,7 +646,7 @@ export default {
         registeredCapitalOrgValue: '',
         remarks: '',
         setUpTime: '',
-        useOrg: window.sessionStorage.getItem('orgSidPath'),
+        useOrgSid: '',
         useOrgName: window.sessionStorage.getItem('orgNamePath'),
         userSid: window.sessionStorage.getItem('userSid'),
         zipCode: '',
@@ -727,6 +734,7 @@ export default {
       this.getbie()
       this.getlei()
       this.getChangshang()
+      this.getListOrgAll()
     },
     showAdd() {
       this.viewTitle = '【新增】经销商信息'
@@ -749,6 +757,11 @@ export default {
           } else {
             this.temp = res.data
           }
+          if (this.temp.useOrgSid.search(',') == '-1') {
+            this.useOrgValue = this.temp.useOrgSid.split(" ")
+          } else {
+            this.useOrgValue = this.temp.useOrgSid.split(",")
+          }
         }
       })
     },
@@ -925,6 +938,32 @@ export default {
       this.gerentemp.county = bb.name
       this.deCode.push(bb.districtCode)
     },
+    // 所有分公司-下拉
+    getListOrgAll() {
+      getListOrg().then((res) => {
+        if (res.success) {
+          this.useOrg_list = res.data
+          console.log('所有分公司',this.useOrg_list)
+        }
+      })
+    },
+    getuseOrg(val) {
+      console.log('选择的使用组织', val)
+      let choosetItem = []
+      val.forEach((ele) => {
+        choosetItem = this.useOrg_list.filter((item) => ele == item.sid)
+      })
+      console.log('chooseItem', choosetItem)
+      const useOrgSid = []
+      const useOrgName = []
+      choosetItem.forEach((e) => {
+        useOrgSid.push(e.sid)
+        useOrgName.push(e.name)
+      })
+      this.temp.useOrgSid = useOrgSid.join()
+      this.temp.useOrgName = useOrgName.join()
+      console.log('使用组织name：', this.temp.useOrgName, '使用组织sid：', this.temp.useOrgSid)
+    },
     // 返回
     handleReturn(isreload) {
       this.temp = {
@@ -951,7 +990,7 @@ export default {
         registeredCapitalOrg: '',
         remarks: '',
         setUpTime: '',
-        useOrg: window.sessionStorage.getItem('orgSidPath'),
+        useOrgSid: '',
         useOrgName: window.sessionStorage.getItem('orgNamePath'),
         userSid: window.sessionStorage.getItem('userSid'),
         zipCode: '',
diff --git a/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangguanli.vue b/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangguanli.vue
index c49418f068..1a8a2ed2c3 100644
--- a/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangguanli.vue
+++ b/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangguanli.vue
@@ -1,49 +1,46 @@
 <template>
   <div class="app-container">
     <div v-show="viewState ==1">
-      <div class="tab-header webtop">
-        <div>经销商管理</div>
-        <div>
-          <el-button type="primary" size="small" @click="handleCreate()">新建</el-button>
-          <el-button type="primary" size="small" @click="handleUpdate()">编辑</el-button>
-          <el-button type="danger" size="small" @click="handleDelete()">删除</el-button>
-          <el-button type="danger" size="small">下线</el-button>
-          <el-button type="success" size="small" @click="handleDaoChu()">导出</el-button>
-          <el-button type="info" size="small">关闭</el-button>
-        </div>
-      </div>
-      <div class="searchcon">
-        <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
-        <div v-show="isSearchShow" class="search">
-          <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
-            <el-form-item label="经销商名称">
-              <el-input v-model="listQuery.params.distributorName" placeholder="请输入经销商名称" clearable class="filter-item" />
-            </el-form-item>
-            <el-form-item label="审核状态">
-              <el-select v-model="listQuery.params.type" class="filter-item" clearable placeholder="请选择审核状态" style="width: 200px;">
-                <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
+      <button-bar view-title="经销商管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="经销商名称">
+                <el-input v-model="listQuery.params.distributorName" placeholder="请输入经销商名称" clearable
+                          class="filter-item"/>
+              </el-form-item>
+              <el-form-item label="审核状态">
+                <el-select v-model="listQuery.params.type" class="filter-item" clearable placeholder="请选择审核状态"
+                           style="width: 200px;">
+                  <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value"/>
+                </el-select>
             </el-form-item>
-            <el-button type="primary" size="small" @click="handleFilter">查询</el-button>
-            <el-button type="primary" size="small" @click="handleFilter">重置</el-button>
           </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" @click="handleFilter">查询</el-button>
+              <el-button type="primary" @click="handleReset">重置</el-button>
+            </div>
         </div>
       </div>
-      <div class="listtop">
-        <div class="tit">经销商信息列表</div>
-        <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.pageSize" class="pagination" @pagination="getList" />
-      </div>
-      <div class="">
-        <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
-          <el-table-column width="50px" type="selection" align="center" />
-          <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
-          <el-table-column label="经销商名称" align="center">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.distributorName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="经销商属性" align="center">
-            <template slot-scope="scope">
+        <div class="listtop">
+          <div class="tit">经销商信息列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+                  :limit.sync="listQuery.pageSize" class="pagination" @pagination="getList"/>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
+                    @selection-change="handleSelectionChange">
+            <el-table-column width="50px" type="selection" align="center"/>
+            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="经销商名称" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.distributorName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="经销商属性" align="center">
+              <template slot-scope="scope">
               <span>{{ scope.row.distributorClassificationValue}}</span>
             </template>
           </el-table-column>
@@ -67,12 +64,14 @@
               <span>{{ scope.row.code }}</span>
             </template>
           </el-table-column>
-        </el-table>
-      </div>
-      <div class="pages">
-        <div class="tit" />
-        <!-- 翻页 -->
-        <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+                      :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
       </div>
     </div>
     <jingxiaoshangAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
@@ -83,9 +82,11 @@
 <script>
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
-import { pagerList, deleteBySids, basefinbankExportExcel } from '@/api/business/jingXiaoShangGuanLi'
+import {basefinbankExportExcel, deleteBySids, pagerList} from '@/api/business/jingXiaoShangGuanLi'
 import jingxiaoshangAdd from './jingxiaoshangAdd.vue'
 import jingxiaoshangInfo from './jingxiaoshangInfo.vue'
+import ButtonBar from '@/components/ButtonBar/index.vue'
+
 export default {
   name: 'Jingxiaoshangguanli',
   components: {
@@ -93,11 +94,50 @@ export default {
     pageye,
     jingxiaoshangAdd,
     jingxiaoshangInfo,
+    ButtonBar
   },
   data() {
     return {
       isSearchShow: false,
       searchxianshitit: '显示查询条件',
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'build',
+          btnLabel: '导出'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
       viewState: 1,
       sids: [],
       tableKey: 0,
@@ -116,6 +156,9 @@ export default {
       rules: {}
     }
   },
+  mounted() {
+    this.$refs["btnbar"].setButtonList(this.btnList)
+  },
   created() {
     // 加载列表
     this.getList()
@@ -136,6 +179,28 @@ export default {
       var pageindex = index + 1 + pagestart
       return pageindex
     },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'toEdit':
+          this.toEdit()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doExport':
+          this.doExport()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
     // 查询列表信息
     getList() {
       this.listLoading = true
@@ -155,8 +220,18 @@ export default {
       this.listQuery.current = 1
       this.getList()
     },
+    // 重置
+    handleReset() {
+      this.listQuery = {
+        params: {},
+        current: 1,
+        size: 10,
+        total: 0
+      }
+      this.getList()
+    },
     // 打开添加对话框
-    handleCreate() {
+    toAdd() {
       this.viewState = 2
       this.$refs['divAdd'].showAdd()
     },
@@ -168,7 +243,7 @@ export default {
       this.sids = aa
     },
     // 打开修改
-    handleUpdate() {
+    toEdit() {
       if (this.sids.length === 1) {
         this.viewState = 3
         this.$refs['divAdd'].showEdit(this.sids)
@@ -195,7 +270,7 @@ export default {
       this.$refs['divInfo'].showInfo(row)
     },
     // 根据本行ID删除数据
-    handleDelete() {
+    doDel() {
       if (this.sids.length > 0) {
         deleteBySids(this.sids).then((response) => {
           if (response.code === '200') {
@@ -228,7 +303,7 @@ export default {
       this.viewState = 1
     },
     // 导出
-    handleDaoChu() {
+    doExport() {
       basefinbankExportExcel(this.sids).then((res) => {
         const blob = new Blob([res], {
           type: 'application/vnd.ms-excel'
@@ -278,7 +353,12 @@ export default {
       //     message: '已取消'
       //   })
       // })
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route);
+      this.$router.go(-1)
     }
+
   }
 }
 </script>
@@ -313,4 +393,18 @@ export default {
 .pagination {
   margin-bottom: -10px;
 }
+.btn {
+  padding: 15px 0 15px 0;
+  border: 1px solid #e0e3eb;
+}
+
+.tab-header {
+  background-color: #edf1f7;
+  padding: 8px 20px;
+  margin-bottom: 0 !important;
+}
+
+.tab-header /deep/ .el-form-item {
+  margin-bottom: 10px;
+}
 </style>
diff --git a/anrui-base/anrui-base-ui/src/views/login/login.vue b/anrui-base/anrui-base-ui/src/views/login/login.vue
index 6f588d38a2..040125491a 100644
--- a/anrui-base/anrui-base-ui/src/views/login/login.vue
+++ b/anrui-base/anrui-base-ui/src/views/login/login.vue
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { login, imgCode } from '@/api/user1.js'
+import { login, imgCode } from '@/api/user.js'
 import user from '@/api/User/login.js'
 import { setToken, getToken, setSession } from '@/utils/auth'
 import imgCodeRole from '@/components/imgCodeRole/index.vue'
diff --git a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue
index c74eff4dc1..7e6002df3f 100644
--- a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue
+++ b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <div class="tab-header webtop">
-      <div v-if="stateId==='0'">新增品牌</div>
-      <div v-else>修改品牌</div>
+      <div v-if="stateId==='0'">【新增】品牌</div>
+      <div v-else>【修改】品牌</div>
       <div>
         <el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
         <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
@@ -54,10 +54,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item prop="useOrgArry">
+            <el-form-item prop="useOrg">
               <span slot="label">使用组织：</span>
-              <el-cascader v-model="useOrgArry" class="addinputw" @change="usrOrgArryChange" :options="options"
-                :props="props" />
+              <el-select v-model="useOrgValue" multiple placeholder="请选择" filterable clearable class="addinputw"
+                         @change="getuseOrg">
+                <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+              </el-select>
+              <!--              <el-cascader v-model="useOrgArry" class="addinputw" @change="usrOrgArryChange" :options="options"-->
+              <!--                :props="props" />-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -67,185 +71,213 @@
 </template>
 
 <script>
-  import {
-    mapGetters
-  } from 'vuex'
-  // import {
-  //   getServiceTypeList,
-  //   getServiceTypePageList,
-  //   addServiceType,
-  //   getServiceType,
-  //   editServiceType,
-  //   delServiceType,
-  // } from "@/api/yanglao/serviceType";
-  // import { getFileType, parseDate, parseTime, ConvertMenuState } from "@/utils";
-  // import { selectListOrg } from '@/api/jichuxinxi/basemanufacturer'
-  import {
-    pagerList,
-    SaveList,
-    Update,
-    deleteBySids,
-    details,
-    dictType,
-    selectListOrg,
-    namesDown
-  } from '@/api/jichuxinxi/brandManagement'
-  export default {
-    name: 'PinpaiAdd',
-    // components: {  },
-    data() {
-      var validCascader = (rule, value, callback) => {
-        if (this.useOrgArry.length == 0) {
-          callback(new Error('请填写使用组织'))
-        } else {
-          callback();
+import {mapGetters} from 'vuex'
+// import {
+//   getServiceTypeList,
+//   getServiceTypePageList,
+//   addServiceType,
+//   getServiceType,
+//   editServiceType,
+//   delServiceType,
+// } from "@/api/yanglao/serviceType";
+// import { getFileType, parseDate, parseTime, ConvertMenuState } from "@/utils";
+// import { selectListOrg } from '@/api/jichuxinxi/basemanufacturer'
+import {
+  details,
+  dictType,
+  getListOrg,
+  namesDown,
+  SaveList,
+  selectListOrg,
+  Update
+} from '@/api/jichuxinxi/brandManagement'
+
+export default {
+  name: 'PinpaiAdd',
+  // components: {  },
+  data() {
+    var validCascader = (rule, value, callback) => {
+      if (this.useOrgArry.length == 0) {
+        callback(new Error('请填写使用组织'))
+      } else {
+        callback();
+      }
+    };
+    return {
+      // --按钮菜单-------
+      menuState: {
+        add: false, // 添加
+        edit: false, // 编辑
+        delete: false, // 删除
+        view: false, // 查看
+        audit: false, // 审核
+        input: false, // 导入
+        output: false, // 导出
+        upload: false, // 同步
+        release: false // 下发
+      },
+      dataArr: [],
+      FormLoading: false,
+      listLoading: false,
+      temp: {}, // 添加和修改
+      useOrgArry: [],
+      useOrg_list: [], //分公司
+      templook: {}, // 查看实体
+      textMap: {
+        update: '修改',
+        create: '创建'
+      },
+      stateId: 0,
+      dialogFormVisible: false, // 添加修改对话框状态
+      dialogFormShowVisible: false, // 查看对话框默认关闭状态
+      dialogStatus: '', // 对话框状态
+      fenzuOptions: [],
+      rules: {
+        brandCode: [{
+          required: true,
+          message: '请填写品牌编码',
+          trigger: 'blur'
+        }],
+        brandName: [{
+          required: true,
+          message: '请填写品牌名称',
+          trigger: 'blur'
+        }],
+        brandType: [{
+          required: true,
+          message: '请选择品牌类型',
+          trigger: 'blur'
+        }],
+        isValidity: [{
+          required: true,
+          message: '请选择是否有效',
+          trigger: 'blur'
+        }],
+        manufacturerSid: [{
+          required: true,
+          message: '请选择厂商名称',
+          trigger: 'blur'
+        }],
+        useOrgArry: [{
+          required: true,
+          validator: validCascader,
+          trigger: "change"
+        }],
+      },
+      // brandType: null,
+      brandType: 'brandType',
+      brand: [],
+      modelValue: [],
+      modelValue2: [],
+      useOrgValue: [],
+      isValiditys: [{
+        dictValue: '是',
+        sid: '1'
+      },
+        {
+          dictValue: '否',
+          sid: '2'
         }
-      };
-      return {
-        // --按钮菜单-------
-        menuState: {
-          add: false, // 添加
-          edit: false, // 编辑
-          delete: false, // 删除
-          view: false, // 查看
-          audit: false, // 审核
-          input: false, // 导入
-          output: false, // 导出
-          upload: false, // 同步
-          release: false // 下发
-        },
-        dataArr: [],
-        FormLoading: false,
-        listLoading: false,
-        temp: {}, // 添加和修改
-        useOrgArry: [],
-        templook: {}, // 查看实体
-        textMap: {
-          update: '修改',
-          create: '创建'
-        },
-        stateId: 0,
-        dialogFormVisible: false, // 添加修改对话框状态
-        dialogFormShowVisible: false, // 查看对话框默认关闭状态
-        dialogStatus: '', // 对话框状态
-        fenzuOptions: [],
-        rules: {
-          brandCode: [{
-            required: true,
-            message: '请填写品牌编码',
-            trigger: 'blur'
-          }],
-          brandName: [{
-            required: true,
-            message: '请填写品牌名称',
-            trigger: 'blur'
-          }],
-          brandType: [{
-            required: true,
-            message: '请选择品牌类型',
-            trigger: 'blur'
-          }],
-          isValidity: [{
-            required: true,
-            message: '请选择是否有效',
-            trigger: 'blur'
-          }],
-          manufacturerSid: [{
-            required: true,
-            message: '请选择厂商名称',
-            trigger: 'blur'
-          }],
-          useOrgArry: [{
-           required: true,
-           validator: validCascader,
-           trigger: "change"
-          }],
-        },
-        // brandType: null,
-        brandType: 'brandType',
-        brand: [],
-        modelValue: [],
-        modelValue2: [],
-        isValiditys: [{
-            dictValue: '是',
-            sid: '1'
-          },
-          {
-            dictValue: '否',
-            sid: '2'
+      ],
+      options: [],
+      useOrg: [],
+      props: {
+        value: 'sid',
+        label: 'name',
+        children: 'children',
+        // checkStrictly: true,
+        multiple: true
+      },
+      supplierType: []
+      // ------------------------------------
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'id',
+      'roles',
+      'rolesIds',
+      'departmentId',
+      'departmentCode'
+    ])
+  },
+  created() {
+    // 初始化变量
+    this.init()
+    this.geTName()
+    this.getZuZhi()
+    this.getListOrgAll()
+    // 加载列表
+    // this.getList()
+  },
+  methods: {
+    init() {
+      this.stateId = this.$route.params.id
+      if (this.stateId !== '0') {
+        details(this.stateId).then((response) => {
+          if (response.code === '200') {
+            this.temp = response.data
+            // this.useOrgArry = response.data.useOrg
+            if (this.temp.useOrg.search(',') == '-1') {
+              this.useOrgValue = this.temp.useOrg.split(" ")
+            } else {
+              this.useOrgValue = this.temp.useOrg.split(",")
+            }
           }
-        ],
-        options: [],
-        useOrg: [],
-        props: {
-          value: 'sid',
-          label: 'name',
-          children: 'children',
-          // checkStrictly: true,
-          multiple: true
-        },
-        supplierType: []
-        // ------------------------------------
+        })
       }
+      this.selectDict()
     },
-    computed: {
-      ...mapGetters([
-        'id',
-        'roles',
-        'rolesIds',
-        'departmentId',
-        'departmentCode'
-      ])
+    // ----------------------------------方法--------------------
+    // 返回
+    handleReturn() {
+      this.$router.go(-1)
     },
-    created() {
-      // 初始化变量
-      this.init()
-      this.geTName()
-      this.getZuZhi()
-      // 加载列表
-      // this.getList()
+    // 所有分公司
+    getListOrgAll() {
+      getListOrg().then((res) => {
+        if (res.success) {
+          this.useOrg_list = res.data
+        }
+      })
     },
-    methods: {
-      init() {
-        this.stateId = this.$route.params.id
-        if (this.stateId !== '0') {
-          details(this.stateId).then((response) => {
-            if (response.code === '200') {
-              if (response.data.useOrg) {
-                this.useOrgArry = response.data.useOrg
-                // console.log('8888888888888888',response.data.useOrgArry)
-              }
-              this.temp = response.data
-              console.log(this.temp, 555555555555)
-            }
-          })
+    getuseOrg(val) {
+      console.log('选择的使用组织', val,this.useOrg_list)
+      var choosetItem = []
+      val.forEach((ele) => {
+        console.log('111222333',ele)
+        choosetItem.push(this.useOrg_list.filter((item) => ele == item.sid)[0])
+      })
+      console.log('使用组织chooseItem', choosetItem)
+      const useOrgName = []
+      choosetItem.forEach((e) => {
+        useOrgName.push(e.name)
+      })
+      console.log('所选组织名字数组', useOrgName)
+      this.temp.useOrg = val.join()
+      this.temp.useOrgName = useOrgName.join()
+      console.log('使用组织name：', this.temp.useOrgName, '使用组织sid：', this.temp.useOrg)
+    },
+
+    selectDict() {
+      dictType({
+        psid: 0,
+        type: 'brandType'
+      }).then((response) => {
+        if (response.code === '200') {
+          this.brand = response.data
         }
-        this.selectDict()
-      },
-      // ----------------------------------方法--------------------
-      // 返回
-      handleReturn() {
-        this.$router.go(-1)
-      },
-      selectDict() {
-        dictType({
-          psid: 0,
-          type: 'brandType'
-        }).then((response) => {
-          if (response.code === '200') {
-            this.brand = response.data
-          }
-        })
-      },
-      usrOrgArryChange(e) {
-        console.log('选中结果：' + JSON.stringify(e))
-        var result = ''
-        if (e.length > 0) {
-          // 循环多选项
-          e.forEach((item) => {
-            var last_id = item[item.length - 1]
-            // console.log('options：'+JSON.stringify(this.options))
-            // 循环查找名字
+      })
+    },
+    usrOrgArryChange(e) {
+      console.log('选中结果：' + JSON.stringify(e))
+      var result = ''
+      if (e.length > 0) {
+        // 循环多选项
+        e.forEach((item) => {
+          var last_id = item[item.length - 1]
+          // console.log('options：'+JSON.stringify(this.options))
+          // 循环查找名字
             this.select_temp = '' // 临时遍历，用来保存选中结果
             this.findOrgId(last_id, this.options)
             result = result + this.select_temp + ','
@@ -287,12 +319,14 @@
       },
       zuzhi0(data) {
         data.forEach((e) => {
-          if (e.children.length != 0) {
-            this.zuzhi0(e.children)
-          } else {
-            delete e.children
-            this.dataArr.push(e)
-            return
+          if (e.children) {
+            if (e.children.length != 0) {
+              this.zuzhi0(e.children)
+            } else {
+              delete e.children
+              this.dataArr.push(e)
+              return
+            }
           }
         })
       },
@@ -320,6 +354,7 @@
       },
       // 提交添加数据
       handleCreate() {
+        console.log('已选择的组织', this.useOrgValue)
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
             this.FormLoading = true
@@ -351,15 +386,15 @@
               //   useOrg2 = abc.toString()
               //   this.useOrgArry = useOrg2
               // }
-              if (this.useOrgArry) {
-                var abc = []
-                this.useOrgArry.forEach((e) => {
-                  console.log('77777777', e)
-                  abc.push(e[e.length - 1])
-                })
-                this.temp.useOrg = abc.toString()
-                console.log('abcabc', this.temp.useOrg)
-              }
+              // if (this.useOrgArry) {
+              //   var abc = []
+              //   this.useOrgArry.forEach((e) => {
+              //     console.log('77777777', e)
+              //     abc.push(e[e.length - 1])
+              //   })
+              //   this.temp.useOrg = abc.toString()
+              //   console.log('abcabc', this.temp.useOrg)
+              // }
               console.log(123456789)
               SaveList(this.temp).then((response) => {
                 console.log(123)
@@ -379,15 +414,15 @@
                 }
               })
             } else {
-              if (this.useOrgArry) {
-                var abc = []
-                this.useOrgArry.forEach((e) => {
-                  console.log('77777777', e)
-                  abc.push(e[e.length - 1])
-                })
-                this.temp.useOrg = abc.toString()
-                console.log('abcabc', this.temp.useOrg)
-              }
+              // if (this.useOrgArry) {
+              //   var abc = []
+              //   this.useOrgArry.forEach((e) => {
+              //     console.log('77777777', e)
+              //     abc.push(e[e.length - 1])
+              //   })
+              //   this.temp.useOrg = abc.toString()
+              //   console.log('abcabc', this.temp.useOrg)
+              // }
               this.temp.sid = this.stateId
               Update(this.temp).then((response) => {
                 console.log('返回值:', response)
diff --git a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiguanli.vue b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiguanli.vue
index f0bf6e89b5..c9f1d111d7 100644
--- a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiguanli.vue
+++ b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiguanli.vue
@@ -1,137 +1,117 @@
 <template>
   <div class="app-container">
-    <div class="tab-header webtop">
-      <div>品牌管理</div>
-      <div>
-        <el-button type="primary" size="small" @click="handleCreate()">新增</el-button>
-        <el-button type="primary" size="small" @click="handleUpdate()">修改</el-button>
-        <el-button type="danger" size="small" @click="handleDelete()">删除</el-button>
-        <!-- <el-button type="success" size="small" @click="handleDaoRu()">导入</el-button> -->
-        <el-button type="success" size="small" @click="handleDaoChu()">导出</el-button>
-      </div>
-    </div>
-    <div class="searchcon">
-      <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
-      <div v-show="isSearchShow" class="search">
-        <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
-          <div class="searchli">
-            <el-form-item label="厂商名称">
-              <el-autocomplete v-model="listQuery.manufacturerName" :fetch-suggestions="querySearchAsync1" style="width: 300px" placeholder="请输入厂商名称" @select="handleSelect1">
-                <i slot="suffix" class="el-icon-edit el-input__icon" @click="inputclear1" />
-                <template slot-scope="{ item }">
-                  <div style="paddingg:5px;background-color:Azure;">
-                    <span>厂商名称：</span>
-                    <span style="color:red">{{ item.manufacturerName }} </span><br>
-                  </div>
-                </template>
-              </el-autocomplete>
-            </el-form-item>
-            <el-form-item label="品牌名称">
-              <!-- <el-input v-model="listQuery.brandName" placeholder="请输入品牌名称" clearable class="filter-item" /> -->
-              <el-autocomplete v-model="listQuery.brandName" :fetch-suggestions="querySearchAsync" style="width: 300px" placeholder="请输入品牌名称" @select="handleSelect">
-                <i slot="suffix" class="el-icon-edit el-input__icon" @click="inputclear" />
-                <template slot-scope="{ item }">
-                  <div style="paddingg:5px;background-color:Azure;">
-                    <span>品牌名称：</span>
-                    <!-- <span style="color:red">{{ item.brandName }} (<span style="color:green">{{ item.sid }}</span>) </span><br> -->
-                    <span style="color:red">{{ item.brandName }} </span><br>
-                  </div>
-                </template>
-              </el-autocomplete>
-            </el-form-item>
+    <button-bar view-title="品牌管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+    <div class="main-content">
+      <div class="searchcon">
+        <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+        <div v-show="isSearchShow" class="search">
+          <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+            <div class="searchli">
+              <el-form-item label="厂商名称">
+                <el-autocomplete v-model="listQuery.manufacturerName" :fetch-suggestions="querySearchAsync1"
+                                 style="width: 300px" placeholder="请输入厂商名称" @select="handleSelect1">
+                  <i slot="suffix" class="el-icon-edit el-input__icon" @click="inputclear1"/>
+                  <template slot-scope="{ item }">
+                    <div style="paddingg:5px;background-color:Azure;">
+                      <span>厂商名称：</span>
+                      <span style="color:red">{{ item.manufacturerName }} </span><br>
+                    </div>
+                  </template>
+                </el-autocomplete>
+              </el-form-item>
+              <el-form-item label="品牌名称">
+                <!-- <el-input v-model="listQuery.brandName" placeholder="请输入品牌名称" clearable class="filter-item" /> -->
+                <el-autocomplete v-model="listQuery.brandName" :fetch-suggestions="querySearchAsync"
+                                 style="width: 300px" placeholder="请输入品牌名称" @select="handleSelect">
+                  <i slot="suffix" class="el-icon-edit el-input__icon" @click="inputclear"/>
+                  <template slot-scope="{ item }">
+                    <div style="paddingg:5px;background-color:Azure;">
+                      <span>品牌名称：</span>
+                      <!-- <span style="color:red">{{ item.brandName }} (<span style="color:green">{{ item.sid }}</span>) </span><br> -->
+                      <span style="color:red">{{ item.brandName }} </span><br>
+                    </div>
+                  </template>
+                </el-autocomplete>
+              </el-form-item>
+            </div>
+          </el-form>
+          <div class="btn" style="text-align: center;">
             <el-button type="primary" @click="handleFilter">查询</el-button>
+            <el-button type="primary" @click="handleReset">重置</el-button>
           </div>
-          <!-- <div class="searchli">
-            <el-form-item label="首字母检索">
-              <el-radio-group v-model="listQuery.manage" size="mini">
-                <el-radio-button label="A" />
-                <el-radio-button label="B" />
-                <el-radio-button label="C" />
-                <el-radio-button label="D" /><el-radio-button label="E" /><el-radio-button label="F" /><el-radio-button label="G" />
-                <el-radio-button label="H" /><el-radio-button label="I" /><el-radio-button label="J" /><el-radio-button label="K" />
-                <el-radio-button label="L" /><el-radio-button label="M" /><el-radio-button label="N" /><el-radio-button label="O" />
-                <el-radio-button label="P" /><el-radio-button label="Q" /><el-radio-button label="R" /><el-radio-button label="S" />
-                <el-radio-button label="T" /><el-radio-button label="U" /><el-radio-button label="V" /><el-radio-button label="W" />
-                <el-radio-button label="X" /><el-radio-button label="Y" /><el-radio-button label="Z" />
-              </el-radio-group>
-            </el-form-item>
-
-          </div> -->
-
-        </el-form>
+        </div>
       </div>
-    </div>
-    <div class="listtop">
-      <div class="tit">品牌信息列表</div>
-      <!-- <pageye v-show="total>0" :total="total" :page.sync="listQuery.pageNumber" :limit.sync="listQuery.pageSize" class="pagination" @pagination="getList" /> -->
-      <pageye v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
-    </div>
-    <div class="listcon">
-      <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change=" handleSelectionChange">
-        <el-table-column width="50px" type="selection" align="center" />
-        <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
-        <el-table-column label="品牌名称" align="center">
-          <template slot-scope="scope">
-            <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.brandName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="品牌编码" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.brandCode }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="厂商" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.manufacturerName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="更新时间" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.modifyTime }}</span>
+      <div class="listtop">
+        <div class="tit">品牌信息列表</div>
+        <!-- <pageye v-show="total>0" :total="total" :page.sync="listQuery.pageNumber" :limit.sync="listQuery.pageSize" class="pagination" @pagination="getList" /> -->
+        <pageye v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
+                class="pagination" @pagination="getList"/>
+      </div>
+      <div class="">
+        <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
+                  @selection-change=" handleSelectionChange">
+          <el-table-column width="50px" type="selection" align="center"/>
+          <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+          <el-table-column label="品牌名称" align="center">
+            <template slot-scope="scope">
+              <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.brandName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="品牌编码" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.brandCode }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="品牌类型" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.brandTypeValue }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column width="340px" label="厂商" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.manufacturerName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column width="120px" label="是否有效" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.isValidity }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column width="160px" label="更新时间" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.modifyTime }}</span>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="操作" align="center" width="250px" class-name="small-padding fixed-width">
+          <template slot-scope="{row}">
+            <el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
           </template>
-        </el-table-column>
-        <!-- <el-table-column label="操作" align="center" width="250px" class-name="small-padding fixed-width">
-        <template slot-scope="{row}">
-          <el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
-        </template>
-      </el-table-column> -->
-      </el-table>
-    </div>
-    <div class="pages">
-      <div class="tit" />
-      <!-- 翻页 -->
-      <!-- <pagination v-show="total>0" :total="total" :page.sync="listQuery.pageNumber" :limit.sync="listQuery.pageSize" class="pagination" @pagination="getList" /> -->
-      <pagination v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
+        </el-table-column> -->
+        </el-table>
+      </div>
+      <div class="pages">
+        <div class="tit"/>
+        <!-- 翻页 -->
+        <!-- <pagination v-show="total>0" :total="total" :page.sync="listQuery.pageNumber" :limit.sync="listQuery.pageSize" class="pagination" @pagination="getList" /> -->
+        <pagination v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
+                    class="pagination" @pagination="getList"/>
 
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-// import {
-//   getServiceTypeList,
-//   getServiceTypePageList,
-//   addServiceType,
-//   getServiceType,
-//   editServiceType,
-//   delServiceType,
-// } from "@/api/yanglao/serviceType";
-// import { getFileType, parseDate, parseTime, ConvertMenuState } from "@/utils";
-// import { findButtonByUserId } from '@/api/sys/permission'
-import { getNamesDownes } from '@/api/jichuxinxi/basemanufacturer'
-import {
-  pagerList,
-  brandLike,
-  dictType,
-  deleteBySids,
-  basefinbankExportExcel
-} from '@/api/jichuxinxi/brandManagement'
+import {mapGetters} from 'vuex'
+import {getNamesDownes} from '@/api/jichuxinxi/basemanufacturer'
+import {basefinbankExportExcel, brandLike, deleteBySids, dictType, pagerList} from '@/api/jichuxinxi/brandManagement'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar/index.vue'
+
 export default {
   name: 'Pinpaiguanli',
-  components: { Pagination, pageye },
+  components: {Pagination, pageye, ButtonBar},
   // directives: {
   //   drag: {
   //     // 指令的定义
@@ -172,6 +152,44 @@ export default {
     return {
       isSearchShow: false,
       searchxianshitit: '显示查询条件',
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'build',
+          btnLabel: '导出'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
       // --按钮菜单-------
       menuState: {
         add: false, // 添加
@@ -244,6 +262,9 @@ export default {
       'departmentCode',
     ]),
   },
+  mounted() {
+    this.$refs["btnbar"].setButtonList(this.btnList)
+  },
   created() {
     // 初始化变量
     this.init()
@@ -260,8 +281,30 @@ export default {
         this.searchxianshitit = '显示查询条件'
       }
     },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'toEdit':
+          this.toEdit()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doExport':
+          this.doExport()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
     init() {
-      dictType({ psid: 0, type: 'supplierType' }).then((response) => {
+      dictType({psid: 0, type: 'supplierType'}).then((response) => {
         if (response.code === '200') {
           this.supplierType = response.data
         }
@@ -278,14 +321,7 @@ export default {
       //   }
       // })
     },
-    searchData(data) {
-      brandLike(data).then((response) => {
-        console.log(response, 7777777777)
-        if (response.code === '200') {
-          this.YongHu = response.data
-        }
-      })
-    },
+
     // 序号
     indexMethod(index) {
       //   var pagestart = (this.listQuery.pageNumber - 1) * this.listQuery.pageSize
@@ -326,6 +362,11 @@ export default {
                 e.manufacturerName = a.dictValue
               }
             })
+            if (e.isValidity == '1'){
+              e.isValidity = '是'
+            }else if (e.isValidity == '2'){
+              e.isValidity = '否'
+            }
           })
           console.log(this.list, 11111111111)
           //   setuser(response.data.records.sid)
@@ -341,7 +382,15 @@ export default {
       this.listQuery.pageNumber = 1
       this.getList()
     },
-
+    handleReset() {
+      this.listQuery = {
+        params: {},
+        current: 1,
+        size: 10,
+        total: 0
+      }
+      this.getList()
+    },
     // ----------------------------------方法--------------------
     // 添加前数据初始化
     resetTemp() {
@@ -354,6 +403,14 @@ export default {
         state: '', //	状态
       }
     },
+    searchData01(data) {
+      brandLike(data).then((response) => {
+        console.log(response, 7777777777)
+        if (response.code === '200') {
+          this.YongHu = response.data
+        }
+      })
+    },
     // 文本模糊查询
     querySearchAsync(queryString, cb) {
       console.log('查询条件：', queryString)
@@ -363,8 +420,8 @@ export default {
         queryString != undefined &&
         queryString !== ''
       ) {
-        this.searchData({ name: queryString })
-        brandLike({ name: queryString }).then((response) => {
+        this.searchData01({name: queryString})
+        brandLike({name: queryString}).then((response) => {
           if (response.code === '200') {
             response.data
             cb(response.data)
@@ -432,8 +489,8 @@ export default {
       //   this.listQuery.brandCode = ''
     },
     // 打开添加
-    handleCreate() {
-      this.$router.push({ path: '/pinpai/pinpaiAdd/0' })
+    toAdd() {
+      this.$router.push({path: '/pinpai/pinpaiAdd/0'})
     },
     // 导入
     handleDaoRu() {
@@ -493,7 +550,7 @@ export default {
       // console.log('wpwpwpw',this.daochu_user)
     },
     // 打开修改
-    handleUpdate(row) {
+    toEdit(row) {
       // this.resetTemp()
       // const tempData = Object.assign({}, row) // copy obj
       // this.FormLoading = true
@@ -575,39 +632,47 @@ export default {
       })
     },
     // 根据本行ID删除数据
-    handleDelete() {
-      if(this.sids.length>0){
-        deleteBySids(this.sids).then((response) => {
-          console.log('3455', response)
-          if (response.code === '200') {
-            this.$notify({
-              title: '提示',
-              message: '删除成功',
-              type: 'success',
-              duration: 2000,
-            })
-            this.getList()
-          } else {
-            this.$notify({
-              title: '删除失败',
-              message: response.msg,
-              type: 'error',
-            })
-          }
+    doDel() {
+      if (this.sids.length > 0) {
+        const _this = this
+        const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
+          .then(() => {
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+            deleteBySids(this.sids)
+              .then(resp => {
+                if (resp.success && resp.code == '200'){
+                  loading.close()
+                  _this.$message({ type: 'success', message: resp.msg, showClose: true })
+                  _this.getList()
+                }else {
+                  loading.close()
+                  // _this.$message({ type: 'error', message: resp.msg, showClose: true })
+                }
+              })
+              .catch(e => {
+                loading.close()
+              })
+          })
+          .catch(() => {
+          })
       }else{
-        this.$notify({
-          title: '提示',
-          message: '没有选择品牌!!',
-          type: 'error',
-          duration: 2000,
-        })
+        this.$message({ type: 'error', message: '没有选择品牌!', showClose: true })
         return
       }
 
     },
     // 导出
-    handleDaoChu() {
+    doExport() {
       // this.$confirm('确定要导出数据, 是否继续?', '提示', {
       //   confirmButtonText: '确定',
       //   cancelButtonText: '取消',
@@ -627,6 +692,10 @@ export default {
         })
       })
     },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route);
+      this.$router.go(-1)
+    }
   },
 }
 </script>
@@ -639,18 +708,31 @@ export default {
   margin: 0;
   padding: 0;
 }
+
 /deep/ .el-collapse-item__wrap {
   border-bottom: 0px solid #ebeef5;
 }
+
 /deep/ .el-collapse-item__header {
   border-bottom: 0px solid #e6ebf5;
 }
+
 .searchli {
   padding: 5px 100px;
 }
-.listcon {
-  height: calc(100vh - 430px);
-  overflow-y: auto;
-  overflow-x: hidden;
+
+.btn {
+  padding: 15px 0 15px 0;
+  border: 1px solid #e0e3eb;
+}
+
+.tab-header {
+  background-color: #edf1f7;
+  padding: 8px 20px;
+  margin-bottom: 0 !important;
+}
+
+.tab-header /deep/ .el-form-item {
+  margin-bottom: 10px;
 }
 </style>
diff --git a/anrui-base/anrui-base-ui/src/views/zifang/zifangzhengce/zifangzhengce.vue b/anrui-base/anrui-base-ui/src/views/zifang/zifangzhengce/zifangzhengce.vue
index f141c4cd0e..1c774fa435 100644
--- a/anrui-base/anrui-base-ui/src/views/zifang/zifangzhengce/zifangzhengce.vue
+++ b/anrui-base/anrui-base-ui/src/views/zifang/zifangzhengce/zifangzhengce.vue
@@ -252,13 +252,13 @@
         }
       },
       zifangmingcheng() {
-      basefinbankDnamesDown({ name: this.temp.manageName }).then((res) => {
-        if (res.code === '200') {
-          console.log(res.data, 66666666666)
-          this.manageNameType = res.data
-        }
-      })
-    },
+        basefinbankDnamesDown({ name: this.temp.manageName }).then((res) => {
+          if (res.code === '200') {
+            console.log(res.data, 66666666666)
+            this.manageNameType = res.data
+          }
+        })
+      },
       querySearchAsync(queryString, cb) {
       console.log('查询条件：', queryString)
 
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengce.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengce.vue
index e408f4fe5b..0593e4d2de 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengce.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengce.vue
@@ -7,7 +7,7 @@
           <el-button type="primary" icon="el-icon-plus" size="small" @click="handleCreate()">新增</el-button>
           <el-button type="primary" size="small">提交</el-button>
           <el-button type="danger" icon="el-icon-delete" size="small" @click="handleDelete()">删除</el-button>
-          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+          <el-button type="info" icon="el-icon-close" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
       <div class="webcon">
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue
index ee96eaa5f1..d70737c238 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue
@@ -52,7 +52,8 @@
             </el-col>
             <el-col :span="8" class="trightb">
               <el-form-item>
-                <el-input v-model="temp.projectCost" class="addinputw" placeholder="" clearable/>
+                <el-input v-model="temp.projectCost" class="addinputw" placeholder="" clearable
+                          @keyup.native="temp.projectCost = oninput(temp.projectCost,2)"/>
               </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
@@ -60,7 +61,8 @@
             </el-col>
             <el-col :span="8" class="trightb">
               <el-form-item>
-                <el-input v-model="temp.discountMoney" class="addinputw" placeholder="" clearable/>
+                <el-input v-model="temp.discountMoney" class="addinputw" placeholder="" clearable
+                          @keyup.native="temp.discountMoney = oninput(temp.discountMoney,2)"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -173,6 +175,25 @@ export default {
       })
       this.getType()
     },
+    // 输入数字正则
+    oninput(val, limit = 0) {
+      val = val.replace(/[^\d.]/g, ""); //保留数字
+      val = val.replace(/^00/, "0."); //开头不能有两个0
+      val = val.replace(/^\./g, "0."); //开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, "."); //两个以上的小数点转换成一个
+      val = val.replace(".", "$#$").replace(/\./g, "").replace("$#$", "."); //只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : ''; //两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
     showAdd() {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengInfo.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengInfo.vue
index 7b56dabac3..b4410414c1 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengInfo.vue
@@ -30,8 +30,9 @@
         <el-row>
           <el-col :span="4" class="trightb">合格证情况：</el-col>
           <el-col :span="8" class="tleft"> {{ temp.certificateSituationValue }}</el-col>
-          <el-col :span="4" class="trightb"/>
-          <el-col :span="8" class="tleft"/>
+          <el-col :span="4" class="trightb" v-show="temp.certificateStateValue == '正式'">公告型号：</el-col>
+          <el-col :span="8" class="tleft" v-show="temp.certificateStateValue == '正式'"> {{temp.noticeModel}} </el-col>
+          <el-col :span="12" v-show="temp.certificateStateValue == '虚拟'"/>
         </el-row>
         <el-row>
           <el-col :span="4" class="trightb">备注：</el-col>
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
index 6171d39537..1a31df30d8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
@@ -55,12 +55,12 @@
                 <el-button size="mini" type="primary" @click="cheLiangXiangXi(row)">车辆信息</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="合格证编号" align="center">
+            <el-table-column label="合格证编号" width="180px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.certificationNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="发证日期" align="center">
+            <el-table-column label="发证日期" width="140px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.certificateDate }}</span>
               </template>
@@ -70,12 +70,12 @@
                 <span>{{ scope.row.certificateStateValue }}</span>
               </template>
             </el-table-column>
-            <el-table-column width="160px" label="到证日期" align="center">
+            <el-table-column label="到证日期" width="140px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.toCardDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column width="160px" label="领取日期" align="center">
+            <el-table-column label="领取日期" width="140px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.receiveDate }}</span>
               </template>
@@ -85,7 +85,7 @@
                 <span>{{ scope.row.receiver }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="备注" align="center">
+            <el-table-column label="备注" width="370px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.remarks }}</span>
               </template>
@@ -193,35 +193,35 @@ export default {
         {
           type: 'primary',
           size: 'small',
-          icon: 'el-icon-plus',
+          icon: 'plus',
           btnKey: 'toAdd',
           btnLabel: '新增'
         },
         {
           type: 'primary',
           size: 'small',
-          icon: 'el-icon-edit',
+          icon: 'edit',
           btnKey: 'toEdit',
           btnLabel: '编辑'
         },
         {
           type: 'danger',
           size: 'small',
-          icon: 'el-icon-delete',
+          icon: 'del',
           btnKey: 'doDel',
           btnLabel: '删除'
         },
         {
           type: 'success',
           size: 'small',
-          icon: '',
-          btnKey: 'doExport',
+          icon: 'export',
+          btnKey: 'build',
           btnLabel: '导出'
         },
         {
           type: 'info',
           size: 'small',
-          icon: 'el-icon-close',
+          icon: 'cross',
           btnKey: 'doClose',
           btnLabel: '关闭'
         }
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue
index ecc8138cfe..e2f4b1b0e5 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue
@@ -75,7 +75,12 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12"/>
+          <el-col :span="12">
+            <el-form-item prop="receiver" v-show="temp.certificateState == '0002'">
+              <span slot="label">公告型号：</span>
+              <el-input v-model="temp.noticeModel" maxlength="125" placeholder="" class="addinputw" clearable/>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -341,7 +346,8 @@ export default {
         certificateSituationValue: '',
         certificatePhoto: [],
         certificateState: '', // 合格证状态key
-        certificateStateValue: '' // 合格证状态value
+        certificateStateValue: '', // 合格证状态value
+        noticeModel:'' // 公告型号
       }, // 添加和修改
       templook: {}, // 查看实体
       Situation: [],
@@ -377,13 +383,9 @@ export default {
         toCardDate: [
           { required: true, message: '请选择到证日期', trigger: 'blur' }
         ],
-        receiveDate: [
-          { required: true, message: '请选择领取日期', trigger: 'blur' }
+        certificateState: [
+          { required: true, message: '请选择合格证状态', trigger: 'blur' }
         ],
-        receiver: [
-          { required: true, message: '请填写领取人', trigger: 'blur' }
-        ],
-        remarks: [{ required: true, message: '请填写备注', trigger: 'blur' }]
         // certificatePhoto: [
         //   { required: true, message: '请选择合格证照片', trigger: 'blur' },
           // ],
@@ -571,6 +573,9 @@ export default {
         })
         this.temp.certificateStateValue = bb.name
         console.log('value值', this.temp.certificateStateValue)
+        if (value == '0001'){
+          this.temp.noticeModel = ''
+        }
       },
       // 合格证情况
       getQingkuang(value) {
diff --git a/anrui-system-ui/src/api/system/departments/departments.js b/anrui-system-ui/src/api/system/departments/departments.js
index 9872e1ef37..a438848fae 100644
--- a/anrui-system-ui/src/api/system/departments/departments.js
+++ b/anrui-system-ui/src/api/system/departments/departments.js
@@ -75,7 +75,7 @@ export function delOrgtree(data) {
     }
   })
 }
-// 查询主管人员分管人员
+// 查询主管人员
 export function getStaff(data) {
   return request({
     url: '/portal/v1/sysstafforg/staffinfoList',
@@ -87,6 +87,18 @@ export function getStaff(data) {
     }
   })
 }
+// 查询分管人员
+export function getStaffName(params) {
+  return request({
+    url: '/portal/v1/sysstaffinfo/getStaffName',
+    method: 'get',
+    params: params,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+}
 // 查看二维码
 export function getQrCode(data) {
   return request({
diff --git a/anrui-system-ui/src/views/organizationManage/organizationManage.vue b/anrui-system-ui/src/views/organizationManage/organizationManage.vue
index 7b32821651..425097478e 100644
--- a/anrui-system-ui/src/views/organizationManage/organizationManage.vue
+++ b/anrui-system-ui/src/views/organizationManage/organizationManage.vue
@@ -36,8 +36,12 @@
         <tr>
           <td>部门地址</td>
           <td>
-            <el-input v-model="form.addrs" style="width:300px"></el-input>
+            <el-input v-model="form.addrs" style="width:130%"></el-input>
           </td>
+          <td class="td_left"/>
+          <td class="td_left"/>
+        </tr>
+        <tr>
           <td>主管人员</td>
           <td>
             <el-select v-model="form.zgStaffSid" style="width:300px">
@@ -45,43 +49,44 @@
               </el-option>
             </el-select>
           </td>
-        </tr>
-        <tr>
+
           <td>分管人员</td>
           <td>
-            <el-select v-model="form.fgStaffSid" style="width:300px">
-              <el-option v-for="(item, i) in staffdata2" :key="i" :label="item.staffName" :value="item.staffSid">
-              </el-option>
-            </el-select>
+            <!--            <el-autocomplete v-model="listQuery.params.brand" :fetch-suggestions="querySearchAsync" class="addinputw" placeholder="请输入品牌名称" @select="handleSelect">-->
+            <!--              <i slot="suffix" class="el-icon-edit el-input__icon" @click="inputclear" />-->
+            <!--              <template slot-scope="{ item }">-->
+            <!--                <div style="paddingg:5px;background-color:Azure;">-->
+            <!--                  <span>品牌名称：</span>-->
+            <!--                  <span style="color:red">{{ item.brandName }}</span><br>-->
+            <!--                </div>-->
+            <!--              </template>-->
+            <!--            </el-autocomplete>-->
+            <!--            <el-select v-model="form.fgStaffSid" style="width:300px">-->
+            <!--              <el-option v-for="(item, i) in staffdata2" :key="i" :label="item.name" :value="item.sid">-->
+            <!--              </el-option>-->
+            <!--            </el-select>-->
           </td>
+        </tr>
+        <tr>
           <td>部门联系人</td>
           <td>
             <el-input v-model="form.linkPerson" style="width:300px"></el-input>
           </td>
-        </tr>
-        <tr>
+
           <td>联系电话</td>
           <td>
             <el-input v-model="form.linkPhone" style="width:300px"></el-input>
           </td>
-          <td>排序号</td>
-          <td>
-            <el-input v-model="form.sort" style="width:300px"></el-input>
-          </td>
         </tr>
         <tr>
-          <td>是否是部门</td>
+          <td>是否独立法人</td>
           <td>
             <el-radio v-model="form.isDept" :label="1">是</el-radio>
             <el-radio v-model="form.isDept" :label="0">否</el-radio>
           </td>
+          <td>排序号</td>
           <td>
-<!--            部门地理位置-->
-          </td>
-          <td>
-<!--            <el-input v-model="form.jwd" style="width:300px" readonly>-->
-<!--              &lt;!&ndash;            <el-button slot="append" icon="el-icon-map-location" @click='mapDialog = true'></el-button>&ndash;&gt;-->
-<!--            </el-input>-->
+            <el-input v-model="form.sort" style="width:300px"></el-input>
           </td>
         </tr>
       </table>
@@ -163,11 +168,11 @@
       <div class="ewm" style="display: flex;justify-content: center; align-items: center;" ref="print">
         <img style="width: 200px; height: 200px;" :src="ewmForm.qrFilePath" alt="">
         <ul style="list-style:none; line-height: 32px; font-size: 16px;">
-          <li><label for="">部门名称: </label><span>{{ ewmForm.departmentName }}</span></li>
+          <li><label>部门名称: </label><span>{{ ewmForm.departmentName }}</span></li>
         </ul>
       </div>
     </div>
-    <!-- 新增编辑 -->
+    <!-- 新增、编辑页面 -->
     <div class="org-table" v-show="isshow == 'edit'">
       <div class="tab-header">
         <el-form ref="form" :inline="true" :model="form" label-width="80px">
@@ -200,47 +205,59 @@
           <tr>
             <td>部门地址</td>
             <td>
-              <el-input v-model="form.addrs" style="width:300px"></el-input>
+              <el-input v-model="form.addrs" style="width:130%"></el-input>
             </td>
+            <td class="td_left"/>
+            <td class="td_left"/>
+          </tr>
+          <tr>
             <td>主管人员</td>
             <td>
-              <el-select v-model="form.zgStaffSid" style="width:300px">
+              <el-select v-model="form.zgStaffSid" style="width:300px" @change="zgStaffSidChange">
                 <el-option v-for="(item, i) in staffdata" :key="i" :label="item.staffName" :value="item.staffSid">
                 </el-option>
               </el-select>
             </td>
-          </tr>
-          <tr>
+
             <td>分管人员</td>
             <td>
-              <el-select v-model="form.fgStaffSid" style="width:300px">
-                <el-option v-for="(item, i) in staffdata2" :key="i" :label="item.staffName" :value="item.staffSid">
-                </el-option>
-              </el-select>
+              <el-autocomplete v-model="form.fgStaffName" :fetch-suggestions="querySearchAsync" class="addinputw"
+                               placeholder="请输入品牌名称" @select="handleSelect">
+                <i slot="suffix" class="el-icon-edit el-input__icon" @click="inputclear"/>
+                <template slot-scope="{ item }">
+                  <div style="paddingg:5px;background-color:Azure;">
+                    <span>品牌名称：</span>
+                    <span style="color:red">{{ item.name }}</span><br>
+                  </div>
+                </template>
+              </el-autocomplete>
+              <!--              <el-select v-model="form.fgStaffSid" style="width:300px" @change="fgStaffSidChange">-->
+              <!--                <el-option v-for="(item, i) in staffdata2" :key="i" :label="item.name" :value="item.sid">-->
+              <!--                </el-option>-->
+              <!--              </el-select>-->
             </td>
+          </tr>
+          <tr>
             <td>部门联系人</td>
             <td>
               <el-input v-model="form.linkPerson" style="width:300px"></el-input>
             </td>
-          </tr>
-          <tr>
+
             <td>联系电话</td>
             <td>
               <el-input v-model="form.linkPhone" style="width:300px"></el-input>
             </td>
-            <td>排序号</td>
-            <td>
-              <el-input v-model="form.sort" style="width:300px"></el-input>
-            </td>
           </tr>
           <tr>
-            <td>是否是部门</td>
+            <td>是否独立法人</td>
             <td>
               <el-radio v-model="form.isDept" :label="1">是</el-radio>
               <el-radio v-model="form.isDept" :label="0">否</el-radio>
             </td>
-            <td></td>
-            <td></td>
+            <td>排序号</td>
+            <td>
+              <el-input v-model="form.sort" style="width:300px"></el-input>
+            </td>
           </tr>
         </table>
       </div>
@@ -252,14 +269,15 @@
 
 <script>
 import {
-  pageList,
-  orgList,
   addOrgTree,
-  putOrgtree,
-  postOrgtree,
   delOrgtree,
   getQrCode,
-  getStaff
+  getStaff,
+  getStaffName,
+  orgList,
+  pageList,
+  postOrgtree,
+  putOrgtree
 } from '@/api/system/departments/departments.js'
 import Position from '@/components/amap/amap.vue'
 
@@ -293,6 +311,7 @@ export default {
         addrs: '',
         zgStaffSid: '',
         fgStaffSid: '',
+        fgStaffName: '',
         linkPerson: '',
         linkPhone: '',
         sort: '',
@@ -485,6 +504,7 @@ export default {
       this.page.params.name = ''
       this.getPageList(this.page)
     },
+    // 主管人员
     getStaff(orgSid) {
       let params = {
         orgSid: orgSid
@@ -495,12 +515,51 @@ export default {
         console.log('这里是主管人员下拉框', res.data)
       })
     },
+    // 选择主管人员
+    zgStaffSidChange(val) {
+      // const choosetItem = this.payType_list.filter((item) => item.dictKey == val)
+      // this.temp.payType = choosetItem[0].dictValue
+      // console.log('name:', this.temp.payType, 'key:', this.temp.payTypeKey)
+    },
+    // 分管人员
     getStaff2() {
-      let params = {}
-      getStaff(params).then(res => {
+      // let params = {}
+      getStaffName({staffName:this.form.fgStaffName}).then(res => {
         this.staffdata2 = res.data
+        console.log('分管人员',this.staffdata2)
       })
+    },
+    querySearchAsync(queryString, cb) {
+      console.log('查询条件：', queryString)
+      if (
+        queryString != null &&
+        queryString != undefined &&
+        queryString !== ''
+      ) {
+        // this.searchData({ name: queryString })
+        getStaffName({staffName: queryString}).then(res => {
+          if (res.code === '200') {
+            this.staffdata2 = res.data
+            console.log('分管人员', this.staffdata2)
+            cb(res.data)
+          }
+        })
+      } else {
+        console.log('无请求参数', this.staffdata2)
+        // this.staffdata2 = this.staffdata2
+        cb(this.staffdata2)
+      }
+    },
+    handleSelect(e) {
+      console.log('分管选择',e)
+      this.form.fgStaffSid = e.sid
+      this.form.fgStaffName = e.name
+    },
+    // 清空信息
+    inputclear() {
+      this.form.fgStaffName = ''
     }
+
   }
 }
 </script>
@@ -577,4 +636,8 @@ export default {
     width: 70%;
   }
 }
+
+.td_left {
+  border-left: 0 solid #e6e9f0;
+}
 </style>