调整仓储库存总账查询条件

src/api/reportManagement/whgenleg.js

@@ -9,6 +9,15 @@ export function listWhgenleg(query) {
   })
 }
 
+// 查询库存总账列表
+export function mapListWhgenleg(query) {
+  return request({
+    url: '/warehouseBusiness/whgenleg/whgenlegList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询库存总账详细
 export function getWhgenleg(fAccyear) {
   return request({

src/views/reportManagement/whgenleg/index.vue

@@ -95,6 +95,23 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="按照箱号">
+        <el-select
+          v-model="queryParams.isCntrno"
+          filterable
+          remote
+          style="width: 200px"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="(dict, index) in isCntrnoOptions"
+            :key="index.id"
+            :label="dict.name"
+            :value="dict.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="入库日期" prop="createTime">
         <el-date-picker
           v-model="queryParams.timeInterval"
@@ -512,7 +529,7 @@
 
 <script>
 import {
-  listWhgenleg,
+  mapListWhgenleg,
   getWhgenleg,
   delWhgenleg,
   addWhgenleg,
@@ -565,6 +582,7 @@ export default {
         pageNum: 1,
         pageSize: 50,
         fOriginalbillno: null,
+        isCntrno: null,
         fPreqty: null,
         fPregrossweight: null,
         fPrenetweight: null,
@@ -595,153 +613,139 @@ export default {
       drag: false,
       setRowList: [],
       getRowList: [],
-      tableDate: [
-          {
+      tableDate: [{
           surface: "0",
           label: "fMblno",
           name: "提单号",
           checked: 0,
           width: 100,
           fixed: "left",
-        },
-        {
+        }, {
           surface: "1",
           label: "fCorpid",
           name: "客户",
           checked: 0,
           width: 100,
           fixed: "left",
-        },
-        {
+        }, {
           surface: "2",
           label: "fOriginalbilldate",
           name: "入库日期",
           checked: 0,
           width: 100,
           fixed: "left",
-        },
-        {
+        }, {
           surface: "3",
           label: "fChargedate",
           name: "仓储费计算日期",
           checked: 0,
           width: 100,
           fixed: "left",
-        },
-        {
+        }, {
           surface: "4",
           label: "fBusinessTypes",
           name: "货物属性",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "5",
           label: "fMarks",
           name: "属性详情",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "6",
           label: "fGoodsids",
           name: "品名",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "8",
           label: "fWarehouseids",
           name: "仓库",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "9",
           label: "fTrademodeid",
           name: "贸易方式",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "10",
           label: "fQtyD",
           name: "入库件数",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "11",
           label: "fGrossweightD",
           name: "入库毛重(kg)",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "12",
           label: "fNetweightD",
           name: "入库净重(kg)",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "13",
           label: "fQtyC",
           name: "出库件数",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "14",
           label: "fGrossweightC",
           name: "出库毛重(kg)",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "15",
           label: "fNetweightC",
           name: "出库净重(kg)",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "16",
           label: "fQtyblc",
           name: "结余件数",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "17",
           label: "fGrossweightblc",
           name: "结余毛重(kg)",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "18",
           label: "fNetweightblc",
           name: "结余净重(kg)",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "19",
           label: "fCntrno",
           name: "箱号",
           checked: 0,
           width: 100,
-        },
-        {
+        }, {
           surface: "20",
           label: "remark",
           name: "备注",
           checked: 0,
           width: 100,
-        },
-      ],
+        },],
       allCheck: false,
+      isCntrnoOptions: [{
+        id: 0,
+        name: '否'
+      }, {
+        id: 1,
+        name: '是'
+      }]
     };
   },
   created() {
@@ -942,7 +946,7 @@ export default {
     /** 查询库存总账列表 */
     getList() {
       this.loading = true;
-      listWhgenleg(this.queryParams).then((response) => {
+      mapListWhgenleg(this.queryParams).then((response) => {
         console.log(response);
         this.whgenlegList = response.rows;
         this.total = response.total;

vue.config.js

@@ -34,11 +34,20 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.137.1:9010`,
+        // 华为10M
+        // target: `http://121.36.212.131:9010/`,
+        // target: `http://121.36.212.131:9020/`,
+        target: `http://121.36.212.131:9030/`,
+        // 华为测试
+        // target: `http://124.70.179.5:9010/`,
+        // target: `http://124.70.179.5:9030`,
+        // target: `http://124.70.179.5:9080/`,
+        // 大木服务器
+        // target: `http://115.29.151.39:9010/`,
+        // target: `http://47.105.221.72:9010/`,
+        // target: `http://localhost:9020/`,
+        // target: `http://csmgn2.natappfree.cc`,
         // target: `http://engineering.echepei.com:9010/`,
-         target: `http://test.tms.tubaosoft.com:9010/`,
-        //  target: `https://test.fms.tubaosoft.com/prod-api/`,
-        //  target: `http://192.168.1.143:9010`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''