Merge branch 'master' of http://oa.sccehui.com:6101/cmc-coding/cmc-oa

oa-ui/src/views/flowable/form/projectProcess/addproject.vue

@@ -2,20 +2,20 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-07 13:55:49
+ * @LastEditTime: 2024-04-07 16:53:39
 -->
 
 <template>
   <div class="project-wrapper">
     <!-- 项目登记 -->
-    <h2 style="text-align: center;">项目登记</h2>
-    <el-form :model="addForm" :rules="rules" label-width="100px" :disable="disable">
+    <h2 style="text-align: center">项目登记</h2>
+    <el-form :model="addForm" :rules="rules" label-width="100px" :disabled="disabled">
       <el-form-item label="项目编号：" prop="projectNumber">
         <el-input v-model="addForm.projectNumber"></el-input>
       </el-form-item>
       <el-form-item label="项目名称：" prop="projectName">
         <el-input v-model="addForm.projectName"></el-input>
-      </el-form-item>      
+      </el-form-item>
       <el-form-item label="项目类型：" prop="projectType">
         <el-input v-model="addForm.projectType"></el-input>
       </el-form-item>
@@ -29,7 +29,7 @@
       </el-form-item>
       <el-form-item label="甲方单位：" prop="partyA">
         <el-autocomplete class="inline-input" v-model="addForm.partyA" :fetch-suggestions="querySearch"
-          placeholder="请输入内容" style="width:100%"></el-autocomplete>
+          placeholder="请输入内容" style="width: 100%"></el-autocomplete>
         <!-- <el-input v-model="addForm.partyA"></el-input> -->
       </el-form-item>
       <el-form-item label="联系人：" prop="contactPerson">
@@ -38,14 +38,14 @@
       <el-form-item label="联系电话：" prop="telephone">
         <el-input v-model="addForm.telephone"></el-input>
       </el-form-item>
-      <el-form-item label="项目概况：" prop="workList">
+      <el-form-item label="项目概况：">
         <table border="1">
           <tr>
-            <td style="width:250px;">工作内容</td>
+            <td style="width: 250px">工作内容</td>
             <td>等级或比例尺</td>
             <td>单位</td>
             <td>工作量</td>
-            <td style="width:100px;">要求完成时间</td>
+            <td style="width: 100px">要求完成时间</td>
             <td>备注</td>
           </tr>
           <tr v-for="(work, index) in workList" :key="index">
@@ -62,7 +62,7 @@
               <el-input v-model="work.workload" clearable></el-input>
             </td>
             <td>
-              <el-date-picker style="width:140px;" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
+              <el-date-picker style="width: 140px" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
                 placeholder="选择日期">
               </el-date-picker>
             </td>
@@ -70,50 +70,64 @@
               <el-input v-model="work.remark" type="textarea" autosize clearable></el-input>
             </td>
             <td>
-              <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletWorkItem(index)"></el-button>
+              <el-button type="danger" icon="el-icon-minus" size="mini" circle
+                @click="deletWorkItem(index)"></el-button>
             </td>
           </tr>
         </table>
 
         <el-button icon="el-icon-plus" size="mini" @click="addWorkList"></el-button>
       </el-form-item>
-      <el-form-item label="项目登记人：" prop="projectRegistrantName">
-        <el-tag>{{ addForm.projectRegistrantName }}</el-tag>
+      <el-form-item label="项目登记人：" prop="projectRegistrantUser.nickName">
+        <el-tag>{{ addForm.projectRegistrantUser.nickName }}</el-tag>
         <!-- <el-input v-model="addForm.projectRegistrant"></el-input> -->
       </el-form-item>
       <el-form-item label="备注：" prop="remark">
         <el-input v-model="addForm.remark" type="textarea" rows="3"></el-input>
       </el-form-item>
-
     </el-form>
-    <div slot="footer" class="dialog-footer" style="text-align: center;">
-      <el-button type="primary" @click="confirmAddForm">确 定</el-button>
-      <el-button @click="cancel">取 消</el-button>
+    <div slot="footer" class="dialog-footer" style="text-align: center">
+      <el-button type="primary" @click="confirmAddForm" :disabled="disabled">确 定</el-button>
+      <el-button @click="cancel" :disabled="disabled">取 消</el-button>
     </div>
