n20-common-lib 2.4.60 → 2.4.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.4.60",
+  "version": "2.4.62",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/DatePicker/por.vue

@@ -18,6 +18,28 @@
 
 <script>
 import { $lc } from '../../utils/i18n/index'
+import dayjs from 'dayjs'
+let startDate = ''
+
+const onPick = ({ maxDate, minDate }) => {
+  startDate = minDate.getMonth() + 1 + '-' + minDate.getDate()
+  let startSh = shortcuts_2.find((s) => s.text.includes($lc('开始')))
+  startSh.text = startDate + $lc('开始')
+  startSh.onClick = (picker) => {
+    const start = dayjs(minDate).format('YYYY-MM-DD HH:mm:ss')
+    const end = dayjs(minDate).add(100, 'year').format('YYYY-MM-DD HH:mm:ss')
+    picker.$emit('pick', [start, end])
+  }
+
+  let endSh = shortcuts_2.find((s) => s.text.includes($lc('截止')))
+  endSh.text = startDate + $lc('截止')
+  endSh.onClick = (picker) => {
+    const end = dayjs(minDate).format('YYYY-MM-DD HH:mm:ss')
+    const start = dayjs(minDate).subtract(100, 'year').format('YYYY-MM-DD HH:mm:ss')
+    picker.$emit('pick', [start, end])
+  }
+}
+
 let disabledDate_1 = (t) => {
   let now = new Date()
   now.setHours(0, 0, -1)
@@ -28,44 +50,7 @@ let disabledDate_2 = (t) => {
   now.setHours(23, 59, 59)
   return t > now
 }
-let shortcuts_1 = [
-  {
-    text: $lc('最近一月'),
-    onClick(picker) {
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      start.setHours(0, 0, 0)
-      picker.$emit('pick', start)
-    }
-  },
-  {
-    text: $lc('最近三月'),
-    onClick(picker) {
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      start.setHours(0, 0, 0)
-      picker.$emit('pick', start)
-    }
-  },
-  {
-    text: $lc('最近六月'),
-    onClick(picker) {
-      const start = new Date()
-      start.setMonth(start.getMonth() - 6)
-      start.setHours(0, 0, 0)
-      picker.$emit('pick', start)
-    }
-  },
-  {
-    text: $lc('最近一年'),
-    onClick(picker) {
-      const start = new Date()
-      start.setFullYear(start.getFullYear() - 1)
-      start.setHours(0, 0, 0)
-      picker.$emit('pick', start)
-    }
-  }
-]
+
 let shortcuts_2 = [
   {
     text: $lc('最近一月'),
@@ -110,6 +95,22 @@ let shortcuts_2 = [
       end.setHours(23, 59, 59)
       picker.$emit('pick', [start, end])
     }
+  },
+  {
+    text: $lc('今天开始'),
+    onClick(picker) {
+      const start = dayjs().format('YYYY-MM-DD HH:mm:ss')
+      const end = dayjs().add(99, 'year').format('YYYY-MM-DD HH:mm:ss')
+      picker.$emit('pick', [start, end])
+    }
+  },
+  {
+    text: $lc('今天截止'),
+    onClick(picker) {
+      const end = dayjs().format('YYYY-MM-DD HH:mm:ss')
+      const start = dayjs().subtract(100, 'year').format('YYYY-MM-DD HH:mm:ss')
+      picker.$emit('pick', [start, end])
+    }
   }
 ]
 
@@ -118,7 +119,10 @@ export default {
   props: {
     type: {
       type: String,
-      default: 'date'
+      default: 'daterange',
+      validator: (value) => {
+        return ['daterange', 'datetimerange', 'monthrange'].includes(value)
+      }
     },
     value: {
       type: [String, Number, Date],
@@ -159,18 +163,18 @@ export default {
   },
   data() {
     let shortcuts = undefined
-    if (this.shortcuts && ['date', 'datetime'].includes(this.type)) shortcuts = shortcuts_1
     if (this.shortcuts && ['daterange', 'datetimerange'].includes(this.type)) shortcuts = shortcuts_2
 
     this.pickerOptionsAs = Object.assign(
       {
         disabledDate: this.minNow ? disabledDate_1 : this.maxNow ? disabledDate_2 : undefined,
-        shortcuts
+        shortcuts,
+        onPick
       },
       this.pickerOptions
     )
 
-    this.listeners = Object.assign({}, this.$listeners, { input: () => {}, change: () => {} })
+    this.listeners = Object.assign({}, this.$listeners, { input: () => {}, change: () => {}, blur: this.HandleBlur })
     return {}
   },
   computed: {
@@ -198,11 +202,12 @@ export default {
               let D = end.getDate()
               let str = `${Y}-${M > 9 ? M : '0' + M}-${D > 9 ? D : '0' + D}`
               if (this.valueFormat === 'yyyy-MM-dd HH:mm:ss') str = str + ' 23:59:59'
-
+              startDate = val[0]
               this.$emit('update:start-date', val[0])
               this.$emit('update:end-date', str)
               this.$emit('change', [val[0], str])
             } else {
+              startDate = val[0]
               this.$emit('update:start-date', val[0])
               this.$emit('update:end-date', val[1])
               this.$emit('change', val)
@@ -218,6 +223,24 @@ export default {
         }
       }
     }
+  },
+  methods: {
+    HandleBlur() {
+      let startSh = shortcuts_2.find((s) => s.text.includes($lc('开始')))
+      let endSh = shortcuts_2.find((s) => s.text.includes($lc('截止')))
+      startSh.text = $lc('今天开始')
+      startSh.onClick = (picker) => {
+        const start = dayjs().format('YYYY-MM-DD HH:mm:ss')
+        const end = dayjs().add(100, 'year').format('YYYY-MM-DD HH:mm:ss')
+        picker.$emit('pick', [start, end])
+      }
+      endSh.text = $lc('今天截止')
+      endSh.onClick = (picker) => {
+        const end = dayjs().format('YYYY-MM-DD HH:mm:ss')
+        const start = dayjs().subtract(100, 'year').format('YYYY-MM-DD HH:mm:ss')
+        picker.$emit('pick', [start, end])
+      }
+    }
   }
 }
 </script>

package/src/components/TablePro/index.vue

@@ -66,7 +66,7 @@
         />
       </template>
     </vxe-table>
-    <tableSetSize v-if="showSetsize" :size="sizeC" @update:size="sizeUp" @resize="sizeSet" />
+    <tableSetSize v-if="showSetsize" :size="sizeC" v-bind="$attrs" @update:size="sizeUp" @resize="sizeSet" />
   </div>
 </template>
 

package/src/components/operatingStatus/index.vue

@@ -2,20 +2,22 @@
   <el-carousel height="50px" :interval="3000" direction="vertical" indicator-position="none" :autoplay="true">
     <el-carousel-item v-for="tip in tips" :key="tip.id">
       <div v-if="tip.isShow === '1'" v-title:br="list" :class="`tip_color_${tip.style || 'default'}`">
-        {{ tip.busCode | busType }}
+        {{ tip.busNname }}{{ enumData[tip.busState]
+        }}{{ tip.busNname === $lc('财司系统') ? '(' + tip.currency + ')' : ''
+        }}{{ tip.isError === '1' ? '(有异常)' : '' }}
       </div>
     </el-carousel-item>
   </el-carousel>
 </template>
 
 <script>
+import { $lc } from '../../utils/i18n/index'
 import axios from '../../utils/axios'
 import getJsonc from '../../assets/getJsonc.js'
 import cloneDeep from 'lodash/cloneDeep'
-let filterData
 let enumData = {
-  D001: '营业中',
-  D002: '日终处理',
+  D001: '营业阶段',
+  D002: '日终阶段',
   D003: '业务截止',
   D004: '营业结束',
   D005: '暂停营业',
@@ -24,29 +26,6 @@ let enumData = {
 }
 export default {
   name: 'OperatingStatus',
-  filters: {
-    busType(code) {
-      let value = ''
-      let item
-      switch (code) {
-        case 'D001':
-          item = filterData.find((c) => c.busCode === 'D001')
-          value = `${item.busNname}${enumData[item.busState]}${item.isError === '1' ? '(有异常)' : ''}`
-          break
-        case 'D002':
-          item = filterData.find((c) => c.busCode === 'D002')
-          value = `${item.busNname}${enumData[item.busState]}${item.isError === '1' ? '(有异常)' : ''}`
-          break
-        case 'ce001':
-          item = filterData.find((c) => c.busCode === 'ce001')
-          value = `${item.busNname}${enumData[item.busState]}${item.isError === '1' ? '(有异常)' : ''}`
-          break
-        default:
-          break
-      }
-      return value
-    }
-  },
   data() {
     return {
       enumData,
@@ -81,13 +60,15 @@ export default {
      * 获取营业状态
      */
     async getOperatingStatus() {
-      const { data } = await axios.get(`/bems/portal/portalTopShow/getShowTopAll`, null, { loading: false })
+      const { data } = await axios.get(`/bems/portal/portalTopShow/getShowTopAll`, null, {
+        loading: false,
+        onMsg: true
+      })
       this.tips = data
-      filterData = data
       this.list = cloneDeep(data)
         .map((tip) => {
-          return `${tip.createTime}${tip.busNname}${enumData[tip.busState]}${
-            tip.busCode !== 'D001' ? tip.currency || '' : ''
+          return `${tip.updateTime || tip.createtime}${tip.busNname}${enumData[tip.busState]}${
+            tip.busNname === $lc('财司系统') ? '(' + tip.currency + ')' : ''
           }`
         })
         .join(',')
@@ -98,7 +79,7 @@ export default {
 
 <style scoped>
 .el-carousel {
-  width: 120px;
+  width: 180px;
 }
 .el-carousel__item div {
   font-size: 14px;