lilei 1 tahun lalu
induk
melakukan
c021650c3d

+ 11 - 25
src/views/salesManagement/salesQueryNew/comps/chooseImportModal.vue

@@ -68,7 +68,7 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { hdExportExcel } from '@/libs/exportExcel'
-import { salesParseProducts, salesFailExcel } from '@/api/salesDetailNew'
+import { salesFailExcel } from '@/api/salesDetailNew'
 export default {
   name: 'SalesChooseImportModal',
   mixins: [commonMixin],
@@ -105,7 +105,7 @@ export default {
         { title: '数量', dataIndex: 'qtyText', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '库存', dataIndex: 'stockQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'productEntity.unit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '备注', dataIndex: 'errorDesc', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '备注', dataIndex: 'importErrorMsgSet', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       unLoadData: [],
       loading: false
@@ -113,29 +113,15 @@ export default {
   },
   methods: {
     getData () {
-      const _this = this
-      this.loading = true
-      const params = {
-        salesBillSn: this.paramsData.salesBillSn,
-        path: this.paramsData.path,
-        salesPromoSn: this.paramsData.salesPromoSn
-      }
-      salesParseProducts(params).then(res => {
-        this.loading = false
-        if (res.status == 200) {
-          if (res.data.okList && res.data.okList.length > 0) {
-            res.data.okList.map((item, index) => {
-              item.no = index + 1
-            })
-          }
-          if (res.data.failList && res.data.failList.length > 0) {
-            res.data.failList.map((item, index) => {
-              item.no = index + 1
-            })
-          }
-          _this.loadData = res.data.okList || []
-          _this.unLoadData = res.data.failList || []
-        }
+      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
+      })
+      this.unLoadData.map((item, index) => {
+        item.no = index + 1
+        item.importErrorMsgSet = item.remarks.split(',')
       })
     },
     // 确认导入

+ 8 - 7
src/views/salesManagement/salesQueryNew/comps/importGuideModal.vue

@@ -90,10 +90,12 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       openImportModal: false, //  导入
-      attachAction: process.env.VUE_APP_API_BASE_URL + '/upload',
+      attachAction: process.env.VUE_APP_API_BASE_URL + '/salesn/detail/importParse',
       paramsData: null,
       uploadParams: {
-        savePathType: 'local'
+        salesBillSn: this.params.salesBillSn,
+        salesPromoSn: this.params.salesPromoSn||'', 
+        promoProductClz: this.params.promoProductClz||''
       },
       exportLoading: false,
       filePath: location.protocol + '//' + location.host + '/templ/销售导入产品模板.xlsx'
@@ -110,12 +112,11 @@ export default {
     },
     // 上传文件  change
     changeImport (file) {
+      console.log(file)
       if (file) {
-        this.paramsData = {
-          salesBillSn: this.params.salesBillSn || '',
-          salesPromoSn: this.params.salesPromoSn,
-          path: file
-        }
+        this.paramsData = Object.assign({}, file || null, this.params)
+      } else {
+        this.paramsData = null
       }
     },
     // 导入

+ 6 - 1
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -229,7 +229,11 @@
     </s-table>
     
       <!-- 导入产品 -->
-      <importGuideModal :openModal="openGuideModal" :params="{salesBillSn: $route.params.sn, salesPromoSn: promo.salesPromoSn}" @close="closeGuideModel" @ok="hanldeImportOk" />
+      <importGuideModal 
+      :openModal="openGuideModal" 
+      :params="{salesBillSn: $route.params.sn, salesPromoSn: promo.salesPromoSn, promoProductClz:promoProductClz}" 
+      @close="closeGuideModel" 
+      @ok="hanldeImportOk" />
       <!-- 仓库设置 -->
       <setWarehouse :show="openWarehouseModal" @ok="chooseWarehouseOk" @cancel="openWarehouseModal=false"></setWarehouse>
       <!-- 换促销 -->
@@ -616,6 +620,7 @@
       },
       // 导入产品
       handleImportClick(e){
+        console.log(e)
         this.openGuideModal = true
         this.promoProductClz = e.key
       },