فهرست منبع

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

chenrui 1 سال پیش
والد
کامیت
49e5dcf402

+ 4 - 0
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -81,6 +81,7 @@
       class="sTable"
       ref="table"
       size="small"
+      :scroll="showTotal ? null :{ y: tableHeight }"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
@@ -273,6 +274,9 @@
       selectTotal () {
         return this.rowSelectionInfo && this.rowSelectionInfo.selectedRowKeys.length || 0
       },
+      tableHeight(){
+        return window.innerHeight - 395
+      },
       columns () {
         const arr = [
           { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },

+ 1 - 1
src/views/salesManagement/salesQueryNew/edit.vue

@@ -56,7 +56,7 @@
             <a-icon title="查看活动详情" type="eye"/> 活动详情
           </span>
           <span style="margin:0 20px;color:#ff0800;cursor: pointer;" @click="(event) => {disabledActive(event, item)}">
-            <a-icon title="禁用规则" type="disconnect"/> 禁用规则
+            <a-icon title="禁用规则" type="disconnect"/> {{item.disabled ? '启用规则' : '禁用规则'}}
           </span>
         </div>
         <div slot="extra" @click="tooglePanel(item)" style="cursor: pointer;">{{ item.isActive ? '收起' : '展开' }} <a-icon type="caret-right" :rotate="item.isActive ? 90 : 0"/> </div>