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

package/src/components/BottomBarBtnHidden/index.vue

@@ -40,11 +40,13 @@
       type="last"
       plain
       @click="btnList[1].click"
-    >{{ btnList[1].text }}</lw-button>
+    >{{ btnList[1]?.text }}
+    </lw-button>
 
     <lw-button
       @click="btnList[0].click"
-    >{{ btnList[0].text }}</lw-button>
+    >{{ btnList[0]?.text }}
+    </lw-button>
 
   </lw-bottom-bar>
 </template>

package/src/components/Button/index.vue

@@ -13,6 +13,7 @@
       `lw-button-${type}`,
       !disabled && 'lw-global-click-style',
       mini && 'lw-mini-button',
+      small && 'lw-small-button',
       round && 'lw-button-round',
       disabled && 'lw-button-disabled',
       plain && `lw-button-plain-${type}`,
@@ -44,6 +45,11 @@ export default {
       type: Boolean,
       default: false
     },
+    // 是否是小型按钮
+    small: {
+      type: Boolean,
+      default: false
+    },
     // 是否是圆角按钮
     round: {
       type: Boolean,
@@ -91,6 +97,7 @@ export default {
           this.autoBlurClass = ''
         }, 200)
       }
+      if (this.disabled) return
       this.$emit('click', ev)
     }
   }
@@ -122,6 +129,12 @@ export default {
   opacity: 0.1;
 }
 
