Forráskód Böngészése

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

1004749546@qq.com 3 éve
szülő
commit
b9cd2765d4

+ 1 - 1
src/views/salesManagement/backorder/detailModal.vue

@@ -9,7 +9,7 @@
     @cancle="isShow=false"
     :width="960">
     <a-spin :spinning="spinning" tip="Loading...">
-      <div style="padding: 0 12px;text-align: right;">
+      <div style="padding: 0 12px;text-align: right;" v-if="$hasPermissions('B_oosPrint')">
         <a-button id="backorderDetail-preview-btn" :disabled="localDataSource.length==0" @click="handlePrint('preview')" style="margin-right: 15px;">打印预览</a-button>
         <a-button type="primary" id="backorderDetail-print-btn" :disabled="localDataSource.length==0" @click="handlePrint('print')">快捷打印</a-button>
       </div>

+ 2 - 1
src/views/salesManagement/backorder/list.vue

@@ -33,7 +33,8 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" @click="handleDetail(record)" id="backorderList-detail-btn">详情</a-button>
+        <a-button size="small" type="link" @click="handleDetail(record)" v-if="$hasPermissions('B_oosDetail')" id="backorderList-detail-btn">详情</a-button>
+        <span v-else>--</span>
       </template>
     </s-table>
     <!-- 详情 -->

+ 3 - 2
src/views/salesManagement/examineVerify/list.vue

@@ -86,7 +86,8 @@
         bordered>
         <!-- 下推单号 -->
         <template slot="dispatchBillNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.dispatchBillNo }}</span>
