修改工作填报

oa-ui/src/views/flowable/form/work/declareForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-08-16 09:16:36
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-08 09:45:17
+ * @LastEditTime: 2024-10-21 16:10:50
 -->
 <template>
   <div>
@@ -10,8 +10,14 @@
       <el-col :span="isFlow ? 18 : 24" :xs="24">
         <h2 class="text-center">项目工作填报表</h2>
         <el-divider></el-divider>
-        <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="formDisabled">
-          <el-form-item label="项目名称：" prop="projectId">
+        <el-form ref="form" :model="form" :rules="rules" label-width="110px" :disabled="formDisabled">
+          <el-form-item label="是否零星项目：">
+            <el-radio-group v-model="radio" @change="chooseLX" :disabled="taskName != '工作填报'">
+              <el-radio label="0">否</el-radio>
+              <el-radio label="1">是</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="项目名称：" prop="projectId" v-if="radio == '0'">
             <el-button icon="el-icon-plus" type="primary" @click="prOpen = true" size="mini"
               v-if="taskName == '工作填报'">选择项目</el-button>
           </el-form-item>
@@ -153,6 +159,7 @@ export default {
         userId: undefined,
         submitTime: undefined,
       },
+      radio: '0',
       rules: {
         projectId: [
           { required: true, trigger: "blur", message: "请选择项目" },
@@ -191,12 +198,17 @@ export default {
           this.form.price = 216;
           this.hasForm = true;
           this.countMoney();
-          getProject(res.data.projectId).then(res => {
-            if (res.data) {
-              this.chooseProject = res.data
-            }
-          })
-          this.getWorkItemList(this.form.workType);
+          if (!res.data.projectId) {
+            this.radio = '1'
+          } else {
+            getProject(res.data.projectId).then(res => {
+              if (res.data) {
+                this.chooseProject = res.data
+              }
+            })
+            this.getWorkItemList(this.form.workType);
+          }
+
         }
       })
     },
@@ -213,15 +225,28 @@ export default {
     submitForm() {
       this.$refs['form'].validate(valid => {
         if (valid) {
+          this.$set(this.taskForm.variables, "skip", false);
           if (!this.chooseProject.projectLeader) {
-            this.$message.error('该项目未指定项目负责人，无法提交。')
-            return
+            if (this.radio == '0') {
+              this.$message.error('该项目未指定项目负责人，无法提交。')
+              return
+            }
           }
           this.$confirm('是否确认提交表单？', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
-          }).then(() => {
+          }).then(async () => {
+            if (this.radio == '0') {
+              let approval = this.chooseProject.projectLeader;
+              this.$set(this.taskForm.variables, "approval", approval);
+            } else {
+              let resData = await getUsersDeptLeader({ userId: this.form.userId }); 
+              if (resData.data) {
+                this.$set(this.taskForm.variables, "approval", resData.data.userId);
+                this.$set(this.taskForm.variables, "skip", true);
+              }
+            }
             if (this.hasForm) {
               updateDeclare(this.form);
             } else {
@@ -229,9 +254,7 @@ export default {
               addDeclare(this.form);
             }
             const params = { taskId: this.taskForm.taskId };
-            let approval = this.chooseProject.projectLeader;
             getNextFlowNode(params).then(() => {
-              this.$set(this.taskForm.variables, "approval", approval);
               this.handleComplete(this.taskForm);
             })
           })
@@ -253,6 +276,7 @@ export default {
           })
         }
       } else if (this.taskName == '部门负责人审核') {
+        this.form.checkStatus = '1';
         this.form.auditStatus = '1';
         updateDeclare(this.form);
         this.$set(this.taskForm.variables, "approval", this.form.userId);
@@ -341,6 +365,36 @@ export default {
         this.projectList = res.rows;
       })
     },
+    chooseLX(val) {
+      if (val == '1') {
+        this.rules = {
+          workType: [
+            { required: true, trigger: "change", message: "请选择工作类别" },
+          ],
+          workItem: [
+            { required: true, trigger: "change", message: "请选择工作细项" },
+          ],
+          workContent: [
+            { required: true, trigger: "blur", message: "请填写具体内容" },
+          ]
+        }
+      } else {
+        this.rules = {
+          projectId: [
+            { required: true, trigger: "blur", message: "请选择项目" },
+          ],
+          workType: [
+            { required: true, trigger: "change", message: "请选择工作类别" },
+          ],
+          workItem: [
+            { required: true, trigger: "change", message: "请选择工作细项" },
+          ],
+          workContent: [
+            { required: true, trigger: "blur", message: "请填写具体内容" },
+          ]
+        }
+      }
+    }
   },
 }
 </script>

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

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-08-14 14:24:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-19 11:47:08
+ * @LastEditTime: 2024-10-21 15:00:50
 -->
 <template>
   <div class="app-container">
