浏览代码

Merge branch 'deploy_0804' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy_0804

1004749546@qq.com 3 年之前
父节点
当前提交
f5c790e900

+ 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_ENVTIPS=
 VUE_APP_VERSION=V1.0.1
-VUE_APP_PRO_NAME=箭冠汽配连锁系统
+VUE_APP_PRO_NAME=ISCM智慧供应链系统
 VUE_APP_LOGO=@/assets/logo.png
 VUE_APP_THEME_COLOR=#ed1c24
 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_VERSION=V1.0.1
 VUE_APP_ENVTIPS=开发环境
-VUE_APP_PRO_NAME=箭冠汽配连锁系统
+VUE_APP_PRO_NAME=ISCM智慧供应链系统
 VUE_APP_LOGO=@/assets/logo.png
 VUE_APP_THEME_COLOR=#ed1c24
 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_VERSION=V1.0.1
 VUE_APP_ENVTIPS=练习环境
-VUE_APP_PRO_NAME=箭冠汽配连锁系统
+VUE_APP_PRO_NAME=ISCM智慧供应链系统
 VUE_APP_LOGO=@/assets/logo.png
 VUE_APP_THEME_COLOR=#ed1c24
 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_VERSION=V1.0.1
 VUE_APP_ENVTIPS=预发布环境
-VUE_APP_PRO_NAME=箭冠汽配连锁系统
+VUE_APP_PRO_NAME=ISCM智慧供应链系统
 VUE_APP_LOGO=@/assets/logo.png
 VUE_APP_THEME_COLOR=#ed1c24
 VUE_APP_COM_NAME=陕西山海高科信息技术有限公司

二进制
public/logo.png


+ 8 - 0
src/api/product.js

@@ -22,6 +22,14 @@ export const productList = (params) => {
     method: 'post'
   })
 }
