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 c70d2daec6..571e3ba782 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
@@ -4,9 +4,9 @@
       <div class="tab-header webtop">
         <div>销售政策管理</div>
         <div>
-          <el-button type="primary" size="small" @click="handleCreate()">新增</el-button>
-          <el-button type="danger" size="small" @click="handleDelete()">删除</el-button>
+          <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>
         </div>
       </div>
@@ -33,18 +33,20 @@
               </el-form-item>
               <el-form-item label="有效期">
                 <div class="block">
-                  <el-date-picker v-model="listQuery.params.getEffectiveStartDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
+                  <el-date-picker v-model="listQuery.params.getEffectiveStartDate" type="date" placeholder="选择日期"
+                                  value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
                 </div>
                 <label>至</label>
                 <div class="block">
-                  <el-date-picker v-model="listQuery.params.getEffectiveEndDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
+                  <el-date-picker v-model="listQuery.params.getEffectiveEndDate" type="date" placeholder="选择日期"
+                                  value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
                 </div>
               </el-form-item>
-              <div class="searchbtns">
-                <el-button type="primary" @click="handleFilter">查询</el-button>
-                <el-button type="primary" @click="handleReset">重置</el-button>
-              </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>
         </div>
         <div class="listtop">
@@ -120,6 +122,7 @@
     </div>
     <xiaoshouzhengce-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="getList"></xiaoshouzhengce-add>
     <xiaoshouzhengce-info v-show="viewState == 4" ref="divinfo" @doback="resetState"></xiaoshouzhengce-info>
+    <tags-view ref="tags" v-show="false"></tags-view>
   </div>
 </template>
 
@@ -129,6 +132,8 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import xiaoshouzhengceAdd from './xiaoshouzhengceAdd'
 import xiaoshouzhengceInfo from './xiaoshouzhengceInfo'
+import TagsView from '@/layout/components/TagsView/index'
+
 
 export default {
   name: "xiaoshouzhengce",
@@ -136,7 +141,8 @@ export default {
     Pagination,
     pageye,
     xiaoshouzhengceAdd,
-    xiaoshouzhengceInfo
+    xiaoshouzhengceInfo,
+    TagsView
   },
   data() {
     return {
@@ -178,6 +184,14 @@ export default {
       nodeState: ''
     }
   },
+  computed: {
+    visitedViews() {
+      return this.$store.state.tagsView.visitedViews
+    },
+    routes() {
+      return this.$store.state.permission.routes
+    }
+  },
   created() {
     // 初始化变量
     this.init()
@@ -365,6 +379,13 @@ export default {
         })
         return
       }
+    },
+    handleReturn() {
+      console.log('1122334455')
+      const choosetItem = this.visitedViews.filter((item) => item.fullPath == this.$route.path)
+      if (choosetItem) {
+        this.$refs['tags'].closeSelectedTag(choosetItem[0])
+      }
     }
     // 提交
     // handleSubmit(row) {
