1

src/views/markets/modules/agreementUnit/agreementAccount.vue

@@ -195,10 +195,12 @@
                     <a-input v-model="record.remarks" placeholder="" @blur="handleAccountRemarks(record)"></a-input>
                 </template>
                 <span slot="action" slot-scope="text, record">
-                    <a v-if="record.type == 3" @click="handleGoodsReturn(record)">退货</a>
                     <a-popconfirm v-if="record.status == 2" title="确定撤销结算吗?" @confirm="() => handleRevoke(record)">
                       <a>撤销</a>
                     </a-popconfirm>
+                    <span v-else>
+                        <a v-if="record.type == 3" @click="handleGoodsReturn(record)">退货</a>
+                    </span>
                 </span>
             </a-table>
         </div>
@@ -378,7 +380,7 @@ export default {
             if (this.settleType == 1 || this.settleType == 2){
                 this.url.list = this.url.baseList +"?status="+this.settleType+"&agreementUnitId="+this.agreementUnitInfo.id;
             }else{
-                this.url.list = this.url.baseList+"?status=1&agreementUnitId="+this.agreementUnitInfo.id;
+                this.url.list = this.url.baseList+"?agreementUnitId="+this.agreementUnitInfo.id;
             }
             // if (!this.queryParam.startTime=="") {
             //     this.url.list = this.url.list + "&startDate=" + this.queryParam.startTime