lilei vor 7 Monaten
Ursprung
Commit
587fe6228d

+ 2 - 2
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -142,7 +142,7 @@ export default {
             {
               field: 'col3',
               key: 'c',
-              title: '已关联',
+              title: '累计',
               width: 50,
               align: 'center'
             },
@@ -175,7 +175,7 @@ export default {
             {
               field: 'col8',
               key: 'k',
-              title: '已关联',
+              title: '累计',
               width: 50,
               align: 'center'
             },

+ 8 - 12
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -60,13 +60,6 @@
             >批量操作<a-icon type="down" /> </a-button>
           </a-dropdown>
           <span v-if="selectTotal" style="margin-left:10px;">已选{{ selectTotal }}项</span>
-        </a-col>
-        <a-col :md="12" :sm="24" style="text-align:right;">
-          <a-button
-            :id="'salesEdit-searchBox-'+id"
-            type="link"
-            class="button-info"
-            @click="showSearchBox=!showSearchBox" ><a-icon :type="showSearchBox?'close':'search'"/> 筛选</a-button>
           <a-button
             :id="'salesEdit-setAllWarehouse-'+id"
             type="link"
@@ -84,6 +77,13 @@
             <a-icon type="delete" /> 全部删除
           </a-button>
         </a-col>
+        <a-col :md="12" :sm="24" style="text-align:right;">
+          <a-button
+            :id="'salesEdit-searchBox-'+id"
+            type="link"
+            class="button-info"
+            @click="showSearchBox=!showSearchBox" ><a-icon :type="showSearchBox?'close':'search'"/> 筛选</a-button>
+        </a-col>
       </a-row>
     </div>
 
@@ -349,11 +349,7 @@ export default {
       if (this.$hasPermissions('B_salesEdit_salesPrice')) {
         arr.splice(3, 0, { title: '售价', dataIndex: 'price', width: '6%', align: 'right', scopedSlots: { customRender: 'price' } })
         arr.splice(4, 0, { title: '价格级别', dataIndex: 'priceLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
-        let idx = 0
-        // 如果是特价活动,显示折扣
-        idx = idx + 1
-        arr.splice(5, 0, { title: '折扣', dataIndex: 'discountPrice', width: '6%', align: 'right', scopedSlots: { customRender: 'discountPrice' } })
-        arr.splice((this.showStockCol ? 9 : 8) + idx, 0, { title: '售价小计', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice((this.showStockCol ? 9 : 8), 0, { title: '售价小计', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr
     }

+ 12 - 12
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -64,18 +64,6 @@
             > 批量操作 <a-icon type="down" /> </a-button>
           </a-dropdown>
           <span v-if="selectTotal" style="margin-left:10px;">已选{{ selectTotal }}项</span>
-        </a-col>
-        <a-col :md="16" :sm="24" style="text-align:right;">
-          <a-button
-            type="link"
-            class="button-info"
-            id="salesEdit-import-product"
-            @click="openGuideModal=true"><a-icon type="login" /> 导入产品</a-button>
-          <a-button
-            id="salesEdit-new-product"
-            type="link"
-            class="button-info"
-            @click="openCpModal"><a-icon type="plus" /> 添加产品</a-button>
           <a-button
             id="salesEdit-setAllWarehouse"
             type="link"
@@ -93,6 +81,18 @@
             <a-icon type="delete" /> 全部删除
           </a-button>
         </a-col>
+        <a-col :md="16" :sm="24" style="text-align:right;">
+          <a-button
+            type="link"
+            class="button-info"
+            id="salesEdit-import-product"
+            @click="openGuideModal=true"><a-icon type="login" /> 导入产品</a-button>
+          <a-button
+            id="salesEdit-new-product"
+            type="link"
+            class="button-info"
+            @click="openCpModal"><a-icon type="plus" /> 添加产品</a-button>
+        </a-col>
       </a-row>
     </div>