@@ -445,4 +466,25 @@ export default {
 .el-form-item__content label {
   padding: 0 5px;
 }
+
+.searchbtn {
+  border: #2cab69 1px solid;
+  color: #2cab69;
+}
+
+.btn {
+  padding: 15px 0 15px 0;
+  border: 1px solid #e0e3eb;
+  background: white;
+}
+
+.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-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue
index 5980841526..ee96eaa5f1 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
@@ -125,7 +125,7 @@ export default {
         discountType: '',	// 优惠类型（赠送套餐 等，数据字典）
         discountTypeKey: '',	// 优惠类型key
         effectiveDate: '',	// 有效期
-        isEmploy: '',	// 1 是 0 否有效
+        isEmploy: '1',	// 1 是 0 否有效
         orderSid: '',	// 销售订单单据sid
         salesPolicy: '',	// 政策类别
         salesPolicyKey: '',	// 政策类别key
@@ -383,7 +383,7 @@ export default {
         discountType: '',	// 优惠类型（赠送套餐 等，数据字典）
         discountTypeKey: '',	// 优惠类型key
         effectiveDate: '',	// 有效期
-        isEmploy: '',	// 1 是 0 否有效
+        isEmploy: '1',	// 1 是 0 否有效
         orderSid: '',	// 销售订单单据sid
         salesPolicy: '',	// 政策类别
         salesPolicyKey: '',	// 政策类别key
diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
index 1ff18d13f1..99908f74af 100644
--- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
+++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
@@ -191,13 +191,13 @@ const codemenu = [
     children: [{
       path: '/guache/guacheguanli',
       component: () => import('@/views/guache/guacheguanli/guacheguanli.vue'),
-      name: 'ShangZhuangGuanLi',
+      name: 'GuaCheJianSuoGuanLi',
       meta: { title: '挂车管理' }
     },
       {
         path: '/guache/guachejiansuo',
         component: () => import('@/views/guache/guachejiansuo/guachejiansuoguanli.vue'),
-        name: 'GuaCheJianSuoGuanLi',
+        name: 'guachejiansuoguanli',
         meta: { title: '挂车管理' }
       }
     ]
diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotherinbound/scmotherinboundAdd.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotherinbound/scmotherinboundAdd.vue
index 5e6181f0d5..eb83e220cb 100644
--- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotherinbound/scmotherinboundAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotherinbound/scmotherinboundAdd.vue
@@ -788,6 +788,7 @@ export default {
         this.formobj.scmOtherInboundDto = obj
         this.stockOrgName_list = data.stockOrgSid // 库存组织sid
         this.invenGroupName_list = data.invenGroupSid // 库存组sid
+        console.log('库存组织',this.stockOrgName_list)
         // 明细表
         this.formobj.scmOtherInboundDetailDto = data.scmOtherInboundDetailVoList
       }).catch(e => {
diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
index 91284c9f62..72ee92b819 100644
--- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
@@ -9,7 +9,7 @@
         <div v-show="isSearchShow" class="search">
           <el-form :inline="true" class="tab-header">
             <el-form-item label="使用组织">
-              <el-input v-model="queryParams.params.useOrg" placeholder="请输入使用组织" clearable/>
+              <el-input :readonly="true" v-model="queryParams.params.useOrg" placeholder="请输入使用组织" />
             </el-form-item>
             <el-form-item label="编码">
               <el-input v-model="queryParams.params.warehouseCode" placeholder="请输入编码" clearable/>
@@ -93,6 +93,7 @@
 
 <script>
 import req from '@/api/anruiscm/scmwarehouse'
+import { getUseOrgByUserSid } from '@/api/cheliang/basevehicle'
 import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
@@ -115,6 +116,8 @@ export default {
       isSearchShow: false,
       tableLoading: false,
       dataList: [],
+      useOrg: '', // 使用组织
+      useOrgSid: '', // 使用组织sid
       queryParams: {
         current: 1,
         size: 10,
@@ -159,6 +162,7 @@ export default {
   },
   created() {
     this.loadList()
+    this.getUseOrg()
   },
   mounted() {
     this.$refs['btnbar'].setButtonList(this.btnList)
@@ -247,7 +251,17 @@ export default {
       this.loadList()
     },
     resetQuery() {
-      this.queryParams.params = {}
+      this.queryParams.params = {
+        sids: [], // 用于导出的时候保存已选择SID
+        useOrg:this.useOrg,
+        useOrgSid:this.useOrgSid,
+        warehouseCode: '', // 编码
+        warehouseName: '', // 名称
+        warehouseAttribute: '', // 仓库属性
+        warehouseContract: '', // 仓库负责人
+        warehouseContractSid: '', // 仓库负责人sid
+        warehouseGroup: '' // 分组
+      }
       this.queryParams.params.sid = '' // sid
       this.queryParams.params.name = '' // 登录名
       this.dosearch()
@@ -271,6 +285,18 @@ export default {
       this.multipleSelection = val
       console.log('点击数据', this.multipleSelection)
     },
+    // 分公司
+    getUseOrg() {
+      const userSid = window.sessionStorage.getItem('userSid')
+      getUseOrgByUserSid({ userSid: userSid }).then((res) => {
+        if (res.success) {
+          this.useOrg = res.data.name // 使用组织
+          this.useOrgSid = res.data.sid // 使用组织sid
+          this.queryParams.params.useOrg = res.data.name
+          this.queryParams.params.useOrgSid = res.data.sid
+        }
+      })
+    },
     // 序号
     indexMethod(index) {
       var pagestart = (this.queryParams.current - 1) * this.queryParams.size
diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseInfo.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseInfo.vue
index 98d05e2323..2ec995869b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseInfo.vue
@@ -15,62 +15,54 @@
       <el-form ref="form_obj" :model="formobj" label-position="top" label-width="300px" class="formadd">
         <div class="wlInfo"><span>存放地点</span></div>
         <el-row>
-          <el-col :span="2" class="tleftb  row_first">
-            <el-form-item><span slot="label">使用组织</span></el-form-item>
+          <el-col :span="14" class="specialCol">
+            <span>使用组织：</span>
+            <span>{{ formobj.useOrg }}</span>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="3" class="tleftb row_first">
+            <el-form-item><span slot="label"><span class="icon">*</span>编码</span></el-form-item>
           </el-col>
           <el-col :span="4" class="trightb row_first">
-            <el-form-item prop="useOrg">
-              <span>{{ formobj.useOrg }}</span>
-              <!-- <el-input v-model="formobj.useOrg" placeholder="使用组织" class="addinputw" clearable/>-->
+            <el-form-item prop="warehouseCode">
+              <span>{{ formobj.warehouseCode }}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="2" class="tleftb  row_first">
-            <el-form-item><span slot="label">分组</span></el-form-item>
+          <el-col :span="3" class="tleftb row_first">
+            <el-form-item><span slot="label"><span class="icon">*</span>名称</span></el-form-item>
           </el-col>
           <el-col :span="4" class="trightb row_first">
-            <el-form-item prop="warehouseGroup">
-              <span>{{ formobj.warehouseGroup }}</span>
-              <!--              <el-input v-model="formobj.warehouseGroup" placeholder="分组" class="addinputw" clearable/>-->
+            <el-form-item prop="warehouseName">
+              <span>{{ formobj.warehouseName }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="2" class="tleftb">
-            <el-form-item><span slot="label">编码</span></el-form-item>
+          <el-col :span="3" class="tleftb">
+            <el-form-item><span slot="label"><span class="icon">*</span>仓库负责人及电话</span></el-form-item>
           </el-col>
           <el-col :span="4" class="trightb">
-            <el-form-item prop="warehouseCode">
-              <span>{{ formobj.warehouseCode }}</span>
-              <!--              <el-input v-model="formobj.warehouseCode" placeholder="编码" class="addinputw" clearable/>-->
+            <el-form-item prop="warehouseContract">
+              <span>{{ formobj.warehouseContract }}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="2" class="tleftb">
-            <el-form-item><span slot="label">名称</span></el-form-item>
+          <el-col :span="3" class="tleftb">
+            <el-form-item><span slot="label"><span class="icon">*</span>分组</span></el-form-item>
           </el-col>
           <el-col :span="4" class="trightb">
-            <el-form-item prop="warehouseName">
-              <span>{{ formobj.warehouseName }}</span>
-              <!--              <el-input v-model="formobj.warehouseName" placeholder="名称" class="addinputw" clearable/>-->
+            <el-form-item prop="warehouseGroup">
+              <span>{{ formobj.warehouseGroup }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="2" class="tleftb">
-            <el-form-item><span slot="label">仓库属性</span></el-form-item>
+          <el-col :span="3" class="tleftb">
+            <el-form-item><span slot="label"><span class="icon">*</span>详细地址</span></el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
+          <el-col :span="11" class="trightb">
             <el-form-item prop="warehouseAttribute">
               <span>{{ formobj.warehouseAttribute }}</span>
-              <!--              <el-input v-model="formobj.warehouseAttribute" placeholder="仓库属性" class="addinputw" clearable/>-->
-            </el-form-item>
-          </el-col>
-          <el-col :span="2" class="tleftb">
-            <el-form-item><span slot="label">仓库负责人</span></el-form-item>
-          </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item prop="warehouseContract">
-              <span>{{ formobj.warehouseContract }}</span>
-              <!--              <el-input v-model="formobj.warehouseContract" placeholder="仓库负责人" class="addinputw" clearable/>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -100,54 +92,58 @@
 </script>
 
 <style scoped lang="scss">
-  .headInfo {
-    margin-left: -14px;
-    margin-right: -14px;
-  }
+.headInfo {
+  margin-left: -14px;
+  margin-right: -14px;
+}
+.row_first {
+  border-top: 1px solid #e0e3eb !important;
+}
+.wlInfo {
+  width: 100%;
+  height: 100%;
+  padding: 60px 0;
+  font-size: 24px;
+  font-weight: bold;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 
-  .wlInfo {
-    width: 100%;
-    height: 100%;
-    padding: 60px 0;
-    font-size: 24px;
-    /*border-width: 0 0 1px 0;*/
-    /*border-style: solid;*/
-    /*border-color: #EDF1F7;*/
-    font-weight: bold;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
+.formadd {
+  padding: 0;
+}
 
-  .formadd {
-    padding: 0;
-  }
+.formadd .el-row {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-wrap: wrap;
+  justify-content: center;
+  border-left: 0 !important;
+}
 
-  .formadd .el-row {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-wrap: wrap;
-    justify-content: center;
-    border-left: 0 !important;
-  }
+.tleftb {
+  text-align: right;
+  border-left: 1px solid #e0e3eb;
+}
 
-  .tleftb {
-    text-align: right;
-    border-left: 1px solid #e0e3eb;
-  }
+.tab-headerg {
+  height: 35px;
+  background-color: #EDF1F7;
+  padding: 20px 20px;
+}
 
-  .tab-headerg {
-    height: 35px;
-    background-color: #EDF1F7;
-    padding: 20px 20px;
-  }
+.icon {
+  color: #e84026;
+  margin-right: 4px;
+}
 
-  .icon {
-    color: #e84026;
-    margin-right: 4px;
-  }
-  .row_first {
-    border-top: 1px solid #e0e3eb !important;
-  }
+.specialCol {
+  min-height: 30px !important;
+  border: 0 !important;
+  font-size: 14px;
+  color: #606266;
+  font-weight: 600;
+}
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
index 97c20fe514..d9e3621b53 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
@@ -306,6 +306,7 @@ export default {
       options: [],
       useOrg: [],
       props: {
+        emitPath:false,
         value: 'sid',
         label: 'name',
         children: 'children',
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
index 5e35241028..2ff97a3ab6 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
@@ -9,7 +9,7 @@
           <el-button type="primary" size="small" @click="handleUpdate()">修改</el-button>
           <el-button type="danger" size="small" @click="handleDelete()">删除</el-button>
           <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
-          <el-button type="primary" size="small" @click="handleOpen()">进入关联表</el-button>
+<!--          <el-button type="primary" size="small" @click="handleOpen()">进入关联表</el-button>-->
         </div>
       </div>
       <div class="main-content">
@@ -139,7 +139,9 @@
             <el-table-column fixed width="50px" type="selection" align="center"/>
             <el-table-column label="关联状态" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.isRelationState === 1 ? '已关联' : '未关联' }}</span>
+                <span class="bluezi" @click="handleOpen(scope.row)">{{
+                    scope.row.isRelationState === 1 ? '已关联' : '未关联'
+                  }}</span>
               </template>
             </el-table-column>
             <el-table-column label="使用状态" align="center">
@@ -590,34 +592,9 @@ export default {
         }
       })
     },
-    handleOpen() {
-      if (this.sids.length === 1) {
-        if (this.sids[0].relationState === 1) {
-          this.viewState = 5
-          this.$refs['relation'].init(this.sids[0].sid)
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '该常用配置未关联车型!',
-            type: 'info',
-            duration: 2000
-          })
-        }
-      } else if (this.sids.length > 1) {
-        this.$notify({
-          title: '提示',
-          message: '不能选中多个常用配置!!',
-          type: 'info',
-          duration: 2000
-        })
-      } else {
-        this.$notify({
-          title: '提示',
-          message: '请选择常用配置!',
-          type: 'error',
-          duration: 2000
-        })
-      }
+    handleOpen(row) {
+      this.viewState = 5
+      this.$refs['relation'].init(row.sid)
     },
     // 返回
     handleReturn() {
@@ -731,39 +708,45 @@ export default {
     // 根据本行ID删除数据
     handleDelete() {
       console.log('删除', this.sids)
+      const _this = this
       const bb = []
       this.sids.forEach((e) => {
         bb.push(e.sid)
       })
       console.log(bb, 666666)
       if (this.sids.length > 0) {
-        deleteBySids(bb).then((response) => {
-          if (response.code === '200') {
-            this.$notify({
-              title: '提示',
-              message: '删除成功',
-              type: 'success',
-              duration: 2000
+        const tip = '请确认是否删除所选 ' + this.multipleSelection.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)'
             })
-            this.getList()
-          } else {
-            this.$notify({
-              title: '失败',
-              message: response.msg,
-              type: 'error'
+            deleteBySids(bb).then(resp => {
+              loading.close()
+              _this.$message({ type: 'success', message: resp.msg, showClose: true })
+              _this.getList()
             })
-          }
-        })
+              .catch(e => {
+                loading.close()
+              })
+          })
+          .catch(() => {
+          })
       } else {
-        this.$notify({
-          title: '提示',
+        this.$message({
+          showClose: true,
           message: '没有选择车型配置!!',
-          type: 'error',
-          duration: 2000
+          type: 'warning'
         })
         return
       }
-
     },
     // 导出
     handleDaoChu() {
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiInfo.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiInfo.vue
index 204251e4a6..0a5b1f0906 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiInfo.vue
@@ -135,20 +135,20 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="4">
-            <span>内部编码</span>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item >
-              <span>{{ temp.insideCode }}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-          </el-col>
-          <el-col :span="8">
-          </el-col>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="4">-->
+<!--            <span>内部编码</span>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item >-->
+<!--              <span>{{ temp.insideCode }}</span>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="4">-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--          </el-col>-->
+<!--        </el-row>-->
         <div class="addtable">
           <div class="tabletitle">
             <div class="titlename">
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiRel.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiRel.vue
index ab66a6c4d5..8989b9da68 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiRel.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiRel.vue
@@ -25,7 +25,7 @@
             </el-form-item>
             <el-form-item label="系列">
               <el-select v-model="listQuery.params.productLine" placeholder="请选择" clearable class="addinputw">
-                <el-option v-for="item in series_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                <el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
             <el-form-item label="驱动">
@@ -90,14 +90,14 @@
         <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">
+          <el-table-column label="品牌" width="120px" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.brandName }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="车型" align="center">
+          <el-table-column label="车型" width="300px" align="center">
             <template slot-scope="scope">
-              <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.modelName }}</span>
+              <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.vehicleAlias }}</span>
             </template>
           </el-table-column>
           <el-table-column label="版本" align="center">
@@ -153,7 +153,7 @@ export default {
       // list ------
       carBrand_list: [], // 品牌
       vehicleFunction_list: [], // 功能 vehicleFunction
-      series_list: [], // 系列 series
+      productLine_list: [], // 系列 productLine
       driveForm_list: [], // 驱动 driver
       power_list: [], // 马力 horsepower
       vehicleVersion_list: [], // 版本 vehicleVersion
@@ -228,10 +228,10 @@ export default {
       })
       // 下拉框-系列
       pullDown({
-        type: 'series'
+        type: 'productLine'
       }).then((res) => {
         if (res.code === '200') {
-          this.series_list = res.data
+          this.productLine_list = res.data
           console.log('下拉框请求系列', res.data)
         }
       })
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 40d58cfaaf..7b56dabac3 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
@@ -10,36 +10,37 @@
       <el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="forminfo" :rules="rules">
         <div class="title">合格证台账详情信息</div>
         <el-row>
-          <el-col :span="4" class="trightb">合格证流水号：</el-col>
-          <el-col :span="8"> {{ temp.certificationSerialNum }} </el-col>
           <el-col :span="4" class="trightb">合格证编号：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.certificationNo }} </el-col>
-        </el-row>
-        <el-row>
+          <el-col :span="8" class="tleft"> {{ temp.certificationNo }}</el-col>
           <el-col :span="4" class="trightb">发证日期：</el-col>
-          <el-col :span="8"> {{ temp.certificateDate }} </el-col>
-          <el-col :span="4" class="trightb">合格证情况：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.certificateSituationValue }} </el-col>
+          <el-col :span="8"> {{ temp.certificateDate }}</el-col>
         </el-row>
         <el-row>
+          <el-col :span="4" class="trightb">合格证状态：</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.certificateStateValue }}</el-col>
           <el-col :span="4" class="trightb">到证日期：</el-col>
-          <el-col :span="8"> {{ temp.toCardDate }} </el-col>
-          <el-col :span="4" class="trightb">领取日期：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.receiveDate }} </el-col>
+          <el-col :span="8"> {{ temp.toCardDate }}</el-col>
         </el-row>
         <el-row>
+          <el-col :span="4" class="trightb">领取日期：</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.receiveDate }}</el-col>
           <el-col :span="4" class="trightb">领取人：</el-col>
