n20-common-lib 2.6.65 → 2.6.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.6.65",
+  "version": "2.6.67",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/ApprovalButtons/index.vue

@@ -36,14 +36,34 @@
               :placeholder="'请选择加签类型' | $lc"
               style="width: 10em"
             >
-              <el-option
-                v-if="authList.includes('isAddForwardTask') || preAddTask"
-                :label="'向前加签' | $lc"
-                value="2"
-              />
-              <el-option v-if="authList.includes('isAddtask') || preAddTask" :label="'向后加签' | $lc" value="1" />
+              <el-option v-if="addTaskModel === '1'" :label="'向后加签' | $lc" value="1" />
+              <template v-else>
+                <el-option
+                  v-if="authList.includes('isAddForwardTask') || preAddTask"
+                  :label="'向前加签' | $lc"
+                  value="2"
+                />
+                <el-option
+                  v-if="addTaskModel === '1' || authList.includes('isAddtask') || preAddTask"
+                  :label="'向后加签' | $lc"
+                  value="1"
+                />
+              </template>
             </el-select>
             <el-select
+              v-if="addTaskModel === '1'"
+              v-model="addTaskType"
+              disabled
+              clearable
+              :placeholder="'请选择审批方式' | $lc"
+              style="width: 10em"
+            >
+              <el-option :label="'普通节点' | $lc" value="1" />
+              <el-option :label="'会签并行' | $lc" value="2" />
+              <el-option :label="'普通串行' | $lc" value="3" />
+            </el-select>
+            <el-select
+              v-else
               v-model="addTaskType"
               disabled
               clearable
@@ -304,6 +324,7 @@ export default {
       approvalToV: false,
       showApprovalTo: false,
       opiAndUser: false,
+      addTaskMode: '0',
       otherAtt: {},
       fileDtos: [],
       fileName: '',
@@ -361,6 +382,16 @@ export default {
         })
       })
     },
+    // 获取加签方式的模式
+    getAddTaskMode() {
+      axios
+        .get(`/bems/activiti/sample/getAddTaskMode`, null, { loading: false, noMsg: true })
+        .then(({ data, code }) => {
+          if (code === 200) {
+            this.addTaskMode = data
+          }
+        })
+    },
 
     // 换回到发起页
     goFrom() {

package/src/components/TablePro/index.vue

@@ -222,7 +222,7 @@ export default {
       }
       $table.toggleCheckboxRow(row)
       this.key++
-      this.handleSelectionChange()
+      this.handleSelectionChange(row)
     },
     customSortMethod({ sortList }) {
       const orders = sortList.map((item) => {
@@ -263,9 +263,10 @@ export default {
         this.$emit('filter-change-method', obj)
       }
     },
-    handleSelectionChange() {
+    // row当前单次勾选的哪一行数据 包含checked字段
+    handleSelectionChange(row = '') {
       const val = this.$refs.vxeTable.getCheckboxRecords()
-      this.$emit('selection-change-method', val)
+      this.$emit('selection-change-method', val, row)
     },
     sizeUp(size) {
       this.sizeC = size