n20-common-lib 2.9.13 → 2.9.14

package/src/components/ApprovalButtons/showOtherAttrNew.vue

@@ -0,0 +1,161 @@
+<template>
+  <div class="w-100p flex-column">
+    <div v-for="(item, i) in otherAttData" :key="i" class="flex-box flex-v">
+      <el-form-item
+        class="m-r-ss m-b-s"
+        :class="item.cfgHasRemark === '1' ? 'flex-auto' : 'flex-1'"
+        :label="item.cfgName"
+      >
+        <span slot="label">
+          <span v-if="required" style="color: red">*</span>
+          {{ item.cfgName }}
+        </span>
+        <el-input
+          v-if="['11'].includes(item.cfgType)"
+          v-model="item.cfgVal"
+          :type="'text'"
+          placeholder="请输入"
+          class="input-w"
+          clearable
+        />
+        <el-select
+          v-if="['21'].includes(item.cfgType)"
+          v-model="item.cfgVal"
+          class="flex-item input-w"
+          clearable
+          @change="(val) => changeFn(val, item)"
+        >
+          <el-option v-for="(row, i) in JSON.parse(item.cfgJson)" :key="i" :label="row.value" :value="row.code" />
+        </el-select>
+        <el-select
+          v-if="['31'].includes(item.cfgType)"
+          v-model="item.selectList"
+          multiple
+          collapse-tags
+          class="flex-item input-w"
+          clearable
+          @change="(val) => changeFn(val, item)"
+        >
+          <el-option v-for="(row, i) in JSON.parse(item.cfgJson)" :key="i" :label="row.value" :value="row.code" />
+        </el-select>
+        <el-radio-group
+          v-if="item.cfgType === '22'"
+          v-model="item.cfgVal"
+          class="input-w"
+          @change="(val) => changeFn(val, item)"
+        >
+          <el-radio v-for="(row, i) in JSON.parse(item.cfgJson)" :key="i" :label="row.code">{{ row.value }}</el-radio>
+        </el-radio-group>
+        <el-checkbox-group
+          v-if="item.cfgType === '32'"
+          v-model="item.checkList"
+          class="input-w"
+          @change="(val) => changeFn(val, item)"
+        >
+          <el-checkbox v-for="(row, i) in JSON.parse(item.cfgJson || '[]')" :key="i" :label="row.code">{{
+            row.value
+          }}</el-checkbox>
+        </el-checkbox-group>
+        <el-date-picker
+          v-if="item.cfgType === '33'"
+          v-model="item.cfgVal"
+          value-format="yyyy-MM-dd"
+          type="date"
+          class="input-w"
+          placeholder="选择日期"
+        />
+      </el-form-item>
+      <el-input
+        v-if="['12'].includes(item.cfgType)"
+        v-model="item.cfgVal"
+        :type="'textarea'"
+        placeholder="请输入"
+        class="w-100p m-r-ss m-b-s flex-1"
+        clearable
+      />
+      <el-input
+        v-if="item.cfgHasRemark === '1' && !['11', '12'].includes(item.cfgType)"
+        v-model="item.cfgRemark"
+        class="w-100p m-r-ss m-b-s flex-1"
+        placeholder="请输入备注"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from '../../utils/axios'
+export default {
+  props: {
+    taskId: {
+      type: [String, Number],
+      default: ''
+    },
+    form: {
+      type: Object,
+      default: () => ({})
+    },
+    otherAttDataA: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    required: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      checkList: [],
+      selectList: [],
+      otherAttData: []
+    }
+  },
+  mounted() {
+    this.getData(this.otherAttDataA)
+  },
+  methods: {
+    getData(data) {
+      if (data.length) {
+        this.otherAttData = data
+      }
+      if (this.taskId) {
+        axios.post(`/bems/admin/customization/${this.taskId}`, null, { loading: false }).then(({ data }) => {
+          if (data && data.length) {
+            this.otherAttData = data || []
+          }
+        })
+      }
+    },
+    changeFn(val, item) {
+      if (['31', '32'].includes(item.cfgType)) {
+        const cfgJson = JSON.parse(item.cfgJson)
+        item.cfgText = val
+          ?.map((s) => cfgJson?.find((row) => row.code === s)?.value)
+          ?.filter((s) => s)
+          .join(',')
+        item.cfgVal = val?.join(',')
+      }
+      if (['22', '21'].includes(item.cfgType)) {
+        const cfgJson = JSON.parse(item.cfgJson)
+        item.cfgText = cfgJson.find((row) => row.code === val)?.value
+        item.cfgVal = val
+      }
+    },
+    getOtherAttData() {
+      return this.otherAttData?.map((item) => {
+        return {
+          cfgName: item.cfgName,
+          cfgKey: item.cfgKey,
+          cfgVal: Array.isArray(item.cfgVal) ? item.cfgVal.join(',') : item.cfgVal,
+          cfgText: Array.isArray(item.cfgText) ? item.cfgText.join(',') : item.cfgText,
+          cfgHasRemark: item.cfgHasRemark,
+          cfgRemark: item.cfgRemark
+        }
+      })
+    }
+  }
+}
+</script>

