1

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

@@ -21,7 +21,7 @@
            </div>
          </div>
        </div>
        <div>
        <div v-if="bussiness != 4">
          <div class="title mb8">
            <span>药品追溯码（</span>
            <span class="c-17b3ec">{{ fillNum }}</span>
@@ -56,12 +56,18 @@ export default {
      }
    },
    trackId: { default: '' },
    deviceId: { default: '' },
    drugId: { default: '' },
    codeList: {
      type: Array,
      default: () => {
        return []
      }
    },
    inventoryObj: {
      default: () => {
        return {}
      }
    }
  },
  data() {
@@ -69,7 +75,8 @@ export default {
      stock: 1,
      keyword: '',
      items: [],
      newCodeList: []
      newCodeList: [],
      init: true
    }
  },
  computed: {
@@ -86,9 +93,13 @@ export default {
  watch: {
    value: {
      handler(val) {
        this.stock = this.bussiness == 1 ? this.data.cargoCapacity : this.data.qty
        if (val) {
          this.newCodeList = JSON.parse(JSON.stringify(this.codeList))
        if (this.init) {
          // 如果是初始化 则赋值。解决扫码回来这个地方重复调用的问题
          this.stock = this.bussiness == 1 ? this.data.cargoCapacity : this.data.qty
          if (val) {
            this.newCodeList = JSON.parse(JSON.stringify(this.codeList))
          }
          this.init = false
        }
      },
      immediate: true
@@ -99,29 +110,47 @@ export default {
      this.newCodeList = item.codeList
    })
  },
  beforeDestroy(){
  beforeDestroy() {
    this.$EventBus.$off('getScanData')
  },
  created() {},
  methods: {
    confirm() {
      if (this.bussiness == 1 && 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
          }
        })
        return
      }
      if (this.trackId) {
        this.updateMediicinecabineInventory()
        return
      }
      this.$emit('onConfirm', { stock: this.stock, codeList: this.newCodeList })
      this.emitValue(false)
    },
    emitValue(show) {
      this.init = true
      this.$emit('input', show)
    },
    updateMediicinecabineInventory(data) {
@@ -171,7 +200,10 @@ export default {
      }
    },
    scan(data) {
      sessionStorage.setItem('scanData', { ...data, codeList: this.newCodeList })
      sessionStorage.setItem('scanData', JSON.stringify({ ...data, codeList: this.newCodeList, ...this.inventoryObj }))
      this.$router.push({
        path: '/replenishment/start/scan'
      })
    }
  }
}
@@ -213,5 +245,8 @@ export default {
    width: 60px;
    margin-right: 0;
  }
  .van-field__control {
    padding-right: 15px;
  }
}
</style>

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

@@ -61,7 +61,7 @@
      </div>
    </div>
    <!-- 修改容量 -->
    <SetStockDialog v-model="setStockShow" :data="info" :codeList="codeList" @onConfirm="updateMediicinecabineInventoryInfoById" :bussiness="bussiness" />
    <SetStockDialog v-model="setStockShow" :data="info" :trackId="id" :drugId="drugId" :codeList="codeList" :deviceId="info.idDevice" :inventoryObj="inventoryObj" @onConfirm="updateMediicinecabineInventoryInfoById" :bussiness="bussiness" />
  </div>
</template>
<script>
@@ -83,7 +83,8 @@ export default {
      drugName: '',
      drugPrice: '',
      from: this.$route.query.from,
      codeList: []
      codeList: [],
      inventoryObj: {}
    }
  },
  computed: {
@@ -127,6 +128,11 @@ export default {
        // })
        if (data.inventoryList.length > 0) {
          this.codeList = data.inventoryList[0].codeList
          this.inventoryObj = {
            layerNo: data.inventoryList[0].layerNo,
            wayerNo: data.inventoryList[0].wayerNo
          }
        }
      })
    },

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