-          <el-col :span="8"> {{ temp.receiver }} </el-col>
-          <el-col :span="4" class="trightb" />
-          <el-col :span="8" class="tleft" />
+          <el-col :span="8"> {{ temp.receiver }}</el-col>
+        </el-row>
+        <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-row>
         <el-row>
           <el-col :span="4" class="trightb">备注：</el-col>
-          <el-col :span="20"> {{ temp.remarks }} </el-col>
+          <el-col :span="20"> {{ temp.remarks }}</el-col>
         </el-row>
         <el-row>
           <el-col :span="4" class="trightb">合格证照片：</el-col>
-          <img v-for="(map_item,index) in temp.certificatePhoto" style="width: 100px; height: 100px;margin-right: 5px;" :key="index" :src="map_item">
+          <img v-for="(map_item,index) in temp.certificatePhoto" style="width: 100px; height: 100px;margin-right: 5px;"
+               :key="index" :src="map_item">
         </el-row>
         <div class="title">合格证详细信息</div>
         <el-row>
@@ -98,27 +99,27 @@
         </el-row>
         <el-row>
           <el-col :span="4" class="trightb">CGS印章：</el-col>
-          <el-col :span="8"> {{ temp.cgsseal }} </el-col>
-          <el-col :span="4" class="trightb">车辆型号：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.carModel }} </el-col>
+          <el-col :span="8"> {{ temp.cgsseal }}</el-col>
+          <el-col :span="4" class="trightb">功率：</el-col>
+          <el-col :span="8"> {{ temp.power }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">车架号：</el-col>
-          <el-col :span="8"> {{ temp.vinNo }} </el-col>
+          <el-col :span="4" class="trightb">轮胎数：</el-col>
+          <el-col :span="8"> {{ temp.tyreNum }}</el-col>
           <el-col :span="4" class="trightb">总质量：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.totalWeight }} </el-col>
