修改网页和移动端，工作填报新增开始日期和结束日期

oa-ui-app/pages/form/declare/declare.vue

 
 			<!-- 选择项目 -->
 			<uni-forms-item label="选择项目" required class="form-item" v-if="!isScattered" name="projectId">
-				<!-- <ProjectPicker v-model="formData.projectId" placeholder="请选择项目" :labelKey="'projectName'"
-					:valueKey="'projectId'" @change="handleProjectChange"
-					:customStyle="{ borderColor: '#e5e5e5', borderRadius: '8px' }" v-if="taskName == '工作填报'" /> -->
-				<!-- <ProjectInfo :project="projectObj" v-else></ProjectInfo> -->
 				<u-button type="primary" @click="openProject = true" v-if="taskName == '工作填报'">选择项目</u-button>
 				<ProjectPicker :visible.sync="openProject" :selected.sync="selectedProject" @confirm="handleConfirm" />
 				<ProjectInfo :project="projectObj"></ProjectInfo>
 			<uni-forms-item label="工作细项" required class="form-item" name="workItem">
 				<picker @change="bindWorkItemChange" :value="formData.workItem" :range="workItemList"
 					:disabled="taskName != '工作填报'">
-					<view class="uni-input">
-						<uni-easyinput type="text" :disabled="taskName != '工作填报'" v-model="formData.workItem"
-							@click="showType = true" placeholder="请选择" :styles="inputStyle" />
+					<view class="picker-selector" :class="{ 'picker-disabled': taskName != '工作填报' }">
+						<text class="picker-text" :class="{ 'picker-placeholder': !formData.workItem }">
+							{{ formData.workItem || '请选择' }}
+						</text>
+						<uni-icons type="arrowdown" size="16" color="#c0c4cc"></uni-icons>
 					</view>
 				</picker>
 			</uni-forms-item>
 
+			<!-- 工作日期 -->
+			<uni-forms-item label="工作日期" required class="form-item" name="beginDate">
+				<uni-datetime-picker v-if="taskName == '工作填报'" type="daterange" v-model="dateRange" start-placeholder="开始日期"
+					end-placeholder="结束日期" range-separator="至" return-type="string" @change="handleDateRangeChange" :border="true"
+					:clear-icon="true" />
+				<view v-else class="date-display">
+					<text class="date-text">{{ formatDateRange() }}</text>
+				</view>
+			</uni-forms-item>
+
 			<!-- 具体内容 -->
 			<uni-forms-item label="具体内容" required class="form-item" name="workContent">
 				<uni-easyinput :disabled="taskName != '工作填报'" type="textarea" v-model="formData.workContent"
 
 			<!-- 工天 -->
 			<uni-forms-item label="工天" required class="form-item" name="workLoad">
-				<uni-easyinput :disabled="taskName != '工作填报'" type="number" v-model="formData.workLoad" placeholder="请输入所需工天"
+				<uni-easyinput :disabled="taskName != '工作填报'" type="number" v-model="formData.workLoad" placeholder="请输入工天"
 					:styles="inputStyle">
 					<text slot="right" class="unit">天</text>
 				</uni-easyinput>
 		startUserName: String, // 流程发起人
 	},
 	created() {
-    this.applierUserName = this.startUserName;
+		this.applierUserName = this.startUserName;
 		this.getProjectList();
 		this.initForm();
 		if (this.taskName != '工作填报') {
 				projectId: '',
 				workType: '',
 				workItem: '',
+				beginDate: '',
+				endDate: '',
 				workContent: '',
 				workLoad: '',
 				price: 200,
 						errorMessage: '请选择工作细项',
 					},]
 				},
