manage-client 3.3.221 → 3.3.223

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Tue Jun 18 18:38:37 CST 2024
+gradle.version=7.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "3.3.221",
+    "version": "3.3.223",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/components/sale/filesquery/RecordInfoQuery.vue

@@ -166,6 +166,11 @@
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_meter_number"
                            condition="f_meternumber = '{}'" placeholder='表号'>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">气表封号</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_metertitles"
+                           condition="f_metertitles = '{}'" placeholder='气表封号'>
+                  </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">卡&emsp;&emsp;号</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"

package/src/filiale/WEINAN/ManageSummaryReport.vue

@@ -52,7 +52,7 @@
                                 :header="$parent.$parent.other"
                                 :footer="$parent.$parent.footer"
                                 sqlurl="api/af-revenue/logic/openapi/exportfile"
-                                sql-name="manage_chargeSummary"
+                                :sql-name="$parent.$parent.sqlName"
                                 template-name='营收汇总报表'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model"
@@ -357,6 +357,7 @@ export default {
       }),
       gasproperties: [],
       show: false,
+      sqlName: 'manage_chargeSummary',
       rowdata: {},
       areaList: [],
       modelval: [],
@@ -470,12 +471,14 @@ export default {
       if(this.f_is_area){
         if (this.f_is_area == '是') {
           this.isCompanyShow = true
+          this.sqlName = 'manage_chargeSummaryByArea'
           this.model = new PagedList('api/af-revenue/sql/manage_chargeSummaryByArea', 20, {
             startDate: 'this.model.startDate',
             endDate: 'this.model.endDate',
             condition2: 'this.model.condition2'
           }, {f_collection: 0, f_gas: 0, f_money: 0,f_card_money:0,f_sell_num:0,f_table_num:0})
         } else {
+          this.sqlName = 'manage_chargeSummary'
           this.isCompanyShow = false
           this.model = new PagedList('api/af-revenue/sql/manage_chargeSummary', 20, {
             startDate: 'this.model.startDate',
@@ -487,6 +490,7 @@ export default {
     isCompanyChange () {
       if (this.f_is_company) {
         if (this.f_is_company == '是') {
+          this.sqlName = 'manage_chargeSummaryByCompany'
           this.isAreaShow = true
           this.model = new PagedList('api/af-revenue/sql/manage_chargeSummaryByCompany', 20, {
             startDate: 'this.model.startDate',
@@ -494,6 +498,7 @@ export default {
             condition2: 'this.model.condition2'
           }, {f_collection: 0, f_gas: 0, f_money: 0,f_card_money:0,f_sell_num:0,f_table_num:0})
         } else {
+          this.sqlName = 'manage_chargeSummary'
           this.isAreaShow = false
           this.model = new PagedList('api/af-revenue/sql/manage_chargeSummary', 20, {
             startDate: 'this.model.startDate',

package/src/filiale/yuncheng/GasInspection.vue

@@ -238,6 +238,12 @@
             <th><nobr>最后抄表日期</nobr></th>
             <th><nobr>温度</nobr></th>
             <th><nobr>压力</nobr></th>
+            <th><nobr>采集时间</nobr></th>
+            <th><nobr>标况流量</nobr></th>
+            <th><nobr>工况流量</nobr></th>
+            <th><nobr>标况总量</nobr></th>
+            <th><nobr>工况总量</nobr></th>
+            <th><nobr>上报余额</nobr></th>
             <th><nobr>用气量</nobr></th>
             <th><nobr>用气金额</nobr></th>
             <th><nobr>欠费月数</nobr></th>
@@ -267,6 +273,14 @@
           <th style="text-align: center;"><nobr>{{row.end_time}}</nobr></th>
           <th style="text-align:center"><nobr>{{row.flowmetertemperature}}</nobr></th>
           <th style="text-align:center"><nobr>{{row.flowmeterpressure}}</nobr></th>
+
+          <th style="text-align:center"><nobr>{{row.f_hand_date}}</nobr></th>
+          <th style="text-align:center"><nobr>{{row.standardconditionflow}}</nobr></th>
+          <th style="text-align:center"><nobr>{{row.operatingmodeflow}}</nobr></th>
+          <th style="text-align:center"><nobr>{{row.standardconditiontotal}}</nobr></th>
+          <th style="text-align:center"><nobr>{{row.operatingmodetotal}}</nobr></th>
+          <th style="text-align:center"><nobr>{{row.f_jval}}</nobr></th>
+
           <th style="text-align: center;"><nobr>{{row.f_oughtamount}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_oughtfee}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.qianfei_month_num}}</nobr></th>

package/src/filiale/yuncheng/config/exportConfig.js

@@ -2036,6 +2036,12 @@ export default {
     'f_meter_base': '表底数',
     'flowmetertemperature': '温度',
     'flowmeterpressure': '压力',
+    'f_hand_date': '采集时间',
+    'standardconditionflow': '标况流量',
+    'operatingmodeflow': '工况流量',
+    'standardconditiontotal': '标况总量',
+    'operatingmodetotal': '工况总量',
+    'f_jval': '上报余额',
     'f_oughtamount': '用气量',
     'f_oughtfee': '用气金额',
     'qianfei_month_num': '欠费月数',