lilei 2 years ago
parent
commit
44af9aceb8

+ 2 - 2
src/api/dealer.js

@@ -27,7 +27,7 @@ export const queryDealerPageList = (params) => {
     method: 'post'
   })
 }
-//  经销商列表有分页
+//  经销商列表有分页,不受权限控制
 export const dealerQueryList = (params) => {
   const url = `/dealer/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
@@ -38,7 +38,7 @@ export const dealerQueryList = (params) => {
     method: 'post'
   })
 }
-//  经销商 列表 有分页
+//  经销商 列表 有分页, 有权限控制
 export const dealerSubareaScopeList = (params) => {
   const url = `/dealer/queryBySubareaScope/${params.pageNo}/${params.pageSize}`
   delete params.pageNo

+ 8 - 1
src/views/allocationManagement/transferOut/printModal.vue

@@ -36,13 +36,20 @@
             <a-radio value="-1">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
-        <a-form-model-item label="产品价格" prop="priceType" v-if="nowType=='dbPrint'||nowType=='dbExport'">
+        <a-form-model-item label="产品价格" prop="priceType" v-if="nowType=='dbPrint'">
           <a-radio-group v-model="form.priceType">
             <a-radio value="ALLOCATE_BILL_PRICE" v-if="$hasPermissions('B_transferOut_print_salesPrice')">销售价</a-radio>
             <a-radio value="ALLOCATE_BILL_COST" v-if="$hasPermissions('B_transferOut_print_costPrice')">成本价</a-radio>
             <a-radio value="ALLOCATE_BILL">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
+        <a-form-model-item label="产品价格" prop="priceType" v-if="nowType=='dbExport'">
+          <a-radio-group v-model="form.priceType">
+            <a-radio value="ALLOCATE_BILL_PRICE">销售价</a-radio>
+            <a-radio value="ALLOCATE_BILL_COST">成本价</a-radio>
+            <a-radio value="ALLOCATE_BILL">不打印</a-radio>
+          </a-radio-group>
+        </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
         <a-button id="allocateBill-print-close" @click="handleClose('preview')">取消</a-button>

+ 2 - 2
src/views/common/settleStyle.js

@@ -1,5 +1,5 @@
 import { settleStyleQueryAll } from '@/api/settleStyle'
-const CustList = {
+const SettleStyle = {
   template: `
         <a-select
           :id="id"
@@ -67,4 +67,4 @@ const CustList = {
   },
 };
 
-export default CustList
+export default SettleStyle