-    
-
   </div>
 </template>
 
 <script>
 import { mapGetters } from "vuex";
-import { listProject, addProject, updateProject, delProject,submitProject } from "@/api/oa/project/project";
-import { getUser } from '@/api/system/user'
-import { getUsersDeptLeaderByDept } from '@/api/system/post'
-import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
+import {
+  listProject,
+  getProject,
+  addProject,
+  updateProject,
+  delProject,
+  submitProject,
+} from "@/api/oa/project/project";
+import { getUser } from "@/api/system/user";
+import { getUsersDeptLeaderByDept } from "@/api/system/post";
+import {
+  complete,
+  rejectTask,
+  returnList,
+  returnTask,
+  getNextFlowNode,
+  delegate,
+  flowTaskForm,
+} from "@/api/flowable/todo";
+import { getProjectWork } from "@/api/oa/project/projectWork";
 export default {
   props: {
-    disable: {
+    disabled: {
       type: Boolean,
-      require: true
+      require: true,
     },
     taskForm: {
       type: Object,
-      required: true
-    }
+      required: true,
+    },
   },
   computed: {
-    ...mapGetters(["userId","name"]),
+    ...mapGetters(["userId", "name"]),
   },
   data() {
     return {
@@ -121,67 +135,83 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        projectNumber: '',
-        projectLeader: '',
+        projectNumber: "",
+        projectLeader: "",
         projectLeaderName: undefined,
-        projectName: '',
+        projectName: "",
       },
       projectList: [],
       total: 0,
       loading: true,
       modifyOpen: false,
       addForm: {
-        projectRegistrant:'',
-        projectRegistrantName:''
+        projectRegistrant: "",
+        projectRegistrantUser: {
+          nickName: ''
+        }
       },
       rules: {
-        projectNumber: [{ required: true, message: '请输入项目编号', trigger: 'blur' }],
-        projectName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }]
+        projectNumber: [{ required: true, message: "请输入项目编号", trigger: "blur" }],
+        projectName: [{ required: true, message: "请输入项目名称", trigger: "blur" }],
       },
-      workList: [{
-        content: '',
-        scale: '',
-        unit: '',
-        workload: '',
-        deadline: '',
-        remark: ''
-      }],
-      restaurants: [
-        { "value": "中国电建集团成都勘测设计研究院有限公司" }
-      ]
-    }
+      workList: [
+        {
+          content: "",
+          scale: "",
+          unit: "",
+          workload: "",
+          deadline: "",
+          remark: "",
+        },
+      ],
+      restaurants: [{ value: "中国电建集团成都勘测设计研究院有限公司" }],
+    };
   },
   created() {
-    this.addForm.projectRegistrant = this.userId
-    this.addForm.projectRegistrantName = this.name
+    if (this.$route.query.taskName != '项目登记') {
+      this.getProjectInfo();
+      this.getProjectWorkList();
+    } else {
+      this.addForm.projectRegistrant = this.userId;
+      this.addForm.projectRegistrantUser.nickName = this.name;
+    }
     this.getList();
   },
