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

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

chenrui 2 лет назад
Родитель
Сommit
c1f2691d7d

+ 4 - 6
src/config/router.config.js

@@ -2823,8 +2823,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '成本设置',
-              icon: 'build'
-              // permission: 'M_costSettingList'
+              icon: 'build',
+              permission: 'M_costSettingList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -2836,7 +2836,6 @@ export const asyncRouterMap = [
                   title: '成本设置列表',
                   icon: 'build',
                   hidden: true
-                  // permission: 'M_costSettingList'
                 }
               }
             ]
@@ -2848,8 +2847,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '成本变更记录',
-              icon: 'build'
-              // permission: 'M_costSetRecordList'
+              icon: 'build',
+              permission: 'M_costSetRecordList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -2861,7 +2860,6 @@ export const asyncRouterMap = [
                   title: '成本变更记录列表',
                   icon: 'build',
                   hidden: true
-                  // permission: 'M_costSetRecordList'
                 }
               }
             ]

+ 3 - 3
src/views/expenseManagement/expenseReimbursement/detail.vue

@@ -88,9 +88,9 @@
           <!-- 产品信息 -->
           <template slot="cpxx" slot-scope="text,record">
             <div v-for="item in record.detailProductsList" :key="item.id">
-              <div v-if="item.productCode">{{ item.productCode }}: ¥{{ item.expense }}</div>
-              <div v-else-if="item.productBrandName">{{ item.productBrandName }}<span v-if="item.productTypeShowName">/</span>{{ item.productTypeShowName }}: ¥{{ item.expense }}</div>
-              <div v-else>{{ item.productTypeShowName }}: ¥{{ item.expense }}</div>
+              <div v-if="item.productCode">{{ item.productCode }}</div>
+              <div v-else-if="item.productBrandName">{{ item.productBrandName }}<span v-if="item.productTypeShowName">/</span>{{ item.productTypeShowName }}</div>
+              <div v-else>{{ item.productTypeShowName }}</div>
             </div>
             <span v-if="!record.detailProductsList||record.detailProductsList.length==0">--</span>
           </template>

+ 1 - 0
src/views/supplierManagement/costSetRecord/list.vue

@@ -40,6 +40,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
+                v-if="$hasPermissions('B_costSetRecordExport')"
                 id="costSetDetailList-export">导出</a-button>
             </a-col>
           </a-row>

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

@@ -116,7 +116,6 @@ import { STable } from '@/components'
 import { productBrandQuery } from '@/api/productBrand'
 import { productTypeQuery, productTypeQueryAll } from '@/api/productType'
 import supplier from '@/views/common/supplier.js'
-import { dealerScopeValidProduct } from '@/api/dealerScope'
 import { addProduct, supplierProductSnList } from '@/api/supplier'
 import { productPricingList } from '@/api/product'
 export default {

+ 7 - 6
src/views/supplierManagement/costSetting/list.vue

@@ -51,15 +51,16 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
+                v-if="$hasPermissions('B_costSetExportDetail')"
                 id="costSetDetailList-export">导出明细</a-button>
             </a-col>
           </a-row>
         </a-form>
         <!-- 操作按钮 -->
         <div class="table-operator">
-          <a-button type="primary" class="button-error" @click="newProduct=true">新增</a-button>
-          <a-button type="primary" class="button-warning" @click="handleBatchImport">批量导入</a-button>
-          <a-button type="primary" class="button-warning" @click="handleBatchAudit">批量审核</a-button>
+          <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>
       <!-- 列表 -->
@@ -70,7 +71,7 @@
         size="small"
         :rowKey="(record) => record.supplierProductSn"
         rowKeyName="supplierProductSn"
-        :row-selection="{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.auditState!=='WAIT' } }) }"
+        :row-selection="$hasPermissions('B_costSetAudit')?{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.auditState!=='WAIT' } }) }:null"
         @rowSelection="rowSelectionFun"
         :columns="columns"
         :data="loadData"
@@ -89,14 +90,14 @@
               size="small"
               type="link"
               class="button-warning"
-              v-if="record.auditState=='WAIT'"
+              v-if="record.auditState=='WAIT'&&$hasPermissions('B_costSetAudit')"
               @click="handleAudit([record.supplierProductSn])"
             >审核</a-button>
             <a-button
               size="small"
               type="link"
               class="button-warning"
-              v-else
+              v-if="record.auditState!='WAIT'&&$hasPermissions('B_costSetting')"
               @click="handleCostSet(record)"
             >设置成本</a-button>
           </div>