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

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

chenrui 3 лет назад
Родитель
Сommit
110795568e
26 измененных файлов с 79 добавлено и 70 удалено
  1. 2 2
      src/views/allocationManagement/chainTransferIn/detail.vue
  2. 1 1
      src/views/allocationManagement/chainTransferIn/edit.vue
  3. 5 4
      src/views/allocationManagement/chainTransferIn/list.vue
  4. 2 2
      src/views/allocationManagement/chainTransferOut/detail.vue
  5. 1 1
      src/views/allocationManagement/chainTransferOut/edit.vue
  6. 7 6
      src/views/allocationManagement/chainTransferOut/list.vue
  7. 2 2
      src/views/allocationManagement/storeTransferOut/detail.vue
  8. 2 2
      src/views/allocationManagement/storeTransferOut/edit.vue
  9. 7 6
      src/views/allocationManagement/storeTransferOut/list.vue
  10. 1 1
      src/views/allocationManagement/warehouseAllocation/detail.vue
  11. 7 6
      src/views/allocationManagement/warehouseAllocation/list.vue
  12. 1 1
      src/views/purchasingManagement/purchaseOrder/detail.vue
  13. 1 1
      src/views/purchasingManagement/purchaseOrder/edit.vue
  14. 6 5
      src/views/purchasingManagement/purchaseOrder/list.vue
  15. 5 4
      src/views/purchasingManagement/purchaseReturn/list.vue
  16. 2 2
      src/views/salesManagement/outboundOrder/list.vue
  17. 2 2
      src/views/salesManagement/salesQuery/chooseCustomModal.vue
  18. 2 2
      src/views/salesManagement/salesQuery/detail.vue
  19. 1 1
      src/views/salesManagement/salesQuery/edit.vue
  20. 9 8
      src/views/salesManagement/salesQuery/list.vue
  21. 1 1
      src/views/salesManagement/salesReturn/detail.vue
  22. 6 5
      src/views/salesManagement/salesReturn/list.vue
  23. 2 2
      src/views/salesManagement/salesReturn/salesReturnEdit.vue
  24. 1 1
      src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue
  25. 1 1
      src/views/salesManagement/urgentItemsOffset/detail.vue
  26. 2 1
      src/views/salesManagement/urgentItemsOffset/list.vue

+ 2 - 2
src/views/allocationManagement/chainTransferIn/detail.vue

@@ -6,7 +6,7 @@
         <template slot="subTitle">
           <a id="chainTransferInDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <a-button
-            v-if="isEdit"
+            v-if="isEdit&&$hasPermissions('B_allocLinkagePutEdit')"
             type="primary"
             size="small"
             style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
@@ -14,7 +14,7 @@
             @click.stop="handleEdit">编辑</a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_allocLinkagePutPrint')">
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>
             <a-radio value="INK">喷墨</a-radio>

+ 1 - 1
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -7,7 +7,7 @@
           <a id="chainTransferInEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_allocLinkagePutPrint')">
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>
             <a-radio value="INK">喷墨</a-radio>

+ 5 - 4
src/views/allocationManagement/chainTransferIn/list.vue

@@ -82,7 +82,8 @@
         bordered>
         <!-- 连锁调入单号 -->
         <template slot="allocationLinkagePutNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.allocationLinkagePutNo }}</span>
+          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_allocLinkagePutDetail')" @click="handleDetail(record)">{{ record.allocationLinkagePutNo }}</span>
+          <span v-else>{{ record.allocationLinkagePutNo }}</span>
         </template>
         <!-- 财务状态 -->
         <template slot="settleState" slot-scope="text, record">
@@ -93,21 +94,21 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_SUBMIT'"
+            v-if="record.state == 'WAIT_SUBMIT'&&$hasPermissions('B_allocLinkagePutEdit')"
             class="button-primary"
             @click="handleEdit(record)"
             id="chainTransferInList-warehousing-btn">入库</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_AUDIT'"