package/src/components/ApprovalCard/index.vue

@@ -10,14 +10,18 @@
         <div>
           <div v-if="item.result === 0" class="flex-box flex-v">
             <div v-title="item.assignee" class="w-full n20-worker p-r-s text-ellipsis" :show-overflow-tooltip="true">
-              {{ item.assignee }}
+              {{ $lc(item.assignee) }}
             </div>
           </div>
           <div v-if="item.result === 5" class="flex-box">
-            <div class="result-left-name" :class="item | typeF(status, 'color-')">{{ $lc(item.resultName) }}</div>
+            <div class="result-left-name" :class="item | typeF(status, 'color-')">
+              {{ $lc(item.resultName) }}
+            </div>
           </div>
           <div v-else class="flex-box">
-            <div class="result-left-name" :class="item | typeF(status, 'color-')">{{ $lc(item.resultName) }}</div>
+            <div class="result-left-name" :class="item | typeF(status, 'color-')">
+              {{ $lc(item.resultName) }}
+            </div>
             <div
               v-title="item.assignee"
               class="flex-box flex-item n20-worker m-r-s text-ellipsis"
@@ -31,6 +35,23 @@
               >
                 {{ item.memberName }}
               </div>
+              <div
+                v-title="item.deptName"
+                :show-overflow-tooltip="true"
+                class="flex-item n20-worker m-r-s text-ellipsis"
+                style="width: 250px"
+              >
+                {{ item.deptName }}
+              </div>
+              <div
+                v-if="item.job"
+                v-title="item.job"
+                :show-overflow-tooltip="true"
+                class="flex-item n20-worker m-r-s text-ellipsis"
+                style="width: 250px"
+              >
+                {{ item.job }}
+              </div>
               <div
                 v-title="item.roleName"
                 class="flex-item n20-worker text-ellipsis"
@@ -51,29 +72,33 @@
               <div
                 v-if="item.result !== 0 && item.appOrPc !== null && item.appOrPc !== '' && item.appOrPc !== undefined"
               >
-                {{ item.appOrPc === '1' ? 'PC端审批' : 'App端审批' }}
+                {{ item.appOrPc === '1' ? 'PC端审批' : item.appOrPc === '2' ? '外部系统审批' : 'App端审批' | $lc }}
               </div>
-              <div class="m-l-s" v-if="item.showConnect === '1'">
+              <div v-if="item.showConnect === '1'" class="m-l-s">
                 <span class="pointer color-ccc f-s-s" @click="seeDetail(item)"
-                  >查看详情 <i class="el-icon-arrow-right"></i
+                  >{{ '查看详情' | $lc }} <i class="el-icon-arrow-right"></i
                 ></span>
               </div>
             </div>
           </div>
 
           <div v-if="item.ccUserName" class="n20-description-c m-t">{{ '抄送人：' | $lc }}{{ item.ccUserName }}</div>
-          <div v-if="item.addTaskName" class="n20-description-c m-t">
-            {{ '加签审批人：' | $lc }}{{ item.addTaskName }}
+          <div class="n20-description-c m-t flex-box flex-v">
+            <el-tag v-if="item.addTaskTag" class="m-r-s" effect="plain" type="info">{{
+              item.addTaskTag | remarkF(remarkOpt)
+            }}</el-tag>
+            <span v-if="item.addTaskName">{{ '加签审批人：' | $lc }}{{ item.addTaskName }}</span>
           </div>
