@logwire/logwire-wms-pda-ui 3.3.4 → 3.5.0

package/src/views/wms/page/outbound/delivery/addOrder/index.vue

@@ -7,20 +7,15 @@
   <div>
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.addOrder.swptymyk','新建发运单')"/>
 
-    <div class="lw-global-page-box">
+    <lw-page-body-module>
 
-      <div
+      <div class="lw-global-model-box lw-global-model-box-3px">
 
-        style="padding-top: 5px"
-        class="lw-global-model-box"
-      >
-
-        <lw-cell-popup-radio
+        <lw-search-select-popup-module
           :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.addOrder.xbcucawc','货主')"
           v-model="form.ownerId"
-          :columns="select.owner"
-          value-key="ownerId"
-          label-key="ownerName"
+          :api="$lwApi.common.searchOwner"
+          input-align="right"
         />
 
         <lw-cell-popup-date
@@ -28,12 +23,14 @@
           v-model="form.planDeliveryTime"
           type="datetime"
           required
+          init-default-time
         />
 
         <lw-input
           :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.addOrder.pmujrozl','外部发运单号')"
           v-model="form.extDeliveryNo"
           rule-key="extDeliveryNo"
+          :create-rule="$lwScanRule.create('装车发运-新建发运单-外部单号','SO')"
           input-align="right"
         />
 
@@ -41,6 +38,7 @@
           :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.addOrder.nwpvyjqc','承运商发运单号')"
           v-model="form.carrierDeliveryNo"
           rule-key="carrierDeliveryNo"
+          :create-rule="$lwScanRule.create('装车发运-新建发运单-承运商发运单号','SO')"
           input-align="right"
         />
 
@@ -48,6 +46,7 @@
           :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.addOrder.rtptcfxy','运输计划单号')"
           v-model="form.transportPlanNo"
           rule-key="transportPlanNo"
+          :create-rule="$lwScanRule.create('装车发运-新建发运单-运输计划单号','SO')"
           input-align="right"
         />
 
@@ -63,12 +62,11 @@
           input-align="right"
         />
 
-        <lw-cell-popup-radio
+        <lw-search-select-popup-module
           :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.addOrder.onfvoihn','承运商编码')"
           v-model="form.carrierCode"
-          :columns="select.carrierCode"
-          value-key="carrierCode"
-          label-key="carrierCode"
+          :api="$lwApi.common.searchCarrier"
+          input-align="right"
           @confirm="carrierConfirm"
           @clear="carrierClear"
         />
@@ -127,6 +125,7 @@
           v-model="form.soNo"
           input-align="right"
           rule-key="soNo"
+          :create-rule="$lwScanRule.create('装车发运-新建发运单-出库订单号','SO')"
         />
 
         <lw-input
@@ -134,6 +133,7 @@
           v-model="form.extSoNo"
           input-align="right"
           rule-key="extSoNo"
+          :create-rule="$lwScanRule.create('装车发运-新建发运单-外部订单号','SO')"
         />
 
         <lw-input
@@ -141,11 +141,13 @@
           v-model="form.extOrderNo"
           input-align="right"
           rule-key="extOrderNo"
+          :create-rule="$lwScanRule.create('装车发运-新建发运单-客户订单号','SO')"
+          :show-bottom-border="false"
         />
 
       </div>
 
-    </div>
+    </lw-page-body-module>
 
     <lw-bottom-bar>
       <lw-button @click="submit">
@@ -160,8 +162,6 @@
 
 import {
   projectCreateDelivery,
-  projectGetWarehouseCarrier,
-  projectGetWarehouseOwner
 } from "../../../../api/outbound/delivery/addOrder";
 
 export default {
@@ -208,37 +208,14 @@ export default {
         // 客户订单号
         extOrderNo:'',
       },
-
-      select:{
-        // 货主选项
-        owner:[],
-
-        // 承运商编码选项
-        carrierCode:[]
-      }
-
     }
   },
