n20-common-lib 2.6.9 → 2.6.10-beta

package/src/components/FileImport/index.vue

@@ -12,6 +12,7 @@
         v-if="!uploadHttpRequest"
         v-bind="uploadProps"
         :width="width"
+        :showErrorExport="showErrorExport"
         :validate-result="validateResult"
         :validate-confirm="validateConfirm"
         :pagination="pagination"
@@ -24,6 +25,7 @@
         :title="'导入文件' | $lc"
         :visible.sync="errorV"
         :width="width"
+        :showErrorExport="showErrorExport"
         :validate-result="validateResult"
         :hide-percent="true"
         :footer-btn="footer"
@@ -77,6 +79,10 @@ export default {
       type: Boolean,
       default: false
     },
+    showErrorExport: {
+      type: Boolean,
+      default: false
+    },
     validateDialog: {
       type: Boolean,
       default: false

package/src/components/FileUploadTable/index.vue

@@ -484,7 +484,7 @@ export default {
           }
         } else {
           // 下载
-          let blob = await this.$axios.get(`/neams/eamsbaserecord/download/${row[this.keys.url]}`, null, {
+          let blob = await axios.get(`/api/neams/eamsbaserecord/download/${row[this.keys.url]}`, null, {
             responseType: 'blob'
           })
           let name = row[this.keys.name] || blob.name

package/src/components/Filters/index.vue

@@ -13,7 +13,7 @@
       <el-button icon="n20-icon-iconfontshaixuan" plain onlyicon size="mini" @click="clickBtn" />
     </template>
     <el-form
-      v-if="showPopC"
+      v-show="showPopC"
       v-click-outside="clickOut"
       class="n20-filter p-a-s p-b-0"
       :label-width="labelWidth ? labelWidth : labelWidthAs + 'px'"

package/src/components/InputNumber/numberRange.vue

@@ -7,6 +7,7 @@
       :type="type"
       style="width: calc(50% - 8px)"
       @input="startChange"
+      @clear="$emit('clear')"
       @blur="blurFn"
     />
     <span class="numbre-range text-c" style="display: inline-block; width: 16px">-</span>
@@ -17,6 +18,7 @@
       :type="type"
       style="width: calc(50% - 8px)"
       @input="endChange"
+      @clear="$emit('clear')"
       @blur="blurFn"
     />
   </div>

package/src/components/Layout/HeaderWrap/changePwd.vue

@@ -49,9 +49,10 @@
 </template>
 
 <script>
-import { $lc } from '../../../utils/i18n/index'
-import auth from '../../../utils/auth'
-import axios from '../../../utils/axios'
+import { $lc } from '../../../utils/i18n/index.js'
+import auth from '../../../utils/auth.js'
+import axios from '../../../utils/axios.js'
+
 export default {
   props: {
     visible: {
@@ -103,17 +104,17 @@ export default {
               break
             case '2':
               this.pwdRE = [/[A-z]+/, /[0-9]+/]
-              this.pwdReMsg = $lc(`密码只能包含数字 + 字母`)
+              this.pwdReMsg = $lc(`密码需包含数字、字母`)
               break
             case '3':
               this.pwdRE = [/[A-Z]+/, /[a-z]+/, /[0-9]+/]
-              this.pwdReMsg = $lc(`密码只能包含数字 + 大写字母 + 小写字母`)
+              this.pwdReMsg = $lc(`密码需包含数字、大小写字母`)
               break
             case '4':
               this.pwdRE = [
-                /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?])[A-Za-z\d!#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]{8,}$/
+                /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!#$%^&*()_+\-=\[\]{};':"\\|,.。！？，￥……‘’；”“、【】<>\/?])[A-Za-z\d!#$%^&*()_+\-=\[\]{};':"\\|,.。！？，￥……‘’；”“【】、<>\/?]{8,}$/
               ]
-              this.pwdReMsg = $lc(`密码只能包含数字 + 大写字母 + 小写字母 + 特殊符号`)
+              this.pwdReMsg = $lc(`密码需包含数字、大小写字母、除@外的特殊字符`)
               break
           }
         })
@@ -197,7 +198,7 @@ export default {
     },
     confirmFnThen() {
       this.$message({
-        message: '密码修改成功!',
+        message: $lc('密码修改成功!'),
         type: 'success'
       })
       axios.delete('/bems/prod_1.0/uas/api/authorization/logout', null, { loading: false }).then(() => {

package/src/components/Layout/HeaderWrap/index.vue

@@ -98,6 +98,9 @@
           </div>
         </template>
         <el-dropdown-item command="changePassword" divided>{{ '修改密码' | $lc }}</el-dropdown-item>
+        <el-dropdown-item v-if="customOpt.personalInfo" command="changeUserInfo" divided>{{
+          '修改人员信息' | $lc
+        }}</el-dropdown-item>
         <el-dropdown-item v-if="customOpt.mydeal" command="myDeal" divided>{{ '我的交易' | $lc }}</el-dropdown-item>
         <el-dropdown-item v-if="customOpt.switchuser" command="switchUser" divided>{{
           '身份切换' | $lc
@@ -351,6 +354,10 @@ export default {
         case 'changePassword':
           this.changePassword()
           break
+
+        case 'changeUserInfo':
+          this.personalInfo()
+          break
         case 'logOut':
           this.logOut()
           break
@@ -368,6 +375,9 @@ export default {
           break
       }
     },
+    personalInfo() {
+      linkPush(`/user-web/user/editUserInfo?uno=${JSON.parse(sessionStorage.getItem('userInfo')).uno}&oneself=true`)
+    },
     setLang() {
       this.langV = false
       window.localStorage.setItem('pageLang', this.langVal)

package/src/components/Layout/HeaderWrap/indexN.vue

@@ -156,6 +156,12 @@
             <i class="el-icon-caret-right m-l-auto m-r-0"></i>
           </div>
         </el-dropdown-item>
+        <el-dropdown-item v-if="customOpt.personalInfo" command="changeUserInfo">
+          <div class="flex-box flex-v">
+            <span>{{ '修改人员信息' | $lc }} </span>
+            <i class="el-icon-caret-right m-l-auto m-r-0"></i>
+          </div>
+        </el-dropdown-item>
         <el-dropdown-item v-if="customOpt.agency" command="myAgency">
           <div class="flex-box flex-v">
             <span>{{ '工作代理' | $lc }}</span>
@@ -199,7 +205,7 @@
           </el-dropdown>
         </el-dropdown-item>
         <!-- 系统切换 -->
-        <el-dropdown-item v-if="systemChange">
+        <el-dropdown-item v-if="systemChange && systemList && systemList.length">
           <el-dropdown trigger="hover" size="medium" placement="left-start" style="width: 100%">
             <div class="flex-box flex-v">
               <span>{{ '系统切换' | $lc }}</span>
@@ -457,14 +463,20 @@ export default {
         this.$refs.userDrop.show()
       }
     },
-    // 跳转打主数据人员页面
+    // 跳转打开人员页面
     goMdmUser() {
-      this.customOpt.userMd && linkPush('/mdm/personnel')
+      axios
+        .get(`/bems/user/mdmWfPersonalMid/validateOne/${JSON.parse(sessionStorage.getItem('userInfo')).uno}`)
+        .then(({ code, msg }) => {
+          if (code !== 200) {
+            return this.$message.error(msg)
+          }
+          linkPush(`/user-web/user/editUserInfo?uno=${JSON.parse(sessionStorage.getItem('userInfo')).uno}&oneself=true`)
+        })
     },
     setUserVisible(v) {
       if (v) {
         this.customOpt.agency && this.getProxyAuthIing()
-
         let loginTime = sessionStorage.getItem('loginTime')
         if (loginTime) {
           this.setDurationTime(loginTime)
@@ -513,6 +525,9 @@ export default {
         case 'changePassword':
           this.changePassword()
           break
+        case 'changeUserInfo':
+          this.goMdmUser()
+          break
         case 'logOut':
           this.logOut()
           break

package/src/components/SelectDatePickerPro/index.vue

@@ -115,10 +115,10 @@ export default {
       },
       set(value) {
         if (value) {
-          // this.$emit('input', { startDate: value[0], endDate: value[1], typeDate: this.type })
+          this.$emit('input', { startDate: value[0], endDate: value[1], typeDate: this.type })
           this.$emit('change', { startDate: value[0], endDate: value[1], typeDate: this.type })
         } else {
-          // this.$emit('input', { startDate: '', endDate: '', typeDate: this.type })
+          this.$emit('input', { startDate: '', endDate: '', typeDate: this.type })
           this.$emit('change', { startDate: '', endDate: '', typeDate: this.type })
         }
       }
@@ -146,14 +146,14 @@ export default {
             typeDate: this.value.typeDate
           } // 选择的范围
 
-          // this.$emit('input', weekTime)
+          this.$emit('input', weekTime)
           this.$emit('change', weekTime)
         } else {
-          // this.$emit('input', {
-          //   startDate: '',
-          //   endDate: '',
-          //   typeDate: this.value.typeDate
-          // })
+          this.$emit('input', {
+            startDate: '',
+            endDate: '',
+            typeDate: this.value.typeDate
+          })
           this.$emit('change', {
             startDate: '',
             endDate: '',
@@ -177,7 +177,7 @@ export default {
             endDate: dayjs(value).endOf('month').format('YYYY-MM-DD'),
             typeDate: this.value.typeDate
           }
-          // this.$emit('input', IMonth)
+          this.$emit('input', IMonth)
           this.$emit('change', IMonth)
         } else {
           let IMonth = {
@@ -185,7 +185,7 @@ export default {
             endDate: '',
             typeDate: this.value.typeDate
           }
-          // this.$emit('input', IMonth)
+          this.$emit('input', IMonth)
           this.$emit('change', IMonth)
         }
       }
@@ -195,7 +195,7 @@ export default {
         return this.value
       },
       set(value) {
-        // this.$emit('input', Object.assign(value, { typeDate: this.type }))
+        this.$emit('input', Object.assign(value, { typeDate: this.type }))
         this.$emit('change', Object.assign(value, { typeDate: this.type }))
       }
     },
@@ -214,7 +214,7 @@ export default {
             endDate: dayjs(value).endOf('year').format('YYYY-MM-DD'),
             typeDate: this.value.typeDate
           }
-          // this.$emit('input', iYear)
+          this.$emit('input', iYear)
           this.$emit('change', iYear)
         } else {
           let iYear = {
@@ -222,7 +222,7 @@ export default {
             endDate: '',
             typeDate: this.value.typeDate
           }
-          // this.$emit('input', iYear)
+          this.$emit('input', iYear)
           this.$emit('change', iYear)
         }
       }

package/src/components/TablePro/filterContent.vue

@@ -0,0 +1,279 @@
+<template>
+  <div class="my-filter-content">
+    <div class="my-fc-search">
+      <div v-if="filterMultiple" class="my-fc-search-content">
+        <template v-if="filters.length">
+          <div class="my-fc-search-top">
+            <el-input v-model="searchVal" placeholder="输入关键字进行过滤" />
+          </div>
+          <div>
+            <el-checkbox v-model="allCheck" :label="true" :indeterminate="indeterminate">{{
+              '全部' | $lc
+            }}</el-checkbox>
+          </div>
+          <el-checkbox-group v-model="filteredValue" class="input-w p-b-s" style="max-height: 226px; overflow: auto">
+            <template v-for="filter in filters">
+              <el-checkbox
+                v-if="filter.label.includes(searchVal)"
+                :key="filter.value"
+                class="m-t-s m-r-0"
+                :label="filter.value"
+                style="display: block"
+              >
+                <span class="align-bottom">{{ filter.label }}</span>
+                <span>{{ filter | countF }}</span>
+              </el-checkbox>
+            </template>
+          </el-checkbox-group>
+          <div class="flex-box flex-c m-t-s">
+            <el-button
+              type="primary"
+              size="mini"
+              @click="
+                () => {
+                  filteredValue.length ? confirmFilterEvent() : resetFilterEvent()
+                }
+              "
+            >
+              {{ '确认' | $lc }}
+            </el-button>
+            <el-button plain size="mini" @click="resetFilterEvent">{{ '清空' | $lc }}</el-button>
+          </div>
+        </template>
+        <template v-else>
+          <div class="my-fc-search-empty">无匹配项</div>
+        </template>
+      </div>
+      <div v-else class="my-fc-search-content">
+        <div class="my-fc-search-top">
+          <el-input v-model="searchVal" placeholder="输入关键字进行过滤" />
+        </div>
+        <ul class="el-table-filter__list">
+          <li
+            class="el-table-filter__list-item"
+            :class="{
+              'is-active': filterValue === undefined || filterValue === null
+            }"
+            @click="handleSelect(null)"
+          >
+            {{ '全部' | $lc }}
+          </li>
+        </ul>
+        <ul class="el-table-filter__list" style="max-height: 226px; overflow: auto">
+          <template v-for="filter in filters">
+            <li
+              v-if="filter.label.includes(searchVal)"
+              :key="filter.value"
+              class="el-table-filter__list-item"
+              :label="filter.value"
+              :class="{ 'is-active': filter.value === filterValue }"
+              @click="handleSelect(filter.value)"
+            >
+              <!-- v-title="filter.text" :show-overflow-tooltip="true" -->
+              <span class="text-ellipsis align-bottom" style="display: inline-block; max-width: 12em">{{
+                filter.label
+              }}</span>
+              <span>{{ filter | countF }}</span>
+            </li>
+          </template>
+        </ul>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FilterContent',
+  filters: {
+    countF(item) {
+      if (item.count === undefined) {
+        return ''
+      } else {
+        return ' (' + item.count + ')'
+      }
+    },
+    alltextF(list = []) {
+      if (list.some((c) => c.count !== undefined)) {
+        let total = 0
+        list.forEach((c) => {
+          if (!isNaN(c.count)) {
+            total = total + Number(c.count)
+          }
+        })
+        return ' (' + total + ')'
+      } else {
+        return ''
+      }
+    }
+  },
+  props: {
+    params: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      demo1: {
+        isAll: false,
+        option: null,
+        colValList: [],
+        valList: []
+      },
+      searchVal: '',
+      column: null,
+      filteredValue: [],
+      filterValue: null,
+      allCheck: false
+    }
+  },
+  computed: {
+    filters() {
+      return this.params.column && this.params.column.filters
+    },
+    filterMultiple() {
+      return this.params.column && this.params.column.filterMultiple
+    },
+
+    indeterminate() {
+      return this.filteredValue.length > 0 && this.filteredValue.length !== this.filters.length
+    },
+
+    multiple() {
+      if (this.column) {
+        return this.column.filterMultiple
+      }
+      return true
+    }
+  },
+  watch: {
+    filteredValue: {
+      immediate: true,
+      deep: true,
+      handler() {
+        if (this.filteredValue.length === this.filters.length) {
+          this.allCheck = true
+        } else if (this.filteredValue.length === 0) {
+          this.allCheck = false
+        }
+      }
+    },
+    allCheck: {
+      deep: true,
+      handler(val) {
+        if (val) {
+          this.filteredValue = this.filters.map((item) => {
+            return item.value
+          })
+        } else {
+          this.filteredValue = []
+        }
+      }
+    }
+  },
+  mounted() {
+    this.column = this.params.column
+    // 初始化 取出已选选项
+    const checked = this.column.filters
+      .filter((item) => {
+        return item.checked
+      })
+      .map((item2) => {
+        return item2.value
+      })
+    this.filteredValue = checked
+    this.filterValue = checked && checked[0]
+  },
+  methods: {
+    isActive(filter) {
+      return filter.value === this.filteredValue
+    },
+    handleSelect(filterValue) {
+      this.filterValue = filterValue
+      if (typeof filterValue !== 'undefined' && filterValue !== null) {
+        this.confirmFilterEventDx([this.filterValue])
+      } else {
+        this.confirmFilterEventDx([])
+      }
+    },
+    // 单选
+    confirmFilterEventDx(filterValue = []) {
+      const { $panel, column } = this.params
+      column.filters.map((item) => {
+        item.data = { vals: filterValue }
+        if (filterValue.includes(item.value)) {
+          item.checked = true
+          item._checked = true
+        } else {
+          item.checked = false
+          item._checked = false
+        }
+        return item
+      })
+      $panel.confirmFilter()
+    },
+    // 多选
+    confirmFilterEvent() {
+      const { $panel, column } = this.params
+      column.filters.map((item) => {
+        item.data = { vals: this.filteredValue }
+        if (this.filteredValue.includes(item.value)) {
+          item.checked = true
+          item._checked = true
+        } else {
+          item.checked = false
+          item._checked = false
+        }
+        return item
+      })
+      $panel.confirmFilter()
+    },
+    resetFilterEvent() {
+      this.filteredValue = []
+      const { $panel, column } = this.params
+      column.filters.map((item) => {
+        item.data = { vals: this.filteredValue }
+        if (this.filteredValue.includes(item.value)) {
+          item.checked = true
+          item._checked = true
+        } else {
+          item.checked = false
+          item._checked = false
+        }
+        return item
+      })
+      $panel.confirmFilter()
+    }
+  }
+}
+</script>
+
+<style>
+/*
+table-pro表头筛选框样式
+*/
+.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 .my-fc-search-content .el-table-filter__list-item {
+  text-align: left;
+}
+</style>