Просмотр исходного кода

Merge branch 'develop_yh28' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh28

lilei 1 год назад
Родитель
Сommit
c9587fa9e1

+ 47 - 43
src/views/basicData/warehouse/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="warehouseList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="warehouseList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -17,52 +17,56 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button v-if="$hasPermissions('B_warehouse_add')" id="warehouseList-add" type="primary" 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="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-warning"
-            @click="goStoringLocation(record)"
-            v-if="$hasPermissions('B_warehouse_ckSet')"
-            id="warehouseList-storingLocation-btn">仓位管理</a-button>
-          <a-button
-            size="small"
-            type="link"
-            class="button-info"
-            v-if="record.defaultFlag!='1' &&$hasPermissions('B_warehouse_edit') "
-            @click="handleEdit(record)"
-            id="warehouseList-edit-btn">编辑</a-button>
-          <!-- <a-button
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button v-if="$hasPermissions('B_warehouse_add')" id="warehouseList-add" type="primary" 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="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-warning"
+              @click="goStoringLocation(record)"
+              v-if="$hasPermissions('B_warehouse_ckSet')"
+              id="warehouseList-storingLocation-btn">仓位管理</a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-info"
+              v-if="record.defaultFlag!='1' &&$hasPermissions('B_warehouse_edit') "
+              @click="handleEdit(record)"
+              id="warehouseList-edit-btn">编辑</a-button>
+            <!-- <a-button
             size="small"
             type="link"
             class="button-error"
             v-if="record.defaultFlag!='1' &&$hasPermissions('B_warehouse_del')"
             @click="handleDel(record)"
             id="warehouseList-del-btn">删除</a-button> -->
