Sfoglia il codice sorgente

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

lilei 1 anno fa
parent
commit
534ec66e7b

+ 3 - 3
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -81,8 +81,8 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="类型" prop="bizType">
-                  <a-select id="hPriceDifferenceDetailList-bizType" allowClear v-model="queryParam.bizType" placeholder="请选择类型">
+                <a-form-model-item label="单据类型" prop="bizType">
+                  <a-select id="hPriceDifferenceDetailList-bizType" allowClear v-model="queryParam.bizType" placeholder="请选择单据类型">
                     <a-select-option v-for="item in bizTypeList" :value="item.value" :key="item.value">{{ item.name }}</a-select-option>
                   </a-select>
                 </a-form-model-item>
@@ -267,7 +267,7 @@ export default {
         // { title: '加盟商金额', dataIndex: 'wholesalePrice2', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '特约加盟店金额', dataIndex: 'wholesalePrice3', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '差价金额', dataIndex: 'rebateAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '类型', dataIndex: 'bizTypeValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '单据类型', dataIndex: 'bizTypeValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
       ]
       arr.splice(11, 0, { title: '分公司金额', dataIndex: 'wholesalePrice1', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       arr.splice(12, 0, { title: '加盟商金额', dataIndex: 'wholesalePrice2', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })

+ 2 - 2
src/views/reportData/productRebateReport/dealerList.vue

@@ -66,8 +66,8 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="类型" prop="bizType">
-                  <a-select id="srebateReport-bizType" allowClear v-model="queryParam.bizType" placeholder="请选择类型">
+                <a-form-model-item label="单据类型" prop="bizType">
+                  <a-select id="srebateReport-bizType" allowClear v-model="queryParam.bizType" placeholder="请选择单据类型">
                     <a-select-option v-for="item in bizTypeList" :value="item.value" :key="item.value">{{ item.name }}</a-select-option>
                   </a-select>
                 </a-form-model-item>