Bladeren bron

导入产品

lilei 2 jaren geleden
bovenliggende
commit
b97dcc0b1a

BIN
public/templ/店内调出产品导入模板.xls


+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1681439623582
+  "version": 1681979830847
 }

+ 25 - 0
src/api/sparePartsRet.js

@@ -146,3 +146,28 @@ export const sparePartsRetDetailClear = (params) => {
     method: 'post'
   })
 }
+// 产品导入数据
+export const sparePartsRetDetailImport = params => {
+  return axios({
+    url: '/sparePartsRet/detail/import',
+    data: params,
+    method: 'post'
+  })
+}
+// 产品信息批量导入
+export const sparePartsRetDetailBatchSave = (params) => {
+  return axios({
+    url: '/sparePartsRet/detail/saveImportDetail',
+    data: params,
+    method: 'post'
+  })
+}
+// 导出错误项
+export const sparePartsRetDetailImportError = (params) => {
+  return axios({
+    url: '/sparePartsRet/detail/exportImportError',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}

+ 1 - 1
src/api/stockOut.js

@@ -34,4 +34,4 @@ export const stockOutDetailList = (params) => {
     data: params,
     method: 'post'
   })
-}
+}

+ 25 - 0
src/api/storeCallOut.js

@@ -119,3 +119,28 @@ export const storeCallOutDetailPrint = params => {
   }
   return axios.request(data)
 }
