n20-common-lib 1.3.98 → 1.3.100

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.98",
+  "version": "1.3.100",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -49,6 +49,7 @@
     "panzoom": "*",
     "qrcode": "*",
     "resize-detector": "*",
+    "v-viewer": "*",
     "vuedraggable": "*"
   },
   "devDependencies": {

package/src/assets/css/cl-approve-card.scss

@@ -2,7 +2,7 @@
   $--pl: 80px;
 
   .el-timeline {
-    padding-left: $--pl;
+    padding-left: 120px;
     padding-top: 10px;
   }
 
@@ -16,10 +16,9 @@
 
   .el-timeline-item__content {
     cursor: default;
-
-    &:hover {
-      background: $--background-color-base;
-    }
+  }
+  .result-left-name {
+    width: 20%;
   }
 
   .n20-time {
@@ -36,7 +35,6 @@
   }
 
   .n20-worker {
-    // width: 150px;
     font-weight: initial;
     font-size: $--font-size-base;
     color: $--color-text-primary;
@@ -64,4 +62,9 @@
     font-size: $--font-size-base;
     color: $--color-text-regular;
   }
+  .n20-description-bgc {
+    background: $--background-color-base;
+    height: 100%;
+    min-height: 40px;
+  }
 }

package/src/components/ApprovalCard/index.vue

@@ -8,25 +8,44 @@
           <div>{{ item.endTime | timeF }}</div>
         </div>
         <div>
-          <div class="flex-box">
-            <div v-title="item.assignee" class="n20-worker flex-item m-r-s text-ellipsis" :show-overflow-tooltip="true">
-              <span class="worker-icon n20-icon-user"></span>
-              <span>{{ item.assignee }}</span>
-            </div>
-            <div class="n20-approval m-r-s" style="width: auto; min-width: 100px">
-              <template v-if="item.result == status.submit">{{ '提交' | $lc }}</template>
-              <template v-else-if="item.result == status.end">{{ '结束' | $lc }}</template>
-              <template v-else-if="item.result !== status.waiting">
-                <span>{{ '审批意见：' | $lc }}</span>
-                <span :class="item | typeF(status, 'color-')">{{ $lc(item.resultName) }}</span>
-              </template>
-            </div>
+          <div v-if="item.result === 0" class="flex-box flex-v">
+            <div class="n20-worker p-r-s">{{ item.assignee }}</div>
           </div>
-          <div v-if="item.suggestion" class="n20-description-c m-t">
-            {{ item.suggestion }}
+          <div v-else class="flex-box">
+            <div class="result-left-name" :class="item | typeF(status, 'color-')">{{ $lc(item.resultName) }}</div>
+            <div v-title="item.assignee" class="flex-box n20-worker m-r-s text-ellipsis" :show-overflow-tooltip="true">
+              <div
+                v-title="item.memberName"
+                :show-overflow-tooltip="true"
+                class="n20-worker m-r-s text-ellipsis"
+                style="width: 130px"
+              >
+                {{ item.memberName }}
+              </div>
+              <div
+                v-title="item.roleName"
+                class="n20-worker text-ellipsis"
+                :show-overflow-tooltip="true"
+                style="width: 130px"
+              >
+                {{ item.roleName }}
+              </div>
+              <div
+                v-title="item.assignee"
+                class="n20-worker text-ellipsis"
+                style="width: 120px"
+                :show-overflow-tooltip="true"
+              >
+                <span class="worker-icon n20-icon-user"></span>{{ item.assignee }}
+              </div>
+            </div>
           </div>
           <div v-if="item.ccUserName" class="n20-description-c m-t">抄送人：{{ item.ccUserName }}</div>
           <div v-if="item.addTaskName" class="n20-description-c m-t">加签审批人：{{ item.addTaskName }}</div>
+          <div v-if="item.suggestion" class="n20-description-c n20-description-bgc m-t p-a-ss">
+            <span v-if="item.result !== status.waiting">{{ '审批意见：' | $lc }}</span>
+            <span v-if="item.suggestion">{{ item.suggestion }}</span>
+          </div>
         </div>
       </el-timeline-item>
     </el-timeline>
@@ -105,8 +124,10 @@ export default {
               endTime: item.endTime || '',
               assignee: item.assignee,
               suggestion: item.suggestion,
+              roleName: item.roleName,
               ccUserName: item.ccUserName, // 抄送人
-              addTaskName: item.addTaskName // 加签审批人
+              addTaskName: item.addTaskName, // 加签审批人
+              memberName: item.memberName // 审批人单位
             }
             let resultName = item.optResult || ''
             resultName = resultName.split('-')
@@ -134,6 +155,7 @@ export default {
             approvalData.push(_item)
           })
           this.approvalData.push(...approvalData)
+          console.log(this.approvalData)
         })
     }
   }

package/src/components/FileUploadTable/index.vue

@@ -248,8 +248,14 @@
       append-to-body
       @close="closeSee"
     >
-      <div v-if="imgType.test(previewName)" class="p-a flex-box flex-c flex-v" style="height: 82vh">
-        <img :src="previewUrl" :alt="previewName" style="max-width: 98%; max-height: 98%" />
+      <div
+        v-if="imgType.test(previewName)"
+        id="previewId"
+        v-viewer="{ scalable: false, inline: true, navbar: false }"
+        class="p-a flex-box flex-c flex-v"
+        style="height: 82vh"
+      >
+        <img :src="previewUrl" :alt="previewName" style="display: none" />
       </div>
       <div v-else class="p-a" style="height: 82vh">
         <component
@@ -303,16 +309,25 @@
 
 <script>
 import { $lc } from '../../utils/i18n/index'
+import importG from '../../utils/importGlobal'
 import dayjs from 'dayjs'
 import axios from '../../utils/axios'
 import clUpload from '../Upload/index.vue'
 import Dialog from '../Dialog/index.vue'
+
+import 'viewerjs/dist/viewer.css'
+import { directive as viewer } from 'v-viewer'
 export default {
   name: 'FileUploadTable',
   components: {
     clUpload,
     Dialog
   },
+  directives: {
+    viewer: viewer({
+      debug: true
+    })
+  },
   filters: {
     typeFiter(type, typeOptions) {
       return typeOptions.find((c) => c.type === type)?.label || ''
@@ -478,6 +493,8 @@ export default {
         this.previewName = name
         this.visibleP = true
       }
+      let ele = document.getElementById('previewId').$viewer
+      ele.show()
     },
     closeSee() {
       this.previewUrl && URL.revokeObjectURL(this.previewUrl)