|
|
@@ -42,215 +42,215 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import {
|
|
|
- getByIdReport,
|
|
|
- jobSave
|
|
|
+ import {
|
|
|
+ getByIdReport,
|
|
|
+ jobSave
|
|
|
+
|
|
|
+ } from '@/api/pda/jobBooking.js'
|
|
|
+
|
|
|
+ import {
|
|
|
+ getWarehouseList,
|
|
|
+ listPDAToWarehouse,
|
|
|
+ listPDAToWarehouseTG
|
|
|
+ } from '@/api/pda/workOrder.js'
|
|
|
+
|
|
|
+ import packingBom from './components/packingBom.vue'
|
|
|
+ import workOrderBom from '../feeding/components/workOrderBom.vue'
|
|
|
+ import packingTgBom from '../jobBooking/components/packingTgBom.vue'
|
|
|
+ export default {
|
|
|
+ components: {
|
|
|
+ workOrderBom,
|
|
|
+ packingBom,
|
|
|
+ packingTgBom
|
|
|
+ },
|
|
|
+ data() {
|
|
|
+ return {
|
|
|
+ id: null,
|
|
|
+ taskId: null,
|
|
|
|
|
|
-} from '@/api/pda/jobBooking.js'
|
|
|
+ objData: {},
|
|
|
+ warehouseList: [],
|
|
|
+ warehouseId: null,
|
|
|
|
|
|
-import {
|
|
|
- getWarehouseList,
|
|
|
- listPDAToWarehouse,
|
|
|
- listPDAToWarehouseTG
|
|
|
-} from '@/api/pda/workOrder.js'
|
|
|
+ List: [],
|
|
|
|
|
|
-import packingBom from './components/packingBom.vue'
|
|
|
-import workOrderBom from '../feeding/components/workOrderBom.vue'
|
|
|
-import packingTgBom from '../jobBooking/components/packingTgBom.vue'
|
|
|
-export default {
|
|
|
- components: {
|
|
|
- workOrderBom,
|
|
|
- packingBom,
|
|
|
- packingTgBom
|
|
|
- },
|
|
|
- data() {
|
|
|
- return {
|
|
|
- id: null,
|
|
|
- taskId: null,
|
|
|
+ tgList: [],
|
|
|
|
|
|
- objData: {},
|
|
|
- warehouseList: [],
|
|
|
- warehouseId: null,
|
|
|
|
|
|
- List: [],
|
|
|
+ clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
|
|
|
+ .clientEnvironmentId, // *1 主环境-601环境 2 soll-索尔环境 3 tg-碳谷环境
|
|
|
|
|
|
- tgList: [],
|
|
|
+ inWarehouseType: null,
|
|
|
|
|
|
+ }
|
|
|
+ },
|
|
|
|
|
|
- clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
|
|
|
- .clientEnvironmentId, // *1 主环境-601环境 2 soll-索尔环境 3 tg-碳谷环境
|
|
|
+ onLoad(options) {
|
|
|
|
|
|
- inWarehouseType: null,
|
|
|
+ this.id = options.workOrderId
|
|
|
+ this.taskId = options.taskId
|
|
|
+ this.workReportId = options.workReportId
|
|
|
+ this.getList()
|
|
|
|
|
|
- }
|
|
|
- },
|
|
|
+ this.getWarehouseListFn()
|
|
|
+
|
|
|
+ if (this.clientEnvironmentId == 3) {
|
|
|
+ this.getTgWarehouse()
|
|
|
+ } else {
|
|
|
+ this.getWarehouse()
|
|
|
+ }
|
|
|
|
|
|
- onLoad(options) {
|
|
|
+ },
|
|
|
|
|
|
- this.id = options.workOrderId
|
|
|
- this.taskId = options.taskId
|
|
|
- this.workReportId = options.workReportId
|
|
|
- this.getList()
|
|
|
+ methods: {
|
|
|
+ getList() {
|
|
|
+ getByIdReport(this.id, this.taskId).then(res => {
|
|
|
+ this.objData = res
|
|
|
+ if (res.workOrderType == 1) {
|
|
|
+ this.inWarehouseType = 1
|
|
|
+ } else if (res.workOrderType == 2) {
|
|
|
+ this.inWarehouseType = 8 // "1入库类型1生产入库2半成品入库"
|
|
|
+ }
|
|
|
|
|
|
- this.getWarehouseListFn()
|
|
|
|
|
|
- if (this.clientEnvironmentId == 3) {
|
|
|
- this.getTgWarehouse()
|
|
|
- } else {
|
|
|
- this.getWarehouse()
|
|
|
- }
|
|
|
+ this.objData.workReportInfo = {
|
|
|
+ formingNum: null,
|
|
|
+ formingWeight: null,
|
|
|
+ formedNum: null,
|
|
|
+ formedWeight: null,
|
|
|
+ taskId: this.taskId
|
|
|
|
|
|
- },
|
|
|
+ }
|
|
|
|
|
|
- methods: {
|
|
|
- getList() {
|
|
|
- getByIdReport(this.id, this.taskId).then(res => {
|
|
|
- this.objData = res
|
|
|
- if (res.workOrderType == 1) {
|
|
|
- this.inWarehouseType = 1
|
|
|
- } else if (res.workOrderType == 2) {
|
|
|
- this.inWarehouseType = 8 // "1入库类型1生产入库2半成品入库"
|
|
|
- }
|
|
|
+ })
|
|
|
+ },
|
|
|
|
|
|
+ getWarehouseListFn() {
|
|
|
+ getWarehouseList().then(res => {
|
|
|
+ this.warehouseList = res
|
|
|
+ })
|
|
|
+ },
|
|
|
|
|
|
- this.objData.workReportInfo = {
|
|
|
- formingNum: null,
|
|
|
- formingWeight: null,
|
|
|
- formedNum: null,
|
|
|
- formedWeight: null,
|
|
|
- taskId: this.taskId
|
|
|
+ getWarehouse() {
|
|
|
+ let param = {
|
|
|
+ workOrderId: this.id,
|
|
|
+ taskId: this.taskId,
|
|
|
+ workReportId: this.workReportId
|
|
|
|
|
|
}
|
|
|
+ listPDAToWarehouse(param).then(res => {
|
|
|
+ this.List = res
|
|
|
+ })
|
|
|
+ },
|
|
|
|
|
|
- })
|
|
|
- },
|
|
|
-
|
|
|
- getWarehouseListFn() {
|
|
|
- getWarehouseList().then(res => {
|
|
|
- this.warehouseList = res
|
|
|
- })
|
|
|
- },
|
|
|
|
|
|
- getWarehouse() {
|
|
|
- let param = {
|
|
|
- workOrderId: this.id,
|
|
|
- taskId: this.taskId,
|
|
|
- workReportId: this.workReportId
|
|
|
+ getTgWarehouse() {
|
|
|
+ let param = {
|
|
|
+ workOrderId: this.id,
|
|
|
+ taskId: this.taskId,
|
|
|
+ workReportId: this.workReportId
|
|
|
|
|
|
- }
|
|
|
- listPDAToWarehouse(param).then(res => {
|
|
|
- this.List = res
|
|
|
- })
|
|
|
- },
|
|
|
+ }
|
|
|
+ listPDAToWarehouseTG(param).then(res => {
|
|
|
+ this.tgList = res
|
|
|
+ })
|
|
|
+ },
|
|
|
|
|
|
|
|
|
- getTgWarehouse() {
|
|
|
- let param = {
|
|
|
- workOrderId: this.id,
|
|
|
- taskId: this.taskId,
|
|
|
- workReportId: this.workReportId
|
|
|
+ handleScan() {
|
|
|
|
|
|
- }
|
|
|
- listPDAToWarehouseTG(param).then(res => {
|
|
|
- this.tgList = res
|
|
|
- })
|
|
|
- },
|
|
|
+ },
|
|
|
+ scrolltolower() {},
|
|
|
|
|
|
+ save() {
|
|
|
|
|
|
- handleScan() {
|
|
|
+ if (!this.warehouseId) {
|
|
|
+ uni.showToast({
|
|
|
+ icon: 'none',
|
|
|
+ title: '请先选择入库仓库'
|
|
|
+ })
|
|
|
+ return false
|
|
|
+ }
|
|
|
|
|
|
- },
|
|
|
- scrolltolower() { },
|
|
|
|
|
|
- save() {
|
|
|
|
|
|
- if (!this.warehouseId) {
|
|
|
- uni.showToast({
|
|
|
- icon: 'none',
|
|
|
- title: '请先选择入库仓库'
|
|
|
- })
|
|
|
- return false
|
|
|
- }
|
|
|
+ let storageInfo = {
|
|
|
+ warehouseId: this.warehouseId,
|
|
|
+ inWarehouseType: this.inWarehouseType,
|
|
|
+ toWarehouseList: this.clientEnvironmentId == 3 ? this.tgList : this.List,
|
|
|
+ }
|
|
|
+ this.objData['storageInfo'] = storageInfo
|
|
|
|
|
|
|
|
|
+ jobSave(this.objData).then(res => {
|
|
|
+ if (this.workReportId) {
|
|
|
+ uni.navigateBack({
|
|
|
+ delta: -2
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ uni.navigateBack({
|
|
|
+ delta: -1
|
|
|
+ });
|
|
|
+ }
|
|
|
|
|
|
- let storageInfo = {
|
|
|
- warehouseId: this.warehouseId,
|
|
|
- inWarehouseType: this.inWarehouseType,
|
|
|
- toWarehouseList: this.clientEnvironmentId == 3 ? this.tgList : this.List,
|
|
|
- }
|
|
|
- this.objData['storageInfo'] = storageInfo
|
|
|
-
|
|
|
-
|
|
|
- jobSave(this.objData).then(res => {
|
|
|
- if( this.workReportId ) {
|
|
|
- uni.navigateBack({
|
|
|
- delta: -2
|
|
|
- });
|
|
|
- } else {
|
|
|
- uni.navigateBack({
|
|
|
- delta: -1
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
- })
|
|
|
+ })
|
|
|
|
|
|
- },
|
|
|
+ },
|
|
|
+ }
|
|
|
}
|
|
|
-}
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
-.content-box {
|
|
|
- height: 100vh;
|
|
|
- overflow: hidden;
|
|
|
- display: flex;
|
|
|
- flex-direction: column;
|
|
|
+ .content-box {
|
|
|
+ height: 100vh;
|
|
|
+ overflow: hidden;
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
|
|
|
-}
|
|
|
+ }
|
|
|
|
|
|
-.list_box {
|
|
|
- flex: 1;
|
|
|
- overflow: hidden;
|
|
|
- padding: 4rpx 0;
|
|
|
+ .list_box {
|
|
|
+ flex: 1;
|
|
|
+ overflow: hidden;
|
|
|
+ padding: 4rpx 0;
|
|
|
|
|
|
- .u-list {
|
|
|
- height: 100% !important;
|
|
|
- }
|
|
|
+ .u-list {
|
|
|
+ height: 100% !important;
|
|
|
+ }
|
|
|
|
|
|
- .card_box {
|
|
|
- padding: 16rpx 24rpx;
|
|
|
- }
|
|
|
+ .card_box {
|
|
|
+ padding: 16rpx 24rpx;
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
|
|
-}
|
|
|
+ }
|
|
|
|
|
|
-.bottom-wrapper {
|
|
|
- .btn_box {
|
|
|
- width: 750rpx;
|
|
|
- height: 88rpx;
|
|
|
- line-height: 88rpx;
|
|
|
- background: $theme-color;
|
|
|
- text-align: center;
|
|
|
- font-size: 36rpx;
|
|
|
- font-style: normal;
|
|
|
- font-weight: 400;
|
|
|
- color: #fff;
|
|
|
+ .bottom-wrapper {
|
|
|
+ .btn_box {
|
|
|
+ width: 750rpx;
|
|
|
+ height: 88rpx;
|
|
|
+ line-height: 88rpx;
|
|
|
+ background: $theme-color;
|
|
|
+ text-align: center;
|
|
|
+ font-size: 36rpx;
|
|
|
+ font-style: normal;
|
|
|
+ font-weight: 400;
|
|
|
+ color: #fff;
|
|
|
+ }
|
|
|
}
|
|
|
-}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-.select_box {
|
|
|
- margin-top: 20rpx;
|
|
|
-}
|
|
|
+ .select_box {
|
|
|
+ margin-top: 20rpx;
|
|
|
+ }
|
|
|
|
|
|
-.list_box {
|
|
|
- margin-top: 40rpx;
|
|
|
+ .list_box {
|
|
|
+ margin-top: 40rpx;
|
|
|
|
|
|
- .time {
|
|
|
- font-size: 28rpx;
|
|
|
+ .time {
|
|
|
+ font-size: 28rpx;
|
|
|
+ }
|
|
|
}
|
|
|
-}
|
|
|
</style>
|
ysy