Pārlūkot izejas kodu

供应商对接

lilei 4 gadi atpakaļ
vecāks
revīzija
a9bf25d7ca

+ 43 - 13
src/api/supplier.js

@@ -11,19 +11,10 @@ export const supplierList = (params) => {
     method: 'post'
   })
 }
-//  供应商 列表  无分页
-export const supplierAllList = (params) => {
-  return axios({
-    url: '/supplier/queryList',
-    data: params,
-    method: 'post'
-  })
-}
 //  供应商 详情
 export const supplierDetail = (params) => {
   return axios({
-    url: `/supplier/findById/${params.id}`,
-    data: params,
+    url: `/supplier/findBySn/${params.sn}`,
     method: 'get'
   })
 }
@@ -35,11 +26,50 @@ export const supplierSave = (params) => {
     method: 'post'
   })
 }
-//  供应商 删除
-export const supplierDel = (params) => {
+
+// 启用禁用
+export const updateEnableStatus = (params) => {
+  return axios({
+    url: `/supplier/enable/${params.sn}/${params.flag}`,
+    data: params,
+    method: 'post'
+  })
+}
+
+// 分页查询供应商产品列表
+export const supplierProductList = (params) => {
+  const url = `/supplierProduct/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+
+// 设置成本价
+export const settingCost = (params) => {
   return axios({
-    url: `/supplier/delete/${params.id}`,
+    url: `/supplierProduct/settingCost`,
     data: params,
     method: 'post'
   })
 }
+
+// 删除产品信息
+export const deleteProduct = (params) => {
+  return axios({
+    url: `/supplierProduct/deleteProduct/${params.sn}`,
+    method: 'get'
+  })
+}
+
+// 添加产品信息
+export const addProduct = (params) => {
+  return axios({
+    url: `/supplierProduct/addProduct`,
+    data: params,
+    method: 'post'
+  })
+}

+ 14 - 3
src/config/router.config.js

@@ -520,7 +520,7 @@ export const asyncRouterMap = [
               {
                 path: 'list',
                 name: 'supplierInfoList',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/supplierManagement/supplierInfo/list.vue'),
+                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/supplierInfo/list.vue'),
                 meta: {
                   title: '供应商列表',
                   icon: 'team',
@@ -531,7 +531,7 @@ export const asyncRouterMap = [
               {
                 path: 'add',
                 name: 'supplierInfoAdd',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/supplierManagement/supplierInfo/edit.vue'),
+                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/supplierInfo/edit.vue'),
                 meta: {
                   title: '新增供应商',
                   icon: 'team',
@@ -542,13 +542,24 @@ export const asyncRouterMap = [
               {
                 path: 'edit/:id',
                 name: 'supplierInfoEdit',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/supplierManagement/supplierInfo/edit.vue'),
+                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/supplierInfo/edit.vue'),
                 meta: {
                   title: '编辑供应商',
                   icon: 'team',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
+              },
+              {
+                path: 'associatedProduct/:sn/:name',
+                name: 'associatedProduct',
+                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/associatedProduct/add.vue'),
+                meta: {
+                  title: '关联产品',
+                  icon: 'team',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
               }
             ]
           },

+ 219 - 0
src/views/supplierManagement/associatedProduct/add.vue

@@ -0,0 +1,219 @@
+<template>
+  <div class="associatedProduct-wrap">
+    <a-page-header :ghost="false" :backIcon="false" class="associatedProduct-head" @back="handleBack" >
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="salesEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+        <span style="margin: 0 15px;color: #666;">供应商名称:{{ decodeURI($route.params.name) }}</span>
+      </template>
+      <!-- 操作区,位于 title 行的行尾 -->
+      <template slot="extra">
+        <a-button key="2" type="primary" @click="newProduct=true" 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>
+    <!-- 列表 -->
+    <a-card size="small" :bordered="false">
+      <!-- 搜索条件 -->
+      <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="associatedProduct-name" v-model.trim="queryParam.product.name" allowClear placeholder="请输入产品名称"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品编码/原厂编码">
+                <a-input id="associatedProduct-queryWord" v-model.trim="queryParam.product.queryWord" allowClear placeholder="请输入产品编码/原厂编码"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="品牌">
+                <ProductBrand id="associatedProduct-productBrandSn" v-model="queryParam.product.productBrandSn"></ProductBrand>
+              </a-form-item>
+            </a-col>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="产品分类">
+                  <ProductType id="associatedProduct-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="associatedProduct-refresh">查询</a-button>
+              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="associatedProduct-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="default"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ x: 2150, y: tableHeight }"
+        bordered>
+        <!-- 产品分类 -->
+        <template slot="productType" slot-scope="text, record">
+          <span v-if="record.product.productTypeName2 || record.product.productTypeName3">{{ record.product.productTypeName1 }} {{ record.product.productTypeName2 ? '>' : '' }} {{ record.product.productTypeName2 }} {{ record.product.productTypeName3 ? '>' : '' }} {{ record.product.productTypeName3 }}</span>
+          <span v-else>--</span>
+        </template>
+        <!-- 操作 -->
+        <template slot="action" slot-scope="text, record">
+          <a-button
+            size="small"
+            type="link"
+            class="button-info"
+            @click="handleSetPrice(record)"
+            id="associatedProduct-setCostPrice-btn">设置成本价</a-button>
+          <a-button
+            size="small"
+            type="link"
+            class="button-error"
+            @click="handleDel(record)"
+            id="associatedProduct-del-btn">删除</a-button>
+        </template>
+      </s-table>
+    </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>
+  </div>
+</template>
+
+<script>
+import { STable, VSelect } from '@/components'
+import { supplierProductList, deleteProduct, addProduct } 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'
+export default {
+  components: { STable, VSelect, ProductBrand, ProductType, SettingCost, ChooseProduct },
+  data () {
+    return {
+      disabled: false,
+      advanced: false,
+      tableHeight: 0,
+      openModal: false, // 设置价格 弹框
+      newProduct: false, // 选择产品 弹框
+      queryParam: { //  查询条件
+        product: {
+          name: '', //  产品名称
+          queryWord: '', // 产品编码/原厂编码
+          productBrandSn: undefined, //  产品品牌
+          productTypeSn1: '', //  产品一级分类
+          productTypeSn2: '', //  产品二级分类
+          productTypeSn3: '' //  产品三级分类
+        }
+      },
+      productType: [],
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '产品品牌', dataIndex: 'product.productBrandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 350, align: 'center' },
+        { title: '产品名称', dataIndex: 'product.name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'product.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'product.origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价', dataIndex: 'cost', width: 140, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 250, align: 'center', fixed: 'right' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        if (this.tableHeight == 0) {
+          this.tableHeight = window.innerHeight - 380
+        }
+        this.queryParam.supplierSn = this.$route.params.sn
+        return supplierProductList(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: {
+    // 返回
+    handleBack () {
+      this.$router.push({ name: 'supplierInfoList' })
+    },
+    //  产品分类  change
+    changeProductType (val, opt) {
+      this.queryParam.product.productTypeSn1 = val[0] ? val[0] : ''
+      this.queryParam.product.productTypeSn2 = val[1] ? val[1] : ''
+      this.queryParam.product.productTypeSn3 = val[2] ? val[2] : ''
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam.product.name = ''
+      this.queryParam.product.queryWord = ''
+      this.queryParam.product.productBrandSn = undefined
+      this.queryParam.product.productTypeSn1 = ''
+      this.queryParam.product.productTypeSn2 = ''
+      this.queryParam.product.productTypeSn3 = ''
+      this.productType = []
+      this.$refs.table.refresh(true)
+    },
+    // 删除
+    handleDel (row) {
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '确认要删除吗?',
+        centered: true,
+        closable: true,
+        onOk () {
+          deleteProduct({ sn: row.supplierProductSn }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+            }
+          })
+        }
+      })
+    },
+    // 设置成本价
+    handleSetPrice (row) {
+      this.openModal = true
+      this.$refs.settingCost.setData(row)
+    },
+    // 添加产品
+    addProduct (snList) {
+      console.log(snList, 'addProduct')
+      addProduct({
+        supplierSn: this.$route.params.sn,
+        productSnList: snList
+      }).then(res => {
+        if (res.status == 200) {
+          this.$message.success(res.message)
+          this.$refs.table.refresh()
+          this.newProduct = false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .associatedProduct-wrap{
+    .associatedProduct-head{
+      margin-bottom: 15px;
+    }
+  }
+</style>

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

@@ -0,0 +1,179 @@
+<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="default"
+        :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" @click="handleSubmit">
+          确定
+        </a-button>
+        <a-button size="large" style="margin-left: 50px;" @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>

+ 132 - 0
src/views/supplierManagement/associatedProduct/settingCost.vue

@@ -0,0 +1,132 @@
+<template>
+  <a-modal
+    centered
+    class="merchantInfoManagement-modal"
+    :footer="null"
+    :maskClosable="false"
+    :title="title"
+    v-model="isShow"
+    @cancle="cansel"
+    width="40%">
+    <div>
+      <a-form-model
+        ref="ruleForm"
+        :model="form"
+        :rules="rules"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
+      >
+        <a-form-model-item label="产品名称">
+          {{ productName }}
+        </a-form-model-item>
+        <a-form-model-item label="产品编码">
+          {{ productCode }}
+        </a-form-model-item>
+        <a-form-model-item label="成本价" prop="cost">
+          <a-input-number
+            id="setting-cost"
+            v-model="form.cost"
+            :precision="2"
+            :min="0"
+            :max="999999"
+            placeholder="请输入"
+            style="width: 100%;" />
+        </a-form-model-item>
+        <div style="display: flex;justify-content: center;padding: 30px 0;">
+          <a-button size="large" type="primary" @click="onSubmit">
+            确定
+          </a-button>
+          <a-button size="large" style="margin-left: 50px;" @click="cansel">
+            取消
+          </a-button>
+        </div>
+      </a-form-model>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+import { VSelect } from '@/components'
+import { settingCost } from '@/api/supplier'
+export default {
+  name: 'SettingCost',
+  components: { VSelect },
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      title: '设置成本价',
+      labelCol: { span: 6 },
+      wrapperCol: { span: 14 },
+      productName: '',
+      productCode: '',
+      form: {
+        supplierSn: '',
+        supplierProductSn: '',
+        cost: ''
+      },
+      rules: {
+        cost: [
+          { required: true, message: '请输入成本价', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  methods: {
+    setData (row) {
+      this.form.supplierSn = row.supplierSn
+      this.form.supplierProductSn = row.supplierProductSn
+      this.productName = row.product.name
+      this.productCode = row.product.code
+    },
+    onSubmit () {
+      const _this = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          const params = JSON.parse(JSON.stringify(_this.form))
+          settingCost(params).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$emit('ok')
+              _this.cansel()
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    cansel () {
+      this.$emit('close')
+      this.productName = ''
+      this.productCode = ''
+      this.$refs.ruleForm.resetFields()
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .merchantInfoManagement-modal{
+    .ant-modal-body {
+      padding: 40px 40px 24px;
+    }
+  }
+</style>

+ 5 - 3
src/views/supplierManagement/supplierInfo/list.vue

@@ -93,13 +93,15 @@ export default {
     //  新增/编辑
     handleEdit (row) {
       if (row) { //  编辑
-        this.$router.push({ path: `/supplierManagement/supplierInfo/edit/${row.id}` })
+        this.$router.push({ name: `supplierInfoEdit`, params: { id: row.id } })
       } else { //  新增
-        this.$router.push({ path: '/supplierManagement/supplierInfo/add' })
+        this.$router.push({ name: 'supplierInfoAdd' })
       }
     },
     // 关联产品
-    handleRelated (row) {},
+    handleRelated (row) {
+      this.$router.push({ name: 'associatedProduct', params: { sn: row.supplierSn, name: encodeURI(row.supplierName) } })
+    },
     // 修改状态
     changeFlagHandle (text, record) {
       const _data = {