+
           <template v-if="item.resultName !== '撤回' || showCtdMsg">
             <div v-if="item.subProcInitId" class="n20-description-c n20-description-bgc m-t p-a-s">
               <span class="color-primary pointer" @click="seeApproveChild(item.subProcInitId)"
                 >{{ item.suggestion }}<i class="n20-icon-shouqizhedie f-s-m"></i
               ></span>
 
-              <div class="n20-approve-wrap-children" v-if="showChildTimeline">
+              <div v-if="showChildTimeline" class="n20-approve-wrap-children">
                 <el-timeline :reverse="true">
-                  <el-timeline-item
+                  <div
                     v-for="(row, i) in approvalChildrenData"
                     :key="i"
                     :type="row | typeF(status)"
@@ -83,7 +108,7 @@
                       <div>{{ row.endTime | dataF }}</div>
                       <div>{{ row.endTime | timeF }}</div>
                     </div>
-                    <div>
+                    <template>
                       <div v-if="row.result === 0" class="flex-box flex-v">
                         <div
                           v-title="row.assignee"
@@ -115,6 +140,14 @@
                           >
                             {{ row.memberName }}
                           </div>
+                          <div
+                            v-title="row.deptName"
+                            :show-overflow-tooltip="true"
+                            class="flex-item n20-worker m-r-s text-ellipsis"
+                            style="width: 250px"
+                          >
+                            {{ row.deptName }}
+                          </div>
                           <div
                             v-title="row.roleName"
                             class="flex-item n20-worker text-ellipsis"
@@ -140,20 +173,101 @@
                       <div v-if="row.addTaskName" class="n20-description-c m-t">
                         {{ '加签审批人：' | $lc }}{{ row.addTaskName }}
                       </div>
-                      <template v-if="row.resultName !== '撤回' || showCtdMsg">
+                      <div v-if="row.resultName !== '撤回' || showCtdMsg">
                         <div v-if="row.suggestion" class="n20-description-c n20-description-bgc m-t p-a-s">
                           <span v-if="row.result !== status.waiting">{{ '审批意见：' | $lc }}</span>
-                          <span>{{ row.suggestion }} </span>
+                          <span style="line-height: 22px">{{ row.suggestion }} </span>
                         </div>
-                      </template>
-                    </div>
-                  </el-timeline-item>
+                        <div
+                          v-if="row.flowHistoryCfgs && row.flowHistoryCfgs.length"
+                          class="n20-description-c m-t p-a-s"
+                        >
+                          <span
+                            v-if="row.result !== status.waiting"
+                            class="color-primary pointer"
+                            @click="showFlowHistoryChild = !showFlowHistoryChild"
+                            >{{ '审查意见：' | $lc }} <i class="n20-icon-shouqizhedie f-s-m"></i
+                          ></span>
+                          <div v-show="showFlowHistoryChild" class="n20-description-bgc p-a-s">
+                            <div v-for="(s, i) in row.flowHistoryCfgs" :key="i">
+                              {{ s.cfgName }}：{{ s.cfgText ? s.cfgText : s.cfgVal }}
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <div
+                        v-if="row.flowHisFileList"
+                        class="n20-description-c n20-description-bgc"
+                        style="margin-top: 0 !important"
+                      >
+                        <span>{{ '附件信息' | $lc }}：</span>
+                        <div class="flex-box">
+                          <div
+                            v-for="(res, i) in row.flowHisFileList"
+                            :key="i"
+                            class="m-a-ss color-primary pointer"
+                            @click="preview(res)"
+                          >
+                            {{ res.fileName }}
+                          </div>
+                        </div>
+                        <Dialog
+                          v-drag
+                          class="p-a-0"
+                          :title="'附件预览' | $lc"
+                          :visible.sync="visibleP"
+                          top="2vh"
+                          width="96%"
+                          :close-on-click-modal="false"
+                          @close="closeSee"
+                        >
+                          <span class="file-upload-table_preview-pn">
+                            <el-button plain size="mini" @click="downFile(seeRow)">下载</el-button>
+                          </span>
+                          <div v-if="visibleP" class="p-a" style="height: 82vh">
+                            <!-- <ViewerImg v-if="imgType.test(previewName)" :options="viewerOptions" style="height: 100%">
+                    <img :src="previewUrl" :alt="previewName" style="display: none" />
+                  </ViewerImg> -->
+                            <component
+                              :is="previewSameOrg ? 'object' : 'div'"
+                              :key="previewUrl"
+                              :data="previewUrl"
+                              style="width: 100%; height: 100%"
+                            >
+                              <div class="flex-column flex-c flex-v" style="height: 100%">
+                                <i class="el-icon-s-release" style="font-size: 60px; color: #999"></i>
+                                <span style="margin-top: 16px">
+                                  {{ '不支持在线预览，请' | $lc
+                                  }}<el-link type="primary" @click="downFile(seeRow)">{{ '下载' | $lc }}</el-link
+                                  >{{ '到本地查看' | $lc }}
+                                </span>
+                              </div>
+                            </component>
+                          </div>
+                        </Dialog>
+                      </div>
+                    </template>
+                  </div>
                 </el-timeline>
               </div>
             </div>
             <div v-if="!item.subProcInitId && item.suggestion" class="n20-description-c n20-description-bgc m-t p-a-s">
               <span v-if="item.result !== status.waiting">{{ '审批意见：' | $lc }}</span>
