n20-common-lib 2.9.32 → 2.9.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.9.32",
+  "version": "2.9.33",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/AttachmentPass/index.vue

@@ -126,11 +126,19 @@ export default {
     }
   },
   watch: {
-    'uploadParams.bussValue'() {
-      this.getSelectList()
+    'uploadParams.bussValue': {
+      handler(val) {
+        this.getSelectList()
+      },
+      immediate: true,
+      deep: true
     },
-    'uploadParams.bussId'() {
-      this.getTabelList()
+    'uploadParams.bussId': {
+      handler() {
+        this.getTabelList()
+      },
+      immediate: true,
+      deep: true
     }
   },
   methods: {
@@ -139,7 +147,10 @@ export default {
     },
     // 附件类型获取
     async getSelectList() {
-      const { code, data } = await axios.post(`/api/neams/eamsattachfile/getByBussValues`, this.uploadParams.bussValues)
+      const { code, data } = await axios.post(
+        `/neams/eamsattachfile/getByBussValues`,
+        Array.isArray(this.uploadParams.bussValue) ? this.uploadParams.bussValue : [this.uploadParams.bussValue]
+      )
       if (code === 200) {
         this.uploadFlag = true
         this.dataPorp.typeOptions = data.map((item) => ({ ...item, type: item.attno, label: item.attname }))
@@ -151,7 +162,7 @@ export default {
         return this.$message.warning('请勾选附件')
       }
       const res = await axios.post(
-        `/api/neams/eamsbaserecord/batchDownloadFiles`,
+        `/neams/eamsbaserecord/batchDownloadFiles`,
         filesId.map((beid) => ({ beid })),
         {
           responseType: 'blob'
@@ -164,7 +175,7 @@ export default {
     async getTabelList() {
       const { bussValues, bussId } = this.uploadParams
       const params = Array.isArray(bussValues) ? { bussValues, bussId } : { bussValue: bussValues, bussId }
-      const { code, data } = await axios.post(`/api/neams/eamsbaserecord/queryList?t=${Date.now()}`, params)
+      const { code, data } = await axios.post(`/neams/eamsbaserecord/queryList?t=${Date.now()}`, params)
       if (code === 200) {
         this.tableData = data || []
       }
@@ -203,7 +214,7 @@ export default {
       const filesId = rows.filter((item) => item.beid).map((item) => item.beid)
 
       if (filesId.length > 0) {
-        const res = await axios.post(`/api/neams/eamsbaserecord/delete`, filesId)
+        const res = await axios.post(`/neams/eamsbaserecord/delete`, filesId)
 
         if (res.code === 200) {
           this.tableData = this.tableData.filter((item) => !filesId.includes(item.beid))
@@ -238,7 +249,7 @@ export default {
       )
       data.append('date', dayjs().format('YYYY-MM-DD HH:mm:ss') + ',2099-12-31 23:59:59')
 
-      return axios.post(`/api/neams/eamsbaserecord/save?r=${Math.random()}`, data, {
+      return axios.post(`/neams/eamsbaserecord/save?r=${Math.random()}`, data, {
         headers: {
           'Content-Type': 'multipart/form-data'
         },

package/src/components/SelectDatePickerPro/halfYearPicker.vue

@@ -0,0 +1,163 @@
+<template>
+  <el-popover
+    ref="popover"
+    v-model="showHalfYear"
+    popper-class="half-year-picker el-date-picker"
+    width="324"
+    placement="bottom-start"
+    trigger="click"
+  >
+    <div class="el-picker-panel__body">
+      <div class="el-date-picker__header el-date-picker__header--bordered">
+        <button
+          type="button"
+          aria-label="前一年"
+          class="el-picker-panel__icon-btn el-date-picker__prev-btn el-icon-d-arrow-left"
+          @click="prev"
+        ></button>
+        <span role="button" class="el-date-picker__header-label" @click="handleYear">{{ year }}{{ '年' | $lc }}</span>
+        <button
+          type="button"
+          aria-label="后一年"
+          class="el-picker-panel__icon-btn el-date-picker__next-btn el-icon-d-arrow-right"
+          @click="next"
+        ></button>
+      </div>
+
+      <div v-if="isHalfYear" class="half-year-picker__grid">
+        <el-button
+          type="text"
+          class="half-year-picker__btn"
+          :class="halfYear === 1 ? 'isactive' : ''"
+          @click="selectHalfYear(0)"
+          >{{ year }}{{ '年 上半年' | $lc }}</el-button
+        >
+        <el-button
+          type="text"
+          class="half-year-picker__btn"
+          :class="halfYear === 2 ? 'isactive' : ''"
+          @click="selectHalfYear(1)"
+          >{{ year }}{{ '年 下半年' | $lc }}</el-button
+        >
+      </div>
+      <div v-else class="n20-quarter-date-picker__year__grid">
+        <el-button
+          v-for="item in getYear"
+          :key="item"
+          type="text"
+          size="medium"
+          :class="year === item ? 'color-primary' : ''"
+          class="n20-quarter-date-picker__btn"
+          @click="selectYear(item)"
+          >{{ item }}{{ '年' | $lc }}</el-button
+        >
+      </div>
+    </div>
+    <el-input
+      slot="reference"
+      ref="halfYear"
+      v-model="showValue"
+      class="el-date-editor"
+      clearable
+      :placeholder="'选择半年' | $lc"
+      @focus="focusFn"
+    >
+      <i slot="suffix" class="el-input__icon el-icon-date" :class="showValue && 'half-year-picker__input--icon'"></i>
+    </el-input>
+  </el-popover>
+</template>
+
+<script>
+export default {
+  props: {
+    value: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      showHalfYear: false,
+      year: new Date().getFullYear(),
+      isHalfYear: true,
+      halfYear: 1,
+      showValue: ''
+    }
+  },
+  computed: {
+    getYear() {
+      let nfOptionsArray = []
+      for (var i = this.year - 4; i <= this.year + 5; i++) {
+        nfOptionsArray.push(i)
+      }
+      return nfOptionsArray
+    }
+  },
+  watch: {
+    value: {
+      handler(val) {
+        if (val && val.startDate && val.endDate) {
+          const regex = /(\d{4})-(\d{2})-(\d{2})/
+          const startDateMatch = val.startDate.match(regex)
+          const [, year, startMonth] = startDateMatch
+          this.year = year
+          this.halfYear = startMonth === '01' ? 1 : 2
+          this.showValue = `${year} 年 ${startMonth === '01' ? '上半年' : '下半年'}`
+        } else {
+          this.showValue = ''
+        }
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    selectYear(i) {
+      this.year = i
+      this.isHalfYear = true
+    },
+    prev() {
+      this.year = this.year * 1 - 1
+    },
+    next() {
+      this.year = this.year * 1 + 1
+    },
+    handleYear() {
+      this.isHalfYear = false
+    },
+    focusFn() {
+      this.$refs.halfYear.blur()
+    },
+    selectHalfYear(i) {
+      this.halfYear = i + 1
+      let arr = [`${this.year}-${i === 0 ? '01' : '07'}`, `${this.year}-${i === 0 ? '06' : '12'}`]
+      this.showHalfYear = false
+      this.showValue = `${this.year} 年 ${i === 0 ? '上半年' : '下半年'}`
+      this.$emit('input', { startDate: arr[0] + '-01', endDate: arr[1] + '-31' })
+      this.$emit('change', { startDate: arr[0] + '-01', endDate: arr[1] + '-31' })
+    }
+  }
+}
+</script>
+
+<style>
+.half-year-picker__grid {
+  display: flex;
+  justify-content: space-around;
+}
+.half-year-picker__btn {
+  flex: 1;
+  padding: 10px;
+  border: none;
+  background: #fff;
+  color: var(--text-color-base);
+  outline: none;
+  cursor: pointer;
+}
+.half-year-picker__btn.isactive {
+  color: var(--color-primary);
+}
+
+.el-date-editor:hover .half-year-picker__input--icon {
+  display: none;
+}
+</style>

package/src/components/SelectDatePickerPro/quarterDatePicker.vue

@@ -16,7 +16,7 @@
           class="el-picker-panel__icon-btn el-date-picker__prev-btn el-icon-d-arrow-left"
           @click="prev"
         ></button>
-        <span role="button" class="el-date-picker__header-label" @click="handleYear">{{ year }}年</span>
+        <span role="button" class="el-date-picker__header-label" @click="handleYear">{{ year }}{{ '年' | $lc }}</span>
         <button
           type="button"
           aria-label="后一年"
@@ -34,7 +34,7 @@
             class="n20-quarter-date-picker__btn"
             :class="this.season == 1 ? 'isactive' : ''"
             @click="selectSeason(0)"
-            >{{ year }}年 第一季度</el-button
+            >{{ year }}{{ '年' | $lc }} {{ '第一季度' | $lc }}</el-button
           >
           <el-button
             type="text"
@@ -43,7 +43,7 @@
             class="n20-quarter-date-picker__btn"
             :class="this.season == 2 ? 'isactive' : ''"
             @click="selectSeason(1)"
-            >{{ year }}年 第二季度</el-button
+            >{{ year }}{{ '年' | $lc }} {{ '第二季度' | $lc }}</el-button
           >
           <el-button
             type="text"
@@ -52,7 +52,7 @@
             class="n20-quarter-date-picker__btn"
             :class="this.season == 3 ? 'isactive' : ''"
             @click="selectSeason(2)"
-            >{{ year }}年 第三季度</el-button
+            >{{ year }}{{ '年' | $lc }} {{ '第三季度' | $lc }}</el-button
           >
           <el-button
             :disabled="isDisabled(year, '4')"
@@ -61,7 +61,7 @@
             class="n20-quarter-date-picker__btn"
             :class="this.season == 4 ? 'isactive' : ''"
             @click="selectSeason(3)"
-            >{{ year }}年 第四季度</el-button
+            >{{ year }}{{ '年' | $lc }} {{ '第四季度' | $lc }}</el-button
           >
         </div>
         <div v-else class="n20-quarter-date-picker__year__grid">
@@ -72,8 +72,8 @@
             size="medium"
             :class="year === item ? 'color-primary' : ''"
             class="n20-quarter-date-picker__btn"
-            @click="selectYaer(item)"
-            >{{ item }}年</el-button
+            @click="selectYear(item)"
+            >{{ item }}{{ '年' | $lc }}</el-button
           >
         </div>
       </div>
@@ -83,7 +83,7 @@
       ref="quarterDate"
       v-model="showValue"
       class="el-date-editor"
-      placeholder="选择季度"
+      :placeholder="'选择季度' | $lc"
       clearable
       @focus="changeFocus"
     >
@@ -201,7 +201,7 @@ export default {
       this.isQuarter = true
       this.$refs.quarterDate.blur()
     },
-    selectYaer(i) {
+    selectYear(i) {
       this.year = i
       this.isQuarter = true
     },

package/src/index.js

@@ -74,6 +74,7 @@ import AttachmentPass from './components/AttachmentPass/index.vue'
 // 新版日期选择框
 import BusiDatePicker from './components/DateSelect/busiDate.vue'
 import QuarterDatePicker from './components/DateSelect/quarterDatePicker.vue'
+import HalfYearPicker from './components/SelectDatePickerPro/halfYearPicker.vue'
 import SelectDatePickerPro from './components/SelectDatePickerPro/index.vue'
 import TableTransfer from './components/TableTransfer/index.vue'
 import UploadMsg from './components/Upload/uploadMsg.vue'
@@ -214,6 +215,7 @@ const components = [
   Diff,
   SelectDatePicker,
   SelectDatePickerPro,
+  HalfYearPicker,
   QuarterDatePicker,
   BusiDatePicker,
   TableTransfer,
@@ -333,6 +335,7 @@ export {
   Pagination,
   Preview,
   QuarterDatePicker,
+  HalfYearPicker,
   SecondaryTab,
   SelectDatePicker,
   SelectDatePickerPro,