Bladeren bron

收费时间

Shannon_mu 2 jaren geleden
bovenliggende
commit
ec952260a2

+ 28 - 13
operationSupport/src/views/payService/leaseBill/index.vue

@@ -14,20 +14,34 @@
                     v-trim
                     v-model.trim="mixins_query.name"
                 ></el-input>
-                <el-select v-model="mixins_query.payType" v-if="chargeStatus == 2" class="width120" placeholder="缴费方式" clearable>
-                    <el-option label="微信" :value="1"></el-option>
-                    <el-option label="支付宝" :value="2"></el-option>
-                    <el-option label="现金" :value="3"></el-option>
-                    <el-option label="其他" :value="5"></el-option>
-                    <el-option label="刷卡" :value="6"></el-option>
-                </el-select>
+                <!-- 已交 -->
+                <template v-if="chargeStatus == 2">
+                    <el-select v-model="mixins_query.payType" class="width120" placeholder="缴费方式" clearable>
+                        <el-option label="微信" :value="1"></el-option>
+                        <el-option label="支付宝" :value="2"></el-option>
+                        <el-option label="现金" :value="3"></el-option>
+                        <el-option label="其他" :value="5"></el-option>
+                        <el-option label="刷卡" :value="6"></el-option>
+                    </el-select>
+                    <el-date-picker
+                        v-model="times"
+                        value-format="yyyy-MM-dd"
+                        type="daterange"
+                        range-separator="至"
+                        start-placeholder="选择开始日期"
+                        end-placeholder="选择结束日期"
+                        @change="effectiveDateToggle"
+                    ></el-date-picker>
+                </template>
+
                 <el-date-picker
+                    v-else
                     v-model="times"
-                    value-format="yyyy-MM-DD"
-                    type="daterange"
+                    value-format="yyyy-MM"
+                    type="monthrange"
                     range-separator="至"
-                    start-placeholder="选择开始日期"
-                    end-placeholder="选择结束日期"
+                    start-placeholder="选择开始"
+                    end-placeholder="选择结束"
                     @change="effectiveDateToggle"
                 ></el-date-picker>
                 <el-button class="search-btn" type="primary" @click="mixins_search()" icon="el-icon-search">搜索</el-button>
@@ -274,7 +288,8 @@ export default {
             this.$nextTick(() => {
                 this.statusTable = true;
             });
-            this.mixins_query.chargeStatus = this.chargeStatus;
+            this.times = [];
+            this.Object_Set(['startTime', 'endTime', 'chargeStatus'], ['', '', this.chargeStatus]);
             this.mixins_search();
         },
         exportExcel() {
@@ -376,7 +391,7 @@ export default {
         this.mixins_query = {
             chargeStatus: this.chargeStatus,
             chargeType: '8',
-             payType: ''
+            payType: ''
         };
     }
 };

+ 26 - 10
operationSupport/src/views/payService/propertyFee/index.vue

@@ -22,22 +22,37 @@
                     <el-option label="车位管理费" :value="4"></el-option>
                     <el-option label="其他费用" :value="7"></el-option>
                 </el-select>
-                <el-select v-model="mixins_query.payType" v-if="chargeStatus == 2" class="width120" placeholder="缴费方式" clearable>
-                    <el-option label="微信" :value="1"></el-option>
-                    <el-option label="支付宝" :value="2"></el-option>
-                    <el-option label="现金" :value="3"></el-option>
-                    <el-option label="其他" :value="5"></el-option>
-                    <el-option label="刷卡" :value="6"></el-option>
-                </el-select>
+                <!-- 已交 -->
+                <template v-if="chargeStatus == 2">
+                    <el-select v-model="mixins_query.payType" class="width120" placeholder="缴费方式" clearable>
+                        <el-option label="微信" :value="1"></el-option>
+                        <el-option label="支付宝" :value="2"></el-option>
+                        <el-option label="现金" :value="3"></el-option>
+                        <el-option label="其他" :value="5"></el-option>
+                        <el-option label="刷卡" :value="6"></el-option>
+                    </el-select>
+                    <el-date-picker
+                        v-model="times"
+                        value-format="yyyy-MM-dd"
+                        type="daterange"
+                        range-separator="至"
+                        start-placeholder="选择开始日期"
+                        end-placeholder="选择结束日期"
+                        @change="effectiveDateToggle"
+                    ></el-date-picker>
+                </template>
+
                 <el-date-picker
+                    v-else
                     v-model="times"
                     value-format="yyyy-MM"
                     type="monthrange"
                     range-separator="至"
-                    start-placeholder="选择开始日期"
-                    end-placeholder="选择结束日期"
+                    start-placeholder="选择开始"
+                    end-placeholder="选择结束"
                     @change="effectiveDateToggle"
                 ></el-date-picker>
+
                 <el-button class="search-btn" type="primary" @click="mixins_search()" icon="el-icon-search">搜索</el-button>
                 <div class="search-icon">
                     <el-tooltip
@@ -338,7 +353,8 @@ export default {
             this.$nextTick(() => {
                 this.statusTable = true;
             });
-            this.mixins_query.chargeStatus = this.chargeStatus;
+            this.times = [];
+            this.Object_Set(['startTime', 'endTime', 'chargeStatus'], ['', '', this.chargeStatus]);
             this.mixins_search();
         },
         exportExcel() {