-  mounted() {
-    
-  },
+  mounted() { },
   methods: {
     // 查询项目列表
     getList() {
-      this.loading = true
+      this.loading = true;
       listProject(this.queryParams).then(response => {
         this.projectList = [];
         for (let p of response.rows) {
           if (p.projectLeader != null) {
             getUser(Number(p.projectLeader)).then(res => {
               p.projectLeaderName = res.data.nickName;
-            })
+            });
           }
           this.projectList.push(p);
         }
         this.total = response.total;
         this.loading = false;
+      });
+    },
+    getProjectInfo() {
+      getProject(this.$route.query.formId).then(res => {
+        this.addForm = res.data;
+      })
+    },
+    getProjectWorkList() {
+      getProjectWork(this.$route.query.formId).then(res => {
+        this.workList = res.data;
+        console.log(res);
       })
     },
     confirmAddForm() {
       this.addForm.projectId = this.taskForm.formId;
       this.addForm.workList = this.workList;
       let forms = new FormData();
-      forms.append('form',JSON.stringify(this.addForm));
+      forms.append("form", JSON.stringify(this.addForm));
       submitProject(forms).then(response => {
         this.$modal.msgSuccess("新增成功");
         this.getList();
@@ -194,28 +224,28 @@ export default {
           this.$set(this.taskForm.variables, "approval", userId);
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
-            this.$emit('goBack')
+            this.$emit("goBack");
           });
-        })
-      })
+        });
+      });
     },
     cancel() {
-      this.addForm = {}
+      this.addForm = {};
     },
     addWorkList() {
       this.workList.push({
-        content: '',
-        scale: '',
-        unit: '',
-        workload: '',
-        deadline: '',
-        remark: ''
+        content: "",
+        scale: "",
+        unit: "",
+        workload: "",
+        deadline: "",
+        remark: "",
       });
     },
     deletWorkItem(index) {
-      let arr = this.workList
+      let arr = this.workList;
       if (arr.length == 1) {
-        return
+        return;
       }
       if (index >= 0 && index < arr.length) {
         arr.splice(index, 1);
@@ -223,17 +253,19 @@ export default {
     },
     querySearch(queryString, cb) {
       var restaurants = this.restaurants;
-      var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+      var results = queryString
+        ? restaurants.filter(this.createFilter(queryString))
+        : restaurants;
       // 调用 callback 返回建议列表的数据
       cb(results);
     },
     createFilter(queryString) {
-      return (restaurant) => {
-        return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+      return restaurant => {
+        return restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0;
       };
     },
   },
-}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -261,4 +293,28 @@ table {
   /*设置背景颜色*/
   /* background-color: #bfa; */
 }
-</style>
+
+::v-deep .el-input.is-disabled .el-input__inner {
+  color: #686a6e;
+}
+
+::v-deep .el-textarea.is-disabled .el-textarea__inner,
+.el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+
+::v-deep .el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+
+::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner::after {
+  background-color: var(--current-color);
+  width: 6px;
+  height: 6px;
+}
+
+::v-deep .el-radio__input.is-disabled .el-radio__inner,
+.el-radio__input.is-disabled.is-checked .el-radio__inner {
+  border-color: var(--current-color);
+}
+</style>

oa-ui/src/views/flowable/form/projectProcess/arrangeProject.vue

@@ -2,12 +2,12 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-07 11:02:16
+ * @LastEditTime: 2024-04-07 17:31:15
 -->
 <template>
   <div class="app-container">
     <h2 style="text-align: center;">项目安排</h2>
-    <el-form :model="form" :rules="rules" label-width="100px">
+    <el-form :model="form" :rules="rules" label-width="100px" :disabled="disabled">
       <el-form-item label="承担部门：" prop="undertakingDept">
         <el-select v-model="form.deptId" multiple clearable style="width:500px" @change="getDeptLeader">
           <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId"
@@ -17,13 +17,13 @@
       </el-form-item>
       <el-form-item label="部门负责人" prop="deptLeader">
         <el-select v-model="form.deptLeader" multiple clearable style="width:500px">
-          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
-            v-if="item.nickName != 'admin'">
+          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="项目负责人" prop="projectLeader">
-        <el-tag effect="plain" type="warning" style="margin-right: 10px;">{{ form.projectLeader }}</el-tag>
+        <el-tag effect="plain" type="warning" style="margin-right: 10px;" v-if="form.projectLeader != ''">{{
+      form.projectLeaderName }}</el-tag>
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="choosePeople">选择</el-button>
       </el-form-item>
       <el-form-item label="现场负责人" prop="siteLeader">
@@ -33,23 +33,21 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="项目预算">
-        <el-input v-model="form.deptLeader"></el-input>
-      </el-form-item>
     </el-form>
     <!-- 人员选择对话框 -->
     <el-dialog width="320px" title="选择项目负责人" :visible.sync="peopleVisible" append-to-body>
       <el-form>
         <el-form-item label="部门：">
           <el-select v-model="peopleForm.deptId" @change="handleChangeDept">
-            <el-option v-for="item in peopleForm.deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId"
-              v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
+            <el-option v-for="item in peopleForm.deptList" :key="item.deptId" :label="item.deptName"
+              :value="item.deptId" v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="人员：">
           <el-select v-model="peopleForm.userId">
-            <el-option v-for="item in peopleForm.userList" :key="item.userId" :label="item.nickName" :value="item.userId">
+            <el-option v-for="item in peopleForm.userList" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
             </el-option>
           </el-select>
         </el-form-item>
@@ -60,8 +58,8 @@
       </el-form>
     </el-dialog>
     <div slot="footer" class="dialog-footer" style="text-align: center;">
-      <el-button type="primary" @click="confirmPlanForm">确 定</el-button>
-      <el-button @click="cancel">取 消</el-button>
+      <el-button type="primary" @click="confirmPlanForm" :disabled="disabled">确 定</el-button>
+      <el-button @click="cancel" :disabled="disabled">取 消</el-button>
     </div>
   </div>
 </template>
@@ -71,8 +69,13 @@ import { listDept } from '@/api/system/dept'
 import { listUser } from '@/api/system/user'
 import { getUsersDeptLeaderByDept } from '@/api/system/post'
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
+import { listProject, getProject, addProject, updateProject, delProject, submitProject,modifyProject } from "@/api/oa/project/project";
 export default {
   props: {
+    disabled: {
+      type: Boolean,
+      require: true,
+    },
     taskForm: {
       type: Object,
       required: true
@@ -80,7 +83,9 @@ export default {
   },
   data() {
     return {
-      form: {},
+      form: {
+        projectLeader: ''
+      },
       rules: {},
       deptList: [],
       userList: [],
@@ -140,7 +145,7 @@ export default {
     // 确定项目负责人
     confirmPeople() {
       this.form.projectLeader = this.peopleForm.userId;
-      this.form.projectLeader = this.tagLeader()
+      this.form.projectLeaderName = this.tagLeader()
       this.peopleVisible = false
     },
     tagLeader() {
@@ -160,23 +165,26 @@ export default {
       this.peopleVisible = false;
     },
     confirmPlanForm() {
+      console.log(this.form);
       let formData = new FormData();
-      let form = JSON.stringify(this.form);
-      formData.append("form", form);
+      formData.append("form", JSON.stringify(this.form));
+      modifyProject(formData).then(res=>{
+        console.log(res);
+      })
       const params = { taskId: this.taskForm.taskId };
       // 获取下一个流程节点
-      getNextFlowNode(params).then(res => {
-        this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
-        this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId);
-        getUsersDeptLeaderByDept({ deptId: 105 }).then(res => {
-          let userId = res.data.userId;
-          this.$set(this.taskForm.variables, "approval", userId);
-          complete(this.taskForm).then(response => {
-            this.$modal.msgSuccess(response.msg);
-            this.$emit('goBack')
-          });
-        })
-      })
+      // getNextFlowNode(params).then(res => {
+      //   this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
+      //   this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId);
+      //   getUsersDeptLeaderByDept({ deptId: 105 }).then(res => {
+      //     let userId = res.data.userId;
+      //     this.$set(this.taskForm.variables, "approval", userId);
+      //     complete(this.taskForm).then(response => {
+      //       this.$modal.msgSuccess(response.msg);
+      //       this.$emit('goBack')
+      //     });
+      //   })
+      // })
     },
     cancel() {
       this.form = {}

oa-ui/src/views/flowable/form/projectProcess/index.vue

@@ -2,27 +2,25 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-07 11:10:57
+ * @LastEditTime: 2024-04-07 16:38:10
 -->
 
 <template>
   <div class="project-wrapper">
 
     <el-tabs tabPosition="left" type="card" class="tabs-border" v-model="activeName">
-      <el-tab-pane label="项目登记" name="项目登记" :disabled="taskName != '项目登记'">
-        <addproject :taskForm="taskForm"></addproject>
+      <el-tab-pane label="项目登记" name="项目登记">
+        <addproject :taskForm="taskForm" :disabled="taskName != '项目登记'" @goBack="goBack"></addproject>
       </el-tab-pane>
-      <el-tab-pane label="项目安排" name="项目安排" :disabled="taskName != '项目安排'">
-        <!-- <arrangeProject :taskForm ="taskForm"></arrangeProject> -->
+      <el-tab-pane label="项目安排" name="项目安排">
+        <arrangeProject :taskForm ="taskForm" :disabled="taskName != '项目安排'" @goBack="goBack"></arrangeProject>
       </el-tab-pane>
-      <el-tab-pane label="技术交底" name="技术交底" :disabled="taskName != '技术交底'"></el-tab-pane>
-      <el-tab-pane label="安全交底" name="安全交底" :disabled="taskName != '安全交底'"></el-tab-pane>
-      <el-tab-pane label="经营审核" name="经营审核" :disabled="taskName != '经营审核'"></el-tab-pane>
-      <el-tab-pane label="分管审核" name="分管审核" :disabled="taskName != '分管审核'"></el-tab-pane>
-      <el-tab-pane label="生产确认" name="生产确认" :disabled="taskName != '生产确认'"></el-tab-pane>
-      <el-tab-pane label="项目生产" name="项目生产" :disabled="taskName != '项目生产'"></el-tab-pane>
-      <el-tab-pane label="质量检查" name="质量检查" :disabled="taskName != '质量检查'"></el-tab-pane>
-      <el-tab-pane label="成果归档" name="成果归档" :disabled="taskName != '成果归档'"></el-tab-pane>
+      <el-tab-pane label="经营审核" name="经营审核"></el-tab-pane>
+      <el-tab-pane label="分管审核" name="分管审核"></el-tab-pane>
+      <el-tab-pane label="生产确认" name="生产确认"></el-tab-pane>
+      <el-tab-pane label="项目生产" name="项目生产"></el-tab-pane>
+      <el-tab-pane label="质量检查" name="质量检查"></el-tab-pane>
+      <el-tab-pane label="成果归档" name="成果归档"></el-tab-pane>
     </el-tabs>
 
 
@@ -89,7 +87,8 @@ export default {
     }
   },
   created() {
-    // this.activeName = this.taskName;
+    this.activeName = this.taskName;
+    console.log(this.taskName);
     this.getList();
     this.getDeptList();
     // console.log(this.activeName);
@@ -202,6 +201,9 @@ export default {
       this.peopleForm.deptId = '';
       this.peopleForm.userId = '';
       this.peopleVisible = false;
+    },
+    goBack(){
+      this.$emit('goBack')
     }
   },
 }

oa-ui/src/views/flowable/task/finished/detail/index.vue

@@ -58,10 +58,10 @@
                         <template slot="label"><i class="el-icon-time"></i>耗时</template>
                         {{ item.duration }}
                       </el-descriptions-item>
-                      <el-descriptions-item v-if="item.comment" label-class-name="my-label">
+                      <!-- <el-descriptions-item v-if="item.comment" label-class-name="my-label">
                         <template slot="label"><i class="el-icon-tickets"></i>处理意见</template>
                         {{ item.comment.comment }}
-                      </el-descriptions-item>
+                      </el-descriptions-item> -->
                     </el-descriptions>
                   </el-card>
                 </el-timeline-item>

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

@@ -52,10 +52,10 @@
                         <template slot="label"><i class="el-icon-time"></i>耗时</template>
                         {{item.duration}}
                       </el-descriptions-item>
-                      <el-descriptions-item v-if="item.comment" label-class-name="my-label">
+                      <!-- <el-descriptions-item v-if="item.comment" label-class-name="my-label">
                         <template slot="label"><i class="el-icon-tickets"></i>处理意见</template>
                         {{item.comment.comment}}
-                      </el-descriptions-item>
+                      </el-descriptions-item> -->
                     </el-descriptions>
                   </el-card>
                 </el-timeline-item>

oa-ui/src/views/flowable/task/myProcess/send/rowDetail.vue

@@ -36,10 +36,10 @@
                   <template slot="label"><i class="el-icon-time"></i>耗时</template>
                   {{ item.duration }}
                 </el-descriptions-item>
-                <el-descriptions-item v-if="item.comment" label-class-name="my-label">
+                <!-- <el-descriptions-item v-if="item.comment" label-class-name="my-label">
                   <template slot="label"><i class="el-icon-tickets"></i>处理意见</template>
                   {{ item.comment.comment }}
-                </el-descriptions-item>
+                </el-descriptions-item> -->
               </el-descriptions>
             </el-card>
           </el-timeline-item>

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -76,11 +76,11 @@
                         <template slot="label"><i class="el-icon-time"></i>耗时</template>
                         {{ item.duration }}
                       </el-descriptions-item>
-                      <el-descriptions-item v-if="item.comment" label-class-name="my-label">
+                      <!-- <el-descriptions-item v-if="item.comment" label-class-name="my-label">
 
                         <template slot="label"><i class="el-icon-tickets"></i>处理意见</template>
                         {{ item.comment }}
-                      </el-descriptions-item>
+                      </el-descriptions-item> -->
                     </el-descriptions>
                   </el-card>
                 </el-timeline-item>

oa-ui/src/views/oa/budget/addBudget.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-03 17:29:25
+ * @LastEditTime: 2024-04-07 16:09:20
 -->
 <template>
   <div>
@@ -101,15 +101,15 @@
             <el-form-item label="联系方式：">
               {{ projectForm.telephone }}
             </el-form-item>
-            <el-form-item label="备注：">
-              {{ projectForm.remark }}
-            </el-form-item>
             <el-form-item label="项目登记人：">
-              {{ projectForm.projectRegistrant }}
+              {{ projectForm.projectRegistrantUser.nickName }}
             </el-form-item>
             <el-form-item label="登记时间：">
               {{ projectForm.createTime }}
             </el-form-item>
+            <el-form-item label="备注：">
+              {{ projectForm.remark }}
+            </el-form-item>
           </el-form>
         </div>
 
@@ -493,6 +493,7 @@
 
 <script>
 import { getProject } from "@/api/oa/project/project";
+import { getProjectWork } from "@/api/oa/project/projectWork";
 import { getSalary } from "@/api/oa/staff/salary";
 import choosePeople from "./components/choosePeople.vue";
 import chooseCar from "./components/chooseCar.vue";
@@ -566,25 +567,12 @@ export default {
         projectName: "",
       },
       projectTotal: 0,
-      projectForm: {},
-      workList: [
-        {
-          content: "实景三维制作（影像分辨率优于5cm）",
-          scale: "1:500",
-          workload: "10",
-          unit: "km²",
-          deadline: "2024-01-31",
-          remark: "此为备注此为备注此为备注此为备注此为备注此为备注",
-        },
-        {
-          content: "XXXXXXXXXXXXXXXXXX",
-          scale: "1:500",
-          workload: "10",
-          unit: "km²",
-          deadline: "2024-01-31",
-          remark: "此为备注此为备注此为备注此为备注此为备注此为备注",
-        },
-      ],
+      projectForm: {
+        projectRegistrantUser:{
+          nickName:''
+        }
+      },
+      workList: [],
       projectRule: {
         projectNumber: [{ required: true, message: "请选择项目编号", trigger: "blur" }],
       },
@@ -600,7 +588,7 @@ export default {
   },
   created() {
     this.getProjectList();
-    console.log(this.taskForm);
+    this.getProjectWorkList();
   },
   methods: {
     goBack() {
@@ -610,13 +598,18 @@ export default {
     },
     // 查询项目列表
     getProjectList() {
-      getProject(this.taskForm.formId).then(response => {
+      getProject(this.$route.query.formId).then(response => {
         // console.log(response.rows);
         // this.projectList = response.rows;
         // this.projectTotal = response.total;
         this.projectForm = response.data;
       });
     },
+    getProjectWorkList() {
+      getProjectWork(this.$route.query.formId).then(res => {
+        this.workList = res.data;
+      })
+    },
     // 选择项目
     chooseProject(row) {
       this.projectForm = row;
@@ -639,7 +632,6 @@ export default {
         this.activeStep += 1;
         this.calculateThatCost();
       } else if (this.activeStep == 3) {
-        console.log(this.budgetForm);
         this.addBudgetForm(this.budgetForm);
         this.activeStep += 1;
       } else {