@@ -22,9 +22,9 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="填报时间" prop="submitTime">
-        <el-date-picker clearable v-model="queryParams.submitTime" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择填报时间">
+      <el-form-item label="填报月份" prop="submitTime">
+        <el-date-picker clearable v-model="queryParams.submitTime" type="month" value-format="yyyy-MM"
+          placeholder="请选择填报月份">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -74,10 +74,10 @@
     </el-row>
 
     <el-table v-loading="loading" :data="declareList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="index" width="55" align="center" />
       <!-- <el-table-column label="填报id" align="center" prop="formId" /> -->
-      <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
-      <el-table-column label="项目名称" align="center" prop="project.projectName" />
+      <el-table-column label="项目编号" align="center" prop="project.projectNumber" :formatter="formatterProjectNumber" />
+      <el-table-column label="项目名称" align="center" prop="project.projectName" :formatter="formatterProjectName" />
       <el-table-column label="填报人" align="center" prop="user.nickName" />
       <el-table-column label="工作类别" align="center" prop="workType" />
       <el-table-column label="工作项目" align="center" prop="workItem" />
@@ -110,24 +110,19 @@
           <span>{{ parseTime(scope.row.submitTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:declare:edit']"
-          >修改</el-button>
-          <el-button
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:declare:edit']">修改</el-button>
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['oa:declare:remove']"
-          >删除</el-button>
+          >删除</el-button> -->
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
 
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@@ -136,31 +131,37 @@
     <!-- 添加或修改工作填报对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
+        <el-form-item label="项目名称" prop="project.projectNumber" v-if="form.projectId">
+          {{ form.project.projectNumber + '-' + form.project.projectName }}
+        </el-form-item>
+        <el-form-item label="项目名称" v-else>
+          {{ form.submitTime ? form.submitTime.substring(0, 4) + '年借调、零星项目' : '借调、零星项目' }}
+        </el-form-item>
+        <el-form-item label="填报人" prop="userId">
+          {{ getUserName(form.userId) }}
         </el-form-item>
-        <el-form-item label="用户id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户id" />
+        <el-form-item label="填报时间" prop="submitTime">
+          <el-date-picker clearable v-model="form.submitTime" type="date" value-format="yyyy-MM-dd" disabled
+            placeholder="请选择填报时间">
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="工作项目" prop="workItem">
-          <el-input v-model="form.workItem" placeholder="请输入工作项目" />
+          <el-input v-model="form.workItem" placeholder="请输入工作项目" disabled />
         </el-form-item>
         <el-form-item label="工作内容">
-          <editor v-model="form.workContent" :min-height="192" />
+          <el-input type="textarea" v-model="form.workContent" :autosize="{ minRows: 4 }" disabled></el-input>
         </el-form-item>
         <el-form-item label="工天" prop="workLoad">
-          <el-input v-model="form.workLoad" placeholder="请输入工天" />
+          <el-input v-model="form.workLoad" placeholder="请输入工天" disabled />
         </el-form-item>
         <el-form-item label="工天单价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入工天单价" />
+          <el-input v-model="form.price" placeholder="请输入工天单价" disabled />
         </el-form-item>
         <el-form-item label="系数" prop="coefficient">
-          <el-input v-model="form.coefficient" placeholder="请输入系数" />
+          <el-input v-model="form.coefficient" placeholder="请输入系数" @blur="predictMoney(this.form)" />
         </el-form-item>
-        <el-form-item label="填报时间" prop="submitTime">
-          <el-date-picker clearable v-model="form.submitTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择填报时间">
-          </el-date-picker>
+        <el-form-item label="预估绩效">
+         <el-tag type="warning">{{ predictMoney(this.form) }}</el-tag>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -216,7 +217,9 @@ export default {
         confirmStatus: null
       },
       // 表单参数
-      form: {},
+      form: {
+        submitTime: ''
+      },
       // 表单校验
       rules: {
       }
@@ -229,6 +232,7 @@ export default {
     /** 查询工作填报列表 */
     getList() {
       this.loading = true;
+      this.queryParams.deptId = this.$store.getters.deptId;
       listDeclare(this.queryParams).then(response => {
         this.declareList = response.rows;
         this.total = response.total;
@@ -356,10 +360,28 @@ export default {
       else
         return 'warning'
     },
-    predictMoney(row){
+    predictMoney(row) {
       let result = parseFloat(row.price * row.workLoad * row.coefficient)
       return result.toFixed(2)
-    }
+    },
+    formatterProjectNumber(row) {
+      if (!row.projectId) {
+        return '无'
+      } else {
+        return row.project.projectNumber
+      }
+    },
+    formatterProjectName(row) {
+      if (!row.projectId) {
+        let year = row.submitTime.substring(0, 4)
+        return year + '年借调、零星项目'
+      } else {
+        return row.project.projectName
+      }
+    },
   }
 };
 </script>
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+</style>

oa-ui/src/views/statistics/components/borrowStatistics.vue

@@ -59,7 +59,6 @@ export default {
   },
   methods: {
     initDatas() {
-      console.log(this.borrowData);
       if (Object.keys(this.borrowData).length !== 0) {
         this.borrowAmount = this.borrowData.amount[0];
         this.borrowUsage = this.borrowData.usage[0];