diff --git a/src/api/stquery/stquery.js b/src/api/stquery/stquery.js
new file mode 100644
index 00000000..a8355970
--- /dev/null
+++ b/src/api/stquery/stquery.js
@@ -0,0 +1,74 @@
+import request from '@/utils/request'
+
+// 查询工程机具使用列表
+export function getProjUsingRecordListApi(query) {
+ return request({
+ url: '/material/complex_query/getProjUsingRecordList',
+ method: 'get',
+ params: query
+ })
+}
+// 查询工程机具使用列表-无分页
+export function getProjUsingRecordListNoPage(query) {
+ return request({
+ url: '/material/complex_query/getProjUsingRecordListNoPage',
+ method: 'get',
+ params: query
+ })
+}
+
+
+// 设备使用追溯查询列表
+export function getMachineHistoryRecordListApi(query) {
+ return request({
+ url: '/material/complex_query/getMachineHistoryRecordList',
+ method: 'get',
+ params: query
+ })
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss
index 34484d47..72f4cb99 100644
--- a/src/assets/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
$base-sub-menu-hover:#001528;
*/
-$base-sidebar-width: 200px;
+$base-sidebar-width: 240px;
// the :export directive is the magic sauce for webpack
// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
diff --git a/src/main.js b/src/main.js
index f51dce1b..a35b7e28 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,7 +18,7 @@ import './assets/icons' // icon
import './permission' // permission control
import { getDicts } from '@/api/system/dict/data'
import { getConfigKey } from '@/api/system/config'
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from '@/utils/bonus'
+import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree,indexContinuation } from '@/utils/bonus'
// 分页组件
import Pagination from '@/components/Pagination'
// 自定义表格工具组件
@@ -50,6 +50,7 @@ Vue.prototype.selectDictLabels = selectDictLabels
Vue.prototype.download = download
Vue.prototype.downloadJson = downloadJson
Vue.prototype.handleTree = handleTree
+Vue.prototype.indexContinuation = indexContinuation
Vue.prototype.globalUrl = global_
// 全局组件挂载
Vue.component('DictTag', DictTag)
diff --git a/src/utils/bonus.js b/src/utils/bonus.js
index 36e2b1a0..309cff4f 100644
--- a/src/utils/bonus.js
+++ b/src/utils/bonus.js
@@ -232,3 +232,8 @@ export function tansParams(params) {
export function blobValidate(data) {
return data.type !== 'application/json'
}
+
+// 处理表格索引延续问题
+export function indexContinuation(num, size) {
+ return (num - 1) * size + 1
+}
diff --git a/src/views/material/stquery/deviceInBound.vue b/src/views/material/stquery/deviceInBound.vue
new file mode 100644
index 00000000..247319c6
--- /dev/null
+++ b/src/views/material/stquery/deviceInBound.vue
@@ -0,0 +1,216 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+ 导出
+
+
+
+
+
+
+ {{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+ 导出
+
+
+
+
+
+
+ {{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+ 导出
+
+
+
+
+
+
+
+
+ 合计：
+ {{ (queryParams.pageNum - 1) * 10 + scope.$index }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.storeNum }}
+
+
+
+
+
+
+ {{ scope.row.useNum }}
+
+
+
+ {{ scope.row.useNum }}
+
+
+
+
+
+
+ {{ scope.row.repairNum }}
+
+
+
+ {{ scope.row.repairNum }}
+
+
+
+
+
+
+ {{ scope.row.inputNum }}
+
+
+
+ {{ scope.row.inputNum }}
+
+
+
+
+
+
+
+ {{ scope.row.repairInputNum }}
+
+
+
+ {{ scope.row.repairInputNum }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+ 导出
+
+
+
+
+
+
+ {{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+ 导出
+
+
+
+
+
+
+
+ 合计：
+ {{ (queryParams.pageNum - 1) * 10 + scope.$index }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+