-              <span>{{ item.suggestion }} </span>
+              <span style="line-height: 22px">{{ item.suggestion }} </span>
+            </div>
+            <div v-if="item.flowHistoryCfgs && item.flowHistoryCfgs.length" class="n20-description-c m-t p-a-s">
+              <span
+                v-if="item.result !== status.waiting"
+                class="color-primary pointer"
+                @click="showFlowHistory = !showFlowHistory"
+                >{{ '审查意见：' | $lc }}<i class="n20-icon-shouqizhedie f-s-m"></i
+              ></span>
+              <div v-show="showFlowHistory" class="n20-description-bgc p-a-s">
+                <div v-for="(s, i) in item.flowHistoryCfgs" :key="i" class="p-b-s">
+                  <div>{{ s.cfgName }}：{{ s.cfgText ? s.cfgText : s.cfgVal }}</div>
+                  <div>{{ s.cfgRemark }}</div>
+                </div>
+              </div>
             </div>
             <div v-if="item.flowHisFileList" class="n20-description-c n20-description-bgc m-t p-a-s">
               <span>{{ '附件信息' | $lc }}：</span>
@@ -181,12 +295,11 @@
                   <el-button plain size="mini" @click="downFile(seeRow)">下载</el-button>
                 </span>
                 <div v-if="visibleP" class="p-a" style="height: 82vh">
-                  <ViewerImg v-if="imgType.test(previewName)" :options="viewerOptions" style="height: 100%">
+                  <!-- <ViewerImg v-if="imgType.test(previewName)" :options="viewerOptions" style="height: 100%">
                     <img :src="previewUrl" :alt="previewName" style="display: none" />
-                  </ViewerImg>
+                  </ViewerImg> -->
                   <component
                     :is="previewSameOrg ? 'object' : 'div'"
-                    v-else
                     :key="previewUrl"
                     :data="previewUrl"
                     style="width: 100%; height: 100%"
@@ -244,6 +357,8 @@ export default {
           return prefix + 'danger'
         case status.end:
           return prefix + 'primary'
+        case status.revocation:
+          return prefix + 'warning'
         default:
           return undefined
       }
