修改移动端设备审批

oa-ui-app/pages/components/DevicePicker.vue

@@ -106,6 +106,11 @@ export default {
       handler(val) {
         this.selectedList = Array.isArray(val) ? [...val] : [val];
       }
+    },
+    'queryParams.status': {
+      handler() {
+        this.handleSearch();
+      }
     }
   },
 
@@ -124,14 +129,19 @@ export default {
 
     // 加载设备数据
     async loadData() {
-      if (this.loading || !this.hasMore) return;
+      if (this.loading) return;
 
       this.loading = true;
       try {
         const res = await listDevice(this.queryParams);
-        this.list = this.queryParams.pageNum === 1
-          ? res.rows
-          : [...this.list, ...res.rows];
+        
+        // 如果是第一页，直接替换列表
+        if (this.queryParams.pageNum === 1) {
+          this.list = res.rows;
+        } else {
+          // 如果不是第一页，追加到列表
+          this.list = [...this.list, ...res.rows];
+        }
 
         this.hasMore = res.total > this.queryParams.pageNum * this.queryParams.pageSize;
         this.queryParams.pageNum++;
@@ -142,6 +152,7 @@ export default {
 
     // 搜索处理
     handleSearch() {
+      // 重置分页参数
       this.queryParams.pageNum = 1;
       this.hasMore = true;
       this.list = [];

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

@@ -20,7 +20,7 @@
 
       <!-- 填报日期 -->
       <uni-forms-item label="填报日期" class="form-item">
-        <uni-datetime-picker v-model="form.applyDate" type="date" :disabled="taskName != '设备申请'" />
+        <text>{{ form.applyDate }}</text>
       </uni-forms-item>
 
       <!-- 选择项目 -->
@@ -33,7 +33,8 @@
       <!-- 设备选择 -->
       <uni-forms-item label="选择设备" required class="form-item" name="devices">
         <uv-button type="primary" @click="openDevice = true" v-if="taskName == '设备申请'">+ 选择设备</uv-button>
-        <device-picker :visible.sync="openDevice" :selected.sync="selectDevice" @confirm="handleDeviceConfirm"></device-picker>
+        <device-picker :visible.sync="openDevice" :selected.sync="selectDevice"
+          @confirm="handleDeviceConfirm"></device-picker>
         <uni-table v-if="deviceList.length > 0">
           <uni-tr>
             <uni-th>序号</uni-th>
@@ -56,16 +57,15 @@
 
       <!-- 申领事由 -->
       <uni-forms-item label="申领事由" required class="form-item" name="applyReason">
-        <uni-easyinput type="textarea" v-model="form.applyReason" placeholder="请输入申领事由" :disabled="taskName != '设备申请'" />
+        <uni-easyinput type="textarea" v-model="form.applyReason" placeholder="请输入申领事由"
+          :disabled="taskName != '设备申请'" />
       </uni-forms-item>
 
       <!-- 日期选择 -->
       <view class="date-range">
-        <uni-forms-item label="开始日期" required class="form-item" name="beginDate">
-          <uni-datetime-picker v-model="form.beginDate" type="date" :disabled="taskName != '设备申请'" @change="calculateDay" />
-        </uni-forms-item>
-        <uni-forms-item label="结束日期" required class="form-item" name="endDate">
-          <uni-datetime-picker v-model="form.endDate" type="date" :disabled="taskName != '设备申请'" @change="calculateDay" />
+        <uni-forms-item label="使用日期" required class="form-item" name="dateRange">
+          <uni-datetime-picker v-model="dateRange" type="daterange" rangeSeparator="至" :clearIcon="false"
+            :disabled="taskName != '设备申请'" @change="handleDateRangeChange" />
         </uni-forms-item>
         <uni-forms-item label="共计" class="form-item">
           <text>{{ form.days + '天' }}</text>
@@ -102,12 +102,14 @@
 
       <!-- 安排设备意见 -->
       <uni-forms-item label="安排设备意见" class="form-item" v-if="taskName == '安排设备'">
-        <uni-easyinput type="textarea" v-model="form.dispatchComment" placeholder="请输入安排设备意见" :disabled="taskName != '安排设备'" />
+        <uni-easyinput type="textarea" v-model="form.dispatchComment" placeholder="请输入安排设备意见"
+          :disabled="taskName != '安排设备'" />
       </uni-forms-item>
 
       <!-- 分管审核意见 -->
       <uni-forms-item label="分管审核意见" class="form-item" v-if="taskName == '分管审核'">
-        <uni-easyinput type="textarea" v-model="form.managerComment" placeholder="请输入分管审核意见" :disabled="taskName != '分管审核'" />
+        <uni-easyinput type="textarea" v-model="form.managerComment" placeholder="请输入分管审核意见"
+          :disabled="taskName != '分管审核'" />
       </uni-forms-item>
 
       <!-- 归还确认 -->
@@ -134,7 +136,8 @@
 
       <!-- 需维修设备 -->
       <uni-forms-item label="需维修设备" class="form-item" v-if="taskName == '归还确认'">
-        <uni-data-select v-model="form.repairDevices" :localdata="modifyDeviceList" multiple :disabled="taskName != '归还确认'" />
+        <uni-data-select v-model="form.repairDevices" :localdata="modifyDeviceList" multiple
+          :disabled="taskName != '归还确认'" />
       </uni-forms-item>
 
       <!-- 备注 -->
@@ -149,9 +152,9 @@
 
       <!-- 操作按钮 -->
       <view class="form-actions">
+        <uv-button style="margin-bottom: 5px;" type="warning" @click="saves">保存</uv-button>
         <uv-button type="primary" @click="submit" v-if="taskName == '设备申请'">提交申请</uv-button>
         <template v-else>
-          <uv-button type="warning" @click="saves">保存</uv-button>
           <uv-button type="primary" @click="completeApply">完成审批</uv-button>
         </template>
       </view>
@@ -186,6 +189,12 @@ export default {
   data() {
     return {
       form: {
+        user: {
+          nickName: ''
+        },
+        dept: {
+          deptName: ''
+        },
         projectId: '',
         applyDate: '',
         applyReason: '',
@@ -194,10 +203,12 @@ export default {
         days: 0,
         dispatchComment: '',
         managerComment: '',
+        devices: [],
         repairDevices: [],
         remark: '',
         returnDate: ''
       },
+      dateRange: [],
       rules: {
         projectId: {
           rules: [{ required: true, errorMessage: '请选择项目' }]
@@ -208,11 +219,8 @@ export default {
         applyReason: {
           rules: [{ required: true, errorMessage: '请输入申领事由' }]
         },
-        beginDate: {
-          rules: [{ required: true, errorMessage: '请选择开始日期' }]
-        },
-        endDate: {
-          rules: [{ required: true, errorMessage: '请选择结束日期' }]
+        dateRange: {
+          rules: [{ required: true, errorMessage: '请选择使用日期' }]
         }
       },
       applierUserName: '',
@@ -223,21 +231,31 @@ export default {
       selectDevice: [],
       deviceList: [],
       modifyDeviceList: [],
-      returnDevicesList: []
-    }
+      returnDevicesList: [],
+      formTotal: 0
+    };
   },
   methods: {
     initForm() {
       getDeviceApproval(this.taskForm.formId).then(res => {
         if (res.data) {
+          this.formTotal = 1;
           this.form = res.data;
           this.deviceList = res.data.devices || [];
           this.modifyDeviceList = res.data.modifyDevices || [];
           this.returnDevicesList = res.data.returnDevices || [];
+          if (this.form.beginDate && this.form.endDate) {
+            this.dateRange = [this.form.beginDate, this.form.endDate];
+          }
         } else {
+          this.form.applier = this.$store.getters.userId;
           this.form.applyDate = parseTime(new Date(), "{y}-{m}-{d}");
+          let name = this.applierUserName.split('-');
+          this.form.user.nickName = name[0];
+          this.form.dept.deptName = name[1];
+          this.formTotal = 0;
         }
-      })
+      });
     },
     handleConfirm(project) {
       this.selectedProject = project;
@@ -248,11 +266,21 @@ export default {
       this.deviceList = Array.isArray(devices) ? devices : [devices];
       this.form.devices = this.deviceList.map(item => item.deviceId);
     },
+    handleDateRangeChange(e) {
+      if (Array.isArray(e) && e.length === 2) {
+        const [start, end] = e;
+        this.form.beginDate = start;
+        this.form.endDate = end;
+        this.calculateDay();
+      }
+    },
     calculateDay() {
       if (this.form.beginDate && this.form.endDate) {
         const begin = new Date(this.form.beginDate);
         const end = new Date(this.form.endDate);
-        this.form.days = Math.ceil((end - begin) / (1000 * 60 * 60 * 24)) + 1;
+        if (!isNaN(begin.getTime()) && !isNaN(end.getTime())) {
+          this.form.days = Math.ceil((end - begin) / (1000 * 60 * 60 * 24)) + 1;
+        }
       }
     },
     replaceRowData(row, index) {
@@ -278,12 +306,68 @@ export default {
       });
     },
     saves() {
-      updateDeviceApproval(this.form).then(res => {
+      try {
+        // 构建提交数据
+        let submitData = {
+          ...this.form,
+          formId: this.taskForm.formId,
+          deviceApplyId: this.taskForm.formId,
+        };
+        let formData = new FormData();
+        let jsonForm = JSON.stringify(submitData);
+        formData.append("form", jsonForm);
+        console.log(formData.get('form'));
+        // 根据表单状态选择接口
+        if (this.formTotal !== 0) {
+          modifyDeviceApproval(formData).then(res => {
+            console.log('修改响应:', res);
+            if (res.code === 200) {
+              uni.showToast({
+                title: '保存成功',
+                icon: 'success'
+              });
+            } else {
+              uni.showToast({
+                title: res.msg || '保存失败',
+                icon: 'error'
+              });
+            }
+          }).catch(error => {
+            console.error('修改错误:', error);
+            uni.showToast({
+              title: error.message || '保存失败',
+              icon: 'error'
+            });
+          });
+        } else {
+          submitDeviceApproval(formData).then(res => {
+            console.log('提交响应:', res);
+            if (res.code === 200) {
+              uni.showToast({
+                title: '保存成功',
+                icon: 'success'
+              });
+            } else {
+              uni.showToast({
+                title: res.msg || '保存失败',
+                icon: 'error'
+              });
+            }
+          }).catch(error => {
+            console.error('提交错误:', error);
+            uni.showToast({
+              title: error.message || '保存失败',
+              icon: 'error'
+            });
+          });
+        }
+      } catch (error) {
+        console.error('保存方法错误:', error);
         uni.showToast({
-          title: '保存成功',
-          icon: 'success'
+          title: error.message || '保存失败',
+          icon: 'error'
         });
-      });
+      }
     },
     completeApply() {
       modifyDeviceApproval(this.form).then(res => {
@@ -320,13 +404,12 @@ export default {
 }
 
 .date-range {
-  display: flex;
+  // display: flex;
   flex-wrap: wrap;
   gap: 32rpx;
 }
 
 .form-actions {
-  display: flex;
   justify-content: center;
   gap: 32rpx;
   margin-top: 32rpx;

oa-ui/src/views/flowable/form/oa/deviceForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-13 09:43:18
+ * @LastEditTime: 2025-04-14 15:27:27
 -->
 
 <template>