报表修改

src/views/school-center/order/order.vue

@@ -7,7 +7,7 @@
         <a-row :gutter="24">
         <a-row :gutter="24">
           <a-col :md="6" :sm="12">
           <a-col :md="6" :sm="12">
             <a-form-item label="时间选择：">
             <a-form-item label="时间选择：">
-              <a-range-picker @change="onChange" format="YYYY-MM" />
+              <a-range-picker @change="onChange" format="YYYY-MM-DD HH:mm:ss" />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :md="4" :sm="12">
           <a-col :md="4" :sm="12">

src/views/school-center/productManagement/product.vue

@@ -97,18 +97,27 @@
                     <a-input placeholder="区域"
                     <a-input placeholder="区域"
                              v-decorator="[ 'productRegion', {rules: [{ required: true, message: '区域不能为空！' ,validator: 'click'}]} ]"></a-input>
                              v-decorator="[ 'productRegion', {rules: [{ required: true, message: '区域不能为空！' ,validator: 'click'}]} ]"></a-input>
                 </a-form-item>
                 </a-form-item>
-                <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="资费：">
-                    <a-input placeholder="资费"
+                <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="单宽资费：">
+                    <a-input placeholder="单宽资费"
                              v-decorator="[ 'productPrice', {rules: [{required: true, message: '资费不能为空！' ,validator: 'click'}]} ]"></a-input>
                              v-decorator="[ 'productPrice', {rules: [{required: true, message: '资费不能为空！' ,validator: 'click'}]} ]"></a-input>
                 </a-form-item>
                 </a-form-item>
-                <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="宽带速率：">
-                    <a-input placeholder="宽带速率"
+                <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="单宽宽带速率：">
+                    <a-input placeholder="单宽宽带速率"
                              v-decorator="[ 'productMeal', {rules: [{ required: true, message: '宽带速率不能为空！' ,validator: 'click'}]} ]"></a-input>
                              v-decorator="[ 'productMeal', {rules: [{ required: true, message: '宽带速率不能为空！' ,validator: 'click'}]} ]"></a-input>
                 </a-form-item>
                 </a-form-item>
-                <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="包年包月情况：">
-                    <a-input placeholder="包年包月情况"
+                <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="单宽包年包月情况：">
+                    <a-input placeholder="单宽包年包月情况"
                              v-decorator="[ 'productRate', {rules: [{ required: true, message: '包年包月情况不能为空！' ,validator: 'click'}]} ]"></a-input>
                              v-decorator="[ 'productRate', {rules: [{ required: true, message: '包年包月情况不能为空！' ,validator: 'click'}]} ]"></a-input>
                 </a-form-item>
                 </a-form-item>
+
+
+                <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="融合资费：">
+                    <a-input :rows="10" v-model="modelData.productRhPrice"/>
+                </a-form-item>
+                <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="融合包年包月情况：">
+                    <a-input :rows="10" v-model="modelData.productRhRate"/>
+                </a-form-item>
+
                 <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="适用学校：">
                 <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="适用学校：">
                     <a-select v-model="universityName" style="width: 330px">
                     <a-select v-model="universityName" style="width: 330px">
                         <a-select-option @click="universitySchoolName('请选择')" value="请选择">请选择</a-select-option>
                         <a-select-option @click="universitySchoolName('请选择')" value="请选择">请选择</a-select-option>
@@ -205,7 +214,9 @@
                     productIntroduction:'',
                     productIntroduction:'',
                     productSetMealIntroduction:'',
                     productSetMealIntroduction:'',
                     productRf2:'',
                     productRf2:'',
-                    productIntroductionPic2: ''
+                    productIntroductionPic2: '',
+                    productRhPrice:'',
+                    productRhRate:''
                 },
                 },
                 columns: [
                 columns: [
                     {dataIndex: 'productTitle', width: 200, title: '宽带标题 '},
                     {dataIndex: 'productTitle', width: 200, title: '宽带标题 '},
@@ -335,6 +346,8 @@
                     this.productRf2 = data.productRf2
                     this.productRf2 = data.productRf2
                     this.modelData.productMealPrice = data.productMealPrice
                     this.modelData.productMealPrice = data.productMealPrice
                     this.modelData.productUniversity = data.productUniversity
                     this.modelData.productUniversity = data.productUniversity
+                    this.modelData.productRhPrice=data.productRhPrice
+                    this.modelData.productRhRate=data.productRhRate
                     this.universityName = data.productUniversity
                     this.universityName = data.productUniversity
                     for (var i = 0; i < this.regulars.length; i++) {
                     for (var i = 0; i < this.regulars.length; i++) {
                         if (data.productIntroductionPic2 == this.regulars[i].regularId + '') {
                         if (data.productIntroductionPic2 == this.regulars[i].regularId + '') {