浏览代码

添加bug

Qukatie 1 年之前
父节点
当前提交
653a3d31b0

+ 7 - 0
src/api/tirePartsMall/basicData/listingManagement/index.js

@@ -97,3 +97,10 @@ export function deptList() {
     method: 'get',
   })
 }
+export const storageDesc = (params) => {
+  return request({
+    url: '/api/blade-sales-part/storageDesc/listAll',
+    method: 'get',
+    params: params
+  })
+}

+ 25 - 8
src/views/tirePartsMall/financialManagement/purchaseDetail/index.vue

@@ -22,8 +22,14 @@
             </template>
             <template slot="brandNameSearch">
                 <search-query :datalist="brandData" :selectValue="query.brandName" :clearable="true" :buttonIf="false"
-                    :forParameter="{ key: 'id', label: 'cname', value: 'cname' }" placeholder="请选择品牌" @corpFocus="listAllfun"
-                    @corpChange="corpChange($event, 'brandName')">
+                    :forParameter="{ key: 'id', label: 'cname', value: 'cname' }" placeholder="请选择品牌"
+                    @corpFocus="listAllfun" @corpChange="corpChange($event, 'brandName')">
+                </search-query>
+            </template>
+            <template slot="storageIdSearch">
+                <search-query :datalist="storageData" :selectValue="query.storageId" :clearable="true" :buttonIf="false"
+                    :forParameter="{ key: 'id', label: 'cname', value: 'id' }" placeholder="请选择品牌"
+                    @corpFocus="storageIdfun" @corpChange="corpChange($event, 'storageId')">
                 </search-query>
             </template>
             <!--<template slot="goodsNameSearch">-->
@@ -42,8 +48,8 @@
             <!--</template>-->
             <template slot="salerNameSearch">
                 <search-query :datalist="salerData" :selectValue="query.salerName" :clearable="true" :buttonIf="false"
-                    :forParameter="{ key: 'id', label: 'name', value: 'name' }" placeholder="请选择业务员" @corpFocus="YWYgetListfun"
-                    @corpChange="corpChange($event, 'salerName')">
+                    :forParameter="{ key: 'id', label: 'name', value: 'name' }" placeholder="请选择业务员"
+                    @corpFocus="YWYgetListfun" @corpChange="corpChange($event, 'salerName')">
                 </search-query>
             </template>
             <template slot="actualPaymentStatusSearch">
@@ -55,7 +61,8 @@
             </template>
             <template slot="bsTypeSearch">
                 <search-query :datalist="bsTypeData" :selectValue="query.bsType" :clearable="true" :buttonIf="false"
-                    :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }" placeholder="请选择单据状态"  @corpChange="corpChange($event, 'bsType')">
+                    :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }" placeholder="请选择单据状态"
+                    @corpChange="corpChange($event, 'bsType')">
                 </search-query>
             </template>
             <template slot="isContainSearch">
@@ -78,7 +85,7 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import { getWorkDicts } from "@/api/system/dictbiz";
 import { getToken } from "@/util/auth";
 import { getSalesman } from "@/api/landTransportation";
-import { listAll } from "@/api/tirePartsMall/basicData/listingManagement";
+import { listAll,storageDesc } from "@/api/tirePartsMall/basicData/listingManagement";
 
 export default {
     components: { SearchQuery },
@@ -87,6 +94,7 @@ export default {
             key: 0,
             data: [],
             total: [],
+            storageData:[],
             query: {
                 businesDateStart: defaultDate3()[0],
                 businesDateEnd: defaultDate3()[1],
@@ -155,8 +163,11 @@ export default {
                 // }, 
                 {
                     label: '仓库',
-                    prop: 'storageName',
+                    prop: "storageName",
+                    searchProp: "storageId",
+                    search: true,
                     overHidden: true,
+                    searchOrder: 9
                 }, {
                     label: '业务编号',
                     prop: 'ordNo',
@@ -275,7 +286,7 @@ export default {
                     hide: true,
                     search: true,
                     searchslot: true,
-                    searchOrder: 9
+                    searchOrder: 10
                 }]
             },
             bsTypeData: [],
@@ -375,6 +386,12 @@ export default {
                 this.brandData = res.data.data
             })
         },
+        //获取仓库
+        storageIdfun(){
+            storageDesc().then(res=>{
+                this.storageData= res.data.data
+            })
+        },
         // 获取客户数据
         KHgetListfun(cname) {
             KHgetList({ current: 1, size: 20, corpType: 'KH', cname: cname ? cname : null }).then(res => {

+ 18 - 3
src/views/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -26,6 +26,12 @@
                     @corpChange="corpChange($event, 'brandName')">
                 </search-query>
             </template>
+            <template slot="storageIdSearch">
+                <search-query :datalist="storageData" :selectValue="query.storageId" :clearable="true" :buttonIf="false"
+                    :forParameter="{ key: 'id', label: 'cname', value: 'id' }" placeholder="请选择品牌"
+                    @corpFocus="storageIdfun" @corpChange="corpChange($event, 'storageId')">
+                </search-query>
+            </template>
             <!--<template slot="goodsNameSearch">-->
             <!--    <search-query :datalist="goodsData"-->
             <!--                  :selectValue="query.goodsName"-->
@@ -79,7 +85,7 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import { getWorkDicts } from "@/api/system/dictbiz";
 import { getToken } from "@/util/auth";
 import { getSalesman } from "@/api/landTransportation";
-import { listAll } from "@/api/tirePartsMall/basicData/listingManagement";
+import { listAll ,storageDesc} from "@/api/tirePartsMall/basicData/listingManagement";
 
 export default {
     components: { SearchQuery },
@@ -88,6 +94,7 @@ export default {
             key: 0,
             data: [],
             total: [],
+            storageData:[],
             query: {
                 businesDateStart: defaultDate3()[0],
                 businesDateEnd: defaultDate3()[1],
@@ -112,7 +119,7 @@ export default {
                 // searchIndex: 2,
                 // highlightCurrentRow: true,
                 border: true,
-                searchMenuSpan: 6,
+                searchMenuSpan: 24,
                 addBtn: false,
                 showSummary: true,
                 summaryText: "合计",
@@ -155,7 +162,10 @@ export default {
                 }, {
                     label: '仓库',
                     prop: 'storageName',
+                    searchProp: "storageId",
+                    search: true,
                     overHidden: true,
+                    searchOrder: 9
                 }, {
                     label: '业务编号',
                     prop: 'ordNo',
@@ -272,7 +282,7 @@ export default {
                     hide: true,
                     search: true,
                     searchslot: true,
-                    searchOrder: 9
+                    searchOrder: 10
                 }]
             },
             bsTypeData: [],
@@ -364,6 +374,11 @@ export default {
                 this.brandData = res.data.data
             })
         },
+        storageIdfun(){
+            storageDesc().then(res=>{
+                this.storageData= res.data.data
+            })
+        },
         // 获取客户数据
         KHgetListfun(cname) {
             KHgetList({ current: 1, size: 20, corpType: 'KH', cname: cname ? cname : null }).then(res => {