From 304b56beb4e7085af93cd1bf3c60c189f64b86aa Mon Sep 17 00:00:00 2001
From: chen <2280784283@qq.com>
Date: Fri, 9 Aug 2024 15:40:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=84=E5=91=A8=E6=8A=A5=E7=9A=84=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../departmentWeekly/DepartmentWeeklyEdit.vue | 14 ++++-
 .../DepartmentWorkloadEdit.vue                | 12 ++++
 .../weekly/ExpenseClaimApplyAddList.vue       | 60 +++++++++++++++++--
 .../weekly/ExpenseClaimApplyDetail.vue        | 25 +++++++-
 .../ProjectBudgetApplyDetail.vue              | 14 ++++-
 .../wholeFirmWeekly/WholeFirmWeeklyEdit.vue   | 14 ++++-
 .../wholeFirmWeekly/WholeFirmWorkloadEdit.vue | 12 ++++
 7 files changed, 138 insertions(+), 13 deletions(-)

diff --git a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue
index 5f6d9c8..cc177a1 100644
--- a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue
+++ b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue
@@ -7,7 +7,7 @@
     <div class="page-content">
       <div class="panel">
         <div class="panel-body">
-          <el-form :model="formAll" label-width="100px" ref="formName">
+          <el-form :model="formAll" :rules="rules" label-width="100px" ref="formName">
 
             <el-form-item label="项目编号" prop="projectNo">
               <el-select class="form-input" filterable placeholder="请选择" v-model="formAll.ls[0].projectNo" :disabled="true">
@@ -26,7 +26,7 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item label="本周进展" prop="thisWeek">
+            <el-form-item label="本周进展" prop="ls[0].thisWeek">
               <el-input
                 class="form-input"
                 placeholder="请输入内容"
@@ -36,7 +36,7 @@
               >
               </el-input>
             </el-form-item>
-            <el-form-item label="下周计划" prop="nextWeek">
+            <el-form-item label="下周计划" prop="ls[0].nextWeek">
               <el-input
                 class="form-input"
                 placeholder="请输入内容"
@@ -88,6 +88,14 @@ export default {
       projectNo: '',
       NowUserId: '',
       draftManId: '',
+      rules: {
+        'ls[0].thisWeek': [
+          { required: true, message: '本周进展不能为空', trigger: 'blur' }
+        ],
+        'ls[0].nextWeek': [
+          { required: true, message: '下周计划不能为空', trigger: 'blur' }
+        ]
+      },
       projectManagerData: '',
       expandRight: false,
       app: app,
diff --git a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWorkloadEdit.vue b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWorkloadEdit.vue
index bc3df76..b15a591 100644
--- a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWorkloadEdit.vue
+++ b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWorkloadEdit.vue
@@ -34,6 +34,7 @@
                 class="form-input"
                 placeholder="请输入内容"
                 v-model="formModel.workload"
+                @change="validateWorkload"
               >
               </el-input>
             </el-form-item>
@@ -267,6 +268,17 @@ export default {
       }
       return dest
     },