+          <el-col :span="8" class="tleft"> {{ temp.totalWeight }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">轮胎数：</el-col>
-          <el-col :span="8"> {{ temp.tyreNum }} </el-col>
           <el-col :span="4" class="trightb">车辆品牌：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.carBrand }} </el-col>
+          <el-col :span="8" class="tleft"> {{ temp.carBrand }}</el-col>
+          <el-col :span="4" class="trightb">车辆型号：</el-col>
+          <el-col :span="8" class="tleft"> {{ temp.carModel }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">功率：</el-col>
-          <el-col :span="8"> {{ temp.power }} </el-col>
+          <el-col :span="4" class="trightb">车架号：</el-col>
+          <el-col :span="8"> {{ temp.vinNo }}</el-col>
           <el-col :span="4" class="trightb">底盘型号：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.chassisModel }} </el-col>
+          <el-col :span="8" class="tleft"> {{ temp.chassisModel }}</el-col>
         </el-row>
 
       </el-form>
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 c1da7496bc..71462eae59 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
@@ -1,36 +1,41 @@
 <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="handleDaoRu()">导入</el-button> -->
-          <el-button type="success" size="small" @click="handleDaoChu()">导出</el-button>
-        </div>
-      </div>
-
+      <button-bar view-title="合格证台账" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <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.certificationNo" placeholder="请输入合格证编号" clearable class="filter-item"/>
+              <el-input v-model="listQuery.params.certificationNo" placeholder="请输入合格证编号" clearable
+                        class="filter-item"/>
             </el-form-item>
             <el-form-item label="发证日期">
