Sfoglia il codice sorgente

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

chenrui 1 anno fa
parent
commit
24abc68bf8

+ 4 - 4
src/views/common/custList.vue

@@ -92,11 +92,11 @@ export default {
         if (fetchId !== this.lastFetchId) {
           return
         }
-        this.data = res.data && res.data.list ? res.data.list : []
+        const list = res.data && res.data.list ? res.data.list : []
         const notSn = []
-        this.notDealerSn.map(item => { notSn.push(item.parentDealerSn) })
-        this.data = this.data.filter(item => item.dealerLevel && !this.notDealerType.includes(item.dealerLevel))
-        this.data = this.data.filter(item => !notSn.includes(item.dealerSn))
+        console.log(this.notDealerSn)
+        this.notDealerSn.filter(item => !!item).map(item => { notSn.push(item.parentDealerSn) })
+        this.data = list.filter(item => !notSn.includes(item.dealerSn)).filter(item => item.dealerLevel && !this.notDealerType.includes(item.dealerLevel))
         this.fetching = false
       })
     },

+ 6 - 4
src/views/dealerManagement/rebateBinding/priceDiffModal.vue

@@ -28,8 +28,8 @@
                 <custList
                   v-if="!form.dealerUpsSn || isSpecial"
                   ref="custList"
-                  :notDealerSn="notZdDealer"
-                  :notDealerType="isSpecial?[]:['SPECIAL']"
+                  :notDealerSn="notDealer"
+                  :notDealerType="['SPECIAL']"
                   @change="custSupChange"
                   placeholder="请输入经销商名称搜索"></custList>
                 <a-input v-else :value="superDealerName" disabled />
