zpy 8.15

ruoyi-ui/src/api/smartSchool/schoolProperty/collectionLedger.js

+import request from "@/utils/request";
+//查看设备领用列表
+export function getReceive(query) {
+  return request({
+    url: "/receive/list",
+    method: "get",
+    params: query,
+  });
+}
+//查看设备领用详细信息
+export function queryReceive(id) {
+  return request({
+    url: "/receive/" + id,
+    method: "get",
+  });
+}
+//新增设备领用
+export function addReceive(data) {
+  return request({
+    url: "/receive/add",
+    method: "post",
+    data,
+  });
+}
+//修改设备领用
+export function editReceive(data) {
+  return request({
+    url: "/receive/edit",
+    method: "put",
+    data: data,
+  });
+}
+//删除设备领用
+export function deleteReceive(id) {
+  return request({
+    url: "/receive/delete/" + id,
+    method: "post",
+  });
+}
+

ruoyi-ui/src/api/smartSchool/schoolProperty/outboundLedger.js

+import request from "@/utils/request";
+//查看设备出库列表
+export function getoutStock(query) {
+  return request({
+    url: "/outStock/list",
+    method: "get",
+    params: query,
+  });
+}
+//查看设备出库详细信息
+export function queryoutStock(id) {
+  return request({
+    url: "/outStock/" + id,
+    method: "get",
+  });
+}

ruoyi-ui/src/api/smartSchool/schoolProperty/warehousingLedger.js

+import request from "@/utils/request";
+//查看设备入库列表
+export function getinStock(query) {
+  return request({
+    url: "/inStock/list",
+    method: "get",
+    params: query,
+  });
+}
+//查看设备出库详细信息
+export function queryinStock(id) {
+  return request({
+    url: "/inStock/" + id,
+    method: "get",
+  });
+}

ruoyi-ui/src/views/smartSchool/schoolProperty/repairApplicant/index.vue

@@ -13,7 +13,7 @@
                         :value="item.value"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="维修状态" prop="disposeState">
+            <el-form-item label="处理状态" prop="disposeState">
                 <el-select v-model="queryParams.disposeState" placeholder="维修状态" clearable>
                     <el-option v-for="(item, index) in dict.type.repair_state" :key="index" :label="item.label"
                         :value="item.value"></el-option>
@@ -26,8 +26,7 @@
         </el-form>
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                    v-hasPermi="['system:application:add']">新增
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增
                 </el-button>
             </el-col>
         </el-row>
@@ -76,13 +75,11 @@
         </el-table>
         <!-- 新增/修改/查看对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body @close="cancel">
-            <el-form ref="postForm" :model="postForm" :rules="rules" label-width="110px" :disabled="!isEditable"
-                :readonly="!isEditable">
+            <el-form ref="postForm" :model="postForm" :rules="rules" label-width="110px">
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="自编码" prop="encode">
-                            <el-input v-model.lazy="postForm.encode" placeholder="自编码" @change="getRencode"
-                                :readonly="!isEditable"></el-input>
+                            <el-input v-model.lazy="postForm.encode" placeholder="自编码" @change="getRencode"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -97,6 +94,7 @@
                             <el-input v-model="postForm.equipmentName" placeholder="设备名称"></el-input>
                         </el-form-item>
                     </el-col>
+
                     <el-col :span="12">
                         <el-form-item label="问题" prop="problem">
                             <el-input v-model="postForm.problem" placeholder="问题"></el-input>
@@ -122,7 +120,8 @@
                     <el-col :span="12">
                         <el-form-item label="投产日期:" prop="dateOfProduction">
                             <el-date-picker v-model="postForm.dateOfProduction" type="date" placeholder="选择日期"
-                                style="width: 100%;" value-format="yyyy-MM-dd" clearable></el-date-picker>
+                                style="width: 100%;" value-format="yyyy-MM-dd" clearable
+                                :readonly="isReadOnly"></el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -139,8 +138,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="修理状态" prop="disposeState">
-                            <el-select v-model="postForm.disposeState" placeholder="维修状态" clearable style="width: 100%;">
+                        <el-form-item label="处理状态" prop="disposeState">
+                            <el-select v-model="postForm.disposeState" placeholder="处理状态" clearable style="width: 100%;">
                                 <el-option v-for="(item, index) in dict.type.repair_state" :key="index" :label="item.label"
                                     :value="item.value"></el-option>
                             </el-select>
@@ -199,6 +198,7 @@ export default {
     dicts: ['dispose_state', 'repair_state'],
     data() {
         return {
+            isReadOnly: false,
             sbflOptions: [],
             repairStatusOptions: {
             },
@@ -382,7 +382,6 @@ export default {
         handleUpdate(row) {
             const id = row.id || this.ids;
             this.title = "修改申请";
-
             queryRepair(id).then(response => {
                 this.postForm = response.data;
                 this.open = true;
@@ -408,12 +407,15 @@ export default {
             this.$refs["postForm"].validate(valid => {
                 if (valid) {
                     this.$modal.loading('正在上传数据，请稍等...');
-                    if (this.postForm.disposeState === 1 || this.postForm.disposeState === 0) {
-                        this.postForm.repairState = 1;
+                    if (this.postForm.disposeState === "1" || this.postForm.disposeState === "0") {
+                        this.postForm.repairState = "1";
+                    } else if (this.postForm.disposeState === null) {
+                        this.postForm.repairState = "0";
                     } else {
-                        this.postForm.repairState = 0;
+                        this.postForm.repairState = "0"; // 当 disposeState 不满足上述条件时，默认设置为 0
                     }
 
+
                     if (this.postForm.id != null) {
                         editRepair(this.postForm).then(response => {
                             console.log('this.postForm',);
@@ -426,11 +428,15 @@ export default {
                         });
 
                     } else {
-                        if (this.postForm.disposeState === 1 || this.postForm.disposeState === 0) {
-                            this.postForm.repairState = 1;
+                        if (this.postForm.disposeState === "1" || this.postForm.disposeState === "0") {
+                            this.postForm.repairState = "1";
+                        } else if (this.postForm.disposeState === null) {
+                            this.postForm.repairState = "0";
                         } else {
-                            this.postForm.repairState = 0;
+                            this.postForm.repairState = "0"; // 当 disposeState 不满足上述条件时，默认设置为 0
                         }
+
+
                         addRepair(this.postForm).then(response => {
                             console.log(this.postForm);
                             this.$modal.closeLoading();