2.28新增查询

sgzb-ui/src/api/stquery/deviceStatusRecord.js

@@ -1,10 +1,10 @@
 import request from '@/utils/request'
 
 //综合查询
-// 查询领料记录列表
-export function backRecord(query) {
+// 查询 机具仓储状态
+export function statusList(query){
   return request({
-    url: '/material/backRecord/getBackRecordList',
+    url: '/material/storageStatus/getStorageStatusList',
     method: 'get',
     params: query
   })

sgzb-ui/src/views/stquery/deviceStatusRecord.vue

@@ -101,15 +101,15 @@
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
       <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
-      <el-table-column label="单位" align="center" prop="code" :show-overflow-tooltip="true" />
-      <el-table-column label="在库数量" align="center" prop="maCode" :show-overflow-tooltip="true" />
-      <el-table-column label="在用数量" align="center" prop="backNum" :show-overflow-tooltip="true" />
-      <el-table-column label="在修数量" align="center" prop="backPerson" :show-overflow-tooltip="true" />
-      <el-table-column label="修试后待入库" align="center" prop="createTime" :show-overflow-tooltip="true" />
-      <el-table-column label="新购待入库" align="center" prop="unitName" :show-overflow-tooltip="true" />
-      <el-table-column label="总保有量" align="center" prop="proName" :show-overflow-tooltip="true" />
-      <el-table-column label="总保有量资产（万元）" align="center" prop="proName" :show-overflow-tooltip="true" />
-      <el-table-column label="是否计数" align="center" prop="proName" :show-overflow-tooltip="true" />
+      <el-table-column label="单位" align="center" prop="unit" :show-overflow-tooltip="true" />
+      <el-table-column label="在库数量" align="center" prop="num" :show-overflow-tooltip="true" />
+      <el-table-column label="在用数量" align="center" prop="usNum" :show-overflow-tooltip="true" />
+      <el-table-column label="在修数量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
+      <el-table-column label="修试后待入库" align="center" prop="repairInputNum" :show-overflow-tooltip="true" />
+      <el-table-column label="新购待入库" align="center" prop="inputNum" :show-overflow-tooltip="true" />
+      <el-table-column label="总保有量" align="center" prop="allNum" :show-overflow-tooltip="true" />
+      <!-- <el-table-column label="总保有量资产（万元）" align="center" prop="proName" :show-overflow-tooltip="true" /> -->
+      <el-table-column label="是否计数" align="center" prop="manageType" :show-overflow-tooltip="true" />
     </el-table>
 
     <pagination
@@ -127,7 +127,7 @@
 </template>
 
 <script>
-import { backRecord,exportList,getUnitData,getProData } from "@/api/stquery/deviceStatusRecord";
+import { statusList,exportList,getUnitData,getProData } from "@/api/stquery/deviceStatusRecord";
 
 export default {
   name: "backRecord",
@@ -191,7 +191,8 @@ export default {
         pageNum: this.queryParams.pageNum
       }
 
-      const res = await backRecord(params)
+      const res = await statusList(params)
+      console.log('机具状态', res)
       this.loading = false;
       this.leaseAuditList = res.data.rows;
       this.total = res.data.total;

sgzb-ui/src/views/stquery/projUsingRecord.vue

@@ -247,7 +247,9 @@ export default {
       this.download('material/backRecord/export', {
         ...this.queryParams
       }, `综合查询_退料记录_${new Date().getTime()}.xlsx`)
-    }
+    },
+
+    
 
   }
 };

sgzb-ui/vue.config.js

@@ -41,8 +41,8 @@ module.exports = {
         // target: `http://1.12.248.179:23028`,//线上环境-南网
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `http://10.40.92.14:8080`,//超
-        target: `http://10.40.92.12:8080`,//韩
-        // target: `http://10.40.92.222:8080`,//川
+        // target: `http://10.40.92.12:8080`,//韩
+        target: `http://10.40.92.206:8080`,//川
 
         changeOrigin: true,
         pathRewrite: {