Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev

Mr.Shi

2023-09-11 24eb9d89423613c7322da715f2a445b4466ffcf4

 minipro_standard/pages/OutOperation/OutOperation.vue

@@ -244,7 +244,6 @@
               infoAction = wTransferForInOut

               data.wTransferType = '0'

            }
            console.log('------');

            infoAction(data).then(res => {

               if (this.isZKD) {

                  this.info = res.data.wtransfer

@@ -274,10 +273,12 @@
            let materials = v.materials



            materials.forEach(materail => {

					
               tempList.forEach(item => {

                  if (materail.materialId == item.materialId && materail.procedureId == item

                     .procedureId && materail.qualityType == item.qualityType && materail.batch ==

                     item.batch) {

                  item.wstockExtListVOList.forEach(hw => {
                     if (materail.materialId == hw.materialId && materail.procedureId == hw
                        .procedureId && materail.qualityType == hw.qualityType && materail.batch ==
                        hw.batch) {
                     let isExist = false

                     this.outboundList.forEach(selected => {

                        if (selected.newId == materail.id) {

@@ -294,7 +295,12 @@
                     this.outboundList.push(obj)

                  }

               })

						
            })

            })

         },
         dele(index) {
             this.outboundList.splice(index, 1)
         },

         submit() {
            if (this.type == QRCodeType.ZKD) {

@@ -346,11 +352,14 @@
                     wtransferId: this.id

                  }).then(res => {

                     if (res.code === 200) {

                        this.$store.dispatch.dispatch('getUpcomingNum')

                        this.$store.dispatch('getUpcomingNum')

                        uni.$u.toast('操作成功')
                        uni.redirectTo({
                           url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.info.id}&dbid=${this.dbid}`
                           url: `/pages/warehousingDetails/warehousingDetails?id=${this.info.id}&dbid=${this.dbid}`
                        })

                        // uni.redirectTo({
                        //    url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.info.id}&dbid=${this.dbid}`
                        // })

                        // setTimeout(() => {

                        //   router.replace({ name: 'wTransferDetail', query: { id: info.value.wtransfer.id, dbid: route.query.dbid } })

                        // }, 2000)

@@ -365,7 +374,7 @@
                  wOutboundType: 0

               }).then(res => {

                  if (res.code === 200) {

                     this.$store.dispatch.dispatch('getUpcomingNum')

                     this.$store.dispatch('getUpcomingNum')

                     uni.$u.toast('操作成功')
                     uni.redirectTo({
                        url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.info.id}`