Browse Source

bug修复

chenrui 3 years ago
parent
commit
4ee2f7ece0
1 changed files with 6 additions and 5 deletions
  1. 6 5
      src/views/salesManagement/salesReturn/list.vue

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

@@ -123,7 +123,7 @@
             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')&&$hasPermissions('B_salesReturnEdit')"
+            v-if="record.salesReturnBillSource != 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT')&&$hasPermissions('B_salesReturnEdit')"
             type="link"
             class="button-info"
             @click="handleEdit(record)"
@@ -137,15 +137,16 @@
             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')&&$hasPermissions('B_salesReturnDel')"
+            v-if="record.salesReturnBillSource != 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT')&&$hasPermissions('B_salesReturnDel')"
             type="link"
             class="button-error"
             @click="handleDel(record)"
             id="salesReturn-del-btn">取消</a-button>
           <span
-            v-if="!(record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT') &&
-              !(record.billStatus == 'WAIT_CHECK') &&
-              !(record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'FINANCIAL_REJECT'||record.billStatus == 'AUDIT_REJECT'))">--</span>
+            v-if="!((record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT')&&$hasPermissions('B_salesReturnAudit')) &&
+              !(record.billStatus == 'WAIT_CHECK'&&$hasPermissions('B_salesReturnCheck')) &&
+              !(record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'FINANCIAL_REJECT'||record.billStatus == 'AUDIT_REJECT')&&($hasPermissions('B_salesReturnEdit') || $hasPermissions('B_salesReturnDel'))) &&
+              !(record.salesReturnBillSource != 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT')&&($hasPermissions('B_salesReturnEdit') || $hasPermissions('B_salesReturnDel')))">--</span>
         </template>
       </s-table>
     </a-spin>