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

src/views/inventory/addDeviceCollectOrder.vue

@@ -161,8 +161,17 @@
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column width="150" label="生产厂家" prop="ylqxzcrbarmc"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="操作" fixed="right" width="150">
+                <el-table-column label="操作" fixed="right" width="200">
                     <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            v-if="scope.row.editSerialNo"
+                            @click.stop="true"
+                            @click.native="copyOrderDetail(scope.row)"
+                        >复制
+                        </el-button
+                        >
                         <el-button
                             type="text"
                             size="small"
@@ -286,7 +295,7 @@
 </template>
 
 <script>
-import { getInvWarehouseList} from "@/api/basic/invSubWarehouse";
+import {getInvWarehouseList} from "@/api/basic/invSubWarehouse";
 import {getSpaceCodeList} from "@/api/inventory/invSpace";
 import {
     addCollectOrder,
@@ -376,12 +385,17 @@ export default {
                 this.spaceList = res.data || [];
             });
         },
-        selectInvProduct() {
+        verifyOrder() {
             if (isBlank(this.formData.deptCode)) {
-                this.$message.error("请选择领用部门！")
+                return "请选择领用部门！";
-                return;
             } else if (isBlank(this.formData.collectUser)) {
-                this.$message.error("请选择领用人！")
+                return "请选择领用人！";
+            }
+        },
+        selectInvProduct() {
+            let message = this.verifyOrder();
+            if (!isBlank(message)) {
+                this.$message.warning(message);
                 return;
             }
 
@@ -414,14 +428,15 @@ export default {
             this.selectInvProductVisible = true;
         },
         saveDeviceCollectOrder() {
-            this.saveOrder();
+            let message = this.verifyOrder();
-            this.closeDialog();
+            if (isBlank(message)) {
+                this.saveOrder();
+                this.closeDialog();
+            } else {
+                this.$message.warning(message);
+            }
         },
         saveOrder(code) {
-            if (isBlank(this.formData.deptCode)) {
-                this.$message.warning("请选择领用部门！");
-                return;
-            }
             if (!isBlank(this.formData.orderId)) {
                 //更新单据
                 updateCollectOrder(this.formData).then((res) => {
@@ -434,6 +449,10 @@ export default {
                         this.formData.id = res.data.id;
                         this.formData.orderId = res.data.orderId;
                         this.formData.createTime = res.data.createTime;
+
+                        if (!isBlank(this.formData.code)) {
+                            this.addScanCode();
+                        }
                     } else {
                         this.$message.error(res.message);
                     }
@@ -449,15 +468,12 @@ export default {
             this.$refs.inputRef.select();
         },
         addCode() {
-            if (isBlank(this.formData.deptCode)) {
+            let message = this.verifyOrder();
-                this.$message.warning("请选择领用部门！");
+            if (!isBlank(message)) {
+                this.$message.warning(message);
                 return;
             }
 
-            if (isBlank(this.formData.collectUser)) {
-                this.$message.warning("请选择领用人！");
-            }
-
             if (isBlank(this.formData.code)) {
                 this.$message.warning("请扫描或输入UDI码");
                 return;
@@ -465,13 +481,15 @@ export default {
 
             if (isBlank(this.formData.orderId)) {
                 this.saveOrder(this.formData.code);
-                return;
+            } else {
+               this.addScanCode();
             }
-
+        },
+        addScanCode() {
             //校验条码是否符合规则
             let checkParams = {
                 code: this.formData.code
-            }
+            };
             checkCode(checkParams).then((res) => {
                 if (res.code === 20000) {
                     this.addDeviceCollectOrderDetail();
@@ -631,6 +649,17 @@ export default {
                 this.userList = res.data.list || [];
             });
         },
+        copyOrderDetail(row) {
+            let params = {
+                orderIdFk: row.orderIdFk,
+                code: row.originCode
+            }
+            addCollectOrderDetail(params).then((res) => {
+                this.getList();
+            }).catch((error) => {
+                this.$message.error(error.message);
+            });
+        },
     },
     created() {
         this.getDepts();

src/views/inventory/assetManage.vue

@@ -102,7 +102,8 @@ export default {
                 code: null,
                 deptName: null,
                 createUser: null,
-                createTime: null
+                createTime: null,
+                collOrderId: null
             }
         };
     },
@@ -161,7 +162,8 @@ export default {
                 createUser: this.$store.getters.employeeName,
                 deptName: row.deptName,
                 deptCode: row.deptCode,
-                createTime: new Date().toLocaleString()
+                createTime: new Date().toLocaleString(),
+                collOrderId: row.orderIdFk
             }
             this.formVisible = true;
         },

src/views/inventory/deviceMAOrderDialog.vue

@@ -129,7 +129,8 @@ export default {
                 deptCode: null,
                 remark: null,
                 maintenanceStatus: null,
-                deviceStatus: null
+                deviceStatus: null,
+                collOrderId: null
             },
             detailList: []
         }
@@ -166,7 +167,8 @@ export default {
             createUser: this.deviceMAOrder.createUser,
             deptName: this.deviceMAOrder.deptName,
             createTime: this.deviceMAOrder.createTime,
-            deptCode: this.deviceMAOrder.deptCode
+            deptCode: this.deviceMAOrder.deptCode,
+            collOrderId: this.deviceMAOrder.collOrderId
         };
         this.getMAOrderDetailList(this.deviceMAOrder.code);
     },