+    // 判断工作量是否是0.5的倍数
+    validateWorkload() {
+      if (this.formModel.workload !== null) {
+        const value = parseFloat(this.formModel.workload);
+        if (value % 0.5 !== 0) {
+          // Adjust value to the nearest multiple of 0.5
+          this.formModel.workload = Math.round(value * 2) / 2;
+          this.$message.error('工作量必须是0.5的倍数');
+        }
+      }
+    },
     addFile () {
       this.formModel.reimburseDetail.push({
         time: '',
diff --git a/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyAddList.vue b/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyAddList.vue
index 9124f7f..6475a1c 100644
--- a/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyAddList.vue
+++ b/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyAddList.vue
@@ -245,6 +245,40 @@ export default {
         },
       ]
     },
+    validateMultipleOfHalf(rule, value, callback) {
+      if (value === undefined || value === null || value === '') {
+        return callback(new Error('请输入一个值'));
+      }
+
+      const num = parseFloat(value);
+
+      if (isNaN(num)) {
+        return callback(new Error('工作量必须为数字值'));
+      }
+
+      if ((num * 2) % 1 !== 0) {
+        return callback(new Error('工作量必须是 0.5 的倍数'));
+      }
+
+      callback(); // 通过验证
+    },
+    validateMultipleOfHalf1(rule, value, callback) {
+      if (value === undefined || value === null || value === '') {
+        return callback(new Error('请输入一个值'));
+      }
+
+      const num = parseFloat(value);
+
+      if (isNaN(num)) {
+        return callback(new Error('周数必须为数字值'));
+      }
+
+      if (num <= 0 || num % 1 !== 0) {
+        return callback(new Error('周数必须是正整数'));
+      }
+
+      callback(); // 通过验证
+    },
     initFormSchema () {
       this.formSchema = [
         {
@@ -287,16 +321,22 @@ export default {
                         title: '项目名称',
                         model: 'projectName',
                         span: 7,
-                        // rules: [
-                        //   {type: 'number', message: '序号必须为数字值'}
-                        // ],
+                        rules: [
+                          {required: true, message: '项目名称不能为空'}
+                        ],
                         externalValue: {}
                       },
                       {
                         type: 'custom-input',
-                        title: '工作量(人日)',
+                        title: '工作量',
                         model: 'workload',
                         span: 5,
+                        rules: [
+                          { required: true, message: '工作量不能为空' },
+                          { type: 'number',
+                            validator: this.validateMultipleOfHalf,
+                            trigger: 'blur'}
+                        ],
                         externalValue: {}
                       },
                       {
@@ -304,6 +344,12 @@ export default {
                         title: '周数',
                         model: 'week',
                         span: 5,
+                        rules: [
+                          {required: true, message: '周数不能为空'},
+                          { type: 'number',
+                            validator: this.validateMultipleOfHalf1,
+                            trigger: 'blur'}
+                        ],
                         externalValue: {}
                       },
                       {
@@ -311,6 +357,9 @@ export default {
                         title: '本周进展',
                         model: 'thisWeek',
                         span: 24,
+                        rules: [
+                          {required: true, message: '本周进展不能为空'}
+                        ],
                         externalValue: {}
                       },
                       {
@@ -318,6 +367,9 @@ export default {
                         title: '下周计划',
                         model: 'nextWeek',
                         span: 24,
+                        rules: [
+                          {required: true, message: '下周计划不能为空'}
+                        ],
                         externalValue: {}
                       },
                       {
diff --git a/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue b/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue
index 3a906dd..11d2312 100644
--- a/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue
+++ b/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue
@@ -18,7 +18,7 @@
     <div class="page-content">
       <div class="panel">
         <div class="panel-body">
-          <el-form :model="formModel" label-width="100px" ref="formName">
+          <el-form :model="formModel" :rules="rules" label-width="100px" ref="formName">
             <el-form-item label="部门" prop="deptId">
               <el-select class="form-input" filterable placeholder="请选择" v-model="formModel.deptId" :disabled="true">
                 <el-option
@@ -48,6 +48,7 @@
                 class="form-input"
                 placeholder="请输入内容"
                 v-model="formModel.projectNo"
+                :disabled="true"
               >
               </el-input>
             </el-form-item>
@@ -59,6 +60,7 @@
                 class="form-input"
                 placeholder="请输入内容"
                 v-model="formModel.projectName"
+                :disabled="true"
               >
               </el-input>
             </el-form-item>
@@ -103,7 +105,7 @@
                 class="form-input"
                 placeholder="请输入内容"
                 v-model.number="formModel.workload"
-                @change="moneyChange"
+                @change="validateWorkload"
               >
               </el-input>
             </el-form-item>
@@ -174,6 +176,14 @@ export default {
       nextWeek: '',
       userId: '',
       workload: '',
+      rules: {
+        thisWeek: [
+          { required: true, message: '本周进展不能为空', trigger: 'blur' }
+        ],
+        nextWeek: [
+          { required: true, message: '下周计划不能为空', trigger: 'blur' }
+        ]
+      },
       projectName: '',
       money: '',
       projectNo: '',
@@ -417,6 +427,17 @@ export default {
         fileList: []     // 文件列表
       })
     },
+    // 判断工作量是否是0.5的倍数
+    validateWorkload() {
+      if (this.formModel.workload !== null) {
+        const value = parseFloat(this.formModel.workload);
+        if (value % 0.5 !== 0) {
+          // Adjust value to the nearest multiple of 0.5
+          this.formModel.workload = Math.round(value * 2) / 2;
+          this.$message.error('工作量必须是0.5的倍数');
+        }
+      }
+    },
     deleteFile (index) {
       if (this.formModel.reimburseDetail.length === 1) {
         this.$message.warning('报销明细不能为空！')
diff --git a/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApplyDetail.vue b/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApplyDetail.vue
index c3b9a5d..3d87ad8 100644
--- a/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApplyDetail.vue
+++ b/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApplyDetail.vue
@@ -18,7 +18,7 @@
     <div class="page-content">
       <div class="panel">
         <div class="panel-body">
-          <el-form :model="formModel" label-width="100px" ref="formName">
+          <el-form :model="formModel" :rules="rules" label-width="100px" ref="formName">
             <el-form-item label="项目编号" prop="projectNo">
               <el-input
                 class="form-input"
@@ -60,6 +60,7 @@
                 class="form-input"
                 placeholder="请输入内容"
                 v-model="formModel.execute"
+                @change="validateExecute"
               >
               </el-input>
             </el-form-item>
@@ -293,6 +294,17 @@ export default {
         }
       })
     },
+    // 判断是否为正整数
+    validateExecute() {
+      if (this.formModel.execute !== null) {
+        const value = parseFloat(this.formModel.execute);
+        if (value <= 0 || !Number.isInteger(value)) {
+          this.$message.error('必须是正整数');
+        } else {
+          this.formModel.execute = value;
+        }
+      }
+    },
     //请求所有人员
     getAllPeople () {
       // Api.PersonnelManagement.personListNew(1, 10000).then((result) => {
diff --git a/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue b/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue
index 2686e11..69cca89 100644
--- a/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue
+++ b/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue
@@ -7,7 +7,7 @@
     <div class="page-content">
       <div class="panel">
         <div class="panel-body">
-          <el-form :model="formAll" label-width="100px" ref="formName">
+          <el-form :model="formAll" :rules="rules" label-width="100px" ref="formName">
 
             <el-form-item label="执行部门" prop="ext.deptName">
               <el-select class="form-input" filterable placeholder="请选择" v-model="formAll.ls[0].ext.deptName" :disabled="true">
@@ -31,7 +31,7 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item label="本周进展" prop="thisWeek">
+            <el-form-item label="本周进展" prop="ls[0].thisWeek">
               <el-input
                 class="form-input"
                 placeholder="请输入内容"
@@ -41,7 +41,7 @@
               >
               </el-input>
             </el-form-item>
-            <el-form-item label="下周计划" prop="nextWeek">
+            <el-form-item label="下周计划" prop="ls[0].nextWeek">
               <el-input
                 class="form-input"
                 placeholder="请输入内容"
@@ -92,6 +92,14 @@ export default {
       money: '',
       projectNo: '',
       NowUserId: '',
+      rules: {
+        'ls[0].thisWeek': [
+          { required: true, message: '本周进展不能为空', trigger: 'blur' }
+        ],
+        'ls[0].nextWeek': [
+          { required: true, message: '下周计划不能为空', trigger: 'blur' }
+        ]
+      },
       draftManId: '',
       projectManagerData: '',
       expandRight: false,
diff --git a/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWorkloadEdit.vue b/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWorkloadEdit.vue
index 44d3901..31908d1 100644
--- a/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWorkloadEdit.vue
+++ b/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWorkloadEdit.vue
@@ -39,6 +39,7 @@
                 class="form-input"
                 placeholder="请输入内容"
                 v-model="formModel.workload"
+                @change="validateWorkload"
               >
               </el-input>
             </el-form-item>
@@ -255,6 +256,17 @@ export default {
         }
       })
     },
+    // 判断工作量是否是0.5的倍数
+    validateWorkload() {
+      if (this.formModel.workload !== null) {
+        const value = parseFloat(this.formModel.workload);
+        if (value % 0.5 !== 0) {
+          // Adjust value to the nearest multiple of 0.5
+          this.formModel.workload = Math.round(value * 2) / 2;
+          this.$message.error('工作量必须是0.5的倍数');
+        }
+      }
+    },
     //递归组装部门级联选择器数据源
     assembleOrgData (source) {
       let dest = []