Merge remote-tracking branch 'origin/dev' into dev

spring

4 天以前 6495c73e01ac2a4fc2243a6254aa309bcf4ce5fe

 src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue

@@ -81,7 +81,17 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="申请人：" prop="approveUser">
              <el-input v-model="form.approveUser" placeholder="请输入" clearable/>
                     <el-select
                        v-model="form.approveUser"
                        placeholder="选择人员"
                     >
                        <el-option
                           v-for="user in userList"
                           :key="user.userId"
                           :label="user.nickName"
                           :value="user.userId"
                        />
                     </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -171,7 +181,8 @@
   approverNodes.value = [
      { id: 1, userId: null }
   ]
  form.value.approveUser = userStore.nickName;
   console.log(userStore)
  form.value.approveUser = userStore.id;
  form.value.approveTime = getCurrentDate();
  if (operationType.value === 'edit') {
    approveProcessGetInfo({id: row.approveId,approveReason: '1'}).then(res => {