@@ -185,13 +185,10 @@ export default {
      let p = {
        deviceId: this.deviceId
      }
      console.log(2)
      medicineAbinetApi
        .findMediicinecabinetInventoryByDeviceId(p)
        .then(res => {
          console.log(res, 'res')
          this.$toast.clear()
          if (res.detailModelList && res.detailModelList.length) {
            var list = _.map(res.detailModelList, v => {
@@ -340,6 +337,15 @@ export default {
        return
      }
      const trackIds = this.selItemList.map(el => el.id).join(',')
      var maxNum = 0
      this.selItemList.forEach(el => {
        if (el.cargoCapacity > maxNum) {
          maxNum = el.cargoCapacity
        }
      })
      // console.log(this.query.qty, );
      // return
      this.$router.push({
        path: '/replenishment/start/traceability',
@@ -347,7 +353,7 @@ export default {
          deviceId: this.deviceId,
          trackId: trackIds,
          drugId: this.query.drugId,
          stock: this.repAll ? this.query.qty : this.num,
          stock: this.repAll ? maxNum : this.num,
          outDetailId: this.$route.query.outDetailId,
          type: 1
        }

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

@@ -13,7 +13,7 @@
    </div>
    <div class="footerBtn">
      <div class="current" v-if="currentCode">当前号码：{{ info.layerNo }}层{{ info.wayerNo }}号位({{ currentIndex }}/{{ info.len }})</div>
      <div class="nextBtn" @click="saveCode" v-if="currentCode">录入下一个追溯码</div>
      <div class="nextBtn" @click="saveCode" v-if="currentCode">{{ currentIndex == info.len ? '完成' : '录入下一个追溯码' }}</div>
    </div>
  </div>
</template>
@@ -64,8 +64,9 @@ export default {
    },
    async saveCode() {
      this.currentCode = null
      console.log(this.currentIndex, this.info.len)
      if(this.currentIndex == this.info.len - 1){
      if (this.currentIndex == this.info.len) {
        this.$toast('已完成所有扫描')
        this.$router.go(-1)
        return
@@ -99,8 +100,7 @@ export default {
    stop() {
      this.html5QrCode
        .stop()
        .then(ignore => {
        })
        .then(ignore => {})
        .catch(err => {
          console.log(err)
          this.$toast('停止扫码失败')
@@ -109,8 +109,7 @@ export default {
    dealSelectFiles() {
      try {
        window.qrcode.callback = result => {
        }
        window.qrcode.callback = result => {}
        // get select files.
        let file = this.fileList[0].file
        var reader = new FileReader()
@@ -144,6 +143,7 @@ export default {
    this.getCameras()
    this.info = JSON.parse(sessionStorage.getItem('scanData'))
    this.currentIndex = this.info.index
    console.log(this.currentIndex, this.info)
  },
  beforeDestroy() {

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

@@ -53,7 +53,7 @@ export default {
      trackId: this.$route.query.trackId,
      drugId: this.$route.query.drugId,
      outDetailId: this.$route.query.outDetailId || '',
      type: this.$route.query.type, // 1: '补货' 2：'入库
      type: this.$route.query.type, // 1: '补货' 2：'入库  3: 更改商品
      drug: {},
      inventoryList: []
    }
@@ -111,25 +111,32 @@ export default {
        inventoryIds: this.trackId
      }
      medicineAbinetApi.drugTraceabilityCodeDetail(params).then(res => {
        // console.log(res,"Res");
        // return
        const data = res.obj
        this.drug = data.drug
        this.inventoryList = data.inventoryList.map(el => {
          let obj = {
            ...el,
            arr: []
            ...el
          }
          console.log(this.stock, 'this.stock')
          // *1 是为了字符串转数字
          var maxNum = (this.stock * 1 > el.cargoCapacity * 1 ? el.cargoCapacity : this.stock) * 1
          var len = obj.codeList.length
          if (obj.codeList.length < maxNum) {
            for (let i = 0; i < maxNum - len; i++) {
          if (this.type == 3) {
            // 如果是更改药品
            obj.codeList = []
            for (let i = 0; i < maxNum; i++) {
              obj.codeList.unshift({ code: '' })
            }
          } else {
            var len = obj.codeList.length
            if (obj.codeList.length < maxNum) {
              for (let i = 0; i < maxNum - len; i++) {
                obj.codeList.unshift({ code: '' })
              }
            }
          }
          return obj
@@ -140,7 +147,7 @@ export default {
      if (this.allNum == this.fillNum) {
        if (this.type == 1) {
          this.batchAddInventory()
        } else {
        } else{
          this.updateMediicinecabineInventory()
        }
      } else {
@@ -153,8 +160,24 @@ export default {
              this.batchAddInventory()
            })
            .catch(() => {})
        } else {
          this.updateMediicinecabineInventory
        } 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(() => {})
        }
      }
    },
@@ -199,18 +222,24 @@ export default {
      })
    },
    updateMediicinecabineInventory() {
      // 入库
      // 入库  更改商品
      const codeList = []
      let qty = 0
      this.inventoryList[0].codeList.forEach((el, index) => {
        codeList.push({
          code: el.code,
          sort: this.inventoryList[0].codeList.length - index
        })
        if (el.code != '') {
          qty++
          codeList.push({
            code: el.code,
            sort: this.inventoryList[0].codeList.length - index
          })
        }
      })
      let p = {
        id: this.trackId,
        drugId: this.drugId,
        qty: this.stock,
        qty: qty,
        userId: this.user.id,
        codeStr: JSON.stringify(codeList)
      }