n20-common-lib 1.3.73 → 1.3.75-0.2

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -15,12 +15,30 @@
         </div>
         <div v-if="authList.includes('isAddtask')" class="flex-1">
           <el-form-item label="加签" class="m-b">
-            <el-input
-              type="textarea"
-              :value="addTaskList.map((c) => c.uname).join(', ')"
-              :autosize="{ minRows: 1 }"
-              @focus="setAddtaskV = true"
-            />
+            <label slot="label">
+              <span>加签</span>
+              <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">
+                  会签并行：增加一个会签节点，全部审批人同意才可通过审批<br />
+                  普通串行：按照加签人数增加节点，每个节点审批通过才可完成当前加签流程
+                </div>
+              </el-tooltip>
+            </label>
+            <div class="flex-box">
+              <el-select v-model="addTaskType" placeholder="请选择审批方式" style="width: 10em">
+                <!-- <el-option label="普通节点" value="1" /> -->
+                <el-option label="会签并行" value="2" />
+                <el-option label="会签串行" value="3" />
+              </el-select>
+              <el-input
+                class="flex-item"
+                type="textarea"
+                :value="addTaskList.map((c) => c.uname).join(', ')"
+                :autosize="{ minRows: 1 }"
+                @focus="setAddtaskV = true"
+              />
+            </div>
           </el-form-item>
         </div>
       </div>
@@ -98,7 +116,8 @@ export default {
       setCarboncopyV: false,
       carbonCopyList: [],
       setAddtaskV: false,
-      addTaskList: []
+      addTaskList: [],
+      addTaskType: undefined
     }
   },
   computed: {
@@ -167,7 +186,8 @@ export default {
           signText: this.signText,
           isAgentcy: isAgentcy,
           carbonCopyUserDtoList: this.carbonCopyList.map((c) => ({ userNo: c.uno, userName: c.uname })),
-          addTaskList: this.addTaskList.map((c) => ({ userNo: c.uno, userName: c.uname }))
+          addTaskList: this.addTaskList.map((c) => ({ userNo: c.uno, userName: c.uname })),
+          addTaskType: this.addTaskType
         }
       ]
     },

package/src/utils/axios.js

@@ -57,13 +57,18 @@ const config = {
 }
 const axios = _axios.create(config)
 
+let langMap = { 'zh-cn': 'zh_CN', en: 'en_US', 'zh-hk': 'zh_TW' }
+let langKey = window.localStorage.getItem('pageLang') || 'zh-cn'
+let reqLang = langMap[langKey]
+
 axios.interceptors.request.use((opt) => {
   let token = auth.getToken()
   let headers = {
     Authorization: token ? 'Bearer ' + token : 'Basic TlNUQzpWVkIxVG1sVlVURlNMemxyTkhoc2VtNXdObFJaUVQwOQ==',
     OperationDesc: opt.OperationDesc ? encodeURI(opt.OperationDesc) : 'default',
     timestamp: Date.now(),
-    requestKey: Date.now()
+    requestKey: Date.now(),
+    lang: reqLang
   }
   opt.headers = Object.assign(headers, opt.headers)