-  mounted() {
-    this.init()
-  },
   methods: {
-    // 初始化
-    init(){
-      Promise.all([projectGetWarehouseOwner(), projectGetWarehouseCarrier()]).then(res=>{
-        this.select.owner = res[0]
-        this.select.carrierCode = res[1]
-      }).catch(()=>{
-        console.warn(this.$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.addOrder.yyurugsf', '创建发运单基础数据加载失败'))
-        history.go(-1)
-      })
-    },
-
     // 承运商编码确认
-    carrierConfirm(item){
-      this.form.carrierName = item.carrierName
-      this.form.carrierContact = item.carrierContact
-      this.form.carrierPhone = item.carrierPhone
+    carrierConfirm(item) {
+      this.form.carrierName = item.name
+      this.form.carrierContact = item.contact
+      this.form.carrierPhone = item.phone
     },
     // 承运商编码清除
     carrierClear(){

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

@@ -82,9 +82,11 @@
       </div>
 
       <!-- 装箱数据 -->
-      <div class="lw-global-row">
+      <div class="lw-global-row-end">
       <span class="lw-global-title">
-        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.boxItem.ntxqnhxs', '装箱数据') }}
+        {{
+          $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.boxItem.ntxqnhxs', '装箱数据')
+        }}
       </span>
         <span>
         <span class="lw-global-value">

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

@@ -26,16 +26,19 @@
         <span
           style="font-size: 16px"
           class="lw-global-value-bold-red"
-        >{{ item.soCount || 0 }}</span>
-        <span class="lw-global-value">
-          {{$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContent.fotbfpec', ' 单 / ')}}
+        >
+          {{ item.soCountLabel }}
         </span>
+
+        <span
+          style="font-size: 16px;color: #000"
+          class="lw-global-value-bold-red"
+        > / </span>
         <span
           style="font-size: 16px"
           class="lw-global-value-bold-red"
-        >{{ item.boxCount ||0 }}</span>
-        <span class="lw-global-value">
-          {{$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContent.ixnlbxbj', ' 箱')}}
+        >
+          {{ item.boxCountLabel }}
         </span>
       </div>
 

package/src/views/wms/page/outbound/delivery/components/orderContentTitle/index.vue

@@ -13,23 +13,32 @@
     <!-- 自定义显示 -->
     <div
       class="lw-global-click-style"
+      style="padding-top: 5px"
       v-if="orderContent.labelValueList && orderContent.labelValueList.length"
       @click="showOrderListClick"
     >
-      <div class="lw-global-flex-between">
-        <lw-title-value-cell
-          :title="orderContent.labelValueList[0].label"
-          :value="orderContent.labelValueList[0].value"
-        />
+
+      <div
+        class="lw-global-flex-between lw-global-row-start"
+        style="margin-bottom: 6px"
+      >
+        <!-- 运单号 -->
+        <div
+          style="font-size: 16px"
+          class="lw-global-value-bold"
+        >
+          {{ orderContent.deliveryNo }}
+        </div>
         <lw-tag
           style="flex-shrink: 0"
           round
           plain
           :type="tagType"
-        >{{ orderContent.billStatusLabel }}</lw-tag>
+        >{{ orderContent.billStatusLabel }}
+        </lw-tag>
       </div>
       <lw-lot-look-module
-        :columns="orderContent.labelValueList.slice(1)"
+        :columns="orderContent.labelValueList"
         title-key="label"
         value-key="value"
         :hidden-last-border="false"
@@ -265,7 +274,6 @@
     </van-collapse>
 
 
-
     <!-- 修改车辆信息弹框 -->
     <lw-popup
       :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContentTitle.rzwkajud','修改车辆信息')"
@@ -311,8 +319,8 @@
       :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContentTitle.index.glpxkmuo','出库单列表')"
       v-model="orderPopup.show"
       background="#f0f0f0"
+      :show-keyboard-placeholder="false"
     >
-
       <div class="lw-global-model-box">
         <lw-title-value-cell
           :title="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.orderContentTitle.index.qkldkqys','订单数')"
@@ -462,8 +470,19 @@ export default {
     }
   },
   methods: {
+    // 获取第一项值
+    getValue(item) {
+      if (item.valueType === 'datetime') {
+        return this.$lwTimezone.UTCToTimezone({
+          date: item.value,
+          format: item.formatMethod || 'yyyy-MM-dd hh:mm:ss'
+        })
+      }
+      return item.value
+    },
+
     // 修改信息被点击
-    changInfo(){
+    changInfo() {
       this.changeCarPopup.data.carrierPlateNum = this.orderContent.carrierPlateNum || ''
       this.changeCarPopup.data.carrierCarriageNum = this.orderContent.carrierCarriageNum || ''
       this.changeCarPopup.data.carrierDriver = this.orderContent.carrierDriver || ''

package/src/views/wms/page/outbound/delivery/components/soAndLpnItem/index.vue

@@ -16,6 +16,7 @@
       animationDelay:item.lwPdaStart ? '' : 50 * index + 'ms',
       background: item.lwPdaStart ? 'rgb(244 218 219)' : ''
     }"
+    @click="$emit('click')"
   >
 
     <template v-if="item.labelValueList && item.labelValueList.length">
@@ -32,10 +33,11 @@
 
         <slot>
           <lw-button
+            v-if="showDel"
             style="flex-shrink: 0"
             round
             mini
-            @click="del"
+            @click.stop="del"
           >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.delete', '删除') }}
           </lw-button>
         </slot>
@@ -58,7 +60,7 @@
           {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.orderNo', '单号') }}
         </span>
           <span class="lw-global-value-bold">
-          {{ item.soNo }}
+          {{ $lwCheckVal(item.soNo) }}
         </span>
         </div>
 
@@ -67,16 +69,17 @@
           {{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.lpn', '托盘号') }}
         </span>
           <span class="lw-global-value-bold">
-          {{ item.palletNo }}
+          {{ $lwCheckVal(item.palletNo) }}
         </span>
         </div>
 
         <slot>
           <lw-button
+            v-if="showDel"
             style="flex-shrink: 0"
             round
             mini
-            @click="del"
+            @click.stop="del"
           >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.delete', '删除') }}
           </lw-button>
         </slot>
@@ -88,7 +91,7 @@
         {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.extOrderNo', '外部单号') }}
       </span>
         <span class="lw-global-value-bold">
-        {{ item.extSoNo || '-' }}
+        {{ $lwCheckVal(item.extSoNo) }}
       </span>
 
       </div>
@@ -99,7 +102,7 @@
         {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.customerOrderNo', '客户单号') }}
       </span>
         <span class="lw-global-value-bold">
-        {{ item.extOrderNo || '-' }}
+        {{ $lwCheckVal(item.extOrderNo) }}
       </span>
 
       </div>
@@ -110,14 +113,16 @@
         {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.customer', '客户') }}
       </span>
         <span class="lw-global-value-bold">
-        {{ (item.customerCode || '-') + ' / ' + (item.customerName || '-') }}
+        {{ $lwCheckVal(item.customerCode) + ' / ' + $lwCheckVal(item.customerName) }}
       </span>
 
       </div>
 
       <!-- 装箱数据 -->
-      <div class="lw-global-row">
-      <span class="lw-global-title">
+      <div
+        :class="[item.extDataList ? 'lw-global-row' : 'lw-global-row-end']"
+      >
+        <span class="lw-global-title">
         {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.boxData', '装箱数据') }}
       </span>
         <span>
@@ -127,23 +132,22 @@
         <span
           style="color: #D50000"
           class="lw-global-value-bold"
-        >{{ item.skuTypeCount }}</span>
+        >{{ $lwCheckVal(item.skuTypeCount) }}</span>
         <span class="lw-global-value">
            / {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.qty', '数量') }}
         </span>
         <span
           style="color: #D50000"
           class="lw-global-value-bold"
-        >{{ item.skuQty }}</span>
+        >{{ $lwCheckVal(item.skuQty) }}</span>
         <span class="lw-global-value">
            / {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.boxAmount', '箱量') }}
         </span>
         <span
           style="color: #D50000"
           class="lw-global-value-bold"
-        >{{ item.boxCount }}</span>
+        >{{ $lwCheckVal(item.boxCount) }}</span>
       </span>
-
       </div>
 
       <!-- 其他数据 -->
@@ -180,6 +184,12 @@ export default {
       default: 0
     },
 
+    // 是否显示删除按钮
+    showDel: {
+      type: Boolean,
+      default: true
+    }
+
   },
   data() {
     return {}

package/src/views/wms/page/outbound/delivery/index/index.vue

@@ -7,7 +7,16 @@
   <div>
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.outbound.delivery.ship','装车发运')"/>
 
-    <div class="lw-global-page-box">
+    <lw-page-body-module>
+
+      <lw-user-checkbox-module
+        class="lw-global-model-box"
+        style="margin-bottom: 10px"
+        :title="$lwLanguage.get('', '装货人员')"
+        v-model="staffList"
+        :is-row="false"
+        @change="mixinStaffChange"
+      />
 
       <lw-tab-box>
 
@@ -29,6 +38,7 @@
                 :get-focus.sync="seo.focus"
                 :placeholder="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.index.index.pihmxyvh','单号/车牌号/月台/货主/承运搜索')"
                 rule-key="order"
+                :create-rule="$lwScanRule.create('装车发运-起始页-单号搜索','SO')"
                 :show-bottom-border="false"
                 @confirm="seoConfirm"
               >
@@ -82,7 +92,7 @@
 
       </lw-tab-box>
 
-    </div>
+    </lw-page-body-module>
 
     <lw-bottom-bar>
       <lw-button @click="addOrder">
@@ -107,30 +117,32 @@ import {
   projectQueryDeliveryData,
   projectGetWarehouseCanDeliveryData
 } from "../../../../api/outbound/delivery";
+import {deliveryMixin} from "./../mixin";
 
 export default {
   name: "lwOutboundDeliveryIndexPage",
-  components:{
+  components: {
     orderContent
   },
+  mixins: [deliveryMixin],
   data() {
     return {
       // tab激活项
-      tabActive:'seo',
+      tabActive: 'seo',
 
       // 查找发运单
-      seo:{
+      seo: {
         showNotData: false,
-        value:'',
+        value: '',
         focus: true,
-        list:[],
+        list: [],
         pageSize: 10,
         pageTotal: 0,
         pageNum: 1
       },
 
       // 未发运
-      waitDelivery:{
+      waitDelivery: {
         list: [],
         pageSize: 10,
         pageTotal: 0,
@@ -140,20 +152,20 @@ export default {
   },
   methods: {
     // tab切换
-    tabChange(){
-      if (this.tabActive === 'wait'){
+    tabChange() {
+      if (this.tabActive === 'wait') {
         this.refreshWait()
       }
     },
 
     // 搜索运单号
-    seoConfirm(){
+    seoConfirm() {
       const deliveryNo = this.seo.value
 
-      if (!deliveryNo){
+      if (!deliveryNo) {
         this.seo.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.index.index.rzmubgvr','请输入单号/车牌号/月台/货主/承运搜索')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.index.index.rzmubgvr', '请输入单号/车牌号/月台/货主/承运搜索')
         )
         return
       }

package/src/views/wms/page/outbound/delivery/mixin.js

@@ -0,0 +1,22 @@
+/*
+* 装车发运混入
+* @author: 张文
+* @date  2023-08-24
+* */
+
+export const deliveryMixin = {
+  data() {
+    return {
+      staffList: []
+    }
+  },
+
+  mounted() {
+    this.staffList = this.$lwLocalStaff.get('lwOutboundDeliveryStaff')
+  },
+  methods: {
+    mixinStaffChange() {
+      this.$lwLocalStaff.set('lwOutboundDeliveryStaff', this.staffList)
+    }
+  }
+}

package/src/views/wms/page/outbound/handover/components/collapseItem.vue

@@ -9,7 +9,7 @@
       padding: '5px 10px',
       animationDelay: 50 * index + 'ms'
     }"
-    class="lw-global-model-box lw-global-animation-out lw-global-collapse-box"
+    class="lw-global-model-box lw-global-animation-out lw-global-collapse-box lw-global-collapse-title-btn"
   >
 
     <van-collapse

package/src/views/wms/page/outbound/handover/components/lineInfo.vue

@@ -6,7 +6,6 @@
 <template>
   <div
     :class="[
-      'lw-global-model-box',
       allClick ? 'lw-global-click-style' : ''
     ]"
     @click="allClick ? $emit('click') : ''"

package/src/views/wms/page/outbound/handover/components/pageBox.vue

@@ -13,6 +13,7 @@
       <!-- 线路信息 -->
       <line-info
         style="margin-bottom: 10px"
+        class="lw-global-model-box"
         :item="lineData"
         show-tag
         all-click

package/src/views/wms/page/outbound/handover/index/index.vue

@@ -20,6 +20,7 @@
           v-model="search"
           :show-bottom-border="false"
           rule-key="case"
+          :create-rule="$lwScanRule.create('出库交接-起始页-箱票号','CASE')"
           @confirm="searchConfirm"
           @clear="searchConfirm"
         >
@@ -63,6 +64,12 @@
           :index="k"
           @click="itemClick"
         />
+        <lw-pagination
+          v-model="pageNum"
+          :page-size.sync="pageSize"
+          :page-total="pageTotal"
+          @change="getData"
+        />
         <lw-not-data v-if="!dataList.length"/>
       </template>
       <lw-not-data v-else/>
@@ -97,8 +104,8 @@
 import collapseItem from './../components/collapseItem.vue'
 import {
   projectHandoverStartStaffTask,
-  projectWmsGetWarehouseHandoverTabKey,
-  projectWmsOutboundGetHandoverData
+  projectWmsGetWarehouseHandoverTabKeyV3,
+  projectWmsOutboundGetHandoverDataV3
 } from "../../../../api/outbound/handover";
 
 export default {
@@ -119,15 +126,27 @@ export default {
 
       // 显示数据
       dataList: [],
+      pageNum: 1,
+      pageSize: 10,
+      pageTotal: 0,
 
       // 选择交接类型弹框
-      selectMethodPopup:{
+      selectMethodPopup: {
         show: false,
-        data:{},
-        list:[
-          {title: this.$lwLanguage.get('wms_project.pda.components.page.outbound.handover.index.iaguxiqo','按码托号交接'), type:'lpn'},
-          {title: this.$lwLanguage.get('wms_project.pda.components.page.outbound.handover.index.kjrvljgo','按客户交接'), type:'customer'},
-          {title: this.$lwLanguage.get('wms_project.pda.components.page.outbound.handover.index.bbbrulkb','按线路交接'), type:'line'},
+        data: {},
+        list: [
+          {
+            title: this.$lwLanguage.get('wms_project.pda.components.page.outbound.handover.index.iaguxiqo', '按码托号交接'),
+            type: 'lpn'
+          },
+          {
+            title: this.$lwLanguage.get('wms_project.pda.components.page.outbound.handover.index.kjrvljgo', '按客户交接'),
+            type: 'customer'
+          },
+          {
+            title: this.$lwLanguage.get('wms_project.pda.components.page.outbound.handover.index.bbbrulkb', '按线路交接'),
+            type: 'line'
+          },
         ]
       }
     }
@@ -137,7 +156,9 @@ export default {
   },
   methods: {
     // 初始化
-    async init(){
+    async init() {
+      this.pageNum = 1
+      this.pageSize = 10
       await this.getTabList()
 
       //如果没有分组数据就不执行后面操作
@@ -151,7 +172,7 @@ export default {
     getTabList(){
       this.tabList = []
       return new Promise((PR,PE)=>{
-        projectWmsGetWarehouseHandoverTabKey({
+        projectWmsGetWarehouseHandoverTabKeyV3({
           queryParam: this.search
         }).then(res=>{
           this.tabList = res || []
@@ -162,28 +183,31 @@ export default {
 
     // 获取数据
     getData(){
-      this.dataList = []
-      projectWmsOutboundGetHandoverData({
+      projectWmsOutboundGetHandoverDataV3({
         queryParam: this.search,
-        tabGroupKey: this.tabActive
-      }).then(res=>{
-        this.dataList = res || []
+        tabGroupKey: this.tabActive,
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+      }).then(res => {
+        this.dataList = res.datas || []
+        this.pageTotal = res.total
       })
     },
 
     // tab发生改变
-    tabChange(){
-      this.search = ''
+    tabChange() {
+      this.pageNum = 1
+      this.pageSize = 10
       this.getData()
     },
 
     // 确认搜索
-    searchConfirm(){
+    searchConfirm() {
       this.init()
     },
 
     // 显示数据被点击
-    itemClick(item){
+    itemClick(item) {
       this.selectMethodPopup.data = item
       this.selectMethodPopup.show = true
     },

package/src/views/wms/page/outbound/handover/lpn/index.vue

@@ -41,6 +41,7 @@
               :get-focus.sync="lpn.focus"
               :show-bottom-border="false"
               rule-key="lpn"
+              :create-rule="$lwScanRule.create('出库交接-按托盘-码托号','LPN')"
               @confirm="lpnConfirm"
             />