sale-client 4.2.84 → 4.2.86

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Thu Jun 12 13:59:43 CST 2025
+#Mon Oct 13 09:26:02 CST 2025
 gradle.version=5.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.2.84",
+  "version": "4.2.86",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/filiale/yangchun/BlackList/BlackListList.vue

@@ -105,6 +105,23 @@
                           condition="f_last_check_date >= '{} 00:00:00'"
               ></datepicker>
             </div>
+            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">&emsp;&ensp;至&ensp;&emsp;</label>
+              <datepicker placeholder="结束日期"
+                          style="width:60%"
+                          class="datepicker"
+                          v-model="model.end_check_date"
+                          :value.sync="model.end_check_date"
+                          :format="'yyyy-MM-dd'"
+                          condition="f_last_check_date <= '{} 23:59:59'"
+              ></datepicker>
+            </div>
+            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">操&nbsp;作&nbsp;人</label>
+              <input  :size="model.f_operator ? model.f_operator.length * 2 : 4" class="input_search" condition="f_operator like '%{}%'" placeholder='操作人' style="width:60%"
+                      type="text"
+                      v-model="model.f_operator">
+            </div>
             <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}">
               <label class="font_normal_body">限购日期</label>
               <datepicker placeholder="开始日期"
@@ -117,10 +134,15 @@
               ></datepicker>
             </div>
             <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}">
-              <label class="font_normal_body">操&nbsp;作&nbsp;人</label>
-              <input  :size="model.f_operator ? model.f_operator.length * 2 : 4" class="input_search" condition="f_operator like '%{}%'" placeholder='操作人' style="width:60%"
-                      type="text"
-                      v-model="model.f_operator">
+              <label class="font_normal_body">&emsp;&ensp;至&ensp;&emsp;</label>
+              <datepicker placeholder="结束日期"
+                          style="width:60%"
+                          class="datepicker"
+                          v-model="model.end_parameter_value"
+                          :value.sync="model.end_parameter_value"
+                          :format="'yyyy-MM-dd'"
+                          condition="f_parameter_value <= '{} 23:59:59'"
+              ></datepicker>
             </div>
             <div class="col-sm-2 form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}">
               <label class="font_normal_body">审核状态</label>

package/src/filiale/yangchun/machineHandAudit.vue

@@ -287,6 +287,9 @@
               <th>
                 <nobr>上期抄表量</nobr>
               </th>
+              <th >
+                <nobr>气价名称</nobr>
+              </th>
               <th title="本次抄表用气量-上次抄表用气量/1">
                 <nobr>增减百分比</nobr>
               </th>
@@ -367,6 +370,7 @@
             <td>{{row.f_result_state}}</td>
             <td><nobr>{{row.f_last_input_date}}</nobr></td>
             <td style="text-align: center;">{{row.f_last_oughtamount}}</td>
+            <td style="text-align: center;">{{row.f_price_name}}</td>
             <td style="text-align: center;">{{row.f_oughtamount_bv}}</td>
             <td><nobr>{{row.f_hand_date}}</nobr></td>
             <td><nobr>{{row.f_input_date}}</nobr></td>
@@ -471,6 +475,7 @@
           'f_result_state': '抄表结果状态',
           'f_last_input_date': '上次抄表录入日期',
           'f_last_oughtamount': '上次抄表量',
+          'f_price_name': '气价名称',
           'f_oughtamount_bv': '增减百分比',
           'f_hand_date': '下发日期',
           'f_input_date': '抄表录入日期',
@@ -518,7 +523,7 @@
           if (item.f_state === '有效' && filialeid == item.f_filialeid) {
             let value = {
               label: item.f_price_name,
-              value: item
+              value: item.f_price_name
             }
             result.push(value)
           }