n20-common-lib 2.7.0-beta.14 → 2.7.0-beta.16

package/src/components/ApprovalButtons/index.vue

@@ -36,14 +36,33 @@
               :placeholder="'请选择加签类型' | $lc"
               style="width: 10em"
             >
-              <el-option
-                v-if="authList.includes('isAddForwardTask') || preAddTask"
-                :label="'向前加签' | $lc"
-                value="2"
-              />
-              <el-option v-if="authList.includes('isAddtask') || preAddTask" :label="'向后加签' | $lc" value="1" />
+              <el-option v-if="addTaskModel === '1'" :label="'向后加签' | $lc" value="1" />
+              <template v-else>
+                <el-option
+                  v-if="authList.includes('isAddForwardTask') || preAddTask"
+                  :label="'向前加签' | $lc"
+                  value="2"
+                />
+                <el-option
+                  v-if="addTaskModel === '1' || authList.includes('isAddtask') || preAddTask"
+                  :label="'向后加签' | $lc"
+                  value="1"
+                />
+              </template>
             </el-select>
             <el-select
+              v-if="addTaskModel === '1'"
+              v-model="addTaskType"
+              clearable
+              :placeholder="'请选择审批方式' | $lc"
+              style="width: 10em"
+            >
+              <el-option :label="'普通节点' | $lc" value="1" />
+              <el-option :label="'会签并行' | $lc" value="2" />
+              <el-option :label="'普通串行' | $lc" value="3" />
+            </el-select>
+            <el-select
+              v-else
               v-model="addTaskType"
               disabled
               clearable
@@ -83,7 +102,7 @@
             style="width: 18%"
           />
         </template>
-        <el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" :required="required" style="width: 70%">
+        <el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" :required="requiredC" style="width: 70%">
           <el-input
             ref="msg-input"
             v-model="messageC"
