bug

mini-pro-web/.env.development

@@ -9,6 +9,8 @@ VUE_APP_IM_API = 'http://172.26.0.105:3000/api/v2'
#VUE_APP_SOCKET_URL = 'https://zb.xmtyw.cn'
#VUE_APP_IM_API = 'https://zb.xmtyw.cn/api/v2'
# VUE_APP_PRE_PATH = '/intelligent-medicine-abinet'
VUE_APP_PRE_PATH = '/hlwyy/intelligent-medicine-abinet' //ehr打包地址
# ehr打包地址
VUE_APP_PRE_PATH = '/hlwyy/intelligent-medicine-abinet' 
VUE_APP_APPID = "wx79a7f451c8c30308"
VUE_APP_WXID = znyg_wx

mini-pro-web/src/views/replenishment/start/components/SetStockDialog.vue

@@ -7,7 +7,7 @@
          <span>{{ bussiness == 1 ? '修改容量' : bussiness == 2 ? '矫正库存' : bussiness == 4 || bussiness == 5 ? '设置库存' : bussiness == 6 ? '新增' : '' }}</span>
        </div>
        <template v-if="bussiness == 1 || bussiness == 4 || bussiness == 5 || bussiness == 6">
          <div class="tc pt30 pb20"><van-stepper v-model="stock" min="1" max="99" button-size="36px" input-width="60px" /></div>
          <div class="tc pt30 pb20"><van-stepper v-model="stock" min="1" :max="data.cargoCapacity" button-size="36px" input-width="60px" /></div>
        </template>
        <div class="tc" v-else>
          <div class="pt10">
