Commit cfd950473b1cbbfb1411f42f6773047cd1cdb7ea
1 parent
80262022
入库单出库单下拉框显示优化，更多没有选择项时候不显示
Signed-off-by: TanYibin <5491541@qq.com>
Showing
2 changed files
with
7 additions
and
7 deletions
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
| ... | ... | @@ -174,14 +174,15 @@ |
| 174 | 174 | |
| 175 | 175 | <span slot="action" slot-scope="text, record"> |
| 176 | 176 | <a-popconfirm v-has="'receiptHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)"> |
| 177 | - <a><a-button type="default">回传</a-button><a-divider type="vertical"/></a> | |
| 177 | + <a><a-button type="default">回传</a-button></a> | |
| 178 | 178 | </a-popconfirm> |
| 179 | - <a v-if="(record.lastStatus < 800 && record.firstStatus >= 15 && record.firstStatus != '20') | |
| 180 | - || (flowOff == '0' && record.lastStatus < 800) " @click="receive(record)" v-has="'receiptHeader:receive'"><a-button type="primary">组盘</a-button><a-divider type="vertical"/></a> | |
| 179 | + <a v-if="(record.lastStatus < 800 && record.firstStatus >= 15 && record.firstStatus != '20') || (flowOff == '0' && record.lastStatus < 800) " @click="receive(record)" v-has="'receiptHeader:receive'"> | |
| 180 | + <a-button type="primary">组盘</a-button><a-divider type="vertical"/> | |
| 181 | + </a> | |
| 181 | 182 | <a v-if="record.firstStatus == '0' && flowOff == '1'" @click="createAudit(record)"><a-button type="primary">提交审核</a-button><a-divider type="vertical"/></a> |
| 182 | 183 | <a v-if="record.nextAuditor == username && flowOff == '1'" @click="audit(record)"><a-button type="primary">审核</a-button><a-divider type="vertical"/></a> |
| 183 | 184 | <a v-if="record.lastStatus == 850" @click="viewReason(record)"><a-button type="danger">原因</a-button><a-divider type="vertical"/></a> |
| 184 | - <a-dropdown> | |
| 185 | + <a-dropdown v-if="(record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1') || (record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null)"> | |
| 185 | 186 | <a class="ant-dropdown-link">更多 <a-icon type="down"/></a> |
| 186 | 187 | <a-menu slot="overlay"> |
| 187 | 188 | <a-menu-item v-if="record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1'"> |
| ... | ... | @@ -197,7 +198,6 @@ |
| 197 | 198 | </a-menu-item> |
| 198 | 199 | </a-menu> |
| 199 | 200 | </a-dropdown> |
| 200 | - | |
| 201 | 201 | </span> |
| 202 | 202 | |
| 203 | 203 | </a-table> |
| ... | ... |
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
| ... | ... | @@ -192,13 +192,13 @@ |
| 192 | 192 | <a v-if="record.firstStatus == '0' && flowOff == '1'" @click="createAudit(record)"><a-button type="primary">提交审核</a-button><a-divider type="vertical"/></a> |
| 193 | 193 | <a v-if="record.nextAuditor == username && flowOff == '1' " @click="audit(record)"><a-button type="primary">审核</a-button><a-divider type="vertical"/></a> |
| 194 | 194 | <a-popconfirm v-has="'shipmentHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)"> |
| 195 | - <a><a-button type="default">回传</a-button><a-divider type="vertical"/></a> | |
| 195 | + <a><a-button type="default">回传</a-button></a> | |
| 196 | 196 | </a-popconfirm> |
| 197 | 197 | <a v-if="((record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus <= 200)) |
| 198 | 198 | || (flowOff == '0' && record.lastStatus <= 200)" @click="autoShipmentCombine(record)" v-has="'shipmentHeader:autoShipmentCombine'"><a-button type="primary">自动配盘</a-button> <a-divider type="vertical"/></a> |
| 199 | 199 | <a v-if="((record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800)) |
| 200 | 200 | || (flowOff == '0' && record.lastStatus < 800)" @click="openAutoShipmentCombine(record)" v-has="'shipmentHeader:autoShipment'"><a-button type="primary">自动出库</a-button> <a-divider type="vertical"/></a> |
| 201 | - <a-dropdown> | |
| 201 | + <a-dropdown v-if="(record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1') || (record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null)"> | |
| 202 | 202 | <a class="ant-dropdown-link">更多 <a-icon type="down"/></a> |
| 203 | 203 | <a-menu slot="overlay"> |
| 204 | 204 | <a-menu-item v-if="record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1'"> |
| ... | ... |