+            v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_allocLinkagePutAudit')"
             class="button-warning"
             @click="handleExamine(record)"
             id="chainTransferInList-examine-btn">审核</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_AUDIT'"
+            v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_allocLinkagePutEdit')"
             class="button-info"
             @click="handleEdit(record)"
             id="chainTransferInList-edit-btn">编辑</a-button>

+ 2 - 2
src/views/allocationManagement/chainTransferOut/detail.vue

@@ -6,7 +6,7 @@
         <template slot="subTitle">
           <a id="chainTransferOutDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <a-button
-            v-if="isEdit"
+            v-if="isEdit&&$hasPermissions('B_allocLinkageOutEdit')"
             type="primary"
             size="small"
             style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
@@ -14,7 +14,7 @@
             @click.stop="handleEdit">编辑</a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_allocLinkageOutPrint')">
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>
             <a-radio value="INK">喷墨</a-radio>

+ 1 - 1
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -8,7 +8,7 @@
           <span style="margin: 0 15px;color: #666;">调往对象:{{ (basicInfoData&&basicInfoData.putTenantName) || '--' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_allocLinkageOutPrint')">
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>
             <a-radio value="INK">喷墨</a-radio>

+ 7 - 6
src/views/allocationManagement/chainTransferOut/list.vue

@@ -72,7 +72,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="chainTransferOutList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
+        <a-button id="chainTransferOutList-add" v-if="$hasPermissions('B_allocLinkageOutNew')" type="primary" class="button-error" @click="openModal=true">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -86,7 +86,8 @@
         bordered>
         <!-- 连锁调出单号 -->
         <template slot="allocationLinkageOutNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.allocationLinkageOutNo }}</span>
+          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_allocLinkageOutDetail')" @click="handleDetail(record)">{{ record.allocationLinkageOutNo }}</span>
+          <span v-else>{{ record.allocationLinkageOutNo }}</span>
         </template>
         <!-- 财务状态 -->
         <template slot="settleState" slot-scope="text, record">
@@ -97,28 +98,28 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_AUDIT'"
+            v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_allocLinkageOutAudit')"
             class="button-warning"
             @click="handleExamine(record)"
             id="chainTransferOutList-examine-btn">审核</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_SUBMIT' || record.state == 'WAIT_AUDIT'"
+            v-if="(record.state == 'WAIT_SUBMIT' || record.state == 'WAIT_AUDIT') &&$hasPermissions('B_allocLinkageOutEdit')"
             class="button-info"
             @click="handleEdit(record)"
             id="chainTransferOutList-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_OUT_WAREHOUSE'"
+            v-if="record.state == 'WAIT_OUT_WAREHOUSE'&&$hasPermissions('B_allocLinkageOutStock')"
             class="button-primary"
             @click="handleOut(record)"
             id="chainTransferOutList-out-btn">出库</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_SUBMIT' || record.state == 'WAIT_AUDIT' || record.state == 'WAIT_OUT_WAREHOUSE'"
+            v-if="(record.state == 'WAIT_SUBMIT' || record.state == 'WAIT_AUDIT' || record.state == 'WAIT_OUT_WAREHOUSE') &&$hasPermissions('B_allocLinkageOutDel')"
             class="button-error"
             @click="handleDel(record)"
             id="chainTransferOutList-del-btn">删除</a-button>

+ 2 - 2
src/views/allocationManagement/storeTransferOut/detail.vue

@@ -6,7 +6,7 @@
         <template slot="subTitle">
           <a id="storeTransferOutDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <a-button
-            v-if="isEdit"
+            v-if="isEdit&&$hasPermissions('B_storeCallOutEdit')"
             type="primary"
             size="small"
             style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
@@ -14,7 +14,7 @@
             @click.stop="handleEdit">编辑</a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_storeCallOutPrint')">
           <a-checkbox key="4" v-model="printCostChecked">打印成本</a-checkbox>
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>

+ 2 - 2
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -8,7 +8,7 @@
           <span style="margin: 0 15px;color: #666;">调往对象名称:{{ (basicInfoData&&basicInfoData.putPersonName) || '--' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_storeCallOutPrint')">
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>
             <a-radio value="INK">喷墨</a-radio>
@@ -401,7 +401,7 @@ export default {
               _this.$refs.table.refresh()
               _this.getChooseProductList()
               _this.spinning = false
-            }else{
+            } else {
               _this.spinning = false
             }
           })

+ 7 - 6
src/views/allocationManagement/storeTransferOut/list.vue

@@ -61,7 +61,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="storeTransferOutList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
+        <a-button id="storeTransferOutList-add" v-if="$hasPermissions('B_storeTransferOutNews')" type="primary" class="button-error" @click="openModal=true">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -75,7 +75,8 @@
         bordered>
         <!-- 店内调出单号 -->
         <template slot="storeCallOutNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.storeCallOutNo }}</span>
+          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_storeCallOutDetail')" @click="handleDetail(record)">{{ record.storeCallOutNo }}</span>
+          <span v-else>{{ record.storeCallOutNo }}</span>
         </template>
         <!-- 财务状态 -->
         <template slot="settleState" slot-scope="text, record">
@@ -86,28 +87,28 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_AUDIT'"
+            v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_storeCallOutAudit')"
             class="button-warning"
             @click="handleExamine(record)"
             id="storeTransferOutList-examine-btn">审核</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="(record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT')"
+            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT')) &&$hasPermissions('B_storeCallOutEdit')"
             class="button-info"
             @click="handleEdit(record)"
             id="storeTransferOutList-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_OUT_WAREHOUSE'"
+            v-if="record.state == 'WAIT_OUT_WAREHOUSE'&&$hasPermissions('B_storeCallStockOut')"
             class="button-primary"
             @click="handleOut(record)"
             id="storeTransferOutList-out-btn">出库</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="(record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'WAIT_OUT_WAREHOUSE')"
+            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'WAIT_OUT_WAREHOUSE'))&&$hasPermissions('B_storeCallOutDel')"
             class="button-error"
             @click="handleDel(record)"
             id="storeTransferOutList-del-btn">删除</a-button>

