n20-common-lib 2.9.13 → 2.9.14

package/src/components/ApprovalRecord/approvalImgPro/index.vue

@@ -34,9 +34,12 @@
       }}</span>
       <el-button type="text" icon="el-icon-full-screen" style="font-size: 16px" @click="scaleReset" />
     </div>
-    <el-popover ref="title-pop" v-model="msgV" trigger="manual" placement="top">
+    <el-popover ref="title-pop" v-model="msgV" trigger="hover" placement="top">
       <div class="activiti-msg">
         <div v-if="assigneeEnd" class="m-t-ss m-b-ss">
+          <div class="flex-box flex-r">
+            <el-button type="text" @click="uploadList(assigneeEnd)">{{ '导出' | $lc }}</el-button>
+          </div>
           <table cellspacing="0" style="border-collapse: collapse; min-width: 460px">
             <tr>
               <td class="text-c">{{ '已审批人' | $lc }}</td>
@@ -46,7 +49,7 @@
             </tr>
             <tr v-for="(item, i) in assigneeEnd" :key="i">
               <td>{{ item.assignee }}</td>
-              <td class="text-c">{{ item.optResult }}</td>
+              <td class="text-c">{{ item.optName }}</td>
               <td>{{ item.suggestion }}</td>
               <td>{{ item.endTime }}</td>
             </tr>
@@ -128,10 +131,10 @@
       </div>
     </el-popover>
 
-    <el-popover ref="child-pop" popper-class="n20-approval-child" v-model="childV" trigger="manual" placement="bottom">
-      <div v-click-outside="clickOut" v-if="childV">
+    <el-popover ref="child-pop" v-model="childV" popper-class="n20-approval-child" trigger="manual" placement="bottom">
+      <div v-if="childV" v-click-outside="clickOut">
         <div>{{ childTitle }}</div>
-        <child :data-pro="childDataPro"></child>
+        <child :data-pro="childDataPro" />
       </div>
     </el-popover>
   </div>
@@ -279,6 +282,31 @@ export default {
     document.body.removeEventListener('click', this.addTaskFn)
   },
   methods: {
+    // 导出
+    uploadList(assigneeEnd) {
+      axios
+        .post(
+          '/bems/activiti/sample/importTaskFlowHistory',
+          {
+            taskName: '',
+            detailList: assigneeEnd.map((item) => {
+              return {
+                assignee: item.assignee,
+                optResult: item.optName,
+                suggestion: item.suggestion,
+                endTime: item.endTime
+              }
+            })
+          },
+          {
+            responseType: 'blob',
+            timeout: 600000 // 针对单个请求设置超时时间
+          }
+        )
+        .then((res) => {
+          this.$downloadBlob(res, res.name)
+        })
+    },
     addTaskFn() {
       this.addTaskV = false
     },
@@ -325,6 +353,8 @@ export default {
           this.setRejectLink(from, to, $lc('驳回至'))
         } else if (type === '4') {
           this.setPropelLink(from, to, $lc('推进至'))
+        } else if (type === '5') {
+          this.setRejectLink(from, to, $lc('撤回至上一步'))
         }
       }
     },
