lilei 17 hours ago
parent
commit
19fe53e769

+ 13 - 3
src/views/salesManagement/receiptPrint/list.vue

@@ -54,9 +54,17 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
+              <a-form-item label="收款金额">
+                <a-select allowClear placeholder="请选择" id="salesCollectionList-receiptAmount" v-model="queryParam.receiptAmountZeroFlag">
+                  <a-select-option value="1">等于0</a-select-option>
+                  <a-select-option value="0">有金额</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="isShowCustomerSearch&&currentTab==1?24:6" :sm="24" :style="{textAlign:isShowCustomerSearch&&currentTab==1?'center':''}">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+                <a-button style="margin-left: 8px;margin-bottom:10px;" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <!-- <a @click="advanced=!advanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -182,7 +190,8 @@ export default {
         fullPaymentFlag: undefined,
         warehouseSn: undefined,
         printStatus: 'NO_PRINT',
-        bizUserSn: undefined
+        bizUserSn: undefined,
+        receiptAmountZeroFlag: undefined
       },
       totalData: {
         totalAmount: 0,
@@ -456,7 +465,8 @@ export default {
         fullPaymentFlag: undefined,
         warehouseSn: undefined,
         bizUserSn: undefined,
-        printStatus: this.currentTab == 2 ? 'NO_PRINT' : undefined
+        printStatus: this.currentTab == 2 ? 'NO_PRINT' : undefined,
+        receiptAmountZeroFlag: undefined
       }
       this.$refs.table.refresh(true)
       this.$refs.table.clearSelected()

+ 1 - 1
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -15,7 +15,7 @@
           <span style="margin: 0 0 0 10px;color: #666;">
             退货仓库:{{ ordeDetail&&ordeDetail.warehouseName }}
           </span>
-          <a-button size="small" type="link" @click="showEditModal=true">
+          <a-button size="small" type="link" @click="showEditModal=true" v-if="ordeDetail&&(ordeDetail.billStatus=='WAIT_SUBMIT'||ordeDetail.billStatus=='AUDIT_REJECT')">
             <a-icon type="edit"></a-icon>修改
           </a-button>
         </template>