+				beginDate: {
+					rules: [{
+						required: true,
+						errorMessage: '请选择开始日期',
+					},]
+				},
+				endDate: {
+					rules: [{
+						required: true,
+						errorMessage: '请选择结束日期',
+					},]
+				},
 				workContent: {
 					rules: [{
 						required: true,
 				workLoad: {
 					rules: [{
 						required: true,
-						errorMessage: '请输入工作量',
+						errorMessage: '请输入工天',
 					},]
 				},
 				coefficient: {
 				borderRadius: '8px',
 				height: '100px'
 			},
-			showType: false,
+
 			workTypeColumns: [{
 				text: '外业',
 				value: '外业',
 			workItemList: [],
 			hasForm: false,
 			show: false,
+			isSubmitting: false, // 提交状态
 		};
 	},
+	computed: {
+		dateRange: {
+			get() {
+				if (this.formData.beginDate && this.formData.endDate) {
+					return [this.formData.beginDate, this.formData.endDate];
+				}
+				return [];
+			},
+			set(value) {
+				if (value && value.length === 2) {
+					this.formData.beginDate = value[0];
+					this.formData.endDate = value[1];
+				} else {
+					this.formData.beginDate = '';
+					this.formData.endDate = '';
+				}
+			}
+		}
+	},
 	methods: {
 		handleConfirm(project) {
 			this.selectedProject = project;
 			this.projectObj = project;
+			// 同时设置formData中的projectId，避免表单验证失败
+			this.formData.projectId = project.projectId;
 		},
 		initForm() {
 			if (this.taskName == '工作填报') {
 					this.projectObj = res.data.project;
 					this.selectedProject = res.data.project;
 					this.bindWorkTypeChange(this.formData.workType);
+
+					// 处理日期范围和工天的关系
+					if (!this.formData.beginDate) {
+						this.formData.beginDate = '';
+					}
+					if (!this.formData.endDate) {
+						this.formData.endDate = '';
+					}
+					if (this.formData.beginDate && this.formData.endDate) {
+						// 如果有日期范围，计算建议工天数但不覆盖现有值
+						this.calculateWorkDays();
+					}
+
 					this.countMoney();
 				} else {
 					this.hasForm = false;
 			let result = Number(this.formData.price) * Number(this.formData.workLoad) * Number(this.formData.coefficient)
 			this.money = result.toFixed(2)
 		},
-		async save() {
-			if (!this.isScattered) {
-				this.formData.projectId = this.projectObj.projectId;
-			} else {
-				this.formData.projectId = ''
+		handleDateRangeChange(range) {
+			this.dateRange = range;
+			this.calculateWorkDays();
+		},
+		calculateWorkDays() {
+			if (!this.formData.beginDate || !this.formData.endDate) {
+				return;
 			}
-			if (this.hasForm) {
-				let updateRes = await updateDeclare(this.formData);
-			} else {
-				this.formData.formId = this.taskForm.formId;
-				let addRes = await addDeclare(this.formData);
-				if (addRes.code == 200) {
-					this.hasForm = true;
+
+			const startDate = new Date(this.formData.beginDate);
+			const endDate = new Date(this.formData.endDate);
+
+			if (startDate && endDate && startDate <= endDate) {
+				// 计算日期差（包含开始和结束日期）
+				const timeDiff = endDate.getTime() - startDate.getTime();
+				const daysDiff = Math.ceil(timeDiff / (1000 * 3600 * 24)) + 1;
+
+				// 直接设置工天
+				this.formData.workLoad = daysDiff;
+			}
+		},
+
+		formatDateRange() {
+			if (this.formData.beginDate && this.formData.endDate) {
+				const beginDate = this.formData.beginDate.split(' ')[0]; // 只取日期部分，去掉时间
+				const endDate = this.formData.endDate.split(' ')[0];
+				return `${beginDate} 到 ${endDate}`;
+			}
+			return '未选择日期';
+		},
+		async save(showToast = true) {
+			try {
+				if (!this.isScattered) {
+					this.formData.projectId = this.projectObj.projectId;
 				} else {
-					this.hasForm = false;
+					this.formData.projectId = ''
 				}
+
+				let result;
+				if (this.hasForm) {
+					result = await updateDeclare(this.formData);
+				} else {
+					this.formData.formId = this.taskForm.formId;
+					result = await addDeclare(this.formData);
+					if (result.code == 200) {
+						this.hasForm = true;
+					} else {
+						this.hasForm = false;
+					}
+				}
+
+				if (result && result.code === 200) {
+					if (showToast) {
+						uni.showToast({
+							title: '保存成功',
+							icon: 'success'
+						});
+					}
+					return Promise.resolve(result);
+				} else {
+					throw new Error(result?.msg || '保存失败');
+				}
+			} catch (error) {
+				console.error('保存失败:', error);
+				if (showToast) {
+					uni.showToast({
+						title: error.message || '保存失败',
+						icon: 'error'
+					});
+				}
+				return Promise.reject(error);
 			}
-			uni.showToast({
-				title: '保存成功',
-				icon: 'success'
-			});
 		},
 		submitForm() {
+			// 在表单验证前确保projectId被正确设置
+			if (!this.isScattered && this.projectObj && this.projectObj.projectId) {
+				this.formData.projectId = this.projectObj.projectId;
+			} else if (this.isScattered) {
+				this.formData.projectId = '';
+			}
+
 			this.$refs.form.validate().then(res => {
 				this.taskForm.variables.skip = false;
 				if (!this.projectObj.projectLeader) {
 				console.log('表单错误信息：', err);
 			})
 		},
-		confirmSubmit() {
-			if (this.taskName == '工作填报') {
-				this.declareSubmit();
-			} else if (this.taskName == '项目负责人审核' || this.taskName == '部门负责人审核') {
-				this.approveForm();
-			} else {
-				this.confirmForm();
+		async confirmSubmit() {
+			if (this.isSubmitting) return; // 防止重复提交
+
+			try {
+				this.isSubmitting = true;
+
+				// 显示保存中提示
+				uni.showLoading({
+					title: '正在保存...'
+				});
+
+				// 先保存表单，不显示保存成功提示
+				await this.save(false);
+
+				uni.hideLoading();
+
+				if (this.taskName != '填报人确认') {
+					// 显示提交中提示
+					uni.showLoading({
+						title: '正在提交...'
+					});
+				}
+
+				// 保存成功后执行相应的提交流程
+				if (this.taskName == '工作填报') {
+					await this.declareSubmit();
+				} else if (this.taskName == '项目负责人审核' || this.taskName == '部门负责人审核') {
+					await this.approveForm();
+				} else {
+					await this.confirmForm();
+				}
+			} catch (error) {
+				console.error('保存失败，无法提交:', error);
+				uni.hideLoading();
+				uni.showToast({
+					title: '保存失败，请重试',
+					icon: 'error'
+				});
+			} finally {
+				this.isSubmitting = false;
 			}
 		},
 		async declareSubmit() {
 				this.taskForm.variables.approval = approval
 			} else {
 				let resData = await getUsersDeptLeader({
-					userId: this.form.userId
+					userId: this.formData.userId
 				});
 				if (resData.data) {
 					this.taskForm.variables.approval = resData.data.userId
 					this.taskForm.variables.skip = true;
 				}
 			}
-			if (this.hasForm) {
-				updateDeclare(this.formData);
-			} else {
-				this.formData.formId = this.taskForm.formId;
-				addDeclare(this.formData);
-			}
+			// 数据已在confirmSubmit中保存，直接进行流程提交
 			this.handleComplete(this.taskForm);
 		},
 		async approveForm() {
 			if (this.taskName == '项目负责人审核') {
 				this.formData.checkStatus = '1';
-				updateDeclare(this.formData);
+				// 更新状态后需要再次保存
+				await updateDeclare(this.formData);
 				let resData = await getUsersDeptLeader({
 					userId: this.formData.userId
 				});
 			} else if (this.taskName == '部门负责人审核') {
 				this.formData.checkStatus = '1';
 				this.formData.auditStatus = '1';
-				updateDeclare(this.formData);
+				// 更新状态后需要再次保存
+				await updateDeclare(this.formData);
 				this.taskForm.variables.approval = this.formData.userId;
 				this.handleComplete(this.taskForm);
 			}
 		},
 		confirmForm() {
-			this.$modal.confirm('最后一个节点，提交将结束流程，是否提交？').then(() => {
+			return this.$modal.confirm('最后一个节点，提交将结束流程，是否提交？').then(async () => {
 				this.formData.confirmStatus = '1';
-				updateDeclare(this.formData);
+				// 更新确认状态后需要再次保存
+				await updateDeclare(this.formData);
 				this.handleComplete(this.taskForm);
 			})
 		},
 			};
 			getNextFlowNode(params).then(() => {
 				complete(taskForm).then(response => {
+					uni.hideLoading(); // 隐藏loading
 					uni.showToast({
 						title: response.msg,
 						icon: 'success'
 							url: '/pages/message/index'
 						})
 					}, 500);
+				}).catch(error => {
+					uni.hideLoading(); // 隐藏loading
+					console.error('提交失败:', error);
+					uni.showToast({
+						title: '提交失败，请重试',
+						icon: 'error'
+					});
 				})
+			}).catch(error => {
+				uni.hideLoading(); // 隐藏loading
+				console.error('获取下一节点失败:', error);
+				uni.showToast({
+					title: '提交失败，请重试',
+					icon: 'error'
+				});
 			})
-
 		},
 	}
 };
 	color: #999;
 	padding: 0 10px;
 }
+
+
+
+.date-display {
+	padding: 10px;
+	border: 1px solid #e5e5e5;
+	border-radius: 8px;
+	background-color: #f7f6f6;
+	min-height: 44px;
+	display: flex;
+	align-items: center;
+}
+
+.date-text {
+	font-size: 14px;
+	color: #333333;
+	line-height: 1.4;
+}
+
+.picker-selector {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 10px;
+	border: 1px solid #e5e5e5;
+	border-radius: 8px;
+	background-color: #fff;
+	min-height: 44px;
+	box-sizing: border-box;
+}
+
+.picker-selector.picker-disabled {
+	background-color: #f7f6f6;
+	color: #333333;
+}
+
+.picker-text {
+	flex: 1;
+	font-size: 14px;
+	color: #333;
+	line-height: 1.4;
+}
+
+.picker-text.picker-placeholder {
+	color: #c0c4cc;
+}
 </style>

oa-ui-app/pages/oa/device/instrumentsList.vue

  * @Author: ysh
  * @Date: 2025-07-08 14:00:47
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-07-08 15:50:20
+ * @LastEditTime: 2025-07-16 15:22:13
 -->
 <template>
   <view class="device-container">
 
     handleViewLogs() {
       this.closeDetailPopup();
-      uni.navigateTo({
-        url: `/pages/oa/device/deviceLog?deviceId=${this.currentDevice.deviceId}`
-      });
+      
     },
 
     handleAdd() {
   align-items: center;
   padding: 15px;
   border-bottom: 1px solid #f0f0f0;
+  background: linear-gradient(90deg, #e0e7ff 0%, #f8fafc 100%);
 }
 
 .device-info {
     align-items: center;
     justify-content: center;
     gap: 4px;
-    padding: 12px;
+    padding: 5px;
     background: none;
     border: none;
     font-size: 13px;
   bottom: 30px;
   width: 56px;
   height: 56px;
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  background: #6366f1;
   border-radius: 50%;
   display: flex;
   align-items: center;
 .popup-footer {
   display: flex;
   gap: 15px;
-  padding: 20px;
+  padding: 10px;
   border-top: 1px solid #f0f0f0;
 
   .popup-btn {
     flex: 1;
-    padding: 12px;
+    padding: 1px;
     border-radius: 8px;
     font-size: 16px;
     border: none;
     }
 
     &.primary {
-      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+      background: #6366f1;
       color: #fff;
     }
   }

oa-ui/src/assets/styles/element-reset.scss

 }
 
 // 复选框
-::v-deep .el-checkbox__input.is-disabled+span.el-checkbox__label{
+::v-deep .el-checkbox__input.is-disabled+span.el-checkbox__label {
   color: #686a6e;
 }
 
-::v-deep .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner{
+::v-deep .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
   background-color: #409EFF;
   border-color: #409EFF;
 }
-::v-deep .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{
+
+::v-deep .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after {
   border-color: #fff;
 }
 
 // 描述框
-::v-deep .el-descriptions-item__label.is-bordered-label{
+::v-deep .el-descriptions-item__label.is-bordered-label {
   color: #686a6e;
 }
 
 // 多选框
 ::v-deep .el-tag.el-tag--info {
   color: #535559;
+}
+
+::v-deep .el-range-editor.is-disabled input {
+  color: #535559;
 }

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

 <!--
  * @Author: ysh
  * @Date: 2024-08-16 09:16:36
- * @LastEditors: wrh
- * @LastEditTime: 2025-06-09 08:51:49
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-07-31 09:48:58
 -->
 <template>
   <div>
             <el-input type="textarea" v-model="form.workContent" :autosize="{ minRows: 4, maxRows: 10 }"
               :disabled="taskName != '工作填报'"></el-input>
           </el-form-item>
+          <el-form-item label="工作日期：" prop="dateRange">
+            <el-date-picker v-model="form.dateRange" type="daterange" range-separator="至" start-placeholder="开始日期"
+              end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+              :disabled="taskName != '工作填报'" @change="handleDateRangeChange">
+            </el-date-picker>
+          </el-form-item>
           <el-form-item label="工天：" prop="workLoad">
             <el-input-number v-model="form.workLoad" @change="countMoney()"
               :disabled="taskName != '工作填报'"></el-input-number>
         price: 200,
         userId: undefined,
         submitTime: undefined,
+        beginDate: undefined,
+        endDate: undefined,
+        dateRange: [],
       },
       radio: '0',
       rules: {
         ],
         workContent: [
           { required: true, trigger: "blur", message: "请填写具体内容" },
+        ],
+        dateRange: [
+          { required: true, trigger: "change", message: "请选择工作日期范围" },
         ]
       },
       prOpen: false,
           this.form.price = 200;
           this.hasForm = true;
           this.countMoney();
+
+          // 设置日期范围
+          if (res.data.beginDate && res.data.endDate) {
+            this.form.dateRange = [res.data.beginDate, res.data.endDate];
+          }
+
           if (!res.data.projectId) {
             this.radio = '1'
           } else {
               let approval = this.chooseProject.projectLeader;
               this.$set(this.taskForm.variables, "approval", approval);
             } else {
-              let resData = await getUsersDeptLeader({ userId: this.form.userId }); 
+              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);
           ],
           workContent: [
             { required: true, trigger: "blur", message: "请填写具体内容" },
+          ],
+          dateRange: [
+            { required: true, trigger: "change", message: "请选择工作日期范围" },
           ]
         }
       } else {
           ],
           workContent: [
             { required: true, trigger: "blur", message: "请填写具体内容" },
+          ],
+          dateRange: [
+            { required: true, trigger: "change", message: "请选择工作日期范围" },
           ]
         }
       }
+    },
+    handleDateRangeChange(val) {
+      if (val) {
+        this.form.beginDate = val[0];
+        this.form.endDate = val[1];
+        this.calculateWorkDays();
+      } else {
+        this.form.beginDate = undefined;
+        this.form.endDate = undefined;
+        this.form.workLoad = 1; // 如果取消选择，则重置工天为1
+        this.countMoney();
+      }
+    },
+    // 计算工天
+    calculateWorkDays() {
+      if (this.form.beginDate && this.form.endDate) {
+        const beginDate = new Date(this.form.beginDate);
+        const endDate = new Date(this.form.endDate);
+
+        if (endDate >= beginDate) {
+          // 计算天数差值，加1是因为要包含开始和结束日期
+          const timeDiff = endDate.getTime() - beginDate.getTime();
+          const dayDiff = Math.ceil(timeDiff / (1000 * 3600 * 24)) + 1;
+
+          this.form.workLoad = dayDiff;
+          // 重新计算金额
+          this.countMoney();
+        }
+      }
     }
   },
 }

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

  * @Author: ysh
  * @Date: 2024-06-21 18:52:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-07-24 11:09:01