-              <el-date-picker v-model="listQuery.certificateDate" type="date" class="addinputw" format="yyyy-MM-dd"
-                              value-format="yyyy-MM-dd" placeholder="选择日期时间"/>
+              <el-date-picker
+                v-model="listQuery.params.certificateStartDate "
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+              <span style="padding: 0 8px">至</span>
+              <el-date-picker
+                v-model="listQuery.params.certificateEndDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
             </el-form-item>
-            <el-form-item label="合格证情况">
-              <el-select v-model="listQuery.certificateSituation" class="addinputw" clearable placeholder="请选择合格证情况"
+            <el-form-item label="合格证状态">
+              <el-select v-model="listQuery.params.certificateState" class="addinputw" clearable placeholder="请选择合格证状态"
                          style="width: 200px;">
                 <el-option v-for="item in Situation" :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="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">
@@ -53,9 +58,9 @@
               <span>{{ scope.row.certificateDate }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="合格证情况" align="center">
+          <el-table-column label="合格证状态" align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.certificateSituationValue }}</span>
+              <span>{{ scope.row.certificateStateValue }}</span>
             </template>
           </el-table-column>
           <el-table-column label="到证日期" align="center">
@@ -116,101 +121,131 @@
 </template>
 
 <script>
-  import { mapGetters } from 'vuex'
-  import {
-    pagerList,
-    deleteBySids,
-    basefinbankExportExcel
-  } from '@/api/cheliang/basevehiclecertificate'
-  import { typeValues } from '@/api/cheliang/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 hegezhengtaizhangAdd from './hegezhengtaizhangAdd'
-  import hegezhengInfo from './hegezhengInfo'
-  import cheliangtaizhangInfo from '@/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo'
-  import CheliangtaizhangInfo from '@/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo'
+import { mapGetters } from 'vuex'
+import { basefinbankExportExcel, deleteBySids, pagerList } from '@/api/cheliang/basevehiclecertificate'
+import { typeValues } from '@/api/cheliang/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 hegezhengtaizhangAdd from './hegezhengtaizhangAdd'
+import hegezhengInfo from './hegezhengInfo'
+import CheliangtaizhangInfo from '@/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo'
+import ButtonBar from '@/components/ButtonBar'
 