@@ -284,6 +303,7 @@ export default {
   data() {
     this.msgisSync = !!this.$listeners['update:message']
     return {
+      requiredC: false,
       prefixCls,
       messageIn: '',
       errMsg: undefined,
@@ -303,6 +323,7 @@ export default {
       approvalToV: false,
       showApprovalTo: false,
       opiAndUser: false,
+      addTaskModel: '0',
       otherAtt: {},
       fileDtos: [],
       fileName: '',
@@ -336,11 +357,19 @@ export default {
     this.taskId = this.$route.query.taskId || this.$route.params.taskId
     this.showBtn = this.$route.query.habtn !== 'true'
     this.getBtns()
+    this.getAddTaskMode()
     this.getShowApprovalTo()
     this.getHasQueryAppOpiAndUser()
     this.nextApproval && this.getTodoList()
+    this.getConfiguration()
   },
   methods: {
+    // 意见是否必填
+    getConfiguration() {
+      getJsonc('portal/server-config.jsonc', null, true).then(({ opinionRequired }) => {
+        this.requiredC = opinionRequired ?? this.required
+      })
+    },
     getTodoList() {
       return new Promise((resolve, reject) => {
         const dto = JSON.parse(sessionStorage.getItem(`approvalDto`))
@@ -353,6 +382,16 @@ export default {
         })
       })
     },
+    // 获取加签方式的模式
+    getAddTaskMode() {
+      axios
+        .get(`/bems/activiti/sample/getAddTaskMode`, null, { loading: false, noMsg: true })
+        .then(({ data, code }) => {
+          if (code === 200) {
+            this.addTaskModel = data
+          }
+        })
+    },
 
     // 换回到发起页
     goFrom() {
@@ -549,7 +588,7 @@ export default {
     },
     // 审批
     approvalFn() {
-      if (this.required && !this.messageC) {
+      if (this.requiredC && !this.messageC) {
         return this.errMsgFn(
           this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
         )
@@ -568,7 +607,7 @@ export default {
       })
     },
     approvalNext() {
-      if (this.required && !this.messageC) {
+      if (this.requiredC && !this.messageC) {
         return this.errMsgFn(
           this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
         )
@@ -605,7 +644,7 @@ export default {
       })
     },
     async goApproval(row) {
-      const { appUrl = {} } = await getJsonc('activiti/server-config.jsonc')
+      const { appUrl = {} } = await getJsonc('activiti/server-config.jsonc', null, true)
       if (appUrl[row.appNo]) {
         let path = toExaminePath(row, appUrl) || appUrl[row.appNo] + $lc('/') + row.typeCode
         linkPush(path, {

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -47,9 +47,11 @@ export default {
   methods: {
     // 审批意见选择是否单选,1是 0 否
     getIsMultiple() {
-      axios.get(`/bems/activiti/actAppOpi/queryAppOpiAndUser`, null, { loading: false }).then(({ msg }) => {
-        this.multiple = msg === '0'
-      })
+      axios
+        .get(`/bems/activiti/actAppOpi/queryAppOpiAndUser`, null, { loading: false, noMsg: true })
+        .then(({ msg }) => {
+          this.multiple = msg === '0'
+        })
     },
     getData() {
       if (this.andUser) {

package/src/components/ApprovalCard/index.vue

@@ -40,7 +40,7 @@
                 {{ item.roleName }}
               </div>
               <div
-                v-if="!item.result == 0"
+                v-if="item.result !== 0"
                 v-title="item.assignee"
                 class="n20-worker text-ellipsis"
                 style="width: 180px"

package/src/components/DateChoose/index.vue

@@ -0,0 +1,278 @@
+<template>
+  <div class="inline_block ">
+    <el-select v-model="showValue" select collapse-tags clearable multiple disabled v-title="showValue.toString()">
+      <el-option v-for="item in showValue" :key="item" :label="item" :value="item" />
+    </el-select>
+    <el-link
+      :underline="false"
+      icon="n20-icon-sousuokuang-sousuodanchuang"
+      class="m-l-s"
+      @click="visibleSelect = true"
+    ></el-link>
+    <Dialog
+      v-drag
+      :visible.sync="visibleSelect"
+      title="时间选择器"
+      :destroy-on-open="true"
+      width="600px"
+      @closed="close"
+    >
+      <div style="height: 200px">
+        <el-form v-if="visible" :model="form" ref="form" label-width="80px" :inline="false" size="normal">
+          <el-form-item label="类型">
+            <el-select class="input-w" v-model="form.type" placeholder="请选择">
+              <el-option v-for="item in filterOptions" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="日期" v-if="[5, 2, 3, 6].includes(form.type)">
+            <cl-date-picker-por
+              v-if="form.type === 5"
+              :start-date.sync="form.term.start"
+              :end-date.sync="form.term.end"
+              type="daterange"
+              startStop
+              value-format="yyyy-MM-dd"
+            />
+            <el-select
+              class="input-w"
+              v-model="form.value"
+              collapse-tags
+              clearable
+              multiple
+              placeholder="请选择"
+              v-if="form.type === 2"
+            >
+              <el-option v-for="item in weeks" :key="item" :label="item" :value="item"> </el-option>
+            </el-select>
+            <el-select
+              class="input-w"
+              v-model="form.value"
+              collapse-tags
+              clearable
+              multiple
+              placeholder="请选择"
+              v-if="form.type === 3"
+            >
+              <el-option v-for="item in months" :key="item" :label="item" :value="item"> </el-option>
+            </el-select>
+            <el-date-picker
+              type="dates"
+              v-model="form.value"
+              placeholder="选择一个或多个日期"
+              v-if="form.type === 6"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="时间点" v-if="hasTime">
+            <cl-time-picker v-model="form.time" value-format="HH:mm:ss" placeholder="请选择时间" />
+          </el-form-item>
+        </el-form>
+        <div class="flex-box flex-r" v-if="!visible">
+          <el-link class="m-b-s" :underline="false" icon="n20-icon-xinzeng" @click="handle('新增')">新增</el-link>
+        </div>
+        <ul class="list" v-if="!visible">
+          <li v-for="(item, index) in value" :key="index">
+            <div class="flex-box flex-lr">
+              <span>
+                <span>{{
+                  options.find(item2 => {
+                    return item2.value === item.type
+                  }).label
+                }}</span>
+                <span v-if="item.type === 2">{{ item.value }}</span>
+                <span v-else-if="item.type === 3">{{ item.value }}日</span>
+                <span v-else-if="item.type === 5" class="m-l-s">{{ item.term.start }}至{{ item.term.end }}</span>
+                <span v-else-if="item.type === 6" class="m-l-s">{{ item.value.toString() }}</span>
+                <span style="margin-left: 4px" v-if="hasTime">{{ item.time }}</span>
+              </span>
+              <div>
+                <el-link
+                  class="m-l-s m-r-s"
+                  :underline="false"
+                  icon="n20-icon-bianjixuanzhong"
+                  @click="handle('编辑', item, index)"
+                ></el-link>
+                <el-link
+                  class="m-r-s"
+                  :underline="false"
+                  icon="n20-icon-a-shanchuxuanzhong"
+                  @click="handle('删除', item, index)"
+                ></el-link>
+              </div>
+            </div>
+          </li>
+        </ul>
+      </div>
+      <div class="dialog-footer" v-if="!visible">
+        <el-button type="primary" @click="visibleSelect = false">确定</el-button>
+        <el-button plain @click="visibleSelect = false">取消</el-button>
+      </div>
+      <div class="dialog-footer" v-else>
+        <el-button type="primary" @click="handle('确定')">确定</el-button>
+        <el-button plain @click="handle('取消')">取消</el-button>
+      </div>
+    </Dialog>
+  </div>
+</template>
+
+<script>
+import Dialog from '../Dialog/index.vue'
+export default {
+  name: 'DateChoose',
+  components: {
+    Dialog
+  },
+  props: {
+    value: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    optionsSelect: {
+      type: Array,
+      default: () => {
+        return ['每日', '每周', '每月', '工作日', '自定义日期区间', '每月固定天数']
+      }
+    },
+    hasTime: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      form: {},
+      visible: false,
+      visibleSelect: false,
+      title: '新增',
+      options: [
+        {
+          label: '每日',
+          value: 1
+        },
+        {
+          label: '每周',
+          value: 2
+        },
+        {
+          label: '每月',
+          value: 3
+        },
+        {
+          label: '工作日',
+          value: 4
+        },
+        {
+          label: '自定义日期区间',
+          value: 5
+        },
+        {
+          label: '每月固定天数',
+          value: 6
+        }
+      ],
+      weeks: ['一', '二', '三', '四', '五', '六', '日'],
+      months: [
+        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+        31
+      ],
+      index: '',
+      showValue: [],
+      filterOptions: []
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {
+    console.log(this.optionsSelect)
+    this.filterOptions = JSON.parse(JSON.stringify(this.options)).filter(item => {
+      return this.optionsSelect.includes(item.label)
+    })
+    this.setView()
+  },
+  methods: {
+    setView() {
+      this.showValue = this.value.map(item => {
+        const type = this.options.find(item2 => {
+          return item2.value === item.type
+        }).label
+        let week = ''
+        if (item.type === 2) {
+          week = item.value
+        } else if (item.type === 3) {
+          week = item.value + '日'
+        } else if (item.type === 5) {
+          week = `${item.term.start}-${item.term.end}`
+        } else if (item.type === 6) {
+          week = `${item.value.toString()}`
+        }
+        const time = item.time || ''
+        return type + week + time
+      })
+    },
+    close() {
+      this.form = {}
+    },
+    handle(type, row, index) {
+      switch (type) {
+        case '新增':
+          this.index = ''
+          this.title = '新增'
+          this.visible = true
+          this.form = {
+            term: { start: '', end: '' }
+          }
+          // this.value.push({})
+          break
+        case '编辑':
+          this.title = '编辑'
+          this.index = index
+          this.form = JSON.parse(JSON.stringify(row))
+          this.visible = true
+          break
+        case '取消':
+          this.form = {}
+          this.visible = false
+          break
+        case '确定':
+          if (this.index !== '') {
+            this.value[this.index] = this.form
+          } else {
+            this.value.push(this.form)
+          }
+          this.setView()
+          this.visible = false
+          break
+        case '删除':
+          this.$msgboxPor({
+            title: '确认要删除吗？',
+            message: '',
+            type: 'warning',
+            customClass: 'question',
+            confirmButtonText: '确定',
+            cancelButtonText: '取消'
+          }).then(() => {
+            this.value.splice(index, 1)
+            this.setView()
+          })
+          break
+        default:
+          break
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.list {
+  li {
+    height: 24px;
+    line-height: 24px;
+  }
+}
+</style>

package/src/components/DatePicker/por.vue

@@ -3,7 +3,7 @@
     ref="date-picker"
     v-model="valueC"
     class="n20-date-editor"
-    :class="{ 'has-value': clearable && valueC }"
+    :class="{ 'has-value': clearable && valueC, [this.$attrs && this.$attrs['rule-form']]: !valueC }"
     :type="type"
     :value-format="valueFormat"
     :placeholder="'选择日期' | $lc"

package/src/components/Descriptions/index.vue

@@ -1,6 +1,9 @@
 <template>
   <el-descriptions class="n20-descriptions" :column="column" size="default" border>
     <slot></slot>
+    <template v-if="this.$slots.default.length === 1">
+      <el-descriptions-item v-for="(item, index) in column - 1" :key="index" />
+    </template>
   </el-descriptions>
 </template>
 
@@ -13,6 +16,7 @@ export default {
     }
   },
   created() {
+    console.log(this.$slots.default)
     this.resize()
     window.addEventListener('resize', this.resize)
   },

package/src/components/ElectronicArchive/index.vue

@@ -622,6 +622,7 @@ export default {
           deptno: this.userInfo.cltno,
           memo: options.file.name,
           recordname: options.file.name,
+          branchNo: this.userInfo.branchNo,
           fileSize: options.file.size
         }
       ]

package/src/components/FileUploadTable/index.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="file-upload-table">
     <div class="flex-box flex-v flex-lr m-b-s">
-      <div><slot name="title"></slot></div>
+      <div>
+        <slot name="title"></slot>
+      </div>
       <div>
         <slot v-if="!readonly" name="add-btn">
           <el-button type="primary" size="mini" @click="addRow">{{ '新增' | $lc }}</el-button>
@@ -9,6 +11,9 @@
         <slot v-if="!readonly && showBatchUpload" name="batch-btn">
           <el-button size="mini" plain @click="visibleBatch = true">{{ '批量上传' | $lc }}</el-button>
         </slot>
+        <slot v-if="!readonly && showBatchPrint" name="batch-btn">
+          <el-button size="mini" plain @click="batchPrint">{{ '批量打印' | $lc }}</el-button>
+        </slot>
         <slot name="down-btn">
           <el-button size="mini" plain @click="downRows">{{ '下载' | $lc }}</el-button>
         </slot>
@@ -73,17 +78,17 @@
           </slot>
         </el-table-column>
         <el-table-column v-if="readonly" :label="'附件上传' | $lc" :prop="keys.name">
-          <slot slot="header" slot-scope="scope" name="upload-header" :column="scope.column">{{
-            '附件上传' | $lc
-          }}</slot>
+          <slot slot="header" slot-scope="scope" name="upload-header" :column="scope.column"
+            >{{ '附件上传' | $lc }}
+          </slot>
           <slot slot-scope="{ row }" name="upload" :row="row">
             {{ $options.filters.fileName(row, keys.url) || row[keys.name] }}
           </slot>
         </el-table-column>
         <el-table-column v-if="!readonly" :label="'附件上传' | $lc">
-          <slot slot="header" slot-scope="scope" name="upload-header" :column="scope.column">{{
-            '附件上传' | $lc
-          }}</slot>
+          <slot slot="header" slot-scope="scope" name="upload-header" :column="scope.column"
+            >{{ '附件上传' | $lc }}
+          </slot>
           <slot slot-scope="{ row, $index }" name="upload" :row="row" :[indexK]="$index">
             <Upload
               :ref="'upload' + $index"
@@ -127,7 +132,7 @@
         </template>
         <template slot-scope="{ row, $index }">
           <slot name="percent" :row="row" :[indexK]="$index">
-            <div v-if="row['_percent'] >= 0 && !row._typeDisabled" class="flex-box flex-v">
+            <div v-if="row['_percent'] >= 0 && !readonly" class="flex-box flex-v">
               <el-progress
                 class="n20-upload-table-progress"
                 :percentage="row['_percent']"
@@ -141,16 +146,16 @@
                 size="mini"
                 style="width: 60px"
                 @click="anewSubmitFn(row, $index)"
-                >{{ '重新上传' | $lc }}</el-button
-              >
+                >{{ '重新上传' | $lc }}
+              </el-button>
               <el-button
                 v-else-if="row['_percent'] >= 0 && row['_percent'] < 100"
                 type="text"
                 size="mini"
                 style="width: 60px"
                 @click="abortFn(row, $index)"
-                >{{ '取消' | $lc }}</el-button
-              >
+                >{{ '取消' | $lc }}
+              </el-button>
             </div>
           </slot>
         </template>
@@ -264,6 +269,19 @@ const ViewerImg = async function () {
   let { component } = await importG('v-viewer', () => import(/*webpackChunkName: "v-viewer"*/ 'v-viewer'))
   return component
 }
+const keysDefault = {
+  rowKey: 'id',
+  type: 'type',
+  name: 'name',
+  url: 'url',
+  time: 'time',
+  user: 'user'
+}
+const typeOptionsDefault = [
+  { type: '001', label: $lc('信贷合同') },
+  { type: '002', label: $lc('贴现合同') },
+  { type: '003', label: $lc('其他合同') }
+]
 
 export default {
   name: 'FileUploadTable',
@@ -315,7 +333,8 @@ export default {
       default: () => /\.(jpg|png|gif|svg|pdf)$/i
     },
     height: {
-      type: [String, Number]
+      type: [String, Number],
+      default: '300px'
     },
     tableData: {
       type: Array,
@@ -329,6 +348,10 @@ export default {
       type: Boolean,
       default: false
     },
+    showBatchPrint: {
+      type: Boolean,
+      default: false
+    },
     uploadHttpRequest: {
       type: Function,
       default: undefined
@@ -393,16 +416,67 @@ export default {
       return this.dataPorp.fileData || undefined
     },
     typeOptions() {
-      return this.dataPorp.typeOptions || typeOptionsD
+      return this.dataPorp.typeOptions || typeOptionsDefault
     },
     keys() {
-      return this.dataPorp.keys || keysD
+      return this.dataPorp.keys || keysDefault
     },
     multiple() {
       return this.dataPorp.multiple ?? true
     }
   },
   methods: {
+    async batchPrint() {
+      if (!this.selectionList.length) {
+        return this.$message({
+          message: $lc(`请先勾选要打印的数据！`),
+          type: 'warning',
+          showClose: true
+        })
+      }
+      let selectionList = await this.setUrlData(this.selectionList)
+
+      const { printJS } = await import('../../plugins/Print')
+
+      // 打印PDF文件的函数
+      function printPdf(item, index) {
+        printJS({
+          printable: item.pathUrl,
+          type: item.printType,
+          onPrintDialogClose: function () {
+            // 如果还有剩余的PDF文件，则继续打印下一个
+            if (index < selectionList.length - 1) {
+              printPdf(selectionList[index + 1], index + 1)
+            } else {
+              // 所有PDF文件都已打印完毕
+              console.log('所有PDF文件打印完成')
+            }
+          },
+          onError: (error) => {
+            console.error('打印PDF文件出错：', error)
+          }
+        })
+      }
+      // 开始打印第一个PDF文件
+      if (selectionList.length > 0) {
+        printPdf(selectionList[0], 0)
+      }
+    },
+    async setUrlData(selectionList) {
+      let list = selectionList.map((item) => {
+        axios
+          .get(`/api/neams/eamsbaserecord/download/${item[this.keys.url]}?t=${Date.now()}`, null, {
+            responseType: 'blob'
+          })
+          .then((res) => {
+            item.pathUrl = URL.createObjectURL(res)
+            let extension = item['_name'].split('.').pop().toLowerCase()
+            item.printType = extension === 'pdf' ? 'pdf' : 'image'
+          })
+        return item
+      })
+      return await Promise.all(list)
+    },
     batchBeforeUploadFn(file) {
       let bu = this.$listeners['before-upload'] || this.$listeners['beforeUpload']
       if (bu) return bu(file)
@@ -558,6 +632,7 @@ export default {
       this.$set(row, '_percent', percent <= 99 ? Math.round(percent) : 99)
     },
     onSuccessFn(response, file, fileList, row) {
+      this.$set(row, '_typeDisabled', true)
       this.$set(row, '_name', file.name)
       this.$set(row, '_percent', 100)
       row[this.keys.time] = dayjs().format('YYYY-MM-DD HH:mm:ss')
@@ -624,20 +699,6 @@ export default {
     }
   }
 }
-
-const keysD = {
-  rowKey: 'id',
-  type: 'type',
-  name: 'name',
-  url: 'url',
-  time: 'time',
-  user: 'user'
-}
-const typeOptionsD = [
-  { type: '001', label: $lc('信贷合同') },
-  { type: '002', label: $lc('贴现合同') },
-  { type: '003', label: $lc('其他合同') }
-]
 </script>
 <style>
 .file-upload-table_preview-pn {

package/src/components/InputNumber/index.vue

@@ -165,6 +165,7 @@ export default {
 
       this.changeFn(this.valueStr)
       this.$emit('blur')
+      this.dispatch('ElFormItem', 'el.form.blur', [this.value])
     },
     clearFn() {
       this.$emit('clear')