浏览代码

bug 修复

lilei 3 年之前
父节点
当前提交
5a41f6fe11

+ 1 - 1
.env

@@ -4,7 +4,7 @@ VUE_APP_API_BASE_URL=http://qpls-md.360arrow.com/qpls-md
 VUE_APP_WX_BASE_URL=//qpls-md.360arrow.com/qpls-md/websocket/
 VUE_APP_WX_BASE_URL=//qpls-md.360arrow.com/qpls-md/websocket/
 VUE_APP_ENVTIPS=
 VUE_APP_ENVTIPS=
 VUE_APP_VERSION=V1.0.1
 VUE_APP_VERSION=V1.0.1
-VUE_APP_PRO_NAME=箭冠汽配连锁系统
+VUE_APP_PRO_NAME=ISCM智慧供应链系统
 VUE_APP_LOGO=@/assets/logo.png
 VUE_APP_LOGO=@/assets/logo.png
 VUE_APP_THEME_COLOR=#ed1c24
 VUE_APP_THEME_COLOR=#ed1c24
 VUE_APP_COM_NAME=陕西山海高科信息技术有限公司
 VUE_APP_COM_NAME=陕西山海高科信息技术有限公司

+ 1 - 1
.env.development

@@ -4,7 +4,7 @@ VUE_APP_API_BASE_URL=/api
 VUE_APP_WX_BASE_URL=//192.168.16.103:8503/qpls-md/websocket/
 VUE_APP_WX_BASE_URL=//192.168.16.103:8503/qpls-md/websocket/
 VUE_APP_VERSION=V1.0.1
 VUE_APP_VERSION=V1.0.1
 VUE_APP_ENVTIPS=开发环境
 VUE_APP_ENVTIPS=开发环境
-VUE_APP_PRO_NAME=箭冠汽配连锁系统
+VUE_APP_PRO_NAME=ISCM智慧供应链系统
 VUE_APP_LOGO=@/assets/logo.png
 VUE_APP_LOGO=@/assets/logo.png
 VUE_APP_THEME_COLOR=#ed1c24
 VUE_APP_THEME_COLOR=#ed1c24
 VUE_APP_COM_NAME=陕西山海高科信息技术有限公司
 VUE_APP_COM_NAME=陕西山海高科信息技术有限公司

+ 1 - 1
.env.practice

@@ -4,7 +4,7 @@ VUE_APP_API_BASE_URL=http://t.qpls.360arrow.com/qpls-md
 VUE_APP_WX_BASE_URL=//t.qpls.360arrow.com/qpls-md/websocket/
 VUE_APP_WX_BASE_URL=//t.qpls.360arrow.com/qpls-md/websocket/
 VUE_APP_VERSION=V1.0.1
 VUE_APP_VERSION=V1.0.1
 VUE_APP_ENVTIPS=练习环境
 VUE_APP_ENVTIPS=练习环境
-VUE_APP_PRO_NAME=箭冠汽配连锁系统
+VUE_APP_PRO_NAME=ISCM智慧供应链系统
 VUE_APP_LOGO=@/assets/logo.png
 VUE_APP_LOGO=@/assets/logo.png
 VUE_APP_THEME_COLOR=#ed1c24
 VUE_APP_THEME_COLOR=#ed1c24
 VUE_APP_COM_NAME=陕西山海高科信息技术有限公司
 VUE_APP_COM_NAME=陕西山海高科信息技术有限公司

+ 1 - 1
.env.preview

@@ -4,7 +4,7 @@ VUE_APP_API_BASE_URL=http://qpls-md.360arrow.com.cn/qpls-md
 VUE_APP_WX_BASE_URL=//qpls-md.360arrow.com.cn/qpls-md/websocket/
 VUE_APP_WX_BASE_URL=//qpls-md.360arrow.com.cn/qpls-md/websocket/
 VUE_APP_VERSION=V1.0.1
 VUE_APP_VERSION=V1.0.1
 VUE_APP_ENVTIPS=预发布环境
 VUE_APP_ENVTIPS=预发布环境