-  export default {
-    name: 'Pinpaiguanli',
-    components: {
-      CheliangtaizhangInfo,
-      Pagination,
-      pageye,
-      hegezhengtaizhangAdd,
-      hegezhengInfo
-    },
-    // 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()
-    //     }
-    //   }
-    // },
-    data() {
-      return {
-        viewState: 1,
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        imgs: [],
-        // --按钮菜单-------
-        menuState: {
-          add: false, // 添加
-          edit: false, // 编辑
-          delete: false, // 删除
-          view: false, // 查看
-          audit: false, // 审核
-          input: false, // 导入
-          output: false, // 导出
-          upload: false, // 同步
-          release: false // 下发
+export default {
+  name: 'Pinpaiguanli',
+  components: {
+    CheliangtaizhangInfo,
+    Pagination,
+    pageye,
+    hegezhengtaizhangAdd,
+    hegezhengInfo,
+    ButtonBar
+  },
+  // 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()
+  //     }
+  //   }
+  // },
+  data() {
+    return {
+      viewState: 1,
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      imgs: [],
+      // --按钮菜单-------
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'el-icon-plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'el-icon-edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'el-icon-delete',
+          btnKey: 'doDel',
+          btnLabel: '删除'
         },
-        // 查询 -----------
-        tableKey: 0,
-        // list: null,
-        list: [],
-        sids: [],
-        total: 1,
-        FormLoading: false,
-        listLoading: false,
-        listQuery: {
-          certificationNo: '',
-          certificateDateL: '',
-          certificateSituation: '',
-          current: 1,
-          size: 20
+        {
+          type: 'success',
+          size: 'small',
+          icon: '',
+          btnKey: 'doExport',
+          btnLabel: '导出'
+        }
+      ],
+      menuState: {
+        add: false, // 添加
+        edit: false, // 编辑
+        delete: false, // 删除
+        view: false, // 查看
+        audit: false, // 审核
+        input: false, // 导入
+        output: false, // 导出
+        upload: false, // 同步
+        release: false // 下发
+      },
+      // 查询 -----------
+      tableKey: 0,
+      // list: null,
+      list: [],
+      sids: [],
+      total: 1,
+      FormLoading: false,
+      listLoading: false,
+      listQuery: {
+        params: {
+          certificateStartDate: '',
+          certificateEndDate: '',
+          certificateState: '',
+          certificationNo: ''
         },
-        certificateSituation: 'certificateSituation',
+        current: 1,
+        size: 20
+      },
         Situation: [],
         selectDate: undefined,
         temp: {}, // 添加和修改
@@ -242,76 +277,90 @@
         }
         // ------------------------------------
       }
+  },
+  computed: {
+    ...mapGetters([
+      'id',
+      'roles',
+      'rolesIds',
+      'departmentId',
+      'departmentCode'
+    ])
+  },
+  created() {
+    // 初始化变量
+    this.init()
+    // 加载列表
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
     },
-    computed: {
-      ...mapGetters([
-        'id',
-        'roles',
-        'rolesIds',
-        'departmentId',
-        'departmentCode'
-      ])
+    init() {
+      // 根据当前用户. 加载当前页面的按钮权限
+      // findButtonByUserId(this.$route.path).then(response => {
+      //   if (
+      //     response.code === 20000 &&
+      //   response.data &&
+      //   response.data.length > 0
+      //   ) {
+      //     this.menuState = ConvertMenuState(response.data) // 处理各按钮显示状态
+      //   }
+      // })
+      this.setDate()
     },
-    created() {
-      // 初始化变量
-      this.init()
-      // 加载列表
-      this.getList()
+    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
+        default:
+          break
+      }
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
     },
-    methods: {
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
-        } else {
-          this.searchxianshitit = '显示查询条件'
+    resetState() {
+      this.viewState = 1
+    },
+    setDate() {
+      typeValues({
+        type: 'certificateState'
+      }).then((res) => {
+        console.log(res)
+        if (res.code === '200') {
+          this.Situation = res.data
         }
-      },
-      init() {
-        // 根据当前用户. 加载当前页面的按钮权限
-        // findButtonByUserId(this.$route.path).then(response => {
-        //   if (
-        //     response.code === 20000 &&
-        //   response.data &&
-        //   response.data.length > 0
-        //   ) {
-        //     this.menuState = ConvertMenuState(response.data) // 处理各按钮显示状态
-        //   }
-        // })
-        this.setDate()
-      },
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      resetState() {
-        this.viewState = 1
-      },
-      setDate() {
-        typeValues({
-          type: this.certificateSituation
-        }).then((res) => {
-          console.log(res)
-          if (res.code === '200') {
-            this.Situation = res.data
-          }
-        })
-      },
-      // 查询列表信息
+      })
+    },
+    // 查询列表信息
       getList() {
         this.listLoading = true
-        pagerList({
-          current: this.listQuery.current,
-          size: this.listQuery.size,
-          params: {
-            certificationNo: this.listQuery.certificationNo,
-            certificateDateL: this.listQuery.certificateDateL,
-            certificateSituation: this.listQuery.certificateSituation
-          }
-        }).then((response) => {
+        pagerList(this.listQuery).then((response) => {
           console.log('列表查询结果：', response)
           this.listLoading = false
           if (
@@ -327,74 +376,87 @@
           }
         })
       },
-      // 查询按钮
-      handleFilter() {
-        this.listQuery.current = 1
-        this.getList()
-      },
-
-      // ----------------------------------方法--------------------
-      // 添加前数据初始化
-      resetTemp() {
-        this.temp = {
-          jc: '', //			false	string
-          organizationId: '', //			false	string
-          qc: '', //			false	string
-          remark: '', //			false
-          string: '', //
-          state: '' //	状态
-        }
-      },
-      handleSelectionChange(row) {
-        const aa = []
-        row.forEach((element) => {
-          aa.push(element.sid)
-        })
-        this.sids = aa
-      },
-      // 打开添加
-      handleCreate() {
-        this.viewState = 2
-        // this.dialogStatus = 'add'
-        this.$refs['divadd'].showAdd()
-        // this.$router.push({
-        //   path: '/cheliang/hegezhengtaizhangAdd/0'
-        // })
-      },
-      // 打开
-      cheLiangXiangXi(row) {
-        console.log('0222221133', row)
-        this.viewState = 5
-        this.$refs['chelianginfo'].showInfo(row.vehicleSid)
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 重置
+    handleReset() {
+      this.listQuery = {
+        params: {
+          certificateStartDate: '',
+          certificateEndDate: '',
+          certificateState: '',
+          certificationNo: ''
+        },
+        current: 1,
+        size: 20
+      }
+      this.getList()
+    },
+    // ----------------------------------方法--------------------
+    // 添加前数据初始化
+    resetTemp() {
+      this.temp = {
+        jc: '', //			false	string
+        organizationId: '', //			false	string
+        qc: '', //			false	string
+        remark: '', //			false
+        string: '', //
+        state: '' //	状态
+      }
+    },
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach((element) => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    // 打开添加
+    toAdd() {
+      this.viewState = 2
+      // this.dialogStatus = 'add'
+      this.$refs['divadd'].showAdd()
+      // this.$router.push({
+      //   path: '/cheliang/hegezhengtaizhangAdd/0'
+      // })
+    },
+    // 打开
+    cheLiangXiangXi(row) {
+      console.log('0222221133', row)
+      this.viewState = 5
+      this.$refs['chelianginfo'].showInfo(row.vehicleSid)
+      // this.$router.push({
+      //   path: '/cheliang/cheliangtaizhangInfo',
+      //   query: {
+      //     sid: row.vehicleSid
+      //   }
+      // })
+    },
+    // 打开修改
+    toEdit() {
+      if (this.sids.length === 1) {
+        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/cheliangtaizhangInfo',
-        //   query: {
-        //     sid: row.vehicleSid
-        //   }
+        //   path: `/cheliang/hegezhengtaizhangAdd/${this.sids[0]}`
         // })
-      },
-      // 打开修改
-      handleUpdate() {
-        if (this.sids.length === 1) {
-          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/hegezhengtaizhangAdd/${this.sids[0]}`
-          // })
-        } else if (this.sids.length > 1) {
-          this.$notify({
-            title: '提示',
-            message: '不能选中多个合格证台账修改!!',
-            type: 'info',
-            duration: 2000
-          })
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '没有选择合格证台账!!',
+      } else if (this.sids.length > 1) {
+        this.$notify({
+          title: '提示',
+          message: '不能选中多个合格证台账修改!!',
+          type: 'info',
+          duration: 2000
+        })
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '没有选择合格证台账!!',
             type: 'error',
             duration: 2000
           })
@@ -414,60 +476,70 @@
         //   }
         // })
       },
-      // 根据本行ID删除数据
-      handleDelete() {
-        if (this.sids.length > 0) {
-          deleteBySids(this.sids).then((response) => {
-            if (response.code === '200') {
-              this.$notify({
-                title: '提示',
-                message: '删除成功',
-                type: 'success',
-                duration: 2000
+    // 根据本行ID删除数据
+    doDel() {
+      const _this = this
+      if (this.sids.length > 0) {
+        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 => {
+                loading.close()
+                _this.$message({ type: 'success', message: resp.msg, showClose: true })
+                _this.getList()
               })
-              this.getList()
-            } else {
-              this.$notify({
-                title: '失败',
-                message: response.msg,
-                type: 'error'
+              .catch(e => {
+                loading.close()
               })
-            }
-          })
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '没有选择合格证台账!!',
-            type: 'error',
-            duration: 2000
-          })
-          return
-        }
-      },
-      // 导出
-      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
+          .catch(() => {
           })
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '没有选择合格证台账!!',
+          type: 'error',
+          duration: 2000
         })
-      },
-      handleLock(row) {
-        console.log('789789789', row)
-        this.imgs = row.certificatePhoto
-        console.log(this.imgs, 'wowoeieiurir')
-        this.dialogFormVisible = true
-        this.dialogTitle = '查看'
+        return
+      }
+    },
+    // 导出
+    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
+        })
+      })
+    },
+    handleLock(row) {
+      console.log('789789789', row)
+      this.imgs = row.certificatePhoto
+      console.log(this.imgs, 'wowoeieiurir')
+      this.dialogFormVisible = true
+      this.dialogTitle = '查看'
         // this.$refs.editform.initForm(row)
       }
+
     }
   }
 </script>
@@ -493,4 +565,19 @@
   .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-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue
index d7c47a90dd..ca03106cd0 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
@@ -13,21 +13,12 @@
       <el-form ref="dataForm" :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>
-              <span slot="label">合格证流水号：</span>
-              <el-input v-model="temp.certificationSerialNum" maxlength="125" placeholder="合格证流水号" disabled
-                        class="addinputw" clearable/>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item prop="certificationNo">
               <span slot="label">合格证编号：</span>
               <el-input v-model="temp.certificationNo" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item prop="certificateDate">
               <span slot="label">发证日期：</span>
@@ -36,17 +27,18 @@
               <!-- <el-date-picker v-model="temp.certificateDate" type="date" placeholder="选择日期时间" /> -->
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
-            <el-form-item prop="certificateSituation">
-              <span slot="label">合格证情况：</span>
-              <el-select v-model="temp.certificateSituation" class="addinputw" placeholder="请选择合格证情况"
+            <el-form-item prop="certificateState">
+              <span slot="label">合格证状态：</span>
+              <el-select v-model="temp.certificateState" class="addinputw" placeholder="请选择合格证状态"
                          @change="getHeGeZheng">
                 <el-option v-for="item in Situation" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
+
           <el-col :span="12">
             <el-form-item prop="toCardDate">
               <span slot="label">到证日期：</span>
@@ -55,6 +47,8 @@
               <!-- <el-date-picker v-model="temp.toCardDate" type="date" placeholder="选择日期时间" /> -->
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item prop="receiveDate">
               <span slot="label">领取日期：</span>
@@ -63,14 +57,24 @@
               <!-- <el-date-picker v-model="temp.receiveDate" type="date" placeholder="选择日期时间" /> -->
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item prop="receiver">
               <span slot="label">领取人：</span>
               <el-input v-model="temp.receiver" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item prop="certificateSituation">
+              <span slot="label">合格证情况：</span>
+              <el-select v-model="temp.certificateSituation" class="addinputw" placeholder="请选择合格证状态"
+                         @change="getQingkuang">
+                <el-option v-for="item in qingkuang_list" :key="item.dictKey" :label="item.dictValue"
+                           :value="item.dictKey"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12"/>
         </el-row>
         <el-row>
@@ -304,100 +308,84 @@
 </template>
 
 <script>
-  import { mapGetters } from 'vuex'
-  import {
-    SaveList,
-    Update,
-    details
-  } from '@/api/cheliang/basevehiclecertificate'
-  import {
-    selectDownPlus
-  } from '@/api/cheliang/basevehiclemodel'
-  import {
-    namesDownBySid
-  } from '@/api/cheliang/basevehiclemodel'
-  import {
-    namesDown
-  } from '@/api/cheliang/basevehicle'
-  import {
-    getNamesDownes
-  } from '@/api/cheliang/basemanufacturer'
-  import { brandLike } from '@/api/cheliang/brandManagement' // 品牌管理模糊查询
-  import { setChe, getChe } from '@/utils/baocun'
-  import { typeValues } from '@/api/cheliang/dictcommons'
-  import ImageUpload from '@/components/uploadFile/ManyImageUpload' // 上传文件
-  export default {
-    name: 'PinpaiAdd',
-    components: { ImageUpload },
-    data() {
-      return {
-        viewTitle: '',
-        // --按钮菜单-------
-        menuState: {
-          add: false, // 添加
-          edit: false, // 编辑
-          delete: false, // 删除
-          view: false, // 查看
-          audit: false, // 审核
-          input: false, // 导入
-          output: false, // 导出
-          upload: false, // 同步
-          release: false // 下发
-        },
-        FormLoading: false,
-        listLoading: false,
-        temp: {
-          certificateSituation: '',
-          certificateSituationValue: '',
-          certificatePhoto: []
-        }, // 添加和修改
-        templook: {}, // 查看实体
-        textMap: {
-          update: '修改',
-          create: '创建'
-        },
-        certificateSituation: 'certificateSituation',
-        Situation: [],
-        stateId: 0,
-        dialogFormVisible: false, // 添加修改对话框状态
-        dialogFormShowVisible: false, // 查看对话框默认关闭状态
-        dialogStatus: '', // 对话框状态
-        fenzuOptions: [],
-        attachTypeYingyezhizhao: [],
-        props: {
-          value: 'id',
-          label: 'name',
-          children: 'children',
-          checkStrictly: true
-        },
-        carBrandes: [],
-        ChangShangsid: '',
-        CJsid: '',
-        vinNosse: [],
-        Model: [],
-        vSid: null,
-        rules: {
-          certificationNo: [
-            { required: true, message: '请填写合格证编号', trigger: 'blur' }
-          ],
-          certificateDate: [
-            { required: true, message: '请选择发证日期', trigger: 'blur' }
-          ],
-          certificateSituation: [
-            { required: true, message: '请选择合格证情况', trigger: 'blur' }
-          ],
-          toCardDate: [
-            { required: true, message: '请选择到证日期', trigger: 'blur' }
-          ],
-          receiveDate: [
-            { required: true, message: '请选择领取日期', trigger: 'blur' }
-          ],
-          receiver: [
-            { required: true, message: '请填写领取人', trigger: 'blur' }
-          ],
-          remarks: [{ required: true, message: '请填写备注', trigger: 'blur' }]
-          // certificatePhoto: [
-          //   { required: true, message: '请选择合格证照片', trigger: 'blur' },
+import { mapGetters } from 'vuex'
+import { details, SaveList, Update } from '@/api/cheliang/basevehiclecertificate'
+import { namesDownBySid, selectDownPlus } from '@/api/cheliang/basevehiclemodel'
+import { namesDown } from '@/api/cheliang/basevehicle'
+import { getNamesDownes } from '@/api/cheliang/basemanufacturer'
+import { getChe } from '@/utils/baocun'
+import { typeValues } from '@/api/cheliang/dictcommons'
+import ImageUpload from '@/components/uploadFile/ManyImageUpload' // 上传文件
+export default {
+  name: 'PinpaiAdd',
+  components: { ImageUpload },
+  data() {
+    return {
+      viewTitle: '',
+      // --按钮菜单-------
+      menuState: {
+        add: false, // 添加
+        edit: false, // 编辑
+        delete: false, // 删除
+        view: false, // 查看
+        audit: false, // 审核
+        input: false, // 导入
+        output: false, // 导出
+        upload: false, // 同步
+        release: false // 下发
+      },
+      FormLoading: false,
+      listLoading: false,
+      temp: {
+        certificateSituation: '',
+        certificateSituationValue: '',
+        certificatePhoto: [],
+        certificateState: '', // 合格证状态key
+        certificateStateValue: '' // 合格证状态value
+      }, // 添加和修改
+      templook: {}, // 查看实体
+      Situation: [],
+      qingkuang_list: [],
+      stateId: 0,
+      dialogFormVisible: false, // 添加修改对话框状态
+      dialogFormShowVisible: false, // 查看对话框默认关闭状态
+      dialogStatus: '', // 对话框状态
+      fenzuOptions: [],
+      attachTypeYingyezhizhao: [],
+      props: {
+        value: 'id',
+        label: 'name',
+        children: 'children',
+        checkStrictly: true
+      },
+      carBrandes: [],
+      ChangShangsid: '',
+      CJsid: '',
+      vinNosse: [],
+      Model: [],
+      vSid: null,
+      rules: {
+        certificationNo: [
+          { required: true, message: '请填写合格证编号', trigger: 'blur' }
+        ],
+        certificateDate: [
+          { required: true, message: '请选择发证日期', trigger: 'blur' }
+        ],
+        certificateSituation: [
+          { required: true, message: '请选择合格证情况', trigger: 'blur' }
+        ],
+        toCardDate: [
+          { required: true, message: '请选择到证日期', trigger: 'blur' }
+        ],
+        receiveDate: [
+          { required: true, message: '请选择领取日期', trigger: 'blur' }
+        ],
+        receiver: [
+          { required: true, message: '请填写领取人', trigger: 'blur' }
+        ],
+        remarks: [{ required: true, message: '请填写备注', trigger: 'blur' }]
+        // certificatePhoto: [
+        //   { required: true, message: '请选择合格证照片', trigger: 'blur' },
           // ],
         }
         // ------------------------------------
@@ -570,15 +558,28 @@
           }
         })
       },
-      //
+      // 合格证状态
       getHeGeZheng(value) {
         let bb = null
         this.Situation.forEach(e => {
           if (e.dictKey == value) {
             bb = {
-              type: 'certificateSituation',
               name: e.dictValue,
-              vaule: e.dictKey
+              key: e.dictKey
+            }
+          }
+        })
+        this.temp.certificateStateValue = bb.name
+        console.log('value值', this.temp.certificateStateValue)
+      },
+      // 合格证情况
+      getQingkuang(value) {
+        let bb = null
+        this.qingkuang_list.forEach(e => {
+          if (e.dictKey == value) {
+            bb = {
+              name: e.dictValue,
+              key: e.dictKey
             }
           }
         })
@@ -586,12 +587,20 @@
         console.log('value值', this.temp.certificateSituationValue)
       },
       setDate() {
-        typeValues({ type: this.certificateSituation }).then((res) => {
+        // 合格证状态
+        typeValues({ type: 'certificateState' }).then((res) => {
           console.log(res)
           if (res.code === '200') {
             this.Situation = res.data
           }
         })
+        // 合格证情况
+        typeValues({ type: 'certificateSituation' }).then((res) => {
+          console.log(res)
+          if (res.code === '200') {
+            this.qingkuang_list = res.data
+          }
+        })
       },
       // ----------------------------------方法--------------------
       fileChangeIt(files,imgFiles){
@@ -600,8 +609,14 @@
       // 返回
       handleReturn(isreload) {
         if (isreload === 'true') this.$emit('reloadlist')
-        // this.temp = {}
-        this.$emit('doback')
+        this.temp = {
+          certificateSituation: '',
+          certificateSituationValue: '',
+          certificatePhoto: [],
+          certificateState: '', // 合格证状态key
+          certificateStateValue: '' // 合格证状态value
+        }, // 添加和修改
+          this.$emit('doback')
         // this.$router.go(-1)
       },