lilei vor 1 Jahr
Ursprung
Commit
b6d3eba475

+ 8 - 0
src/views/reportData/productRebateReport/detailList.vue

@@ -24,6 +24,11 @@
                 <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">
               <a-form-model-item label="客户名称">
                 <dealerSearchList ref="dealer" id="srebateReport-buyerName" @change="dealerChange" />
@@ -142,6 +147,7 @@ export default {
         endDate: '',
         buyerSn: undefined, // 客户sn
         bizNo: '', // 单号
+        bizSubNo: '',
         bizType: undefined,
         directDealerSn: undefined, // 直接经销商SN
         indirectDealerSn: undefined, // 间接经销商SN
@@ -194,6 +200,7 @@ 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: '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 },
@@ -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

+ 12 - 4
src/views/reportData/productRebateReport/list.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">
@@ -132,6 +137,7 @@ export default {
         endDate: '',
         buyerSn: undefined, // 客户sn
         bizNo: '', // 单号
+        bizSubNo: '',
         bizType: undefined,
         directDealerSn: undefined, // 直接经销商SN
         indirectDealerSn: undefined // 间接经销商SN
@@ -187,8 +193,9 @@ export default {
       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: 'bizSubNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类型', dataIndex: 'bizTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户级别', dataIndex: 'buyerLevelDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', width: '12%', 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) : '--') } },
@@ -265,6 +272,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