+          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record)">{{ record.dispatchBillNo }}</span>
+          <span v-else>{{ record.dispatchBillNo }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
@@ -94,7 +95,7 @@
             size="small"
             type="link"
             class="button-info"
-            v-if="record.billStatus=='WAIT_STOCK_UP_AUDIT'"
+            v-if="record.billStatus=='WAIT_STOCK_UP_AUDIT'&&$hasPermissions('B_dispatchAduit')"
             @click="handleExamine(record)"
             id="examineVerifyList-examine-btn">备货审核</a-button>
           <span v-else>--</span>

+ 5 - 5
src/views/salesManagement/outboundOrder/list.vue

@@ -61,7 +61,7 @@
         </a-form>
       </div>
       <!-- 列表 -->
-      <div style="margin-bottom: 15px">
+      <div style="margin-bottom: 15px" v-if="$hasPermissions('B_stockOut')">
         <a-button type="primary" id="outboundOrder-export" :loading="loading" @click="handleOutbound()">批量出库</a-button>
         <span style="margin-left: 8px">
           <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
@@ -71,7 +71,7 @@
         class="sTable"
         ref="table"
         size="default"
-        :row-selection="rowSelection"
+        :row-selection="$hasPermissions('B_stockOut')?rowSelection:null"
         :rowKey="(record) => record.stockOutSn"
         :columns="columns"
         :data="loadData"
@@ -87,7 +87,7 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state=='WAIT'"
+            v-if="record.state=='WAIT'&&$hasPermissions('B_stockOut')"
             class="button-primary"
             @click="handleOutbound(record)"
             id="outboundOrderList-out-btn">出库</a-button>
@@ -198,9 +198,9 @@ export default {
     //  详情
     handleDetail (row) {
       //  根据出库类型跳转对应页面
-      if (row.outBizType == 'SALES') { //  销售出库
+      if (row.outBizType == 'SALES' && this.$hasPermissions('B_dispatchDetail')) { //  销售出库
         this.$router.push({ path: `/salesManagement/pushOrderManagement/detail/${row.outBizSubSn}/stockOut` })
-      } else if (row.outBizType == 'ALLOCATE') { //  调拨出库
+      } else if (row.outBizType == 'ALLOCATE' && this.$hasPermissions('M_transferOut_detail')) { //  调拨出库
         this.$router.push({ path: `/allocationManagement/transferOut/detail/${row.outBizSn}` })
       } else if (row.outBizType == 'CHECK_ORDER_OUT') { //  库存盘点盘亏
 

+ 1 - 1
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -5,7 +5,7 @@
         <template slot="subTitle">
           <a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
         </template>
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_dispatchPrint')">
           <a-button
             key="4"
             type="primary"

+ 4 - 2
src/views/salesManagement/pushOrderManagement/list.vue

@@ -70,11 +70,13 @@
       bordered>
       <!-- 销售单号 -->
       <template slot="salesBillNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span>
+        <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span>
+        <span v-else>{{ record.salesBillNo }}</span>
       </template>
       <!-- 备货单号 -->
       <template slot="dispatchBillNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
+        <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
+        <span v-else>{{ record.dispatchBillNo }}</span>
       </template>
     </s-table>
   </a-card>

+ 2 - 2
src/views/salesManagement/salesQuery/detail.vue

@@ -70,7 +70,7 @@
         size="large"
         style="width: 150px;"
         id="salesDetail-edit-btn"
-        v-if="detailData&&detailData.salesBillSource != 'PURCHASE' && (detailData.billStatus == 'WAIT_SUBMIT' || detailData.billStatus == 'WAIT_AUDIT' || detailData.billStatus == 'AUDIT_REJECT')"
+        v-if="detailData&&detailData.salesBillSource != 'PURCHASE' && (detailData.billStatus == 'WAIT_SUBMIT' || detailData.billStatus == 'WAIT_AUDIT' || detailData.billStatus == 'AUDIT_REJECT')&&$hasPermissions('B_salesEdit')"
         @click="handleEdit(record)"
       >
         编辑
@@ -81,7 +81,7 @@
         type="primary"
         class="button-info"
         id="salesDetail-edit-btn"
-        v-if="detailData&&detailData.salesBillSource == 'PURCHASE' && (detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE')"
+        v-if="detailData&&detailData.salesBillSource == 'PURCHASE' && (detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesEdit')"
         @click="handleEdit(record)"
       >
         改单

+ 13 - 10
src/views/salesManagement/salesQuery/list.vue

@@ -110,10 +110,13 @@
         bordered>
         <!-- 销售单号 -->
         <template slot="salesBillNo" slot-scope="text, record">
-          <a-badge :count="'改'+record.changeTimes" :offset="[0,-10]" v-if="record.changeTimes>0">
-            <span style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
-          </a-badge>
-          <span v-else style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+          <div v-if="$hasPermissions('B_salesDetail')">
+            <a-badge :count="'改'+record.changeTimes" :offset="[0,-10]" v-if="record.changeTimes>0">
+              <span style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+            </a-badge>
+            <span v-else style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+          </div>
+          <div v-else>{{ record.salesBillNo }}</div>
         </template>
         <!-- 总数量 -->
         <template slot="totalQty" slot-scope="text, record">
@@ -129,7 +132,7 @@
             size="small"
             type="link"
             class="button-warning"
-            v-if="record.billStatus == 'WAIT_AUDIT'"
+            v-if="record.billStatus == 'WAIT_AUDIT'&&$hasPermissions('B_salesAudit')"
             @click="handleEexamine(record)"
           >审核</a-button>
 
@@ -137,7 +140,7 @@
             size="small"
             type="link"
             class="button-warning"
-            v-if="record.billStatus == 'OUTING_WAREHOUSE'&&record.totalUnpushedQty>0"
+            v-if="record.billStatus == 'OUTING_WAREHOUSE'&&record.totalUnpushedQty>0&&$hasPermissions('B_salesDispatch')"
             @click="handleDispatch(record)"
           >下推</a-button>
 
@@ -145,7 +148,7 @@
             size="small"
             type="link"
             class="button-info"
-            v-if="record.salesBillSource != 'PURCHASE' && (record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT')"
+            v-if="record.salesBillSource != 'PURCHASE' && (record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT')&&$hasPermissions('B_salesEdit')"
             @click="handleEdit(record)"
           >
             编辑
@@ -154,7 +157,7 @@
             size="small"
             type="link"
             class="button-info"
-            v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE')"
+            v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesEdit')"
             @click="handleEdit(record)"
           >
             改单
@@ -163,7 +166,7 @@
             size="small"
             type="link"
             class="button-error"
-            v-if="record.salesBillSource != 'PURCHASE' && (record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT')"
+            v-if="record.salesBillSource != 'PURCHASE' && (record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT')&&$hasPermissions('B_salesDel')"
             @click="handleDel(record)"
           >
             删除
@@ -172,7 +175,7 @@
             size="small"
             type="link"
             class="button-error"
-            v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE')"
+            v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesDel')"
             @click="handleDel(record)"
           >
             取消

+ 3 - 3
src/views/salesManagement/salesReturn/detail.vue

@@ -47,7 +47,7 @@
           class="button-warning"
           style="width: 150px;"
           size="large"
-          v-if="detailData&&(detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE')"
+          v-if="detailData&&(detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesReturnAudit')"
           @click="visibleAudit=true"
           id="salesReturn-eexamine-btn">审核</a-button>
         <a-button
@@ -56,7 +56,7 @@
           size="large"
           style="width: 150px;"
           id="salesDetail-edit-btn"
-          v-if="detailData&&detailData.salesReturnBillSource == 'SALES' && (detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'WAIT_SUBMIT')"
+          v-if="detailData&&detailData.salesReturnBillSource == 'SALES' && (detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'WAIT_SUBMIT')&&$hasPermissions('B_salesReturnEdit')"
           @click="handleEdit()"
         >
           编辑
@@ -64,7 +64,7 @@
         <a-button
           size="large"
           style="width: 150px;"
-          v-if="detailData&&detailData.salesReturnBillSource != 'SALES' && (detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE')"
+          v-if="detailData&&detailData.salesReturnBillSource != 'SALES' && (detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesReturnEdit')"
           type="primary"
           class="button-info"
           @click="handleEdit()"

+ 9 - 8
src/views/salesManagement/salesReturn/list.vue

@@ -69,7 +69,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button type="primary" class="button-error" @click="openModal = true">新增</a-button>
+        <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesReturnNew')" @click="openModal = true">新增</a-button>
       </div>
       <!-- alert -->
       <a-alert type="info" style="margin-bottom: 10px;">
@@ -91,7 +91,8 @@
         bordered>
         <!-- 单号 -->
         <template slot="salesReturnBillNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
+          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_salesReturnDetail')" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
+          <span v-else>{{ record.salesReturnBillNo }}</span>
         </template>
         <!-- 财务状态 -->
         <!-- <template slot="financialStatus" slot-scope="text, record">
@@ -103,40 +104,40 @@
             size="small"
             type="link"
             class="button-warning"
-            v-if="record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT'"
+            v-if="(record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT')&&$hasPermissions('B_salesReturnAudit')"
             @click="handleEexamine(record)"
             id="salesReturn-eexamine-btn">审核</a-button>
           <a-button
             size="small"
             type="link"
             class="button-warning"
-            v-if="record.billStatus == 'WAIT_CHECK'"
+            v-if="record.billStatus == 'WAIT_CHECK'&&$hasPermissions('B_salesReturnCheck')"
             @click="handleCheck(record)"
             id="salesReturn-eexamine-btn">品检</a-button>
           <a-button
             size="small"
-            v-if="record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'FINANCIAL_REJECT'||record.billStatus == 'AUDIT_REJECT')"
+            v-if="record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'FINANCIAL_REJECT'||record.billStatus == 'AUDIT_REJECT')&&$hasPermissions('B_salesReturnEdit')"
             type="link"
             class="button-info"
             @click="handleEdit(record)"
             id="salesReturn-edit-btn">编辑</a-button>
           <a-button
             size="small"
-            v-if="record.salesReturnBillSource != 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT')"
+            v-if="record.salesReturnBillSource != 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT')&&$hasPermissions('B_salesReturnEdit')"
             type="link"
             class="button-info"
             @click="handleEdit(record)"
             id="salesReturn-edit-btn">改单</a-button>
           <a-button
             size="small"
-            v-if="record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'FINANCIAL_REJECT'||record.billStatus == 'AUDIT_REJECT')"
+            v-if="record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'FINANCIAL_REJECT'||record.billStatus == 'AUDIT_REJECT')&&$hasPermissions('B_salesReturnDel')"
             type="link"
             class="button-error"
             @click="handleDel(record)"
             id="salesReturn-del-btn">删除</a-button>
           <a-button
             size="small"
-            v-if="record.salesReturnBillSource != 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT')"
+            v-if="record.salesReturnBillSource != 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT')&&$hasPermissions('B_salesReturnDel')"
             type="link"
             class="button-error"
             @click="handleDel(record)"

+ 3 - 1
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -61,6 +61,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
+                v-if="$hasPermissions('B_oosDetailExportByBuyer')"
                 id="shortageStatisticsCList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
                 {{ advanced ? '收起' : '展开' }}
@@ -100,7 +101,8 @@
         bordered>
         <!-- 单号 -->
         <template slot="salesBillNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+          <span v-else>{{ record.salesBillNo }}</span>
         </template>
       </s-table>
     </a-spin>