hd 1 周之前
父节点
当前提交
897121bd5f

+ 1 - 1
mini-pro-web/.env.development

@ -11,6 +11,6 @@ VUE_APP_IM_API = 'http://172.26.0.105:3000/api/v2'
# VUE_APP_PRE_PATH = '/intelligent-medicine-abinet'
# ehr打包地址
VUE_APP_PRE_PATH = '/hlwyy/intelligent-medicine-abinet' 
VUE_APP_PRE_PATH = '/hlwyy/intelligent-medicine-abinet'
VUE_APP_APPID = "wx79a7f451c8c30308"
VUE_APP_WXID = znyg_wx

+ 5 - 3
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="data.cargoCapacity" button-size="36px" input-width="60px" /></div>
          <div class="tc pt30 pb20"><van-stepper v-model="stock" min="1" :max="bussiness == 4 ? data.cargoCapacity : 99" button-size="36px" input-width="60px" /></div>
        </template>
        <div class="tc" v-else>
          <div class="pt10">
@ -140,7 +140,8 @@ export default {
          this.emitValue(false)
          this.$toast.clear()
          this.$emitRefreshPage('replenishmentStartDeviceDetail')
          history.back()
          // history.back()
          this.$emit('refresh')
        })
      } else if (this.bussiness == 2) {
        // 矫正库存
@ -156,7 +157,8 @@ export default {
            this.emitValue(false)
            this.$toast.clear()
            this.$emitRefreshPage('replenishmentStartDeviceDetail')
            history.back()
            // history.back()
            this.$emit('refresh')
          })
          .catch(err => {
            console.error(err)

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

@ -61,7 +61,7 @@
      </div>
    </div>
    <!-- 修改容量 -->
    <SetStockDialog v-model="setStockShow" :data="info" :trackId="id" :drugId="drugId" :codeList="codeList" :deviceId="info.idDevice" :inventoryObj="inventoryObj" @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" @refresh="selectMediicinecabineInventoryById"/>
  </div>
</template>
<script>

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

@ -249,7 +249,11 @@ export default {
          this.$toast(`${this.type == 2 ? '入库成功!' : '更改成功!'}`)
          this.$EventBus.$emit('initPage')
          // this.$emitRefreshPage('replenishmentDeviceDetail')
          this.$router.go(-2)
          if (this.type == 2) {
            this.$router.go(-1)
          } else {
            this.$router.go(-2)
          }
        }
      })
    },