Browse Source

Merge branch 'develop_cuxiao' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

chenrui 1 year ago
parent
commit
0b99d6c376

+ 1 - 1
src/api/salesDetailNew.js

@@ -52,7 +52,7 @@ export const salesBatchInsert = (params) => {
 }
 //  销售 导入产品 导出错误项
 export const salesFailExcel = (params) => {
-  const url = `/salesn/detail/downloadFailExcel`
+  const url = `/salesn/detail/exportImportError`
   return axios.request({
     url: url,
     method: 'post',

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/activeQueryPart.vue

@@ -64,7 +64,7 @@
       :customRow="handleClickRow"
       :scroll="{ y: tableHeight }"
       :defaultLoadData="false"
-      pageSize="50"
+      :pageSize="50"
       bordered>
       <!-- 销售数量 -->
       <template slot="nums" slot-scope="text, record">

+ 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/salesDetail'
+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
       },

+ 15 - 5
src/views/salesManagement/salesQueryNew/edit.vue

@@ -47,7 +47,7 @@
           <span style="margin-left:20px;color:#00aaff;cursor: pointer;"  @click="(event) => {showDesc(event, item)}">
             <a-icon title="查看活动详情" type="eye"/> 活动详情
           </span>
-          <span style="margin:0 20px;color:#ff0800;cursor: pointer;" @click="(event) => {disabledActive(event, item.promoRuleSn)}">
+          <span style="margin:0 20px;color:#ff0800;cursor: pointer;" @click="(event) => {disabledActive(event, item)}">
             <a-icon title="禁用规则" type="disconnect"/> 禁用规则
           </span>
         </div>
@@ -133,6 +133,7 @@ import productList from './comps/productList.vue'
 import productNormalList from './comps/productNormalList.vue'
 import chooseProduct from './comps/chooseProduct.vue'
 import setPriceModal from './setPriceModal.vue'
+import { salesDisablePromo } from '@/api/salesDetailNew'
 import { salesDetailBySn, salesWriteSubmit, submitCheck, updateBatch, salesPromoQueryList } from '@/api/salesNew'
 export default {
   name: 'SalesNewEdit',
@@ -293,7 +294,7 @@ export default {
       row&&row.showDesc(item.promotionRule)
     },
     // 禁用活动
-    disabledActive(e,id){
+    disabledActive(e,item){
       const _this = this
       this.$confirm({
         title: '确定禁用规则?',
@@ -303,10 +304,10 @@ export default {
           <div style="padding:10px 0;text-align:center;">禁用规则后,将无法享受该活动规则优惠</div>
           <div style="padding:0 0 10px 0;text-align:center;">
             <aRadioGroup onChange={_this.changeDaOpt}>
-              <aRadio style="display:block;height: '30px';lineHeight: '30px';padding:5px 0;" value="1">
+              <aRadio style="display:block;height: '30px';lineHeight: '30px';padding:5px 0;" value="DELETE">
                 删除规则中相关产品
               </aRadio>
-              <aRadio style="display:block;height: '30px';lineHeight: '30px';padding:5px 0;" value="2">
+              <aRadio style="display:block;height: '30px';lineHeight: '30px';padding:5px 0;" value="REMOVE">
                 移出规则中相关产品
               </aRadio>
             </aRadioGroup>
@@ -314,7 +315,16 @@ export default {
         </div>,
         onOk() {
           if(_this.disabledActiveOption){
-            _this.disabledActiveOption = null
+            salesDisablePromo({
+              salesBillSn: _this.salesBillSn,
+              salesPromoSn: item.promo.salesPromoSn,
+              salesDisableType: _this.disabledActiveOption
+            }).then(res => {
+              if(res.status == 200){
+                _this.$refs[item.promoRuleSn][0].resetSearchForm()
+                _this.disabledActiveOption = null
+              }
+            })
           }else{
             _this.$message.info("请选择如何禁用规则!")
             return true