Bladeren bron

产品管理页面优化

chenrui 1 jaar geleden
bovenliggende
commit
3e8df0b081

+ 41 - 37
src/views/productManagement/newProduct/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="productInfoList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="productInfoList-wrap searchBottomSpace">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -48,39 +48,43 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :defaultLoadData="false"
-        :scroll="{ x: 1090, y: tableHeight }"
-        bordered>
-        <!-- 上/下线时间 表头 -->
-        <template slot="auditTimeTit">
-          {{ $route.params.onlineFalg=='1'?'上':'下' }}线时间
-        </template>
-        <!-- 产品分类 -->
-        <template slot="productType" slot-scope="text, record">
-          <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-success"
-            @click="handleDetail(record)"
-            id="productInfoList-detail-btn">详情</a-button>
-        </template>
-      </s-table>
-    </a-spin>
-  </a-card>
+    </a-card>
+    <!-- 列表 -->
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :defaultLoadData="false"
+          :scroll="{ x: 1090, y: tableHeight }"
+          bordered>
+          <!-- 上/下线时间 表头 -->
+          <template slot="auditTimeTit">
+            {{ $route.params.onlineFalg=='1'?'上':'下' }}线时间
+          </template>
+          <!-- 产品分类 -->
+          <template slot="productType" slot-scope="text, record">
+            <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-success"
+              @click="handleDetail(record)"
+              id="productInfoList-detail-btn">详情</a-button>
+          </template>
+        </s-table>
+      </a-spin>
+    </a-card>
+  </div>
 </template>
 <script>
 import { commonMixin } from '@/utils/mixin'