@@ -545,6 +575,9 @@ export default {
       } else if (this.dataPro.taskDefIdMap[id] /*已审批*/) {
         this.assigneeEnd = this.dataPro.taskDefIdMap[id]
         this.$nextTick(() => {
+          this.assigneeEnd = this.assigneeEnd?.filter((item) => {
+            return item.isShow !== '0'
+          })
           this.$refs['title-pop'].doDestroy()
           this.$refs['title-pop'].referenceElm = ev.currentTarget
           this.msgV = true
@@ -564,8 +597,12 @@ export default {
         } else {
           this.assignee = undefined
           this.assigneeEnd = list
+          this.taskCandidate = undefined
         }
         this.$nextTick(() => {
+          this.assigneeEnd = this.assigneeEnd?.filter((item) => {
+            return item.isShow !== '0'
+          })
           this.$refs['title-pop'].doDestroy()
           this.$refs['title-pop'].referenceElm = task
           this.msgV = true

package/src/components/ApprovalRecord/index.vue

@@ -16,7 +16,12 @@
       append-to-body
       top="10vh"
     >
-      <approvalCard class="p-a" :proc-inst-id="procInstIdC" style="height: 70vh; overflow: auto" />
+      <approvalCard
+        :api-prefix="apiPrefix"
+        class="p-a"
+        :proc-inst-id="procInstIdC"
+        style="height: 70vh; overflow: auto"
+      />
     </el-dialog>
     <el-dialog
       v-drag
@@ -31,12 +36,20 @@
     </el-dialog>
   </div>
   <div v-else>
-    <expandableWrap title="审批记录">
+    <expandableWrap :title="'审批记录' | $lc">
       <template slot="tips">
-        <el-button size="mini" plain @click="imgV = true">流程图查看</el-button>
+        <el-button size="mini" plain @click="imgV = true">{{ '流程图查看' | $lc }}</el-button>
       </template>
-      <approvalCard :procInstId="procInstIdC" />
-      <el-dialog v-drag title="查看流程" :visible.sync="imgV" width="65%" class="p-a-0" append-to-body top="10vh">
+      <approvalCard :api-prefix="apiPrefix" :proc-inst-id="procInstIdC" />
+      <el-dialog
+        v-drag
+        :title="'查看流程' | $lc"
+        :visible.sync="imgV"
+        width="65%"
+        class="p-a-0"
+        append-to-body
+        top="10vh"
+      >
         <approvalImg class="text-c p-a" style="height: 70vh; overflow: auto" />
       </el-dialog>
     </expandableWrap>
@@ -56,6 +69,10 @@ export default {
     approvalImg
   },
   props: {
+    apiPrefix: {
+      type: String,
+      default: undefined
+    },
     procInstId: {
       type: String,
       default: undefined
@@ -78,7 +95,7 @@ export default {
     }
   },
   mounted() {
-    getJsonc('/server-config.jsonc').then(({ approvalMode }) => {
+    getJsonc('portal/server-config.jsonc').then(({ approvalMode }) => {
       this.approvalMode = approvalMode
     })
   }

package/src/components/ApprovalRecord/indexApp.vue

@@ -0,0 +1,79 @@
+/* 审批记录 */
+<template>
+  <div>
+    <div class="flex-box flex-r m-b-s">
+      <el-button type="text" size="mini" :disabled="false" @click="cardV = true">{{ '审批进度查看' | $lc }}</el-button>
+    </div>
+    <el-dialog
+      v-drag
+      :title="'审批记录' | $lc"
+      :visible.sync="cardV"
+      width="90%"
+      class="p-a-0"
+      append-to-body
+      top="10vh"
+    >
+      <approvalCard
+        :api-prefix="apiPrefix"
+        class="p-a"
+        :proc-inst-id="procInstIdC"
+        style="height: 70vh; overflow: auto"
+      />
+    </el-dialog>
+    <el-dialog
+      v-drag
+      :title="'查看流程' | $lc"
+      :visible.sync="imgV"
+      width="80%"
+      class="p-a-0"
+      append-to-body
+      top="10vh"
+    >
+      <approvalImg class="text-c p-a" :proc-inst-id="procInstIdC" style="height: 70vh; overflow: auto" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import approvalCard from '../ApprovalCard/indexApp.vue'
+import approvalImg from './approvalImg.vue'
+import getJsonc from '../../assets/getJsonc'
+export default {
+  name: 'ApprovalRecord',
+  components: {
+    approvalCard,
+    approvalImg
+  },
+  props: {
+    apiPrefix: {
+      type: String,
+      default: undefined
+    },
+    procInstId: {
+      type: String,
+      default: undefined
+    },
+    buttonMode: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      cardV: false,
+      imgV: false,
+      approvalMode: undefined
+    }
+  },
+  computed: {
+    procInstIdC() {
+      return this.procInstId || this.$route.query.processInstanceId
+    }
+  },
+  mounted() {
+    getJsonc('portal/server-config.jsonc').then(({ approvalMode }) => {
+      this.approvalMode = approvalMode
+    })
+  }
+}
+</script>

package/src/components/AttachmentPass/index.vue

@@ -0,0 +1,286 @@
+<template>
+  <Dialog v-drag :visible.sync="visibleC" width="75%" title="补传附件" v-bind="$attrs" v-on="$listeners">
+    <el-form ref="form" :model="paramValues" label-width="8em" class="label-width-14em">
+      <el-form-item
+        v-for="item in defaultModel"
+        :key="item.value"
+        :label="item.label"
+        :prop="item.value"
+        :rules="item.rules"
+      >
+        <el-select
+          v-if="item.type === 'select'"
+          v-model="paramValues[item.value]"
+          value-key="label"
+          class="input-w"
+          placeholder="请选择"
+          v-bind="item.props"
+          v-on="item.on"
+        >
+          <el-option
+            v-for="option in item.options"
+            :key="option.value"
+            :label="option[item.props.label || 'label']"
+            :value="option[item.props.value || 'value']"
+          />
+        </el-select>
+        <el-date-picker
+          v-if="item.type === 'date'"
+          v-model="paramValues[item.value]"
+          type="date"
+          class="input-w"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择"
+          v-bind="item.props"
+          v-on="item.on"
+        />
+        <el-input
+          v-if="item.type === 'text'"
+          v-model="paramValues[item.value]"
+          v-bind="item.props"
+          placeholder="请选择"
+          v-on="item.on"
+        />
+      </el-form-item>
+    </el-form>
+    <FileUploadTable
+      ref="FileUploadTable"
+      action="/api/neams/eamsbaserecord/batchSavejson"
+      :data-porp="dataPorp"
+      :upload-http-request="uploadRequest"
+      :table-data="tableData"
+      @add-row="addRow"
+      @delete-rows="deleteRows"
+      @down-rows="downRows"
+    >
+      <el-table-column slot="slotCol" label="归档名称" width="140" prop="archiveName" show-overflow-tooltip />
+    </FileUploadTable>
+    <slot name="dialogFoot"></slot>
+  </Dialog>
+</template>
+
+<script>
+import axios from '../../utils/axios'
+import { $lc } from '../../utils/i18n/index'
+import { dayjs } from '../../utils/date.js'
+import Dialog from '../Dialog/index.vue'
+import FileUploadTable from '../FileUploadTable/index.vue'
+export default {
+  name: 'AttachmentPass',
+  components: {
+    Dialog,
+    FileUploadTable
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    paramModel: {
+      type: Array,
+      default: () => []
+    },
+    apiPrefix: {
+      type: String,
+      default: undefined
+    },
+    uploadParams: {
+      type: Object,
+      default: () => ({})
+    },
+    paramValues: {
+      type: Object,
+      default: () => ({})
+    },
+    customStr: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      tableData: [],
+      dataPorp: {
+        keys: {
+          rowKey: 'beid',
+          type: 'attno', // 附件类型
+          name: 'name', // 附件名称
+          url: 'beid', // 上传文件返回的文件地址
+          time: 'date', // 附件上传时间
+          user: 'user' // 附件上传人
+        }
+      }
+    }
+  },
+  computed: {
+    visibleC: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    },
+    defaultModel: {
+      get() {
+        return this.paramModel
+      },
+      set(val) {
+        this.$emit('update:paramModel', val)
+      }
+    }
+  },
+  watch: {
+    'uploadParams.bussValue': {
+      handler(val) {
+        this.getSelectList()
+      },
+      immediate: true,
+      deep: true
+    }
+  },
+  methods: {
+    setTableData(data) {
+      this.tableData = data
+    },
+    // 附件类型获取
+    async getSelectList() {
+      const { code, data } = await axios.post(
+        this.apiPrefix
+          ? `${this.apiPrefix}/neams/eamsattachfile/getByBussValues`
+          : `/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 }))
+      }
+    },
+    async downRows(rows) {
+      const filesId = rows.map(({ beid }) => beid).filter(Boolean)
+      if (!filesId.length) {
+        return this.$message.warning('请勾选附件')
+      }
+      const res = await axios.post(
+        this.apiPrefix
+          ? `${this.apiPrefix}/neams/eamsbaserecord/batchDownloadFiles`
+          : `/neams/eamsbaserecord/batchDownloadFiles`,
+        filesId.map((beid) => ({ beid })),
+        {
+          responseType: 'blob'
+        }
+      )
+      if (res) {
+        this.$downloadBlob(res, `附件.zip`)
+      }
+    },
+    getTableData() {
+      return this.tableData
+    },
+    addRow() {
+      const dynamicParams = this.customStr
+        .split('&')
+        .map((key) => this.paramValues[key] || '')
+        .join('')
+
+      this.$refs.form.validate((valid) => {
+        if (!valid) return
+        // 自行添加
+        this.tableData.splice(0, 0, {
+          id: 'n' + Math.random(),
+          type: '',
+          name: '',
+          date: '',
+          user: sessionStorage.getItem('userNo'),
+          archiveName: dynamicParams,
+          _fileData: {
+            /* 上传时附带的额外参数 */
+          }
+        })
+      })
+    },
+    async deleteRows(rows) {
+      if (!rows.length) {
+        return this.$message({
+          message: $lc('请先勾选要删除的数据！'),
+          type: 'warning',
+          showClose: true
+        })
+      }
+
+      const filesId = rows.filter((item) => item.beid).map((item) => item.beid)
+
+      if (filesId.length > 0) {
+        const res = await axios.post(
+          this.apiPrefix ? `${this.apiPrefix}/neams/eamsbaserecord/delete` : `/neams/eamsbaserecord/delete`,
+          filesId
+        )
+
+        if (res.code === 200) {
+          this.tableData = this.tableData.filter((item) => !filesId.includes(item.beid)) || []
+          this.$message.success('删除成功')
+        }
+      }
+
+      const ids = rows.map((item) => item.id)
+      this.tableData = this.tableData.filter((item) => !ids.includes(item.id) || item.beid) || []
+    },
+    uploadRequest(options, row) {
+      // row.typeName =
+      let { file } = options
+      let data = new FormData()
+      data.append('file', file)
+      data.append(
+        'data',
+        JSON.stringify({
+          syscode: this.uploadParams.syscode,
+          appno: this.uploadParams.appno, //模块名
+          bussValue: this.uploadParams.bussValue, // 业务品种
+          attno: row ? row.attno : this.dataPorp.typeOptions[0].attno, // 附件类型
+          bussId: this.uploadParams.bussId, // 业务ID
+          cltno: this.uploadParams.cltno,
+          memo: file.name,
+          recordname: file.name,
+          fileSize: file.size,
+          archiveName: row.archiveName,
+          ...this.paramValues
+        })
+      )
+      data.append('date', dayjs().format('YYYY-MM-DD HH:mm:ss') + ',2099-12-31 23:59:59')
+
+      let pro = new Promise((resolve, reject) => {
+        axios
+          .post(
+            this.apiPrefix
+              ? `${this.apiPrefix}/neams/eamsbaserecord/batchSavejson?r=${Math.random()}`
+              : `/neams/eamsbaserecord/batchSavejson?r=${Math.random()}`,
+            data,
+            {
+              headers: {
+                'Content-Type': 'multipart/form-data'
+              },
+              timeout: 900000,
+              loading: false,
+              noMsg: true
+            }
+          )
+          .then((res) => {
+            resolve(res)
+          })
+          .catch((err) => {
+            reject(err)
+          })
+      })
+      return pro
+    },
+    setOptions(key, opts) {
+      let item = this.defaultModel.find((f) => f.value === key)
+      if (item) {
+        item.options = opts || []
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped></style>

package/src/components/Button/button-group.vue

@@ -141,7 +141,9 @@ export default {
       if (btnt.includes('back')) {
         btns.push({ emit: 'back', label: $lc('返回'), plain: true })
       }
-
+      if (btnt.includes('zsbf')) {
+        btns.push({ emit: 'zsbf', label: $lc('证书颁发'), plain: true })
+      }
       return btns
     }
   }

package/src/components/CascaderArea/index.vue

@@ -1,7 +1,7 @@
 <template>
   <el-cascader
-    v-title
     ref="el-cascader"
+    v-title
     :value="value"
     v-bind="$attrs"
     :options="areaTree"
@@ -13,7 +13,6 @@
 </template>
 
 <script>
-import cloneDeep from 'lodash/cloneDeep'
 window._china_area_tree_ = undefined
 export default {
   name: 'CascaderArea',
@@ -64,7 +63,7 @@ export default {
         label: 'regionName',
         children: 'children',
         expandTrigger: 'hover',
-        checkStrictly: this.isUrban ? false : true
+        checkStrictly: !this.isUrban
       }
       return Object.assign(_prop, this.props)
     },
@@ -99,7 +98,7 @@ export default {
         )
         .then(({ data }) => {
           if (data) {
-            let result = cloneDeep(data)
+            let result = JSON.parse(JSON.stringify(data))
             if (this.isUrban) {
               window[this.urbanKey] = isUrbanFn(result)
               this.areaTree = window[this.urbanKey]
@@ -121,7 +120,7 @@ export default {
 
 const treeFn = (data) => {
   return data?.map((res) => {
-    if (!['3', '4', '5'].includes(res.regionLevel)) {
+    if (!['3', '4', '5'].includes(res.regionLevel) && res.hasChildren) {
       res.disabled = true
     }
 
@@ -136,7 +135,7 @@ const treeFn = (data) => {
 
 const isUrbanFn = (data) => {
   return data?.map((res) => {
-    if (res.regionLevel === '2') {
+    if (res.regionLevel === '2' || !res.children?.length) {
       res.children = null
     } else {
       res.children = isUrbanFn(res.children)

package/src/components/DatePicker/por.vue

@@ -3,7 +3,15 @@
     ref="date-picker"
     v-model="valueC"
     class="n20-date-editor"
-    :class="{ 'has-value': clearable && valueC, [this.$attrs && this.$attrs['rule-form']]: !valueC }"
+    :class="{
+      'has-value': clearable && valueC,
+      [this.$attrs && this.$attrs['rule-form']]: !valueC
+    }"
+    :popper-class="
+      !clearable && type === 'datetimerange'
+        ? 'clearable-datetimerange' + ' ' + $attrs['popper-class']
+        : $attrs['popper-class']
+    "
     :type="type"
     :value-format="valueFormat"
     :placeholder="'选择日期' | $lc"
@@ -112,6 +120,17 @@ let shortcuts_1 = [
       end.setHours(23, 59, 59)
       picker.$emit('pick', [start, end])
     }
+  },
+  {
+    text: $lc('最近三年'),
+    onClick(picker) {
+      const start = new Date()
+      const end = new Date()
+      start.setFullYear(start.getFullYear() - 3)
+      start.setHours(0, 0, 0)
+      end.setHours(23, 59, 59)
+      picker.$emit('pick', [start, end])
+    }
   }
 ]
 
@@ -160,6 +179,17 @@ let shortcuts_2 = [
       picker.$emit('pick', [start, end])
     }
   },
+  {
+    text: $lc('最近三年'),
+    onClick(picker) {
+      const start = new Date()
+      const end = new Date()
+      start.setFullYear(start.getFullYear() - 3)
+      start.setHours(0, 0, 0)
+      end.setHours(23, 59, 59)
+      picker.$emit('pick', [start, end])
+    }
+  },
   {
     text: $lc('今天开始'),
     onClick(picker) {

package/src/components/DateSelect/quarterDatePicker.vue

@@ -154,7 +154,9 @@ export default {
       },
       get() {
         if (this.value) {
-          return `${dayjs(this.value.startDate).year()} 年 ${dayjs(this.value.endDate).quarter()} 季度`
+          return `${dayjs(this.value.startDate).year()} 年 第${this.getChinese(
+            dayjs(this.value.endDate).quarter()
+          )}季度`
         } else {
           return this.value
         }
@@ -166,6 +168,26 @@ export default {
     // this.getDefaultTime()
   },
   methods: {
+    getChinese(val) {
+      let value = ''
+      switch (val) {
+        case 1:
+          value = '一'
+          break
+        case 2:
+          value = '二'
+          break
+        case 3:
+          value = '三'
+          break
+        case 4:
+          value = '四'
+          break
+        default:
+          break
+      }
+      return value
+    },
     prev() {
       this.year = this.year * 1 - 1
     },

package/src/components/Descriptions/index.vue

@@ -10,9 +10,10 @@
 <script>
 export default {
   name: 'Descriptions',
-  data() {
-    return {
-      column: 2
+  props: {
+    column: {
+      type: Number,
+      default: 2
     }
   },
   created() {
@@ -34,6 +35,9 @@ export default {
       } else if (wW > 1920) {
         this.column = 4
       }
+    },
+    destroyResize() {
+      window.removeEventListener('resize', this.resize)
     }
   }
 }