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

package/src/components/page/outbound/delivery/components/boxItem/index.vue

@@ -1,118 +1,154 @@
-<!--
-  装车发运 - 执行 - 按箱
-  @author: 张文
-  @date: 2022-06-07
--->
-<template>
-  <div
-    :class="[
-      'lw-global-model-box',
-      item.lwPdaStart ?
-        'lw-global-animation-breath' :
-        'lw-global-animation-out'
-    ]"
-    :style="{
-      animationDelay:item.lwPdaStart ? '' : 50 * index + 'ms',
-      background: item.lwPdaStart ? 'rgb(244 218 219)' : ''
-    }"
-  >
-
-    <!-- 箱号 -->
-    <div class="lw-global-flex-between lw-global-row-start">
-      <div>
-        <span class="lw-global-title">
-          {{ $lwLanguage.get('', '箱号') }}
-        </span>
-        <span class="lw-global-value-bold">
-          {{ item.boxNo }}
-        </span>
-      </div>
-
-      <lw-button
-        v-if="!hiddenDelBtn"
-        mini
-        round
-        style="flex-shrink: 0"
-        @click="del"
-      >{{ $lwLanguage.get('', '删除') }}
-      </lw-button>
-    </div>
-
-    <!-- 客户 -->
-    <div class="lw-global-row">
-      <span class="lw-global-title">
-        {{ $lwLanguage.get('', '客户') }}
-      </span>
-      <span class="lw-global-value-bold">
-        {{ (item.customerCode || '-') + ' / ' + (item.customerName || '-') }}
-      </span>
-
-    </div>
-
-    <!-- 装箱数据 -->
-    <div class="lw-global-row">
-      <span class="lw-global-title">
-        {{ $lwLanguage.get('', '装箱数据') }}
-      </span>
-      <span>
-        <span class="lw-global-value">
-          {{ $lwLanguage.get('', '品类') }}
-        </span>
-        <span
-          class="lw-global-value-bold"
-          style="color: #D50000"
-        >
-          {{ item.skuTypeCount }}
-        </span>
-        <span class="lw-global-value">
-           / {{ $lwLanguage.get('', '数量') }}
-        </span>
-        <span
-          class="lw-global-value-bold"
-          style="color: #D50000"
-        >
-          {{ item.skuQty }}
-        </span>
-      </span>
-
-    </div>
-
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: "index",
-  props:{
-    // 数据
-    item:{
-      type: Object,
-      default: ()=>{}
-    },
-
-    // 数据索引
-    index:{
-      type: Number,
-      default: 0
-    },
-
-    // 隐藏删除按钮
-    hiddenDelBtn: Boolean
-
-  },
-  data() {
-    return {}
-  },
-  methods: {
-    // 删除
-    del(){
-      this.$emit('del', this.item.boxNo, this.index)
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-
-</style>
+<!--
+  装车发运 - 执行 - 按箱
+  @author: 张文
+  @date: 2022-06-07
+-->
+<template>
+  <div
+    :class="[
+      'lw-global-model-box',
+      item.lwPdaStart ?
+        'lw-global-animation-breath' :
+        'lw-global-animation-out'
+    ]"
+    :style="{
+      animationDelay:item.lwPdaStart ? '' : 50 * index + 'ms',
+      background: item.lwPdaStart ? 'rgb(244 218 219)' : ''
+    }"
+  >
+
+    <template v-if="item.labelValueList && item.labelValueList.length">
+
+      <div class="lw-global-flex-between lw-global-row-start">
+        <div>
+          <span class="lw-global-title">
+            {{ item.labelValueList[0].label }}
+          </span>
+          <span class="lw-global-value-bold">
+            {{ item.labelValueList[0].value }}
+          </span>
+        </div>
+
+        <lw-button
+          v-if="!hiddenDelBtn"
+          mini
+          round
+          style="flex-shrink: 0"
+          @click="del"
+        >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.boxItem.uozcnfef', '删除') }}
+        </lw-button>
+      </div>
+
+      <lw-lot-look-module
+        :columns="item.labelValueList.slice(1)"
+        :hidden-first-border="false"
+        title-key="label"
+        value-key="value"
+      />
+
+    </template>
+
+    <template v-else>
+      <!-- 箱号 -->
+      <div class="lw-global-flex-between lw-global-row-start">
+        <div>
+        <span class="lw-global-title">
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.boxItem.xtpdqwig', '箱号') }}
+        </span>
+          <span class="lw-global-value-bold">
+          {{ item.boxNo }}
+        </span>
+        </div>
+
+        <lw-button
+          v-if="!hiddenDelBtn"
+          mini
+          round
+          style="flex-shrink: 0"
+          @click="del"
+        >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.boxItem.uozcnfef', '删除') }}
+        </lw-button>
+      </div>
+
+      <!-- 客户 -->
+      <div class="lw-global-row">
+      <span class="lw-global-title">
+        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.boxItem.qkuwtxjo', '客户') }}
+      </span>
+        <span class="lw-global-value-bold">
+        {{ (item.customerCode || '-') + ' / ' + (item.customerName || '-') }}
+      </span>
+
+      </div>
+
+      <!-- 装箱数据 -->
+      <div class="lw-global-row">
+      <span class="lw-global-title">
+        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.boxItem.ntxqnhxs', '装箱数据') }}
+      </span>
+        <span>
+        <span class="lw-global-value">
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.boxItem.britnuff', '品类') }}
+        </span>
+        <span
+          class="lw-global-value-bold"
+          style="color: #D50000"
+        >
+          {{ item.skuTypeCount }}
+        </span>
+        <span class="lw-global-value">
+           / {{
+            $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.boxItem.lttlyicz', '数量')
+          }}
+        </span>
+        <span
+          class="lw-global-value-bold"
+          style="color: #D50000"
+        >
+          {{ item.skuQty }}
+        </span>
+      </span>
+
+      </div>
+    </template>
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "index",
+  props: {
+    // 数据
+    item: {
+      type: Object,
+      default: () => {
+      }
+    },
+
+    // 数据索引
+    index: {
+      type: Number,
+      default: 0
+    },
+
+    // 隐藏删除按钮
+    hiddenDelBtn: Boolean
+
+  },
+  data() {
+    return {}
+  },
+  methods: {
+    // 删除
+    del() {
+      this.$emit('del', this.item.boxNo, this.index)
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

package/src/components/page/outbound/delivery/components/orderContent/index.vue

@@ -11,82 +11,116 @@
     <!-- 单号 -->
     <div class="lw-global-flex-between lw-global-row-start">
 
-      <div>{{ item.deliveryNo }}</div>
+      <div class="lw-global-flex-start">
+        <span>{{ item.deliveryNo }}</span>
+
+        <lw-tag
+          style="flex-shrink: 0;margin-left: 5px"
+          round
+          plain
+          :type="tagType"
+        >{{ item.billStatusLabel || '-' }}</lw-tag>
+      </div>
 
       <div>
         <span
-          style="color: #D50000;font-size: 16px"
-          class="lw-global-value-bold"
+          style="font-size: 16px"
+          class="lw-global-value-bold-red"
         >{{ item.soCount || 0 }}</span>
-        <span class="lw-global-value"> 单 / </span>
+        <span class="lw-global-value">
+          {{$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContent.fotbfpec', ' 单 / ')}}
+        </span>
         <span
-          style="color: #D50000;font-size: 16px"
-          class="lw-global-value-bold"
+          style="font-size: 16px"
+          class="lw-global-value-bold-red"
         >{{ item.boxCount ||0 }}</span>
-        <span class="lw-global-value"> 箱</span>
-      </div>
-
-    </div>
-
-    <!-- 预计发运时间 -->
-    <div class="lw-global-flex-between lw-global-row">
-
-      <div>
-        <span class="lw-global-title">
-          {{ $lwLanguage.get('','预计发运时间') }}
+        <span class="lw-global-value">
+          {{$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContent.ixnlbxbj', ' 箱')}}
         </span>
-        <span class="lw-global-value-bold">{{ item.planDeliveryTime || '-' }}</span>
       </div>
 
-      <lw-tag
-        round
-        plain
-        :type="tagType"
-      >{{ item.billStatusLabel || '-' }}</lw-tag>
-
     </div>
 
-    <!-- 外部发运单号 -->
-    <div class="lw-global-row">
+    <!-- 判断是否使用了扩展字段 -->
+    <lw-lot-look-module
+      v-if="item.labelValueList && item.labelValueList.length"
+      :columns="item.labelValueList"
+      value-key="value"
+      title-key="label"
+      :hidden-first-border="false"
+    />
+
+    <template v-else>
+
+      <!-- 预计发运时间 -->
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContent.lpvmfypt','预计发运时间')"
+        :value="$lwDate.format(item.planDeliveryTime, 'yyyy-MM-dd hh:mm') || '-'"
+        val-bold
+      />
+
+      <!-- 外部发运单号 -->
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContent.iukkaydt','外部发运单号')"
+        :value="item.extDeliveryNo || '-'"
+        val-bold
+      />
+
+      <!-- 货主 -->
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContent.hwakycso','货主')"
+        :value="(item.ownerCode || '-') + ' / ' + (item.ownerName || '-')"
+        val-bold
+      />
+
+      <!-- 承运商 -->
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContent.aonsxfwq','承运商')"
+        :value="(item.carrierCode || '-') + ' / ' + (item.carrierName || '-')"
+        val-bold
+      />
+
+      <!-- 车牌号/拖车号 -->
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContent.etcrptxj','车牌号/拖车号')"
+        :value="(item.carrierPlateNum || '-') + ' / ' + (item.carrierCarriageNum || '-')"
+        val-bold
+      />
+
+      <!-- 月台 -->
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContent.index.mvrlwdnb','月台')"
+        :value="(item.dockCode || '-') + ' / ' + (item.dockName || '-')"
+        val-bold
+      />
+
+      <!-- 异常 -->
+      <lw-title-value-cell
+        v-if="item.abnType"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContent.index.bgexhfro','异常信息')"
+        :value="($lwDict.getDictLabel('OutboundDeliveryAbnormalType', item.abnType)) + ' - ' + item.abnMsg"
+        val-bold
+      />
+
+      <!-- 进度 -->
+      <div class="lw-global-flex-start lw-global-row-end">
+
+        <div class="lw-global-title">
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContent.index.lknfqtjc','进度') }}
+        </div>
+
+        <div class="lw-global-value-bold">
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContent.index.sfhgwgix','拣选率') }}
+          <span class="lw-global-value-bold-red">{{ item.pickRate || 0 }}%</span>
+           / {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContent.index.bhtpwtsk','捆包率') }}
+          <span class="lw-global-value-bold-red">{{ item.packRate || 0 }}%</span>
+          / {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContent.index.sesqxapz','装车率') }}
+          <span class="lw-global-value-bold-red">{{ item.loadRate || 0 }}%</span>
+        </div>
 
-      <span class="lw-global-title">
-        {{ $lwLanguage.get('','外部发运单号') }}
-      </span>
-      <span class="lw-global-value-bold">{{ item.extDeliveryNo || '-' }}</span>
-    </div>
-
-    <!-- 货主 -->
-    <div class="lw-global-row">
-
-      <span class="lw-global-title">
-        {{ $lwLanguage.get('','货主') }}
-      </span>
-      <span class="lw-global-value-bold">
-        {{ (item.ownerCode || '-') + ' / ' + (item.ownerName || '-') }}
-      </span>
-    </div>
-
-    <!-- 承运商 -->
-    <div class="lw-global-row">
-
-      <span class="lw-global-title">
-        {{ $lwLanguage.get('','承运商') }}
-      </span>
-      <span class="lw-global-value-bold">
-        {{ (item.carrierCode || '-') + ' / ' + (item.carrierName || '-') }}
-      </span>
-    </div>
-
-    <!-- 车牌号/拖车号 -->
-    <div class="lw-global-row">
+      </div>
 
-      <span class="lw-global-title">
-        {{ $lwLanguage.get('','车牌号/拖车号') }}
-      </span>
-      <span class="lw-global-value-bold">
-        {{ (item.carrierPlateNum || '-') + ' / ' + (item.carrierCarriageNum || '-') }}
-      </span>
-    </div>
+    </template>
 
   </div>
 </template>