Merge branch 'master' of http://oa.sccehui.com:6101/cmc-coding/cmc-oa

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

@@ -96,7 +96,6 @@ public class CmcDeviceApprovalController extends BaseController
         cmcDeviceApproval.setBeginDate(formDataJson.getDate("beginDate"));
         cmcDeviceApproval.setEndDate(formDataJson.getDate("endDate"));
         cmcDeviceApproval.setDays(formDataJson.getLong("days"));
-        cmcDeviceApproval.setState("0");
         if (formDataJson.getJSONArray("devices").size() > 0) {
             String deviceString = formDataJson.getString("devices").substring(1, formDataJson.getString("devices").length() - 1);
             cmcDeviceApproval.setDevices(deviceString);
@@ -104,8 +103,6 @@ public class CmcDeviceApprovalController extends BaseController
             BigDecimal estimateCost = new BigDecimal(0);
             for (String device : devices) {
                 CmcDevice cmcDevice = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(device));
-                cmcDevice.setStatus("0");
-                cmcDeviceService.updateCmcDevice(cmcDevice);
                 if (cmcDevice.getDayCost() != null)
                     estimateCost = estimateCost.add(cmcDevice.getDayCost().multiply(new BigDecimal(cmcDeviceApproval.getDays())));
             }
@@ -140,7 +137,6 @@ public class CmcDeviceApprovalController extends BaseController
             cmcDeviceApproval.setManagerTime(new Date());
         }
         if (formDataJson.getDate("confirmDate") != null) {
-            cmcDeviceApproval.setState("1");
             cmcDeviceApproval.setConfirmDate(formDataJson.getDate("confirmDate"));
         }
         if (formDataJson.getDate("returnDate") != null) {
@@ -156,13 +152,11 @@ public class CmcDeviceApprovalController extends BaseController
         if (formDataJson.getJSONArray("modifyDevices").size() > 0) {
             cmcDeviceApproval.setDispatcher(getLoginUser().getUserId());
             String deviceString = formDataJson.getString("modifyDevices").substring(1, formDataJson.getString("modifyDevices").length() - 1);
-            cmcDeviceApproval.setDevices(deviceString);
+            cmcDeviceApproval.setModifyDevices(deviceString);
             String[] devices = deviceString.split(",");
             BigDecimal estimateCost = new BigDecimal(0);
             for (String device : devices) {
                 CmcDevice cmcDevice = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(device));
-                cmcDevice.setStatus("1");
-                cmcDeviceService.updateCmcDevice(cmcDevice);
                 if (cmcDevice.getDayCost() != null)
                     estimateCost = estimateCost.add(cmcDevice.getDayCost().multiply(new BigDecimal(cmcDeviceApproval.getDays())));
             }

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: wrh
- * @LastEditTime: 2024-05-23 15:53:29
+ * @LastEditTime: 2024-05-23 17:35:16
 -->
 
 <template>
@@ -61,7 +61,7 @@
               <el-form-item label="设备选择：">
                 <el-select style="width: 100%;" v-model="form.devices" filterable multiple placeholder="请选择"
                   clearable :disabled="taskName != '设备申请'">
-                  <el-option v-for="item in deviceList" :key="item.deviceId" 
+                  <el-option v-for="item in deviceList" :key="item.deviceId" :disabled="item.status == null || item.status != 1"
                     :label="item.name +'【' +  (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series  + '】': '')
                      + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place"  :value="item.deviceId">
                   </el-option>
@@ -98,7 +98,7 @@
               <el-form-item label-width="120px" label="拟发放设备：">
                 <el-select style="width: 100%;" v-model="form.modifyDevices" filterable multiple placeholder="请选择"
                   clearable :disabled="taskName != '安排设备'">
-                  <el-option v-for="item in deviceList" :key="item.deviceId" 
+                  <el-option v-for="item in deviceList" :key="item.deviceId" :disabled="item.status == null || item.status != 1"
                     :label="item.name +'【' +  (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series  + '】': '')
                      + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place"  :value="item.deviceId">
                   </el-option>
@@ -146,8 +146,8 @@
               <el-divider></el-divider>
               <el-form-item label="设备状况：" prop="state" label-width="120px">                
                 <el-radio-group v-model="form.state" size="small" :disabled="taskName != '归还确认'">
-                  <el-radio label="2">完好</el-radio>
-                  <el-radio label="3">需维修</el-radio>
+                  <el-radio label="0">完好</el-radio>
+                  <el-radio label="1">需维修</el-radio>
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="备注：" prop="remark" label-width="120px">
@@ -412,7 +412,6 @@ export default {
     // 获取设备列表
     getDeviceList() {
       listDevice({
-        status: "1",
         pageNum: 1,
         pageSize: 99999999,
         type: '仪器设备'
@@ -447,7 +446,7 @@ export default {
     showFormItem(name) {
       let isShow = false;
       if (name == '分管审核')
-        isShow = (this.taskName == '设备申请' || this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排设备' || this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.managerUserId != null);
+        isShow = (this.taskName == '设备申请' || this.taskName == '安排设备' || this.taskName == '分管审核') || ((this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.managerUserId != null);
       else if (name == '分管审核签名')
         isShow = this.taskName == '分管审核' || ((this.taskName == '安排设备' || this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.managerUserId != null);
       return isShow;

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

@@ -208,7 +208,6 @@
             <el-table-column label="设备状况" align="center" prop="state">
               <template slot-scope="scope">
                 <el-tag :type="stateTypeStyle(scope.row.state)">{{ stateTypeText(scope.row.state) }}</el-tag>
-                {{ scope.row.state ? (scope.row.state == '0' ? '完好' : '需维修') : '使用中' }}
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -473,29 +472,17 @@ export default {
     },
     stateTypeText(row) {
       if (row == '0') {
-        return '申领中'
-      }
-      if (row == '1') {
-        return '被领取'
-      }
-      if (row == '2') {
         return '完好'
       }
-      if (row == '3') {
+      if (row == '1') {
         return '需维修'
       }
     },
     stateTypeStyle(row) {
       if (row == '0') {
-        return 'primary'
-      }
-      if (row == '1') {
-        return 'warning'
-      }
-      if (row == '2') {
         return 'success'
       }
-      if (row == '3') {
+      if (row == '1') {
         return 'danger'
       }
     }