n20-common-lib 2.6.9 → 2.6.10-beta

package/src/components/TablePro/filterContent_tree.vue

@@ -0,0 +1,172 @@
+<template>
+  <div class="my-filter-content">
+    <div class="my-fc-search">
+      <div class="my-fc-search-top">
+        <el-input v-model="filterText" placeholder="输入关键字进行过滤" />
+      </div>
+      <div class="my-fc-search-content">
+        <template v-if="data.length">
+          <el-tree
+            ref="tree"
+            class="filter-tree"
+            :data="data"
+            :props="defaultProps"
+            :show-checkbox="filterMultiple"
+            default-expand-all
+            :default-checked-keys="defaultCheckedKeys"
+            :filter-node-method="filterNode"
+            node-key="value"
+          />
+        </template>
+        <template v-else>
+          <div class="my-fc-search-empty">无匹配项</div>
+        </template>
+      </div>
+    </div>
+    <div class="flex-box flex-c m-t-s" style="width: 100%">
+      <el-button type="primary" size="mini" @click="confirmFilterEvent">确认</el-button>
+      <el-button plan size="mini" @click="resetFilterEvent">重置</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FilterContent',
+  props: {
+    params: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      demo1: {
+        isAll: false,
+        option: null,
+        colValList: [],
+        valList: []
+      },
+      filterText: '',
+      defaultProps: {
+        children: 'children',
+        label: 'label'
+      },
+      data: [],
+      filterMultiple: false,
+      defaultCheckedKeys: []
+    }
+  },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  mounted() {
+    this.load()
+  },
+  methods: {
+    // 顶部筛选
+    filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+    load() {
+      const params = this.params
+      const { column } = params
+      if (column.filterMultiple) {
+        this.filterMultiple = column.filterMultiple
+      }
+      if (column.filters) {
+        // 多选
+        if (column.filterMultiple) {
+          this.data = [
+            {
+              value: 0,
+              label: '全部',
+              children: column.filters
+            }
+          ]
+          //单选
+        } else {
+          this.data = column.filters
+        }
+      }
+    },
+
+    confirmFilterEvent() {
+      const { $panel, column } = this.params
+      const vals = this.$refs.tree.getCheckedKeys() || this.$refs.tree.getCurrentKey()
+      this.defaultCheckedKeys = vals
+      column.filters.map((item) => {
+        item.data = { vals: vals }
+        if (vals.includes(item.value)) {
+          item.checked = true
+          item._checked = true
+        } else {
+          item.checked = false
+          item._checked = false
+        }
+        return item
+      })
+      $panel.confirmFilter()
+    },
+
+    resetFilterEvent() {
+      const params = this.params
+      if (params) {
+        const { $panel } = params
+        $panel.resetFilter()
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.my-filter-content {
+  padding: 10px;
+  user-select: none;
+}
+.my-filter-content .my-fc-search .my-fc-search-top {
+  position: relative;
+  padding: 5px 0;
+}
+.my-filter-content .my-fc-search .my-fc-search-top > input {
+  border: 1px solid #ababab;
+  padding: 0 20px 0 2px;
+  width: 200px;
+  height: 22px;
+  line-height: 22px;
+}
+.my-filter-content .my-fc-search .my-fc-search-content {
+  padding: 2px 10px;
+}
+.my-filter-content .my-fc-search-empty {
+  text-align: center;
+  padding: 20px 0;
+}
+.my-filter-content .my-fc-search-list {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+.my-filter-content .my-fc-search-list-body {
+  overflow: auto;
+  height: 120px;
+}
+.my-filter-content .my-fc-search-list .my-fc-search-item {
+  padding: 2px 0;
+  display: block;
+}
+.my-filter-content .my-fc-footer {
+  text-align: right;
+  padding-top: 10px;
+}
+.my-filter-content .my-fc-footer button {
+  padding: 0 15px;
+  margin-left: 15px;
+}
+</style>

package/src/components/TablePro/index.js

@@ -1,8 +1,38 @@
 import vxeTable from 'vxe-table'
 import 'vxe-table/lib/style.css'
+import filterContent from './filterContent.vue'
 import numerify from 'numerify'
 import dayjs from 'dayjs'
 
+// 创建一个简单的输入框筛选
+vxeTable.renderer.add('FilterInput', {
+  // 筛选模板
+  renderFilter(h, renderOpts, params) {
+    return <filterContent params={params}></filterContent>
+  },
+  // 不显示底部按钮，使用自定义的按钮
+  showFilterFooter: false,
+  // 重置数据方法
+  filterResetMethod({ options }) {
+    options.forEach((option) => {
+      option.data = ''
+    })
+  },
+  // 重置筛选复原方法（当未点击确认时，该选项将被恢复为默认值）
+  filterRecoverMethod({ option }) {
+    option.data = ''
+  },
+  // 筛选方法
+  filterMethod({ option, row, column }) {
+    const { data } = option
+    const cellValue = row[column.property]
+    if (cellValue) {
+      return cellValue.indexOf(data) > -1
+    }
+    return false
+  }
+})
+
 // 自定义全局的格式化处理函数
 vxeTable.formats.mixin({
   // 格式化内容 为空转为--

package/src/components/TablePro/index.vue

@@ -66,7 +66,7 @@
             :key="'vxe-table-' + i"
             :formatter="subItem.formatter ? subItem.formatter : 'formatName'"
             :filters="subItem.filters"
-            :filter-render="subItem.filterRender"
+            :filter-render="{ name: 'FilterInput', ...subItem.filterRender }"
             :title="subItem.label"
             :field="subItem.prop"
             v-bind="subItem"
@@ -79,7 +79,7 @@
           :class-name="`${item.wrap && `vxe-table-custom-wrap`} ${item.bold && `font-w600`}`"
           :formatter="item.formatter ? item.formatter : 'formatName'"
           :filters="item.filters"
-          :filter-render="item.filterRender"
+          :filter-render="{ name: 'FilterInput', ...item.filterRender }"
           :title="item.label"
           :field="item.prop"
           v-bind="item"
@@ -234,6 +234,7 @@ export default {
       this.$emit('sort-change-method', orders)
     },
     filterChange(data) {
+      console.log(data)
       const { filterList } = data
       // 输出全部条件
       const obj = {}

package/src/components/Tree/index.vue

@@ -29,7 +29,11 @@
           class="cl-tree-item-label text-ellipsis"
         >
           {{ (data[props.value] ? '(' + data[props.value] + ') ' : '') + data[props.label] }}
-          {{ data && data.children && data.children.length > 0 ? '(' + data.children.length + ')' : '' }}
+          {{
+            data && data[props.children] && data[props.children].length > 0
+              ? '(' + data[props.children].length + ')'
+              : ''
+          }}
         </div>
       </div>
       <el-button
@@ -55,6 +59,7 @@
         @click="handleChecked(node, data)"
         >{{ $lc('只勾选本层级') }}</el-button
       >
+      <slot v-else name="right" :node="node" :data="data"></slot>
     </div>
   </el-tree>
 </template>

package/src/components/Upload/index.vue

@@ -42,6 +42,7 @@
       :percent="percent"
       :width="width"
       title="文件导入"
+      :showErrorExport="showErrorExport"
       :pagination="pagination"
       :footer-btn="footer"
       :validate-result="validateResult"
@@ -169,6 +170,10 @@ export default {
     footer: {
       type: Object,
       default: undefined
+    },
+    showErrorExport: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

package/src/components/Upload/uploadMsg.vue

@@ -49,7 +49,7 @@
           <div class="bd-a">
             <div class="flex-box flex-lr flex-v m-t m-b p-l p-r">
               <span>{{ '无效数据详情' | $lc }}</span>
-              <el-button type="text" @click="importError">{{ '导出错误数据' | $lc }}</el-button>
+              <el-button type="text" v-if="showErrorExport" @click="importError">{{ '导出错误数据' | $lc }}</el-button>
             </div>
             <el-table ref="tables" :key="index" :data="errorListC" border style="width: 100%" height="300px">
               <el-table-column
@@ -161,6 +161,10 @@ export default {
     hidePercent: {
       type: Boolean,
       default: false
+    },
+    showErrorExport: {
+      type: Boolean,
+      default: false
     }
   },
   filters: {
@@ -182,7 +186,7 @@ export default {
     errorList: {
       handler() {
         this.errorListC = this.errorList
-        this.page.total = Math.ceil(this.tableData.length / this.page.pageSize)
+        this.page.total = this.tableData.length
       }
     },
     page: {
@@ -222,8 +226,7 @@ export default {
           this.tableData = cloneDeep(_errorList)
           const startIndex = (this.page.current - 1) * this.page.pageSize
           const endIndex = startIndex + this.page.pageSize
-          let dto = this.tableData.slice(startIndex, endIndex)
-          return dto
+          return this.pagination ? this.tableData.slice(startIndex, endIndex) : this.tableData
         } else {
           return undefined
         }
@@ -250,7 +253,6 @@ export default {
       const startIndex = (this.page.current - 1) * this.page.pageSize
       const endIndex = startIndex + this.page.pageSize
       this.errorListC = this.tableData.slice(startIndex, endIndex)
-
       this.index += 1
       this.$nextTick(() => {
         this.$refs.tables.doLayout()

package/src/components/operatingStatus/index.vue

@@ -79,12 +79,14 @@ export default {
 
 <style scoped>
 .el-carousel {
-  width: 180px;
+  min-width: 220px;
 }
-.el-carousel__item div {
+.el-carousel__item {
+  display: flex;
+  justify-content: center;
+  align-items: center;
   font-size: 14px;
   opacity: 0.75;
-  line-height: 50px;
   margin: 0;
 }
 .el-carousel__item:nth-child(n) {

package/src/index.js

@@ -65,6 +65,7 @@ import WornPagination from './components/WornPagination/index.vue'
 import AdvancedFilter from './components/AdvancedFilter/index.vue'
 import SelectTreePro from './components/SelectTree/pro.vue'
 import Tree from './components/Tree/index.vue'
+import ElectronicArchive from './components/ElectronicArchive/index.vue'
 
 // 新版日期选择框
 import BusiDatePicker from './components/DateSelect/busiDate.vue'
@@ -118,6 +119,7 @@ import list2tree from './utils/list2tree'
 import { msgPor, msgboxPor } from './utils/msgboxPor.js'
 import N from './utils/numberPor.js' // 扩展Number
 import { closeTab, linkGo, linkPush } from './utils/urlToGo'
+
 function numerify(input, formatType, roundingFunction) {
   return _numerify(input, formatType, roundingFunction)
 }
@@ -202,6 +204,7 @@ const components = [
   Tree,
   SelectTreePro,
   AdvancedFilter,
+  ElectronicArchive,
   /* old */
   TableO,
   FiltersO,
@@ -213,7 +216,7 @@ const components = [
   operatingStatus
 ]
 
-const install = function (Vue, opts = { prefix: 'Cl', i18nConfig: {} }) {
+const install = function(Vue, opts = { prefix: 'Cl', i18nConfig: {} }) {
   components.forEach((component) => {
     let name = component.name
     if (!name) return console.error('必须设置组件名称:', component)
@@ -254,6 +257,7 @@ export default {
 const linkClose = closeTab
 export {
   $l,
+
   AdvancedFilter,
   Anchor,
   AnchorItem,
@@ -280,6 +284,7 @@ export {
   Dialog,
   Diff,
   DragList,
+  ElectronicArchive,
   Empty,
   EventBubble,
   Expandable,

package/src/utils/amountInWords.js

@@ -1,104 +1,21 @@
-/**
- *
- * @param {number|string} amount 需转换的金额
- */
-export function convert(money) {
-  //汉字的数字
-  var cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖')
-  //基本单位
-  var cnIntRadice = new Array('', '拾', '佰', '仟')
-  //对应整数部分扩展单位
-  var cnIntUnits = new Array('', '万', '亿', '兆')
-  //对应小数部分单位
-  var cnDecUnits = new Array('角', '分', '毫', '厘')
-  //整数金额时后面跟的字符
-  var cnInteger = '整'
-  //整型完以后的单位
-  var cnIntLast = '元'
-  //最大处理的数字
-  var maxNum = 999999999999999.9999
-  //金额整数部分
-  var integerNum
-  //金额小数部分
-  var decimalNum
-  //输出的中文金额字符串
-  var chineseStr = ''
-  var minusStr = '负'
-  var minusFlag = false
-  //分离金额后用的数组，预定义
-  var parts
-  if (money == '') {
-    return ''
-  }
-  money = parseFloat(money)
-  if (money >= maxNum) {
-    //超出最大处理数字
-    return ''
-  }
-
-  if (money == 0) {
-    chineseStr = cnNums[0] + cnIntLast
-    return chineseStr
-  }
+import Nzh from 'nzh'
 
-  //转换为字符串
-  money = money.toString()
-  if (money.indexOf('-') !== -1) {
-    minusFlag = true
-    money = Math.abs(money).toString()
-  }
-  if (money.indexOf('.') == -1) {
-    integerNum = money
-    decimalNum = ''
+export const convert = (
+  money,
+  options = {
+    ch: '零壹贰叁肆伍陆柒捌玖', // 数字字符
+    ch_u: '个拾佰仟万亿兆京', // 数位单位字符，万以下十进制，万以上万进制，个位不能省略
+    ch_f: '负', // 负字符
+    ch_d: '点', // 小数点字符
+    m_u: '元角分厘', // 金额单位
+    m_t: '', // 金额前缀
+    m_z: '整' // 金额无小数后缀
+  }
+) => {
+  if (money === undefined || money === null) {
+    return money
   } else {
-    parts = money.split('.')
-    integerNum = parts[0]
-    decimalNum = parts[1].substr(0, 4)
-  }
-
-  //获取整型部分转换
-  if (parseInt(integerNum, 10) > 0) {
-    var zeroCount = 0
-    var IntLen = integerNum.length
-    for (var i = 0; i < IntLen; i++) {
-      var n = integerNum.substr(i, 1)
-      var p = IntLen - i - 1
-      var q = p / 4
-      var m = p % 4
-      if (n == '0') {
-        zeroCount++
-      } else {
-        if (zeroCount > 0) {
-          chineseStr += cnNums[0]
-        }
-        //归零
-        zeroCount = 0
-        chineseStr += cnNums[parseInt(n)] + cnIntRadice[m]
-      }
-      if (m == 0 && zeroCount < 4) {
-        chineseStr += cnIntUnits[q]
-      }
-    }
-    chineseStr += cnIntLast
-  }
-  //小数部分
-  if (decimalNum != '') {
-    var decLen = decimalNum.length
-    for (var i = 0; i < decLen; i++) {
-      var n = decimalNum.substr(i, 1)
-      if (n != '0') {
-        chineseStr += cnNums[Number(n)] + cnDecUnits[i]
-      }
-    }
-  }
-  if (chineseStr == '') {
-    chineseStr += cnNums[0] + cnIntLast + cnInteger
-  } else if (decimalNum == '') {
-    chineseStr += cnInteger
-  }
-
-  if (minusFlag) {
-    chineseStr = minusStr + chineseStr
+    var nzh = new Nzh(options)
+    return nzh.toMoney(money)
   }
-  return chineseStr
 }