lilei 2 سال پیش
والد
کامیت
c66973e920

+ 25 - 38
src/config/router.config.js

@@ -2288,6 +2288,31 @@ export const asyncRouterMap = [
                 }
               }
             ]
+          },
+          {
+            path: '/productRebateReport/index',
+            redirect: '/productRebateReport/index/list',
+            name: 'productRebateReportList',
+            component: BlankLayout,
+            meta: {
+              title: '产品返利明细表',
+              icon: 'profile',
+              permission: 'M_productRebateReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'productRebateReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/productRebateReport/index.vue'),
+                meta: {
+                  title: '产品返利明细表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_productRebateReportList'
+                }
+              }
+            ]
           }
           // {
           //   path: '/reportData/allCountryCostReport',
@@ -2316,44 +2341,6 @@ export const asyncRouterMap = [
           // }
         ]
       },
-      // 产品返利明细表
-      {
-        path: '/productRebateReport',
-        redirect: '/productRebateReport/index',
-        component: PageView,
-        meta: {
-          title: '产品返利表',
-          icon: 'profile',
-          permission: 'M_productRebateReport'
-        },
-        children: [
-          {
-            path: '/productRebateReport/index',
-            redirect: '/productRebateReport/index/list',
-            name: 'productRebateReportList',
-            component: BlankLayout,
-            meta: {
-              title: '产品返利明细表',
-              icon: 'profile',
-              permission: 'M_productRebateReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'productRebateReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/productRebateReport/index.vue'),
-                meta: {
-                  title: '产品返利明细表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_productRebateReportList'
-                }
-              }
-            ]
-          }
-        ]
-      },
       // 数据导出
       {
         path: '/dataExport',

+ 14 - 6
src/views/reportData/allocationDetails/list.vue

@@ -62,6 +62,11 @@
                   <ProductType id="allocationDetailsList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="出库仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.billWarehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户名称">
                   <a-input id="allocationDetailsList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入客户名称"/>
@@ -149,12 +154,13 @@ import ProductBrand from '@/views/common/productBrand.js'
 import ProductType from '@/views/common/productType.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { userQueryList } from '@/api/power-user'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import AllocateType from '@/views/common/allocateType.js'
 import { allocateReportDetailList, allocateReportDetailCount, allocateReportDetailExport } from '@/api/allocateReport'
 export default {
   name: 'AllocationDetailsList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, Area, ProductBrand, reportModal, AllocateType, ProductType },
+  components: { STable, VSelect, rangeDate, subarea, Area, ProductBrand, reportModal, AllocateType, ProductType, chooseWarehouse },
   data () {
     return {
       spinning: false,
@@ -188,7 +194,8 @@ export default {
           subareaSn: undefined,
           subareaAreaSn: undefined
         },
-        dealerProvinceSn: undefined
+        dealerProvinceSn: undefined,
+        billWarehouseSn: undefined
       },
       productType: [],
       labelCol: { span: 8 },
@@ -243,7 +250,7 @@ export default {
   computed: {
     columns () {
       const _this = this
-      const arr = [
+      let arr = [
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨单号', dataIndex: 'allocateNo', width: 160, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
@@ -274,9 +281,9 @@ export default {
          arr.push({ title: '毛利', dataIndex: 'grossProfit', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         }
       }
-      arr.concat([
-        { title: '仓库', dataIndex: 'warehouseName', width: 90, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
-        { title: '仓位', dataIndex: 'warehouseLocationName', width: 90, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
+      arr = arr.concat([
+        { title: '仓库', dataIndex: 'warehouseName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作员', dataIndex: 'creatorName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '费用类型', dataIndex: 'costTypeName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨类型(一级)', dataIndex: 'allocateSortName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
@@ -362,6 +369,7 @@ export default {
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerProvinceSn = undefined
+      this.queryParam.billWarehouseSn = undefined
       this.productType = []
       this.allocateTypeVal = []
       if(this.advanced){

+ 19 - 10
src/views/reportData/salesDetails/list.vue

@@ -17,22 +17,22 @@
                 <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="销售单号">
                 <a-input id="salesDetailsList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="salesDetailsList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
+            <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品名称">
                   <a-input id="salesDetailsList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
                 </a-form-model-item>
               </a-col>
+            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户名称">
                   <a-input id="salesDetailsList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入客户名称"/>
@@ -64,6 +64,11 @@
                   <ProductType id="salesDetailsList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="出库仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.billWarehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="salesDetailsList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
@@ -141,12 +146,13 @@ import reportModal from '@/views/common/reportModal.vue'
 import AreaList from '@/views/common/areaList.js'
 import ProductBrand from '@/views/common/productBrand.js'
 import ProductType from '@/views/common/productType.js'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportSalesBillDetailList, reportSalesBillDetailCount, reportSalesBillDetailExport } from '@/api/reportData'
 export default {
   name: 'SalesDetailsList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, custList, subarea, ProductBrand, ProductType, reportModal, AreaList },
+  components: { STable, VSelect, rangeDate, custList, subarea, ProductBrand, ProductType, reportModal, AreaList, chooseWarehouse },
   data () {
     return {
       spinning: false,
@@ -176,7 +182,8 @@ export default {
         },
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
-        dealerCountySn: undefined
+        dealerCountySn: undefined,
+        billWarehouseSn: undefined
       },
       productType: [],
       rules: {
@@ -211,9 +218,10 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '区域', dataIndex: 'subareaArea.subareaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '区域', dataIndex: 'subareaArea.subareaName', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'salesBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '出库仓库', dataIndex: 'warehouseName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '省份', dataIndex: 'dealerProvinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'dealerName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -237,7 +245,7 @@ export default {
         // { title: '折扣金额', dataIndex: 'discountAmount', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
       ]
       if (this.$hasPermissions('M_salesDetailsList_costPrice')) { //  成本价权限
-        arr.splice(15, 0, { title: '成本价', dataIndex: 'totalRealCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(16, 0, { title: '成本价', dataIndex: 'totalRealCost', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('M_salesDetailsList_salesPrice')) { //  售价权限
         arr.push({ title: '实售价', dataIndex: 'totalRealSaleAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
@@ -252,7 +260,7 @@ export default {
         arr.push({ title: '折后单价', dataIndex: 'discountedPrice', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '折扣金额', dataIndex: 'discountAmount', width: 70, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      arr.push({ title: '操作员', dataIndex: 'operatorName', width: 150, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
+      arr.push({ title: '操作员', dataIndex: 'operatorName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
       return arr
     }
   },
@@ -323,6 +331,7 @@ export default {
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
+      this.queryParam.billWarehouseSn = undefined
       if(this.advanced){
         this.$refs.subarea.clearData()
         this.$refs.areaList.clearData()

+ 10 - 1
src/views/reportData/salesReturnDetailReport/list.vue

@@ -64,6 +64,11 @@
                   <ProductType id="salesReturnDetailList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="出库仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.billWarehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="salesReturnDetailList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
@@ -142,6 +147,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import AreaList from '@/views/common/areaList.js'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import ProductBrand from '@/views/common/productBrand.js'
 import ProductType from '@/views/common/productType.js'
 import { hdExportExcel } from '@/libs/exportExcel'
@@ -149,7 +155,7 @@ import { reportSalesReturnDetailList, reportSalesReturnDetailCount, reportSalesR
 export default {
   name: 'SalesReturnDetailReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, ProductBrand, ProductType, reportModal, AreaList },
+  components: { STable, VSelect, rangeDate, subarea, ProductBrand, ProductType, reportModal, AreaList, chooseWarehouse },
   data () {
     return {
       spinning: false,
@@ -173,6 +179,7 @@ export default {
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
+        billWarehouseSn: undefined,
         subareaArea:{
           subareaSn: undefined,
           subareaAreaSn: undefined
@@ -218,6 +225,7 @@ export default {
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货单号', dataIndex: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '出库仓库', dataIndex: 'warehouseName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '省份', dataIndex: 'dealerProvinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -366,6 +374,7 @@ export default {
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
+      this.queryParam.billWarehouseSn = undefined
       this.productType = []
       if (this.advanced) {
         this.$refs.subarea.clearData()

+ 2 - 2
src/views/reportData/salesReturnsReport/list.vue

@@ -176,7 +176,7 @@ export default {
   computed: {
     columns () {
       const _this = this
-      const arr = [
+      let arr = [
         { title: '退货单号', dataIndex: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货完成日期', dataIndex: 'salesReturnDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'dealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -209,7 +209,7 @@ export default {
         arr.push({ title: '直接差价', dataIndex: 'totalDirectRebate', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '间接差价', dataIndex: 'totalIndirectRebate', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      arr.concat([
+      arr = arr.concat([
         { title: '坏件数量', dataIndex: 'totalBadQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作员', dataIndex: 'operatorName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ])

+ 12 - 3
src/views/reportData/urchaseDetailReturn/detailList.vue

@@ -58,6 +58,11 @@
                   <v-select code="BRAND_TYPE" id="urchaseDetailReturn-productBrandTypeSn" v-model="queryParam.product.brandType" allowClear placeholder="请选择品牌分类"></v-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="出库仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.billWarehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
                     <AreaList id="salesSlipReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
@@ -133,12 +138,13 @@ import supplier from '@/views/common/supplier.js'
 import reportModal from '@/views/common/reportModal.vue'
 import AreaList from '@/views/common/areaList.js'
 import ProductBrand from '@/views/common/productBrand.js'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { sparePartsReturnDetailReportList, sparePartsReturnDetailReportStat, sparePartsReturnReportExportDetail } from '@/api/reportData'
 export default {
   name: 'UrchaseDetailReturnList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, supplier, ProductBrand, reportModal, AreaList },
+  components: { STable, VSelect, rangeDate, supplier, ProductBrand, reportModal, AreaList, chooseWarehouse },
   data () {
     return {
       spinning: false,
@@ -154,6 +160,7 @@ export default {
         endDate: getDate.getCurrMonthDays().endtime,
         sparePartsReturnNo: '', // 采购退货单号
         returnReason: '',
+        billWarehouseSn: undefined,
         product: {
           name: '',
           code: '',
@@ -198,6 +205,7 @@ export default {
       const _this = this
       const arr = [
         { title: '采购退货单号', dataIndex: 'sparePartsReturnNo', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '出库仓库', dataIndex: 'warehouseName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '省份', dataIndex: 'supplier.provinceName', width: 80, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '供应商名称', dataIndex: 'supplier.supplierName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '退货原因', dataIndex: 'returnReasonDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
@@ -219,8 +227,8 @@ export default {
       ]
 
       if (_this.$hasPermissions('M_urchaseDetailReturnList_costPrice')) {
-        arr.splice(15, 0, { title: '入库单价', dataIndex: 'cost', width: 60, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
-        arr.splice(19, 0, { title: '退货金额', dataIndex: 'totalCost', width: 60, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
+        arr.splice(16, 0, { title: '入库单价', dataIndex: 'cost', width: 60, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
+        arr.splice(20, 0, { title: '退货金额', dataIndex: 'totalCost', width: 60, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
       }
       return arr
     }
@@ -284,6 +292,7 @@ export default {
       this.queryParam.supplier.provinceSn = undefined
       this.queryParam.supplier.citySn = undefined
       this.queryParam.supplier.districtSn = undefined
+      this.queryParam.billWarehouseSn = undefined
       this.totalData = null
       if(this.advanced){
         this.$refs.areaList.clearData()

+ 20 - 9
src/views/reportData/warehousingOrder/list.vue

@@ -50,6 +50,11 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="入库仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button
@@ -90,6 +95,8 @@
         bordered>
         <template slot="footer">
           <a-row :gutter="15">
+            <a-col :md="2" :sm="24">
+            </a-col>
             <a-col :md="4" :sm="24">
               总数量:{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}
             </a-col>
@@ -111,11 +118,12 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 import reportModal from '@/views/common/reportModal.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { reportStockPutList, reportStockPutCount, reportStockPutExport } from '@/api/reportData'
 export default {
   name: 'WarehousingOrderList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, reportModal },
+  components: { STable, VSelect, rangeDate, reportModal, chooseWarehouse },
   data () {
     return {
       spinning: false,
@@ -129,7 +137,8 @@ export default {
         stockPutNo: '',
         supplierName: '',
         putBizType: undefined,
-        sparePartsType: undefined
+        sparePartsType: undefined,
+        warehouseSn: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择完成日期', trigger: 'change' }]
@@ -164,16 +173,17 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '入库单号', dataIndex: 'stockPutNo', width: '21%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '入库开单日期', dataIndex: 'createDate', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单位名称', dataIndex: 'supplierName', width: '22%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '入库数量', dataIndex: 'productTotalQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库单号', dataIndex: 'stockPutNo', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库仓库', dataIndex: 'warehouseName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '入库开单日期', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位名称', dataIndex: 'supplierName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '入库数量', dataIndex: 'productTotalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '入库金额', dataIndex: 'productTotalCost', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库类型', dataIndex: 'putBizTypeDictValue', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '散件入库子类型', dataIndex: 'sparePartsTypeDictValue', width: '11%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '入库类型', dataIndex: 'putBizTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '散件入库子类型', dataIndex: 'sparePartsTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('M_warehousingOrderList_costPrice')) { //  成本价权限
-        arr.splice(4, 0, { title: '入库金额', dataIndex: 'productTotalCost', width: '11%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(5, 0, { title: '入库金额', dataIndex: 'productTotalCost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }
@@ -224,6 +234,7 @@ export default {
       this.queryParam.supplierName = ''
       this.queryParam.putBizType = undefined
       this.queryParam.sparePartsType = undefined
+      this.queryParam.warehouseSn = undefined
       this.totalData = null
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()

+ 27 - 18
src/views/reportData/warehousingOrderDetail/list.vue

@@ -17,12 +17,12 @@
                 <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="入库单号">
                 <a-input id="warehousingOrderDetailList-stockPutNo" v-model.trim="queryParam.stockPutNo" allowClear placeholder="请输入入库单号"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="入库类型">
                 <v-select
                   v-model="queryParam.putBizType"
@@ -33,8 +33,7 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="7" :sm="24">
+            <a-col :md="6" :sm="24">
                 <a-form-model-item label="散件入库子类型">
                   <v-select
                     v-model="queryParam.sparePartsType"
@@ -45,12 +44,18 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="5" :sm="24">
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="入库仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.billWarehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
                 <a-form-model-item label="单位名称">
                   <a-input id="warehousingOrderDetailList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入单位名称"/>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="5" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品名称">
                   <a-input id="warehousingOrderDetailList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
                 </a-form-model-item>
@@ -121,11 +126,12 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 import reportModal from '@/views/common/reportModal.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { reportStockPutDetailList, reportStockPutDetailCount, reportStockPutDetailExport } from '@/api/reportData'
 export default {
   name: 'WarehousingOrderDetailList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, reportModal },
+  components: { STable, VSelect, rangeDate, reportModal, chooseWarehouse },
   data () {
     return {
       spinning: false,
@@ -140,7 +146,8 @@ export default {
         putBizType: undefined,
         supplierName: '',
         productName: '',
-        productCode: ''
+        productCode: '',
+        billWarehouseSn: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择完成日期', trigger: 'change' }]
@@ -175,22 +182,23 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '入库单号', dataIndex: 'stockPutNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '入库开单日期', dataIndex: 'openBillTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单位名称', dataIndex: 'supplierName', width: '11%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品名称', dataIndex: 'productName', width: '11%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'productCode', width: '9%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '入库单号', dataIndex: 'stockPutNo', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '入库开单日期', dataIndex: 'openBillTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位名称', dataIndex: 'supplierName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'productName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'productCode', width: '8%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库数量', dataIndex: 'putQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '进价', dataIndex: 'putCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '入库金额', dataIndex: 'putAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库类型', dataIndex: 'putBizTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '散件入库子类型', dataIndex: 'sparePartsTypeDictValue', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '完成日期', dataIndex: 'auditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '入库类型', dataIndex: 'putBizTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '散件入库子类型', dataIndex: 'sparePartsTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '完成日期', dataIndex: 'auditTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('M_warehousingOrderDetailList_costPrice')) { //  成本价权限
-        arr.splice(7, 0, { title: '进价', dataIndex: 'putCost', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(8, 0, { title: '入库金额', dataIndex: 'putAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8, 0, { title: '进价', dataIndex: 'putCost', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(9, 0, { title: '入库金额', dataIndex: 'putAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }
@@ -242,6 +250,7 @@ export default {
       this.queryParam.supplierName = ''
       this.queryParam.productName = ''
       this.queryParam.productCode = ''
+      this.queryParam.billWarehouseSn = undefined
       this.totalData = null
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()

+ 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.111/ocs-admin',
+        target: 'http://192.168.2.117/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
         // target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,