Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/bpm/model/index.vue

@@ -46,7 +46,7 @@
     </el-card>
 
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="流程分类" prop="processTypeId">
           <!--          <el-select v-model="form.processTypeId" clearable style="width: 100%" @change="handleProcessType">-->

src/views/workforceManagement/team/components/staffSelection.vue

@@ -73,6 +73,17 @@
                         </div>
                       </div>
                     </template>
+                    <template slot-scope="{ row }">
+                      <el-button
+                        size="mini"
+                        type="primary"
+                        @click="choiceAsset(row)"
+                        :disabled="row.disabled"
+                        icon="el-icon-arrow-right"
+                        circle
+                      >
+                      </el-button>
+                    </template>
                   </el-table-column>
                  <el-table-column width="80" label="操作">