Commit 831c03f4f1b62f3c38271713b1a08c18fcb1a3e3
1 parent
12c87364
入库单页面，出库单页面单据审核BUG修复
Signed-off-by: TanYibin <5491541@qq.com>
Showing
2 changed files
with
8 additions
and
6 deletions
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
| ... | ... | @@ -176,9 +176,10 @@ |
| 176 | 176 | <a-popconfirm v-has="'receiptHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)"> |
| 177 | 177 | <a><a-button type="default">回传</a-button><a-divider type="vertical"/></a> |
| 178 | 178 | </a-popconfirm> |
| 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'"><a-button type="primary">组盘</a-button><a-divider type="vertical"/></a> | |
| 180 | - <a v-if="record.firstStatus == '0'&&flowOff=='1'" @click="createAudit(record)"><a-button type="primary">提交审核</a-button><a-divider type="vertical"/></a> | |
| 181 | - <a v-if="record.nextAuditor == username&&flowOff=='1'" @click="audit(record)"><a-button type="primary">审核</a-button><a-divider type="vertical"/></a> | |
| 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> | |
| 181 | + <a v-if="record.firstStatus == '0' && flowOff == '1'" @click="createAudit(record)"><a-button type="primary">提交审核</a-button><a-divider type="vertical"/></a> | |
| 182 | + <a v-if="record.nextAuditor == username && flowOff == '1'" @click="audit(record)"><a-button type="primary">审核</a-button><a-divider type="vertical"/></a> | |
| 182 | 183 | <a v-if="record.lastStatus == 850" @click="viewReason(record)"><a-button type="danger">原因</a-button><a-divider type="vertical"/></a> |
| 183 | 184 | <a-dropdown> |
| 184 | 185 | <a class="ant-dropdown-link">更多 <a-icon type="down"/></a> |
| ... | ... |
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
| ... | ... | @@ -189,12 +189,13 @@ |
| 189 | 189 | </a-button> |
| 190 | 190 | </template> |
| 191 | 191 | <span slot="action" slot-scope="text, record"> |
| 192 | - <a v-if="record.firstStatus == '0'&&flowOff=='1'" @click="createAudit(record)"><a-button type="primary">提交审核</a-button><a-divider type="vertical"/></a> | |
| 193 | - <a v-if="record.nextAuditor == username&&flowOff=='1' " @click="audit(record)"><a-button type="primary">审核</a-button><a-divider type="vertical"/></a> | |
| 192 | + <a v-if="record.firstStatus == '0' && flowOff == '1'" @click="createAudit(record)"><a-button type="primary">提交审核</a-button><a-divider type="vertical"/></a> | |
| 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 | 195 | <a><a-button type="default">回传</a-button><a-divider type="vertical"/></a> |
| 196 | 196 | </a-popconfirm> |
| 197 | - <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> | |
| 197 | + <a v-if="((record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800)) | |
| 198 | + || (flowOff == '0' && record.lastStatus < 800)" @click="autoShipmentCombine(record)" v-has="'shipmentHeader:autoShipmentCombine'"><a-button type="primary">自动配盘</a-button> <a-divider type="vertical"/></a> | |
| 198 | 199 | <a-dropdown> |
| 199 | 200 | <a class="ant-dropdown-link">更多 <a-icon type="down"/></a> |
| 200 | 201 | <a-menu slot="overlay"> |
| ... | ... |