|
@@ -73,10 +73,10 @@
|
|
|
size="small"
|
|
|
type="link"
|
|
|
class="button-warning"
|
|
|
- v-if="record.auditState == 'WAIT_PUT_WAREHOUSE'&&$hasPermissions('B_purchaseReceiving')"
|
|
|
+ v-if="(record.auditState == 'PUT_WAREHOUSE_AUDIT_REJECT' || record.auditState == 'WAIT_PUT_WAREHOUSE')&&$hasPermissions('B_purchaseReceiving')"
|
|
|
@click="handleWarehouse(record)"
|
|
|
>签收入库</a-button>
|
|
|
- <span v-if="!(record.auditState == 'WAIT_PUT_WAREHOUSE'&&$hasPermissions('B_purchaseReceiving'))">--</span>
|
|
|
+ <span v-if="!((record.auditState == 'PUT_WAREHOUSE_AUDIT_REJECT' || record.auditState == 'WAIT_PUT_WAREHOUSE')&&$hasPermissions('B_purchaseReceiving'))">--</span>
|
|
|
</template>
|
|
|
</s-table>
|
|
|
</a-spin>
|
|
@@ -87,7 +87,7 @@
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import rangeDateTime from '@/views/common/rangeDateTime.vue'
|
|
|
import getDate from '@/libs/getDate.js'
|
|
|
-import { receivingList } from '@/api/receiving'
|
|
|
+import { receivingStockList } from '@/api/receiving'
|
|
|
export default {
|
|
|
components: { STable, VSelect, rangeDateTime },
|
|
|
data () {
|
|
@@ -121,7 +121,7 @@ export default {
|
|
|
loadData: parameter => {
|
|
|
this.disabled = true
|
|
|
this.spinning = true
|
|
|
- return receivingList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
+ return receivingStockList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
const data = res.data
|
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
@@ -161,7 +161,7 @@ export default {
|
|
|
},
|
|
|
// 签收入库
|
|
|
handleWarehouse (row) {
|
|
|
- this.$router.push({ path: `/purchasingManagement/signWarehousing/edit/${row.purchaseBillSn}` })
|
|
|
+ this.$router.push({ path: `/purchasingManagement/signWarehousing/edit/${row.receivingBillSn}` })
|
|
|
},
|
|
|
pageInit () {
|
|
|
const _this = this
|