@logwire/logwire-wms-pda-ui 3.1.1 → 3.1.2

package/src/components/page/container/scrapRecord/orderInfo/index.vue

@@ -0,0 +1,464 @@
+<!--
+  报废登记 - 执行页
+  @author: 张文
+  @date: 2022-12-22
+-->
+<template>
+  <div>
+
+    <lw-nav-bar :title="$lwLanguage.get('','完善报废单')"/>
+
+
+    <div class="lw-global-page-box">
+
+      <!-- 拒绝原因 -->
+      <div
+        v-if="orderInfo.refuseName"
+        style="padding: 5px 10px"
+        class="lw-global-model-box lw-global-border-2px"
+      >
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('','拒绝原因')"
+          :value="orderInfo.refuseReason || '-'"
+          val-bold
+          val-red
+          :is-row="false"
+        />
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('','拒绝人')"
+          :value="orderInfo.refuseName"
+          val-bold
+          val-red
+          is-row-end
+        />
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('','拒绝时间')"
+          :value="$lwDate.format(orderInfo.refuseTime,'yyyy-MM-dd hh:mm')"
+          val-bold
+          val-red
+          is-row-end
+        />
+
+      </div>
+
+      <!-- 报废单信息 -->
+      <div class="lw-global-model-box">
+        <div class="lw-global-flex-between">
+
+          <lw-title-value-cell
+            :title="$lwLanguage.get('','报废单号')"
+            :value="orderInfo.scrapNo"
+            :is-row="false"
+          />
+
+          <lw-button
+            style="flex-shrink: 0"
+            mini
+            round
+            @click="editOrderPopupShow = true"
+          >
+            {{ $lwLanguage.get('', '编辑信息') }}
+          </lw-button>
+
+        </div>
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('','报废方式')"
+          :value="orderInfo.scrapMethodLabel"
+          is-row-end
+        />
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('','预计报废日期')"
+          :value="$lwDate.format(orderInfo.planScrapTime)"
+          is-row-end
+        />
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('','报废方')"
+          :value="orderInfo.scrapOrg"
+          is-row-end
+        />
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('','报废人')"
+          :value="orderInfo.scrapPeople"
+          is-row-end
+        />
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('','报废人电话')"
+          :value="orderInfo.scrapPhone"
+          is-row-end
+        />
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('','备注')"
+          :value="orderInfo.remark"
+          is-row-end
+        />
+      </div>
+
+      <!-- 报废原因 -->
+      <div
+        style="padding: 0 10px"
+        class="lw-global-model-box"
+      >
+
+        <lw-cell-popup-radio
+          :title="$lwLanguage.get('','报废原因')"
+          v-model="addContainer.method"
+          dict-key="WmsContainerScrapReason"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('','报废备注')"
+          v-model="addContainer.remark"
+          type="textarea"
+          :rows="3"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('','所在库位')"
+          v-model="addContainer.location.value"
+          :get-focus.sync="addContainer.location.focus"
+          rule-key="location"
+          :create-rule="$lwScanRule.create('容器管理 - 完善报废单 - 所在库位','LOCATION')"
+          required
+          @confirm="locationConfirm"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('','容器号')"
+          v-model="addContainer.container.value"
+          :get-focus.sync="addContainer.container.focus"
+          rule-key="container"
+          :create-rule="$lwScanRule.create('容器管理 - 完善报废单 - 所在库位','CONTAINER')"
+          required
+          :show-bottom-border="false"
+          @confirm="containerConfirm"
+        >
+
+          <template #button>
+
+            <lw-button
+              round
+              mini
+              @click="containerConfirm"
+            >
+              {{ $lwLanguage.get('', '确认') }}
+            </lw-button>
+
+          </template>
+
+        </lw-input>
+
+      </div>
+
+      <!-- 容器列表 -->
+      <div class="lw-global-model-box">
+
+        <div class="lw-global-flex-start lw-global-row-start">
+
+          <div class="lw-global-title">
+            {{ $lwLanguage.get('', '已添加容器数量：') }}
+          </div>
+
+          <div class="lw-global-value-bold-red">{{ containerList.length }}</div>
+
+        </div>
+
+        <container-info
+          v-for="(i,k) in containerList.slice(0,2)"
+          :key="i.scrapLineId"
+          class="lw-global-row"
+          :item="i"
+          @del="containerDel(k,i.scrapLineId)"
+          @imgUpload="(str)=>imgUpload(i.scrapLineId,str)"
+        />
+
+        <div
+          v-if="containerList.length"
+          class="lw-global-flex-center lw-global-row-end lw-global-click-style lw-global-value"
+          @click="lookAll"
+        >
+          {{ $lwLanguage.get('', '查看全部') }}
+          <van-icon style="margin-left: 5px" name="arrow"/>
+        </div>
+      </div>
+
+    </div>
+
+    <lw-bottom-bar>
+
+      <lw-button @click="submit">
+        {{ $lwLanguage.get('', '提交') }}
+      </lw-button>
+
+    </lw-bottom-bar>
+
+
+    <!-- 报废信息编辑 -->
+    <add-or-edit
+      v-model="editOrderPopupShow"
+      :item="orderInfo"
+      :confirm-fn="editOrderConfirm"
+    />
+
+    <!-- 查看全部容器信息 -->
+    <lw-popup
+      :title="$lwLanguage.get('','容器列表')"
+      v-model="containerListPopup.show"
+      @closed="containerListPopupOff"
+    >
+      <lw-input
+        :title="$lwLanguage.get('','容器号')"
+        v-model="containerListPopup.search"
+        rule-key="container"
+        :create-rule="$lwScanRule.create('容器管理 - 完善报废单 - 所在库位','CONTAINER')"
+        @confirm="containerSearch"
+      >
+
+        <template #button>
+          <lw-button
+            mini
+            round
+            @click="containerSearch"
+          >
+            {{ $lwLanguage.get('', '搜索') }}
+          </lw-button>
+        </template>
+
+      </lw-input>
+
+      <container-info
+        v-for="(i,k) in containerListPopup.showList"
+        :key="i.scrapLineId"
+        class="lw-global-row"
+        :item="i"
+        @del="popupDel(k)"
+        @imgUpload="(str)=>containerListPopupImgUpload(i.scrapLineId,k,str)"
+      />
+
+      <lw-not-data v-if="!containerListPopup.showList.length"/>
+
+    </lw-popup>
+
+  </div>
+</template>
+
+<script>
+import containerInfo from "../components/containerInfo.vue";
+import addOrEdit from "../components/addOrEdit.vue";
+import {
+  projectWmsPDAContainerScrapOrderAddLine, projectWmsPDAContainerScrapOrderChangeLineImages,
+  projectWmsPDAContainerScrapOrderQueryDetail, projectWmsPDAContainerScrapOrderRemoveLine,
+  projectWmsPDAContainerScrapOrderSave, projectWmsPDAContainerScrapOrderSubmit
+} from "../../../../../api/container/scrapRecord";
+
+export default {
+  name: "lwContainerScrapRecordOrderInfoPage",
+  components: {
+    containerInfo,
+    addOrEdit,
+  },
+  data() {
+    return {
+      // 报废单id
+      scrapId: '',
+
+      // 报废单数据
+      orderInfo: {},
+
+      // 增加容器
+      addContainer: {
+        method: '',
+        remark: '',
+        location: {
+          value: '',
+          focus: false
+        },
+        container: {
+          value: '',
+          focus: false
+        },
+      },
+
+      // 容器列表
+      containerList: [],
+
+      // 编辑信息弹框
+      editOrderPopupShow: false,
+
+      // 容器列表弹框
+      containerListPopup: {
+        show: false,
+        imgChange: false,
+        search: '',
+        showList: []
+      }
+    }
+  },
+  mounted() {
+    this.scrapId = this.$route.query.scrapId
+    projectWmsPDAContainerScrapOrderQueryDetail({
+      scrapId: this.scrapId
+    }).then(res => {
+      this.orderInfo = res
+      this.containerList = res.lineList || []
+    })
+  },
+  methods: {
+    // 报废信息 - 确认
+    async editOrderConfirm(obj) {
+      const res = await projectWmsPDAContainerScrapOrderSave({
+        scrapId: this.scrapId,
+        extScrapNo: this.orderInfo.extScrapNo,
+        ...obj
+      })
+
+      for (const i in this.orderInfo) {
+        this.orderInfo[i] = res[i] || this.orderInfo[i]
+      }
+    },
+
+    // 所在库位校验
+    checkLocation() {
+      if (this.addContainer.location.value) return true
+
+      this.addContainer.location.focus = true
+      this.$lwShowErrorMsg(
+        this.$lwLanguage.get('', '所在库位不能为空')
+      )
+      return false
+    },
+    // 所在库位确认
+    locationConfirm() {
+      this.checkLocation() ? this.addContainer.container.focus = true : ''
+    },
+
+    // 容器号校验
+    checkContainer() {
+      if (this.addContainer.container.value) return true
+
+      this.addContainer.container.focus = true
+      this.$lwShowErrorMsg(
+        this.$lwLanguage.get('', '容器号不能为空')
+      )
+      return false
+    },
+    // 容器号确认
+    containerConfirm() {
+
+      if (!this.checkLocation() || !this.checkContainer()) return
+
+      projectWmsPDAContainerScrapOrderAddLine({
+        scrapId: this.scrapId,
+        containerCode: this.addContainer.container.value,
+        fromLocation: this.addContainer.location.value,
+        scrapReason: this.addContainer.method,
+        remark: this.addContainer.remark
+      }).then(res => {
+        this.containerList.unshift(res)
+        this.addContainer.container.value = ''
+        this.addContainer.container.focus = true
+      })
+
+    },
+
+    // 容器列表 - 删除
+    async containerDel(index, scrapLineId) {
+      await projectWmsPDAContainerScrapOrderRemoveLine({
+        scrapId: this.scrapId,
+        scrapLineId
+      })
+
+      this.containerList.splice(index, 1)
+    },
+    // 图片上传
+    imgUpload(scrapLineId, images) {
+      projectWmsPDAContainerScrapOrderChangeLineImages({
+        scrapId: this.scrapId,
+        scrapLineId,
+        images
+      })
+    },
+    // 查看全部
+    lookAll() {
+      this.containerListPopup.showList = []
+      this.$nextTick(()=>{
+        this.containerListPopup.showList = this.$lwDeepCopy(this.containerList)
+        this.containerListPopup.search = ''
+        this.containerListPopup.show = true
+        this.containerListPopup.imgChange = false
+      })
+    },
+
+    // 容器弹框确认搜索
+    containerSearch() {
+      this.containerListPopup.showList = this.containerList.filter(item=>{
+        return item.containerCode.includes(this.containerListPopup.search)
+      })
+    },
+    // 容器弹框 - 图片上传或删除
+    containerListPopupImgUpload(repairLineId,index,str){
+      this.containerListPopup.imgChange = true
+      this.imgUpload(repairLineId,str)
+      this.containerList.forEach(i=>{
+        if(i.scrapLineId === this.containerListPopup.showList[index].scrapLineId){
+          i.images = str
+        }
+      })
+    },
+    // 容器弹框 - 删除
+    async popupDel(index) {
+      let scrapLineId = ''
+      let key = ''
+      this.containerList.forEach((i,k)=>{
+        if(i.scrapLineId === this.containerListPopup.showList[index].scrapLineId){
+          scrapLineId = i.scrapLineId
+          key = k
+        }
+      })
+
+      await this.containerDel(key,scrapLineId)
+
+      this.containerListPopup.showList.splice(index,1)
+    },
+    // 容器弹框 - 关闭
+    containerListPopupOff(){
+      if (this.containerListPopup.imgChange){
+        const arr = this.$lwDeepCopy(this.containerList)
+        this.containerList = []
+        this.$nextTick(()=>this.containerList = arr)
+      }
+    },
+
+    // 提交数据
+    submit() {
+      if (!this.containerList.length) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '没有可以提交的数据')
+        )
+        return
+      }
+
+      projectWmsPDAContainerScrapOrderSubmit({
+        scrapId: this.scrapId
+      }).then(() => {
+        this.$lwToast.success(
+          this.$lwLanguage.get('', '已提交')
+        )
+        history.go(-1)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/components/page/count/console/index/index.vue

@@ -55,10 +55,7 @@
       </lw-data-look-bg>
 
       <!-- 父级tab -->
-      <div
-        class="lw-global-tab-box"
-        style="margin-top: 10px;"
-      >
+      <lw-tab-box style="margin-top: 10px;">
         <van-tabs
           type="card"
           animated
@@ -85,7 +82,7 @@
 
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
       <!-- 子级tab -->
       <div
@@ -171,14 +168,7 @@
       @acceptTask="acceptTask"
       @claimTask="claimTask"
       @startTask="startTask"
-      @overTask="overTask"
-    />
-
-    <!-- 结束任务弹框 -->
-    <over-task-popup
-      v-model="overTaskPopup.show"
-      :task-id="this.taskPopup.data.taskId"
-      @backConfirm="overTaskConfirm"
+      @closed="taskContentClosed"
     />
 
     <!-- 随机盘点 - 结束盘点弹框 -->
@@ -453,9 +443,8 @@
 </template>
 
 <script>
-import taskItem from "../components/taskItem.vue";
-import lookTaskContentPopup from "../components/lookTaskContentPopup.vue";
-import overTaskPopup from "../components/overTaskPopup.vue";
+import taskItem from "../../../common/Task/components/taskItem.vue";
+import lookTaskContentPopup from "../../../common/Task/components/lookTaskContentPopup.vue";
 import randomCountItem from "../components/randomCountItem.vue";
 import {
   wmsInnerCountHandle,
@@ -470,7 +459,6 @@ export default {
   components:{
     taskItem,
     lookTaskContentPopup,
-    overTaskPopup,
     randomCountItem,
   },
   data() {
@@ -698,6 +686,11 @@ export default {
       this.taskPopup.data = item
       this.taskPopup.show = true
     },
+    // 任务详情弹框关闭
+    taskContentClosed(){
+      this.init()
+      this.getChildData()
+    },
 
 
     // 接受任务
@@ -718,14 +711,6 @@ export default {
 
       this.$router.push(query)
     },
-    // 结束任务
-    overTask(){
-      this.overTaskPopup.show = true
-    },
-    // 结束任务 - 确认结束
-    overTaskConfirm(){
-      this.taskPopup.show = false
-    },
 
 
 

package/src/components/page/count/inv/index/index.vue

@@ -9,7 +9,7 @@
       </div>
 
       <!-- TAB标签 -->
-      <div class="lw-global-tab-box" style="margin-top: 10px;">
+      <lw-tab-box style="margin-top: 10px;">
         <van-tabs type="card" animated v-model="tabActive" @change="tabChange">
           <van-tab :title="$lwLanguage.get('wms_project.pda.components.page.count.inv.index.fctlurjf', '未盘点')" name="unCount">
             <div class="lw-global-model-box">
@@ -58,7 +58,7 @@
                       :page-total="countedPagination.total"/>
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
     </div>
 

package/src/components/page/count/loc/action/index.vue

@@ -16,7 +16,7 @@
           <van-icon class="lw-handover-btn" name="arrow" @click="getNextLine"/>
         </div>
 
-        <div class="lw-global-tab-box" style="margin-top: 10px;">
+        <lw-tab-box style="margin-top: 10px;">
           <van-tabs type="card" animated v-model="tabActive">
             <van-tab :title="$lwLanguage.get('wms_project.pda.components.page.count.loc.action.wwrfufxn', '盘点中')">
               <!-- 输入框 -->
@@ -94,7 +94,7 @@
               </div>
             </van-tab>
           </van-tabs>
-        </div>
+        </lw-tab-box>
       </div>
     </div>
 

package/src/components/page/count/loc/index/index.vue

@@ -9,7 +9,7 @@
       </div>
 
       <!-- TAB标签 -->
-      <div class="lw-global-tab-box" style="margin-top: 10px;">
+      <lw-tab-box style="margin-top: 10px;">
         <van-tabs type="card" animated v-model="tabActive" @change="tabChange">
           <van-tab :title="$lwLanguage.get('wms_project.pda.components.page.count.loc.index.woklvlzp', '未盘点')" name="unCount">
             <div class="lw-global-model-box">
@@ -63,7 +63,7 @@
                       :page-total="countedPagination.total"/>
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
     </div>
 

package/src/components/page/inbound/components/AsnSkuInfo.vue

@@ -26,6 +26,16 @@
         >
           {{ $lwLanguage.get('','补码') }}
         </lw-button>
+
+        <lw-button
+          v-if="showContainerPrint"
+          style="flex-shrink: 0"
+          mini
+          round
+          @click="$emit('containerPrint')"
+        >
+          {{$lwLanguage.get('','打印容器号')}}
+        </lw-button>
         <lw-tag plain color="red">{{data.sku.qualityTypeLabel}}</lw-tag>
       </div>
     </div>
@@ -43,7 +53,10 @@ export default {
       type: String,
       default: 'not'
     },
-    showPrint: Boolean
+    showPrint: Boolean,
+
+    // 是否显示容器打印按钮
+    showContainerPrint: Boolean
   },
 }
 </script>

package/src/components/page/inbound/components/QualityTaskInfo.vue

@@ -23,6 +23,15 @@
         <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.tmfmdakc', '异常率')}}</div>
         <div>{{data.asn.abnormalRate || 0}}%</div>
         <div>
+          <lw-button
+            v-if="showPrintContainerBtn"
+            style="margin-right: 10px"
+            mini
+            round
+            @click="$emit('printContainer')"
+          >
+            {{ $lwLanguage.get('','打印容器号') }}
+          </lw-button>
           <lw-tag plain color="red">{{$lwDict.getDictLabel('quality_type_choice', data.sku.qualityType)}}</lw-tag>
         </div>
       </div>
@@ -73,6 +82,9 @@ export default {
   name: 'QualityTaskInfo',
   props: {
     data: Object,
+
+    // 是否显示打印容器按钮
+    showPrintContainerBtn:Boolean
   },
 }
 </script>
@@ -86,4 +98,4 @@ export default {
 .lw-global-sh {
   margin: 5px 0;
 }
-</style>
+</style>