@@ -168,9 +168,11 @@ export default {
     isSpecial () {
       return this.detailData && this.detailData.dealerLevel == 'SPECIAL'
     },
-    notZdDealer () {
-      // ...this.checkedDealerSn
+    notDealer () {
       return this.form.rebateDealerList.concat(this.zdDealearList).concat([{ 'parentDealerSn': this.form.dealerSn }])
+    },
+    notZdDealer () {
+      return this.form.rebateDealerList.concat(this.zdDealearList)
     }
   },
   methods: {

+ 18 - 18
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -35,7 +35,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="客户名称">
-                <dealerSubareaScopeList id="priceDifferenceDetailList-custList" ref="custList" :itemSn="queryParam.dealerSn" @change="custChange"></dealerSubareaScopeList>
+                <dealerSubareaScopeList id="priceDifferenceDetailList-custList" ref="custList" :itemSn="queryParam.buyerSn" @change="custChange"></dealerSubareaScopeList>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
@@ -79,17 +79,17 @@
           <template slot="footer">
             <table>
               <tr>
-                <td width="51%" colspan="4"></td>
-                <td width="8%">
+                <td width="41%" colspan="4">总计:</td>
+                <td width="8%" align="right">
                   <div>实售金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</div>
                 </td>
-                <td width="8%">
+                <td width="8%" align="right">
                   <div>开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</div>
                 </td>
-                <td width="8%">
-                  <div>差价金额:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</div>
+                <td width="8%" align="right">
+                  <div>差价金额:{{ (totalData && (totalData.directRebateAmount || totalData.directRebateAmount==0)) ? toThousands(totalData.directRebateAmount) : '--' }}</div>
                 </td>
-                <td width="25%" colspan="2"></td>
+                <td width="34%" colspan="3"></td>
               </tr>
             </table>
           </template>
@@ -127,8 +127,8 @@ export default {
       queryParam: { //  查询条件
         month: moment().format('YYYY-MM'),
         provinceSn: undefined,
-        rebateDealerSn: undefined,
-        dealerSn: undefined,
+        parentDealerSn: undefined,
+        buyerSn: undefined,
         bizUserSn: undefined
       },
       rules: {
@@ -168,17 +168,17 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '月份', dataIndex: 'month', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '月份', dataIndex: 'bizDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'provinceName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '记账门店', dataIndex: 'rebateDealerName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '客户名称', dataIndex: 'dealerName', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '记账门店', dataIndex: 'parentDealerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'buyerName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品品牌+二级分类', dataIndex: 'productBrandAndType2', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '类型', dataIndex: 'bizType', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       arr.splice(4, 0, { title: '实售金额', dataIndex: 'totalRealAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       arr.splice(5, 0, { title: '开单金额', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      arr.splice(6, 0, { title: '差价金额', dataIndex: 'rebateAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      arr.splice(7, 0, { title: '记账费用', dataIndex: 'rebateAmount1', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      arr.splice(6, 0, { title: '差价金额', dataIndex: 'directRebateAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      arr.splice(7, 0, { title: '记账费用', dataIndex: 'rebateAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       return arr
     }
   },
@@ -212,17 +212,17 @@ export default {
       })
     },
     rebateDealerChange (val) {
-      this.queryParam.rebateDealerSn = val.key
+      this.queryParam.parentDealerSn = val.key
     },
     custChange (val) {
-      this.queryParam.dealerSn = val.key
+      this.queryParam.buyerSn = val.key
     },
     //  重置
     resetSearchForm () {
       this.queryParam.month = moment().format('YYYY-MM')
       this.queryParam.provinceSn = undefined
-      this.queryParam.rebateDealerSn = undefined
-      this.queryParam.dealerSn = undefined
+      this.queryParam.parentDealerSn = undefined
+      this.queryParam.buyerSn = undefined
       this.queryParam.bizUserSn = undefined
       this.$refs.rebateDealerList.resetForm()
       this.totalData = null

+ 13 - 5
src/views/reportData/productRebateReport/detailList.vue

@@ -20,8 +20,13 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="单号">
-                <a-input id="srebateReport-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入单号"/>
+              <a-form-model-item label="订单号">
+                <a-input id="srebateReport-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入订单号"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="备货单号">
+                <a-input id="srebateReport-bizSubNo" v-model.trim="queryParam.bizSubNo" allowClear placeholder="请输入备货单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -40,13 +45,13 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="类型">
+              <a-form-model-item label="单据类型">
                 <v-select
                   v-model="queryParam.bizType"
                   ref="bizType"
                   id="srebateReport-bizType"
                   code="REBATE_BILL_BIZ_TYPE"
-                  placeholder="请选择类型"
+                  placeholder="请选择单据类型"
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
@@ -142,6 +147,7 @@ export default {
         endDate: '',
         buyerSn: undefined, // 客户sn
         bizNo: '', // 单号
+        bizSubNo: '',
         bizType: undefined,
         directDealerSn: undefined, // 直接经销商SN
         indirectDealerSn: undefined, // 间接经销商SN
@@ -194,7 +200,8 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '60px', align: 'center' },
         { title: '订单号', dataIndex: 'bizNo', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '类型', dataIndex: 'bizTypeDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备货单号', dataIndex: 'bizSubNo', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户级别', dataIndex: 'buyerLevelDictValue', width: '90px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '差价归属方', dataIndex: 'parentDealerName', width: '130px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -279,6 +286,7 @@ export default {
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.bizNo = ''
+      this.queryParam.bizSubNo = ''
       this.queryParam.bizType = undefined
       this.queryParam.buyerSn = undefined
       this.queryParam.indirectDealerSn = undefined

+ 8 - 8
src/views/reportData/productRebateReport/list.vue

@@ -20,8 +20,8 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="单号">
-                <a-input id="srebateReport-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入单号"/>
+              <a-form-model-item label="单号">
+                <a-input id="srebateReport-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -40,13 +40,13 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="类型">
+              <a-form-model-item label="单据类型">
                 <v-select
                   v-model="queryParam.bizType"
                   ref="bizType"
                   id="srebateReport-bizType"
                   code="REBATE_BILL_BIZ_TYPE"
-                  placeholder="请选择类型"
+                  placeholder="请选择单据类型"
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
@@ -186,10 +186,10 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '订单号', dataIndex: 'bizNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '类型', dataIndex: 'bizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户级别', dataIndex: 'buyerLevelDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'buyerName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '订单号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户级别', dataIndex: 'buyerLevelDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'buyerName', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '总开单金额', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '直接差价金额', dataIndex: 'directRebate', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '间接差价金额', dataIndex: 'indirectRebate', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },