diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
index 1d6181b..e478d3c 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
@@ -176,9 +176,10 @@
           <a-popconfirm v-has="'receiptHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
           	<a><a-button type="default">回传</a-button><a-divider type="vertical"/></a>
           </a-popconfirm>
-          <a v-if="(record.lastStatus < 800 && record.firstStatus ==15 && record.firstStatus!='20') ||flowOff=='0'&&record.lastStatus < 800 " @click="receive(record)" v-has="'receiptHeader:receive'"><a-button type="primary">组盘</a-button><a-divider type="vertical"/></a>
-          <a v-if="record.firstStatus == '0'&&flowOff=='1'" @click="createAudit(record)"><a-button type="primary">提交审核</a-button><a-divider type="vertical"/></a>
-          <a v-if="record.nextAuditor == username&&flowOff=='1'" @click="audit(record)"><a-button type="primary">审核</a-button><a-divider type="vertical"/></a>
+          <a v-if="(record.lastStatus < 800 && record.firstStatus >= 15 && record.firstStatus != '20')
+            || (flowOff == '0' && record.lastStatus < 800) " @click="receive(record)" v-has="'receiptHeader:receive'"><a-button type="primary">组盘</a-button><a-divider type="vertical"/></a>
+          <a v-if="record.firstStatus == '0' && flowOff == '1'" @click="createAudit(record)"><a-button type="primary">提交审核</a-button><a-divider type="vertical"/></a>
+          <a v-if="record.nextAuditor == username && flowOff == '1'" @click="audit(record)"><a-button type="primary">审核</a-button><a-divider type="vertical"/></a>
           <a v-if="record.lastStatus == 850" @click="viewReason(record)"><a-button type="danger">原因</a-button><a-divider type="vertical"/></a>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
diff --git a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
index be400fa..a905fc3 100644
--- a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
@@ -189,12 +189,13 @@
           </a-button>
         </template>
         <span slot="action" slot-scope="text, record">
-          <a v-if="record.firstStatus == '0'&&flowOff=='1'" @click="createAudit(record)"><a-button type="primary">提交审核</a-button><a-divider type="vertical"/></a>
-          <a v-if="record.nextAuditor == username&&flowOff=='1' " @click="audit(record)"><a-button type="primary">审核</a-button><a-divider type="vertical"/></a>
+          <a v-if="record.firstStatus == '0' && flowOff == '1'" @click="createAudit(record)"><a-button type="primary">提交审核</a-button><a-divider type="vertical"/></a>
+          <a v-if="record.nextAuditor == username && flowOff == '1' " @click="audit(record)"><a-button type="primary">审核</a-button><a-divider type="vertical"/></a>
           <a-popconfirm v-has="'shipmentHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
             <a><a-button type="default">回传</a-button><a-divider type="vertical"/></a>
           </a-popconfirm>
-          <a v-if="(record.firstStatus>15&&record.firstStatus!='20'&&record.lastStatus < 800)||flowOff=='0'&&record.lastStatus < 800  " @click="autoShipmentCombine(record)" v-has="'shipmentHeader:autoShipmentCombine'"><a-button type="primary">自动配盘</a-button> <a-divider type="vertical"/></a>
+          <a v-if="((record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800))
+            || (flowOff == '0' && record.lastStatus < 800)" @click="autoShipmentCombine(record)" v-has="'shipmentHeader:autoShipmentCombine'"><a-button type="primary">自动配盘</a-button> <a-divider type="vertical"/></a>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">