+// 产品导入数据
+export const storeCallOutDetailImport = params => {
+  return axios({
+    url: '/storeCallOut/detail/import',
+    data: params,
+    method: 'post'
+  })
+}
+// 产品信息批量导入
+export const storeCallOutDetailBatchSave = (params) => {
+  return axios({
+    url: '/storeCallOut/detail/saveBatch',
+    data: params,
+    method: 'post'
+  })
+}
+// 导出错误项
+export const storeCallOutDetailImportError = (params) => {
+  return axios({
+    url: '/storeCallOut/detail/exportImportError',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}

+ 196 - 0
src/views/allocationManagement/storeTransferOut/chooseImportModal.vue

@@ -0,0 +1,196 @@
+<template>
+  <a-modal
+    centered
+    class="chooseImport-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="确认导入"
+    v-model="isShow"
+    @cancel="isShow=false"
+    width="80%">
+    <div class="chooseImport-con">
+      <!-- 可导入数据 -->
+      <p class="">可导入数据{{ loadData.length }}条</p>
+      <a-table
+        class="sTable"
+        ref="table"
+        size="small"
+        :rowKey="(record) => record.allocateSn"
+        :columns="nowColumns"
+        :dataSource="loadData"
+        :loading="loading"
+        :scroll="{ y: 200 }"
+        :pagination="false"
+        bordered>
+      </a-table>
+      <a-divider />
+      <!-- 不可导入数据 -->
+      <p class="red">不可导入数据{{ unLoadData.length }}条</p>
+      <a-table
+        class="unTable"
+        ref="unTable"
+        size="small"
+        :rowKey="(record) => record.errorDesc"
+        :columns="nowUnColumns"
+        :dataSource="unLoadData"
+        :loading="loading"
+        :scroll="{ y: 200 }"
+        :pagination="false"
+        bordered>
+        <template slot="errorMsg" slot-scope="text,record">
+          <a-popover placement="topRight">
+            <template slot="content">
+              <p v-for="d in record.importErrorMsgSet">{{ d }}</p>
+            </template>
+            <a-button type="link">
+              查看
+            </a-button>
+          </a-popover>
+        </template>
+      </a-table>
+      <!-- 按钮 -->
+      <div class="btn-con">
+        <a-button
+          type="primary"
+          id="chooseImport-submit"
+          size="large"
+          :class="loadData.length==0?'button-grey':'button-primary'"
+          @click="handleSubmit"
+          style="padding: 0 40px;">确认导入</a-button>
+        <a-button
+          id="chooseImport-cancel"
+          size="large"
+          class="button-cancel"
+          @click="isShow=false"
+          style="padding: 0 40px;margin-left: 15px;">取消</a-button>
+        <a-button
+          type="primary"
+          id="chooseImport-error"
+          size="large"
+          class="button-error"
+          @click="handleError"
+          style="padding: 0 40px;margin-left: 15px;">导出错误项</a-button>
+      </div>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import { hdExportExcel } from '@/libs/exportExcel'
+import { storeCallOutDetailImportError } from '@/api/storeCallOut.js'
+export default {
+  name: 'ChooseImportModal',
+  mixins: [commonMixin],
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    paramsData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  data () {
+    const _this = this
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      nowColumns: [
+        { title: '序号', dataIndex: 'no', width: '8%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '22%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'productUnit', align: 'center', width: '10%', customRender: function (text) { return text || '--' } },
+        { title: '调出数量', dataIndex: 'qtyStr', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
+      ],
+      loadData: [],
+      nowUnColumns: [
+        { title: '序号', dataIndex: 'no', width: '8%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '22%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调出数量', dataIndex: 'qtyStr', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '错误说明', scopedSlots: { customRender: 'errorMsg' }, width: '20%', align: 'center' }
+      ],
+      unLoadData: [],
+      loading: false
+    }
+  },
+  methods: {
+    getData () {
+      const paramsData = JSON.parse(JSON.stringify(this.paramsData))
+      this.loadData = paramsData.rightList || []
+      this.unLoadData = paramsData.errorList || []
+      this.loadData.map((item, index) => {
+        item.no = index + 1
+        item.storeCallOutSn = paramsData.storeCallOutSn
+      })
+      this.unLoadData.map((item, index) => {
+        item.no = index + 1
+        item.storeCallOutSn = paramsData.storeCallOutSn
+        item.importErrorMsgSet = item.remarks.split(',')
+      })
+    },
+    // 确认导入
+    handleSubmit () {
+      if (this.paramsData.rightList.length == 0) {
+        this.$message.warning('无可导入的产品!')
+      } else {
+        const data = this.paramsData.rightList
+        
+        this.$emit('ok', data)
+        this.isShow = false
+      }
+    },
+    // 导出
+    handleError () {
+      const _this = this
+      if (_this.paramsData.errorList.length < 1) {
+        _this.$message.info('暂无可导出错误项~')
+        return
+      }
+      _this.spinning = true
+      hdExportExcel(storeCallOutDetailImportError, _this.paramsData.errorList, '店内调出导入产品错误项', function () {
+        _this.spinning = false
+      })
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+        this.loadData = []
+        this.unLoadData = []
+      } else {
+        this.getData()
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .chooseImport-modal{
+    .chooseImport-con{
+      .red{
+        color: #f30;
+      }
+      .btn-con{
+        text-align: center;
+        margin: 30px 0 20px;
+        .button-cancel,.button-error{
+          font-size: 12px;
+        }
+      }
+    }
+  }
+</style>

+ 21 - 3
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -168,7 +168,11 @@
                 </div>
               </a-col>
               <a-col :span="4" style="text-align: right;">
-                <!-- <a-button size="small" id="storeTransferOutEdit-import-btn">导入明细</a-button> -->
+                <a-button
+                  type="default"
+                  @click="openGuideModal=true"
+                  style="margin-right:5px;"
+                  id="salesEdit-import">导入产品</a-button>
               </a-col>
             </a-row>
             <!-- 列表 -->
@@ -213,6 +217,8 @@
         </a-collapse>
         <!-- 出入库明细 -->
         <outInDetialModal ref="outInDetialModal" outBizType="SHOP_CALL_OUT" :openModal="showOutInModal" @close="showOutInModal=false"></outInDetialModal>
+        <!-- 导入产品 -->
+        <importGuideModal :params="{storeCallOutSn: $route.params.sn}" :openModal="openGuideModal" @close="openGuideModal=false" @ok="importOk" />
       </div>
     </a-spin>
     <div class="affix-cont">
@@ -232,22 +238,24 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { getOperationalPrecision } from '@/libs/tools.js'
-import { storeCallOutDetailList, storeCallOutDetailSn, storeCallOutDetailCount, storeCallOutDetailSave, storeCallOutDetailDel, storeCallOutSubmit, storeCallOutDetailPrint } from '@/api/storeCallOut'
+import { storeCallOutDetailList, storeCallOutDetailSn, storeCallOutDetailCount, storeCallOutDetailSave, storeCallOutDetailDel, storeCallOutSubmit, storeCallOutDetailPrint, storeCallOutDetailBatchSave } from '@/api/storeCallOut'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
 import { warehouseAllList } from '@/api/warehouse'
 import { productQuery } from '@/api/allocWarehouse'
 import Print from '@/views/common/print.vue'
+import importGuideModal from './importGuideModal.vue'
 import outInDetialModal from '@/views/common/outInDetialModal.vue'
 import { hdPrint } from '@/libs/JGPrint'
 export default {
   name: 'StoreCallOutEdit',
-  components: { STable, VSelect, Print, ProductType, ProductBrand, outInDetialModal },
+  components: { STable, VSelect, Print, ProductType, ProductBrand, outInDetialModal, importGuideModal },
   mixins: [commonMixin],
   data () {
     return {
       spinning: false,
       showOutInModal: false,
+      openGuideModal: false,
       queryParam: {
         productCode: '',
         productName: '',
@@ -389,6 +397,16 @@ export default {
       this.chooseQueryParam.productName = ''
       this.$refs.chooseTable.refresh(true)
     },
+    // 确认导入明细
+    importOk(data){
+      this.spinning = true
+      storeCallOutDetailBatchSave(data).then(res => {
+        if(res.status == 200){
+          this.chooseResetSearchForm()
+        }
+        this.spinning = false
+      })
+    },
     // 基本信息
     getDetail () {
       storeCallOutDetailSn({ sn: this.$route.params.sn }).then(res => {

+ 196 - 0
src/views/allocationManagement/storeTransferOut/importGuideModal.vue

@@ -0,0 +1,196 @@
+<template>
+  <a-modal
+    centered
+    class="importGuide-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="导入产品"
+    v-model="isShow"
+    @cancel="isShow=false"
+    :width="800">
+    <div class="importGuide-con">
+      <div class="explain-con">
+        <div class="explain-item">
+          <div class="explain-tit">
+            <span>1</span>准备导入
+          </div>
+          <ul>
+            <li>1) 导入的Excel文件中必须包含名为“产品编码”、“仓库”、“仓位”、“调出数量”的列,且名称必须要相同,其它列可自定义,不影响数据导入</li>
+            <li>2) 如果导入的产品已经存在,则不会导入该行</li>
+            <li>
+              <a :href="filePath" style="margin: 5px 0 0;display: block;">
+                <a-icon type="download" style="padding-right: 5px;" />下载导入模板
+              </a>
+            </li>
+          </ul>
+        </div>
+        <div class="explain-item">
+          <div class="explain-tit">
+            <span>2</span>上传数据文件
+          </div>
+          <p>目前支持的文件类型*.xls,*.xlsx.</p>
+          <div style="overflow: hidden;padding-left: 23px;">
+            <Upload
+              id="importGuide-attachList"
+              ref="importUpload"
+              :maxNums="1"
+              fileType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
+              uploadType="attach"
+              :action="attachAction"
+              :uploadParams="uploadParams"
+              upText="选择导入文件"
+              @remove="resetSearchForm"
+              @change="changeImport"></Upload>
+          </div>
+        </div>
+      </div>
+      <!-- 按钮 -->
+      <div class="btn-con">
+        <a-button
+          type="primary"
+          id="importGuide-nextStep"
+          size="large"
+          class="button-primary"
+          @click="handlerNextStep"
+          style="padding: 0 60px;">下一步</a-button>
+        <a-button
+          id="importGuide-cancel"
+          size="large"
+          class="button-cancel"
+          @click="isShow=false"
+          style="padding: 0 60px;margin-left: 15px;">取消</a-button>
+      </div>
+    </div>
+    <!-- 导入 -->
+    <chooseImportModal :openModal="openImportModal" :paramsData="paramsData" @close="handleClose" @ok="hanldeOk" />
+  </a-modal>
+</template>
+
+<script>
+import ChooseImportModal from './chooseImportModal.vue'
+import { Upload } from '@/components'
+export default {
+  name: 'ImportGuideModal',
+  components: { ChooseImportModal, Upload },
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    params: {
+      type: Object,
+      default: null
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      openImportModal: false, //  导入
+      attachAction: process.env.VUE_APP_API_BASE_URL + '/storeCallOut/detail/import',
+      paramsData: null,
+      uploadParams: {
+        savePathType: 'local',
+        storeCallOutSn: this.params.storeCallOutSn
+      },
+      filePath: location.protocol + '//' +location.host + '/templ/店内调出产品导入模板.xlsx'
+    }
+  },
+  methods: {
+    // 清空数据
+    resetSearchForm () {
+      this.$refs.importUpload.setFileList() //  清空导入文件
+      this.paramsData = null //  清空上传数据
+    },
+    // 下一步
+    handlerNextStep () {
+      if (this.paramsData) {
+        this.openImportModal = true
+      } else {
+        this.$message.warning('添加文件后再进行下一步操作!')
+      }
+    },
+    // 上传文件  change
+    changeImport (file) {
+      // console.log(file, JSON.parse(file))
+      if (file && JSON.parse(file).length > 0) {
+        this.paramsData = Object.assign({}, JSON.parse(file)[0] || null, this.params)
+      } else {
+        this.paramsData = null
+      }
+    },
+    // 导入
+    hanldeOk (obj) {
+      if (obj && obj.length > 0) {
+        this.$emit('ok', obj)
+        this.isShow = false
+      }
+    },
+    // 关闭
+    handleClose () {
+      this.openImportModal = false
+      this.isShow = false
+    },
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+        this.resetSearchForm()
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .importGuide-modal{
+    .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;
+            }
+          }
+        }
+        #importGuide-attachList{
+          width: 100%;
+        }
+      }
+      .btn-con{
+        margin: 10px 0 20px;
+        text-align: center;
+        .button-cancel{
+          font-size: 12px;
+        }
+      }
+    }
+  }
+</style>

+ 17 - 21
src/views/bulkManagement/bulkReturnGoods/chooseImportModal.vue

@@ -15,7 +15,8 @@
         class="sTable"
         ref="table"
         size="small"
-        :rowKey="(record) => record.allocateSn"
+        :rowKey="(record) => record.no"
+        rowKeyName="no"
         :columns="nowColumns"
         :dataSource="loadData"
         :loading="loading"
@@ -30,7 +31,8 @@
         class="unTable"
         ref="unTable"
         size="small"
-        :rowKey="(record) => record.errorDesc"
+        :rowKey="(record) => record.no"
+        rowKeyName="no"
         :columns="nowUnColumns"
         :dataSource="unLoadData"
         :loading="loading"
@@ -40,7 +42,7 @@
         <template slot="errorMsg" slot-scope="text,record">
           <a-popover placement="topRight">
             <template slot="content">
-              <p v-for="d in record.importErrorMsgSet">{{ d }}</p>
+              <p v-for="d in record.errorMsgList">{{ d }}</p>
             </template>
             <a-button type="link">
               查看
@@ -78,7 +80,7 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { hdExportExcel } from '@/libs/exportExcel'
-import { salesDetailFailExcel } from '@/api/salesDetail'
+import { sparePartsRetDetailImportError } from '@/api/sparePartsRet'
 export default {
   name: 'ChooseImportModal',
   mixins: [commonMixin],
@@ -104,9 +106,9 @@ export default {
         { title: '产品名称', dataIndex: 'productName', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '售价', dataIndex: 'importPrice', width: '14%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '数量', dataIndex: 'importQty', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单位', dataIndex: 'importProductUnit', align: 'center', width: '15%', customRender: function (text) { return text || '--' } }
+        { title: '单位', dataIndex: 'productUnit', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },
+        { title: '退货单价', dataIndex: 'returnPriceStr', width: '14%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '退货数量', dataIndex: 'returnQtyStr', width: '14%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       loadData: [],
       nowUnColumns: [
@@ -114,8 +116,8 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '售价', dataIndex: 'importPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '数量', dataIndex: 'importQty', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货单价', dataIndex: 'returnPriceStr', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '退货数量', dataIndex: 'returnQtyStr', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '错误说明', scopedSlots: { customRender: 'errorMsg' }, width: '10%', align: 'center' }
       ],
       unLoadData: [],
@@ -125,29 +127,23 @@ export default {
   methods: {
     getData () {
       const paramsData = JSON.parse(JSON.stringify(this.paramsData))
-      this.loadData = paramsData.rightList || []
+      this.loadData = paramsData.rigthList || []
       this.unLoadData = paramsData.errorList || []
       this.loadData.map((item, index) => {
         item.no = index + 1
-        item.salesBillNo = paramsData.salesBillNo
-        item.salesBillSn = paramsData.salesBillSn
+        item.sparePartsReturnSn = paramsData.sparePartsReturnSn
       })
       this.unLoadData.map((item, index) => {
         item.no = index + 1
-        item.salesBillNo = paramsData.salesBillNo
-        item.salesBillSn = paramsData.salesBillSn
+        item.sparePartsReturnSn = paramsData.sparePartsReturnSn
       })
     },
     // 确认导入
     handleSubmit () {
-      if (this.paramsData.rightList.length == 0) {
+      if (this.paramsData.rigthList.length == 0) {
         this.$message.warning('无可导入的产品!')
       } else {
-        const data = this.paramsData.rightList
-        data.map(item => {
-          item.salesBillNo = this.paramsData.salesBillNo
-          item.salesBillSn = this.paramsData.salesBillSn
-        })
+        const data = this.paramsData.rigthList
         this.$emit('ok', data)
         this.isShow = false
       }
@@ -160,7 +156,7 @@ export default {
         return
       }
       _this.spinning = true
-      hdExportExcel(salesDetailFailExcel, _this.paramsData.errorList, '销售产品导出错误项', function () {
+      hdExportExcel(sparePartsRetDetailImportError, _this.paramsData.errorList, '散件入库(不抓单)产品导出错误项', function () {
         _this.spinning = false
       })
     }

+ 3 - 2
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -226,7 +226,8 @@ import {
   sparePartsRetSubmit,
   sparePartsRetDetailPrint,
   sparePartsRetDetailExport,
-  sparePartsRetDetailClear } from '@/api/sparePartsRet'
+  sparePartsRetDetailClear,
+  sparePartsRetDetailBatchSave } from '@/api/sparePartsRet'
 export default {
   name: 'BulkReturnGoodsEdit',
   components: { STable, VSelect, Print, importGuideModal },
@@ -329,7 +330,7 @@ export default {
     // 确认导入明细
     hanldeImprotOk (obj) {
       this.spinning = true
-      salesDetailInsertImport(obj).then(res => {
+      sparePartsRetDetailBatchSave(obj).then(res => {
         if (res.status == 200) {
           this.chooseResetSearchForm()
         }

+ 1 - 1
src/views/bulkManagement/bulkReturnGoods/grabEdit.vue

@@ -219,7 +219,7 @@ export default {
       // 表头
       columns: [
         { title: '散件入库单号', dataIndex: 'sparePartsPurchaseNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '入库时间', dataIndex: 'createDate', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库时间', dataIndex: 'putStockTime', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库价格', dataIndex: 'putCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },

+ 3 - 3
src/views/bulkManagement/bulkReturnGoods/importGuideModal.vue

@@ -15,7 +15,7 @@
             <span>1</span>准备导入
           </div>
           <ul>
-            <li>1) 导入的Excel文件中必须包含名为“产品编码”、“仓库”、“仓位”、“售价”、“数量”的列,且名称必须相同,其它列可自定义,不影响数据导入</li>
+            <li>1) 导入的Excel文件中必须包含名为“产品编码”、“退货单价”、“仓库”、“仓位”、“退货数量”的列,且名称必须要相同,其它列可自定义,不影响数据导入</li>
             <li>2) 如果导入的产品已经存在,则不会导入该行</li>
             <li>
               <a :href="filePath" style="margin: 5px 0 0;display: block;">
@@ -86,11 +86,11 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       openImportModal: false, //  导入
-      attachAction: process.env.VUE_APP_API_BASE_URL + '/salesDetail/importDetail',
+      attachAction: process.env.VUE_APP_API_BASE_URL + '/sparePartsRet/detail/import',
       paramsData: null,
       uploadParams: {
         savePathType: 'local',
-        salesBillSn: this.params.salesBillSn
+        sparePartsReturnSn: this.params.sparePartsReturnSn
       },
       filePath: location.protocol + '//' +location.host + '/templ/散件退货产品导入模板.xlsx'
     }

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.103/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.2.113:8550/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,