修改设备申请表里的已归还设备选择；

修改项目流转里项目安排的操作逻辑。

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java

@@ -168,7 +168,7 @@ public class CmcDeviceApprovalController extends BaseController
         }
         if (formDataJson.getDate("returnDate") != null) {
             cmcDeviceApproval.setRemark(formDataJson.getString("remark"));
-            if (formDataJson.getDate("repairDevices") != null && formDataJson.getJSONArray("repairDevices").size() > 0) {
+            if (formDataJson.getString("repairDevices") != null && formDataJson.getJSONArray("repairDevices").size() > 0) {
                 String deviceString = formDataJson.getString("repairDevices").substring(1, formDataJson.getString("repairDevices").length() - 1);
                 cmcDeviceApproval.setRepairDevices(deviceString);
                 String[] devices = deviceString.split(",");
@@ -178,7 +178,7 @@ public class CmcDeviceApprovalController extends BaseController
                     cmcDeviceService.updateCmcDevice(cmcDevice);
                 }
             }
-            if (formDataJson.getDate("returnDevices") != null && formDataJson.getJSONArray("returnDevices").size() > 0) {
+            if (formDataJson.getString("returnDevices") != null && formDataJson.getJSONArray("returnDevices").size() > 0) {
                 String deviceString = formDataJson.getString("returnDevices").substring(1, formDataJson.getString("returnDevices").length() - 1);
                 cmcDeviceApproval.setReturnDevices(deviceString);
                 String[] devices = deviceString.split(",");

oa-ui/src/api/oa/project/project.js

@@ -24,7 +24,7 @@ export function getProject(projectId) {
 }
 
 // 查询cmc项目详细
-export function getProject(query) {
+export function getProjectNmuber(query) {
   return request({
     url: '/oa/project/projectNumber',
     method: 'get',

oa-ui/src/views/file/filesProject/project.vue

@@ -520,7 +520,6 @@ export default {
       this.uploadKmlData.append("kmlfile", this.kmlfile);
       this.uploadKmlData.append("cpfile", this.cpfile);
       this.modifyForm.partyA = null
-      console.log( this.kmlfile);
       if (this.position.length != 0) {
         this.modifyForm.kmlLng = this.position[0];
         this.modifyForm.kmlLat = this.position[1];
@@ -531,8 +530,6 @@ export default {
           for (let i in this.modifyForm) {
             this.uploadKmlData.append(i, this.modifyForm[i] == null ? "" : this.modifyForm[i]);
           }
-          console.log(this.modifyForm);
-          console.log((this.uploadKmlData) );
           // return
           updateProject(this.uploadKmlData).then(response => {
             this.$modal.msgSuccess("修改成功");

oa-ui/src/views/file/index/infoBox.vue

@@ -58,7 +58,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.datas);
   },
   methods: {},
 }

oa-ui/src/views/flowable/form/components/conditionDisplay.vue

@@ -29,7 +29,7 @@
     <borrow-form :key="'bor'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '借款审批'"></borrow-form>
     <brand-form :key="'brand'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '品牌项目支付'"></brand-form>
     <deposit-form :key="'deposit'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '保证金审批'"></deposit-form>
-    <device-form :key="'device'+taskForm.taskId" :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '设备审批'"></device-form>
+    <device-form :key="'device'+taskForm.taskId" :taskForm="taskForm" :taskName="''" :formDisabled="true" v-else-if="taskForm.procDefName == '设备审批'"></device-form>
   </div>
 </template>
 

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: 2024-07-30 11:40:54
+ * @LastEditTime: 2024-07-31 13:54:57
 -->
 
 <template>
@@ -12,7 +12,7 @@
         <el-card>
           <h2 style="text-align: center;">设备申请表</h2>
           <div>
-            <el-form ref="deviceForm" :model="form" label-width="120px" :rules="rules">
+            <el-form ref="deviceForm" :model="form" label-width="120px" :rules="rules" :disabled="formDisabled">
               <!-- 申请人填写 -->
               <el-divider></el-divider>
               <el-row :gutter="20">
@@ -149,6 +149,17 @@
               </el-row>
               <!-- 归还确认 -->
               <el-divider></el-divider>
+              <el-form-item label="已归还设备" >
+                <el-table ref="returnDevicesRef" :data="returnDevicesList" @selection-change="handleSelectionReturn" >
+                  <el-table-column type="selection" width="55" disabled />
+                  <el-table-column label="序号" type="index" />
+                  <el-table-column label="出厂编号" align="center" prop="code" />
+                  <el-table-column label="设备品牌" align="center" prop="brand" />
+                  <el-table-column label="设备名称" align="center" prop="name" />
+                  <el-table-column label="规格型号" align="center" prop="series" />
+                  <el-table-column label="存放地址" align="center" prop="place" />
+                </el-table>
+              </el-form-item>
               <el-form-item label="需维修设备：" prop="state" label-width="120px">
                 <el-select style="width: 100%;" v-model="form.repairDevices" filterable multiple placeholder="请选择"
                   clearable :disabled="taskName != '归还确认'">
@@ -177,7 +188,6 @@
             </el-row>
           </div>
         </el-card>
-
       </el-col>
       <el-col :span="6" :xs="24" v-if="flowDisabled">
         <el-card>
@@ -230,6 +240,10 @@ export default {
     flowDisabled: {
       type: Boolean,
       default: true
+    },
+    formDisabled:{
+      type: Boolean,
+      default: false
     }
   },
   watch: {
@@ -284,6 +298,7 @@ export default {
       deviceList: [],
       grantDeviceList: [],
       modifyDeviceList: [],
+      returnDevicesList: [],
       formTotal: 0,
       clicDevice: {},
       clickRowIndex: 0,
@@ -350,6 +365,7 @@ export default {
           this.formTotal = 1;
           let data = res.data;
           this.form = data;
+          // 处理devices
           if (res.data.devices == null || res.data.devices == undefined || res.data.devices == "") {
             data.devices = []
           } else {
@@ -364,6 +380,7 @@ export default {
             }
             data.devices = arr;
           }
+          // 处理modifyDevices
           if (res.data.modifyDevices == null || res.data.modifyDevices == undefined || res.data.modifyDevices == "") {
             data.modifyDevices = []
             this.modifyDeviceList = this.deviceList
@@ -381,6 +398,28 @@ export default {
             data.modifyDevices = arr;
             this.form.modifyDevices = arr;
           }
+          // 处理 returnDevices  
+          if (!data.returnDevices || data.returnDevices === "") {
+            data.returnDevices = [];
+            this.returnDevicesList = this.modifyDeviceList; // 如果逻辑允许，这里可以直接赋值 
+          } else {
+            this.returnDevicesList = this.modifyDeviceList;
+            let selectReturnDevicesIds = data.returnDevices.split(',');
+            let selectReturnDevicesPromises = selectReturnDevicesIds.map(d => getDevice(d).then(result => result.data));
+            Promise.all(selectReturnDevicesPromises).then(returnDevices => {
+              if (returnDevices) {
+                let deviceIdsSet = new Set(this.returnDevicesList.map(device => device.deviceId));
+                returnDevices.forEach(device1 => {
+                  if (deviceIdsSet.has(device1.deviceId)) {
+                    const matchingDevice = this.returnDevicesList.find(device2 => device2.deviceId === device1.deviceId);
+                    if (matchingDevice) {
+                      this.$refs.returnDevicesRef.toggleRowSelection(matchingDevice);
+                    }
+                  }
+                });
+              }
+            })
+          }
           if (data.projectId) {
             getProject(data.projectId).then(response => {
               this.chooseProject = response.data;
@@ -609,6 +648,11 @@ export default {
     addRowdata() {
       this.openDevice = true;
       this.multiple = true;
+    },
+    // 选择已归还设备
+    handleSelectionReturn(val) {
+      const ids = val.map(item => item.deviceId);
+      this.form.returnDevices = ids
     }
   },
 }

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-23 14:55:46
+ * @LastEditTime: 2024-07-30 17:43:08
 -->
 <template>
   <div class="project-wrapper">
@@ -58,7 +58,8 @@
             <span class="el-icon-download">下载文件</span>
           </el-link>
         </div>
-        <FileUpload v-if="$route.query.taskName == '项目登记'" ref="orz" :limit="1" :filePathName="'项目任务书/' + parseTime(new Date(),'{y}-{m}-{d}-{h}-{i}-{s}')"
+        <FileUpload v-if="$route.query.taskName == '项目登记'" ref="orz" :limit="1"
+          :filePathName="'项目任务书/' + parseTime(new Date(), '{y}-{m}-{d}-{h}-{i}-{s}')"
           :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setProjectDocument">
         </FileUpload>
       </el-form-item>
@@ -95,7 +96,7 @@
 <script>
 import { parseTime } from "@/utils/ruoyi";
 import { mapGetters } from "vuex";
-import { listProject, getProject, addProject, updateProject, delProject } from "@/api/oa/project/project";
+import { listProject, getProject, addProject, updateProject, delProject, getProjectNmuber } from "@/api/oa/project/project";
 import { getUser } from "@/api/system/user";
 import { getUsersDeptLeaderByDept } from "@/api/system/post";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
@@ -145,7 +146,7 @@ export default {
         registerTime: undefined,
         projectRegistrant: "",
         projectLevel: "0",
-        taskDocument:''
+        taskDocument: ''
       },
       chooseContractInfo: {
         contractCode: '',
@@ -379,14 +380,22 @@ export default {
     changeProjectSource(val) {
       let params = {
         pageNum: 1,
-        pageSize: 1000, // 假设这是一个合理的值  
+        pageSize: 1000,
       };
+      let year = new Date().getFullYear();
+      let isCorW = '';
       if (val === '0') {
         params.partyAName = '中国电建集团成都勘测设计研究院有限公司';
+        isCorW = 'C'
+      } else {
+        isCorW = 'W'
       }
       listPartyA(params).then(response => {
         this.partyAList = response.rows;
       })
+      getProjectNmuber({ projectNumber: year + isCorW }).then(res => {
+        this.$set(this.addForm, 'projectNumber', res.msg)
+      })
     }
   },
 };

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-24 11:04:44
+ * @LastEditTime: 2024-07-31 10:59:19
 -->
 <template>
   <div class="app-container">
@@ -31,20 +31,21 @@
       <el-row :gutter="20">
         <el-col :span="12" :xs="24">
           <el-form-item label="项目负责人：" prop="projectLeader">
-            <el-select v-model="form.projectLeader" placeholder="请选择项目负责人" size="large" disabled>
-              <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            <el-select v-model="peopleForm.deptId" @change="handleChangeDept" clearable style="width:60%">
+              <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-select v-model="form.projectLeader" placeholder="请选择项目负责人" clearable style="width:40%">
+              <el-option v-for="item in peopleForm.userList" :key="item.userId" :label="item.nickName"
                 :value="item.userId" />
             </el-select>
-            <!-- <el-tag effect="plain" type="warning" style="margin-right: 10px;"
-              v-if="form.projectLeader != '' && form.projectLeader != undefined">{{
-      form.projectLeaderName }}</el-tag> -->
-            <el-button type="primary" plain icon="el-icon-plus" @click="choosePeople">选择</el-button>
           </el-form-item>
         </el-col>
         <el-col :span="12" :xs="24">
           <el-form-item label="现场负责人：" prop="siteLeader">
             <el-select v-model="form.siteLeader" filterable clearable style="width:100%">
-              <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+              <el-option v-for="item in peopleForm.allDeptUserList" :key="item.userId" :label="item.nickName"
                 :value="item.userId" v-if="item.nickName != 'admin'">
               </el-option>
             </el-select>
@@ -77,31 +78,8 @@
         </el-col>
       </el-row> -->
     </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>
-          </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>
-          </el-select>
-        </el-form-item>
-        <el-form-item style="text-align: center;">
-          <el-button @click="confirmPeople" type="primary">确定</el-button>
-          <el-button @click="cancelChoosePeople">取消</el-button>
-        </el-form-item>
-      </el-form>
-    </el-dialog>
     <div slot="footer" class="dialog-footer" style="text-align: center;">
-      <!-- <el-button type="warning" @click="save" :disabled="disabled">保 存</el-button> -->
+      <el-button type="warning" @click="save" :disabled="disabled">保 存</el-button>
       <el-button type="primary" @click="confirmPlanForm" :disabled="disabled">提 交</el-button>
     </div>
   </div>
@@ -149,7 +127,8 @@ export default {
         deptId: '',
         deptList: [],
         userId: '',
-        userList: []
+        userList: [],
+        allDeptUserList: []
       },
     }
   },
@@ -204,6 +183,14 @@ export default {
           this.form.deptLeader = this.deptLeaderList;
         })
       }
+      val.forEach(item => {
+        listUser({ pageSize: 999, deptId: item }).then(res => {
+          res.rows.forEach(row => {
+            this.peopleForm.allDeptUserList.push(row)
+          })
+        })
+      })
+      this.handleChangeDept(val[0])
     },
     // 人员选择
     choosePeople() {
@@ -212,6 +199,7 @@ export default {
     // 改变部门选择
     handleChangeDept(deptId) {
       this.peopleForm.userId = '';
+      this.$set(this.peopleForm, 'deptId', deptId)
       listUser({ pageSize: 999999, deptId }).then(res => {
         this.peopleForm.userList = res.rows
       })
@@ -243,7 +231,11 @@ export default {
         if (vaild) {
           this.form.projectId = this.taskForm.formId;
           this.form.undertakingDept = this.form.deptId.join(',');
-          updateProject(this.form)
+          updateProject(this.form).then(res => {
+            this.$message.success('保存成功')
+          })
+        } else {
+          this.$message.error('请完善必填项')
         }
       })
     },
@@ -273,7 +265,7 @@ export default {
                 this.$emit('goBack');
               });
             })
-          }else{
+          } else {
             this.$message.error('请完善必填项')
           }
         })

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-15 13:52:22
+ * @LastEditTime: 2024-07-31 16:56:06
 -->
 <template>
   <div class="app-container">

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

@@ -239,7 +239,6 @@ export default {
         this.formTitle = "自定义表单";
       }else{
         this.formConfOpen = true;
-        console.log(JSON.parse(row.formContent));
         this.formTitle = "流程表单配置详细";
         this.formConf = JSON.parse(row.formContent)
       }

oa-ui/src/views/oa/device/approval.vue

@@ -152,7 +152,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         applier: null,
         useDept: null,
         devices: null,

oa-ui/src/views/oa/device/expense.vue

@@ -190,7 +190,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         deviceId: null,
         userId: null,
         expenseType: null,

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

@@ -170,7 +170,7 @@
           <el-col :span="12">
             <el-form-item label="管理部门" prop="manageDept">
               <el-select v-model="form.manageDept" filterable placeholder="请选择" clearable>
-                <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
+                <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -232,7 +232,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         code: null,
         type: '仪器设备',
         acquisitionTime: null,

oa-ui/src/views/oa/device/scrap.vue

@@ -164,7 +164,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         deviceId: null,
         cost: null,
         scrapDate: null,

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

@@ -116,7 +116,7 @@
           <el-table-column label="专业" align="center" key="major" prop="major" v-if="columns[11].visible" />
           <el-table-column label="学历" align="center" key="degree" prop="degree" :formatter="formatterDegree"
             v-if="columns[12].visible" />
-          <el-table-column label="籍贯" align="center" key="nativePlace" prop="native_place" v-if="columns[13].visible" />
+          <el-table-column label="籍贯" align="center" key="nativePlace" prop="nativePlace" v-if="columns[13].visible" />
           <el-table-column label="政治面貌" align="center" key="politicalAffiliation" :formatter="formatterPoliticalAffiliation" prop="politicalAffiliation"
             v-if="columns[14].visible" />
           <el-table-column label="民族" align="center" key="ethnic" prop="ethnic"  v-if="columns[15].visible" />

oa-ui/src/views/oa/supply/handover.vue

@@ -193,7 +193,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         deviceId: null,
         handoverDeptId: null,
         handoverUserId: null,

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

@@ -158,7 +158,11 @@
           </el-col>
         </el-row>
         <el-form-item label="管理部门" prop="dept.deptName">
-          <el-input v-model="form.deptName" placeholder="请输入管理部门" />
+          <el-select v-model="form.manageDept" filterable placeholder="请选择" clearable>
+            <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+              :value="item.deptId">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-row :gutter="20">
           <el-col :span="24">
@@ -205,7 +209,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         code: null,
         type: '办公设备',
         acquisitionTime: null,