lilei 1 năm trước cách đây
mục cha
commit
e563c8bde7

+ 23 - 18
src/views/productManagement/priceChangeRecord/list.vue

@@ -203,26 +203,31 @@ export default {
                 { title: '变更前', dataIndex: 'beforeProvincePrice', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
                 { title: '变更后', scopedSlots: { customRender: 'afterProvincePrice' }, width: '4%', align: 'right' }
               ]
-            },
-            {
-              title: '市级价',
-              dataIndex: 'sdterminaldsdPrice',
-              align: 'center',
-              children: [
-                { title: '变更前', dataIndex: 'beforeCityPrice', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-                { title: '变更后', scopedSlots: { customRender: 'afterCityPrice' }, width: '4%', align: 'right' }
-              ]
             })
+
+            if (this.$hasPermissions('M_ShowAllCityPrice')) {
+              this.columns.push({
+                title: '市级价',
+                dataIndex: 'sdterminaldsdPrice',
+                align: 'center',
+                children: [
+                  { title: '变更前', dataIndex: 'beforeCityPrice', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+                  { title: '变更后', scopedSlots: { customRender: 'afterCityPrice' }, width: '4%', align: 'right' }
+                ]
+              })
+            }
           } else if (res.data.dealerLevel && res.data.dealerLevel == 'CITY') { //  市级
-            this.columns.push({
-              title: '市级价',
-              dataIndex: 'sdterminaldsdPrice',
-              align: 'center',
-              children: [
-                { title: '变更前', dataIndex: 'beforeCityPrice', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-                { title: '变更后', scopedSlots: { customRender: 'afterCityPrice' }, width: '4%', align: 'right' }
-              ]
-            })
+            if (this.$hasPermissions('M_ShowAllCityPrice')) {
+              this.columns.push({
+                title: '市级价',
+                dataIndex: 'sdterminaldsdPrice',
+                align: 'center',
+                children: [
+                  { title: '变更前', dataIndex: 'beforeCityPrice', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+                  { title: '变更后', scopedSlots: { customRender: 'afterCityPrice' }, width: '4%', align: 'right' }
+                ]
+              })
+            }
           }
           if (res.data.isShowSpecialPrice && res.data.isShowSpecialPrice == '1') { //  是否展示特约价
             this.columns.push({

+ 19 - 17
src/views/productManagement/productInfoJg/list.vue

@@ -81,22 +81,12 @@
           <a-dropdown v-model="showCell">
             <a-button type="link" class="button-default"> <a-icon type="setting" />  显示</a-button>
             <a-menu slot="overlay">
-              <a-menu-item>
-                <a-checkbox v-model="isTerminalPrice">
-                  自定义终端价
-                </a-checkbox>
-              </a-menu-item>
-              <a-menu-item>
-                <a-checkbox v-model="isCarOwnersPrice">
-                  自定义车主价
-                </a-checkbox>
-              </a-menu-item>
               <a-menu-item v-if="currentDealerInfo.dealerLevel && currentDealerInfo.dealerLevel == 'PROVINCE'">
                 <a-checkbox v-model="isProPrice">
                   省级价
                 </a-checkbox>
               </a-menu-item>
-              <a-menu-item v-if="currentDealerInfo.dealerLevel && (currentDealerInfo.dealerLevel == 'CITY'||currentDealerInfo.dealerLevel == 'PROVINCE')">
+              <a-menu-item v-if="currentDealerInfo.dealerLevel && (currentDealerInfo.dealerLevel == 'CITY'||currentDealerInfo.dealerLevel == 'PROVINCE')&&$hasPermissions('M_ShowAllCityPrice')">
                 <a-checkbox v-model="isCityPrice">
                   市级价
                 </a-checkbox>
@@ -111,11 +101,21 @@
                   终端价
                 </a-checkbox>
               </a-menu-item>
+              <a-menu-item>
+                <a-checkbox v-model="isTerminalPrice">
+                  自定义终端价
+                </a-checkbox>
+              </a-menu-item>
               <a-menu-item>
                 <a-checkbox v-model="isCzPrice">
                   车主价
                 </a-checkbox>
               </a-menu-item>
+              <a-menu-item>
+                <a-checkbox v-model="isCarOwnersPrice">
+                  自定义车主价
+                </a-checkbox>
+              </a-menu-item>
             </a-menu>
           </a-dropdown>
           <a-divider type="vertical" style="margin:5px 0;"/>
@@ -287,22 +287,24 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
       ]
       if (_this.currentDealerInfo.dealerLevel && _this.currentDealerInfo.dealerLevel == 'PROVINCE') { //  省级
-        if(this.isProPrice){
+        if (this.isProPrice) {
           arr.push(
             { title: '省级价', dataIndex: 'provincePrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
           )
         }
-        if (_this.isCityPrice) {
+        if (_this.isCityPrice && _this.$hasPermissions('M_ShowAllCityPrice')) {
           arr.push(
             { title: '市级价', dataIndex: 'cityPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
           )
         }
       } else if (_this.currentDealerInfo.dealerLevel && _this.currentDealerInfo.dealerLevel == 'CITY' && _this.isCityPrice) { //  市级
-        arr.push(
-          { title: '市级价', dataIndex: 'cityPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
-        )
+        if (_this.$hasPermissions('M_ShowAllCityPrice')) {
+          arr.push(
+            { title: '市级价', dataIndex: 'cityPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+          )
+        }
       }
-      if (_this.currentDealerInfo.isShowSpecialPrice && _this.currentDealerInfo.isShowSpecialPrice == '1'&&_this.isSpecialPrice) { //  是否展示特约价
+      if (_this.currentDealerInfo.isShowSpecialPrice && _this.currentDealerInfo.isShowSpecialPrice == '1' && _this.isSpecialPrice) { //  是否展示特约价
         arr.push({ title: '特约价', dataIndex: 'specialPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
 

+ 2 - 2
src/views/salesManagement/productPricing/list.vue

@@ -58,7 +58,7 @@
     <div style="padding: 10px 0;text-align: right;">
       <a-checkbox v-model="isCostPrice" v-if="$hasPermissions('M_ShowAllCost')"><span style="display: inline-block;">成本价</span></a-checkbox>
       <!-- 特约加盟商不可见市级价 -->
-      <a-checkbox v-model="isCityPrice" v-if="dealerData && dealerData.dealerLevel != 'SPECIAL'"><span style="display: inline-block;">市级价</span></a-checkbox>
+      <a-checkbox v-model="isCityPrice" v-if="dealerData && dealerData.dealerLevel != 'SPECIAL'&&$hasPermissions('M_ShowAllCityPrice')"><span style="display: inline-block;">市级价</span></a-checkbox>
       <!-- 是否展示特约价 -->
       <a-checkbox v-model="isSpecialPrice" v-if="dealerData && dealerData.isShowSpecialPrice == '1'"><span style="display: inline-block;">特约价</span></a-checkbox>
       <a-checkbox v-model="isTerminalPrice"><span style="display: inline-block;">终端价/自定义终端价</span></a-checkbox>
@@ -172,7 +172,7 @@ export default {
       if (this.isCostPrice) {
         arr.splice(6, 0, { title: '成本价', dataIndex: 'offerCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.isCityPrice) {
+      if (this.isCityPrice && this.$hasPermissions('M_ShowAllCityPrice')) {
         const ind = this.isCostPrice ? 7 : 6
         arr.splice(ind, 0, { title: '市级价', dataIndex: 'cityPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }

+ 3 - 3
src/views/salesManagement/salesQuery/queryPart.vue

@@ -81,7 +81,7 @@
           </a-col>
           <a-col flex="auto" style="margin-bottom: 15px;display:flex;align-items:center;">
             <a-checkbox v-model="cost" v-if="$hasPermissions('M_ShowAllCost')" id="salesQuery-cost">成本价</a-checkbox>
-            <a-checkbox v-model="cityPrice" id="salesQuery-cityPrice">市级价</a-checkbox>
+            <a-checkbox v-model="cityPrice" v-if="$hasPermissions('M_ShowAllCityPrice')" id="salesQuery-cityPrice">市级价</a-checkbox>
             <a-checkbox v-model="tyuePrice" v-if="$store.state.user.isShowSpecialPrice==1" id="salesQuery-tyuePrice">特约价</a-checkbox>
             <a-checkbox v-model="zdPrice" id="salesQuery-zdPrice">终端价</a-checkbox>
           </a-col>
@@ -298,7 +298,7 @@ export default {
       if (this.cost) {
         arr.push({ slots: { title: 'costTitle' }, dataIndex: 'putCost', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.cityPrice) {
+      if (this.cityPrice && this.$hasPermissions('M_ShowAllCityPrice')) {
         arr.push({ title: '市级价', dataIndex: 'dealerProduct.cityPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.tyuePrice) {
@@ -480,7 +480,7 @@ export default {
     },
     // 仓库
     getWarehouse () {
-      warehouseAllList({wasteFlag: 0}).then(res => {
+      warehouseAllList({ wasteFlag: 0 }).then(res => {
         if (res.status == 200) {
           this.warehouseList = res.data
         } else {

+ 172 - 172
src/views/salesManagement/salesQueryNew/chooseProductModal.vue

@@ -10,44 +10,44 @@
     @close="onClose"
     wrapClassName="chooseProduct-drawer jg-drawer-wrap">
     <a-spin :spinning="spinning||newLoading" tip="Loading...">
-    <!-- 搜索条件 -->
-    <div ref="searchBox" class="table-page-search-wrapper">
-      <a-form-model
-        ref="ruleForm"
-        class="form-model-con"
-        layout="inline"
-        :rules="rules"
-        :model="queryParam"
-        @keyup.enter.native="$refs.table.refresh(true)" >
-        <a-row type="flex" :gutter="5">
-          <a-col flex="1">
-            <a-form-model-item label="产品编码">
-              <a-input id="productInfoList-code" ref="searchProductCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
-            </a-form-model-item>
-          </a-col>
-          <a-col flex="1">
-            <a-form-model-item label="产品名称">
-              <a-input id="productInfoList-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
-            </a-form-model-item>
-          </a-col>
-          <a-col flex="1">
-            <a-form-model-item label="原厂编码">
-              <a-input id="productInfoList-origCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
-            </a-form-model-item>
-          </a-col>
-          <a-col flex="1">
-            <a-form-model-item label="产品品牌">
-              <ProductBrand id="productInfoList-productBrandSn" v-model="queryParam.brandSn"></ProductBrand>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-        <a-row type="flex" :gutter="5">
-          <a-col flex="1.5">
-            <a-form-model-item label="产品分类">
-              <ProductType id="productInfoList-productType" :isDealer="true" @change="changeProductType" v-model="productType"></ProductType>
-            </a-form-model-item>
-          </a-col>
-          <a-col flex="1.5">
+      <!-- 搜索条件 -->
+      <div ref="searchBox" class="table-page-search-wrapper">
+        <a-form-model
+          ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
+          :rules="rules"
+          :model="queryParam"
+          @keyup.enter.native="$refs.table.refresh(true)" >
+          <a-row type="flex" :gutter="5">
+            <a-col flex="1">
+              <a-form-model-item label="产品编码">
+                <a-input id="productInfoList-code" ref="searchProductCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col flex="1">
+              <a-form-model-item label="产品名称">
+                <a-input id="productInfoList-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col flex="1">
+              <a-form-model-item label="原厂编码">
+                <a-input id="productInfoList-origCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col flex="1">
+              <a-form-model-item label="产品品牌">
+                <ProductBrand id="productInfoList-productBrandSn" v-model="queryParam.brandSn"></ProductBrand>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+          <a-row type="flex" :gutter="5">
+            <a-col flex="1.5">
+              <a-form-model-item label="产品分类">
+                <ProductType id="productInfoList-productType" :isDealer="true" @change="changeProductType" v-model="productType"></ProductType>
+              </a-form-model-item>
+            </a-col>
+            <a-col flex="1.5">
               <a-form-model-item label="仓库">
                 <a-select
                   placeholder="请选择仓库"
@@ -81,136 +81,136 @@
                 </a-select>
               </a-form-item>
             </a-col>
-          <a-col flex="auto">
-            <a-button type="primary" @click="searchForm()" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" id="productInfoList-reset">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form-model>
+            <a-col flex="auto">
+              <a-button type="primary" @click="searchForm()" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" id="productInfoList-reset">重置</a-button>
+            </a-col>
+          </a-row>
+        </a-form-model>
 
-      <div v-if="hasVaild&&showTable" class="vinInfo-box">
-        <div>
-          <div class="vinInfo-error" v-if="vinInfoData&&!vinInfoData.vinInfo">
-            <a-icon type="exclamation-circle" :style="{ color: '#E70012', fontSize: '15px', verticalAlign: 'sub', marginRight: '3px' }" />抱歉!暂未找到匹配VIN码的车型!
-          </div>
-          <div v-if="vinInfoData&&vinInfoData.vinInfo" @click="openCarInfoModal=true">
-            <div style="display: flex;justify-content: space-between;align-items: center;" @click="openCarInfoModal=true">
-              <div>
-                <img :src="vinInfoData.vinInfo && vinInfoData.vinInfo.icon?(vinInfoData.vinInfo.icon+'?x-oss-process=image/resize,h_30,m_lfit'):defImg" width="30" height="30" class="imageUrl" style="border-radius: 50%;vertical-align: middle;margin-right: 3px;" />
-                <span style="vertical-align: middle;">{{ vinInfoData.vinInfo.text }}</span>
-              </div>
-              <div style="color: #f90;cursor: pointer;">
-                <span>查看更多</span> >
+        <div v-if="hasVaild&&showTable" class="vinInfo-box">
+          <div>
+            <div class="vinInfo-error" v-if="vinInfoData&&!vinInfoData.vinInfo">
+              <a-icon type="exclamation-circle" :style="{ color: '#E70012', fontSize: '15px', verticalAlign: 'sub', marginRight: '3px' }" />抱歉!暂未找到匹配VIN码的车型!
+            </div>
+            <div v-if="vinInfoData&&vinInfoData.vinInfo" @click="openCarInfoModal=true">
+              <div style="display: flex;justify-content: space-between;align-items: center;" @click="openCarInfoModal=true">
+                <div>
+                  <img :src="vinInfoData.vinInfo && vinInfoData.vinInfo.icon?(vinInfoData.vinInfo.icon+'?x-oss-process=image/resize,h_30,m_lfit'):defImg" width="30" height="30" class="imageUrl" style="border-radius: 50%;vertical-align: middle;margin-right: 3px;" />
+                  <span style="vertical-align: middle;">{{ vinInfoData.vinInfo.text }}</span>
+                </div>
+                <div style="color: #f90;cursor: pointer;">
+                  <span>查看更多</span> >
+                </div>
               </div>
             </div>
           </div>
-        </div>
-        <div>
-          <a-dropdown v-model="showCell">
-            <a class="ant-dropdown-link" @click="e => e.preventDefault()">
-              <a-icon type="setting" /> 显示
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-checkbox v-model="cost" v-if="$hasPermissions('M_ShowAllCost')" id="salesQuery-cost">成本价</a-checkbox>
-              </a-menu-item>
-              <a-menu-item>
-                <a-checkbox v-model="cityPrice" id="salesQuery-cityPrice">市级价</a-checkbox>
-              </a-menu-item>
-              <a-menu-item>
-                <a-checkbox v-model="tyuePrice" v-if="$store.state.user.isShowSpecialPrice==1" id="salesQuery-tyuePrice">特约价</a-checkbox>
-              </a-menu-item>
-              <a-menu-item>
-                <a-checkbox v-model="zdPrice" id="salesQuery-zdPrice">终端价</a-checkbox>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+          <div>
+            <a-dropdown v-model="showCell">
+              <a class="ant-dropdown-link" @click="e => e.preventDefault()">
+                <a-icon type="setting" /> 显示
+              </a>
+              <a-menu slot="overlay">
+                <a-menu-item v-if="$hasPermissions('M_ShowAllCost')" >
+                  <a-checkbox v-model="cost" id="salesQuery-cost">成本价</a-checkbox>
+                </a-menu-item>
+                <a-menu-item v-if="$hasPermissions('M_ShowAllCityPrice')">
+                  <a-checkbox v-model="cityPrice" id="salesQuery-cityPrice">市级价</a-checkbox>
+                </a-menu-item>
+                <a-menu-item v-if="$store.state.user.isShowSpecialPrice==1" >
+                  <a-checkbox v-model="tyuePrice"id="salesQuery-tyuePrice">特约价</a-checkbox>
+                </a-menu-item>
+                <a-menu-item>
+                  <a-checkbox v-model="zdPrice" id="salesQuery-zdPrice">终端价</a-checkbox>
+                </a-menu-item>
+              </a-menu>
+            </a-dropdown>
+          </div>
         </div>
       </div>
-    </div>
-     
-    <!-- 列表 -->
-    <s-table
-      v-if="hasVaild&&showTable"
-      class="sTable"
-      ref="table"
-      size="small"
-      :rowKey="(record) => record.no"
-      rowKeyName="no"
-      :columns="columns"
-      :data="loadData"
-      @dblclick="handleClickRow"
-      :pageSize="30"
-      :scroll="{ y: tableHeight, x: tableWidth }"
-      bordered>
-      <div slot="costTitle">
-        <a-tooltip placement="top">
-          <template slot="title">
-            产品所在仓库仓位的最近一次入库成本,不包含盘盈入库和仓库调拨入库。
-          </template>
-          <span style="margin-right: 5px;">参考成本价</span> <a-icon type="question-circle" />
-        </a-tooltip>
-      </div>
-      <!-- 售价 -->
-      <template slot="salePrice" slot-scope="text, record">
-        <div style="display: flex;align-items: center;" @dblclick.stop>
-          <a-input-number
-            size="small"
-            v-model="record.price"
-            :precision="2"
-            :min="0"
-            :max="999999"
-            style="width: 100%;"
-            placeholder="请输入" />
-          <span style="color: red;margin: 0 2px;font-size: 14px;" v-if="record.origSalePriceFlag == 1">原</span>
-          <span v-else>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-        </div>
-      </template>
-      <!-- 销售数量 -->
-      <template slot="nums" slot-scope="text, record">
-        <div @dblclick.stop>
-          <a-input-number
-            size="small"
-            v-model="record.salesNums"
-            :precision="0"
-            :min="0"
-            :max="999999"
-            style="width: 100%;"
-            placeholder="请输入" />
+
+      <!-- 列表 -->
+      <s-table
+        v-if="hasVaild&&showTable"
+        class="sTable"
+        ref="table"
+        size="small"
+        :rowKey="(record) => record.no"
+        rowKeyName="no"
+        :columns="columns"
+        :data="loadData"
+        @dblclick="handleClickRow"
+        :pageSize="30"
+        :scroll="{ y: tableHeight, x: tableWidth }"
+        bordered>
+        <div slot="costTitle">
+          <a-tooltip placement="top">
+            <template slot="title">
+              产品所在仓库仓位的最近一次入库成本,不包含盘盈入库和仓库调拨入库。
+            </template>
+            <span style="margin-right: 5px;">参考成本价</span> <a-icon type="question-circle" />
+          </a-tooltip>
         </div>
-      </template>
-      <!-- 操作 -->
-      <template slot="action" slot-scope="text, record">
+        <!-- 售价 -->
+        <template slot="salePrice" slot-scope="text, record">
+          <div style="display: flex;align-items: center;" @dblclick.stop>
+            <a-input-number
+              size="small"
+              v-model="record.price"
+              :precision="2"
+              :min="0"
+              :max="999999"
+              style="width: 100%;"
+              placeholder="请输入" />
+            <span style="color: red;margin: 0 2px;font-size: 14px;" v-if="record.origSalePriceFlag == 1">原</span>
+            <span v-else>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+          </div>
+        </template>
+        <!-- 销售数量 -->
+        <template slot="nums" slot-scope="text, record">
+          <div @dblclick.stop>
+            <a-input-number
+              size="small"
+              v-model="record.salesNums"
+              :precision="0"
+              :min="0"
+              :max="999999"
+              style="width: 100%;"
+              placeholder="请输入" />
+          </div>
+        </template>
+        <!-- 操作 -->
+        <template slot="action" slot-scope="text, record">
           <span style="color:#999;" v-if="hasChecked(record)">已添加</span>
           <a-button
-          size="small"
-          type="link"
-          class="button-primary"
-          @click="handleAdd(record)"
-          v-else
-          id="productInfoList-edit-btn">添加</a-button>
-        <a-button
-          size="small"
-          type="link"
-          class="button-primary"
-          @click="handleDetail(record)"
-          id="productInfoList-detail-btn"
-          style="margin-left: 5px;">销售记录</a-button>
-      </template>
-    </s-table>
-    <div style="padding-top: 30px;" v-else>
-      <a-empty
-        :image="simpleImage"
-        :image-style="{
-          height: '60px',
-        }"
-      >
-        <span style="color:red" slot="description">请输入查询条件</span>
-      </a-empty>
-    </div>
-    
-    <!-- 查看车辆信息 -->
-    <car-info-modal ref="carInfoModal" :openModal="openCarInfoModal" :infoData="vinInfoData&&vinInfoData.vinInfo" @close="openCarInfoModal=false" />
+            size="small"
+            type="link"
+            class="button-primary"
+            @click="handleAdd(record)"
+            v-else
+            id="productInfoList-edit-btn">添加</a-button>
+          <a-button
+            size="small"
+            type="link"
+            class="button-primary"
+            @click="handleDetail(record)"
+            id="productInfoList-detail-btn"
+            style="margin-left: 5px;">销售记录</a-button>
+        </template>
+      </s-table>
+      <div style="padding-top: 30px;" v-else>
+        <a-empty
+          :image="simpleImage"
+          :image-style="{
+            height: '60px',
+          }"
+        >
+          <span style="color:red" slot="description">请输入查询条件</span>
+        </a-empty>
+      </div>
+
+      <!-- 查看车辆信息 -->
+      <car-info-modal ref="carInfoModal" :openModal="openCarInfoModal" :infoData="vinInfoData&&vinInfoData.vinInfo" @close="openCarInfoModal=false" />
     </a-spin>
   </a-drawer>
 </template>
@@ -247,7 +247,7 @@ export default {
     },
     checkedList: {
       type: Array,
-      default:() => []
+      default: () => []
     }
   },
   watch: {
@@ -264,7 +264,7 @@ export default {
   },
   data () {
     return {
-      showCell:false,
+      showCell: false,
       spinning: false,
       showTable: false,
       visible: this.showModal,
@@ -367,30 +367,30 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: '150px', align: 'center', sorter: true, customRender: function (text) { return text || '--' }, fixed: 'left' },
         { title: '产品名称', dataIndex: 'productName', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '品牌', dataIndex: 'brandName', width: '120px', align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
+        { title: '品牌', dataIndex: 'brandName', width: '120px', align: 'center', sorter: true, customRender: function (text) { return text || '--' } }
       ]
       if (this.cost) {
         this.tableWidth += 100
         arr.push({ slots: { title: 'costTitle' }, dataIndex: 'putCost', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }else{
+      } else {
         this.tableWidth -= 100
       }
-      if (this.cityPrice) {
+      if (this.cityPrice && this.$hasPermissions('M_ShowAllCityPrice')) {
         this.tableWidth += 80
         arr.push({ title: '市级价', dataIndex: 'dealerProduct.cityPrice', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }else{
+      } else {
         this.tableWidth -= 80
       }
       if (this.tyuePrice) {
         this.tableWidth += 80
         arr.push({ title: '特约价', dataIndex: 'dealerProduct.specialPrice', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }else{
+      } else {
         this.tableWidth -= 80
       }
       if (this.zdPrice) {
         this.tableWidth += 80
         arr.push({ title: '终端价', dataIndex: 'dealerProduct.terminalPrice', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }else{
+      } else {
         this.tableWidth -= 80
       }
 
@@ -412,7 +412,7 @@ export default {
     }
   },
   methods: {
-    hasChecked(item){
+    hasChecked (item) {
       return this.checkedList.includes(item.productSn)
     },
     // 查询
@@ -474,7 +474,7 @@ export default {
     },
     // 双击列表
     handleClickRow (record) {
-      if(!this.hasChecked(record)){
+      if (!this.hasChecked(record)) {
         this.$emit('add', record)
       }
     },
@@ -496,7 +496,7 @@ export default {
       this.vinInfoData = null
       this.showTable = false
 
-      if(!flag){
+      if (!flag) {
         this.$refs.table.refresh(true)
       }
     },
@@ -540,7 +540,7 @@ export default {
     },
     // 销售记录
     handleDetail (row) {
-      this.$emit('viewRecord',row)
+      this.$emit('viewRecord', row)
     },
     uploadFun () {
       document.getElementById('filed').click()
@@ -578,7 +578,7 @@ export default {
     },
     // 仓库
     getWarehouse () {
-      warehouseAllList({wasteFlag:0}).then(res => {
+      warehouseAllList({ wasteFlag: 0 }).then(res => {
         if (res.status == 200) {
           this.warehouseList = res.data
         } else {