Bladeren bron

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

chenrui 2 jaren geleden
bovenliggende
commit
2e72478752

+ 3 - 1
src/views/Home.vue

@@ -114,7 +114,9 @@ export default {
         { label: '成本价', value: 'costPrice' },
         { label: '省级价', value: 'provincePrice' },
         { label: '市级价', value: 'cityPrice' },
-        { label: '特约价', value: 'specialPrice' }
+        { label: '特约价', value: 'specialPrice' },
+        { label: '终端价', value: 'terminalPrice' },
+        { label: '车主价', value: 'carOwnersPrice' }
       ]
     })
   }

+ 2 - 13
src/views/productManagement/productInfo/list.vue

@@ -101,19 +101,8 @@
           :loading="loadingDownline"
           @click="handleBatchDownline"
           style="margin: 0 10px;">批量下线</a-button>
-        <!-- <a-button
-          v-if="$hasPermissions('B_productInfo_batchImport')"
-          type="primary"
-          class="button-error"
-          @click="openGuideModal=true"
-          style="margin: 0 10px;">批量导入</a-button> -->
-        <a-dropdown id="productInfoList-batchImport">
-          <a-menu slot="overlay" @click="handleMenuClick">
-            <a-menu-item key="1" v-if="$hasPermissions('B_productInfo_batchImport')">新增产品导入</a-menu-item>
-            <a-menu-item key="2">下线产品导入</a-menu-item>
-          </a-menu>
-          <a-button type="primary" class="button-error" style="margin: 0 10px;"> 批量导入 <a-icon type="down" /> </a-button>
-        </a-dropdown>
+        <a-button type="primary" class="button-info" v-if="$hasPermissions('B_productInfo_batchImport')" style="margin: 0 10px;"> 新增产品导入</a-button>
+        <a-button type="primary" class="button-info" v-if="$hasPermissions('B_offlineProduct_import')" style="margin: 0 10px;"> 下线产品导入</a-button>
         <span style="margin-left: 8px" v-if="$hasPermissions('B_productInfo_batchAudit') || $hasPermissions('B_productInfo_batchLaunch') || $hasPermissions('B_productInfo_batchDownline')">
           <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
         </span>

+ 20 - 7
src/views/productManagement/productNotOnline/list.vue

@@ -158,14 +158,27 @@ export default {
         { title: '第一次入库时间', dataIndex: 'skCreateDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '定价状态', dataIndex: 'pricingStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '定价时间', dataIndex: 'pricingTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '最新成本', dataIndex: 'lastStockCost', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '省级价', dataIndex: 'provincePrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '市级价', dataIndex: 'cityPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '特约价', dataIndex: 'specialPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '终端价', dataIndex: 'terminalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '车主价', dataIndex: 'carOwnersPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '定价时间', dataIndex: 'pricingTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
+
+      if (this.$hasPermissions('M_productNotOnlineList_costPrice')) {
+        arr.push({ title: '最新成本', dataIndex: 'lastStockCost', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if (this.$hasPermissions('M_productNotOnlineList_provincePrice')) {
+        arr.push({ title: '省级价', dataIndex: 'provincePrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if (this.$hasPermissions('M_productNotOnlineList_cityPrice')) {
+        arr.push({ title: '市级价', dataIndex: 'cityPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if (this.$hasPermissions('M_productNotOnlineList_specialPrice')) {
+        arr.push({ title: '特约价', dataIndex: 'specialPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if (this.$hasPermissions('M_productNotOnlineList_terminalPrice')) {
+        arr.push({ title: '终端价', dataIndex: 'terminalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if (this.$hasPermissions('M_productNotOnlineList_carOwnersPrice')) {
+        arr.push({ title: '车主价', dataIndex: 'carOwnersPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
       return arr
     }
   },