+ 1 - 1
src/views/allocationManagement/warehouseAllocation/detail.vue

@@ -5,7 +5,7 @@
       <template slot="subTitle">
         <a id="warehouseAllocationDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
         <a-button
-          v-if="warehouse&&warehouse.stateDictValue!='已完结'"
+          v-if="warehouse&&warehouse.stateDictValue!='已完结'&&$hasPermissions('B_warehouseAllocationEdit')"
           type="primary"
           size="small"
           style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"

+ 7 - 6
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -1,6 +1,6 @@
 <template>
   <a-card size="small" :bordered="false" class="warehouseAllocationList-wrap">
-    
+
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
@@ -51,7 +51,7 @@
         </a-form>
       </div>
       <!-- 操作按钮 -->
-      <div class="table-operator"><a-button id="warehouseAllocationList-add" type="primary" class="button-error" @click="openModal = true">新增</a-button></div>
+      <div class="table-operator"><a-button id="warehouseAllocationList-add" v-if="$hasPermissions('B_warehouseAllocationNews')" type="primary" class="button-error" @click="openModal = true">新增</a-button></div>
       <!-- 列表 -->
       <s-table
         class="sTable"
@@ -64,12 +64,13 @@
         bordered>
         <!-- 单号 -->
         <template slot="allocationWarehouseNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.allocationWarehouseNo }}</span>
