n20-common-lib 1.3.96 → 1.3.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.96",
+  "version": "1.3.98",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/ApprovalCard/index-zjk.vue

@@ -8,7 +8,10 @@
           <div>{{ item.endTime | timeF }}</div>
         </div>
         <div>
-          <div class="flex-box flex-v">
+          <div v-if="item.result === 0" class="flex-box flex-v">
+            <div class="n20-worker p-r-s">{{ item.assignee }}</div>
+          </div>
+          <div v-else class="flex-box flex-v">
             <div class="n20-worker p-r-s" style="width: 300px">{{ item.memberName }}</div>
             <div class="n20-worker p-r-s" style="width: 150px">{{ item.roleName }}</div>
             <div class="n20-worker p-r-s text-c" style="width: 80px">{{ item.assignee }}</div>
@@ -17,6 +20,7 @@
             </div>
             <div class="flex-item">{{ item.suggestion }}</div>
           </div>
+
           <div v-if="item.ccUserName" class="n20-description-c m-t">抄送人：{{ item.ccUserName }}</div>
         </div>
       </el-timeline-item>
@@ -96,6 +100,7 @@ export default {
               endTime: item.endTime || '',
               assignee: item.assignee,
               suggestion: item.suggestion,
+              roleName: item.roleName,
               ccUserName: item.ccUserName, // 抄送人
               memberName: item.memberName // 审批人单位
             }

package/src/components/ApprovalCard/index.vue

@@ -16,9 +16,9 @@
             <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>
+              <template v-else-if="item.result !== status.waiting">
                 <span>{{ '审批意见：' | $lc }}</span>
-                <span :class="item | typeF(status, 'color-')">{{ $lc(item.resultName || '驳回') }}</span>
+                <span :class="item | typeF(status, 'color-')">{{ $lc(item.resultName) }}</span>
               </template>
             </div>
           </div>

package/src/components/Filters/index.vue

@@ -23,7 +23,7 @@
           <slot v-if="item.slotName" :name="item.slotName"></slot>
           <form-item-input v-else :form="form" :item="item" />
         </el-form-item>
-        <template v-if="filterList.length > defaultShow">
+        <template v-if="filterLT.length > defaultShow">
           <div :style="{ paddingLeft: labelWidth }">
             <el-button class="p-t-0 m-b-s color-primary" type="text" @click="moreFn"
               ><span>{{ '更多条件' | $lc }}</span
@@ -56,7 +56,8 @@
           ref="setRemote"
           :dialog-visible.sync="setRemoteV"
           :check-columns="remoteList"
-          :columns="filterList"
+          :columns="filterLT"
+          :columns-groups="filterGp"
           :is-filter="true"
           :auto-save="true"
           :page-id="pageId"
@@ -110,6 +111,10 @@ export default {
     filterId: {
       type: String,
       default: undefined
+    },
+    isGroup: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -123,11 +128,29 @@ export default {
     }
   },
   computed: {
+    filterLT() {
+      if (!this.isGroup) {
+        return this.filterList
+      } else {
+        let list = []
+        this.filterList.forEach((gp) => {
+          if (gp.children) {
+            gp.children.forEach((col) => {
+              list.push(Object.assign({}, col, { groupId: gp.groupId }))
+            })
+          }
+        })
+        return list
+      }
+    },
+    filterGp() {
+      return !this.isGroup ? undefined : this.filterList.map((gp) => ({ groupId: gp.groupId, groupName: gp.groupName }))
+    },
     minList() {
-      return this.filterList.slice(0, this.defaultShow)
+      return this.filterLT.slice(0, this.defaultShow)
     },
     moreList() {
-      return this.filterList.slice(this.defaultShow)
+      return this.filterLT.slice(this.defaultShow)
     },
     pageId() {
       return 'filter:' + this.filterId
@@ -176,18 +199,18 @@ export default {
       }
     },
     setOptions(key, opts) {
-      let item = this.filterList.find((f) => f.value === key)
+      let item = this.filterLT.find((f) => f.value === key)
       if (item) {
         item.options = opts || []
       }
     },
     getRemote() {
-      getColumns(this.pageId, this.userNo, this.filterList).then((list) => {
+      getColumns(this.pageId, this.userNo, this.filterLT).then((list) => {
         if (list) {
           this.remoteList = list
         } else {
-          let defaultList = this.filterList.filter((col) => col.isDefault)
-          this.remoteList = defaultList.length ? defaultList : this.filterList.slice(0, this.defaultShow)
+          let defaultList = this.filterLT.filter((col) => col.isDefault)
+          this.remoteList = defaultList.length ? defaultList : this.filterLT.slice(0, this.defaultShow)
         }
         this.showPop = true
       })

package/src/components/ShowColumn/index.vue

@@ -25,15 +25,33 @@
           </div>
           <div class="flex-item p-r" style="height: 50%; overflow: auto">
             <el-checkbox-group :value="dragList.map((d) => d[labelKey])">
-              <el-checkbox
-                v-for="(column, i) in columnsAs"
-                :key="i"
-                :label="column[labelKey]"
-                :disabled="column.checked"
-                class="m-t"
-                @change="(val) => checkChange(val, column)"
-                >{{ column[labelKey] }}</el-checkbox
-              >
+              <template v-if="!columnsGroups">
+                <el-checkbox
+                  v-for="(column, i) in columnsAs"
+                  :key="i"
+                  :label="column[labelKey]"
+                  :disabled="column.checked"
+                  class="m-t"
+                  @change="(val) => checkChange(val, column)"
+                  >{{ column[labelKey] }}</el-checkbox
+                >
+              </template>
+              <template v-else>
+                <div v-for="gp in columnsGroups" :key="gp.groupId" class="m-b">
+                  <div class="f-s-b font-w600">{{ gp.groupName }}</div>
+                  <template v-for="(column, i) in columnsAs">
+                    <el-checkbox
+                      v-if="column.groupId === gp.groupId"
+                      :key="i"
+                      :label="column[labelKey]"
+                      :disabled="column.checked"
+                      class="m-t"
+                      @change="(val) => checkChange(val, column)"
+                      >{{ column[labelKey] }}</el-checkbox
+                    >
+                  </template>
+                </div>
+              </template>
             </el-checkbox-group>
           </div>
         </div>
@@ -54,6 +72,7 @@
     </div>
   </dialog-wrap>
 </template>
+
 <script>
 import { $lc } from '../../utils/i18n/index'
 import axios from '../../utils/axios'
@@ -72,6 +91,10 @@ export default {
       type: Array,
       default: () => []
     },
+    columnsGroups: {
+      type: Array,
+      default: undefined
+    },
     checkColumns: {
       type: Array,
       default: () => []