@@ -93,12 +93,12 @@ export default {
  watch: {
    value: {
      handler(val) {
        if (this.init&&val) {
        if (this.init && val) {
          // 如果是初始化 则赋值。解决扫码回来这个地方重复调用的问题
            this.stock = this.bussiness == 1 ? this.data.cargoCapacity : this.data.qty
          console.log(this.codeList,"this.codeList");
            this.newCodeList = JSON.parse(JSON.stringify(this.codeList))
          
          this.stock = this.bussiness == 1 ? this.data.cargoCapacity : this.data.qty
          console.log(this.codeList, 'this.codeList')
          this.newCodeList = JSON.parse(JSON.stringify(this.codeList))
          this.init = false
        }
      },
@@ -116,38 +116,74 @@ export default {
  created() {},
  methods: {
    confirm() {
      if (this.bussiness == 1 && this.fillNum > this.stock) {
        // 修改容量
        this.$toast('追溯码数量不能大于容量')
        return
      const codeList = []
      this.newCodeList.forEach((el, index) => {
        codeList.push({
          code: el.code,
          sort: this.newCodeList.length - index
        })
      })
      let p = {
        id: this.trackId,
        userId: this.user.id,
        codeStr: JSON.stringify(codeList)
      }
      if (this.bussiness == 1) {
        //修改容量
        if (this.fillNum > this.stock) {
          this.$toast('追溯码数量不能大于容量')
          return
        }
      if (this.bussiness == 2 && this.fillNum != this.stock * 1) {
        // 矫正库存
        this.$toast('追溯码数量必须等于库存')
        return
      }
      if (this.bussiness == 4) {
        // 更换商品
        this.$router.push({
          path: '/replenishment/start/traceability',
          query: {
            deviceId: this.deviceId,
            trackId: this.trackId,
            drugId: this.drugId,
            stock: this.stock,
            type: 3
          }
        p.cargoCapacity = this.stock
        medicineAbinetApi.updateMediicinecabineInventoryInfoById(p).then(res => {
          this.emitValue(false)
          this.$toast.clear()
          this.$emitRefreshPage('replenishmentStartDeviceDetail')
          history.back()
        })
        return
      }
      if (this.trackId) {
        this.updateMediicinecabineInventory()
        return
      }
      } else if (this.bussiness == 2) {
        // 矫正库存
        if (this.fillNum != this.stock * 1) {
          this.$toast('追溯码数量必须等于库存')
          return
        }
        p.drugId = this.drugId
        p.qty = this.stock
        medicineAbinetApi
          .updateMediicinecabineInventory(p)
          .then(res => {
            this.emitValue(false)
            this.$toast.clear()
            this.$emitRefreshPage('replenishmentStartDeviceDetail')
            history.back()
          })
          .catch(err => {
            console.error(err)
          })
      } else {
        if (this.bussiness == 4) {
          // 更换商品
          this.$router.push({
            path: '/replenishment/start/traceability',
            query: {
              deviceId: this.deviceId,
              trackId: this.trackId,
              drugId: this.drugId,
              stock: this.stock,
              type: 3
            }
          })
          return
        }
        if (this.trackId) {
          this.updateMediicinecabineInventory()
          return
        }
      this.$emit('onConfirm', { stock: this.stock, codeList: this.newCodeList })
      this.emitValue(false)
        this.$emit('onConfirm', { stock: this.stock, codeList: this.newCodeList })
        this.emitValue(false)
      }
    },
    emitValue(show) {
      this.init = true
@@ -177,12 +213,6 @@ export default {
          this.$toast.clear()
          this.$emitRefreshPage('replenishmentStartDeviceDetail')
          history.back()
          // this.$router.replace({
          //     path: '/replenishment/start/productDetail',
          //     query: {
          //         id: this.trackId
          //     }
          // })
        })
        .catch(err => {
          console.error(err)

mini-pro-web/src/views/replenishment/start/traceability.vue

@@ -63,7 +63,7 @@ export default {
      let all = 0
      this.inventoryList.forEach(el => {
        if (el.cargoCapacity * 1 > this.stock * 1) {
          all += this.stock
          all += this.stock * 1
        } else {
          all += el.cargoCapacity * 1
        }
@@ -146,8 +146,10 @@ export default {
    finish() {
      if (this.allNum == this.fillNum) {
        if (this.type == 1) {
          // 补货
          this.batchAddInventory()
        } else{
        } else {
          // 入库 、更改商品
          this.updateMediicinecabineInventory()
        }
      } else {
@@ -160,24 +162,22 @@ export default {
              this.batchAddInventory()
            })
            .catch(() => {})
        } else if (this.type == 2) {
          this.$dialog
            .confirm({
              message: '未录入所有追溯码，是否完成补货？请确保顺序靠后的位次为空，药品放在前置位。'
            })
            .then(() => {
              this.updateMediicinecabineInventory()
            })
            .catch(() => {})
        } else if (this.type == 3) {
          this.$dialog
            .confirm({
              message: '未录入所有追溯码，是否完成更改商品？请确保顺序靠后的位次为空，药品放在前置位。'
            })
            .then(() => {
              this.updateMediicinecabineInventory()
            })
            .catch(() => {})
        } else {
          let message = ''
          if (this.type == 2) {
            message = '未录入所有追溯码，是否完成补货？请确保顺序靠后的位次为空，药品放在前置位。'
          } else if (this.type == 3) {
            message = '未录入所有追溯码，是否完成更改商品？请确保顺序靠后的位次为空，药品放在前置位。'
            this.$dialog
              .confirm({
                message: message
              })
              .then(() => {
                this.updateMediicinecabineInventory()
              })
              .catch(() => {})
          }
        }
      }
    },
@@ -246,10 +246,10 @@ export default {
      medicineAbinetApi.updateMediicinecabineInventory(p).then(res => {
        if (res.status == 200) {
          this.$toast('入库成功！')
          this.$toast(`${this.type == 2 ? '入库成功！' : '更改成功！'}`)
          this.$EventBus.$emit('initPage')
          // this.$emitRefreshPage('replenishmentDeviceDetail')
          this.backFn()
          this.$router.go(-2)
        }
      })
    },