页面修改

src/components/Hotel/SupplierHandFee.vue

@@ -4,16 +4,10 @@
       <ul class="user_time_picker">
         <li>
           <span>
-            <em>{{$t('hotel.hotel_StartDate')}}</em>
-            <el-date-picker type="date" v-model="msg.StartDate" :picker-options="pickerBeginDateBefore"
-              value-format="yyyy-MM-dd" placeholder></el-date-picker>
-          </span>
-        </li>
-        <li>
-          <span>
-            <em>{{$t('hotel.hotel_EndDate')}}</em>
-            <el-date-picker type="date" v-model="msg.EndDate" :picker-options="pickerBeginDateBefore"
-              value-format="yyyy-MM-dd" placeholder></el-date-picker>
+            <em>月份</em>
+            <el-date-picker v-model="msg.QMonthStr" type="month" value-format="yyyy-MM"
+              :placeholder="$t('ground.xuanzenian')">
+            </el-date-picker>
           </span>
         </li>
         <li>
@@ -60,7 +54,7 @@
             </td>
             <td>{{subItem.SubtotalMoney}}</td>
             <td>
-              <template v-if="subItem.Frids!=''">  {{subItem.RMBMoney}}</template>
+              <template v-if="subItem.Frids!=''"> {{subItem.RMBMoney}}</template>
             </td>
             <td>
               {{subItem.Frids}}
@@ -84,8 +78,7 @@
       return {
         //请求
         msg: {
-          StartDate: "",
-          EndDate: "",
+          QMonthStr: "",
           Supplier: 0,
           PageIndex: 1,
           PageSize: 15,
@@ -94,25 +87,8 @@
         currentPage: 1,
         total: 0,
         dataList: [],
-
         //供应商
         SupplierList: [],
-        pickerBeginDateBefore: {
-          disabledDate: time => {
-            if (this.msg.EndDate == null) {
-              return false;
-            } else {
-              let endTime = new Date(this.msg.EndDate)
-              return endTime.getTime() < time.getTime()
-            }
-          }
-        },
-        pickerBeginDateAfter: {
-          disabledDate: time => {
-            let startTime = new Date(this.msg.StartDate)
-            return startTime.getTime() >= time.getTime()
-          }
-        },
       }
     },
     mounted() {
@@ -123,28 +99,15 @@
     methods: {
       //点击查询
       getSearch() {
-        var isA, isB, isC
+        if (this.msg.QMonthStr == '' || this.msg.QMonthStr == null) {
+          this.Error('请选择月份');
+          return;
+        }
         if (this.msg.Supplier == 0) {
           this.Error('请选择供应商');
-          isA = false
-        } else {
-          isA = true;
-        }
-        if (this.msg.StartDate == '' || this.msg.StartDate == null) {
-          this.Error('请选择开始日期');
-          isB = false
-        } else {
-          isB = true;
-        }
-        if (this.msg.EndDate == '' || this.msg.EndDate == null) {
-          this.Error('请选择结束日期');
-          isC = false
-        } else {
-          isC = true;
-        }
-        if (isA && isB && isC) {
-          this.getList();
+          return;
         }
+        this.getList();
       },
       //获取数据
       getList() {
@@ -154,7 +117,6 @@
           res => {
             this.loading = false;
             if (res.data.resultCode == 1) {
-              console.log(res.data.data.pageData, 'resss');
               this.dataList = res.data.data.pageData;
               this.total = res.data.data.count
             } else {
@@ -171,7 +133,8 @@
       // 获取供应商
       initSupplier() {
         this.apipost("supplier_post_GetAllList", {
-          Type: 1
+          Type: 1,
+          Country: 651, //日本供应商
         }, res => {
           if (res.data.resultCode === 1) {
             this.SupplierList = res.data.data;