+ * @LastEditTime: 2025-07-24 14:37:14
 -->
 <template>
   <div class="app-container">
         listContract(this.queryParams).then(response => {
           this.contractList = response.rows;
           this.total = response.total;
-          for (let contract of this.contractList) {
-            listContractPaid({ contractId: contract.contractId }).then(res => {
-              if (res.total > 0) {
-                let percentage = res.rows.reduce((sum, item) => sum + Number(item.paidPercentage), 0);
-                let paidAmount = res.rows.reduce((sum, item) => sum + Number(item.paidAmount), 0);
-                this.$set(contract, 'percentage', Number(percentage.toFixed(2)))
-                this.$set(contract, 'paidAmount', Number(paidAmount.toFixed(2)))
-              } else {
-                this.$set(contract, 'percentage', 0)
-              }
-              this.loading = false;
-            })
-          }
+          this.loading = false;
         });
       }
       else {

oa-ui/src/views/oa/contract/subContract.vue

  * @Author: ysh
  * @Date: 2024-06-21 18:52:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-07-24 10:39:15
+ * @LastEditTime: 2025-07-24 14:38:46
 -->
 <template>
   <div class="app-container">
       listSubContract(this.queryParams).then(response => {
         this.subContractList = response.rows;
         this.total = response.total;
-        for (let subContract of this.subContractList) {
-          listContractPaid({ contractId: subContract.subContractId }).then(res => {
-            if (res.total > 0) {
-              let percentage = res.rows.reduce((sum, item) => sum + Number(item.paidPercentage), 0);
-              let paidAmount = res.rows.reduce((sum, item) => sum + Number(item.paidAmount), 0);
-              this.$set(subContract, 'percentage', Number(percentage.toFixed(2)));
-              this.$set(subContract, 'paidAmount', Number(paidAmount.toFixed(2)));
-            } else {
-              this.$set(subContract, 'percentage', 0)
-            }
-            this.loading = false;
-          })
-        }
+        this.loading = false;
       });
     },
     remoteMethod(val) {

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

  * @Author: wrh
  * @Date: 2024-08-14 14:24:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-15 10:33:56
+ * @LastEditTime: 2025-07-31 10:00:14
 -->
 <template>
   <div class="app-container">
       <el-table-column label="工作类别" align="center" prop="workType" />
       <el-table-column label="工作项目" align="center" prop="workItem" />
       <el-table-column label="工作内容" align="center" prop="workContent" width="250px" />
+      <el-table-column label="开始日期" align="center" prop="beginDate" width="92px"/>
+      <el-table-column label="结束日期" align="center" prop="endDate" width="92px"/>
       <el-table-column label="工天" align="center" prop="workLoad" />
       <el-table-column label="工天单价" align="center" prop="price" />
       <el-table-column label="系数" align="center" prop="coefficient" />
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="填报时间" align="center" prop="submitTime">
+      <el-table-column label="填报时间" align="center" prop="submitTime" width="92px">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitTime, '{y}-{m}-{d}') }}</span>
         </template>