完成1.5.2需求

mini-pro-web/src/router/replenishment.js

@@ -187,13 +187,13 @@ const routeMap = [
      },
      {
        path: '/replenishment/start/scan',
        name: 'scan',
        name: 'replenishmentStartScan',
        meta: {
          title: '扫码',
          hasBot: false,
          hasTop: false
        },
        component: () => import('@/views/replenishment/start/components/scan.vue')
        component: () => import('@/views/replenishment/start/scan.vue')
      }
    ]
  }

mini-pro-web/src/views/drug/list.vue

@@ -126,7 +126,10 @@ export default {
      this.$router.back()
    },
    onConfirm() {
      this.$router.push({
      this.$emitRefreshPage('replenishmentStartQuick', {
        bussiness: 6
      })
      this.$router.replace({
        path: '/replenishment/start/traceability',
        query: {
          deviceId: this.deviceId,

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

@@ -17,7 +17,7 @@
          <div class="pt10 c-999">软件显示库存：{{ data.qty }}</div>
          <div class="pt10 pb20 ipt plr50">
            <div class="tc  ">
              <van-stepper placeholder="实际库存" v-model="stock" min="1" :max="data.cargoCapacity" button-size="36px" input-width="60px" @change="changeStock"/>
              <van-stepper placeholder="实际库存" v-model="stock" min="1" :max="data.cargoCapacity" button-size="36px" input-width="60px" @change="changeStock" />
            </div>
          </div>
        </div>
@@ -28,7 +28,7 @@
            <span>/{{ stock }}）</span>
          </div>
          <div class="code-box">
            <codeList :codeList="newCodeList" :qty="data.qty" :stock="stock" :bussiness="bussiness"></codeList>
            <codeList :codeList="newCodeList" :qty="data.qty" :stock="stock" :bussiness="bussiness" @scan="scan"></codeList>
          </div>
        </div>
        <div class="ptb10">
@@ -57,9 +57,9 @@ export default {
    },
    trackId: { default: '' },
    drugId: { default: '' },
    codeList:{
      type:Array,
      default: ()=>{
    codeList: {
      type: Array,
      default: () => {
        return []
      }
    }
@@ -72,12 +72,12 @@ export default {
      newCodeList: []
    }
  },
  computed:{
    fillNum(){
  computed: {
    fillNum() {
      let num = 0
      this.newCodeList.forEach(el=>{
        if(el.code){
          num ++
      this.newCodeList.forEach(el => {
        if (el.code) {
          num++
        }
      })
      return num
@@ -86,32 +86,40 @@ export default {
  watch: {
    value: {
      handler(val) {
        this.stock = this.bussiness == 1 ? this.data.cargoCapacity : this.data.qty        
        if(val){
        this.stock = this.bussiness == 1 ? this.data.cargoCapacity : this.data.qty
        if (val) {
          this.newCodeList = JSON.parse(JSON.stringify(this.codeList))
        }
      },
      immediate: true
    }
  },
  mounted() {
    this.$EventBus.$on('getScanData', item => {
      this.newCodeList = item.codeList
    })
  },
  beforeDestroy(){
    this.$EventBus.$off('getScanData')
  },
  created() {},
  methods: {
    confirm() {
      if(this.bussiness == 1 && this.fillNum > this.stock){
      if (this.bussiness == 1 && this.fillNum > this.stock) {
        this.$toast('追溯码数量不能大于容量')
        return
      }
      
      if(this.bussiness == 2 && this.fillNum != this.stock*1){
        this.$toast("追溯码数量必须等于库存")
      if (this.bussiness == 2 && this.fillNum != this.stock * 1) {
        this.$toast('追溯码数量必须等于库存')
        return
      }
      if (this.trackId) {
        this.updateMediicinecabineInventory()
        return
      }
      
      this.$emit('onConfirm', {stock: this.stock,codeList: this.newCodeList})
      this.$emit('onConfirm', { stock: this.stock, codeList: this.newCodeList })
    },
    emitValue(show) {
      this.$emit('input', show)
@@ -119,7 +127,7 @@ export default {
    updateMediicinecabineInventory(data) {
      this.$loading('保存中..')
      const codeList = []
      this.newCodeList.forEach((el,index)=>{
      this.newCodeList.forEach((el, index) => {
        codeList.push({
          code: el.code,
          sort: this.newCodeList.length - index
@@ -151,16 +159,19 @@ export default {
          console.error(err)
        })
    },
    changeStock(val){
      if(val > this.newCodeList.length){
    changeStock(val) {
      if (val > this.newCodeList.length) {
        this.newCodeList.push({
          code: ''
        })
      }else if(val < this.newCodeList.length){
        if(!this.newCodeList[this.newCodeList.length - 1].code){
      } else if (val < this.newCodeList.length) {
        if (!this.newCodeList[this.newCodeList.length - 1].code) {
          this.newCodeList.pop()
        }
      }
    },
    scan(data) {
      sessionStorage.setItem('scanData', { ...data, codeList: this.newCodeList })
    }
  }
}

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

@@ -2,8 +2,8 @@
  <draggable v-model="items" :group="{ name: groupName }" :animation="200" handle=".drag" @sort="onSort">
    <div class="flex justify-between align-center mb10" style="position: relative;" v-for="(item, index) in codeList" :key="index">
      <van-field v-model="item.code" :label="getLabel(index)" placeholder="请扫描或输入追溯码" class="mr8" />
      <img src="@/assets/images/traceability/scan.png" class="scan" alt="" v-if="qty <= stock&&bussiness != 1" />
      <img src="@/assets/images/traceability/drag.png" class="drag" alt="" v-if="qty <= stock&&bussiness != 1" />
      <img src="@/assets/images/traceability/scan.png" class="scan" alt="" v-if="qty <= stock && bussiness != 1" @click="scan(index)" />
      <img src="@/assets/images/traceability/drag.png" class="drag" alt="" v-if="qty <= stock && bussiness != 1" />
      <img src="@/assets/images/traceability/del.png" alt="" v-if="qty > stock" @click="delDrug(index)" />
    </div>
  </draggable>
@@ -26,7 +26,7 @@ export default {
      }
    },
    bussiness: {
      default: 0  //1修改容量 2矫正库存 4设置库存 5选择药品后 设置库存  6备药时选择药品
      default: 0 //1修改容量 2矫正库存 4设置库存 5选择药品后 设置库存  6备药时选择药品
    }
  },
  components: {
@@ -77,6 +77,9 @@ export default {
        result += characters.charAt(Math.floor(Math.random() * charactersLength))
      }
      return result
    },
    scan(index) {
      this.$emit('scan', { index: index, len: this.codeList.length })
    }
  }
}
@@ -100,7 +103,7 @@ export default {
::v-deep {
  .van-field__label {
    color: #999;
    width: 60px;
    width: 64px;
    margin-right: 0;
  }
}

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

@@ -172,6 +172,12 @@ export default{
    created() {
        this.initPage()
        this.findDeviceById()
        this.$EventBus.$on("initPage",()=>{
            this.initPage()
        })
    },
    beforeDestroy() {
        this.$EventBus.$off("initPage")
    },
    methods:{
        $refreshData(){

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

@@ -138,7 +138,6 @@ export default {
      medicineAbinetApi
        .selectMediicinecabineInventoryById(p)
        .then(res => {
          console.log(res, 'REs')
          const obj = res.obj
          this.$toast.clear()
          this.info = obj
@@ -171,7 +170,15 @@ export default {
      if (bussiness == 3) {
        p.status = data //下架状态0，上架状态1
      } else if (this.bussiness == 1) {
        p.cargoCapacity = data
        p.cargoCapacity = data.stock
        const codeList = []
        data.codeList.forEach((el, index) => {
          codeList.push({
            code: el.code,
            sort: data.codeList.length - index
          })
        })
        p.codeStr = JSON.stringify(codeList)
      } else if (this.bussiness == 2) {
        p.qty = data.stock
        const codeList = []

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

@@ -127,7 +127,7 @@ export default {
    $refreshData(p) {
      if (p) {
        var oQty = this.curCargo.cargoCapacity - this.curCargo.qty
        //1修改容量 2矫正库存 3下架药品  4更换药品
        //1修改容量 2矫正库存 3下架药品  4更换药品  5补货  6入库
        switch (Number(p.bussiness)) {
          case 1:
          case 2:
@@ -164,6 +164,14 @@ export default {
              this.allNum = this.allNum - oQty
            }
            break
          case 5:
            this.allNum = 0
            this.selItemList.forEach(v => {
              v.isActive = false
            })
            this.selItemList = []
            this.findMediicinecabinetInventoryByDeviceId()
            break
        }
      } else {
        this.findMediicinecabinetInventoryByDeviceId()
@@ -177,9 +185,13 @@ 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 => {

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

@@ -4,9 +4,7 @@
      <div class="left-back">
        <van-icon name="arrow-left" @click="clickBack" size="14px"></van-icon>
      </div>
      <div class="currentIndex">
        5位最里：827162 123 12334 34435
      </div>
      <div class="currentIndex" v-if="currentCode">{{ currentLabel }} {{ currentCode }}</div>
    </div>
    <div class="container">
      <div class="qrcode">
@@ -14,8 +12,8 @@
      </div>
    </div>
    <div class="footerBtn">
      <div class="current">当前号码：{{ currentCode || '未扫描' }}（{{ scannedCodes.length + 1 }}/5）</div>
      <div class="nextBtn" @click="saveCode">{{ scannedCodes.length >= 5 ? '已完成' : '录入下一个追溯码' }}</div>
      <div class="current" v-if="currentCode">当前号码：{{ info.layerNo }}层{{ info.wayerNo }}号位({{ currentIndex }}/{{ info.len }})</div>
      <div class="nextBtn" @click="saveCode" v-if="currentCode">录入下一个追溯码</div>
    </div>
  </div>
</template>
@@ -26,6 +24,8 @@ import { Html5Qrcode } from 'html5-qrcode'
export default {
  data() {
    return {
      info: {},
      currentIndex: '',
      html5QrCode: null,
      fileList: [],
      scannedCodes: [], // 存储已扫描的码
@@ -52,6 +52,9 @@ export default {
    },
    handleScanSuccess(code) {
      this.currentCode = code
      this.info.codeList[this.currentIndex].code = code
      this.currentIndex++
      this.$EventBus.$emit('getScanData', this.info)
      this.stop() // 扫描成功停止扫描
      this.$toast('扫描成功，请点击录入下一个')
    },
@@ -60,27 +63,18 @@ export default {
      this.$toast(err?.message || '扫码失败')
    },
    async saveCode() {
      if (!this.currentCode) return
      // 添加到数组
      this.scannedCodes.push(this.currentCode)
      console.log('11111111111111111', this.scannedCodes)
      this.currentCode = null
      // 如果达到最大数量
      if (this.scannedCodes.length >= this.maxScanCount) {
      if(this.currentIndex == this.info.len - 1){
        this.$toast('已完成所有扫描')
        this.submitCodes()
        this.$router.go(-1)
        return
      }
      // 重置当前码并重新开始扫描
      this.currentCode = null
      await this.start()
    },
    submitCodes() {
      // 这里可以添加提交到服务器的逻辑
      console.log('最终提交的数组:', this.scannedCodes)
      this.$toast(`已保存${this.scannedCodes.length}个码`)
    },
    clickBack() {
@@ -106,7 +100,6 @@ export default {
      this.html5QrCode
        .stop()
        .then(ignore => {
          console.log('停止扫码', ignore)
        })
        .catch(err => {
          console.log(err)
@@ -117,7 +110,6 @@ export default {
    dealSelectFiles() {
      try {
        window.qrcode.callback = result => {
          console.log(result, '我是扫描获取到的值')
        }
        // get select files.
        let file = this.fileList[0].file
@@ -133,9 +125,25 @@ export default {
      }
    }
  },
  computed: {
    currentLabel() {
      const len = this.info.len
      const index = this.currentIndex
      if (index == 0) {
        return `${len - index}位最里:`
      } else if (index == len - 1) {
        return '1位最外:'
      } else {
        return `第${len - index}位次:`
      }
    }
  },
  mounted() {
    this.getCameras()
    this.info = JSON.parse(sessionStorage.getItem('scanData'))
    this.currentIndex = this.info.index
  },
  beforeDestroy() {

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

@@ -19,14 +19,14 @@
        <div class="title">
          药品追溯码（
          <span class="c-17b3ec">{{ fillNum }}</span>
          /{{ allNum }}）
          / {{ allNum }}）
        </div>
        <div class="fs-12 c-999">请按照追溯码录入的位次进行顺序摆放，序号为最里的位次摆放在该号位的最里层，以此类推</div>
        <div class="line"></div>
        <div v-for="item in inventoryList" :key="item.id">
          <div class="title">{{ item.layerNo }}层{{ item.wayerNo }}号位</div>
          <div class="code-box">
            <code-list :codeList="item.codeList"></code-list>
            <code-list :codeList="item.codeList" @scan="scan($event, item)"></code-list>
          </div>
        </div>
      </div>
@@ -36,7 +36,7 @@
      <div class="plain-btn" @click="backFn">
        返回上一步
      </div>
      <div class="primary-btn" @click="finish">完成{{ type == 1 ? '补货' : '入库' }}</div>
      <div class="primary-btn" @click="finish">完成{{ type == 1 ? '补货' : '入库' }}({{ fillNum }})</div>
    </div>
  </div>
</template>
@@ -84,6 +84,15 @@ export default {
  },
  mounted() {
    this.drugTraceabilityCodeDetail()
    this.$EventBus.$on('getScanData', item => {
      const obj = this.inventoryList.find(el => el.id == item.id)
      if (obj) {
        obj.codeList = item.codeList
      }
    })
  },
  beforeDestroy() {
    this.$EventBus.$off('getScanData')
  },
  methods: {
    getLabel(index, len) {
@@ -102,6 +111,9 @@ 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 => {
@@ -109,11 +121,14 @@ export default {
            ...el,
            arr: []
          }
          var maxNum = el.cargoCapacity * 1 > this.stock * 1 ? this.stock * 1 : el.cargoCapacity * 1
          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++) {
              obj.codeList.push({ code: '' })
              obj.codeList.unshift({ code: '' })
            }
          }
@@ -151,13 +166,13 @@ export default {
        let qty = 0
        el.codeList.forEach((item, index) => {
          // 记录填写了追溯码的数量
          if (item.code) {
          if (item.code != '') {
            qty++
            codeList.push({
              code: item.code,
              sort: el.codeList.length - index
            })
          }
          codeList.push({
            code: item.code,
            sort: el.codeList.length - index
          })
        })
        list.push({
          cargoId: el.id,
@@ -175,6 +190,10 @@ export default {
      medicineAbinetApi.batchAddInventory(p).then(res => {
        if (res.status == 200) {
          this.$toast('操作成功！')
          this.$EventBus.$emit('initPage')
          this.$emitRefreshPage('replenishmentStartQuick', {
            bussiness: 5
          })
          this.backFn()
        }
      })
@@ -185,7 +204,7 @@ export default {
      this.inventoryList[0].codeList.forEach((el, index) => {
        codeList.push({
          code: el.code,
          sort: el.codeList.length - index
          sort: this.inventoryList[0].codeList.length - index
        })
      })
      let p = {
@@ -199,12 +218,27 @@ export default {
      medicineAbinetApi.updateMediicinecabineInventory(p).then(res => {
        if (res.status == 200) {
          this.$toast('入库成功！')
          this.$EventBus.$emit('initPage')
          // this.$emitRefreshPage('replenishmentDeviceDetail')
          this.backFn()
        }
      })
    },
    backFn() {
      this.$router.go(-1)
    },
    scan(data, item) {
      sessionStorage.setItem(
        'scanData',
        JSON.stringify({
          ...data,
          ...item
        })
      )
      this.$router.push({
        path: '/replenishment/start/scan'
      })
    }
  }
}
@@ -227,7 +261,7 @@ export default {
  width: 200px;
}
.title {
  margin-bottom: 6px;
  margin: 10px 0;
}
.line {
  border: 1px solid #eaeaea;