新增项目委外，修改一些小问题

oa-ui/src/utils/deleteResource.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-13 17:07:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-20 13:59:08
+ * @LastEditTime: 2024-09-23 15:43:29
  */
 import request from '@/utils/request'
 
@@ -103,6 +103,13 @@ const apiEndpoints = [
       '/oa/procurePlan/:id'
     ]
   },
+  {
+    procDefName: '项目委外',
+    apiUrl: [
+      '/oa/outsource/:id',
+      '/oa/outsourceWork/:id'
+    ]
+  },
 ]
 
 // 编写一个方法来处理删除请求，并同时发送所有API请求  

oa-ui/src/views/flowable/form/components/conditionDisplay.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-23 17:08:16
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-20 16:45:23
+ * @LastEditTime: 2024-09-23 15:47:25
 -->
 <template>
   <div>
@@ -36,6 +36,7 @@
     <declare :key="'work'+taskForm.taskId" :taskForm="taskForm" :taskName="''" :formDisabled="true" v-else-if="taskForm.procDefName == '工作填报'"></declare>
     <procure-form :key="'procure'+taskForm.taskId"  :taskForm="taskForm" :taskName="''" :isFlow ="true" v-else-if="taskForm.procDefName == '采购审批'"></procure-form>
     <outsource-form :key="'outsource'+taskForm.taskId"  :taskForm="taskForm" :taskName="''" :isFlow ="true" v-else-if="taskForm.procDefName == '项目委外'"></outsource-form>
+    <performance-form :key="'performance'+taskForm.taskId"  :taskForm="taskForm" :taskName="''" :isFlow ="true" v-else-if="taskForm.procDefName == '绩效审批'"></performance-form>
   </div>
 </template>
 
@@ -67,6 +68,7 @@ import workFilling from "@/views/flowable/form/work/declareForm.vue";
 import declare from "@/views/flowable/form/work/declareForm.vue";
 import procureForm from "@/views/flowable/form/procure/procureForm.vue";
 import outsourceForm from '@/views/flowable/form/outsource/outsourceForm.vue';
