lilei 3 anos atrás
pai
commit
27e261cc86

+ 12 - 0
src/api/dealerProduct.js

@@ -12,6 +12,18 @@ export const dealerProductList = (params) => {
   })
 }
 
+//  散件入库 列表  分页  (自建产品)
+export const bulkProductList = (params) => {
+  const url = `/dealerProduct/queryPageForSparePartsPur/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+
 // 新增/编辑 经销商产品
 export const dealerProductSave = params => {
   return axios({

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

@@ -1224,7 +1224,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'add/:id/:sn',
+                path: 'add/:id/:sn/:supplierSn',
                 name: 'bulkWarehousingOrderAdd',
                 component: () => import(/* webpackChunkName: "bulkManagement" */ '@/views/bulkManagement/bulkWarehousingOrder/edit.vue'),
                 meta: {
@@ -1235,7 +1235,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'edit/:id/:sn',
+                path: 'edit/:id/:sn/:supplierSn',
                 name: 'bulkWarehousingOrderEdit',
                 component: () => import(/* webpackChunkName: "bulkManagement" */ '@/views/bulkManagement/bulkWarehousingOrder/edit.vue'),
                 meta: {

+ 9 - 56
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -48,30 +48,12 @@
                     </a-col>
                     <a-col :md="6" :sm="24">
                       <a-form-item label="产品品牌">
-                        <a-select
-                          placeholder="请选择产品品牌"
-                          id="bulkWarehousingOrderEdit-productBrandSn"
-                          allowClear
-                          v-model="queryParam.productBrandSn"
-                          :showSearch="true"
-                          option-filter-prop="children"
-                          :filter-option="filterOption">
-                          <a-select-option v-for="item in productBrandList" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
-                        </a-select>
+                        <ProductBrand id="bulkWarehousingOrderEdit-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                       </a-form-item>
                     </a-col>
                     <a-col :md="6" :sm="24">
                       <a-form-item label="产品分类">
-                        <a-cascader
-                          @change="changeProductType"
-                          change-on-select
-                          v-model="productType"
-                          expand-trigger="hover"
-                          :options="productTypeList"
-                          :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
-                          id="productInfoList-productType"
-                          placeholder="请选择产品分类"
-                          allowClear />
+                        <ProductType id="productInfoList-productType" @change="changeProductType" v-model="productType"></ProductType>
                       </a-form-item>
                     </a-col>
                     <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
@@ -237,15 +219,15 @@
 import { STable, VSelect } from '@/components'
 import basicInfoModal from './basicInfoModal.vue'
 import { getOperationalPrecision } from '@/libs/tools.js'
-import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
-import { dealerProductTypeList } from '@/api/dealerProductType'
 import { sparePartsPurDetail, sparePartsPurDetailList, sparePartsPurDetailCount, sparePartsPurDetailSave, sparePartsPurDetailDel, sparePartsPurSubmit, sparePartsPurDetailPrint } from '@/api/sparePartsPur'
-import { dealerProductList } from '@/api/dealerProduct'
+import { bulkProductList } from '@/api/dealerProduct'
 import { warehouseCascadeList } from '@/api/warehouse'
+import ProductType from '../../common/productType.js'
+import ProductBrand from '../../common/productBrand.js'
 import Print from '@/views/common/print.vue'
 import { hdPrint } from '@/libs/JGPrint'
 export default {
-  components: { STable, VSelect, basicInfoModal, Print },
+  components: { STable, VSelect, basicInfoModal, Print, ProductType, ProductBrand },
   data () {
     return {
       spinning: false,
@@ -258,8 +240,6 @@ export default {
         productTypeSn2: undefined,
         productTypeSn3: undefined
       },
-      productBrandList: [], //  产品品牌  下拉数据
-      productTypeList: [], //  产品分类  下拉数据
       productType: [],
       warehouseCascadeData: [], //  仓库仓位
       disabled: false, //  查询、重置按钮是否可操作
@@ -280,13 +260,14 @@ export default {
       loadData: parameter => {
         this.disabled = true
         parameter.sortAlias = 'dp'
-        const params = Object.assign(parameter, this.queryParam)
+        const params = Object.assign(parameter, this.queryParam, { supplierSn: this.$route.params.supplierSn })
         params.enabledFlag = 1
-        return dealerProductList(params).then(res => {
+        return bulkProductList(params).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
+            data.list[i].putCost = data.list[i].purchasePrice || ''
             if (this.defaultWarehouseCascade.length > 0) {
               data.list[i].warehouseCascade = this.defaultWarehouseCascade
               data.list[i].warehouseSn = this.defaultWarehouseCascade[0]
@@ -599,37 +580,9 @@ export default {
         }
       })
     },
-    //  产品品牌  列表
-    getProductBrand () {
-      // sysFlag传0,表示只查自建产品
-      dealerProductBrandQuery({}).then(res => {
-        if (res.status == 200) {
-          this.productBrandList = res.data
-        } else {
-          this.productBrandList = []
-        }
-      })
-    },
-    //  产品分类  列表
-    getProductType () {
-      dealerProductTypeList({}).then(res => {
-        if (res.status == 200) {
-          this.productTypeList = res.data
-        } else {
-          this.productTypeList = []
-        }
-      })
-    },
-    filterOption (input, option) {
-      return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      )
-    },
     initPage () {
       this.getWarehouseCascade()
       this.getDetail()
-      this.getProductBrand()
-      this.getProductType()
       this.resetSearchForm()
       this.$refs.chooseTable.refresh(true)
       this.openModal = false

+ 2 - 2
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -221,11 +221,11 @@ export default {
     },
     //  基本信息  保存
     handleOk (row) {
-      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/add/${row.id}/${row.sparePartsPurchaseSn}` })
+      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/add/${row.id}/${row.sparePartsPurchaseSn}/${row.supplierSn}` })
     },
     //  编辑
     handleEdit (row) {
-      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/edit/${row.id}/${row.sparePartsPurchaseSn}` })
+      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/edit/${row.id}/${row.sparePartsPurchaseSn}/${row.supplierSn}` })
     },
     //  详情
     handleDetail (row) {