1.修复设备领用和设备养护相关功能的bug

src/views/inventory/addDeviceCollectOrder.vue

@@ -450,12 +450,16 @@ export default {
         },
         addCode() {
             if (isBlank(this.formData.deptCode)) {
-                this.$message.warning("请先选择养护仓库！");
+                this.$message.warning("请选择领用部门！");
                 return;
             }
 
+            if (isBlank(this.formData.collectUser)) {
+                this.$message.warning("请选择领用人！");
+            }
+
             if (isBlank(this.formData.code)) {
-                this.$message.warning("请扫描或输入UDI码")
+                this.$message.warning("请扫描或输入UDI码");
                 return;
             }
 

src/views/inventory/assetManage.vue

@@ -29,10 +29,16 @@
 
             <el-table v-loading="loading" :data="list" style="width: 100%">
                 <el-table-column label="序号" type="index" fixed></el-table-column>
-                <el-table-column label="养护记录号" prop="orderId" width="180"></el-table-column>
-                <el-table-column label="领用记录号" prop="collOrderId" width="180"></el-table-column>
-                <el-table-column label="养护日期" prop="createTime" width="180"></el-table-column>
-                <el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
+                <el-table-column label="设备名称" prop="productName" width="180"></el-table-column>
+                <el-table-column label="设备编号" prop="code" width="180" show-overflow-tooltip></el-table-column>
+                <el-table-column label="产品DI" prop="nameCode" width="180"></el-table-column>
+                <el-table-column label="生产日期" prop="produceDate" width="180"></el-table-column>
+                <el-table-column label="批次号" prop="batchNo" width="180"></el-table-column>
+                <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
+                <el-table-column label="医疗器械注册/备案人名称" prop="ylqxzcrbarmc" width="180"></el-table-column>
+                <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="180"></el-table-column>
+                <el-table-column label="所属仓库" prop="invWarehouseName" width="180"></el-table-column>
+                <el-table-column label="领用部门" prop="deptName" width="180"></el-table-column>
                 <el-table-column label="操作" width="180" fixed="right">
                     <template slot-scope="scope">
                         <el-button
@@ -152,7 +158,7 @@ export default {
         addMAOrder(row) {
             this.deviceMAOrder = {
                 code: row.code,
-                createUser: this.$store.getters.employName,
+                createUser: this.$store.getters.employeeName,
                 deptName: row.deptName,
                 deptCode: row.deptCode,
                 createTime: new Date().toLocaleString()

src/views/inventory/deviceCollectOrderAudit.vue

@@ -35,7 +35,7 @@
                 </el-row>
             </el-form>
 
-            <el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleChange">
+            <el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleChange" highlight-current-row>
                 <el-table-column label="序号" type="index" fixed></el-table-column>
                 <el-table-column label="设备领用记录号" prop="orderId" width="180"></el-table-column>
                 <el-table-column label="领用部门" prop="deptName" width="180"></el-table-column>
@@ -214,7 +214,6 @@ export default {
                     }
                 })
             }).catch((error) => {
-                this.$message.error(error.message);
             });
         },
         getDepts() {

src/views/inventory/deviceCollectOrderCompleted.vue

@@ -35,7 +35,7 @@
                 </el-row>
             </el-form>
 
-            <el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleChange">
+            <el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleChange" highlight-current-row>
                 <el-table-column label="序号" type="index" fixed></el-table-column>
                 <el-table-column label="设备领用记录号" prop="orderId" width="180"></el-table-column>
                 <el-table-column label="领用部门" prop="deptName" width="180"></el-table-column>
@@ -206,7 +206,7 @@ export default {
             })
         },
         handleChange(row) {
-            this.detailList = {
+            this.detailQuery = {
                 orderIdFk: row.orderId,
                 page: 1,
                 limit: 20

src/views/inventory/deviceCollectOrderNew.vue

@@ -191,7 +191,6 @@ export default {
             });
         },
         closeDialog() {
-            debugger
             this.formVisible = false;
             this.getList();
         },

src/views/inventory/deviceMAOrderDialog.vue

@@ -136,6 +136,10 @@ export default {
     },
     methods: {
         saveOrder() {
+            if (this.detailList[0].maintenanceStatus === 0) {
+                this.$message.error("请完成当前设备养护！");
+                return;
+            }
             this.formData.remark = this.detailList[0].remark;
             this.formData.maintenanceStatus = this.detailList[0].maintenanceStatus;
             this.formData.deviceStatus = this.detailList[0].deviceStatus;