chenrui 4 лет назад
Родитель
Сommit
7da610a194

+ 7 - 0
src/api/supplier.js

@@ -80,3 +80,10 @@ export const addProduct = (params) => {
     method: 'post'
   })
 }
+// 查询供应商产品sn集合
+export const supplierProductSnList = (params) => {
+  return axios({
+    url: `/supplierProduct/queryProductSnList/${params.sn}`,
+    method: 'get'
+  })
+}

+ 59 - 27
src/views/common/chooseProductsModal.vue

@@ -68,7 +68,15 @@
           ref="table"
           size="small"
           :rowKey="(record) => record.productSn"
-          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onChange, onSelect: onSelectChange, onSelectAll: onSelectAllChange }"
+          :row-selection="{
+            selectedRowKeys: selectedRowKeys,
+            onChange: onChange,
+            onSelect: onSelectChange,
+            onSelectAll: onSelectAllChange,
+            getCheckboxProps:record =>({props: {
+              disabled: (this.type == 'supplier') && (this.selectedRowKeys.indexOf(record.productSn) > -1)
+            }})
+          }"
           :data-source="loadData"
           :columns="columns"
           :pagination="paginationProps"
@@ -102,7 +110,7 @@ import { STable } from '@/components'
 import { productBrandQuery } from '@/api/productBrand'
 import { productTypeQuery } from '@/api/productType'
 import { dealerScopeValidProduct } from '@/api/dealerScope'
-import { productPricedList } from '@/api/product'
+import { productPricedList, productList } from '@/api/product'
 export default {
   name: 'ChooseProductsModal',
   components: { STable },
@@ -117,7 +125,7 @@ export default {
         return []
       }
     },
