Merge branch 'master' of http://git.echepei.com/tire-platform/tire-platform-ui

src/views/overviewAllocation/index.vue

@@ -80,7 +80,8 @@ export default {
     },
     created() {
         let nowDate = new Date()
-        this.query.yearMonth = nowDate.getFullYear() + '-' + (nowDate.getMonth() + 1)
+        let month = nowDate.getMonth() + 1
+        this.query.yearMonth = nowDate.getFullYear() + '-' + (month < 10 ? '0' + month : month)
         this.getBaseData();
     },
     methods: {

src/views/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -198,7 +198,11 @@ export default {
                     label: '出库时间',
                     prop: 'deliveryBusinesDate',
                     overHidden: true,
-                }, {
+                },{
+                    label: '结算日期',
+                    prop: 'paymentDate',
+                    overHidden: true,
+                },  {
                     label: '结算状态',
                     prop: 'actualPaymentStatus',
                     overHidden: true,
@@ -330,7 +334,27 @@ export default {
                     search: true,
                     searchslot: true,
                     searchOrder: 8
-                }, {
+                },  {
+                        label: '结算开始',
+                        prop: 'settlementDateStart',
+                        overHidden: true,
+                        search: true,
+                        hide: true,
+                        searchOrder: 9,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd",
+                    }, {
+                        label: '结算结束',
+                        prop: 'settlementDateEnd',
+                        overHidden: true,
+                        search: true,
+                        hide: true,
+                        searchOrder: 9,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd",
+                    },{
                     label: '包含未发货',
                     prop: 'isContain',
                     overHidden: true,

src/views/tirePartsMall/salesManagement/purchaseOrder/index.vue

@@ -469,6 +469,19 @@ export default {
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
         }, {
+                label: '收费日期',
+                prop: "paymentDate",
+                searchProp: "paymentDateList",
+                type: "date",
+                overHidden: true,
+                search: true,
+                width: 100,
+                unlinkPanels: true,
+                searchRange: true,
+                searchDefaultTime: ["00:00:00", "23:59:59"],
+                format: "yyyy-MM-dd",
+                valueFormat: "yyyy-MM-dd HH:mm:ss"
+            }, {
           label: "更新人",
           prop: "updateUserName",
           searchProp: "updateUser",

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -2281,7 +2281,7 @@ export default {
             this.viewDisabled = false;
           }
         });
-      } else if (this.form.businessSource == "外部销售") {
+      } else if (this.form.businessSource == "外部销售" || this.form.businessSource == "额度支付") {
         this.optionForm.column.forEach(its => {
           if (its.prop == "contacts" || its.prop == "phone" || its.prop == "recAddress") {
             this.$set(its, "disabled", true);