lilei hace 2 años
padre
commit
30ae8f722a

+ 1 - 1
src/config/router.config.js

@@ -1152,7 +1152,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'warehouseDetail/:sn',
+                path: 'warehouseDetail/:sn/:warehouseSn',
                 name: 'inventoryQueryWarehouseDetail',
                 component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryQuery/warehouseDetail.vue'),
                 meta: {

+ 1 - 1
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -249,7 +249,7 @@ export default {
     },
     //  出入库明细
     goWarehouseDetail (row) {
-      this.$router.push({ path: `/inventoryManagement/inventoryQuery/warehouseDetail/${row.productSn}` })
+      this.$router.push({ path: `/inventoryManagement/inventoryQuery/warehouseDetail/${row.productSn}/${row.warehouseSn}` })
     },
     // 导出Excel
     handleExcelOk (exportType) {

+ 1 - 21
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -34,13 +34,6 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="仓库">
-                  <a-select id="inventoryQueryWarehouseDetail-warehouseSn" allowClear placeholder="请选择仓库" v-model="queryParam.warehouseSn" >
-                    <a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="单据审核时间">
                   <rangeDate ref="rangeDate" @change="dateChange" />
@@ -139,7 +132,6 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { stockFlowCount, stockFlowList, stockFlowExport } from '@/api/stock'
-import { warehouseAllList } from '@/api/warehouse'
 export default {
   name: 'InventoryQueryWarehouseDetail',
   mixins: [commonMixin],
@@ -165,7 +157,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        const params = Object.assign(parameter, this.queryParam, { productSn: this.$route.params.sn })
+        const params = Object.assign(parameter, this.queryParam, { productSn: this.$route.params.sn, warehouseSn: this.$route.params.warehouseSn })
         return stockFlowList(params).then(res => {
           let data
           if (res.status == 200) {
@@ -187,7 +179,6 @@ export default {
         })
       },
       exportLoading: false,
-      warehouseList: [], //  仓库  下拉数据
       productTotal: null //  合计
     }
   },
@@ -268,22 +259,11 @@ export default {
     handleBack () {
       this.$router.push({ path: '/inventoryManagement/inventoryQuery/list', query: { closeLastOldTab: true } })
     },
-    // 仓库下拉数据
-    getWarehouseList (type) {
-      warehouseAllList({}).then(res => {
-        if (res.status == 200) {
-          this.warehouseList = res.data
-        } else {
-          this.warehouseList = []
-        }
-      })
-    },
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
-      this.getWarehouseList()
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight

+ 1 - 1
vue.config.js

@@ -107,7 +107,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.117/ocs-admin',
+        target: 'http://192.168.2.113:8660/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
         // target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,