From 2b82d31bf1ecd2711a411b76e1c0a21b8acabcd7 Mon Sep 17 00:00:00 2001
From: FrancisHu <2756004617@qq.com>
Date: Wed, 28 Feb 2024 13:31:56 +0800
Subject: [PATCH] =?UTF-8?q?2.28=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/api/stquery/deviceExitQuery.js    |  0
 sgzb-ui/src/api/stquery/deviceFetchQuery.js   |  0
 sgzb-ui/src/api/stquery/deviceFixQuery.js     |  0
 sgzb-ui/src/api/stquery/deviceInStoreQuery.js |  0
 sgzb-ui/src/api/stquery/deviceScrapQuery.js   |  0
 sgzb-ui/src/api/stquery/deviceStatusRecord.js |  6 ++---
 sgzb-ui/src/views/stquery/deviceExitQuery.vue |  0
 .../src/views/stquery/deviceFetchQuery.vue    |  0
 sgzb-ui/src/views/stquery/deviceFixQuery.vue  |  0
 .../src/views/stquery/deviceInStoreQuery.vue  |  0
 .../src/views/stquery/deviceScrapQuery.vue    |  0
 .../src/views/stquery/deviceStatusRecord.vue  | 23 ++++++++++---------
 sgzb-ui/src/views/stquery/projUsingRecord.vue |  4 +++-
 sgzb-ui/vue.config.js                         |  4 ++--
 14 files changed, 20 insertions(+), 17 deletions(-)
 create mode 100644 sgzb-ui/src/api/stquery/deviceExitQuery.js
 create mode 100644 sgzb-ui/src/api/stquery/deviceFetchQuery.js
 create mode 100644 sgzb-ui/src/api/stquery/deviceFixQuery.js
 create mode 100644 sgzb-ui/src/api/stquery/deviceInStoreQuery.js
 create mode 100644 sgzb-ui/src/api/stquery/deviceScrapQuery.js
 create mode 100644 sgzb-ui/src/views/stquery/deviceExitQuery.vue
 create mode 100644 sgzb-ui/src/views/stquery/deviceFetchQuery.vue
 create mode 100644 sgzb-ui/src/views/stquery/deviceFixQuery.vue
 create mode 100644 sgzb-ui/src/views/stquery/deviceInStoreQuery.vue
 create mode 100644 sgzb-ui/src/views/stquery/deviceScrapQuery.vue

diff --git a/sgzb-ui/src/api/stquery/deviceExitQuery.js b/sgzb-ui/src/api/stquery/deviceExitQuery.js
new file mode 100644
index 00000000..e69de29b
diff --git a/sgzb-ui/src/api/stquery/deviceFetchQuery.js b/sgzb-ui/src/api/stquery/deviceFetchQuery.js
new file mode 100644
index 00000000..e69de29b
diff --git a/sgzb-ui/src/api/stquery/deviceFixQuery.js b/sgzb-ui/src/api/stquery/deviceFixQuery.js
new file mode 100644
index 00000000..e69de29b
diff --git a/sgzb-ui/src/api/stquery/deviceInStoreQuery.js b/sgzb-ui/src/api/stquery/deviceInStoreQuery.js
new file mode 100644
index 00000000..e69de29b
diff --git a/sgzb-ui/src/api/stquery/deviceScrapQuery.js b/sgzb-ui/src/api/stquery/deviceScrapQuery.js
new file mode 100644
index 00000000..e69de29b
diff --git a/sgzb-ui/src/api/stquery/deviceStatusRecord.js b/sgzb-ui/src/api/stquery/deviceStatusRecord.js
index 6c8c87af..3ba9ce15 100644
--- a/sgzb-ui/src/api/stquery/deviceStatusRecord.js
+++ b/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
   })
diff --git a/sgzb-ui/src/views/stquery/deviceExitQuery.vue b/sgzb-ui/src/views/stquery/deviceExitQuery.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/sgzb-ui/src/views/stquery/deviceFetchQuery.vue b/sgzb-ui/src/views/stquery/deviceFetchQuery.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/sgzb-ui/src/views/stquery/deviceFixQuery.vue b/sgzb-ui/src/views/stquery/deviceFixQuery.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/sgzb-ui/src/views/stquery/deviceInStoreQuery.vue b/sgzb-ui/src/views/stquery/deviceInStoreQuery.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/sgzb-ui/src/views/stquery/deviceScrapQuery.vue b/sgzb-ui/src/views/stquery/deviceScrapQuery.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
index a903adf2..c848e087 100644
--- a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
+++ b/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;
diff --git a/sgzb-ui/src/views/stquery/projUsingRecord.vue b/sgzb-ui/src/views/stquery/projUsingRecord.vue
index cb50866e..7d1c6008 100644
--- a/sgzb-ui/src/views/stquery/projUsingRecord.vue
+++ b/sgzb-ui/src/views/stquery/projUsingRecord.vue
@@ -247,7 +247,9 @@ export default {
       this.download('material/backRecord/export', {
         ...this.queryParams
       }, `综合查询_退料记录_${new Date().getTime()}.xlsx`)
-    }
+    },
+
+    
 
   }
 };
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index de2c3e95..e8634b5a 100644
--- a/sgzb-ui/vue.config.js
+++ b/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: {