+import performanceForm from '@/views/flowable/form/performance/performanceForm.vue';
 export default {
   props: {
     passingParam: {
@@ -104,7 +106,8 @@ export default {
     changeForm,
     declare,
     procureForm,
-    outsourceForm
+    outsourceForm,
+    performanceForm,
   },
   data() {
     return {

oa-ui/src/views/flowable/form/components/detailDisplay.vue

@@ -50,6 +50,8 @@
       @goBack="goBack"></procure-form>
     <outsource-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目委外'"
       @goBack="goBack"></outsource-form>
+    <performance-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '绩效审批'"
+      @goBack="goBack"></performance-form>
   </div>
 </template>
 
@@ -81,6 +83,7 @@ import changeForm from '@/views/flowable/form/changeForm.vue';
 import declareForm from '@/views/flowable/form/work/declareForm.vue';
 import procureForm from '@/views/flowable/form/procure/procureForm.vue';
 import outsourceForm from '@/views/flowable/form/outsource/outsourceForm.vue';
+import prformanceForm from '@/views/flowable/form/performance/performanceForm.vue';
 export default {
   components: {
     ScTable,
@@ -109,7 +112,8 @@ export default {
     changeForm,
     declareForm,
     procureForm,
-    outsourceForm
+    outsourceForm,
+    prformanceForm,
   },
   props: {
     taskForm: {

oa-ui/src/views/flowable/form/outsource/outsourceForm.vue

@@ -2,15 +2,84 @@
  * @Author: ysh
  * @Date: 2024-09-20 16:09:07
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-20 16:46:18
+ * @LastEditTime: 2024-09-23 16:22:14
 -->
 <template>
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="isFlow ? 18 : 24" :xs="24">
-        <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="taskName == ''">
-          <h2 style="text-align: center;">项目委外审批表</h2>
+        <h2 style="text-align: center;">项目委外审批表</h2>
+        <el-form ref="form" :model="form" :rules="rules" :disabled="taskName == ''">
+          <el-row :gutter="20">
+            <el-col :span="7" :xs="24">
+              <el-form-item label="申请人：" prop="applier" label-width="100px">
+                {{ getUserName(form.applier) }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="7" :xs="24">
+              <el-form-item label="申请部门：" prop="applyDept" label-width="100px">
+                {{ getDeptName(form.applyDept) }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="7" :xs="24">
+              <el-form-item label="申请时间：" prop="date" label-width="100px">
+                {{ form.applyTime }}
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="项目名称：" prop="projectId" label-width="100px">
+            <el-button icon="el-icon-plus" type="primary" @click="prOpen = true" size="mini"
+              v-if="taskName == '委外申请'">选择项目</el-button>
+            <el-descriptions class="mb20" border v-if="form.projectId" style="margin-top: 10px" :column="1">
+              <el-descriptions-item label="项目编号">
+                {{ project.projectNumber }}
+              </el-descriptions-item>
+              <el-descriptions-item label="项目名称">
+                {{ project.projectName }}
+              </el-descriptions-item>
+              <el-descriptions-item label="项目负责人">
+                {{ getUserName(project.projectLeader) }}
+              </el-descriptions-item>
+              <el-descriptions-item label="项目类型">
+                {{ project.projectType }}
+              </el-descriptions-item>
+              <el-descriptions-item label="承担部门">
+                {{ getDeptNames(project.undertakingDept) }}
+              </el-descriptions-item>
+            </el-descriptions>
+          </el-form-item>
+          <el-form-item label="合作单位：" prop="partnerId">
+            <el-tag class="mr10" v-for="item in partnerList" v-if="partnerList.length != 0">
+              {{ item.partnerName }}
+            </el-tag>
+            <el-button icon="el-icon-plus" type="primary" @click="partOpen = true" size="mini"
+              v-if="taskName == '委外申请'">选择合作单位</el-button>
+          </el-form-item>
+          <el-form-item label="委外说明：" prop="applyReason">
+            <el-input type="textarea" v-model="form.applyReason" :autosize="{ minRows: 4 }"
+              :disabled="taskName != '委外申请'"></el-input>
+          </el-form-item>
+          <el-form-item label="委外工作计划：">
+            <outsource-plan ref="planRef" :taskForm="taskForm" :taskName="taskName"
+              :outsoureId="outsoureId"></outsource-plan>
+          </el-form-item>
+          <el-form-item label="分管审核意见：" prop="managerComment" label-width="130px">
+            <el-input type="textarea" v-model="form.managerComment" :autosize="{ minRows: 4 }"
+              :disabled="taskName != '分管审核'"></el-input>
+            <auditor-row ref="fgRef" :isCurrent="taskName == '分管审核'"
+              :signature="form.managerUserId ? form.managerUserId : null" :signTime="form.managerTime"></auditor-row>
+          </el-form-item>
+          <el-form-item label="总经理审批意见：" prop="zjlComment" label-width="130px">
+            <el-input type="textarea" v-model="form.zjlComment" :autosize="{ minRows: 4 }"
+              :disabled="taskName != '总经理审批'"></el-input>
+            <auditor-row ref="zjlRef" :isCurrent="taskName == '总经理审批'"
+              :signature="form.zjlUserId ? form.zjlUserId : null" :signTime="form.zjlTime"></auditor-row>
+          </el-form-item>
         </el-form>
+        <el-row style="text-align: center;" v-if="taskName != ''">
+          <el-button type="warning" @click="saves()">保存</el-button>
+          <el-button type="primary" @click="completeApply()">提交</el-button>
+        </el-row>
       </el-col>
       <el-col :span="6" :xs="24" v-if="isFlow">
         <el-card>
@@ -21,14 +90,31 @@
         </el-card>
       </el-col>
     </el-row>
+    <el-dialog title="选择项目" :visible.sync="prOpen" :width="'60%'" append-to-body>
+      <choose-project @chooseProject="confirmProject"></choose-project>
+    </el-dialog>
+    <el-dialog title="选择合作单位" :visible.sync="partOpen" :width="'60%'" append-to-body>
+      <choose-partner @confirm="confirmPartner"></choose-partner>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import flow from '@/views/flowable/task/todo/detail/flow';
 import { flowXmlAndNode } from "@/api/flowable/definition";
+import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
+import { parseTime } from "@/utils/ruoyi";
+import { getProject } from "@/api/oa/project/project";
+import { listOutsource, getOutsource, addOutsource, updateOutsource, delOutsource } from "@/api/oa/outsource/outsource";
+import { listOutsourceWork, getOutsourceWork, addOutsourceWork, updateOutsourceWork, delOutsourceWork } from "@/api/oa/outsource/outsourceWork";
+import { getUsersDeptLeaderByDept, getUsersManageLeaderByDept, getUserByPost } from '@/api/system/post'
+import { getPartner } from "@/api/oa/partner/partner";
+import chooseProject from '@/views/flowable/form/components/chooseProject.vue';
+import ChoosePartner from '@/views/flowable/form/components/choosePartner.vue';
+import outsourcePlan from './outsourcePlan.vue';
+import AuditorRow from '@/views/flowable/form/components/auditorRow.vue';
 export default {
-  components: { flow },
+  components: { flow, chooseProject, ChoosePartner, outsourcePlan, AuditorRow },
   props: {
     taskName: {
       type: String,
@@ -45,12 +131,34 @@ export default {
   },
   data() {
     return {
-      flowData:{}
+      flowData: {},
+      form: {
+        deptId: undefined,
+        applyTime: undefined,
+        applier: undefined,
+      },
+      rules: {
+        applyReason: [
+          { required: true, message: '请输入委外说明', trigger: 'blur' }
+        ],
+        projectId: [
+          { required: true, message: '请选择项目', trigger: 'change' }
+        ],
+        partnerId: [
+          { required: true, message: '请选择合作单位', trigger: 'change' }
+        ]
+      },
+      project: {},
+      partnerList: [],
+      prOpen: false,
+      partOpen: false,
+      formTotal: 0,
+      outsoureId: ''
     }
   },
   created() {
     this.initFlow();
-    // this.initForm();
+    this.initForm();
   },
   methods: {
     initFlow() {
@@ -60,8 +168,121 @@ export default {
         })
       }
     },
+    initForm() {
+      const formId = this.taskForm.formId;
+      this.outsoureId = formId;
+      getOutsource(formId).then(res => {
+        if (res.data) {
+          this.formTotal = 1
+          this.form = res.data;
+          this.getPartnerList(res.data.partnerId);
+          this.getProjectInfo(res.data.projectId);
+        }
+        if (this.taskName == '委外申请') {
+          this.form.applier = this.$store.getters.userId;
+          this.form.applyDept = this.$store.getters.deptId;
+          this.form.applyTime = parseTime(new Date(), "{y}-{m}-{d}")
+        }
+      })
+    },
+    getProjectInfo(projectId) {
+      getProject(projectId).then(res => {
+        if (res.data)
+          this.project = res.data
+      })
+    },
+    getPartnerList(partnerId) {
+      if(!partnerId) return
+      this.partnerList = [];
+      let ids = partnerId.split(',');
+      ids.forEach(async item => {
+        let res = await getPartner(item);
+        if (res.data)
+          this.partnerList.push(res.data)
+      })
+    },
+    async saves() {
+      if (this.formTotal) {
+        if (this.taskName == '分管审核') {
+          this.form.managerUserId = this.$refs.fgRef.localSignatureUserId;
+          this.form.managerTime = this.$refs.fgRef.loaclSignTime;
+        } else if (this.taskName == '总经理审批') {
+          this.form.zjlUserId = this.$refs.zjlRef.localSignatureUserId;
+          this.form.zjlTime = this.$refs.zjlRef.loaclSignTime;
+        }
+        await updateOutsource(this.form)
+      } else {
+        this.form.outsoureId = this.taskForm.formId;
+        await addOutsource(this.form)
+      }
+      this.savePlan()
+      this.$message.success('保存成功')
+    },
+    async savePlan() {
+      const planList = this.$refs.planRef.workList;
+      const isAdd = this.$refs.planRef.formTotal;
+      const outsourceId = this.taskForm.formId;
+      if (isAdd)
+        await delOutsourceWork(outsourceId)
+      for (let plan of planList) {
+        plan.outsourceId = outsourceId
+        await addOutsourceWork(plan)
+      }
+    },
+    completeApply() {
+      const params = { taskId: this.taskForm.taskId };
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          this.saves();
+          getNextFlowNode(params).then(async res => {
+            if (this.taskName == '委外申请') {
+              let managerList = []
+              let result = await getUsersManageLeaderByDept({ deptId: this.form.applyDept });
+              result.data.forEach(element => {
+                managerList.push(element.userId)
+              });
+              this.$set(this.taskForm.variables, "approvalList", managerList);
+              this.successComplete();
+            } else if (this.taskName == '分管审核') {
+              let result = await getUserByPost({ postName: '总经理' })
+              this.$set(this.taskForm.variables, "approval", result.data[0].userId);
+              this.successComplete();
+            } else if (this.taskName == '总经理审批') {
+              this.successComplete();
+            }
+          })
+        } else {
+          this.$message.error('请完善必填项')
+        }
+      })
+    },
+    successComplete() {
+      complete(this.taskForm).then(response => {
+        this.$modal.msgSuccess(response.msg);
+        this.$emit('goBack')
+      })
+    },
+    confirmProject(val) {
+      if (val.length != 1) {
+        this.$message.error("项目只能选择一个！");
+        return;
+      }
+      this.project = val[0]
+      this.$set(this.form, 'projectId', val[0].projectId)
+      this.prOpen = false;
+      this.$refs.form.validateField('projectId');
+    },
+    confirmPartner(val) {
+      this.partnerList = val;
+      this.partOpen = false;
+      const ids = val.map(obj => obj.partnerId).join(',');
+      this.$set(this.form, 'partnerId', ids)
+      this.$refs.form.validateField('partnerId');
+    }
   },
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+</style>

oa-ui/src/views/flowable/form/outsource/outsourcePlan.vue

@@ -0,0 +1,197 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-09-23 11:17:31
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-09-23 15:39:39
+-->
+<template>
+  <div style="width:100%">
+    <table class="table" border="1" style="width:100%">
+      <!-- <tr>
+        <td style="width:55px;">序号</td>
+        <td>委外内容</td>
+        <td style="width:50px;" v-if="taskName == '委外申请'">操作</td>
+      </tr>
+      <tr v-for="(work, index) in workList" :key="index">
+        <td>
+          {{ index + 1 }}
+        </td>
+        <td class="text-center">
+          <el-descriptions :column="4" border size="mini">
+            <el-descriptions-item label="工作内容" :span="4">
+              <el-input type="textarea" v-model="work.content" :autosize="{ minRows: 2 }"></el-input>
+            </el-descriptions-item>
+            <el-descriptions-item label="等级或比例尺" :span="2">
+              <el-select v-model="work.scale" placeholder="请选择" clearable style="width:100%">
+                <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
+                  :value="dict.label" />
+              </el-select>
+            </el-descriptions-item>
+            <el-descriptions-item label="单位" :span="2">
+              <el-select v-model="work.unit" placeholder="请选择" clearable style="width:100%">
+                <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label"
+                  :value="dict.label" />
+              </el-select>
+            </el-descriptions-item>
+            <el-descriptions-item label="工作量" :span="2">
+              <el-input v-model="work.workload" clearable></el-input>
+            </el-descriptions-item>
+            <el-descriptions-item label="要求完成时间" :span="2">
+              <el-date-picker style="width:100%" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-descriptions-item>
+            <el-descriptions-item label="备注" :span="4">
+              <el-input v-model="work.remark" type="textarea" clearable :autosize="{ minRows: 4 }"></el-input>
+            </el-descriptions-item>
+          </el-descriptions>
+        </td>
+        <td v-if="taskName == '委外申请'">
+          <div class="delete-btn" @click="deletWorkItem(index)">
+            <i class="el-icon-circle-close"></i>
+          </div>
+        </td>
+      </tr> -->
+      <tr>
+        <td style="width: 280px">工作内容</td>
+        <td>等级或比例尺</td>
+        <td>单位</td>
+        <td>工作量</td>
+        <td style="width: 100px">要求完成时间</td>
+        <td>备注</td>
+      </tr>
+      <tr v-for="(work, index) in workList" :key="index">
+        <td>
+          <el-input v-model="work.content" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }" :disabled="taskName != '委外申请'"></el-input>
+        </td>
+        <td>
+          <el-select v-model="work.scale" placeholder="请选择" clearable :disabled="taskName != '委外申请'">
+            <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
+              :value="dict.label" />
+          </el-select>
+        </td>
+        <td>
+          <el-select v-model="work.unit" placeholder="请选择" clearable :disabled="taskName != '委外申请'">
+            <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label" :value="dict.label" />
+          </el-select>
+        </td>
+        <td>
+          <el-input v-model="work.workload" clearable :disabled="taskName != '委外申请'"></el-input>
+        </td>
+        <td>
+          <el-date-picker style="width: 140px" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
+            placeholder="选择日期" :disabled="taskName != '委外申请'">
+          </el-date-picker>
+        </td>
+        <td>
+          <el-input v-model="work.remark" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }" :disabled="taskName != '委外申请'"></el-input>
+        </td>
+        <td v-if="taskName == '委外申请'">
+          <div class="delete-btn" @click="deletWorkItem(index)">
+            <i class="el-icon-circle-close"></i>
+          </div>
+        </td>
+      </tr>
+    </table>
+    <el-button icon="el-icon-plus" type="primary" plain size="mini" @click="addWorkList"></el-button>
+  </div>
+</template>
+
+<script>
+import { listOutsourceWork, getOutsourceWork, addOutsourceWork, updateOutsourceWork, delOutsourceWork } from "@/api/oa/outsource/outsourceWork";
+export default {
+  dicts: ['cmc_scale_grade', 'cmc_unit'],
+  props: {
+    taskForm: {
+      type: Object,
+    },
+    taskName: {
+      type: String,
+      required: true
+    },
+    outsoureId: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      workList: [
+        {
+          content: "",
+          scale: "",
+          unit: "",
+          workload: "",
+          deadline: undefined,
+          remark: "",
+        },
+      ],
+      formTotal: 0
+    }
+  },
+  mounted() {
+    this.initTable()
+  },
+  methods: {
+    initTable() {
+      if (!this.outsoureId) return
+      listOutsourceWork({ pageNum: 1, pageSize: 100, outsourceId: this.outsoureId }).then(res => {
+        if (res.rows.length > 0) {
+          this.formTotal = 1;
+          this.workList = res.rows;
+        } else {
+          this.workList = [{
+            content: "",
+            scale: "",
+            unit: "",
+            workload: "",
+            deadline: undefined,
+            remark: "",
+          }]
+        }
+      });
+    },
+    addWorkList() {
+      this.workList.push({
+        content: "",
+        scale: "",
+        unit: "",
+        workload: "",
+        deadline: undefined,
+        remark: "",
+      });
+    },
+    deletWorkItem(index) {
+      let arr = this.workList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+table {
+  /*居中*/
+  margin: 0 auto;
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+}
+
+.delete-btn {
+  color: #F56C6C;
+  cursor: pointer;
+
+  i {
+    font-size: 25px;
+  }
+}
+</style>

oa-ui/src/views/flowable/form/performance/performanceForm.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>
+
+  </div>
+</template>
+
+<script>
+  export default {
+    
+  }
+</script>
+
+<style lang="scss" scoped>
+
+</style>

oa-ui/src/views/flowable/form/procure/procureForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-09-19 13:45:43
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-20 15:05:52
+ * @LastEditTime: 2024-09-23 14:27:46
 -->
 <template>
   <div class="app-container">
@@ -86,7 +86,7 @@ import { getUsersDeptLeaderByDept, getUsersManageLeaderByDept, getUserByPost } f
 import { listProcureApproval, getProcureApproval, addProcureApproval, updateProcureApproval, delProcureApproval } from "@/api/oa/procure/procureApproval";
 import { listProcurePlan, getProcurePlan, addProcurePlan, updateProcurePlan, delProcurePlan } from "@/api/oa/procure/procurePlan";
 import plan from './plan.vue'
-import AuditorRow from '../components/auditorRow.vue';
+import AuditorRow from '@/views/flowable/form/components/auditorRow.vue';
 import FlowUser from '@/components/flow/User';
 export default {
   components: { flow, FlowUser, plan, AuditorRow },

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-19 11:18:09
+ * @LastEditTime: 2024-09-23 15:50:44
 -->
 <template>
   <div class="app-container">
@@ -449,7 +449,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.procInsId || this.ids;// 暂不支持删除多个流程
-      this.$confirm('是否确定取消流程？', "警告", {
+      this.$confirm('取消流程将删除对应数据，是否确定取消流程？', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

oa-ui/src/views/oa/project/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-20 16:56:04
+ * @LastEditTime: 2024-09-23 16:15:25
 -->
 <template>
   <div class="project-wrapper">
@@ -23,12 +23,19 @@
             <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
           </el-select>
         </el-form-item>
-        <el-form-item label="状态" prop="isFinished">
+        <el-form-item label="承担部门" prop="undertakingDept">
+          <el-select v-model="queryParams.undertakingDept" filterable clearable @change="handleQuery">
+            <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+              :value="item.deptId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="状态" prop="isFinished">
           <el-select v-model="queryParams.isFinished" clearable>
             <el-option label="进行中" value="0"></el-option>
             <el-option label="已结束" value="1"></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         </el-form-item>
@@ -454,6 +461,9 @@ export default {
       this.peopleVisible = false;
     },
     formatStatus(row) {
+      if (!row) {
+        row = 0
+      }
       if (row <= 20) {
         return 'exception'
       } else if (row > 20 && row <= 50) {

oa-ui/src/views/oa/project/info.vue

@@ -355,7 +355,7 @@
               </template>
               <el-select v-model="devices" multiple disabled style="width:100%">
                 <el-option v-for="item in deviceList" :key="item.deviceId" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
-        + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
+        + (item.code != null ? '（设备编号：' + item.code + '）' : '') " :value="item.deviceId">
                 </el-option>
               </el-select>
             </el-descriptions-item>
@@ -948,4 +948,9 @@ html {
 ::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
   border: 1px solid #cdd0d3;
 }
+
+::v-deep .el-tag.el-tag--info{
+  border-color: #d1d1dc;
+  color:#101010
+}
 </style>