瀏覽代碼

修改bug

chenrui 7 月之前
父節點
當前提交
9e9223804c
共有 2 個文件被更改,包括 4 次插入2 次删除
  1. 1 1
      src/views/salesManagement/salesQuery/list.vue
  2. 3 1
      src/views/salesManagement/salesQueryNew/list.vue

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

@@ -228,7 +228,7 @@
             type="link"
             :id="'salesManagementList-del-'+record.salesBillNo"
             class="button-error"
-            v-if="((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING' ) && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel')"
+            v-if="((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING' ) && (record.billStatus != 'FINISH' || record.billStatus != 'WAIT_OUT_WAREHOUSE')) && $hasPermissions('B_salesDel')"
             @click="handleDel(record)"
           >
             删除

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

@@ -199,6 +199,8 @@
             <stateIcon :title="record.financialStatusDictValue" :state="record.financialStatus == 'FINISH'?'1':'2'"></stateIcon>
           </template>
           <!-- 操作按钮 -->
+          <!-- sourceType SALES自建   CHILD_PURCHASE下级创建  DEALER_PURCHASE省仓订单  XPRH_PURCHASE货架促销  TEMPORARY_DISPATCHING数字货架 -->
+          <!-- billStatus  WAIT_SUBMIT待提交   WAIT_AUDIT待审核    AUDIT_REJECT审核不通过  WAIT_OUT_WAREHOUSE待出库   FINISH已完结  SUPERIOR_CHANGE上级改单  CANCEL已取消 -->
           <template slot="action" slot-scope="text, record">
             <a-button
               :id="'salesManagementList-audit-'+record.id"
@@ -231,7 +233,7 @@
               size="small"
               type="link"
               class="button-error"
-              v-if="((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel')"
+              v-if="((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus != 'FINISH' ||record.billStatus != 'WAIT_OUT_WAREHOUSE' )) && $hasPermissions('B_salesDel')"
               @click="handleDel(record)"
             >
               删除