移交记录加上办公设备、维修加上了办公设备

oa-ui/src/views/flowable/form/budget/components/chooseDevice.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
- * @Date: 2024-03-27 11:10:26
+ * @Date: 2024-06-21 18:51:51
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-29 11:19:05
+ * @LastEditTime: 2024-07-30 15:37:00
 -->
 <template>
   <div>
@@ -60,9 +60,7 @@
       <el-tag v-if="multiple" v-for="item in chooseList" style="margin: 5px;" :key="item.deviceIdId">
         {{ item.name + '-' + item.series + '-' + item.brand }}
       </el-tag>
-      <el-tag v-if="!multiple" style="margin: 5px;">{{ chooseList.name + '-' + chooseList.series + '-' +
-      chooseList.brand
-        }}</el-tag>
+      <el-tag v-if="!multiple" style="margin: 5px;">{{ formatChooseList() }}</el-tag>
       <div style="text-align: center;margin-top: 20px;">
         <el-button type="primary" @click="confirmChoose">确认选择</el-button>
         <el-button @click="clearChoose">清空选择</el-button>
@@ -192,6 +190,13 @@ export default {
       if (row == '4') {
         return 'info'
       }
+    },
+    formatChooseList() {
+      if (this.chooseList.name) {
+        return this.chooseList.name + '-' + this.chooseList.series + '-' + this.chooseList.brand
+      }else{
+        return null
+      }
     }
   }
 }

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

@@ -138,8 +138,8 @@
               <span class="el-icon-download">下载文件</span>
             </el-link>
           </div>
-          <FileUpload :limit="1" :filePathName="expenseName" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
-            @input="getExpensePath"></FileUpload>
+          <FileUpload :limit="1" :filePathName="expenseName"
+            :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getExpensePath"></FileUpload>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -149,7 +149,7 @@
     </el-dialog>
 
     <el-dialog title="选择设备" :visible.sync="openDevice" width="70%" append-to-body>
-      <choose-device @chooseList="confirmDevice"></choose-device>
+      <device-list @chooseList="confirmDevice" :multiple="false"></device-list>
     </el-dialog>
   </div>
 </template>
@@ -158,11 +158,13 @@
 import { listDeviceExpense, getDeviceExpense, delDeviceExpense, addDeviceExpense, updateDeviceExpense } from "@/api/oa/device/deviceExpense";
 import { listDevice } from "@/api/oa/device/device"
 import ChooseDevice from '../../flowable/form/budget/components/chooseDevice.vue';
+import DeviceList from '../supply/deviceList.vue';
 
 export default {
   name: "DeviceExpense",
   components: {
-    ChooseDevice
+    ChooseDevice,
+    DeviceList
   },
   data() {
     return {
@@ -204,7 +206,7 @@ export default {
       deviceList: [],
       alldeviceList: [],
       openDevice: false,
-      expenseName:''
+      expenseName: ''
     };
   },
   created() {
@@ -364,11 +366,7 @@ export default {
       }
     },
     confirmDevice(val) {
-      if (val && val.length > 1) {
-        return this.$message.error('请选择一个设备')
-      }
-
-      this.form.deviceId = val[0].deviceId
+      this.form.deviceId = val.deviceId
       this.openDevice = false;
     },
     //费用附件路径

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

@@ -153,7 +153,7 @@
       </div>
     </el-dialog>
     <el-dialog title="选择设备" :visible.sync="openDevice" width="70%" append-to-body>
-      <choose-device @chooseList="confirmDevice"></choose-device>
+      <device-list @chooseList="confirmDevice" :multiple="false"></device-list>
     </el-dialog>
   </div>
 </template>
@@ -162,11 +162,13 @@
 import { listDeviceHandover, getDeviceHandover, delDeviceHandover, addDeviceHandover, updateDeviceHandover } from "@/api/oa/device/deviceHandover";
 import { listDevice } from "@/api/oa/device/device"
 import ChooseDevice from '../../flowable/form/budget/components/chooseDevice.vue';
+import DeviceList from './deviceList.vue';
 
 export default {
   name: "DeviceHandover",
   components: {
-    ChooseDevice
+    ChooseDevice,
+    DeviceList
   },
   data() {
     return {
@@ -333,11 +335,7 @@ export default {
       }, `deviceHandover_${new Date().getTime()}.xlsx`)
     },
     confirmDevice(val) {
-      if (val && val.length > 1) {
-        return this.$message.error('请选择一个设备')
-      }
-
-      this.form.deviceId = val[0].deviceId
+      this.form.deviceId = val.deviceId
       this.openDevice = false;
     },
   }