代码

src/api/toolsManage/index.js

@@ -159,4 +159,12 @@ export const getToolByProApi = (data = {}) => {
     method: 'GET',
     params: data,
   })
-}
+}
+
+export const getToolByOrderApi = (data = {}) => {
+  return request({
+    url: '/material-mall/toolLedger/getToolByOrder',
+    method: 'GET',
+    params: data,
+  })
+}

src/views/EquipmentServicing/index.vue

@@ -74,7 +74,7 @@
           <el-table-column prop="deviceName" label="装备名称" align="center"/>
           <el-table-column prop="itemTypeModel" label="装备型号" align="center"/>
           <el-table-column prop="deviceCode" label="装备编码" align="center"/>
-          <el-table-column prop="createBy" label="维保人" align="center" width="120"/>
+          <el-table-column prop="qcUser" label="维保人" align="center" width="120"/>
           <el-table-column prop="nextCheckTime" label="下次维保日期" align="center"/>
           <el-table-column prop="phonenumber" label="维保人联系方式" align="center"/>
           <el-table-column prop="updateTime" label="更新时间" align="center"/>

src/views/toolsManage/toolsLedger/index.vue

@@ -214,9 +214,10 @@
 </template>
 
 <script>
-import { getToolLedgerListApi, getToolSelectApi, getToolByTypeIdApi, getToolByProApi } from '@/api/toolsManage'
+import { getToolLedgerListApi, getToolSelectApi, getToolByTypeIdApi, getToolByProApi ,getToolByOrderApi} from '@/api/toolsManage'
 import { getTreeSelectApi } from '@/api/toolsManage/index.js'
 
+
 export default {
   name: 'ToolsLedger',
   data() {
@@ -491,9 +492,12 @@ export default {
         if (this.dialogForm.type == '0' || this.dialogForm.type == '2') {
           params.status = this.dialogForm.type
           res = await getToolByTypeIdApi(params)
-        } else {
-          params.status = this.dialogForm.type == '3' ? '0' : '1'
+        } else if (this.dialogForm.type == '3') {
+          params.status = '0'
           res = await getToolByProApi(params)
+        }else{
+          params.status = '1'
+          res =await getToolByOrderApi(params)
         }
         this.dialogList = res.rows || []
         this.dlgTotal = res.total || 0