@@ -257,9 +372,16 @@ export default {
       let t = _t || ''
       let ts = t.split(' ') || ['', '']
       return ts[1]
+    },
+    remarkF(val, list) {
+      return list?.find((item) => item.code === val)?.name || val
     }
   },
   props: {
+    apiPrefix: {
+      type: String,
+      default: undefined
+    },
     close: {
       type: Boolean,
       default: false
@@ -272,7 +394,8 @@ export default {
         approval: 2,
         reject: 3,
         invalid: 4,
-        end: 5
+        end: 5,
+        revocation: 6
       })
     },
     approvalData: {
@@ -296,6 +419,7 @@ export default {
       navbar: false,
       button: false,
       title: true,
+
       toolbar: {
         zoomIn: true,
         zoomOut: true,
@@ -311,17 +435,20 @@ export default {
       }
     }
     return {
+      remarkOpt: [],
       showChildTimeline: false,
       approvalChildrenData: [],
       // 显示撤回意见,默认不显示
       showCtdMsg: window._approvalExtend['card.countermand.suggestion'] === true,
       visibleP: false,
       previewUrl: '',
-      imgType: /\.(jpg|png|gif|svg)$/i,
+      imgType: /\.(jpg|png1|gif|svg)$/i,
       previewName: '',
       previewSameOrg: false,
       seeTypes: /\.(jpg|png|gif|svg|pdf|swf|xlsx|xls|docx|doc)$/i,
-      seeRow: {}
+      seeRow: {},
+      showFlowHistory: true,
+      showFlowHistoryChild: true
     }
   },
   async created() {
@@ -334,7 +461,7 @@ export default {
     async seeDetail(item) {
       const { appUrl = {} } = await getJsonc('activiti/server-config.jsonc', null, true)
       if (appUrl[item._details.appNo]) {
-        let path = appUrl[item._details.appNo] + $l('/') + item._details.typeCode
+        let path = appUrl[item._details.appNo] + '/' + item._details.typeCode
         linkPush(path, {
           taskId: item._details.taskId,
           typeCode: item._details.typeCode,
@@ -363,9 +490,12 @@ export default {
         },
         { loading: !this.hideLoading }
       )
+
       let approvalData = []
       data?.forEach((item) => {
         let _item = {
+          job: item.job || '',
+          isShow: item.isShow, //是否显示
           endTime: item.endTime || '',
           assignee: item.assignee,
           suggestion: item.suggestion,
@@ -377,17 +507,27 @@ export default {
           subProcInitId: item.subProcInitId, // 子流程id
           appOrPc: item.appOrPc, // 终端标识 1 PC 2 APP
           showConnect: item.showConnect, // 是否显示查看详情
-          _details: item
+          _details: item,
+          deptName: item.deptName, // 部门
+          addTaskTag: item.addTaskTag, // 加签备注
+          flowHistoryCfgs: item.flowHistoryCfgs // 自定义字段
+        }
+        if (_item.addTaskTag && this.remarkOpt?.length === 0) {
+          this.getMdmDataDoc()
         }
         let resultName = item.optResult || ''
         resultName = resultName.split('-')
         resultName = resultName[resultName.length - 1]
         _item.resultName = resultName === $lc('推进') ? $lc('批准') : resultName
+        _item.resultNameA = resultName === $lc('推进') ? $lc('批准') : resultName
+        if (item.optName) {
+          _item.resultName = item.optName
+        }
         if (item.taskName === $lc('开始')) {
           _item.result = 1
-        } else if (_item.resultName === $lc('加签推进')) {
+        } else if (_item.resultNameA === $lc('加签推进')) {
           _item.result = 2
-        } else if (_item.resultName === $lc('作废')) {
+        } else if (_item.resultNameA === $lc('作废')) {
           _item.result = 4
         } else if (item.taskName === $lc('结束')) {
           _item.result = 5
@@ -403,7 +543,18 @@ export default {
 
         approvalData.push(_item)
       })
-      return approvalData
+      return (
+        approvalData?.filter((item) => {
+          return item.isShow !== '0'
+        }) || []
+      )
+    },
+    // 获取数据字典加签备注
+    async getMdmDataDoc() {
+      const { code, data } = await axios.get(`/bems/1.0/mdmDataDoc?t=${Math.random()}`, { typeCode: 'ADD_TASK_TAG' })
+      if (code === 200) {
+        this.remarkOpt = data || []
+      }
     },
     async preview(row) {
       this.visibleP = true
@@ -418,22 +569,17 @@ export default {
       this.visibleP = false
     },
     async downFile(row) {
-      const blob = await axios.get(`/api/neams/eamsbaserecord/download/${row.beid}`, null, {
-        responseType: 'blob',
-        loading: false
-      })
-      let url = URL.createObjectURL(blob)
-      if (url) {
-        let aDom = document.createElement('a')
-        aDom.href = url
-        aDom.download = row.fileName
-        aDom.click()
-
-        this.$nextTick(() => {
-          aDom = undefined
-          url && URL.revokeObjectURL(url)
-        })
-      }
+      const blob = await axios.get(
+        this.apiPrefix
+          ? this.apiPrefix + `/neams/eamsbaserecord/download/${row.beid}`
+          : `/neams/eamsbaserecord/download/${row.beid}`,
+        null,
+        {
+          responseType: 'blob',
+          loading: false
+        }
+      )
+      this.$downloadBlob(blob, blob.name)
     }
   }
 }