Merge pull request 'master' (#488) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/488

src/views/project-demand/summary/index.vue

@@ -151,7 +151,10 @@ const tableConfig = reactive({
   columns: [
     {
       type: 'selection',
-      prop: 'selection'
+      prop: 'selection',
+      selectable: (row, index) => {
+        return row.state === '4';
+      }
     },
     {
       prop: 'requirementName',
@@ -287,7 +290,11 @@ const headBtnClick = (key) => {
   }
 }
 const selectionChange = (data) => {
-  console.log('data', data)
+  console.log('data', data, tableIns.value.tableInstance)
+
+  data.forEach(item => {
+    //   toggleRowSelection
+  })
   projectSelectList.value = data
 }
 const handleExport = () => {

src/views/project-management/implementation/updateTable.vue

@@ -9,10 +9,10 @@
       </el-col>
       <el-col :span="24">
         <el-form-item prop="projectChargePerson" label="项目负责人">
-          {{ tableForm.projectChargePersonName }}
-          <el-button color="#DED0B2" @click="showPersonnelPicker" style="margin-left: 10px">
+          <el-button color="#DED0B2" @click="showPersonnelPicker" style="margin-right: 10px">
             {{ tableForm.projectChargePersonName ? '更改' : '请选择项目负责人' }}
           </el-button>
+          {{ tableForm.projectChargePersonName }}
         </el-form-item>
       </el-col>
       <el-col :span="12">

src/views/workflow/process/config/ApprovalNodeConfig.vue

@@ -14,7 +14,8 @@
         <el-button size="mini" icon="Plus" type="primary" @click="showSysRolePicker" round>
           选择人员
         </el-button>
-        <user-picker :check-matrix="true" title="请选择人员" :multiple="false" ref="sysRolePicker" :v-model="assignedUser" @ok="selectedUser"/>
+        <user-picker :check-matrix="true" title="请选择人员" :multiple="false" ref="sysRolePicker"
+                     v-model:value="assignedUser" @ok="selectedUser"/>
         <!--        <ellipsis :row="3" :user-info="assignedUser"/>-->
         <role-items v-model="assignedUser"/>
       </div>
@@ -57,7 +58,8 @@
       </div>
       <div v-else-if="nodeProps.assignedType === 'FORM_USER'">
         <el-form-item label="选择表单联系人项" prop="text" class="approve-end">
-          <el-select style="width: 80%;" size="small" v-model="nodeProps.formUser" placeholder="请选择包含联系人的表单项" filterable>
+          <el-select style="width: 80%;" size="small" v-model="nodeProps.formUser" placeholder="请选择包含联系人的表单项"
+                     filterable>
             <el-option v-for="(op,i) in forms" :label="op.title" :value="op.id" :key="i"></el-option>
           </el-select>
         </el-form-item>
@@ -402,7 +404,8 @@ const selectedUser = (select) => {
     let userInfo = {
       id: val.id,
       name: val.name,
-      avatar: val.avatar,
+      companyName: val.companyName,
+      accountType: val.accountType,
     }
     userInfoList.push(userInfo)
   }