提交库存帐

src/api/purchasingManagement/inventoryAccount.js

@@ -6,6 +6,13 @@ export const getList = (params) => {
         params: params
     })
 }
+export const generalLedgerListByGoods = (params) => {
+    return request({
+        url: '/api/trade-purchase/woodHarvestingCloud/generalLedgerListByGoods',
+        method: 'get',
+        params: params
+    })
+}
 export function remove(data) {
     return request({
         url: '/api/trade-purchase/woodHarvestingCloud/removeById',

src/views/InventoryManagement/inventoryAccount/index.vue

@@ -16,10 +16,10 @@
         @refresh-change="refreshChange"
     >
       <template slot="itemId" slot-scope="{row,index}">
-        {{row.goodsName}}
+        {{ row.goodsName }}
       </template>
       <template slot="warehouseId" slot-scope="{row,index}">
-        {{row.warehouse}}
+        {{ row.warehouse }}
       </template>
       <template slot="corpNameSearch">
         <crop-select v-model="search.corpId" corpType="GYS" :refresh="false"></crop-select>
@@ -31,30 +31,48 @@
         <el-button type="warning"
                    icon="el-icon-plus"
                    size="small"
-                   @click="outExport()">导出</el-button>
+                   @click="outExport()">导出
+        </el-button>
+      </template>
+      <template slot="header">
+        <el-table
+            :data="commodityData"
+            border
+            size="small"
+            @header-click="cellClick"
+            style="width: 100%">
+          <el-table-column
+              v-for="(item,index) in commodityLabel"
+              :key="index"
+              :prop="item.prop"
+              width="200"
+              show-overflow-tooltip
+              :label="item.label">
+          </el-table-column>
+        </el-table>
       </template>
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
-import {getList} from "@/api/purchasingManagement/inventoryAccount";
+import {generalLedgerListByGoods, getList} from "@/api/purchasingManagement/inventoryAccount";
 import {getToken} from "@/util/auth";
 
 export default {
   data() {
     return {
-      key:0,
+      key: 0,
       search: {},
       data: [],
-      query:{},
+      query: {},
       page: {
         pageSize: 10,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 50, 100, 200, 300]
       },
-      option:{},
+      option: {},
       optionList: {
         align: 'center',
         stripe: true,
@@ -64,8 +82,25 @@ export default {
         searchSpan: 8,
         searchIcon: true,
         searchIndex: 2,
-        highlightCurrentRow: true,
+        // highlightCurrentRow: true,
         addBtn: false,
+
+        showSummary: true,
+        summaryText: "合计",
+        sumColumnList: [
+          {
+            name: 'sliceNumber',
+            type: 'sum',
+            decimals: 2
+          },{
+            name: 'balanceNumber',
+            type: 'sum',
+            decimals: 2
+          },{
+            name: 'balanceMoney',
+            type: 'sum',
+            decimals: 2
+          }],
         column: [{
           label: '品名',
           // searchProp: 'goodsName',
@@ -79,23 +114,23 @@ export default {
           type: "select",
           overHidden: true,
           index: 1,
-          search:true
+          search: true
         }, {
           label: '长',
           prop: 'length',
           index: 2,
-          search:true
-        },{
+          search: true
+        }, {
           label: '厚',
           prop: 'thickness',
           index: 5,
-          search:true
+          search: true
         }, {
           label: '捆包号',
           prop: 'billNo',
           index: 6,
           width: 100,
-          search:true
+          search: true
         }, {
           label: '可用片数',
           prop: 'sliceNumber',
@@ -128,7 +163,7 @@ export default {
           "width": 120,
           "searchSpan": 8,
           "overHidden": true,
-          search:true
+          search: true
         }, {
           label: '库位',
           prop: 'storageName',
@@ -137,42 +172,57 @@ export default {
           label: '品牌',
           prop: 'itemType',
           index: 13,
-          search:true
+          search: true
         }, {
           label: '等级',
           prop: 'grade',
           index: 14,
-          search:true
+          search: true
         }, {
           label: '产地',
           prop: 'itemProp',
           index: 15,
-          search:true
+          search: true
         }, {
           label: '供应商',
           prop: 'corpName',
           index: 16,
-          search:true
+          width: 100,
+          overHidden: true,
+          search: true
         }, {
           label: '车船号',
           prop: 'vehicleShipNumber',
           index: 17,
-          search:true
+          search: true
         }, {
           label: '货权人',
           prop: 'purchaser',
           index: 18,
-          search:true
+          width: 140,
+          overHidden: true,
+          search: true
         }, {
           label: '提单号',
           prop: 'morderNo',
           index: 19,
-          search:true
+          search: true
         }]
-      }
+      },
+      commodityLabel: [],
+      commodityData: []
     }
   },
   async created() {
+    generalLedgerListByGoods().then(res => {
+      for (let item in res.data.data) {
+        this.commodityLabel.push({label: res.data.data[item].cname, prop: item, id: res.data.data[item].id})
+        this.commodityData[0] = {
+          ...this.commodityData[0],
+          [item]: res.data.data[item].sliceNumber + '片,' + res.data.data[item].balanceNumber + '平方'
+        }
+      }
+    })
     this.option = await this.getColumnData(this.getColumnName(200), this.optionList);
     this.key++
     let i = 0;
@@ -185,14 +235,22 @@ export default {
       this.option.searchMenuPosition = "right";
     }
   },
-  methods:{
-    onLoad(page, params = {}){
+  methods: {
+    cellClick(row, column, cell, event) {
+      for (let item of this.commodityLabel) {
+        if (row.label == item.label) {
+          this.search.itemId = item.id
+          this.onLoad(this.page, this.search)
+        }
+      }
+    },
+    onLoad(page, params = {}) {
       let queryParams = {
         size: page.pageSize,
         current: page.currentPage,
         ...Object.assign(params, this.query)
       }
-      getList(queryParams).then(res=>{
+      getList(queryParams).then(res => {
         this.data = res.data.data.records
         this.page.total = res.data.data.total
         this.option.height = window.innerHeight - 230;
@@ -218,9 +276,9 @@ export default {
     // 获得高度
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 184
+        this.option.height = this.option.height - 55
       } else {
-        this.option.height = this.option.height + 184
+        this.option.height = this.option.height + 55
       }
       this.$refs.crud.getTableHeight()
     },
@@ -261,7 +319,7 @@ export default {
         const routeData = this.$router.resolve({
           path: '/api/trade-purchase/woodHarvestingCloud/generalLedgerExport',      //跳转目标窗口的地址
           query: {
-            'Blade-Auth':getToken(),
+            'Blade-Auth': getToken(),
             ...queryParams    //括号内是要传递给新窗口的参数
           }
         })

src/views/landTransportation/motorcadeDriver/index.vue

@@ -475,7 +475,7 @@ export default {
             showColumn: false,
             filterable: true,
             type: 'select',
-            cascader: ['plateNo','driverId'],
+            cascader: ['plateNo'],
             overHidden: true,
             prop: 'fleetId',
             dicUrl: "/api/blade-client/corpsdesc/fleetList",
@@ -512,11 +512,12 @@ export default {
             index: 9,
             prop: 'driverId',
             type: "select",
-            dicUrl: `/api/blade-client/land-driver/driver-list?plateNo={{key}}&fleetId=${ `{{fleetId}}` ? `{{fleetId}}` : '' }`,
+            // dicUrl: `/api/blade-client/land-driver/driver-list?plateNo={{key}}&fleetId=${ `{{fleetId}}` ? `{{fleetId}}` : '' }`,
+            dicUrl: '/api/blade-client/land-driver/driver-list?plateNo={{key}}',
             props: {
               label: "name",
               value: "id",
-              res: "res.data"
+              // res: "res.data"
             }
           }, {
             label: '电话',