-    type: { //  类型,经销权设置dealership
+    type: { //  类型,经销权设置dealership,  供应商添加产品supplier
       type: String,
       default: ''
     },
@@ -235,11 +243,22 @@ export default {
     },
     // 保存
     handleSave () {
+      const _this = this
       if (this.selectedRowKeys.length < 1) {
         this.$message.warning('请在列表勾选后再进行操作!')
         return
       }
-      this.$emit('ok', this.selectedRows)
+      if (this.type == 'supplier') { //  供应商增加产品
+        const arr = []
+        this.selectedRowKeys.map(item => {
+          if (_this.chooseData.indexOf(item) == -1) {
+            arr.push(item)
+          }
+        })
+        this.$emit('ok', arr)
+      } else {
+        this.$emit('ok', this.selectedRows)
+      }
       this.isShow = false
     },
     onChange (selectedRowKeys, selectedRows) {
@@ -247,29 +266,33 @@ export default {
     },
     onSelectChange (record, selected, selectedRows, nativeEvent) {
       const _this = this
-      if (selected) { //  选择
-        this.selectedRows.push(record)
-      } else { //  取消
-        this.selectedRows.map((item, index) => {
-          if (item.productSn == record.productSn) {
-            _this.selectedRows.splice(index, 1)
-          }
-        })
+      if (this.type != 'supplier') { //  供应商增加产品
+        if (selected) { //  选择
+          this.selectedRows.push(record)
+        } else { //  取消
+          this.selectedRows.map((item, index) => {
+            if (item.productSn == record.productSn) {
+              _this.selectedRows.splice(index, 1)
+            }
+          })
+        }
       }
     },
     // 本页全选/取消全选
     onSelectAllChange (selected, selectedRows, changeRows) {
       const _this = this
-      if (selected) { //  选择
-        this.selectedRows = [...this.selectedRows, ...changeRows]
-      } else { //  取消
-        this.selectedRows.map((item, index) => {
-          this.selectedRows.map((subItem, ind) => {
-            if (item.productSn == subItem.productSn) {
-              _this.selectedRows.splice(index, 1)
-            }
+      if (this.type != 'supplier') { //  供应商增加产品
+        if (selected) { //  选择
+          this.selectedRows = [...this.selectedRows, ...changeRows]
+        } else { //  取消
+          this.selectedRows.map((item, index) => {
+            this.selectedRows.map((subItem, ind) => {
+              if (item.productSn == subItem.productSn) {
+                _this.selectedRows.splice(index, 1)
+              }
+            })
           })
-        })
+        }
       }
     },
     // 产品列表
@@ -281,7 +304,11 @@ export default {
         pageSize: this.pageSize
       }
       this.loading = true
-      productPricedList(Object.assign(params, this.queryParam)).then(res => {
+      let url = productPricedList //  获取定过价的产品
+      if (this.type == 'supplier') { //  供应商增加产品
+        url = productList //  获取全部产品(包含定过价和未定过价的所有)
+      }
+      url(Object.assign(params, this.queryParam)).then(res => {
         this.loading = false
         if (res.status == 200) {
           const data = res.data
@@ -356,11 +383,16 @@ export default {
         this.disabled = false
         this.resetData()
       } else {
-        this.selectedRows = this.chooseData
-        this.selectedRowKeys = []
-        this.chooseData.map(item => {
-          this.selectedRowKeys.push(item.goodsSn)
-        })
+        if (this.type == 'supplier') { //  供应商增加产品
+          this.selectedRows = []
+          this.selectedRowKeys = this.chooseData
+        } else {
+          this.selectedRows = this.chooseData
+          this.selectedRowKeys = []
+          this.chooseData.map(item => {
+            this.selectedRowKeys.push(item.goodsSn)
+          })
+        }
         if (this.productBrandList.length == 0) {
           this.getProductBrand()
         }

+ 28 - 17
src/views/promotionRulesManagement/promotionRules/choosePriceProductsModal.vue

@@ -25,14 +25,9 @@
           <div class="products-operation" v-if="goodsType=='normal'">
             <a-row :gutter="15">
               <a-col :span="9">
-                <v-select
-                  code="ORDER_GOODS_UNIT"
-                  id="choosePosPriceProducts-orderGoodsUnit"
-                  v-model="orderGoodsUnit"
-                  allowClear
-                  placeholder="请选择"
-                  style="width: 100%;"
-                ></v-select>
+                <a-select id="choosePosPriceProducts-orderGoodsUnit" v-model="orderGoodsUnit" placeholder="请选择" allowClear style="width: 100%;" >
+                  <a-select-option v-for="item in orderGoodsUnitData" :key="item.code" :value="item.code">{{ item.dispName }}</a-select-option>
+                </a-select>
               </a-col>
               <a-col :span="10">
                 <a-input-number
@@ -71,14 +66,9 @@
         </template>
         <!-- 起订量限制 -->
         <template slot="orderGoodsUnit" slot-scope="text, record">
-          <v-select
-            code="ORDER_GOODS_UNIT"
-            id="choosePosPriceProducts-orderGoodsUnit"
-            v-model="record.orderGoodsUnit"
-            allowClear
-            placeholder="请选择"
-            style="width: 40%;"
-          ></v-select>
+          <a-select id="choosePosPriceProducts-orderGoodsUnit" v-model="record.orderGoodsUnit" placeholder="请选择" allowClear style="width: 40%;" >
+            <a-select-option v-for="item in orderGoodsUnitData" :key="item.code" :value="item.code">{{ item.dispName }}</a-select-option>
+          </a-select>
           <a-input-number
             v-if="record.orderGoodsUnit=='PROD_UNIT'"
             id="choosePosPriceProducts-orderGoodsQty"
@@ -139,6 +129,7 @@ import ChooseBrandModal from '@/views/common/chooseBrandModal.vue'
 import ChooseTypeModal from '@/views/common/chooseTypeModal.vue'
 import ImportGuideModal from './importGuideModal.vue'
 import { VSelect } from '@/components'
+import { getLookUpData } from '@/api/data'
 export default {
   name: 'ChoosePriceProductsModal',
   components: { VSelect, ChooseProductsModal, ChooseBrandModal, ChooseTypeModal, ImportGuideModal },
@@ -199,7 +190,8 @@ export default {
       openGuideModal: false, //  导入产品引导
       chooseBrand: [], //  所选品牌
       chooseProducts: [], //  所选产品
-      chooseType: [] //  所选分类
+      chooseType: [], //  所选分类
+      orderGoodsUnitData: []
     }
   },
   computed: {
@@ -371,6 +363,21 @@ export default {
     // 删除
     handleDel (record, ind) {
       this.loadData.splice(ind, 1)
+    },
+    // 起订量限制  数据字典     (避免多次请求同一数据字典)
+    getOrderGoodsUnitList () {
+      const _this = this
+      getLookUpData({
+        pageNo: 1,
+        pageSize: 1000,
+        lookupCode: 'ORDER_GOODS_UNIT'
+      }).then(res => {
+        if (res.status == 200) {
+          _this.orderGoodsUnitData = res.data.list
+        } else {
+          _this.orderGoodsUnitData = []
+        }
+      })
     }
   },
   watch: {
@@ -387,6 +394,10 @@ export default {
         this.orderGoodsUnit = undefined //  起订量限制 批量
         this.orderGoodsQty = '' //  限制数量
         this.$emit('close')
+      } else {
+        if (this.orderGoodsUnitData.length == 0) {
+          this.getOrderGoodsUnitList()
+        }
       }
     },
     nowData: {

+ 28 - 11
src/views/supplierManagement/associatedProduct/add.vue

@@ -8,7 +8,7 @@
       </template>
       <!-- 操作区,位于 title 行的行尾 -->
       <template slot="extra">
-        <a-button key="2" type="primary" @click="newProduct=true" class="button-error" id="associatedProduct-addProduct-btn">增加产品</a-button>
+        <a-button key="2" type="primary" @click="choosePModal" class="button-error" id="associatedProduct-addProduct-btn">增加产品</a-button>
         <a-button key="1" type="primary" class="button-success" id="associatedProduct-import-btn">批量导入</a-button>
       </template>
     </a-page-header>
@@ -86,20 +86,20 @@
     </a-card>
     <!-- 设置成本价 -->
     <SettingCost ref="settingCost" :openModal="openModal" @ok="$refs.table.refresh()" @close="openModal=false"></SettingCost>
-    <!-- 添加产品 -->
-    <ChooseProduct ref="shooseProduct" :openModal="newProduct" @ok="addProduct" @close="newProduct=false"></ChooseProduct>
+    <!-- 选择产品 -->
+    <chooseProductsModal type="supplier" :openModal="newProduct" :chooseData="chooseProducts" @close="newProduct=false" @ok="handleProductsOk" />
   </div>
 </template>
 
 <script>
 import { STable, VSelect } from '@/components'
-import { supplierProductList, deleteProduct, addProduct } from '@/api/supplier'
+import { supplierProductList, deleteProduct, addProduct, supplierProductSnList } from '@/api/supplier'
 import ProductType from '@/views/common/productType.js'
 import ProductBrand from '@/views/common/productBrand.js'
 import SettingCost from './settingCost.vue'
-import ChooseProduct from './chooseProduct.vue'
+import ChooseProductsModal from '@/views/common/chooseProductsModal.vue'
 export default {
-  components: { STable, VSelect, ProductBrand, ProductType, SettingCost, ChooseProduct },
+  components: { STable, VSelect, ProductBrand, ProductType, SettingCost, ChooseProductsModal },
   data () {
     return {
       disabled: false,
@@ -144,7 +144,8 @@ export default {
           this.disabled = false
           return data
         })
-      }
+      },
+      chooseProducts: [] //  所选产品
     }
   },
   methods: {
@@ -192,12 +193,28 @@ export default {
       this.openModal = true
       this.$refs.settingCost.setData(row)
     },
-    // 添加产品
-    addProduct (snList) {
-      console.log(snList, 'addProduct')
+    // 增加产品
+    choosePModal () {
+      // 查询所有已选sn
+      supplierProductSnList({ sn: this.$route.params.sn }).then(res => {
+        if (res.status == 200) {
+          this.chooseProducts = res.data //  包含先前所选产品
+          this.newProduct = true
+        }
+      })
+    },
+    // 产品
+    handleProductsOk (obj) {
+      this.chooseProducts = obj
+      if (obj.length > 0) {
+        this.addProduct()
+      }
+    },
+    // 添加产品  数据处理
+    addProduct () {
       addProduct({
         supplierSn: this.$route.params.sn,
-        productSnList: snList
+        productSnList: this.chooseProducts
       }).then(res => {
         if (res.status == 200) {
           this.$message.success(res.message)

+ 0 - 179
src/views/supplierManagement/associatedProduct/chooseProduct.vue

@@ -1,179 +0,0 @@
-<template>
-  <a-modal
-    centered
-    :footer="null"
-    :maskClosable="false"
-    title="选择产品"
-    v-model="isShow"
-    @cancle="cansel"
-    width="80%">
-    <a-card size="small" :bordered="false" class="productInfoList-wrap">
-      <!-- 搜索条件 -->
-      <div class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="productInfoList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码/原厂编码">
-                <a-input id="productInfoList-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入产品编码/原厂编码"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="品牌">
-                <ProductBrand id="productInfoList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
-              </a-form-item>
-            </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="产品分类">
-                  <ProductType id="productInfoList-productType" v-model="productType" @change="changeProductType"></ProductType>
-                </a-form-item>
-              </a-col>
-            </template>
-            <a-col :md="6" :sm="24">
-              <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" id="productInfoList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable"
-        ref="table"
-        size="small"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        bordered>
-      </s-table>
-      <div style="display: flex;justify-content: center;padding: 10px 0;">
-        <a-button size="large" type="primary" class="button-primary" @click="handleSubmit" style="padding: 0 60px;">
-          确定
-        </a-button>
-        <a-button size="large" style="padding: 0 60px;margin-left: 15px;font-size: 12px;" @click="cansel">
-          取消
-        </a-button>
-      </div>
-    </a-card>
-  </a-modal>
-</template>
-
-<script>
-import { STable, VSelect } from '@/components'
-import { productList } from '@/api/product'
-import ProductType from '@/views/common/productType.js'
-import ProductBrand from '@/views/common/productBrand.js'
-export default {
-  name: 'ChooseProduct',
-  components: { STable, VSelect, ProductType, ProductBrand },
-  props: {
-    openModal: { //  弹框显示状态
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    return {
-      isShow: this.openModal,
-      advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
-      queryParam: { //  查询条件
-        name: '', //  产品名称
-        queryWord: '', // 产品编码/原厂编码
-        productBrandSn: undefined, //  产品品牌
-        productTypeSn1: '', //  产品一级分类
-        productTypeSn2: '', //  产品二级分类
-        productTypeSn3: '' //  产品三级分类
-      },
-      productType: [],
-      disabled: false, //  查询、重置按钮是否可操作
-      columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'code', width: 220, align: 'center', customRender: function (text) { return text || '--' } }
-      ],
-      selectedRowKeys: [], // Check here to configure the default column
-      selectedRows: [],
-      loading: false,
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
-        }
-        return productList(Object.assign(parameter, this.queryParam)).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
-          }
-          this.disabled = false
-          return data
-        })
-      }
-    }
-  },
-  methods: {
-    onSelectChange (selectedRowKeys, selectedRows) {
-      this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-    },
-    // 选择产品
-    handleSubmit () {
-      const _this = this
-      if (_this.selectedRowKeys.length < 1) {
-        _this.$message.warning('请在选择产品!')
-        return
-      }
-      const obj = []
-      _this.selectedRows.map(item => {
-        obj.push(item.productSn)
-      })
-      _this.$emit('ok', obj)
-    },
-    //  重置
-    resetSearchForm () {
-      this.queryParam.name = ''
-      this.queryParam.queryWord = ''
-      this.queryParam.productBrandSn = undefined
-      this.queryParam.productTypeSn1 = ''
-      this.queryParam.productTypeSn2 = ''
-      this.queryParam.productTypeSn3 = ''
-      this.productType = []
-      this.$refs.table.refresh(true)
-    },
-    //  产品分类  change
-    changeProductType (val, opt) {
-      this.queryParam.productTypeSn1 = val[0] ? val[0] : ''
-      this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
-      this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
-    },
-    cansel () {
-      this.$emit('close')
-    }
-  },
-  watch: {
-    //  父页面传过来的弹框状态
-    openModal (newValue, oldValue) {
-      this.isShow = newValue
-    },
-    //  重定义的弹框状态
-    isShow (newValue, oldValue) {
-      if (!newValue) {
-        this.$emit('close')
-      }
-    }
-  }
-}
-</script>