@@ -122,7 +126,7 @@ export default {
       ],
       columns: [
         { title: '序号', dataIndex: 'no', width: 50, align: 'center' },
-        { slots: { title: 'auditTimeTit' }, dataIndex: 'auditTime', width: 140, align: 'center',customRender: function (text) { return text || '--' } },
+        { slots: { title: 'auditTimeTit' }, dataIndex: 'auditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 140, align: 'center' },
         { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
@@ -214,7 +218,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 215
+      this.tableHeight = window.innerHeight - tableSearchH - 225
     }
   },
   watch: {

+ 56 - 52
src/views/productManagement/priceChangeRecord/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="productChangeRecordList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="productChangeRecordList-wrap searchBottomSpace">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -56,55 +56,59 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+122.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ x: 1520, y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 产品分类 -->
-        <template slot="productType" slot-scope="text, record">
-          <span v-if="record.productEntity.productTypeName2 || record.productEntity.productTypeName3">{{ record.productEntity.productTypeName2 }} {{ record.productEntity.productTypeName3 ? '>' : '' }} {{ record.productEntity.productTypeName3 }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 变更状态 -->
-        <span slot="productStatus" slot-scope="text, record">
-          <a-switch checkedChildren="启用" unCheckedChildren="禁用" v-model="record.enabledFlag" @change="changeFlagHandle(text, record)"/>
-        </span>
-        <!-- 省级价变更后 -->
-        <template slot="afterProvincePrice" slot-scope="text, record">
-          <span v-if="record.afterProvincePrice || record.afterProvincePrice==0" :class="record.beforeProvincePrice != record.afterProvincePrice ? 'red' : ''">{{ toThousands(record.afterProvincePrice) }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 市级价变更后 -->
-        <template slot="afterCityPrice" slot-scope="text, record">
-          <span v-if="record.afterCityPrice || record.afterCityPrice==0" :class="record.beforeCityPrice != record.afterCityPrice ? 'red' : ''">{{ toThousands(record.afterCityPrice) }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 特约价变更后 -->
-        <template slot="afterSpecialPrice" slot-scope="text, record">
-          <span v-if="record.afterSpecialPrice || record.afterSpecialPrice==0" :class="record.beforeSpecialPrice != record.afterSpecialPrice ? 'red' : ''">{{ toThousands(record.afterSpecialPrice) }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 终端价变更后 -->
-        <template slot="afterTerminalPrice" slot-scope="text, record">
-          <span v-if="record.afterTerminalPrice || record.afterTerminalPrice==0" :class="record.beforeTerminalPrice != record.afterTerminalPrice ? 'red' : ''">{{ toThousands(record.afterTerminalPrice) }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 车主价变更后 -->
-        <template slot="afterCarOwnersPrice" slot-scope="text, record">
-          <span v-if="record.afterCarOwnersPrice || record.afterCarOwnersPrice==0" :class="record.beforeCarOwnersPrice != record.afterCarOwnersPrice ? 'red' : ''">{{ toThousands(record.afterCarOwnersPrice) }}</span>
-          <span v-else>--</span>
-        </template>
-      </s-table>
-    </a-spin>
-  </a-card>
+    </a-card>
+    <!-- 列表 -->
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+122.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ x: 1520, y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 产品分类 -->
+          <template slot="productType" slot-scope="text, record">
+            <span v-if="record.productEntity.productTypeName2 || record.productEntity.productTypeName3">{{ record.productEntity.productTypeName2 }} {{ record.productEntity.productTypeName3 ? '>' : '' }} {{ record.productEntity.productTypeName3 }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 变更状态 -->
+          <span slot="productStatus" slot-scope="text, record">
+            <a-switch checkedChildren="启用" unCheckedChildren="禁用" v-model="record.enabledFlag" @change="changeFlagHandle(text, record)"/>
+          </span>
+          <!-- 省级价变更后 -->
+          <template slot="afterProvincePrice" slot-scope="text, record">
+            <span v-if="record.afterProvincePrice || record.afterProvincePrice==0" :class="record.beforeProvincePrice != record.afterProvincePrice ? 'red' : ''">{{ toThousands(record.afterProvincePrice) }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 市级价变更后 -->
+          <template slot="afterCityPrice" slot-scope="text, record">
+            <span v-if="record.afterCityPrice || record.afterCityPrice==0" :class="record.beforeCityPrice != record.afterCityPrice ? 'red' : ''">{{ toThousands(record.afterCityPrice) }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 特约价变更后 -->
+          <template slot="afterSpecialPrice" slot-scope="text, record">
+            <span v-if="record.afterSpecialPrice || record.afterSpecialPrice==0" :class="record.beforeSpecialPrice != record.afterSpecialPrice ? 'red' : ''">{{ toThousands(record.afterSpecialPrice) }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 终端价变更后 -->
+          <template slot="afterTerminalPrice" slot-scope="text, record">
+            <span v-if="record.afterTerminalPrice || record.afterTerminalPrice==0" :class="record.beforeTerminalPrice != record.afterTerminalPrice ? 'red' : ''">{{ toThousands(record.afterTerminalPrice) }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 车主价变更后 -->
+          <template slot="afterCarOwnersPrice" slot-scope="text, record">
+            <span v-if="record.afterCarOwnersPrice || record.afterCarOwnersPrice==0" :class="record.beforeCarOwnersPrice != record.afterCarOwnersPrice ? 'red' : ''">{{ toThousands(record.afterCarOwnersPrice) }}</span>
+            <span v-else>--</span>
+          </template>
+        </s-table>
+      </a-spin>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -319,7 +323,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 233
+      this.tableHeight = window.innerHeight - tableSearchH - 263
     },
     // 修改状态
     changeFlagHandle (text, record) {

+ 7 - 5
src/views/productManagement/productBrand/detailModal.vue

@@ -8,7 +8,7 @@
     v-model="isShow"
     @cancel="isShow=false"
     :width="960">
-    <div>
+    <div class="modalContext">
       <a-descriptions bordered size="small" :column="1">
         <a-descriptions-item label="品牌名称:">{{ detailsData&&detailsData.brandName || '--' }}</a-descriptions-item>
         <a-descriptions-item label="品牌分类:">{{ detailsData&&detailsData.brandTypeDictValue || '--' }}</a-descriptions-item>
@@ -22,8 +22,8 @@
           <span v-else>--</span>
         </a-descriptions-item>
       </a-descriptions>
-      <div class="btn-cont"><a-button id="productBrandDetail-modal-back" @click="isShow = false">返回列表</a-button></div>
     </div>
+    <div class="btn-cont"><a-button id="productBrandDetail-modal-back" @click="isShow = false">返回列表</a-button></div>
     <a-modal :visible="previewVisible" :footer="null" centered :maskClosable="false" @cancel="previewVisible=false">
       <img alt="example" style="width: 100%;" :src="previewImage" />
     </a-modal>
@@ -92,9 +92,6 @@ export default {
 
 <style lang="less">
   .productBrandDetail-modal{
-    .ant-modal-body {
-      padding: 40px 40px 24px;
-    }
     .productPic{
       cursor: pointer;
       max-width: 100px;
@@ -108,5 +105,10 @@ export default {
     .ant-descriptions-item-label.ant-descriptions-item-colon{
       width: 120px;
     }
+    .modalContext{
+      padding: 0 40px;
+      max-height:630px;
+      overflow-y: scroll;
+    }
   }
 </style>

+ 10 - 8
src/views/productManagement/productBrand/editModal.vue

@@ -9,7 +9,7 @@
     @cancel="isShow=false"
     :width="960">
     <!-- 表单 -->
-    <div>
+    <div class="modalContext">
       <a-spin :spinning="spinning" tip="Loading...">
         <a-form-model
           id="productBrandEdit-form"
@@ -49,12 +49,12 @@
             <editor id="productBrandEdit-brandIntroduce" ref="editor" class="productBrandEdit-brandIntroduce" @on-change="editorChange" :cache="false"></editor>
           </a-form-model-item>
         </a-form-model>
-        <div class="btn-cont">
-          <a-button type="primary" id="product-brand-edit-modal-save" @click="handleSave">保存</a-button>
-          <a-button id="product-brand-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
-        </div>
       </a-spin>
     </div>
+    <div class="btn-cont">
+      <a-button type="primary" id="product-brand-edit-modal-save" @click="handleSave">保存</a-button>
+      <a-button id="product-brand-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
+    </div>
   </a-modal>
 </template>
 
@@ -191,9 +191,6 @@ export default {
 
 <style lang="less">
   .productBrandEdit-modal{
-    .ant-modal-body {
-    	padding: 40px 40px 24px;
-    }
     .upload{
       width: 100%!important;
     }
@@ -212,5 +209,10 @@ export default {
       text-align: center;
       margin: 35px 0 10px;
     }
+    .modalContext{
+      padding: 0 40px;
+      max-height:630px;
+      overflow-y: scroll;
+    }
   }
 </style>

+ 77 - 67
src/views/productManagement/productBrand/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="productBrandList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="productBrandList-wrap searchBottomSpace">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -29,70 +29,80 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button id="productBrandList-add" type="primary" v-if="$hasPermissions('B_productBrand_add')" class="button-error" @click="handleEdit()">新增</a-button>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 产品图片 -->
-        <template slot="imageUrl" slot-scope="text, record">
-          <img :src="record.imageUrl+'?x-oss-process=image/resize,h_30,m_lfit' || ''" width="30" height="30" class="imageUrl" @click="lookPic(record.imageUrl)" />
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_productBrand_edit')"
-            class="button-info"
-            @click="handleEdit(record)"
-            id="productBrandList-edit-btn">编辑</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_productBrand_detail')"
-            class="button-success"
-            @click="handleDetail(record)"
-            id="productBrandList-detail-btn">详情</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_productBrand_del')"
-            class="button-error"
-            @click="handleDel(record)"
-            id="productBrandList-del-btn">删除</a-button>
-          <span v-if="!$hasPermissions('B_productBrand_edit') && !$hasPermissions('B_productBrand_detail') && !$hasPermissions('B_productBrand_del')">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 新增/编辑产品品牌 -->
-    <product-brand-edit-modal v-drag :openModal="openModal" :nowData="nowData" :itemSn="itemSn" @ok="$refs.table.refresh()" @close="closeModal" />
-    <!-- 查看产品品牌 -->
-    <product-brand-detail-modal v-drag :openModal="openDetailModal" :itemSn="itemSn" @close="closeDetailModal" />
-    <!-- 查看图片 -->
-    <a-modal
-      centered
-      v-drag
-      class="productBrandList-modal"
-      :footer="null"
-      :maskClosable="false"
-      title="品牌图片"
-      v-model="openPicModal"
-      @cancel="nowPic=''">
-      <img :src="nowPic" width="100%" />
-    </a-modal>
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button id="productBrandList-add" type="primary" v-if="$hasPermissions('B_productBrand_add')" class="button-error" @click="handleEdit()">新增</a-button>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 产品图片 -->
+          <template slot="imageUrl" slot-scope="text, record">
+            <img :src="record.imageUrl+'?x-oss-process=image/resize,h_30,m_lfit' || ''" width="30" height="30" class="imageUrl" @click="lookPic(record.imageUrl)" />
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_productBrand_edit')"
+              class="button-info"
+              @click="handleEdit(record)"
+              id="productBrandList-edit-btn">编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_productBrand_detail')"
+              class="button-success"
+              @click="handleDetail(record)"
+              id="productBrandList-detail-btn">详情</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_productBrand_del')"
+              class="button-error"
+              @click="handleDel(record)"
+              id="productBrandList-del-btn">删除</a-button>
+            <span v-if="!$hasPermissions('B_productBrand_edit') && !$hasPermissions('B_productBrand_detail') && !$hasPermissions('B_productBrand_del')">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 新增/编辑产品品牌 -->
+      <product-brand-edit-modal
+        v-drag
+        :openModal="openModal"
+        :nowData="nowData"
+        :itemSn="itemSn"
+        @ok="$refs.table.refresh()"
+        @close="closeModal" />
+      <!-- 查看产品品牌 -->
+      <product-brand-detail-modal v-drag :openModal="openDetailModal" :itemSn="itemSn" @close="closeDetailModal" />
+      <!-- 查看图片 -->
+      <a-modal
+        centered
+        v-drag
+        class="productBrandList-modal"
+        :footer="null"
+        :maskClosable="false"
+        title="品牌图片"
+        v-model="openPicModal"
+        @cancel="nowPic=''">
+        <img :src="nowPic" width="100%" />
+      </a-modal>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -216,7 +226,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 265
     }
   },
   watch: {

+ 1 - 1
src/views/productManagement/productInfo/list.vue

@@ -613,7 +613,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 265
     }
   },
   watch: {

+ 35 - 33
src/views/productManagement/productLaunchAudit/list.vue

@@ -10,39 +10,41 @@
         code="PRODUCT_LOG_BIZ_STATE"
         allowClear></v-select>
     </div>
-    <a-card size="small" :bordered="false" >
+    <a-card size="small" :bordered="false" class="searchBottomSpace">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
+            <a-col :md="5" :sm="24">
+              <a-form-item label="产品名称">
+                <a-input id="productLaunchAuditList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="5" :sm="24">
+              <a-form-item label="产品编码">
+                <a-input id="productLaunchAuditList-code" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="提交时间">
+                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24" v-if="queryParam.bizState == 'PASS'">
+              <a-form-item label="是否新品">
+                <v-select code="FLAG" id="productLaunchAuditList-isNew" v-model="queryParam.newProductFlag" allowClear placeholder="请选择产品是否为新品"></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productLaunchAuditList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productLaunchAuditList-reset">重置</a-button>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
-        <!-- 搜索条件 -->
-        <div ref="tableSearch" class="table-page-search-wrapper">
-          <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-            <a-row :gutter="15">
-              <a-col :md="5" :sm="24">
-                <a-form-item label="产品名称">
-                  <a-input id="productLaunchAuditList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="5" :sm="24">
-                <a-form-item label="产品编码">
-                  <a-input id="productLaunchAuditList-code" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="提交时间">
-                  <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="4" :sm="24" v-if="queryParam.bizState == 'PASS'">
-                <a-form-item label="是否新品">
-                  <v-select code="FLAG" id="productLaunchAuditList-isNew" v-model="queryParam.newProductFlag" allowClear placeholder="请选择产品是否为新品"></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
-                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productLaunchAuditList-refresh">查询</a-button>
-                <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productLaunchAuditList-reset">重置</a-button>
-              </a-col>
-            </a-row>
-          </a-form>
-        </div>
         <!-- 列表 -->
         <div style="margin-bottom: 10px">
           <a-button type="primary" v-if="$hasPermissions('B_productLaunchAudit_batchAudit')&&queryParam.bizState == 'WAIT'" id="productLaunchAudit-export" :loading="loading" @click="handleBatchAudit">批量审核</a-button>
@@ -289,7 +291,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 285
+      this.tableHeight = window.innerHeight - tableSearchH - 312
     }
   },
   watch: {

+ 79 - 75
src/views/productManagement/productLevel/list.vue

@@ -1,90 +1,94 @@
 <template>
-  <a-card size="small" :bordered="false" class="productLevelList-wrap">
-    <!-- 搜索条件 -->
-    <div ref="tableSearch" class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="产品名称">
-              <a-input id="productLevelList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="产品编码/原厂编码">
-              <a-input id="productLevelList-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入产品编码"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="产品分类">
-              <ProductType id="productLevelList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
-            </a-form-model-item>
-          </a-col>
-          <template v-if="advanced">
+  <div>
+    <a-card size="small" :bordered="false" class="productLevelList-wrap searchBottomSpace">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="品牌">
-                <ProductBrand id="productLevelList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+              <a-form-item label="产品名称">
+                <a-input id="productLevelList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品级别">
-                <v-select code="PRODUCT_LEVEL" id="productLevelList-level" v-model="queryParam.level" allowClear placeholder="请选择产品级别"></v-select>
+              <a-form-item label="产品编码/原厂编码">
+                <a-input id="productLevelList-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
-          </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productLevelList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productLevelList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
-              {{ advanced ? '收起' : '展开' }}
-              <a-icon :type="advanced ? 'up' : 'down'"/>
-            </a>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="产品分类">
+                <ProductType id="productLevelList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+              </a-form-model-item>
+            </a-col>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="品牌">
+                  <ProductBrand id="productLevelList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="产品级别">
+                  <v-select code="PRODUCT_LEVEL" id="productLevelList-level" v-model="queryParam.level" allowClear placeholder="请选择产品级别"></v-select>
+                </a-form-item>
+              </a-col>
+            </template>
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productLevelList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productLevelList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
     <!-- 操作按钮 -->
     <!-- <div class="table-operator" style="margin-bottom: 10px;">
       <a-button id="productLevelList-import" type="primary" @click="handleImport">导入</a-button>
       <a-button style="margin-left: 5px" id="productLevelList-export" type="danger" @click="handleExport" :loading="exportLoading">导出</a-button>
     </div> -->
     <!-- 列表 -->
-    <s-table
-      class="sTable fixPagination"
-      ref="table"
-      :style="{ height: tableHeight+84.5+'px' }"
-      size="small"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :data="loadData"
-      :scroll="{ y: tableHeight }"
-      :defaultLoadData="false"
-      bordered>
-      <!-- 产品分类 -->
-      <template slot="productType" slot-scope="text, record">
-        <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
-        <span v-else>--</span>
-      </template>
-      <!-- 操作 -->
-      <template slot="action" slot-scope="text, record">
-        <a-button
-          size="small"
-          type="link"
-          v-if="$hasPermissions('B_productLevel_edit')"
-          class="button-info"
-          @click="handleEdit(record)"
-          id="productLevelList-edit-btn">编辑</a-button>
-        <span v-else>--</span>
-      </template>
-    </s-table>
-    <!-- 编辑价格 -->
-    <product-level-edit-modal
-      v-drag
-      :openModal="openModal"
-      :itemId="itemId"
-      :nowData="nowData"
-      @close="closeModal"
-      @ok="$refs.table.refresh()" />
-  </a-card>
+    <a-card size="small" :bordered="false">
+      <s-table
+        class="sTable fixPagination"
+        ref="table"
+        :style="{ height: tableHeight+84.5+'px' }"
+        size="small"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
+        bordered>
+        <!-- 产品分类 -->
+        <template slot="productType" slot-scope="text, record">
+          <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
+          <span v-else>--</span>
+        </template>
+        <!-- 操作 -->
+        <template slot="action" slot-scope="text, record">
+          <a-button
+            size="small"
+            type="link"
+            v-if="$hasPermissions('B_productLevel_edit')"
+            class="button-info"
+            @click="handleEdit(record)"
+            id="productLevelList-edit-btn">编辑</a-button>
+          <span v-else>--</span>
+        </template>
+      </s-table>
+      <!-- 编辑价格 -->
+      <product-level-edit-modal
+        v-drag
+        :openModal="openModal"
+        :itemId="itemId"
+        :nowData="nowData"
+        @close="closeModal"
+        @ok="$refs.table.refresh()" />
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -218,7 +222,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 225
     }
   },
   watch: {

+ 33 - 29
src/views/productManagement/productNotOnline/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="productPricingList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="productPricingList-wrap searchBottomSpace">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchForm">
@@ -61,31 +61,35 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator" style="text-align:right;">
-        <a-checkbox v-model="zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag" @change="handleChangeQty">仅显示有库存</a-checkbox>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.no"
-        rowKeyName="no"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 产品分类 -->
-        <template slot="productType" slot-scope="text, record">
-          <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
-          <span v-else>--</span>
-        </template>
-      </s-table>
-    </a-spin>
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator" style="text-align:right;">
+          <a-checkbox v-model="zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag" @change="handleChangeQty">仅显示有库存</a-checkbox>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.no"
+          rowKeyName="no"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 产品分类 -->
+          <template slot="productType" slot-scope="text, record">
+            <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
+            <span v-else>--</span>
+          </template>
+        </s-table>
+      </a-spin>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -97,7 +101,7 @@ import { queryOnlinePage, excelOnlineList } from '@/api/product'
 import ProductType from '@/views/common/productType.js'
 import ProductBrand from '@/views/common/productBrand.js'
 export default {
-  name: 'productNotOnlineList',
+  name: 'ProductNotOnlineList',
   mixins: [commonMixin],
   components: { STable, VSelect, rangeDate, ProductBrand, ProductType },
   data () {
@@ -243,7 +247,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 255
     }
   },
   watch: {

+ 51 - 48
src/views/productManagement/productOfflineAudit/list.vue

@@ -11,68 +11,71 @@
         allowClear></v-select>
     </div>
 
-    <a-card size="small" :bordered="false">
-      <a-spin :spinning="spinning" tip="Loading...">
-        <!-- 搜索条件 -->
-        <div ref="tableSearch" class="table-page-search-wrapper">
-          <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-            <a-row :gutter="15">
+    <a-card size="small" :bordered="false" class="searchBottomSpace">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品名称">
+                <a-input id="productOfflineAuditList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品编码/通用编码">
+                <a-input id="productOfflineAuditList-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入产品编码/通用编码"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="下线选项">
+                <v-select
+                  v-model="queryParam.reasonType"
+                  ref="reasonType"
+                  id="productOfflineAuditList-reasonType"
+                  code="OFFLINE_REASON_TYPE"
+                  placeholder="请选择下线选项"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品名称">
-                  <a-input id="productOfflineAuditList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+                <a-form-item label="品牌">
+                  <ProductBrand id="productOfflineAuditList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品编码/通用编码">
-                  <a-input id="productOfflineAuditList-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入产品编码/通用编码"/>
+                <a-form-item label="产品分类">
+                  <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="productOfflineAuditList-productType"></productTypeAll>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="下线选项">
-                  <v-select
-                    v-model="queryParam.reasonType"
-                    ref="reasonType"
-                    id="productOfflineAuditList-reasonType"
-                    code="OFFLINE_REASON_TYPE"
-                    placeholder="请选择下线选项"
-                    allowClear></v-select>
+                <a-form-item label="提交时间">
+                  <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
                 </a-form-item>
               </a-col>
-              <template v-if="advanced">
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="品牌">
-                    <ProductBrand id="productOfflineAuditList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="产品分类">
-                    <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="productOfflineAuditList-productType"></productTypeAll>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="提交时间">
-                    <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
-                  </a-form-item>
-                </a-col>
-              </template>
-              <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productOfflineAuditList-refresh">查询</a-button>
-                <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productOfflineAuditList-reset">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 5px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
-              </a-col>
-            </a-row>
-          </a-form>
-        </div>
-        <!-- 列表 -->
+            </template>
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productOfflineAuditList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productOfflineAuditList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <!-- 列表 -->
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
         <div style="margin-bottom: 10px">
           <a-button type="primary" v-if="$hasPermissions('B_productOfflineAudit_batchAudit')&&queryParam.bizState == 'WAIT'" id="productOfflineAudit-export" :loading="loading" @click="handleBatchAudit">批量审核</a-button>
           <span style="margin-left: 5px" v-if="$hasPermissions('B_productOfflineAudit_batchAudit')">
             <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
           </span>
         </div>
+
         <s-table
           class="sTable fixPagination"
           ref="table"
@@ -305,7 +308,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 300
+      this.tableHeight = window.innerHeight - tableSearchH - 310
     }
   },
   watch: {

+ 80 - 76
src/views/productManagement/productPricing/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="productPricingList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="productPricingList-wrap searchBottomSpace">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchForm">
@@ -56,81 +56,85 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button
-          style="margin: 0 15px 0 0;"
-          v-if="$hasPermissions('B_productPriceImport')"
-          id="productPricingList-add"
-          @click="openGuideModal=true"
-          type="primary"
-          class="button-error">定价导入</a-button>
-        <a-button
-          id="productPricingList-batchAudit"
-          type="primary"
-          class="button-warning"
-          :loading="spinning"
-          @click="handleBatchAudit"
-          v-if="$hasPermissions('B_productPricing_audit')"
-          style="margin: 0 15px 0 0;">批量审核</a-button>
-        <span v-if="$hasPermissions('B_productPricing_audit')&&selTotal">已选{{ selTotal }}项</span>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :row-selection="$hasPermissions('B_productPricing_audit') ? { columnWidth: '4%', getCheckboxProps: record => ({ props: { disabled: record.pricingState!='WAIT_PRICING_AUDIT' } })}: null"
-        @rowSelection="rowSelectionFun"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 产品分类 -->
-        <template slot="productType" slot-scope="text, record">
-          <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 成本价 -->
-        <template slot="sterminaldsdPrice" slot-scope="text, record">
-          <div v-if="record.supplierProductList">
-            <p v-for="(item, index) in record.supplierProductList" :key="index" style="margin: 0;">
-              <span>{{ (item.cost || item.cost==0) ? item.cost.toFixed(2):'--' }}</span>元 -
-              <span>{{ (item.supplierName||'') }}</span>;
-            </p>
-          </div>
-          <span v-else>--</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
           <a-button
-            size="small"
-            type="link"
-            v-if="record.pricingState=='WAIT_PRICING_AUDIT' && $hasPermissions('B_productPricing_audit')"
-            class="button-warning"
-            @click="handleAudit(record)"
-            id="productPricingList-audit-btn">审核</a-button>
+            style="margin: 0 15px 0 0;"
+            v-if="$hasPermissions('B_productPriceImport')"
+            id="productPricingList-add"
+            @click="openGuideModal=true"
+            type="primary"
+            class="button-error">定价导入</a-button>
           <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_productPricing_edit')"
-            class="button-info"
-            @click="handleEdit(record)"
-            id="productPricingList-edit-btn">编辑</a-button>
-          <span v-if="!(record.pricingState=='WAIT_PRICING_AUDIT' && $hasPermissions('B_productPricing_audit')) && !$hasPermissions('B_productPricing_edit')">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 编辑价格 -->
-    <product-pricing-edit-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" @ok="$refs.table.refresh()" />
-    <!-- 审核价格 -->
-    <product-pricing-audit-modal v-drag :openModal="openAuditModal" :itemSn="itemSn" @close="closeAuditModal" @ok="auditSuccess" />
-    <!-- 导入产品 -->
-    <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="hanldeOk" />
-  </a-card>
+            id="productPricingList-batchAudit"
+            type="primary"
+            class="button-warning"
+            :loading="spinning"
+            @click="handleBatchAudit"
+            v-if="$hasPermissions('B_productPricing_audit')"
+            style="margin: 0 15px 0 0;">批量审核</a-button>
+          <span v-if="$hasPermissions('B_productPricing_audit')&&selTotal">已选{{ selTotal }}项</span>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :row-selection="$hasPermissions('B_productPricing_audit') ? { columnWidth: '4%', getCheckboxProps: record => ({ props: { disabled: record.pricingState!='WAIT_PRICING_AUDIT' } })}: null"
+          @rowSelection="rowSelectionFun"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 产品分类 -->
+          <template slot="productType" slot-scope="text, record">
+            <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 成本价 -->
+          <template slot="sterminaldsdPrice" slot-scope="text, record">
+            <div v-if="record.supplierProductList">
+              <p v-for="(item, index) in record.supplierProductList" :key="index" style="margin: 0;">
+                <span>{{ (item.cost || item.cost==0) ? item.cost.toFixed(2):'--' }}</span>元 -
+                <span>{{ (item.supplierName||'') }}</span>;
+              </p>
+            </div>
+            <span v-else>--</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.pricingState=='WAIT_PRICING_AUDIT' && $hasPermissions('B_productPricing_audit')"
+              class="button-warning"
+              @click="handleAudit(record)"
+              id="productPricingList-audit-btn">审核</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_productPricing_edit')"
+              class="button-info"
+              @click="handleEdit(record)"
+              id="productPricingList-edit-btn">编辑</a-button>
+            <span v-if="!(record.pricingState=='WAIT_PRICING_AUDIT' && $hasPermissions('B_productPricing_audit')) && !$hasPermissions('B_productPricing_edit')">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 编辑价格 -->
+      <product-pricing-edit-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" @ok="$refs.table.refresh()" />
+      <!-- 审核价格 -->
+      <product-pricing-audit-modal v-drag :openModal="openAuditModal" :itemSn="itemSn" @close="closeAuditModal" @ok="auditSuccess" />
+      <!-- 导入产品 -->
+      <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="hanldeOk" />
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -340,7 +344,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 265
     }
   },
   watch: {

+ 51 - 47
src/views/productManagement/productUniversal/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="productUniversalList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="productUniversalList-wrap searchBottomSpace">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -52,50 +52,54 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button id="productUniversalList-add" type="primary" v-if="$hasPermissions('B_productUniversal_add')" class="button-error" @click="handleEdit()">新增</a-button>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 产品分类 -->
-        <template slot="productType" slot-scope="text, record">
-          <span v-if="record.productCommont.productTypeName2 || record.productCommont.productTypeName3">{{ record.productCommont.productTypeName2 }} {{ record.productCommont.productTypeName3 ? '>' : '' }} {{ record.productCommont.productTypeName3 }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_productUniversal_edit')"
-            class="button-info"
-            @click="handleEdit(record)"
-            id="productUniversalList-edit-btn">编辑</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_productUniversal_del')"
-            class="button-error"
-            @click="handleDel(record)"
-            id="productUniversalList-del-btn">删除</a-button>
-          <span v-if="!$hasPermissions('B_productUniversal_edit') && !$hasPermissions('B_productUniversal_del')">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 新增/编辑 -->
-    <product-universal-edit-modal v-drag :openModal="openModal" :itemId="itemId" @close="closeModal" @ok="$refs.table.refresh()" />
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button id="productUniversalList-add" type="primary" v-if="$hasPermissions('B_productUniversal_add')" class="button-error" @click="handleEdit()">新增</a-button>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 产品分类 -->
+          <template slot="productType" slot-scope="text, record">
+            <span v-if="record.productCommont.productTypeName2 || record.productCommont.productTypeName3">{{ record.productCommont.productTypeName2 }} {{ record.productCommont.productTypeName3 ? '>' : '' }} {{ record.productCommont.productTypeName3 }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_productUniversal_edit')"
+              class="button-info"
+              @click="handleEdit(record)"
+              id="productUniversalList-edit-btn">编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_productUniversal_del')"
+              class="button-error"
+              @click="handleDel(record)"
+              id="productUniversalList-del-btn">删除</a-button>
+            <span v-if="!$hasPermissions('B_productUniversal_edit') && !$hasPermissions('B_productUniversal_del')">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 新增/编辑 -->
+      <product-universal-edit-modal v-drag :openModal="openModal" :itemId="itemId" @close="closeModal" @ok="$refs.table.refresh()" />
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -232,7 +236,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 265
     }
   },
   watch: {

+ 14 - 9
src/views/productManagement/shelfNoManage/changeRecordModal.vue

@@ -7,15 +7,19 @@
     v-model="isShow"
     @cancel="isShow=false"
     width="50%">
-    <a-descriptions size="small" :column="1">
-      <a-descriptions-item label="产品编码">
-        {{ detailData&&detailData.product.code || '--' }}
-      </a-descriptions-item>
-      <a-descriptions-item label="产品名称">
-        {{ detailData&&detailData.product.name || '--' }}
-      </a-descriptions-item>
-    </a-descriptions>
-    <a-spin :spinning="spinning" tip="Loading...">
+    <a-collapse :activeKey="['1']">
+      <a-collapse-panel key="1" header="记录基本信息">
+        <a-descriptions size="small" :column="1">
+          <a-descriptions-item label="产品编码">
+            {{ detailData&&detailData.product.code || '--' }}
+          </a-descriptions-item>
+          <a-descriptions-item label="产品名称">
+            {{ detailData&&detailData.product.name || '--' }}
+          </a-descriptions-item>
+        </a-descriptions>
+      </a-collapse-panel>
+    </a-collapse>
+    <a-spin :spinning="spinning" tip="Loading..." style="margin-top:10px;">
       <s-table
         class="sTable fixPagination"
         ref="table"
@@ -24,6 +28,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ y: 500 }"
+        :style="{ height: '300px' }"
         :showPagination="false"
         :defaultLoadData="false"
         bordered>

+ 62 - 58
src/views/productManagement/shelfNoManage/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="shelfNoMan-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="shelfNoMan-wrap searchBottomSpace">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -84,60 +84,64 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button
-          id="shelfNoMan-batchAudit"
-          v-if="$hasPermissions('B_shelfNoManage_import')"
-          type="primary"
-          @click="openGuideModal = true"
-        >批量导入</a-button>
-        <a-button type="primary" @click="openNewModal" class="button-warning" id="shelfNoMan-add">新增</a-button>
-      </div>
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 产品分类 -->
-        <template slot="productType" slot-scope="text, record">
-          <span v-if="record.product.productTypeName2 || record.product.productTypeName3">{{ record.product.productTypeName2 }} {{ record.product.productTypeName3 ? '>' : '' }} {{ record.product.productTypeName3 }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <div>
-            <a-button
-              size="small"
-              type="link"
-              v-if="$hasPermissions('B_shelfNoManage_edit')"
-              class="button-info"
-              @click="handleEdit(record)"
-              id="shelfNoMan-edit-btn">编辑</a-button>
-            <a-button
-              size="small"
-              type="link"
-              v-if="$hasPermissions('B_shelfNoManage_detail')"
-              class="button-success"
-              @click="handleDetail(record)"
-              id="shelfNoMan-detail-btn">变更记录</a-button>
-          </div>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 导入产品 -->
-    <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="hanldeOk" />
-    <!-- 编辑 -->
-    <editHwModal v-drag :openModal="openModal" :nowData="nowData" @ok="editOk" @close="closeModal" />
-    <!-- 变更记录 -->
-    <changeRecordModal v-drag :openModal="recordModal" :detailData="nowData" @close="closeModal"></changeRecordModal>
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button
+            id="shelfNoMan-batchAudit"
+            v-if="$hasPermissions('B_shelfNoManage_import')"
+            type="primary"
+            @click="openGuideModal = true"
+          >批量导入</a-button>
+          <a-button type="primary" @click="openNewModal" class="button-warning" id="shelfNoMan-add">新增</a-button>
+        </div>
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 产品分类 -->
+          <template slot="productType" slot-scope="text, record">
+            <span v-if="record.product.productTypeName2 || record.product.productTypeName3">{{ record.product.productTypeName2 }} {{ record.product.productTypeName3 ? '>' : '' }} {{ record.product.productTypeName3 }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <div>
+              <a-button
+                size="small"
+                type="link"
+                v-if="$hasPermissions('B_shelfNoManage_edit')"
+                class="button-info"
+                @click="handleEdit(record)"
+                id="shelfNoMan-edit-btn">编辑</a-button>
+              <a-button
+                size="small"
+                type="link"
+                v-if="$hasPermissions('B_shelfNoManage_detail')"
+                class="button-success"
+                @click="handleDetail(record)"
+                id="shelfNoMan-detail-btn">变更记录</a-button>
+            </div>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 导入产品 -->
+      <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="hanldeOk" />
+      <!-- 编辑 -->
+      <editHwModal v-drag :openModal="openModal" :nowData="nowData" @ok="editOk" @close="closeModal" />
+      <!-- 变更记录 -->
+      <changeRecordModal v-drag :openModal="recordModal" :detailData="nowData" @close="closeModal"></changeRecordModal>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -174,7 +178,7 @@ export default {
           productTypeSn3: '', //  产品三级分类
           state: undefined //  产品状态
         },
-        warehouseSn: undefined, // 仓库
+        warehouseSn: undefined // 仓库
       },
       productType: [],
       disabled: false, //  查询、重置按钮是否可操作
@@ -301,7 +305,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 265
     }
   },
   watch: {