-VUE_APP_PRO_NAME=箭冠汽配连锁系统
+VUE_APP_PRO_NAME=ISCM智慧供应链系统
 VUE_APP_LOGO=@/assets/logo.png
 VUE_APP_LOGO=@/assets/logo.png
 VUE_APP_THEME_COLOR=#ed1c24
 VUE_APP_THEME_COLOR=#ed1c24
 VUE_APP_COM_NAME=陕西山海高科信息技术有限公司
 VUE_APP_COM_NAME=陕西山海高科信息技术有限公司

二进制
src/assets/logo.png


二进制
src/assets/logo1.png


+ 11 - 0
src/config/router.config.js

@@ -48,6 +48,17 @@ export const asyncRouterMap = [
         },
         },
         hidden: true
         hidden: true
       },
       },
+      // 新品列表
+      {
+        path: '/newProduct',
+        name: 'newProduct',
+        component: () => import(/* webpackChunkName: "home" */ '@/views/productManagement/newProduct/list'),
+        meta: {
+          title: '新品信息',
+          icon: 'home'
+        },
+        hidden: true
+      },
       // 销售管理
       // 销售管理
       {
       {
         path: '/salesManagement',
         path: '/salesManagement',

+ 1 - 1
src/layouts/BasicLayout.vue

@@ -51,7 +51,7 @@
       </a-layout-footer>
       </a-layout-footer>
 
 
       <!-- Setting Drawer (show in development mode) -->
       <!-- Setting Drawer (show in development mode) -->
-      <setting-drawer v-if="!production"></setting-drawer>
+      <!-- <setting-drawer v-if="!production"></setting-drawer> -->
     </a-layout>
     </a-layout>
   </a-layout>
   </a-layout>
 
 

+ 23 - 2
src/views/Home.vue

@@ -15,19 +15,35 @@
       v-model="openResetPwd">
       v-model="openResetPwd">
       <ResetPwd />
       <ResetPwd />
     </a-modal>
     </a-modal>
+    <!-- 新产品上线提醒 -->
+    <a-modal
+      class="newProductTips"
+      title="新产品上线提醒"
+      width="60%"
+      centered
+      :footer="null"
+      :maskClosable="false"
+      :destroyOnClose="true"
+      @cancel="openNewProduct=false"
+      v-model="openNewProduct">
+      <newProduct></newProduct>
+    </a-modal>
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
 import { mapGetters } from 'vuex'
 import { mapGetters } from 'vuex'
 import ResetPwd from '@/views/user/ResetPwd.vue'
 import ResetPwd from '@/views/user/ResetPwd.vue'
+import newProduct from '@/views/productManagement/newProduct/modal.vue'
+
 export default {
 export default {
   name: 'Home',
   name: 'Home',
-  components: { ResetPwd },
+  components: { ResetPwd, newProduct },
   data () {
   data () {
     return {
     return {
       message: '欢迎登录' + process.env.VUE_APP_PRO_NAME,
       message: '欢迎登录' + process.env.VUE_APP_PRO_NAME,
-      openResetPwd: false //  重置密码是否显示
+      openResetPwd: false, //  重置密码是否显示
+      openNewProduct: false
     }
     }
   },
   },
   computed: {
   computed: {
@@ -36,6 +52,9 @@ export default {
   created () {
   created () {
   },
   },
   methods: {
   methods: {
+    hasNewProduct () {
+      this.openNewProduct = true
+    }
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
@@ -45,6 +64,8 @@ export default {
       } else {
       } else {
         vm.openResetPwd = true
         vm.openResetPwd = true
       }
       }
+      // 判断是否有新产品上线
+      vm.hasNewProduct()
     })
     })
   }
   }
 }
 }

+ 102 - 0
src/views/productManagement/newProduct/detailModal.vue

