修改资产管理页面 及修复bug

src/api/inventory/deviceReceiveOrder.js

@@ -88,4 +88,12 @@ export function deleteDeviceReceiveOrderDetail(data) {
     });
 }
 
+export function selectByorderIdFk(params) {
+  return axios({
+    url: "/device/receive/order/detail/selectByorderIdFk",
+    method: "get",
+    params: params
+  });
+}
+
 

src/views/inventory/AssetManage.vue

@@ -19,33 +19,14 @@
       </el-form>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
+                @current-change="handleSelectionChange"
                 border>
-        <el-table-column label="序号" type="index"></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="productionDate" width="180"></el-table-column>
-        <el-table-column label="失效日期" prop="expireDate" 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="fromDeptName" ></el-table-column>
         <el-table-column label="领用仓库" prop="fromInvName" ></el-table-column>
         <el-table-column label="领用货位" prop="fromInvSpaceName" ></el-table-column>
         <el-table-column label="领用日期" prop="createTime" ></el-table-column>
         <el-table-column label="领用人" prop="createUserName"></el-table-column>
-        <el-table-column label="操作" >
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="addMAOrder(scope.row)"
-            >养护
-            </el-button
-            >
-          </template>
-        </el-table-column>
+
       </el-table>
       <pagination
         v-show="total>0"
@@ -56,6 +37,47 @@
       ></pagination>
     </el-card>
 
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据业务详情-->
+      <el-tab-pane>
+        <span slot="label">设备详情</span>
+        <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
+                  :row-style="rowStyle"
+                  row-key="id"
+        >
+          <el-table-column label="序号" type="index"></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="productionDate" width="180"></el-table-column>
+          <el-table-column label="失效日期" prop="expireDate" 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="操作" >
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                @click.native.stop="addMAOrder(scope.row)"
+              >养护
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+    <pagination
+      v-show="bizTotal>0"
+      :total="bizTotal"
+      :page.sync="filterQuery.page"
+      :limit.sync="filterQuery.limit"
+      @pagination="getBizDetailList"
+    />
+
     <el-dialog
       title="新增设备养护记录"
       :visible.sync="formVisible"
@@ -77,7 +99,7 @@
 <script>
 import {getDeviceReceiveOrderList} from "@/api/inventory/deviceReceiveOrder";
 import deviceMAOrderModify from "@/views/inventory/DeviceMAOrderModify.vue";
-
+import {selectByorderIdFk} from "@/api/inventory/deviceReceiveOrder";
 export default {
   name: "AssetManage",
   data() {
@@ -87,10 +109,14 @@ export default {
         nameCode: null,
         status: 2,
         page: 1,
-        limit: 20
+        limit: 20,
+        orderIdFk:""
       },
+      bizDetailLoading: false,
+      bizDetailList:[],
       list: [],
       total: 0,
+      bizTotal:0,
       loading: false,
       idQuery: null,
       formVisible: false,
@@ -121,6 +147,29 @@ export default {
       this.filterQuery.page = 1;
       this.getList();
     },
+    handleSelectionChange(val){
+      this.filterQuery.orderIdFk= val.orderId;
+      this.filterQuery.status=null;
+      this.getBizDetailList();
+    },
+    getBizDetailList(){
+      this.bizDetailLoading = true;
+      selectByorderIdFk(this.filterQuery).then((res) => {
+        this.bizDetailLoading = false;
+        if (res.code === 20000) {
+          this.bizDetailList = res.data.list || [];
+          this.bizTotal = res.data.total;
+        } else {
+          this.$message.error(res.message);
+          this.bizDetailList = [];
+        }
+      }).catch((error) =>{
+        this.bizDetailLoading = false;
+        this.$message.error(error.message);
+        this.bizDetailList = [];
+        this.bizTotal = 0;
+      })
+    },
     getList() {
       this.loading = true;
       getDeviceReceiveOrderList(this.filterQuery).then((res) => {

src/views/inventory/DeviceMAOrderModify.vue

@@ -118,7 +118,11 @@ export default {
     closeDialog: {
       type: Function,
       required: true
-    }
+    },
+    deviceMAOrder: {
+      type: Object,
+      required: true
+    },
   },
   name: "DeviceMAOrderModify",
   data() {
@@ -177,6 +181,7 @@ export default {
     };
   },
   created() {
+    this.deviceMAOrder
     this.formData = {
       code: this.deviceMAOrder.code,
       createUser: this.$store.getters.adminId,