diff --git a/src/api/sync/spsSyncStatus.js b/src/api/sync/spsSyncStatus.js index a822d6c2..08d81b0c 100644 --- a/src/api/sync/spsSyncStatus.js +++ b/src/api/sync/spsSyncStatus.js @@ -50,3 +50,13 @@ export function updateConfig(query) { }); } +export function infoByStatus(query) { + return axios({ + url: "/spssync/basic/udiinfo/infoByStatus", + method: "post", + data: query, + responseType: 'blob' + }); +} + + diff --git a/src/views/inout/DialogNewReviewOrder.vue b/src/views/inout/DialogNewReviewOrder.vue index 685d6766..a4f2be6c 100644 --- a/src/views/inout/DialogNewReviewOrder.vue +++ b/src/views/inout/DialogNewReviewOrder.vue @@ -180,6 +180,8 @@ export default { page: 1, limit: 10, }, + + isEntrust: false, } }, @@ -267,6 +269,7 @@ export default { this.detailList = response.data.orderDetailEntities || []; this.formData = response.data.orderEntity; this.orderQuery = this.formData; + this.isEntrust = response.data.entrust; } else { this.$message.error(response.message); } @@ -371,6 +374,7 @@ export default { postAccept() { let query = { orderId: this.orderQuery.billNo, + entrust: this.isEntrust, }; if (this.reviewType != null && this.reviewType == 2) { thirdUpdateStatus(query) diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue index 62b15d76..a4cc3a6e 100644 --- a/src/views/inout/IoCheckAuditOrder.vue +++ b/src/views/inout/IoCheckAuditOrder.vue @@ -1022,6 +1022,7 @@ export default { //验收结束 closeAcceptDialog() { this.acceptOrderVisible = false; + this.newAcceptOrderVisible = false; }, //开始验收 diff --git a/src/views/sync/SysUdimsData.vue b/src/views/sync/SysUdimsData.vue index f58efbb5..552f0d9a 100644 --- a/src/views/sync/SysUdimsData.vue +++ b/src/views/sync/SysUdimsData.vue @@ -18,24 +18,24 @@ + value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择同步时间"> - 查询 - - 同步单据 - - + 查询 + + + + + @@ -58,24 +58,31 @@ - - + + + :total="total" :current-page="filterQuery.page"> + :visible.sync="syncVisible"> @@ -83,291 +90,308 @@