+          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_warehouseAllocationDetail')" @click="handleDetail(record)">{{ record.allocationWarehouseNo }}</span>
+          <span v-else>{{ record.allocationWarehouseNo }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
-            v-if="record.state == 'WAIT_AUDIT'"
+            v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_allocWarehouseAudit')"
             size="small"
             type="link"
             class="button-warning"
@@ -78,7 +79,7 @@
             审核
           </a-button>
           <a-button
-            v-if="(record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT')"
+            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT')) && $hasPermissions('B_warehouseAllocationEdit')"
             size="small"
             type="link"
             class="button-info"
@@ -87,7 +88,7 @@
             编辑
           </a-button>
           <a-button
-            v-if="(record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT')"
+            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT')) && $hasPermissions('B_warehouseAllocationDel')"
             size="small"
             type="link"
             class="button-error"

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -10,7 +10,7 @@
           <a-tag color="orange">{{ detail&&detail.financialStatusDictValue }}</a-tag>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_purchasePrint')">
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>
             <a-radio value="INK">喷墨</a-radio>

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -8,7 +8,7 @@
           <p class="billno">单号:{{ detail&&detail.purchaseBillNo }}</p>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_purchasePrint')">
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>
             <a-radio value="INK">喷墨</a-radio>

+ 6 - 5
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -67,7 +67,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="purchaseOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
+        <a-button id="purchaseOrderList-add" type="primary" v-if="$hasPermissions('B_purchaseNew')" class="button-error" @click="handleAdd">新增</a-button>
       </div>
       <!-- alert -->
       <a-alert type="info" showIcon style="margin-bottom:15px">
@@ -85,7 +85,8 @@
         bordered>
         <!-- 采购单号 -->
         <template slot="purchaseBillNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.purchaseBillNo }}</span>
+          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_purchaseDetail')" @click="handleDetail(record)">{{ record.purchaseBillNo }}</span>
+          <span v-else>{{ record.purchaseBillNo }}</span>
         </template>
         <!-- 财务状态 -->
         <template slot="financialStatus" slot-scope="text, record">
@@ -101,21 +102,21 @@
             size="small"
             type="link"
             class="button-info"
-            v-if="record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT'"
+            v-if="(record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT') && $hasPermissions('B_purchaseEdit')"
             @click="handleEdit(record)"
           >编辑</a-button>
           <a-button
             size="small"
             type="link"
             class="button-warning"
-            v-if="record.billStatus == 'WAIT_PUT_WAREHOUSE'"
+            v-if="record.billStatus == 'WAIT_PUT_WAREHOUSE'&&$hasPermissions('B_purchaseReceiving')"
             @click="handleWarehouse(record)"
           >签收入库</a-button>
           <a-button
             size="small"
             type="link"
             class="button-error"
-            v-if="record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT'"
+            v-if="(record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT') &&$hasPermissions('B_purchaseDel')"
             @click="handleDel(record)"
           >删除</a-button>
           <span v-if="record.billStatus != 'WAIT_SUBMIT'&&record.billStatus != 'AUDIT_REJECT'&&record.billStatus != 'WAIT_PUT_WAREHOUSE'">--</span>

+ 5 - 4
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -53,7 +53,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="purchaseReturnList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+        <a-button id="purchaseReturnList-add" type="primary" v-if="$hasPermissions('B_purchaseReturnNew')" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -67,7 +67,8 @@
         bordered>
         <!-- 采退单号 -->
         <template slot="purchaseReturnNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.purchaseReturnNo }}</span>
+          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_purchaseReturnDetail')" @click="handleDetail(record)">{{ record.purchaseReturnNo }}</span>
+          <span v-else>{{ record.purchaseReturnNo }}</span>
         </template>
         <!-- 财务状态 -->
         <template slot="settleState" slot-scope="text, record">
@@ -79,14 +80,14 @@
             size="small"
             type="link"
             class="button-info"
-            v-if="record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT'"
+            v-if="(record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && $hasPermissions('B_purchaseReturnEdit')"
             @click="handleEdit(record)"
             id="purchaseReturnList-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
             class="button-error"
-            v-if="record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT'"
+            v-if="(record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && $hasPermissions('B_purchaseReturnDel')"
             @click="handleDel(record)"
             id="purchaseReturnList-del-btn">删除</a-button>
           <span v-if="!(record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT')">--</span>

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

@@ -83,7 +83,7 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state=='WAIT'"
+            v-if="record.state=='WAIT'&&$hasPermissions('B_outboundOut')"
             class="button-primary"
             @click="handleOutbound(record)"
             id="outboundOrderList-out-btn">出库</a-button>
@@ -230,7 +230,7 @@ export default {
               _this.$message.success(res.message)
               _this.$refs.table.refresh()
               _this.spinning = false
-            }else{
+            } else {
               _this.spinning = false
             }
           })

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