+// 产品详情
+export const productDetail = (params) => {
+  const url = `/product/findBySn/${params.sn}`
+  return axios({
+    url: url,
+    method: 'get'
+  })
+}
 //  产品  价格变更记录  列表  分页
 export const productPriceChangeList = (params) => {
   const url = `/product/priceChange/queryPage/${params.pageNo}/${params.pageSize}`

+ 47 - 0
src/api/stockImport.js

@@ -0,0 +1,47 @@
+import { axios } from '@/utils/request'
+
+//  库存/散件导入  列表  分页
+export const stockImportList = (params) => {
+  const url = `/stockImportDetail/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  散件导入  取消导入
+export const stockImportCancel = (params) => {
+  return axios({
+    url: `/stockImport/cancelImport`,
+    data: params,
+    method: 'post'
+  })
+}
+//  散件导入  确认导入
+export const stockImportFinish = (params) => {
+  return axios({
+    url: `/stockImport/finishImport`,
+    data: params,
+    method: 'post'
+  })
+}
+//  散件导入  错误导出
+export const stockImportExportError = (params) => {
+  return axios({
+    url: '/stockImportDetail/exportForSpareParts',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+//  库存导入  错误导出
+export const stockImportKCExportError = (params) => {
+  return axios({
+    url: '/stockImportDetail/exportForStock',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}

二进制
src/assets/logo.png


+ 91 - 35
src/components/UploadFile/index.vue

@@ -4,11 +4,12 @@
       :action="action"
       :listType="listType"
       :fileList="fileList"
+      :disabled="disabled"
       @preview="handlePreview"
       @change="handleChange"
       :beforeUpload="beforeUpload"
-      :preview-file="previewFile"
       :data="params"
+      :headers="headers"
       :value="comVal"
     >
       <div v-if="fileList.length < maxNums && listType=='picture-card'">
@@ -19,7 +20,7 @@
         <a-button> <a-icon type="upload" /> {{ upText }} </a-button>
       </div>
     </a-upload>
-    <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel">
+    <a-modal :visible="previewVisible" :footer="null" centered :maskClosable="false" @cancel="handleCancel">
       <video v-if="fileType=='video/mp4'" controls="controls" style="width: 100%" :src="previewImage" />
       <img v-else alt="example" style="width: 100%" :src="previewImage" />
     </a-modal>
@@ -43,9 +44,7 @@ export default {
     },
     previewFile: {
       type: Function,
-      default: function () {
-
-      }
+      default: function () {}
     },
     action: {
       type: String,
@@ -57,7 +56,7 @@ export default {
     },
     upText: {
       type: String,
-      default: '上传'
+      default: ''
     },
     value: {
       type: String
@@ -66,14 +65,21 @@ export default {
       type: Object,
       default: function () {
         return {
-          savePathType: 'ali' // 存储类型 local 服务器本地,ali 阿里云
+          savePathType: 'ali' // 存储类型 local 服务器本地,ali 阿里云, web
         }
       }
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    uploadType: { //  上传类型  img图片;attach附件;import导入
+      type: String,
+      default: 'img'
     }
   },
   watch: {
     value (a, b) {
-      console.log(a, '=--====')
       this.comVal = a || ''
       if (a == undefined) {
         this.fileList = []
@@ -86,26 +92,47 @@ export default {
       previewImage: '',
       fileList: [],
       comVal: this.value,
-      params: this.uploadParams
+      params: this.uploadParams,
+      headers: {
+        'access-token': this.$store.getters.token
+      }
     }
   },
   methods: {
     setFileList (a) {
       const temp = []
       if (a && a.length > 0) {
-        a.split(',').map((item, index) => {
-          if (item) {
-            temp.push({
-              uid: index,
-              name: item,
-              status: 'done',
-              url: item,
-              response: {
-                data: item
-              }
-            })
-          }
-        })
+        if (this.uploadType == 'img' || this.uploadType == 'import') { // 图片/导入
+          a.split(',').map((item, index) => {
+            if (item) {
+              temp.push({
+                uid: index,
+                name: item,
+                status: 'done',
+                url: item,
+                response: {
+                  data: item
+                }
+              })
+            }
+          })
+        } else if (this.uploadType == 'attach') { // 附件
+          a.map((item, index) => {
+            if (item) {
+              const arr = []
+              arr.push(item) //  包裹成与新上传文件数据返回结构一致
+              temp.push({
+                uid: index,
+                name: item.fileName,
+                status: 'done',
+                url: item.filePath,
+                response: {
+                  data: arr
+                }
+              })
+            }
+          })
+        }
       }
       this.fileList = temp
     },
@@ -116,39 +143,54 @@ export default {
       if (this.listType == 'text') {
         return
       }
-      console.log(file, '8888888888')
       this.previewImage = file.url || file.thumbUrl
-      // this.previewImage = file.response.data
       this.previewVisible = true
     },
     handleChange ({ file, fileList }) {
-      if (file.status == 'error') {
+      // console.log(file, fileList, '-----change')
+      if (file.status == 'error' || (file.response && (file.response.status == 500))) {
         this.$message.error('上传失败,请重试!')
         return
       }
       this.fileList = this.validaFile(file, fileList)
       this.$emit('change', this.formatFile())
+      this.$emit('input', this.formatFile())
     },
     // 格式化文件列表数据,给表单
     formatFile () {
+      const _this = this
       const a = this.fileList
-      const temp = []
+      let temp = []
+      let obj = null
       if (a && a.length) {
-        a.map(item => {
-          if (item.response && item.status == 'done') {
-            temp.push(item.response.data)
-          }
-        })
+        if (this.uploadType == 'img' || this.uploadType == 'import') { // 图片/导入    将接口的返回图片地址逗号拼接后返回页面
+          a.map(item => {
+            if (item.response && item.status == 'done') {
+              temp.push(item.response.data)
+            }
+          })
+          obj = temp.join(',')
+        } else if (this.uploadType == 'attach') { // 附件    将接口的返回数据返回页面
+          a.map(item => {
+            if (item.response && item.status == 'done') {
+              if (_this.maxNums == 1) {
+                temp = [item.response.data]
+              } else {
+                temp = [...temp, ...item.response.data]
+              }
+            }
+          })
+          obj = JSON.stringify(temp)
+        }
       }
-      return temp.join(',')
+      return obj
     },
     // 文件校验
     validaFile (file, filesList) {
       if (filesList.length == 0) {
         return []
       }
-
-      console.log(file, filesList, this.beforeUpload(file, 0))
+      // console.log(file, filesList, this.beforeUpload(file, 0))
       if (!this.beforeUpload(file, 0) && file.status != 'removed') {
         const index = filesList.findIndex(item => item.uid == file.uid)
         filesList.splice(index, 1)
@@ -159,9 +201,16 @@ export default {
     beforeUpload (file, tip) {
       // 不限制
       if (this.fileType == '*') {
+        // 文件大小
+        const isLt2M = file.size / 1024 / 1024 < this.fileSize
+        if (!isLt2M) {
+          if (tip != 0) {
+            this.$message.error('上传文件不能超过 ' + this.fileSize + 'MB!')
+          }
+          return isLt2M
+        }
         return true
       }
-
       const isType = this.fileType.indexOf(file.type) >= 0 && file.type != ''
       if (!isType) {
         if (tip != 0) {
@@ -192,10 +241,12 @@ export default {
   .upload-file{
     float: left;
     overflow: hidden;
+    height: 80px;
     /* you can make up upload button and sample style by using stylesheets */
     .ant-upload-select-picture-card i {
       font-size: 32px;
       color: #999;
+      margin-top: 9px;
     }
     .ant-upload-select-picture-card .ant-upload-text {
       margin-top: 8px;
@@ -207,11 +258,16 @@ export default {
         padding: 4px 0;
       }
     }
+    .ant-upload-list-picture-card-container{
+      height: 80px;
+      width: 80px;
+    }
     .ant-upload.ant-upload-select-picture-card,
     .ant-upload-list-picture-card .ant-upload-list-item{
       width:80px;
       height:80px;
       padding: 4px;
+      margin: 0;
     }
     .ant-upload-list-item-info{
       padding: 0 22px 0 4px;

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

@@ -48,6 +48,17 @@ export const asyncRouterMap = [
         },
         hidden: true
       },
+      // 新品列表
+      {
+        path: '/newProduct',
+        name: 'newProduct',
+        component: () => import(/* webpackChunkName: "home" */ '@/views/productManagement/newProduct/list'),
+        meta: {
+          title: '新品信息',
+          icon: 'home'
+        },
+        hidden: true
+      },
       // 销售管理
       {
         path: '/salesManagement',
@@ -1149,6 +1160,31 @@ export const asyncRouterMap = [
               }
             ]
           },
+          {
+            path: '/inventoryManagement/inventoryImport',
+            redirect: '/inventoryManagement/inventoryImport/list',
+            name: 'inventoryImport',
+            component: RouteView,
+            meta: {
+              title: '库存导入',
+              icon: 'frown'
+              // permission: 'M_bulkReturnGoodsList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'inventoryImportList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryImport/list.vue'),
+                meta: {
+                  title: '库存导入列表',
+                  icon: 'frown',
+                  hidden: true
+                  // permission: 'M_bulkReturnGoodsList'
+                }
+              }
+            ]
+          },
           {
             path: '/inventoryManagement/warehouse',
             redirect: '/inventoryManagement/warehouse/list',
@@ -1302,6 +1338,31 @@ export const asyncRouterMap = [
                 }
               }
             ]
+          },
+          {
+            path: '/bulkManagement/bulkImport',
+            redirect: '/bulkManagement/bulkImport/list',
+            name: 'bulkImport',
+            component: RouteView,
+            meta: {
+              title: '散件导入',
+              icon: 'frown'
+              // permission: 'M_bulkReturnGoodsList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'bulkImportList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkImport/list.vue'),
+                meta: {
+                  title: '散件导入列表',
+                  icon: 'frown',
+                  hidden: true
+                  // permission: 'M_bulkReturnGoodsList'
+                }
+              }
+            ]
           }
         ]
       },

+ 1 - 1
src/layouts/BasicLayout.vue

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

+ 23 - 2
src/views/Home.vue

@@ -15,19 +15,35 @@
       v-model="openResetPwd">
       <ResetPwd />
     </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>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
 import ResetPwd from '@/views/user/ResetPwd.vue'
+import newProduct from '@/views/productManagement/newProduct/modal.vue'
+
 export default {
   name: 'Home',
-  components: { ResetPwd },
+  components: { ResetPwd, newProduct },
   data () {
     return {
       message: '欢迎登录' + process.env.VUE_APP_PRO_NAME,
-      openResetPwd: false //  重置密码是否显示
+      openResetPwd: false, //  重置密码是否显示
+      openNewProduct: false
     }
   },
   computed: {
@@ -36,6 +52,9 @@ export default {
   created () {
   },
   methods: {
+    hasNewProduct () {
+      this.openNewProduct = true
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
@@ -45,6 +64,8 @@ export default {
       } else {
         vm.openResetPwd = true
       }
+      // 判断是否有新产品上线
+      vm.hasNewProduct()
     })
   }
 }

+ 292 - 0
src/views/bulkManagement/bulkImport/list.vue

@@ -0,0 +1,292 @@
+<template>
+  <a-card size="small" :bordered="false" class="bulkImportList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <Upload
+          id="bulkImportList-attachList"
+          ref="importUpload"
+          :maxNums="1"
+          fileType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
+          uploadType="attach"
+          :action="attachAction"
+          :uploadParams="uploadParams"
+          upText="选择导入文件"
+          @change="changeImport"></Upload>
+        <a :href="filePath" style="margin: 5px 0 0 15px;display: block;float: left;">
+          <a-icon type="download" style="padding-right: 5px;" />下载导入模板
+        </a>
+      </div>
+      <div class="importGuide-con">
+        <div class="explain-con">
+          <div class="explain-item">
+            <div class="explain-tit">导入文件说明</div>
+            <ul>
+              <li>1) 导入的EXCEL文件中必须包含名为"供应商"、"产品品牌"、"产品编码"、"原厂编码"、"产品名称"、"产品一级类别"、"产品二级类别"、"产品三级类别"、"仓库"、"仓位"、"入库数量"、"成本价"、"售价";列顺序可忽略、行顺序可忽略。其中"供应商"、"产品品牌"、"产品编码"、"产品名称"、"仓库"、"仓位"、"入库数量"、"成本价"、"售价"内容不能为空。</li>
+              <li>2) 红色底白字为错误项,对应错误原因列显示错误信息,存在错误项时不能导入,请取消修改后重新上传操作。</li>
+              <li>3) 上传成功显示产品列表后,第一次以后上传的文件名如果和第一次上传的文件名相同,将不再上传,采取第一次上传的文件,如要重新上传数据,请更改文件名称。</li>
+              <li>4) 供应商为必填项且不能包含箭牌供应商、产品品牌为必填项且不能包含箭牌品牌、产品名称为必填项。</li>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <!-- 列表 -->
+      <s-table
+        class="sTable fixPagination"
+        ref="table"
+        :style="{ height: tableHeight+84.5+'px' }"
+        size="small"
+        :rowClassName="(record, index) => record.isError==1 ? 'redBg-row':''"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ x: 1680, y: tableHeight }"
+        :defaultLoadData="false"
+        bordered>
+      </s-table>
+      <div class="btn-con" v-if="uploadData && uploadData.stockImportSn">
+        <a-button
+          id="productInfoList-batchAudit"
+          type="primary"
+          class="button-warning"
+          @click="handleConfirm"
+          style="margin: 0 15px;">确认导入</a-button>
+        <a-button
+          id="productInfoList-batchLaunch"
+          type="primary"
+          class="button-primary"
+          @click="handleCancel"
+          style="margin: 0 15px;">取消导入</a-button>
+        <a-button
+          id="productInfoList-batchDownline"
+          type="primary"
+          class="button-grey"
+          @click="handleExportError"
+          style="margin: 0 15px;">导出错误项</a-button>
+      </div>
+    </a-spin>
+  </a-card>
+</template>
+
+<script>
+import { STable, Upload } from '@/components'
+import { stockImportList, stockImportFinish, stockImportCancel, stockImportExportError } from '@/api/stockImport'
+import moment from 'moment'
+export default {
+  components: { STable, Upload },
+  data () {
+    return {
+      spinning: false,
+      exportLoading: false, // 导出loading
+      tableHeight: 0,
+      queryParam: {}, // 查询参数
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 50, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品品牌', dataIndex: 'productBrandName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '供应商', dataIndex: 'supplierName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品一级分类', dataIndex: 'productTypeName1', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品二级分类', dataIndex: 'productTypeName2', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品三级分类', dataIndex: 'productTypeName3', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库数量', dataIndex: 'putQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '成本价', dataIndex: 'cost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '售价', dataIndex: 'terminalPrice', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '错误原因', dataIndex: 'errorMsg', width: 150, align: 'center', customRender: function (text) { return text || '--' } }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.spinning = true
+        return stockImportList(Object.assign(parameter, { stockImportSn: this.uploadData && this.uploadData.stockImportSn })).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.spinning = false
+          return data
+        })
+      },
+      attachAction: process.env.VUE_APP_API_BASE_URL + '/stockImport/importForSpareParts',
+      uploadParams: {
+        savePathType: 'local'
+      },
+      uploadData: null,
+      filePath: 'https://jianguan-images.oss-cn-beijing.aliyuncs.com/template/ShangHuProductImports.xlsx'
+    }
+  },
+  methods: {
+    // 上传文件  change
+    changeImport (file) {
+      if (file && JSON.parse(file).length > 0) {
+        this.uploadData = JSON.parse(file)[0] || null
+        this.$refs.table.refresh(true)
+      } else {
+        this.uploadData = null
+      }
+    },
+    // 确认导入
+    handleConfirm () {
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '您是否确认导入产品信息?',
+        centered: true,
+        onOk () {
+          _this.spinning = true
+          stockImportFinish({ stockImportSn: _this.uploadData && _this.uploadData.stockImportSn }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.clearTable() //  清空列表数据
+              _this.$refs.importUpload.setFileList() //  清空导入文件
+              _this.uploadData = null //  清空上传数据
+              _this.spinning = false
+            } else {
+              _this.spinning = false
+            }
+          })
+        }
+      })
+    },
+    // 取消导入
+    handleCancel () {
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '您确认取消导入产品的信息?',
+        centered: true,
+        onOk () {
+          _this.spinning = true
+          stockImportCancel({ stockImportSn: _this.uploadData && _this.uploadData.stockImportSn }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.clearTable() //  清空列表数据
+              _this.$refs.importUpload.setFileList() //  清空导入文件
+              _this.uploadData = null //  清空上传数据
+              _this.spinning = false
+            } else {
+              _this.spinning = false
+            }
+          })
+        }
+      })
+    },
+    // 下载模板
+    handleExport () {},
+    // 导出错误项
+    handleExportError () {
+      const _this = this
+      _this.spinning = true
+      stockImportExportError({ stockImportSn: _this.uploadData && _this.uploadData.stockImportSn }).then(res => {
+        _this.spinning = false
+        if (res.type == 'application/json') {
+          var reader = new FileReader()
+          reader.addEventListener('loadend', function () {
+            const obj = JSON.parse(reader.result)
+            _this.$notification.error({
+              message: '提示',
+              description: obj.message
+            })
+          })
+          reader.readAsText(res)
+        } else {
+          this.download(res)
+        }
+      })
+    },
+    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 fname = '散件导入错误项' + moment('YYYY_MMDD')
+      link.setAttribute('download', fname + '.xlsx')
+      document.body.appendChild(link)
+      link.click()
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 400
+    }
+  },
+  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 => {})
+  }
+}
+</script>
+<style lang="less">
+  .bulkImportList-wrap{
+    .table-page-search-wrapper{
+      overflow: hidden;
+      .upload-file{
+        height: auto;
+        margin-bottom: 10px;
+        .ant-btn{
+          background-color: #f30;
+          border-color: #f30;
+          margin: 0 5px;
+          font-size: 12px;
+          color: #fff;
+        }
+      }
+    }
+    .importGuide-con{
+      .explain-con{
+        .explain-item{
+          margin-bottom: 10px;
+          .explain-tit{
+            font-weight: bold;
+            span{
+              display: inline-block;
+              width: 18px;
+              height: 18px;
+              line-height: 16px;
+              text-align: center;
+              margin-right: 5px;
+              border-radius: 50%;
+              border: 1px solid rgba(0, 0, 0, 0.3);
+            }
+          }
+          p{
+            margin: 8px 0;
+            padding-left: 23px;
+          }
+          ul{
+            list-style: none;
+            padding: 0;
+            padding-left: 23px;
+            margin: 0;
+            li{
+              line-height: 26px;
+              font-size: 12px;
+            }
+          }
+        }
+      }
+    }
+    .redBg-row{
+      background-color: #F39494;
+    }
+    .btn-con{
+      text-align: center;
+    }
+  }
+</style>

+ 285 - 0
src/views/inventoryManagement/inventoryImport/list.vue

@@ -0,0 +1,285 @@
+<template>
+  <a-card size="small" :bordered="false" class="bulkImportList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <Upload
+          id="bulkImportList-attachList"
+          ref="importUpload"
+          :maxNums="1"
+          fileType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
+          uploadType="attach"
+          :action="attachAction"
+          :uploadParams="uploadParams"
+          upText="选择导入文件"
+          @change="changeImport"></Upload>
+        <a :href="filePath" style="margin: 5px 0 0 15px;display: block;float: left;">
+          <a-icon type="download" style="padding-right: 5px;" />下载导入模板
+        </a>
+      </div>
+      <div class="importGuide-con">
+        <div class="explain-con">
+          <div class="explain-item">
+            <div class="explain-tit">导入文件说明</div>
+            <ul>
+              <li>1) 导入的EXCEL文件中必须包含名为"产品编码"、"仓库"、"仓位"、"入库数量"、"成本价";列顺序可忽略、行顺序可忽略。以产品编码,仓库,仓位作为导入的是否有效判断依据。</li>
+              <li>2) 红色底白字为错误项,确认入库会忽略错误项入库。</li>
+              <li>3) 上传成功显示产品列表后,第一次以后上传的文件名如果和第一次上传的文件名相同,将不再上传,采取第一次上传的文件,如要重新上传数据,请更改文件名称。</li>
+              <li>4) 入库数量必须大于0,且为正整数,为了保证数据的正确性,请检查上传文件数据无误后再上传操作。</li>
+              <li>5) 成本价为空或者小于零的将读取成本价,读取成本价后成本仍然小于零的将会被忽略导入,如需要导入成本价为零的,请为该件产品并指定成本价为零。</li>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <!-- 列表 -->
+      <s-table
+        class="sTable fixPagination"
+        ref="table"
+        :style="{ height: tableHeight+84.5+'px' }"
+        size="small"
+        :rowClassName="(record, index) => record.isError==1 ? 'redBg-row':''"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ x: 1680, y: tableHeight }"
+        :defaultLoadData="false"
+        bordered>
+      </s-table>
+      <div class="btn-con" v-if="uploadData && uploadData.stockImportSn">
+        <a-button
+          id="productInfoList-batchAudit"
+          type="primary"
+          class="button-warning"
+          @click="handleConfirm"
+          style="margin: 0 15px;">确认导入</a-button>
+        <a-button
+          id="productInfoList-batchLaunch"
+          type="primary"
+          class="button-primary"
+          @click="handleCancel"
+          style="margin: 0 15px;">取消导入</a-button>
+        <a-button
+          id="productInfoList-batchDownline"
+          type="primary"
+          class="button-grey"
+          @click="handleExportError"
+          style="margin: 0 15px;">导出错误项</a-button>
+      </div>
+    </a-spin>
+  </a-card>
+</template>
+
+<script>
+import { STable, Upload } from '@/components'
+import { stockImportList, stockImportFinish, stockImportCancel, stockImportKCExportError } from '@/api/stockImport'
+import moment from 'moment'
+export default {
+  components: { STable, Upload },
+  data () {
+    return {
+      spinning: false,
+      exportLoading: false, // 导出loading
+      tableHeight: 0,
+      queryParam: {}, // 查询参数
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 50, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库数量', dataIndex: 'putQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '成本价', dataIndex: 'cost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '错误原因', dataIndex: 'errorMsg', width: 150, align: 'center', customRender: function (text) { return text || '--' } }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.spinning = true
+        return stockImportList(Object.assign(parameter, { stockImportSn: this.uploadData && this.uploadData.stockImportSn })).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.spinning = false
+          return data
+        })
+      },
+      attachAction: process.env.VUE_APP_API_BASE_URL + '/stockImport/importForStock',
+      uploadParams: {
+        savePathType: 'local'
+      },
+      uploadData: null,
+      filePath: 'https://jianguan-images.oss-cn-beijing.aliyuncs.com/template/StockImports.xlsx'
+    }
+  },
+  methods: {
+    // 上传文件  change
+    changeImport (file) {
+      if (file && JSON.parse(file).length > 0) {
+        this.uploadData = JSON.parse(file)[0] || null
+        this.$refs.table.refresh(true)
+      } else {
+        this.uploadData = null
+      }
+    },
+    // 确认导入
+    handleConfirm () {
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '您是否确认导入库存?',
+        centered: true,
+        onOk () {
+          _this.spinning = true
+          stockImportFinish({ stockImportSn: _this.uploadData && _this.uploadData.stockImportSn }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.clearTable() //  清空列表数据
+              _this.$refs.importUpload.setFileList() //  清空导入文件
+              _this.uploadData = null //  清空上传数据
+              _this.spinning = false
+            } else {
+              _this.spinning = false
+            }
+          })
+        }
+      })
+    },
+    // 取消导入
+    handleCancel () {
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '您确认取消导入库存?',
+        centered: true,
+        onOk () {
+          _this.spinning = true
+          stockImportCancel({ stockImportSn: _this.uploadData && _this.uploadData.stockImportSn }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.clearTable() //  清空列表数据
+              _this.$refs.importUpload.setFileList() //  清空导入文件
+              _this.uploadData = null //  清空上传数据
+              _this.spinning = false
+            } else {
+              _this.spinning = false
+            }
+          })
+        }
+      })
+    },
+    // 下载模板
+    handleExport () {},
+    // 导出错误项
+    handleExportError () {
+      const _this = this
+      _this.spinning = true
+      stockImportKCExportError({ stockImportSn: _this.uploadData && _this.uploadData.stockImportSn }).then(res => {
+        _this.spinning = false
+        if (res.type == 'application/json') {
+          var reader = new FileReader()
+          reader.addEventListener('loadend', function () {
+            const obj = JSON.parse(reader.result)
+            _this.$notification.error({
+              message: '提示',
+              description: obj.message
+            })
+          })
+          reader.readAsText(res)
+        } else {
+          this.download(res)
+        }
+      })
+    },
+    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 fname = '库存导入错误项' + moment('YYYY_MMDD')
+      link.setAttribute('download', fname + '.xlsx')
+      document.body.appendChild(link)
+      link.click()
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 400
+    }
+  },
+  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 => {})
+  }
+}
+</script>
+<style lang="less">
+  .bulkImportList-wrap{
+    .table-page-search-wrapper{
+      overflow: hidden;
+      .upload-file{
+        height: auto;
+        margin-bottom: 10px;
+        .ant-btn{
+          background-color: #f30;
+          border-color: #f30;
+          margin: 0 5px;
+          font-size: 12px;
+          color: #fff;
+        }
+      }
+    }
+    .importGuide-con{
+      .explain-con{
+        .explain-item{
+          margin-bottom: 10px;
+          .explain-tit{
+            font-weight: bold;
+            span{
+              display: inline-block;
+              width: 18px;
+              height: 18px;
+              line-height: 16px;
+              text-align: center;
+              margin-right: 5px;
+              border-radius: 50%;
+              border: 1px solid rgba(0, 0, 0, 0.3);
+            }
+          }
+          p{
+            margin: 8px 0;
+            padding-left: 23px;
+          }
+          ul{
+            list-style: none;
+            padding: 0;
+            padding-left: 23px;
+            margin: 0;
+            li{
+              line-height: 26px;
+              font-size: 12px;
+            }
+          }
+        }
+      }
+    }
+    .redBg-row{
+      background-color: #F39494;
+    }
+    .btn-con{
+      text-align: center;
+    }
+  }
+</style>

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

@@ -0,0 +1,197 @@
+<template>
+  <a-modal
+    centered
+    class="newProductDetail-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="产品详情"
+    v-model="isShow"
+    @cancle="isShow=false"
+    width="80%">
+    <!-- 产品详情 -->
+    <h4>{{ detailsData&&detailsData.name || '--' }}</h4>
+    <div class="productHead">
+      <div class="productInfo">
+        <a-descriptions bordered :column="2" size="small">
+          <a-descriptions-item label="产品品牌:">{{ detailsData&&detailsData.productBrandName || '--' }}</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.name || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="重量:">{{ detailsData&&detailsData.unit || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="计量单位:">{{ detailsData&&detailsData.unit || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="其它编号:">{{ detailsData&&(detailsData.specialPrice || detailsData.specialPrice==0) ? detailsData.specialPrice : '--' }}</a-descriptions-item>
+          <a-descriptions-item label=""></a-descriptions-item>
+          <a-descriptions-item label="适用车型:">{{ productTypeName || '--' }}</a-descriptions-item>
+        </a-descriptions>
+        <div class="productDetail">
+          <h4>产品介绍</h4>
+          <div class="productDesc">
+            阿斯顿发链接撒旦发了就阿斯大幅拉四大佛教萨拉丁撒地方就拉萨撒萨德勒撒旦发了撒打发士大夫了士大夫了撒打发
+          </div>
+        </div>
+      </div>
+      <div class="productImg">
+        <a-carousel arrows>
+          <div
+            slot="prevArrow"
+            slot-scope="props"
+            class="custom-slick-arrow"
+            style="left: 10px;zIndex: 1"
+          >
+            <a-icon type="left-circle" />
+          </div>
+          <div slot="nextArrow" slot-scope="props" class="custom-slick-arrow" style="right: 10px">
+            <a-icon type="right-circle" />
+          </div>
+          <div><img src="../../../assets/avatar2.jpg"></div>
+          <div><img src="../../../assets/avatar2.jpg"></div>
+          <div><img src="../../../assets/avatar2.jpg"></div>
+        </a-carousel>
+        <div class="sycxImg">
+          <p>适用车型图片</p>
+          <div>
+            <img src="../../../assets/avatar2.jpg">
+            <div>江陵凯瑞200</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="btn-cont"><a-button id="product-management-detail-modal-back" @click="isShow = false">返回列表</a-button></div>
+  </a-modal>
+</template>
+
+<script>
+import { productDetail } from '@/api/product.js'
+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 () {
+      productDetail({ sn: 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">
+  /* For demo */
+  .ant-carousel .slick-slide {
+    text-align: center;
+    height: 190px;
+    line-height: 190px;
+    background: #364d79;
+    overflow: hidden;
+  }
+  .ant-carousel .custom-slick-arrow {
+    width: 25px;
+    height: 25px;
+    font-size: 25px;
+    color: #fff;
+    opacity: 0.3;
+  }
+  .ant-carousel .custom-slick-arrow:before {
+    display: none;
+  }
+  .ant-carousel .custom-slick-arrow:hover {
+    opacity: 0.5;
+  }
+  .ant-carousel .slick-slide img {
+    width: 100%;
+    height: 100%;
+  }
+  .newProductDetail-modal{
+    .ant-modal-body {
+      padding: 15px;
+      h4{
+        font-size: 18px;
+      }
+      .productHead{
+        display: flex;
+        .productImg{
+          width: 25%;
+        }
+        .productInfo{
+          flex-grow: 1;
+          margin-right: 10px;
+        }
+        .sycxImg{
+          margin-top: 10px;
+          p{
+            font-size: 14px;
+            padding: 5px 10px;
+            background-color: #dcf1ff;
+          }
+          img{
+            width: 100px;
+          }
+        }
+      }
+      .productDetail{
+        border: 1px solid #eee;
+        margin-top: 10px;
+        h4{
+          font-size: 14px;
+          padding: 5px 10px;
+          background-color: #dcf1ff;
+        }
+        .productDesc{
+          padding: 15px;
+        }
+      }
+    }
+    .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="newProduct-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: '', //  当前产品productSn
+      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.productSn
+      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>

+ 7 - 1
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -500,7 +500,13 @@ export default {
       })
     },
     // 查看产品
-    handlePicDetail (row) {},
+    handlePicDetail (row) {
+      if (row.productMainPic && row.productMainPic.imageUrl) {
+        this.$viewerApi({
+          images: [row.productMainPic.imageUrl.replace('/small/', '/big/')]
+        })
+      }
+    },
     // 上次缺货 导入成功
     hanldeOkOutStock () {
       this.$refs.purchaseTable.refresh(true)

+ 3 - 1
src/views/salesManagement/salesQuery/edit.vue

@@ -242,7 +242,7 @@ export default {
         //  校验库存
         stockByProductSn({ productSn: record.productSn }).then(res => {
           if (res.status == 200 && res.data) {
-            if (res.data.currentStockQty && val > res.data.currentStockQty) {
+            if (res.data.currentStockQty != undefined && val > res.data.currentStockQty) {
               this.$confirm({
                 title: '提示',
                 content: '库存不足,确认添加为急件吗?',
@@ -256,6 +256,8 @@ export default {
                   _this.spinning = false
                 }
               })
+            }else{
+              _this.changeQty(record)
             }
           } else {
             this.spinning = false

+ 7 - 1
src/views/salesManagement/salesQuery/queryPart.vue

@@ -13,7 +13,7 @@
           <a-col :md="7" :sm="24">
             <a-form-model-item label="车架号(VIN)" prop="vinCode">
               <a-input id="productInfoList-vinCode" v-model.trim="queryParam.vinCode" allowClear placeholder="请输入车架号(VIN)">
-                <a-icon @click="uploadFun" type="camera" slot="addonAfter" :style="{ fontSize: '18px', verticalAlign: 'bottom' }" />
+                <a-icon @click="uploadFun" :type="vinLoading?'loading':'camera'" slot="addonAfter" :style="{ fontSize: '18px', verticalAlign: 'bottom' }" />
               </a-input>
               <input type="file" id="filed" hidden="" @change="filePreview">
             </a-form-model-item>
@@ -196,6 +196,7 @@ export default {
     return {
       advanced: false, // 高级搜索 展开/关闭
       showSetting: false, // 设置弹框
+      vinLoading: false,
       tableWidth: 0,
       settingColVal: ['productOrigCode', 'brandName', 'warehouseName', 'warehouseLocationName', 'currentQty', 'unit'],
       settingColList: [
@@ -396,6 +397,7 @@ export default {
       const formData = new FormData()
       formData.append('savePathType', 'local')
       formData.append('file', files)
+      this.vinLoading = true
       vinCodeParse(formData).then(res => {
         if (res.type == 'application/json') {
           var reader = new FileReader()
@@ -411,8 +413,12 @@ export default {
                 description: obj.message
               })
             }
+            _this.vinLoading = false
+            document.getElementById('filed').value = ''
           })
           reader.readAsText(res)
+        } else {
+          _this.vinLoading = false
         }
       })
     },

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

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

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.16.103:8503/qpls-md',
+        // target: 'http://192.168.16.194:8503/qpls-md',
         target: 'http://qpls-md.360arrow.com.cn/qpls-md', //  Ô¤·¢²¼
         // target: 'http://qpls-md.360arrow.com/qpls-md', //  Éú²ú
         // ws: false,