n20-common-lib 2.4.39 → 2.4.41

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -14,13 +14,13 @@
         <el-form-item v-if="authList.includes('isAddtask')" :label="'加签' | $lc" :error="addMsg" class="flex-1 m-b-s">
           <label slot="label">
             <span>{{ '加签' | $lc }}</span>
-            <el-tooltip placement="top">
+            <!-- <el-tooltip placement="top">
               <span class="n20-icon-xinxitishi m-l-ss" style="position: static"></span>
               <div slot="content" style="width: 16em; line-height: 1.6">
                 {{ '会签并行：增加一个会签节点，全部审批人同意才可通过审批' | $lc }}<br />
                 {{ '普通串行：按照加签人数增加节点，每个节点审批通过才可完成当前加签流程' | $lc }}
               </div>
-            </el-tooltip>
+            </el-tooltip> -->
           </label>
           <div class="flex-box">
             <el-select
@@ -30,15 +30,20 @@
               clearable
               :placeholder="'请选择加签类型' | $lc"
               style="width: 10em"
-              @change="() => addTaskWay === '2' && addTaskType === '2' && (addTaskType = '3')"
             >
               <el-option :label="'向前加签' | $lc" value="2" />
               <el-option :label="'向后加签' | $lc" value="1" />
             </el-select>
-            <el-select v-model="addTaskType" clearable :placeholder="'请选择审批方式' | $lc" style="width: 10em">
-              <!-- <el-option :label="'普通节点' | $lc" value="1" /> -->
-              <el-option :label="'会签并行' | $lc" value="2" :disabled="addTaskWay === '2'" />
-              <el-option :label="'普通串行' | $lc" value="3" />
+            <el-select
+              v-model="addTaskType"
+              disabled
+              clearable
+              :placeholder="'请选择审批方式' | $lc"
+              style="width: 10em"
+            >
+              <el-option :label="'普通节点' | $lc" value="1" />
+              <!-- <el-option :label="'会签并行' | $lc" value="2" :disabled="addTaskWay === '2'" /> -->
+              <!-- <el-option :label="'普通串行' | $lc" value="3" /> -->
             </el-select>
             <el-input
               class="flex-item"
@@ -95,8 +100,10 @@
         />
       </el-form-item>
     </el-form>
-
-    <div class="text-c">
+    <div v-if="authList.includes('byAddTask') && addTaskList.length > 0" class="text-c">
+      <el-button v-if="authList.includes('approval')" type="primary" @click="approvalFn">{{ '加 签' | $lc }}</el-button>
+    </div>
+    <div v-else class="text-c">
       <el-button v-if="authList.includes('approval')" type="primary" @click="approvalFn">{{ '批 准' | $lc }}</el-button>
       <el-button v-if="showApprovalTo" type="primary" @click="approvalToV = true">{{ '批准至' | $lc }}</el-button>
       <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ '驳回至' | $lc }}</el-button>
@@ -250,7 +257,7 @@ export default {
       addMsg: undefined,
       setAddtaskV: false,
       addTaskList: [],
-      addTaskType: undefined,
+      addTaskType: '1',
       preAddTask: false,
       addTaskWay: undefined,
       rejectToV: false,

package/src/components/FileImport/index.vue

@@ -55,6 +55,10 @@ export default {
       type: Function,
       default: undefined
     },
+    customTemplateDownload: {
+      type: Function,
+      default: undefined
+    },
     validateResult: {
       type: Object,
       default: undefined
@@ -118,9 +122,13 @@ export default {
       })
     },
     downFn() {
-      axios.get(this.templateUrl, null, { responseType: 'blob', ...this.templateOpt }).then((blob) => {
-        downloadBlob(blob, this.fileName)
-      })
+      if (this.customTemplateDownload) {
+        this.customTemplateDownload()
+      } else {
+        axios.get(this.templateUrl, null, { responseType: 'blob', ...this.templateOpt }).then((blob) => {
+          downloadBlob(blob, this.fileName)
+        })
+      }
     }
   }
 }

package/src/components/Layout/TabsNav/index.vue

@@ -50,8 +50,6 @@ export default {
   },
   methods: {
     tabClick(C) {
-      console.log(C)
-
       let item = C.$attrs['tab-info']
       this.$emit('tab-click', item)
     },

package/src/components/Table/index.vue

@@ -167,7 +167,7 @@ export default {
     let _this = this
     return {
       colsKey: 0,
-      sizeC: _this.size,
+      sizeC: localStorage.getItem('table-size') || _this.size,
       sizeBind: undefined
     }
   },

package/src/components/TableSetSize/index.vue

@@ -39,21 +39,21 @@ export default {
   data() {
     let _this = this
     return {
-      sizeC: _this.size
+      sizeC: localStorage.getItem('table-size') || _this.size
     }
   },
   watch: {
     size() {
-      this.setSize(this.size, 'pasv')
+      this.setSize(localStorage.getItem('table-size') || this.size, 'pasv')
     }
   },
   created() {
-    this.setSize(this.size, 'pasv')
+    this.setSize(localStorage.getItem('table-size') || this.size, 'pasv')
   },
   methods: {
     setSize(type, t) {
       this.sizeC = type
-
+      localStorage.setItem('table-size', type)
       if (type === 'mini') {
         this.$emit('resize', this.mini)
       } else if (type === 'small') {
@@ -61,7 +61,7 @@ export default {
       }
 
       if (t !== 'pasv') {
-        this.$emit('update:size', type)
+        this.$emit('update:size', localStorage.getItem('table-size') || type)
       }
     }
   }

package/src/i18n.json

@@ -830,6 +830,9 @@
   "批准": {
     "en": "Approval"
   },
+  "加 签": {
+    "en": "Add signature"
+  },
   "消息中心": {
     "en": "Message center"
   },