+// 小型按钮
+.lw-small-button {
+  min-height: 24px;
+  font-size: 12px;
+}
+
 // mini按钮
 .lw-mini-button {
   min-height: 20px;

package/src/components/CalendarPopup/index.js

@@ -0,0 +1,11 @@
+/*
+* 日历
+* @author: 张文
+* @date  2023-11-10
+* */
+
+import lwCalendarPopup from "./index.vue";
+
+lwCalendarPopup.install = Vue => Vue.component(lwCalendarPopup.name, lwCalendarPopup)
+
+export default lwCalendarPopup

package/src/components/CalendarPopup/index.vue

@@ -0,0 +1,239 @@
+<!--
+  日历
+  @author: 张文
+  @date: 2023-11-10
+-->
+<template>
+  <lw-popup
+    :title="title || $lwLanguage.get('', '日历')"
+    v-model="show"
+    :show-keyboard-placeholder="false"
+    height="570px"
+  >
+
+    <div
+      v-if="type==='range' && celerityMenu.length"
+      style="flex-wrap: wrap"
+      class="lw-global-row-start lw-global-flex-start"
+    >
+
+      <template v-for="i in celerityMenu">
+        <lw-button
+          v-if="celerityDateObj[i]"
+          style="margin: 3px 5px"
+          :key="celerityDateObj[i].value"
+          small
+          type="last"
+          @click="celerityClick(celerityDateObj[i].value)"
+        >
+          {{ celerityDateObj[i].label }}
+        </lw-button>
+      </template>
+
+    </div>
+
+    <van-calendar
+      ref="calender"
+      class="calendar-box"
+      :type="type"
+      :min-date="minDate"
+      :max-date="maxDate"
+      :default-date="defaultDate"
+      :max-range="maxRange"
+      :range-prompt="rangePrompt"
+      :allow-same-day="allowSameDay"
+      :show-title="false"
+      :poppable="false"
+      :show-confirm="false"
+      :row-height="54"
+    />
+
+    <template #button>
+      <lw-button @click="confirm">
+        {{ $lwLanguage.get('', '确认') }}
+      </lw-button>
+    </template>
+  </lw-popup>
+</template>
+
+<script>
+
+
+export default {
+  name: "lwCalendarPopup",
+  props: {
+    // 是否显示弹框
+    value: {
+      type: Boolean,
+      default: false
+    },
+    // 标题
+    title: [String, Number],
+
+    // 日历类型 single-单个日期，multiple-多个日期，range-区间
+    type: {
+      type: String,
+      default: 'single'
+    },
+    // 最小日期
+    minDate: {
+      type: Date,
+      default: () => {
+        const nowYear = new Date().getFullYear() - 1
+        return new Date(`${nowYear}-01-01`)
+      }
+    },
+    // 最大日期，默认为当前日期
+    maxDate: {
+      type: Date,
+      default: () => new Date()
+    },
+    // 默认选中的日期
+    defaultDate: null,
+
+    // 当 type=range、multiple 时有效，允许选择的最大天数
+    maxRange: [Number, String],
+    // 当 type=range、multiple 时有效，超过最大天数的提示文字
+    rangePrompt: [String],
+    // 当 type=range 时有效，起止日是否允许为同一天
+    allowSameDay: {
+      type: Boolean,
+      default: true
+    },
+    // 当 type=range 时有效，快捷菜单可点击项
+    celerityMenu: {
+      type: Array,
+      default: () => ['today', 'yesterday', 'week', 'twoWeek', 'month', 'semester', 'year',]
+    }
+  },
+  computed: {
+    show: {
+      get() {
+        return this.value
+      },
+      set(v) {
+        this.$emit('input', v)
+      }
+    }
+  },
+  data() {
+    return {
+      // 快捷选择日期
+      celerityDateObj: {
+        today: {
+          label: this.$lwLanguage.get('', '当天'),
+          value: 0
+        },
+        yesterday: {
+          label: this.$lwLanguage.get('', '最近2天'),
+          value: 1
+        },
+        week: {
+          label: this.$lwLanguage.get('', '最近1周'),
+          value: 6
+        },
+        twoWeek: {
+          label: this.$lwLanguage.get('', '最近2周'),
+          value: 13
+        },
+        month: {
+          label: this.$lwLanguage.get('', '最近1月'),
+          value: 29
+        },
+        semester: {
+          label: this.$lwLanguage.get('', '最近半年'),
+          value: 182
+        },
+        year: {
+          label: this.$lwLanguage.get('', '最近1年'),
+          value: 364
+        },
+      },
+      // 当前的时间戳时间
+      todayTime: '',
+      defaultDateArr: []
+    }
+  },
+  mounted() {
+    this.todayTime = this.$lwTimezone.getTimezoneDate()
+    this.defaultDataFormat()
+  },
+  methods: {
+    // 处理默认时间
+    defaultDataFormat() {
+      if (this.defaultDate) {
+        this.defaultDateArr = this.defaultDate
+        return
+      }
+
+      if (this.type === 'range') {
+        this.celerityClick(0)
+      }
+    },
+
+    // 快捷菜单项点击
+    celerityClick(val) {
+      const time = Number(val) * 24 * 60 * 60 * 1000
+      this.$refs.calender.reset([
+        new Date(this.$lwDate.format(new Date(this.todayTime - time))),
+        new Date()
+      ])
+    },
+
+    // 日期确认
+    confirm() {
+      let currentDate = this.$refs.calender.currentDate
+      if (this.type === 'single') {
+        currentDate = [currentDate]
+      } else if (this.type === 'multiple') {
+        if (!currentDate.length) {
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('', '请至少选择一个日期')
+          )
+          return
+        }
+      } else if (!currentDate[1]) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '请选择结束日期')
+        )
+        return
+      }
+      this.confirmFn(currentDate)
+
+    },
+
+    confirmFn(data) {
+      this.$emit('confirm', data)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import './../../assets/css/var.less';
+
+.calendar-box {
+  height: calc(100% - 10px);
+
+  /deep/ .van-calendar__days {
+
+    .van-calendar__month-mark {
+      word-break: normal;
+    }
+
+    .van-calendar__day--end, .van-calendar__day--start, .van-calendar__day--start-end, .van-calendar__day--multiple-middle, .van-calendar__day--multiple-selected {
+      background-color: @baseColor;
+    }
+
+    .van-calendar__day--middle {
+      color: @baseColor;
+    }
+  }
+
+  /deep/ .van-calendar__header {
+    box-shadow: none;
+    border-bottom: solid 1px #f0f0f0;
+  }
+
+}
+</style>

package/src/components/CarPlate/index.vue

@@ -343,7 +343,7 @@ export default {
       } else {
         this.carType = 'handInput'
       }
-      
+
       if (this.carType === 'handInput') {
         this.handInput.value = this.num
       } else {
@@ -448,7 +448,7 @@ export default {
 
 .lw-car-plate {
   text-align: center;
-  padding: 3px 5px;
+  padding: 2px 5px;
 }
 
 .lw-car-plate-old {

package/src/components/Cell/index.vue

@@ -28,7 +28,7 @@
           textAlign:titleAlign,
           width:typeof titleWidth === 'number' ? titleWidth + 'px' : titleWidth,
           flexShrink:titleWidth !== 'auto' ? 0 :'',
-          flex: titleWidth !== 'auto' ? 'initial' : 1
+          maxWidth: titleWidth !== 'auto' ? '' : '50%'
         }"
       >
         <slot name="title">{{ title }}</slot>
@@ -94,7 +94,7 @@ export default {
     },
 
     // 标题
-    title: String,
+    title: [String, Number],
     // 标题对齐方式
     titleAlign: {
       type: String,
@@ -224,13 +224,13 @@ export default {
   border-bottom: solid 1px @borderColor;
   position: relative;
   font-size: 14px;
-  padding: 5px 0;
+  padding: 2px 0;
+  min-height: 28px;
 }
 
 .lw-cell-boss {
   flex: 1;
   width: calc(100% - 28px);
-  padding: 5px 0;
 }
 
 .lw-cell-title-box {

package/src/components/CellPopupDate/index.vue

@@ -63,7 +63,7 @@ export default {
       type: Boolean,
       default: false
     },
-    // 绑定的值
+    // 绑定的值，如需回显应当传入标准时间
     value: {
       type: String,
       default: ''
@@ -117,6 +117,9 @@ export default {
       }
     },
 
+    // 初始化时是否默认设置当前时间
+    initDefaultTime: Boolean
+
   },
   computed: {
     val: {
@@ -167,6 +170,10 @@ export default {
     } else {
       this.formatType = this.type
     }
+
+    if (this.initDefaultTime) {
+      this.val = this.$lwTimezone.getUTC()
+    }
   },
   methods: {
     // 行点击

package/src/components/CellPopupRadio/index.vue

@@ -14,7 +14,7 @@
       :is-link="!disabled"
       :required="required"
       :name="name"
-      :is-edit="!disabled"
+      :is-edit="(!disabled && isEdit)"
       :border="border"
       @click="showPopup = true"
       @clear="$emit('clear')"
@@ -49,21 +49,25 @@ export default {
       type: Boolean,
       default: false
     },
+    // 是否是编辑模式
+    isEdit: {
+      type: Boolean,
+      default: true
+    },
     // 是否显示必填星号
-    required:{
+    required: {
       type: Boolean,
       default: false
     },
     // 表单提交时的key
-    name:String,
+    name: String,
     // 是否显示下边框
-    border:{
-      type:Boolean,
+    border: {
+      type: Boolean,
       default: true
     },
 
 
-
     // 弹框的title
     popupTitle: String,
     // 提供选择的数据

package/src/components/CellPopupSelect/index.vue

@@ -61,7 +61,11 @@
                 @click="toggle(index)"
               >
                 <template #right-icon>
-                  <van-checkbox :name="i" ref="checkboxes" />
+                  <van-checkbox
+                    :name="i"
+                    ref="checkboxes"
+                    shape="square"
+                  />
                 </template>
               </van-cell>
             </van-cell-group>

package/src/components/CellSearchSelectDel/index.vue

@@ -111,6 +111,7 @@
             v-for="i in popup.list"
             :key="i[valueKey]"
             :name="i[valueKey]"
+            shape="square"
           >
             {{ labelMsg(i) }}
           </van-checkbox>

package/src/components/CodeNameQtyRow/index.js

@@ -0,0 +1,11 @@
+/*
+* 编码、名称、数量显示行
+* @author: 张文
+* @date  2023-09-20
+* */
+
+import lwCodeNameQtyRow from './index.vue'
+
+lwCodeNameQtyRow.install = Vue => Vue.component(lwCodeNameQtyRow.name, lwCodeNameQtyRow)
+
+export default lwCodeNameQtyRow

package/src/components/CodeNameQtyRow/index.vue

@@ -0,0 +1,139 @@
+<!--
+  编码、名称、数量显示行
+  @author: 张文
+  @date: 2023-09-20
+-->
+<template>
+  <div
+    class="lw-global-flex-start"
+    @click="getRowId"
+  >
+    <div style="flex: 1">
+      <div
+        :class="[codeBold ? 'lw-global-value-bold' : 'lw-global-value']"
+      >
+        {{ $lwCheckVal(rowData.codeLabel || rowData.code) }}
+      </div>
+      <div
+        v-if="showName"
+        class="lw-global-title"
+      >
+        {{ $lwCheckVal(rowData.nameLabel || rowData.name) }}
+      </div>
+    </div>
+
+    <div
+      v-if="showQty"
+      class="lw-global-value-bold-red qty"
+    >
+      {{ $lwCheckVal(rowData.qtyLabel || rowData.qty) }}
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwCodeNameQtyRow",
+  props: {
+    // 显示的code
+    code: null,
+    // code 是否加粗
+    codeBold: {
+      type: Boolean,
+      default: true
+    },
+    // 显示的名称
+    name: null,
+    // 是否显示名称
+    showName: Boolean,
+    // 数量
+    qty: null,
+    // 行类型
+    rowType: String,
+    // 行id
+    rowId: String,
+    // 是否显示数量
+    showQty: {
+      type: Boolean,
+      default: true
+    }
+  },
+  computed: {
+    rowData() {
+      return this.$lwProjectCustomRender.getRenderData(
+        'snLabelRender',
+        {
+          code: this.code,
+          name: this.name,
+          qty: this.qty,
+          type: this.rowType,
+          id: this.rowId
+        }
+      ).data
+    }
+  },
+  data() {
+    return {
+      // 点击需要的数据
+      clickData: {
+        num: 0,
+        timeout: null
+      },
+    }
+  },
+  methods: {
+    // 获取数量显示的id
+    getRowId() {
+
+      this.clickData.timeout && clearTimeout(this.clickData.timeout)
+
+      this.clickData.num++
+
+      // 显示当前行id和行类型
+      if (this.clickData.num >= 10) {
+
+        this.$lwDialog.confirm({
+          type: this.rowId ? 'success' : 'warning',
+          message: this.$lwLanguage.get(
+            '',
+            '当前数据行ID为：{id}，类型为：{type}',
+            {
+              id: this.$lwCheckVal(this.rowId),
+              type: this.rowType
+            }
+          ),
+          confirmButtonText: this.$lwLanguage.get('', '复制ID'),
+          showConfirmButton: !!this.rowId
+        }).then(() => {
+          navigator.clipboard.writeText(this.rowId).then(() => {
+            this.$lwToast.success(
+              this.$lwLanguage.get('', '已复制')
+            )
+          }).catch(() => {
+            this.$lwToast.fail(
+              this.$lwLanguage.get('', '复制失败')
+            )
+          })
+        }).catch(() => {
+        })
+
+        this.clickData.num = 0
+        return
+      }
+
+      this.clickData.timeout = setTimeout(() => {
+        this.clickData.num = 0
+      }, 500)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.qty {
+  width: 80px;
+  flex-shrink: 0;
+  text-align: center;
+}
+</style>

package/src/components/DataLookBg/index.vue

@@ -5,6 +5,7 @@
 -->
 <template>
   <div
+    v-if="show"
     :class="[
       'lw-global-flex-around',
       'lw-look-data-bg-boss',
@@ -19,9 +20,9 @@
     <lw-data-look-item
       v-for="(i,k) in showDate"
       :key="k"
-      :color="i.color"
-      :title="i.title"
-      :value="i.value"
+      :color="i[colorKey]"
+      :title="i[titleKey]"
+      :value="i[valueKey]"
     />
 
 
@@ -45,19 +46,40 @@ export default {
 
     // 需要渲染的数据
     data: {
-      type: [Array, Object],
+      type: [Array, Object, null],
       default: () => []
     },
 
+    // 颜色key
+    colorKey: {
+      type: String,
+      default: 'color'
+    },
+    // 标题key
+    titleKey: {
+      type: String,
+      default: 'title'
+    },
+    // 取值key
+    valueKey: {
+      type: String,
+      default: 'value'
+    },
+
     // 是否需要显示最后的分割线
     showEndLine: {
       type: Boolean,
       default: true
-    }
+    },
+
+    // 是否强制显示，忽略配置的不显示和内部数据为空时不显示的配置
+    needShow: Boolean
   },
   computed: {
     // 渲染的数据转换
     showDate() {
+      if (!this.data) return []
+
       if (Array.isArray(this.data)) {
         return this.data
       }
@@ -67,6 +89,22 @@ export default {
         arr.push(this.data[i])
       }
       return arr
+    },
+
+    // 是否显示。双向控制，既要读取后台配置信息，也要判断是否有数据
+    show() {
+      if (this.needShow) return true
+
+      const config = this.$lwWarehouseConfig.get('systemConfig.WMS_PDA_DISPLAY_TOTAL_PROGRESS_EXCLUDE_BIZ_TYPE')
+
+      let needShow = !!this.$slots.default || !!this.showDate.length
+
+      // 如果有数据就判断配置项，没有就直接不显示
+      if (!!config && needShow) {
+        needShow = !config.split(',').includes(this.$route.path)
+      }
+
+      return needShow
     }
   },
   data() {