@@ -32,7 +32,7 @@
               </a-select>
             </a-form-model-item>
           </a-col>
-          <a-col :span="16">
+          <a-col :span="16" v-if="$hasPermissions('B_customer_customerInfo_add')">
             <a-form-model-item>
               <a-button type="primary" class="button-primary" @click="openNewCust" icon="plus">新增</a-button>
               (点击新增按钮新增客户)
@@ -404,7 +404,7 @@ export default {
         if (res.status != 200) {
           this.$message.error(res.message)
           this.spinning = false
-        }else{
+        } else {
           this.spinning = false
         }
       })

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

@@ -5,14 +5,14 @@
         <template slot="subTitle">
           <a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
           <a-button
-            v-if="detailData&&detailData.billStatus !== 'CANCEL' && detailData.billStatus !== 'FINISH' && detailData.billStatus != 'WAIT_OUT_WAREHOUSE'"
+            v-if="(detailData&&detailData.billStatus !== 'CANCEL' && detailData.billStatus !== 'FINISH' && detailData.billStatus != 'WAIT_OUT_WAREHOUSE')&&$hasPermissions('B_salesEdit')"
             type="primary"
             size="small"
             style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
             id="salesDetail-edit-btn"
             @click.stop="handleEdit">编辑</a-button>
         </template>
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_salesPrint')">
           <!-- <span>打印字段:</span>
           <a-select key="1" style="width:150px" id="salesDetail-pritKey" placeholder="请选择打印字段" allowClear>
             <a-select-option v-for="item in pritKey" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>

+ 1 - 1
src/views/salesManagement/salesQuery/edit.vue

