@logwire/logwire-wms-pda-ui 1.1.19 → 3.1.0

package/src/components/module/OnLine/index.vue

@@ -4,176 +4,200 @@
   @date: 2022-02-25
 -->
 <template>
-  <lw-popup
-    class="lw-on-line-model-box"
-    v-model="show"
-    :allow-off="false"
-    :title="$lwLanguage.get('wms_project.pda.model.onlineModel.manage', '状态管理')"
-  >
-
-    <slot name="top"/>
-
-    <div style="padding: 10px 0">
-      <lw-cell
-        class="lw-global-animation-out"
-        v-bind="cellStyle"
-        :title="$lwLanguage.get('wms_project.pda.model.onlineModel.userState', '当前用户状态')"
-      >
-        <template #value>
-          <van-switch
-            v-model="userStatus"
-            :size="switchSize"
-            @change="userChange"
-          />
-        </template>
-      </lw-cell>
-
-      <div
-        class="lw-global-bottom-border lw-global-title-left-line lw-global-animation-out"
-        style="padding: 20px 0 10px;animation-delay: 50ms"
-      >{{ $lwLanguage.get('wms_project.pda.model.onlineModel.job', '业务状态') }}</div>
-
-      <lw-cell
-        class="lw-global-animation-out"
-        v-bind="cellStyle"
-        v-for="(i,k) in bizList"
-        :style="{animationDelay: (k+2) * 50 + 'ms'}"
-        :key="k"
-        :title="i.operationTypeLabel"
-      >
-        <template #value>
-          <van-switch
-            v-model="i.online"
-            :size="switchSize"
-            @change="(val) => switchChange(i, k, val)"
-          />
-        </template>
-      </lw-cell>
-
-      <slot name="addItem"/>
-    </div>
-
-    <slot name="end"/>
-
-    <template #button>
-      <lw-button
-        v-if="showConfirm"
-        v-bind="confirmStyle"
-        @click="confirm"
-      >
-        <slot name="btn">{{ confirmText || $lwLanguage.get('wms_project.pda.common.confirm', '确定') }}</slot>
-      </lw-button>
-
-      <slot name="addBtn"/>
-    </template>
-  </lw-popup>
+  <div>
+    <lw-popup
+      class="lw-on-line-model-box"
+      v-model="show"
+      :title="$lwLanguage.get('wms_project.pda.model.onlineModel.manage', '状态管理')"
+    >
+
+      <div style="padding: 10px 0">
+        <lw-cell
+          class="lw-global-animation-out"
+          v-bind="cellStyle"
+          :title="$lwLanguage.get('wms_project.pda.model.onlineModel.userState', '当前用户状态')"
+        >
+          <template #value>
+            <van-switch
+              v-model="userStatus"
+              :size="switchSize"
+              @change="userChange"
+            />
+          </template>
+        </lw-cell>
+
+        <div
+          class="lw-global-bottom-border lw-global-title-left-line lw-global-animation-out"
+          style="padding: 20px 0 10px;animation-delay: 50ms"
+        >{{ $lwLanguage.get('wms_project.pda.model.onlineModel.job', '业务状态') }}
+        </div>
+
+        <lw-cell
+          class="lw-global-animation-out"
+          v-bind="cellStyle"
+          v-for="(i,k) in bizList"
+          :style="{animationDelay: (k+2) * 50 + 'ms'}"
+          :key="k"
+          :title="i.operationTypeLabel"
+        >
+          <template #value>
+            <van-switch
+              v-model="i.online"
+              :size="switchSize"
+              @change="switchChange"
+            />
+          </template>
+        </lw-cell>
+
+        <slot name="addItem"/>
+      </div>
+
+      <template #button>
+        <lw-button
+          v-if="showConfirm"
+          @click="confirm()"
+        >
+          {{ confirmText || $lwLanguage.get('wms_project.pda.common.confirm', '确定') }}
+        </lw-button>
+      </template>
+    </lw-popup>
+
+
+    <!-- 下线理由弹框 -->
+    <lw-off-line-popup-module
+      :title="$lwLanguage.get('wms_project.pda.components.module.OnLine.index.guzfdlye','强制下线')"
+      v-model="forceOfflinePopupShow"
+      @confirm="forceOfflineConfirm"
+    />
+  </div>
 </template>
 
 <script>
 
 export default {
   name: "lwOnLineModule",
-  props:{
-    value:{
-      type:Boolean,
+  props: {
+    value: {
+      type: Boolean,
       default: false
     },
 
     // 是否显示确定按钮
-    showConfirm:{
+    showConfirm: {
       type: Boolean,
       default: true
     },
     // 确定按钮的文字
     confirmText: String,
-    // 确定按钮的样式
-    confirmStyle:{
-      type: Object,
-      default: () => {
-        return {
-          block: true
-        }
-      }
-    },
   },
   data() {
     return {
-      // 打开弹出框
-      show:false,
 
       // 单元行样式
-      cellStyle:{
+      cellStyle: {
         isLink: false
       },
       // 开关的大小
       switchSize: '18px',
 
       // 用户在线状态
-      userStatus:false,
+      userStatus: false,
       // 业务状态
-      bizList:[]
+      bizList: [],
+
+      // 强制下线的弹框
+      forceOfflinePopupShow: false
     }
   },
-  watch:{
-    value:{
-      handler(n){
+  computed:{
+    show:{
+      get(){
+        return this.value
+      },
+      set(v){
+        this.$emit('input', v)
+      }
+    }
+  },
+  watch: {
+    value: {
+      handler(n) {
         n && this.allLineStatus()
       }
     }
   },
   methods: {
     // 获取全部状态
-    allLineStatus(){
-      this.$lwApi.user.allLineStatus().then(res=>{
+    allLineStatus() {
+      this.$lwApi.user.allLineStatus().then(res => {
         this.userStatus = res.online
-        this.bizList = res.bizList
-        this.show = true
-      }).catch(err=>{
+        this.bizList = res.bizList || []
+      }).catch(err => {
         console.error('获取全部状态失败：', err)
         this.show = false
-        this.$emit('input', false)
       })
     },
 
     // 用户状态改变
-    userChange(val){
-      const fn = val ? 'userOnLine' : 'userOffLine'
-      this.$lwApi.user[fn]().catch(err=>{
-        console.error('用户上下线错误', err)
-        this.userStatus = !val
+    userChange(val) {
+      this.bizList.forEach(item => {
+        item.online = val
       })
     },
 
     // 业务状态改变
-    async switchChange(item, key, val){
-
-      try{
-
-        if (!this.userStatus) {
-          this.$lwShowErrorMsg(
-            this.$lwLanguage.get(
-              'wms_project.pda.model.onlineModel.userLineError',
-              '用户状态为下线，不允许操作业务上线。如需操作，请将用户状态设置为上线'
-            )
-          )
-          throw Error('用户状态为下线，不允许设置业务上线')
-        }
-
+    async switchChange(val) {
 
-        const fn = val ? 'bizOnLine' : 'bizOffLine'
-        await this.$lwApi.user[fn]({operationType: item.operationType})
-      }catch (err){
-        console.error('业务上下线错误：', err)
-        this.bizList[key].online = !val
+      if (val) {
+        this.userStatus = true
       }
 
     },
 
     // 确定
-    confirm(){
-      this.show = false
-      this.$emit('input', false)
-      this.$emit('confirm')
+    async confirm(data) {
+      try {
+        const res = await this.$lwApi.user.onOrOffLine({
+          taskSwitch: this.userStatus,
+          lines: this.bizList,
+          ...data
+        })
+
+        const wait = res.processingBizList
+        if (wait && wait.length){
+          this.$lwDialog.confirm({
+            title: this.$lwLanguage.get('wms_project.pda.components.module.OnLine.index.karmqkkq','警告'),
+            message: this.$lwLanguage.get('wms_project.pda.components.module.OnLine.index.jldokzwp','当前存在未完成的任务，不允许下线'),
+            msgList: wait.map(item=>{
+              return{
+                key: item.operationTypeLabel,
+                value: item.processingCount
+              }
+            }),
+            type:'error',
+            confirmButtonText: this.$lwLanguage.get('wms_project.pda.components.module.OnLine.index.guzfdlye','强制下线')
+          }).then(()=>{
+            this.forceOfflinePopupShow = true
+          }).catch(()=>{})
+          return
+        }
+
+        this.forceOfflinePopupShow = false
+        this.show = false
+        this.$emit('confirm')
+      } catch (e) {
+        console.log('上下线状态变更失败：', e)
+      }
+
+    },
+
+    // 强制下线确认
+    forceOfflineConfirm(obj){
+
+      this.confirm({
+        forceOffline: true,
+        ...obj
+      })
     },
   }
 }
@@ -182,14 +206,12 @@ export default {
 <style scoped lang="less">
 
 
+.lw-on-line-model-box {
 
-.lw-on-line-model-box{
-
-  /deep/.van-switch--on{
+  .van-switch--on {
     background-color: #D50000;
   }
 }
 
 
-
 </style>

package/src/components/module/OnLine//344/270/212/344/270/213/347/272/277/347/256/241/347/220/206/346/250/241/345/235/227.md

@@ -1 +1 @@
-# 上下线管理模块 [查看文档](http://note.youdao.com/groupshare/?token=DDAAF929AD7E43D5981DF5C8CABFDA3D&gid=136361463)
+# 上下线管理模块 [查看文档](https://www.yuque.com/docs/share/a83a001b-d68b-4b59-8b6e-537754203301)

package/src/components/module/ReceiveAbnormal/index.vue

@@ -9,14 +9,14 @@
     <div v-if="show">
 
       <!-- ERP单号 -->
-      <div class="lw-global-model-box lw-receive-abnormal-boss">
+      <div class="lw-global-model-box lw-receive-abnormal-boss" v-if="!moreAsnDisabled">
 
         <lw-input
           :title="this.$lwLanguage.get('wms_project.pda.module.receiveAbn.order','订单号')"
           v-model="abnormalInfo.orderNo"
           input-align="right"
-          required
-          disabled
+          :required="!!asnNo"
+          :disabled="!!asnNo"
           rule-prefix="receiveAbn"
           rule-key="orderNo"
         />
@@ -55,7 +55,7 @@
       </div>
 
       <!-- 更多单据信息 -->
-      <div class="lw-global-model-box lw-global-collapse-box">
+      <div class="lw-global-model-box lw-global-collapse-box" v-if="!moreInfoDisabled">
         <van-collapse
           v-model="moreInfoCollapse"
           :border="false"
@@ -132,7 +132,7 @@
         <lw-cell
           style="padding-top: 0"
           :title="$lwLanguage.get('wms_project.pda.module.receiveAbn.type','所属类型')"
-          :value="belongType"
+          :value="belongType || $lwLanguage.get('wms_project.pda.module.receiveAbn.title', '收货')"
           value-align="right"
           :is-link="false"
         />
@@ -259,6 +259,14 @@
           :must-required="false"
         />
 
+        <!-- 待处理量 -->
+        <div class="lw-global-row lw-global-flex-between" v-if="qty>-1">
+          <div class="lw-global-title">
+            {{ $lwLanguage.get('wms_project.pda.module.inboundAbn.wait','待处理量') }}
+          </div>
+
+          <div class="lw-global-value-bold" style="color: #D50000">{{ qty }}</div>
+        </div>
 
         <lw-input
           :title="$lwLanguage.get('wms_project.pda.module.receiveAbn.anbQty','异常数量')"
@@ -287,6 +295,31 @@
           rule-key="lpn"
         />
 
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.module.receiveAbn.originalLocal','原库位')"
+          v-if="originalLocationCode"
+          v-model="skuInfo.originalLocationCode"
+          input-align="right"
+          rule-prefix="receiveAbn"
+          rule-key="location"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.module.receiveAbn.originalLpn','原托盘号')"
+          v-if="originalLpn"
+          v-model="skuInfo.originalLpn"
+          input-align="right"
+          rule-prefix="receiveAbn"
+          rule-key="lpn"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.module.receiveAbn.originalCaseNum','原箱号')"
+          v-if="originalCaseNum"
+          v-model="skuInfo.originalCaseNum"
+          input-align="right"
+        />
+
         <!-- 处理方式 -->
         <lw-cell-popup-radio
           :title="this.$lwLanguage.get('wms_project.pda.module.receiveAbn.handleMethod','处理方式')"
@@ -373,10 +406,7 @@ export default {
     asnNo: String,
 
     // 所属类型
-    belongType: {
-      type: String,
-      default: '收货'
-    },
+    belongType: String,
 
     // 是否允许多条保存
     multiple:{
@@ -389,9 +419,34 @@ export default {
       type: Boolean,
       default: false
     },
+    moreInfoDisabled:{
+      type: Boolean,
+      default: false
+    },
+    moreAsnDisabled:{
+      type: Boolean,
+      default: false
+    },
 
     // 商品号
     skuCode: String,
+    ownerId: String ,
+    qty:{
+      type: Number,
+      default: -1
+    },
+    originalLocationCode:{
+      type: Boolean,
+      default: false
+    },
+    originalLpn:{
+      type: Boolean,
+      default: true
+    },
+    originalCaseNum:{
+      type: Boolean,
+      default: true
+    },
 
     // 是否显示底部导航栏模块
     showBottomBar:{
@@ -469,19 +524,22 @@ export default {
       // 商品信息
       skuInfo:{
         skuCode:'',
-        // 当前扫描零件得到的零件基础信息
+        // 当前扫描商品得到的商品基础信息
         sku:{
           skuName:''
         },
         abnQty:'',
         abnLocationCode:'',
         abnLpn:'',
+        originalLocationCode:'',
+        originalLpn:'',
+        originalCaseNum:'',
         handleMethod:'',
         remark:'',
         imagesArr:[],
       },
 
-      // 零件信息获取焦点
+      // 商品信息获取焦点
       skuInfoFocus:{
         skuCode: false,
         qty: false,
@@ -505,7 +563,7 @@ export default {
   watch:{
     'skuInfo.skuCode':{
       handler(n){
-        // 如果零件信息为空就清除批次数据、零件数据
+        // 如果商品信息为空就清除批次数据、商品数据
         if (!n){
           this.skuInfo.sku = {}
           this.lot.show = false
@@ -515,9 +573,7 @@ export default {
     }
   },
   mounted() {
-
     this.init()
-
   },
   methods: {
     // 初始化
@@ -526,27 +582,30 @@ export default {
 
         // 获取货主信息
         this.ownerList = await this.$lwApi.common.getOwnerList()
-        const asnData = await wmsMobileFoundAsn({
-          asnNo: this.asnNo
-        })
+        if(this.asnNo){
+          const asnData = await wmsMobileFoundAsn({
+            asnNo: this.asnNo
+          })
+          this.asnData = asnData || {}
+        } else {
+          this.asnData = {}
+        }
 
-        this.asnData = asnData || {}
-        this.abnormalInfo.orderNo = this.asnData.asnNo || ''
         this.skuInfo.skuCode = this.skuCode || ''
+
+        this.abnormalInfo.orderNo = this.asnData.asnNo || this.asnNo
         this.abnormalInfo.extNo = this.asnData.erpOrderNo || ''
         this.abnormalInfo.supplierCode = this.asnData.supplierCode || ''
         this.abnormalInfo.supplierName = this.asnData.supplierName || ''
         this.abnormalInfo.carrierCode = this.asnData.carrierCode || ''
         this.abnormalInfo.carrierName = this.asnData.carrierName || ''
         this.abnormalInfo.carrierPlateNum = this.asnData.plateNumber || ''
-        this.abnormalType.ownerId = this.asnData.ownerId || ''
+        this.abnormalType.ownerId = this.asnData.ownerId || this.ownerId || ''
         /*this.abnormalInfo.bizOrderNo = this.asnData.bizOrderNo || ''
         this.abnormalInfo.bizOrderLineNo = this.asnData.bizOrderLineNo || ''*/
 
-
         // 是否存在商品数据，如果存在就获取商品信息
-        if (this.skuInfo.skuCode){
-
+        if(this.skuInfo.skuCode){
           await this.skuCodeConfirm(true)
         }
 
@@ -556,7 +615,6 @@ export default {
         console.error('收货异常模块初始化失败：', err)
       }
     },
-
     // 异常类型确认
     typeConfirm({value}){
 
@@ -575,6 +633,7 @@ export default {
 
     // 商品号确认
     async skuCodeConfirm(first = false){
+
       if (!this.skuInfo.skuCode){
         this.skuInfoFocus.skuCode = true
         this.$lwShowErrorMsg(
@@ -595,19 +654,24 @@ export default {
         skuCode: this.skuInfo.skuCode
       }
 
+      console.log(this.asnData)
+      console.log(this.abnormalType)
+
       if (this.asnData.ownerId){
         query.asnId = this.asnData.id
       }else {
         query.ownerId = this.abnormalType.ownerId
       }
 
+      console.log(query)
+
       const res = await wmsMobileFoundAsnLineSku(query)
 
       this.skuInfo.sku = {
         ...res,
         skuCode: res.sku.code,
         skuName: res.sku.name,
-        skuOwner: res.sku.owner,
+        skuOwner: res.sku.ownerId,
         skuId: res.sku.id,
       }
 
@@ -718,14 +782,20 @@ export default {
         return false
       }
 
-      // 校验异常量是否大于商品可用量
-      /*if (this.skuInfo.abnQty > this.skuInfo.sku.qty){
+      const num = Number(this.skuInfo.abnQty || 0)
+      if (
+        this.abnormalType.abnType !== 'ORDER' &&
+        this.abnormalType.abnSubType !== 'QTY_MORE' &&
+        !this.multiple && this.qty>-1 &&
+        num > this.qty
+      ){
         this.skuInfoFocus.qty = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.module.receiveAbn.qtyMore','异常量不能大于商品可用量')
+          this.$lwLanguage.get('wms_project.pda.module.receiveAbn.skuMore','异常量不能大于待处理量')
         )
+        this.skuInfo.abnQty = ''
         return false
-      }*/
+      }
 
       // 校验是否输入异常库位
       if (!this.skuInfo.abnLocationCode){
@@ -767,15 +837,15 @@ export default {
       return true
     },
 
-    // 增加零件信息按钮被点击
+    // 增加商品信息按钮被点击
     addSku(){
       this.showAddBtn = false
       this.skuInfoFocus.skuCode = true
     },
 
-    // 删除零件按钮被点击
+    // 删除商品按钮被点击
     delSku(index){
-      this.$dialog.confirm({
+      this.$lwDialog.confirm({
         title: this.$lwLanguage.get('wms_project.pda.module.receiveAbn.warning','警告'),
         message: this.$lwLanguage.get('wms_project.pda.module.receiveAbn.del','确认删除该商品？')
       }).then(()=>{
@@ -821,6 +891,27 @@ export default {
       }
     },
 
+    getAllAbnormalData(){
+      const {success, data} = this.getAbnormalData()
+
+      if (!success) {
+        return {
+          success: false,
+          data: []
+        }
+      }
+
+      return {
+        success: true,
+        data: {
+          order: this.abnormalInfo,
+          lines: data,
+          ...this.abnormalType,
+          asnId: this.asnData.id
+        }
+      }
+    },
+
     // 确认上报
     confirm(){
       const {success, data} = this.getAbnormalData()

package/src/components/module/ReceiveAbnormal//346/224/266/350/264/247/345/274/202/345/270/270/346/250/241/345/235/227.md

@@ -0,0 +1 @@
+# 收货异常模块 [查看文档](https://www.yuque.com/docs/share/f0577748-6aac-431a-ba05-46318d8ab23e)