-          <span v-if="record.defaultFlag=='0' && !$hasPermissions('B_warehouse_edit') && !$hasPermissions('B_warehouse_del')">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 新增/编辑仓库 -->
-    <warehouse-edit-modal :openModal="openModal" :nowData="nowData" :itemSn="itemSn" @ok="handleOk" @close="closeModal" />
-  </a-card>
+            <span v-if="record.defaultFlag=='0' && !$hasPermissions('B_warehouse_edit') && !$hasPermissions('B_warehouse_del')">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 新增/编辑仓库 -->
+      <warehouse-edit-modal :openModal="openModal" :nowData="nowData" :itemSn="itemSn" @ok="handleOk" @close="closeModal" />
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -168,7 +172,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 240
+      this.tableHeight = window.innerHeight - tableSearchH - 250
     }
   },
   watch: {

+ 1 - 1
src/views/basicData/warehouse/storingLocation/list.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="storingLocationList-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <strong style="color: rgba(0, 0, 0);margin-left: 50px;">所属仓库:{{ $route.query.name }}</strong>
+          <strong style="color: rgb(102, 102, 102);margin-left: 20px;">所属仓库:{{ $route.query.name }}</strong>
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" class="storingLocationList-cont">

+ 7 - 2
src/views/bnSetting/menu/adminMenus.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" :bodyStyle="{overflowY: 'auto'}">
+  <a-card :bordered="false" :bodyStyle="{overflowY: 'auto'}"   :style="{height:windowHeight +'px'}">
     <a-row :gutter="24">
       <a-button style="margin-right: 10px;" type="primary" icon="plus" @click="addChild">添加子菜单</a-button>
       <a-button style="margin-right: 10px;background-color: #19be6b;color: #fff;" type="" icon="plus" @click="addTitle">添加顶部菜单</a-button>
@@ -187,7 +187,8 @@ export default {
         type: '0',
         isLeaf: true,
         status: '' // 活动状态
-      }
+      },
+      windowHeight:0
     }
   },
   computed: {
@@ -439,10 +440,14 @@ export default {
     },
     handleCancel () {
       this.clear()
+    },
+    setTableH () {
+      this.windowHeight = window.innerHeight - 90
     }
   },
   mounted () {
     this.priceOptions = this.$store.state.app.priceAuthOptions
+    this.setTableH();
   },
   beforeCreate () {
     this.form = this.$form.createForm(this, { name: 'menu' })

+ 52 - 48
src/views/power/role/roleList.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="roleList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="roleList-wrap searchBoxNormal">
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
@@ -27,46 +27,49 @@
           </a-row>
         </a-form>
       </div>
-      <div class="table-operator">
-        <a-button type="primary" v-if="$hasPermissions('B_power_role_add')" class="button-error" @click="openModal" id="roleList-openModal">新增</a-button>
-      </div>
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        rowKey="id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        style="word-break: break-all;"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 启用禁用 -->
-        <span slot="status" slot-scope="text, record">
-          <a-switch
-            v-if="$hasPermissions('B_power_role_enable')"
-            checkedChildren="启用"
-            unCheckedChildren="禁用"
-            id="roleList-isEnable"
-            v-model="record.isEnable"
-            @change="changeFlagHandle(text, record)" />
-          <span v-else>{{ record.isEnable==1?'已启用':'已禁用' }}</span>
-        </span>
-        <!-- 角色描述 -->
-        <template slot="remarks" slot-scope="text, record">
-          <span class="text-overflows" :title="record.remarks">{{ record.remarks ?record.remarks : '--' }}</span>
-        </template>
-        <!-- 操作 -->
-        <span slot="action" slot-scope="text, record">
-          <a-button
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <div class="table-operator">
+          <a-button type="primary" v-if="$hasPermissions('B_power_role_add')" class="button-error" @click="openModal" id="roleList-openModal">新增</a-button>
+        </div>
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          rowKey="id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          style="word-break: break-all;"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 启用禁用 -->
+          <span slot="status" slot-scope="text, record">
+            <a-switch
+              v-if="$hasPermissions('B_power_role_enable')"
+              checkedChildren="启用"
+              unCheckedChildren="禁用"
+              id="roleList-isEnable"
+              v-model="record.isEnable"
+              @change="changeFlagHandle(text, record)" />
+            <span v-else>{{ record.isEnable==1?'已启用':'已禁用' }}</span>
+          </span>
+          <!-- 角色描述 -->
+          <template slot="remarks" slot-scope="text, record">
+            <span class="text-overflows" :title="record.remarks">{{ record.remarks ?record.remarks : '--' }}</span>
+          </template>
+          <!-- 操作 -->
+          <span slot="action" slot-scope="text, record">
+            <a-button
               size="small"
               type="link"
               class="button-info"
               v-if="$hasPermissions('M_power_role_menu')"
               @click="openMenuModal(record,1)"
             >
-            功能权限
+              功能权限
             </a-button>
             <a-button
               size="small"
@@ -75,7 +78,7 @@
               v-if="$hasPermissions('M_power_role_menu')"
               @click="openMenuModal(record,0)"
             >
-            价格权限
+              价格权限
             </a-button>
             <a-button
               size="small"
@@ -84,7 +87,7 @@
               v-if="$hasPermissions('B_power_role_edit')"
               @click="handleEdit(record)"
             >
-            编辑
+              编辑
             </a-button>
             <a-button
               size="small"
@@ -93,15 +96,16 @@
               v-if="!record.isEnable && $hasPermissions('B_power_role_del')"
               @click="delect(record)"
             >
-            删除
+              删除
             </a-button>
-          <span v-if="!$hasPermissions('M_power_role_menu') && !$hasPermissions('B_power_role_edit') && (record.isEnable && !$hasPermissions('B_power_role_del'))">--</span>
-        </span>
-      </s-table>
-    </a-spin>
-    <roleModal :visible="showModal" @refresh="$refs.table.refresh(true)" :nowData="itemData" @close="closeRole"></roleModal>
-    <menuModal :visible="showMenuModal" @refresh="$refs.table.refresh(true)" :nowData="menuData" @close="showMenuModal = false"></menuModal>
-  </a-card>
+            <span v-if="!$hasPermissions('M_power_role_menu') && !$hasPermissions('B_power_role_edit') && (record.isEnable && !$hasPermissions('B_power_role_del'))">--</span>
+          </span>
+        </s-table>
+      </a-spin>
+      <roleModal :visible="showModal" @refresh="$refs.table.refresh(true)" :nowData="itemData" @close="closeRole"></roleModal>
+      <menuModal :visible="showMenuModal" @refresh="$refs.table.refresh(true)" :nowData="menuData" @close="showMenuModal = false"></menuModal>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -200,7 +204,7 @@ export default {
       this.getMenuList(row.id, type)
     },
     // 获取菜单树列表
-    getMenuList (id,type) {
+    getMenuList (id, type) {
       const _this = this
       getMenuList({
         id: id
@@ -265,7 +269,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 250
     }
   },
   watch: {

+ 62 - 58
src/views/power/user/userList.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
@@ -26,61 +26,65 @@
           </a-row>
         </a-form>
       </div>
-      <div class="table-operator">
-        <a-button type="primary" v-if="$hasPermissions('B_power_user_add')" class="button-error" @click="openModal">新增</a-button>
-      </div>
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        size="small"
-        :style="{ height: tableHeight+84.5+'px' }"
-        rowKey="id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        style="word-break: break-all;"
-        :defaultLoadData="false"
-        bordered
-      >
-        <span slot="status" slot-scope="text, record">
-          <!-- 超级管理员不可删除不可编辑不可启禁用 -->
-          <a-switch v-if="record.superAdmin!=1 && $hasPermissions('B_power_user_enable')" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
-          <span v-else>{{ record.loginFlag==1?'已启用':'已禁用' }}</span>
-        </span>
-        <span slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-info"
-            v-if="record.superAdmin!=1 &&$hasPermissions('B_power_user_edit')"
-            @click="handleEdit(record)"
-          >
-            编辑
-          </a-button>
-          <a-button
-            size="small"
-            type="link"
-            class="button-info"
-            v-if="record.loginFlag==1 && record.superAdmin!=1 &&$hasPermissions('B_power_user_resetPsd')"
-            @click="resetPassword(record)"
-          >
-            重置密码
-          </a-button>
-           
-          <a-button
-            size="small"
-            type="link"
-            class="button-error"
-            v-if="record.loginFlag==0 && record.superAdmin!=1 &&$hasPermissions('B_power_user_del')"
-            @click="delect(record)"
-          >
-            删除
-          </a-button>
-        </span>
-      </s-table>
-    </a-spin>
-    <userModal :visible="showModal" @refresh="$refs.table.refresh(true)" :nowData="itemData" @close="closeModal"></userModal>
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <div class="table-operator">
+          <a-button type="primary" v-if="$hasPermissions('B_power_user_add')" class="button-error" @click="openModal">新增</a-button>
+        </div>
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          size="small"
+          :style="{ height: tableHeight+84.5+'px' }"
+          rowKey="id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          style="word-break: break-all;"
+          :defaultLoadData="false"
+          bordered
+        >
+          <span slot="status" slot-scope="text, record">
+            <!-- 超级管理员不可删除不可编辑不可启禁用 -->
+            <a-switch v-if="record.superAdmin!=1 && $hasPermissions('B_power_user_enable')" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
+            <span v-else>{{ record.loginFlag==1?'已启用':'已禁用' }}</span>
+          </span>
+          <span slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-info"
+              v-if="record.superAdmin!=1 &&$hasPermissions('B_power_user_edit')"
+              @click="handleEdit(record)"
+            >
+              编辑
+            </a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-info"
+              v-if="record.loginFlag==1 && record.superAdmin!=1 &&$hasPermissions('B_power_user_resetPsd')"
+              @click="resetPassword(record)"
+            >
+              重置密码
+            </a-button>
+
+            <a-button
+              size="small"
+              type="link"
+              class="button-error"
+              v-if="record.loginFlag==0 && record.superAdmin!=1 &&$hasPermissions('B_power_user_del')"
+              @click="delect(record)"
+            >
+              删除
+            </a-button>
+          </span>
+        </s-table>
+      </a-spin>
+      <userModal :visible="showModal" @refresh="$refs.table.refresh(true)" :nowData="itemData" @close="closeModal"></userModal>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -234,7 +238,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 255
     }
   },
   watch: {

+ 19 - 3
src/views/promotionRulesManagement/dealerPromotions/detail.vue

@@ -54,6 +54,7 @@
           :data="loadData"
           :defaultLoadData="false"
           :showPagination="false"
+          :scroll="{ y: !isShowBisiceInfo?365:568}"
           bordered>
           <!-- 门槛规则 -->
           <template slot="cillProduct" slot-scope="text, record">
@@ -105,7 +106,9 @@
               id="promotionList-edit-btn">详情</a-button>
           </template>
         </s-table>
-        <div style="text-align:center;margin-top:20px;" v-if="$route.query.type=='rule'">
+      </a-card>
+      <div class="footerBtn" v-if="$route.query.type=='rule'">
+        <a-card size="small" :bordered="false">
           <a-button
             type="primary"
             size="large"
@@ -113,8 +116,8 @@
             @click="handleSubmit"
             :disabled="disabled"
             v-if="$hasPermissions('B_rulesSubmit')&&(mainContentList&&mainContentList.length>0)">提交</a-button>
-        </div>
-      </a-card>
+        </a-card>
+      </div>
     </a-spin>
     <!-- 查看参与客户 -->
     <lookUp-customers-modal ref="lookUpCustomers" :openModal="openCustomerModal" @close="openCustomerModal = false"></lookUp-customers-modal>
@@ -308,6 +311,11 @@ export default {
 
 <style lang="less" scoped>
   .salesDetail-wrap{
+   position: relative;
+   height: 100%;
+   padding-bottom: 71px;
+   box-sizing: border-box;
+   transform: translateZ(0);
     .salesDetail-cont{
       margin-bottom: 10px;
     }
@@ -338,5 +346,13 @@ export default {
       max-width:89%;
       vertical-align: top;
     }
+    .footerBtn{
+      width: 100%;
+      text-align:center;
+      position:fixed;
+      bottom:10px;
+      right:0px;
+      box-shadow: 0 0 20px #dcdee2;
+    }
   }
 </style>

+ 129 - 125
src/views/promotionRulesManagement/dealerPromotions/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="promotionList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="promotionList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -56,131 +56,135 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator" v-if="$hasPermissions('B_dealerPromotionAdd')">
-        <a-button id="promotionList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.sparePartsReturnNo"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 促销名称 -->
-        <template slot="promotionName" slot-scope="text, record">
-          <div v-if="$hasPermissions('B_dealerPromotionDetail')" class="link-bule nameBox text-overflows2" @click="handleDetail(record)">{{ record.title }}</div>
-          <div v-else class="nameBox text-overflows2">{{ record.title }}</div>
-        </template>
-        <!-- 促销时间-->
-        <template slot="promotionTime" slot-scope="text, record">
-          <div>{{ record.promotionDateStart }}-{{ record.promotionDateEnd }}</div>
-        </template>
-        <!-- 参与客户 -->
-        <template slot="joinCustomers" slot-scope="text, record">
-          <div v-if="record.dealerScope ==='ALL_DEALER'">全部客户</div>
-          <div class="joinCustomer" v-else @click="handleCustomers(record)">共有<span style="color:#39f;vertical-align:top;">{{ record.dealerSnList?record.dealerSnList.length:0 }}</span>个客户</div>
-        </template>
-        <!-- 发布状态 -->
-        <template slot="releaseStatus" slot-scope="text, record">
-          <a-switch
-            v-if="$hasPermissions('B_dealerPromotionStatus')"
-            id="promotionList-enable"
-            @change="changeStatus(record)"
-            :disabled="record.state!='NOT_START' && record.state!='RUNNING'"
-            :checked="record.enabledFlag == 1 ? true : false"></a-switch>
-          <span v-else>--</span>
-        </template>
-        <!-- 操作 -->
-        <!--  state 待提交:WAIT_SUBMIT 待审核:WAIT_AUDIT 未开始:NOT_START 进行中:RUNNING 审核不通过:AUDIT_REJECT 已结束:IS_OVER -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-warning"
-            @click="handleSetRules(record)"
-            v-if="$hasPermissions('B_dealerPromotionRules')&&(record.state =='WAIT_SUBMIT'||record.state == 'AUDIT_REJECT')"
-            id="allocateBillList-examine-btn">规则设置</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_dealerPromotionEdit')&&(record.state == 'WAIT_SUBMIT' ||record.state == 'AUDIT_REJECT')"
-            @click="handleEdit(record)"
-            class="button-info"
-            id="promotionList-edit-btn">编辑</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_dealerPromotionAudit')&&record.state == 'WAIT_AUDIT'"
-            @click="handleCheck(record)"
-            class="button-info"
-            id="promotionList-edit-btn">审核</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_editTime')&&(record.state == 'NOT_START' || record.state=='RUNNING')"
-            @click="handleTime(record)"
-            class="button-info"
-            id="promotionList-edit-btn">促销时间变更</a-button>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator" v-if="$hasPermissions('B_dealerPromotionAdd')">
+          <a-button id="promotionList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.sparePartsReturnNo"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 促销名称 -->
+          <template slot="promotionName" slot-scope="text, record">
+            <div v-if="$hasPermissions('B_dealerPromotionDetail')" class="link-bule nameBox text-overflows2" @click="handleDetail(record)">{{ record.title }}</div>
+            <div v-else class="nameBox text-overflows2">{{ record.title }}</div>
+          </template>
+          <!-- 促销时间-->
+          <template slot="promotionTime" slot-scope="text, record">
+            <div>{{ record.promotionDateStart }}-{{ record.promotionDateEnd }}</div>
+          </template>
+          <!-- 参与客户 -->
+          <template slot="joinCustomers" slot-scope="text, record">
+            <div v-if="record.dealerScope ==='ALL_DEALER'">全部客户</div>
+            <div class="joinCustomer" v-else @click="handleCustomers(record)">共有<span style="color:#39f;vertical-align:top;">{{ record.dealerSnList?record.dealerSnList.length:0 }}</span>个客户</div>
+          </template>
+          <!-- 发布状态 -->
+          <template slot="releaseStatus" slot-scope="text, record">
+            <a-switch
+              v-if="$hasPermissions('B_dealerPromotionStatus')"
+              id="promotionList-enable"
+              @change="changeStatus(record)"
+              :disabled="record.state!='NOT_START' && record.state!='RUNNING'"
+              :checked="record.enabledFlag == 1 ? true : false"></a-switch>
+            <span v-else>--</span>
+          </template>
+          <!-- 操作 -->
+          <!--  state 待提交:WAIT_SUBMIT 待审核:WAIT_AUDIT 未开始:NOT_START 进行中:RUNNING 审核不通过:AUDIT_REJECT 已结束:IS_OVER -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-warning"
+              @click="handleSetRules(record)"
+              v-if="$hasPermissions('B_dealerPromotionRules')&&(record.state =='WAIT_SUBMIT'||record.state == 'AUDIT_REJECT')"
+              id="allocateBillList-examine-btn">规则设置</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_dealerPromotionEdit')&&(record.state == 'WAIT_SUBMIT' ||record.state == 'AUDIT_REJECT')"
+              @click="handleEdit(record)"
+              class="button-info"
+              id="promotionList-edit-btn">编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_dealerPromotionAudit')&&record.state == 'WAIT_AUDIT'"
+              @click="handleCheck(record)"
+              class="button-info"
+              id="promotionList-edit-btn">审核</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_editTime')&&(record.state == 'NOT_START' || record.state=='RUNNING')"
+              @click="handleTime(record)"
+              class="button-info"
+              id="promotionList-edit-btn">促销时间变更</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_overActive')&&(record.state == 'NO_START' || record.state=='RUNNING')"
+              @click="handleEnd(record)"
+              class="button-info"
+              id="promotionList-edit-btn">终止</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_dealerPromotionDel')&&(record.state == 'WAIT_SUBMIT'||record.state == 'AUDIT_REJECT')"
+              @click="handleDel(record)"
+              class="button-error"
+              id="promotionList-del-btn">删除</a-button>
+            <div v-if="record.state == 'IS_OVER'">--</div>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 参与客户 -->
+      <lookUp-customers-modal ref="lookUpCustomers" :openModal="openCustomerModal" @close="openCustomerModal = false"></lookUp-customers-modal>
+      <!-- 新增/编辑弹窗-->
+      <add-modal v-drag :itemSn="itemSn" :openModal="openModal" @ok="handleOk" @close="openModal=false" />
+      <!-- 促销时间变更 -->
+      <edit-active-end-time ref="editTime" v-drag :openModal="editEndModal" @ok="$refs.table.refresh()" @close="editEndModal=false" />
+      <!-- 审核弹窗 -->
+      <a-modal
+        closable
+        v-model="openAuditModal"
+        :footer="null"
+        width="416px"
+        centered>
+        <div style="display:flex;margin:30px 0 20px 20px;">
+          <a-icon type="question-circle" :style="{fontSize:'23px',color:'#faad14'}"/>
+          <div style="margin-left:10px;">
+            <p style="font-size:16px;font-wight:bold;">提示</p>
+            <p>请点击下方按钮确认操作?</p>
+          </div>
+        </div>
+        <!-- 按钮 -->
+        <div style="text-align: right;">
           <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_overActive')&&(record.state == 'NO_START' || record.state=='RUNNING')"
-            @click="handleEnd(record)"
-            class="button-info"
-            id="promotionList-edit-btn">终止</a-button>
+            id="auditModal-cancel"
+            class="button-cancel"
+            @click="closeAuditModal"
+            style="margin-right: 15px;">审核不通过</a-button>
           <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_dealerPromotionDel')&&(record.state == 'WAIT_SUBMIT'||record.state == 'AUDIT_REJECT')"
-            @click="handleDel(record)"
-            class="button-error"
-            id="promotionList-del-btn">删除</a-button>
-          <div v-if="record.state == 'IS_OVER'">--</div>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 参与客户 -->
-    <lookUp-customers-modal ref="lookUpCustomers" :openModal="openCustomerModal" @close="openCustomerModal = false"></lookUp-customers-modal>
-    <!-- 新增/编辑弹窗-->
-    <add-modal v-drag :itemSn="itemSn" :openModal="openModal" @ok="handleOk" @close="openModal=false" />
-    <!-- 促销时间变更 -->
-    <edit-active-end-time ref="editTime" v-drag :openModal="editEndModal" @ok="$refs.table.refresh()" @close="editEndModal=false" />
-    <!-- 审核弹窗 -->
-    <a-modal
-      closable
-      v-model="openAuditModal"
-      :footer="null"
-      width="416px"
-      centered>
-      <div style="display:flex;margin:30px 0 20px 20px;">
-        <a-icon type="question-circle" :style="{fontSize:'23px',color:'#faad14'}"/>
-        <div style="margin-left:10px;">
-          <p style="font-size:16px;font-wight:bold;">提示</p>
-          <p>请点击下方按钮确认操作?</p>
+            type="primary"
+            id="auditModal-save"
+            class="button-primary"
+            @click="handleAuditModal"
+          >审核通过</a-button>
         </div>
-      </div>
-      <!-- 按钮 -->
-      <div style="text-align: right;">
-        <a-button
-          id="auditModal-cancel"
-          class="button-cancel"
-          @click="closeAuditModal"
-          style="margin-right: 15px;">审核不通过</a-button>
-        <a-button
-          type="primary"
-          id="auditModal-save"
-          class="button-primary"
-          @click="handleAuditModal"
-        >审核通过</a-button>
-      </div>
-    </a-modal>
-  </a-card>
+      </a-modal>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -410,7 +414,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 240
+      this.tableHeight = window.innerHeight - tableSearchH - 250
     }
   },
   watch: {

+ 117 - 110
src/views/promotionRulesManagement/promotionManagement/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="promotion-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="promotion-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -45,117 +45,124 @@
             </a-col>
           </a-row>
         </a-form>
+
+      </div>
+    </a-card>
+    <!-- 列表 -->
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator" v-if="$hasPermissions('B_promotionManagementAdd')">
           <a-button type="primary" class="button-error" @click="openAddModal = true">新增</a-button>
         </div>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+94.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 自定义表头 -->
-        <template slot="arrowFalgTitle">
-          <a-tooltip placement="top">
-            <template slot="title">
-              <span>易码通轮播促销展示显示状态</span>
-            </template>
-            显示状态<a-icon type="question-circle" :style="{ marginLeft: '10px' }" />
-          </a-tooltip>
-        </template>
-        <!-- 显示状态 -->
-        <template slot="arrowFalg" slot-scope="text, record">
-          <a-switch
-            checkedChildren="显示"
-            unCheckedChildren="隐藏"
-            id="promotion-isEnable"
-            v-model="record.isEnable"
-            :disabled="record.state!='PUBLISH'"
-            @change="changeFlagHandle(record)" />
-        </template>
-        <!-- 促销时间 -->
-        <template slot="promotionTime" slot-scope="text, record">
-          <span>{{ record.activeDateStart }}至{{ record.activeDateEnd }}</span>
-        </template>
-        <!-- 参与客户 -->
-        <template slot="joinCustomers" slot-scope="text, record">
-          <span @click="handleCustomers(record)">共有<span class="font1">{{ record.promoBuyerSnSet?record.promoBuyerSnSet.length:0 }}</span>个客户</span>
-        </template>
-        <!-- 促销描述 -->
-        <template slot="salesDesc" slot-scope="text, record">
-          <a-tooltip placement="rightBottom" v-if="record.description&&record.description.length>14">
-            <template slot="title">
-              <span>{{ record.description }}</span>
-            </template>
-            <div @click="promotionDesc(record)" class="desc font1">{{ record.description }}</div>
-          </a-tooltip>
-          <div v-else @click="promotionDesc(record)" class="desc font1">{{ record.description }}</div>
-        </template>
-        <!-- 促销展示 -->
-        <template slot="salesShow" slot-scope="text, record">
-          <div @click="handleSaleShow(record)" v-if="record.contentType!='LINK'&&record.imageSet && record.imageSet.length>0">
-            <img :src="record.imageSet[0]" alt="图片走丢啦" width="60" />
-          </div>
-          <div v-else-if="record.contentType=='LINK'&&record.imageSet && record.imageSet.length>0">
-            <img :src="record.imageSet[0]" alt="图片走丢啦" width="60" />
-          </div>
-          <span v-else>--</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <div>
-            <a-button
-              size="small"
-              type="link"
-              class="button-warning"
-              @click="promotionEdit(record)"
-              v-if="(record.state=='UNPUBLISH' || record.state=='CLOSE') && $hasPermissions('B_promotionManagementAdd')"
-              id="promotion-edit-btn">促销编辑</a-button>
-            <a-button
-              size="small"
-              type="link"
-              class="button-warning"
-              @click="handleRelease(record,'edit')"
-              v-if="(record.state=='PUBLISH' || record.state=='CLOSE')&&$hasPermissions('B_promotionManagementContent')"
-              id="promotion-modify-btn">发布修改</a-button>
-            <a-button
-              size="small"
-              type="link"
-              class="button-info"
-              @click="handleRelease(record,'add')"
-              v-if="record.state=='UNPUBLISH'&&$hasPermissions('B_promotionManagementContent')"
-              id="promotion-release-btn">促销发布</a-button>
-            <a-button
-              size="small"
-              type="link"
-              class="button-error"
-              v-if="record.state=='UNPUBLISH'&&$hasPermissions('B_promotionManagementDel')"
-              @click="handleDel(record)"
-              id="promotion-del-btn">删除</a-button>
-            <span v-if="record.state=='End'">--</span>
-          </div>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 参与客户 -->
-    <lookUp-customers-modal ref="lookUpCustomers" :openModal="openCustomerModal" @close="openCustomerModal = false"></lookUp-customers-modal>
-    <!-- 促销描述 -->
-    <promotion-desc-modal :openModal="openDescModal" :con="descCon" @close="openDescModal = false;descCon=''"></promotion-desc-modal>
-    <!-- 促销展示 -->
-    <promotion-show-modal ref="showModal" :openModal="openShowModal" @close="openShowModal = false"></promotion-show-modal>
-    <!-- 新增 -->
-    <addModal :openModal="openAddModal" :itemId="itemId" @close="closeAddModal" @ok="$refs.table.refresh()"></addModal>
-    <!-- 促销发布 -->
-    <promotion-edit-modal :pageType="pageType" :openModal="openPromotionEditModal" :itemId="itemId" @close="closePromotionEditModal" @ok="$refs.table.refresh()" />
-  </a-card>
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+94.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 自定义表头 -->
+          <template slot="arrowFalgTitle">
+            <a-tooltip placement="top">
+              <template slot="title">
+                <span>易码通轮播促销展示显示状态</span>
+              </template>
+              显示状态<a-icon type="question-circle" :style="{ marginLeft: '10px' }" />
+            </a-tooltip>
+          </template>
+          <!-- 显示状态 -->
+          <template slot="arrowFalg" slot-scope="text, record">
+            <a-switch
+              checkedChildren="显示"
+              unCheckedChildren="隐藏"
+              id="promotion-isEnable"
+              v-model="record.isEnable"
+              :disabled="record.state!='PUBLISH'"
+              @change="changeFlagHandle(record)" />
+          </template>
+          <!-- 促销时间 -->
+          <template slot="promotionTime" slot-scope="text, record">
+            <span>{{ record.activeDateStart }}至{{ record.activeDateEnd }}</span>
+          </template>
+          <!-- 参与客户 -->
+          <template slot="joinCustomers" slot-scope="text, record">
+            <span @click="handleCustomers(record)" v-if="record.promoBuyerSnSet&&record.promoBuyerSnSet.length>0">共有<span class="font1">{{ record.promoBuyerSnSet.length }}</span>个客户</span>
+            <span v-else>共有0个客户</span>
+          </template>
+          <!-- 促销描述 -->
+          <template slot="salesDesc" slot-scope="text, record">
+            <a-tooltip placement="rightBottom" v-if="record.description&&record.description.length>14">
+              <template slot="title">
+                <span>{{ record.description }}</span>
+              </template>
+              <div @click="promotionDesc(record)" class="desc font1">{{ record.description }}</div>
+            </a-tooltip>
+            <div v-else-if="!record.description" class="desc">--</div>
+            <div v-else @click="promotionDesc(record)" class="desc font1">{{ record.description }}</div>
+          </template>
+          <!-- 促销展示 -->
+          <template slot="salesShow" slot-scope="text, record">
+            <div @click="handleSaleShow(record)" v-if="record.contentType!='LINK'&&record.imageSet && record.imageSet.length>0">
+              <img :src="record.imageSet[0]" alt="图片走丢啦" width="60" />
+            </div>
+            <div v-else-if="record.contentType=='LINK'&&record.imageSet && record.imageSet.length>0">
+              <img :src="record.imageSet[0]" alt="图片走丢啦" width="60" />
+            </div>
+            <span v-else>--</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <div>
+              <a-button
+                size="small"
+                type="link"
+                class="button-warning"
+                @click="promotionEdit(record)"
+                v-if="(record.state=='UNPUBLISH' || record.state=='CLOSE') && $hasPermissions('B_promotionManagementAdd')"
+                id="promotion-edit-btn">促销编辑</a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-warning"
+                @click="handleRelease(record,'edit')"
+                v-if="(record.state=='PUBLISH' || record.state=='CLOSE')&&$hasPermissions('B_promotionManagementContent')"
+                id="promotion-modify-btn">发布修改</a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-info"
+                @click="handleRelease(record,'add')"
+                v-if="record.state=='UNPUBLISH'&&$hasPermissions('B_promotionManagementContent')"
+                id="promotion-release-btn">促销发布</a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-error"
+                v-if="record.state=='UNPUBLISH'&&$hasPermissions('B_promotionManagementDel')"
+                @click="handleDel(record)"
+                id="promotion-del-btn">删除</a-button>
+              <span v-if="record.state=='End'">--</span>
+            </div>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 参与客户 -->
+      <lookUp-customers-modal ref="lookUpCustomers" :openModal="openCustomerModal" @close="openCustomerModal = false"></lookUp-customers-modal>
+      <!-- 促销描述 -->
+      <promotion-desc-modal :openModal="openDescModal" :con="descCon" @close="openDescModal = false;descCon=''"></promotion-desc-modal>
+      <!-- 促销展示 -->
+      <promotion-show-modal ref="showModal" :openModal="openShowModal" @close="openShowModal = false"></promotion-show-modal>
+      <!-- 新增 -->
+      <addModal :openModal="openAddModal" :itemId="itemId" @close="closeAddModal" @ok="$refs.table.refresh()"></addModal>
+      <!-- 促销发布 -->
+      <promotion-edit-modal :pageType="pageType" :openModal="openPromotionEditModal" :itemId="itemId" @close="closePromotionEditModal" @ok="$refs.table.refresh()" />
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -345,7 +352,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 215
+      this.tableHeight = window.innerHeight - tableSearchH - 265
     }
   },
   watch: {

+ 27 - 23
src/views/supplierManagement/associatedProductDetails/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="associatedProductList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="associatedProductList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -43,26 +43,30 @@
           </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"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 产品分类 -->
-        <template slot="productType" slot-scope="text, record">
-          <span v-if="record.product&&(record.product.productTypeName2 || record.product.productTypeName3)">{{ record.product.productTypeName2 }} {{ record.product.productTypeName3 ? '>' : '' }} {{ record.product.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...">
+        <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&&(record.product.productTypeName2 || record.product.productTypeName3)">{{ record.product.productTypeName2 }} {{ record.product.productTypeName3 ? '>' : '' }} {{ record.product.productTypeName3 }}</span>
+            <span v-else>--</span>
+          </template>
+        </s-table>
+      </a-spin>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -156,7 +160,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 215
     }
   },
   watch: {

+ 29 - 25
src/views/supplierManagement/costSetRecord/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="costSetRecordList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="costSetRecordList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -46,26 +46,30 @@
           </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"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 产品分类 -->
-        <template slot="productType" slot-scope="text, record">
-          <span v-if="record.product&&(record.product.productTypeName2 || record.product.productTypeName3)">{{ record.product.productTypeName2 }} {{ record.product.productTypeName3 ? '>' : '' }} {{ record.product.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...">
+        <!-- 列表 -->
+        <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&&(record.product.productTypeName2 || record.product.productTypeName3)">{{ record.product.productTypeName2 }} {{ record.product.productTypeName3 ? '>' : '' }} {{ record.product.productTypeName3 }}</span>
+            <span v-else>--</span>
+          </template>
+        </s-table>
+      </a-spin>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -74,9 +78,9 @@ import { STable, VSelect } from '@/components'
 import { hdExportExcel } from '@/libs/exportExcel'
 import ProductType from '@/views/common/productType.js'
 import ProductBrand from '@/views/common/productBrand.js'
-import { supplierProductCostLogList,supplierProductCostLogExport } from '@/api/supplier'
+import { supplierProductCostLogList, supplierProductCostLogExport } from '@/api/supplier'
 export default {
-  name: 'costSetRecordList',
+  name: 'CostSetRecordList',
   mixins: [commonMixin],
   components: { STable, VSelect, ProductBrand, ProductType },
   data () {
@@ -169,7 +173,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 215
     }
   },
   watch: {

+ 2 - 1
src/views/supplierManagement/costSetting/addProductModal.vue

@@ -68,6 +68,7 @@
             @rowSelection="rowSelectionFun"
             :columns="columns"
             :data="loadData"
+            :scroll="{ y: 400 }"
             :defaultLoadData="false"
             bordered>
           </s-table>
@@ -284,7 +285,7 @@ export default {
     .products-con{
       .btn-con{
         text-align: center;
-        margin: 30px 0 20px;
+        margin-top: 30px;
         .button-cancel{
           font-size: 12px;
         }

+ 63 - 59
src/views/supplierManagement/costSetting/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="costSetList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="costSetList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -56,69 +56,73 @@
             </a-col>
           </a-row>
         </a-form>
+      </div>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator">
           <a-button type="primary" v-if="$hasPermissions('B_costSetAddProduct')" class="button-error" @click="newProduct=true">新增</a-button>
           <a-button type="primary" v-if="$hasPermissions('B_costSetBatchImport')" class="button-warning" @click="handleBatchImport">批量导入</a-button>
           <a-button type="primary" v-if="$hasPermissions('B_costSetAudit')" class="button-warning" @click="handleBatchAudit">批量审核</a-button>
         </div>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.supplierProductSn"
-        rowKeyName="supplierProductSn"
-        :row-selection="$hasPermissions('B_costSetAudit')?{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.auditState!=='WAIT' } }) }:null"
-        @rowSelection="rowSelectionFun"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 产品分类 -->
-        <template slot="productType" slot-scope="text, record">
-          <span v-if="record.product&&(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"
-              class="button-warning"
-              v-if="record.auditState=='WAIT'&&$hasPermissions('B_costSetAudit')"
-              @click="handleAudit([record.supplierProductSn])"
-            >审核</a-button>
-            <a-button
-              size="small"
-              type="link"
-              class="button-warning"
-              v-if="record.auditState=='WAIT'&&$hasPermissions('B_costSetting')"
-              @click="handleCostSet(record,editFlag = true)"
-            >编辑</a-button>
-            <a-button
-              size="small"
-              type="link"
-              class="button-warning"
-              v-if="record.auditState!='WAIT'&&$hasPermissions('B_costSetting')"
-              @click="handleCostSet(record,false)"
-            >设置成本</a-button>
-          </div>
-        </template>
-      </s-table>
-    </a-spin>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.supplierProductSn"
+          rowKeyName="supplierProductSn"
+          :row-selection="$hasPermissions('B_costSetAudit')?{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.auditState!=='WAIT' } }) }:null"
+          @rowSelection="rowSelectionFun"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 产品分类 -->
+          <template slot="productType" slot-scope="text, record">
+            <span v-if="record.product&&(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"
+                class="button-warning"
+                v-if="record.auditState=='WAIT'&&$hasPermissions('B_costSetAudit')"
+                @click="handleAudit([record.supplierProductSn])"
+              >审核</a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-warning"
+                v-if="record.auditState=='WAIT'&&$hasPermissions('B_costSetting')"
+                @click="handleCostSet(record,editFlag = true)"
+              >编辑</a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-warning"
+                v-if="record.auditState!='WAIT'&&$hasPermissions('B_costSetting')"
+                @click="handleCostSet(record,false)"
+              >设置成本</a-button>
+            </div>
+          </template>
+        </s-table>
+      </a-spin>
 
-    <!-- 新增 -->
-    <addProductModal :openModal="newProduct" @close="newProduct=false" @ok="handleProductsOk" />
-    <!-- 设置成本价 -->
-    <SettingCost ref="settingCost" :edit="editFlag" :openModal="openSetModal" @ok="$refs.table.refresh()" @close="openSetModal=false"></SettingCost>
-    <!-- 导入产品 -->
-    <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="handleGuideOk" />
-  </a-card>
+      <!-- 新增 -->
+      <addProductModal :openModal="newProduct" @close="newProduct=false" @ok="handleProductsOk" />
+      <!-- 设置成本价 -->
+      <SettingCost ref="settingCost" :edit="editFlag" :openModal="openSetModal" @ok="$refs.table.refresh()" @close="openSetModal=false"></SettingCost>
+      <!-- 导入产品 -->
+      <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="handleGuideOk" />
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -311,7 +315,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 250
     }
   },
   watch: {

+ 49 - 45
src/views/supplierManagement/supplierInfo/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="supplierInfoList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="supplierInfoList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -17,48 +17,52 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button id="supplierInfoList-add" type="primary" v-if="$hasPermissions('B_supplierInfo_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="enabledFlag" slot-scope="text, record">
-          <a-switch v-if="$hasPermissions('B_supplierInfo_enabled')" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.enableFlag" @change="changeFlagHandle(text, record)"/>
-          <span v-else :style="{color:(record.enableFlag==1?'#00aa00':'#999')}"> {{ record.enableFlag==1? '已启用': '已禁用' }} </span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_supplierInfo_relation')"
-            class="button-warning"
-            @click="handleRelated(record)"
-            id="supplierInfoList-related-btn">关联产品</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_supplierInfo_edit')"
-            class="button-info"
-            @click="handleEdit(record)"
-            id="supplierInfoList-edit-btn">编辑</a-button>
-          <span v-if="!$hasPermissions('B_supplierInfo_relation') && !$hasPermissions('B_supplierInfo_edit')">--</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">
+          <a-button id="supplierInfoList-add" type="primary" v-if="$hasPermissions('B_supplierInfo_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="enabledFlag" slot-scope="text, record">
+            <a-switch v-if="$hasPermissions('B_supplierInfo_enabled')" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.enableFlag" @change="changeFlagHandle(text, record)"/>
+            <span v-else :style="{color:(record.enableFlag==1?'#00aa00':'#999')}"> {{ record.enableFlag==1? '已启用': '已禁用' }} </span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_supplierInfo_relation')"
+              class="button-warning"
+              @click="handleRelated(record)"
+              id="supplierInfoList-related-btn">关联产品</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_supplierInfo_edit')"
+              class="button-info"
+              @click="handleEdit(record)"
+              id="supplierInfoList-edit-btn">编辑</a-button>
+            <span v-if="!$hasPermissions('B_supplierInfo_relation') && !$hasPermissions('B_supplierInfo_edit')">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -153,7 +157,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 255
     }
   },
   watch: {