@@ -8,7 +8,7 @@
           <span style="margin: 0 15px;color: #666;">客户名称:{{ detailData&&detailData.buyerName }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_salesPrint')">
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>
             <a-radio value="INK">喷墨</a-radio>

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

@@ -82,7 +82,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button type="primary" class="button-error" @click="handleAdd">新增(零售)</a-button>
+        <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd">新增(零售)</a-button>
       </div>
       <!-- alert -->
       <a-alert type="info" showIcon style="margin-bottom:15px">
@@ -105,7 +105,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>
         <!-- 急件 -->
         <template slot="oosFlag" slot-scope="text, record">
@@ -121,13 +122,13 @@
             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>
           <a-button
             size="small"
             type="link"
-            v-if="record.billStatus == 'WAIT_OUT_WAREHOUSE'"
+            v-if="record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')"
             class="button-primary"
             @click="handleSend(record)"
           >出库</a-button>
@@ -135,7 +136,7 @@
             size="small"
             type="link"
             class="button-info"
-            v-if="(record.salesBillSource == 'SATELLITE' || record.salesBillSource == 'SALES') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT')"
+            v-if="((record.salesBillSource == 'SATELLITE' || record.salesBillSource == 'SALES') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT')) && $hasPermissions('B_salesEdit')"
             @click="handleEdit(record)"
           >
             编辑
@@ -144,7 +145,7 @@
             size="small"
             type="link"
             class="button-error"
-            v-if="(record.salesBillSource == 'SATELLITE' || record.salesBillSource == 'SALES') && record.billStatus != 'FINISH'"
+            v-if="((record.salesBillSource == 'SATELLITE' || record.salesBillSource == 'SALES') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel')"
             @click="handleDel(record)"
           >
             删除
@@ -153,7 +154,7 @@
             size="small"
             type="link"
             class="button-info"
-            v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT')"
+            v-if="(record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT')) && $hasPermissions('B_salesEdit')"
             @click="handleEdit(record)"
           >
             改单
@@ -162,7 +163,7 @@
             size="small"
             type="link"
             class="button-error"
-            v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT')"
+            v-if="(record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT')) && $hasPermissions('B_salesDel')"
             @click="handleDel(record, 'cancel')"
           >
             取消

+ 1 - 1
src/views/salesManagement/salesReturn/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_salesReturnPrint')">
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>
             <a-radio value="INK">喷墨</a-radio>

+ 6 - 5
src/views/salesManagement/salesReturn/list.vue

@@ -62,7 +62,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: 15px;">
@@ -85,7 +85,8 @@
         bordered>
         <!-- 单号 -->
         <template slot="salesReturnNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.salesReturnNo }}</span>
+          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_salesReturnDetail')" @click="handleDetail(record)">{{ record.salesReturnNo }}</span>
+          <span v-else>{{ record.salesReturnNo }}</span>
         </template>
         <!-- 财务状态 -->
         <template slot="financialStatus" slot-scope="text, record">
@@ -97,19 +98,19 @@
             size="small"
             type="link"
             class="button-warning"
-            v-if="record.state == 'WAIT_AUDIT'"
+            v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_salesReturnAudit')"
             @click="handleEexamine(record)"
             id="salesReturn-eexamine-btn">审核</a-button>
           <a-button
             size="small"
-            v-if="record.state == 'WAIT_AUDIT'||record.state == 'WAIT_SUBMIT'"
+            v-if="(record.state == 'WAIT_AUDIT'||record.state == 'WAIT_SUBMIT') &&$hasPermissions('B_salesReturnEdit')"
             type="link"
             class="button-info"
             @click="handleEdit(record)"
             id="salesReturn-edit-btn">编辑</a-button>
           <a-button
             size="small"
-            v-if="record.state == 'WAIT_AUDIT'||record.state == 'WAIT_SUBMIT'"
+            v-if="(record.state == 'WAIT_AUDIT'||record.state == 'WAIT_SUBMIT') &&$hasPermissions('B_salesReturnDel')"
             type="link"
             class="button-error"
             @click="handleDel(record)"

+ 2 - 2
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -8,7 +8,7 @@
           <span style="margin: 0 15px;color: #666;">客户名称:{{ (ordeDetail&&ordeDetail.buyerName) || '--' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_salesReturnPrint')">
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>
             <a-radio value="INK">喷墨</a-radio>
@@ -343,7 +343,7 @@ export default {
         if (res.status == 200) {
           this.resetSearchForm()
           this.spinning = false
-        }else{
+        } else {
           this.spinning = false
         }
       })

+ 1 - 1
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -8,7 +8,7 @@
           <span style="margin: 0 15px;color: #666;">客户名称:{{ (ordeDetail&&ordeDetail.buyerName) || '--' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_salesReturnPrint')">
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>
             <a-radio value="INK">喷墨</a-radio>

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

@@ -9,7 +9,7 @@
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
-          <a-button key="3" type="danger" v-if="!isWriteDown" @click="handleSubmit" id="urgentItemsOffsetDetail-btn-submit">冲减</a-button>
+          <a-button key="3" type="danger" v-if="!isWriteDown&&$hasPermissions('B_urgentWriteDown')" @click="handleSubmit" id="urgentItemsOffsetDetail-btn-submit">冲减</a-button>
           <!-- <a-button key="2" @click="handlePreview" id="urgentItemsOffsetDetail-btn-preview">打印预览</a-button>
           <a-button key="1" type="primary" @click="handlePrint" id="urgentItemsOffsetDetail-btn-print">快速打印</a-button> -->
         </template>

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

@@ -69,7 +69,8 @@
       bordered>
       <!-- 单号 -->
       <template slot="urgentBillNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.urgentBillNo }}</span>
+        <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('M_urgentDetail')" @click="handleDetail(record)">{{ record.urgentBillNo }}</span>
+        <span v-else>{{ record.urgentBillNo }}</span>
       </template>
     </s-table>
   </a-card>