问题修改

.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"}'
 
 
 

src/views/inventorys/outbounds.vue

@@ -13,7 +13,7 @@
               <span class="selector-item__label">资产名称：</span>
               <Input v-model="select.keyword" style="width: 120px;margin-right: 10px;" placeholder="资产名称搜索" />
             </div>
-            <!-- <DatePicker @on-change="changeDate" type="daterange" split-panels placeholder="请选择日期" style="width: 200px"></DatePicker> -->
+            <DatePicker @on-change="changeDate" type="daterange" split-panels placeholder="请选择日期" style="width: 200px"></DatePicker>
             <Button type="primary" style="margin-left: 10px;" @click="getindex">查询</Button>
             <Button type="primary" style="margin-left: 10px;"
               @click="exportExcel(new Date().getTime().toString())">导出</Button>
@@ -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",

src/views/inventorys/stocks.vue

@@ -13,7 +13,7 @@
               <span class="selector-item__label">资产名称：</span>
               <Input v-model="select.keyword" style="width: 120px;margin-right: 10px;" placeholder="资产名称搜索" />
             </div>
-            <!-- <DatePicker @on-change="changeDate" type="daterange" split-panels placeholder="请选择日期" style="width: 200px"></DatePicker> -->
+            <DatePicker @on-change="changeDate" type="daterange" split-panels placeholder="请选择日期" style="width: 200px"></DatePicker>
             <Button type="primary" style="margin-left: 10px;" @click="getindex">查询</Button>
             <Button type="primary" style="margin-left: 10px;"
               @click="exportExcel(new Date().getTime().toString())">导出</Button>
@@ -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",

src/views/storages/floodmaterialfile.vue

@@ -30,7 +30,19 @@
     </div>
 
     <xy-table :list="list" :total="total" v-loading="loading" @pageSizeChange="e => select.pageSize = e"
-      @pageIndexChange="pageChange" :table-item="table">
+      @pageIndexChange="pageChange" :table-item="table">
+      <template v-slot:suozaiquyu>
+        <el-table-column align="center" label="所在区域" width="120" header-align="center">
+          <template slot-scope="scope">
+            <div v-if="scope.row.quyu_detail">
+              {{scope.row.quyu_detail.value?scope.row.quyu_detail.value:''}}
+            </div>
+            <div v-else></div>
+
+          </template>
+        </el-table-column>
+
+      </template>
       <template v-slot:btns>
         <el-table-column fixed="right" label="操作" width="180" header-align="center">
           <template slot-scope="scope">