diff --git a/.env.development b/.env.development index 91f061a..605bb4a 100644 --- a/.env.development +++ b/.env.development @@ -2,15 +2,15 @@ ENV='development' # base api -VUE_APP_BASE_API = http://192.168.60.99:9004/ -VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file -VUE_APP_OA_URL = http://192.168.60.18:2021 -VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}' +#VUE_APP_BASE_API = http://192.168.60.99:9004/ +#VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file +#VUE_APP_OA_URL = http://192.168.60.18:2021 +#VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}' -#VUE_APP_BASE_API = http://192.168.60.99:8004/ -#VUE_APP_UPLOAD_API = http://192.168.60.99:8004/api/admin/upload-file -#VUE_APP_OA_URL= http://suzhouhedaooa.langye.net -#VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}' +VUE_APP_BASE_API = http://192.168.60.99:8004/ +VUE_APP_UPLOAD_API = http://192.168.60.99:8004/api/admin/upload-file +VUE_APP_OA_URL= http://suzhouhedaooa.langye.net +VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}' diff --git a/src/views/inventorys/outbounds.vue b/src/views/inventorys/outbounds.vue index dad1528..82f6158 100644 --- a/src/views/inventorys/outbounds.vue +++ b/src/views/inventorys/outbounds.vue @@ -13,7 +13,7 @@ 资产名称: - + 查询 导出 @@ -218,6 +218,7 @@ page_size: 99999, page: 1, table_name: this.customForm.tableName, + range:this.dateRanges, // is_export:this.select.is_export, filter: [{ "key": "wuzibianma", @@ -271,7 +272,8 @@ const res = await index({ page_size: this.select.pageSize, page: this.select.pageIndex, - table_name: this.customForm.tableName, + table_name: this.customForm.tableName, + range:this.dateRanges, // is_export:this.select.is_export, filter: [{ "key": "wuzibianma", diff --git a/src/views/inventorys/stocks.vue b/src/views/inventorys/stocks.vue index 5c0d3f3..b8d7d29 100644 --- a/src/views/inventorys/stocks.vue +++ b/src/views/inventorys/stocks.vue @@ -13,7 +13,7 @@ 资产名称: - + 查询 导出 @@ -261,6 +261,7 @@ page_size: 99999, page: 1, table_name: this.customForm.tableName, + range:this.dateRanges, filter: [{ "key": "wuzibianma", "op": "like", @@ -319,7 +320,8 @@ const res = await index({ page_size: this.select.pageSize, page: this.select.pageIndex, - table_name: this.customForm.tableName, + table_name: this.customForm.tableName, + range:this.dateRanges, filter: [{ "key": "wuzibianma", "op": "like", diff --git a/src/views/storages/floodmaterialfile.vue b/src/views/storages/floodmaterialfile.vue index d8f44fd..fa09185 100644 --- a/src/views/storages/floodmaterialfile.vue +++ b/src/views/storages/floodmaterialfile.vue @@ -30,7 +30,19 @@ select.pageSize = e" - @pageIndexChange="pageChange" :table-item="table"> + @pageIndexChange="pageChange" :table-item="table"> + + + + + {{scope.row.quyu_detail.value?scope.row.quyu_detail.value:''}} + + + + + + +