@@ -0,0 +1,102 @@
+<template>
+  <a-modal
+    centered
+    class="productInfoDetail-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="产品详情"
+    v-model="isShow"
+    @cancle="isShow=false"
+    :width="800">
+    <!-- 产品详情 -->
+    <div>
+      <a-descriptions bordered :column="2" size="small">
+        <a-descriptions-item label="产品名称:">{{ detailsData&&detailsData.name || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="产品编码:">{{ detailsData&&detailsData.code || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="原厂编码:">{{ detailsData&&detailsData.origCode || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="基本单位:">{{ detailsData&&detailsData.unit || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="产品品牌:">{{ detailsData&&detailsData.productBrandName || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="产品分类:">{{ productTypeName || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="经销批发价:">{{ detailsData&&(detailsData.specialPrice || detailsData.specialPrice==0) ? detailsData.specialPrice : '--' }}</a-descriptions-item>
+        <a-descriptions-item label="终端价:">{{ detailsData&&(detailsData.terminalPrice || detailsData.terminalPrice==0) ? detailsData.terminalPrice : '--' }}</a-descriptions-item>
+        <a-descriptions-item label="车主价:">{{ detailsData&&(detailsData.carOwnersPrice || detailsData.carOwnersPrice==0) ? detailsData.carOwnersPrice : '--' }}</a-descriptions-item>
+      </a-descriptions>
+      <div class="btn-cont"><a-button id="product-management-detail-modal-back" @click="isShow = false">返回列表</a-button></div>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+import { dealerProductDetail } from '@/api/dealerProduct'
+export default {
+  name: 'ProductInfoDetailModal',
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    itemId: {
+      type: [Number, String],
+      default: ''
+    }
+  },
+  computed: {
+    productTypeName () {
+      const productTypeName1 = this.detailsData&&this.detailsData.productTypeName1 ? this.detailsData.productTypeName1 : ''
+      const productTypeName2 = this.detailsData&&this.detailsData.productTypeName2 ? ' > ' + this.detailsData.productTypeName2 : ''
+      const productTypeName3 = this.detailsData&&this.detailsData.productTypeName3 ? ' > ' + this.detailsData.productTypeName3 : ''
+      return productTypeName1 + productTypeName2 + productTypeName3
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      detailsData: null //  详情数据
+    }
+  },
+  methods: {
+    //  获取详情
+    getDetail () {
+      dealerProductDetail({ id: this.itemId }).then(res => {
+        if (res.status == 200) {
+          this.detailsData = res.data
+        } else {
+          this.detailsData = null
+        }
+      })
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+      }
+    },
+    itemId (newValue, oldValue) {
+      if (this.isShow && newValue) {
+        this.getDetail()
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .productInfoDetail-modal{
+    .ant-modal-body {
+      padding: 40px 40px 24px;
+    }
+    .ant-descriptions-item-label.ant-descriptions-item-colon{
+      width: 120px;
+    }
+    .btn-cont {
+      text-align: center;
+      margin: 35px 0 10px;
+    }
+  }
+</style>

+ 287 - 0
src/views/productManagement/newProduct/list.vue

@@ -0,0 +1,287 @@
+<template>
+  <a-card size="small" :bordered="false" class="productInfoList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" 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-model-item label="上线日期" prop="time">
+                <rangeDate ref="rangeDate" v-model.trim="time" @change="dateChange" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品品牌">
+                <a-select
+                  placeholder="请选择产品品牌"
+                  id="productInfoList-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>
+              </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 />
+              </a-form-item>
+            </a-col>
+            <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>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="产品编码">
+                  <a-input id="productInfoList-code" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="原厂编码">
+                  <a-input id="productInfoList-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
+                </a-form-item>
+              </a-col>
+            </template>
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
+              <!-- <a-button
+                style="margin: 0 0 18px 8px"
+                type="danger"
+                @click="handleExport"
+                :disabled="disabled"
+                :loading="exportLoading"
+                id="inventoryQueryList-export">导出</a-button> -->
+              <a @click="advanced=!advanced" style="margin-left: 5px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!-- 列表 -->
+      <s-table
+        class="sTable fixPagination"
+        ref="table"
+        :style="{ height: tableHeight+84.5+'px' }"
+        size="small"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ x: 1300, y: tableHeight }"
+        bordered>
+        <!-- 产品分类 -->
+        <template slot="productType" slot-scope="text, record">
+          <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
+          <span v-else>--</span>
+        </template>
+        <!-- 操作 -->
+        <template slot="action" slot-scope="text, record">
+          <a-button
+            v-if="$hasPermissions('B_product_dealerProduct_detail')"
+            size="small"
+            type="link"
+            class="button-success"
+            @click="handleDetail(record)"
+            id="productInfoList-detail-btn">详情</a-button>
+          <span v-if="!$hasPermissions('B_product_dealerProduct_edit') && !$hasPermissions('B_product_dealerProduct_detail')">--</span>
+        </template>
+      </s-table>
+    </a-spin>
+    <!-- 产品详情 -->
+    <product-info-detail-modal :openModal="openModal" :itemId="itemId" @close="closeModal" />
+  </a-card>
+</template>
+
+<script>
+import moment from 'moment'
+import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
+import { dealerProductTypeList } from '@/api/dealerProductType'
+import { dealerProductList, dealerProductExport } from '@/api/dealerProduct'
+import { STable, VSelect } from '@/components'
+import rangeDate from '@/views/common/rangeDate.vue'
+import productInfoDetailModal from './detailModal.vue'
+export default {
+  components: { STable, VSelect, productInfoDetailModal, rangeDate },
+  data () {
+    return {
+      spinning: false,
+      advanced: true, // 高级搜索 展开/关闭
+      tableHeight: 0,
+      productType: [],
+      time: [],
+      queryParam: { //  查询条件
+        beginDate: '',
+        endDate: '',
+        code: '', //  产品编码
+        name: '', //  产品名称
+        origCode: '', //  原厂编码
+        sysFlag: '0',
+        productBrandSn: undefined, //  产品品牌
+        productTypeSn1: '', //  产品一级分类
+        productTypeSn2: '', //  产品二级分类
+        productTypeSn3: '', //  产品三级分类
+        enabledFlag: undefined //  状态
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      exportLoading: false, // 导出loading
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '上线日期', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品品牌', dataIndex: 'productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
+        { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'code', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'unit', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'origCode', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        this.spinning = true
+        return dealerProductList(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
+            const productTypeName1 = data.list[i].productTypeName1 ? data.list[i].productTypeName1 : ''
+            const productTypeName2 = data.list[i].productTypeName2 ? ' > ' + data.list[i].productTypeName2 : ''
+            const productTypeName3 = data.list[i].productTypeName3 ? ' > ' + data.list[i].productTypeName3 : ''
+            data.list[i].productTypeName = productTypeName1 + productTypeName2 + productTypeName3
+          }
+          this.disabled = false
+          this.spinning = false
+          return data
+        })
+      },
+      openModal: false, //  查看客户详情  弹框
+      itemId: '', //  当前产品id
+      productBrandList: [], //  品牌下拉数据
+      productTypeList: [] //  分类下拉数据
+    }
+  },
+  methods: {
+    //  创建时间  change
+    dateChange (date) {
+      this.queryParam.time = date
+      this.queryParam.beginDate = date[0] || ''
+      this.queryParam.endDate = date[1] || ''
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam.code = ''
+      this.queryParam.name = ''
+      this.queryParam.origCode = ''
+      this.queryParam.productBrandSn = undefined
+      this.queryParam.productTypeSn1 = ''
+      this.queryParam.productTypeSn2 = ''
+      this.queryParam.productTypeSn3 = ''
+      this.queryParam.enabledFlag = undefined
+      this.productType = []
+      this.$refs.table.refresh(true)
+    },
+    filterOption (input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
+    //  详情
+    handleDetail (row) {
+      this.itemId = row.id
+      this.openModal = true
+    },
+    //  关闭弹框
+    closeModal () {
+      this.itemId = ''
+      this.openModal = false
+    },
+    //  产品分类  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] : ''
+    },
+    //  导出
+    handleExport () {
+      this.exportLoading = true
+      this.spinning = true
+      dealerProductExport(this.queryParam).then(res => {
+        this.exportLoading = false
+        this.download(res)
+        this.spinning = false
+      })
+    },
+    download (data) {
+      if (!data) { return }
+      const url = window.URL.createObjectURL(new Blob([data]))
+      const link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      const a = moment().format('YYYYMMDDHHmmss')
+      const fname = '自建产品列表' + a
+      link.setAttribute('download', fname + '.xlsx')
+      document.body.appendChild(link)
+      link.click()
+    },
+    //  产品品牌  列表
+    getProductBrand () {
+      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 = []
+        }
+      })
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 235
+    }
+  },
+  mounted () {
+    const _this = this
+    this.$nextTick(() => { // 页面渲染完成后的回调
+      _this.setTableH()
+    })
+  },
+  watch: {
+    advanced (newValue, oldValue) {
+      const _this = this
+      setTimeout(() => {
+        _this.setTableH()
+      }, 400)
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getProductBrand()
+      vm.getProductType()
+    })
+  }
+}
+</script>

+ 59 - 0
src/views/productManagement/newProduct/modal.vue

@@ -0,0 +1,59 @@
+<template>
+  <div>
+    <!-- 列表 -->
+    <s-table
+      class="sTable fixPagination"
+      ref="table"
+      size="small"
+      :rowKey="(record) => record.id"
+      :columns="columns"
+      :scroll="{ y: 400 }"
+      :data="loadData"
+      :showPagination="false"
+      bordered>
+    </s-table>
+    <div style="padding-top: 15px;">
+      <a-button @click="viewMore" block type="primary" ghost>查看更多新品</a-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { STable } from '@/components'
+import { dealerProductList } from '@/api/dealerProduct'
+export default {
+  name: 'NewProduct',
+  components: { STable },
+  data () {
+    return {
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '产品品牌', dataIndex: 'productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'code', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'unit', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '上线时间', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return dealerProductList(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
+          }
+          return data
+        })
+      }
+    }
+  },
+  methods: {
+    viewMore () {
+      this.$router.push({ name: 'newProduct' })
+    }
+  }
+}
+</script>
+
+<style>
+</style>

+ 6 - 3
src/views/salesManagement/salesReturn/queryPart.vue

@@ -78,7 +78,7 @@
 
 
 <script>
 <script>
 import { salesReturnProductList } from '@/api/salesReturn'
 import { salesReturnProductList } from '@/api/salesReturn'
-import { querySumByProductLocation } from '@/api/stock'
+import { stockList } from '@/api/stock'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 export default {
 export default {
@@ -112,7 +112,7 @@ export default {
         if (this.grabFlag == 1) {
         if (this.grabFlag == 1) {
           this.queryParam.buyerSn = this.buyerSn
           this.queryParam.buyerSn = this.buyerSn
         }
         }
-        const fun = [querySumByProductLocation, salesReturnProductList]
+        const fun = [stockList, salesReturnProductList]
         if (this.grabFlag == 0) {
         if (this.grabFlag == 0) {
           this.queryParam.salePriceType = this.priceType
           this.queryParam.salePriceType = this.priceType
         }
         }
@@ -121,6 +121,9 @@ export default {
           const no = (data.pageNo - 1) * data.pageSize
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
             data.list[i].no = no + i + 1
+            if (this.grabFlag == 0) {
+              data.list[i].salePrice = data.list[i].lastStockCost
+            }
           }
           }
           this.listData = data.list || []
           this.listData = data.list || []
           this.disabled = false
           this.disabled = false
@@ -152,7 +155,7 @@ export default {
         { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'productOrigCode', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '售价', dataIndex: 'salePrice', align: 'center', width: 100, scopedSlots: { customRender: 'price' } },
         { title: '售价', dataIndex: 'salePrice', align: 'center', width: 100, scopedSlots: { customRender: 'price' } },
-        { title: '单位', dataIndex: 'unit', align: 'center', customRender: function (text) { return text || '--' }, width: 100 },
+        { title: '单位', dataIndex: 'productUnit', align: 'center', customRender: function (text) { return text || '--' }, width: 100 },
         { slots: { title: 'customTitle' }, scopedSlots: { customRender: 'action' }, width: 100, align: 'center' }]
         { slots: { title: 'customTitle' }, scopedSlots: { customRender: 'action' }, width: 100, align: 'center' }]
     }
     }
   },
   },