manage-client 3.3.52 → 3.3.54

package/package.json

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

package/src/components/sale/businessquery/ChargeQuery.vue

@@ -155,7 +155,7 @@
                   <v-select :value.sync="model.f_price_name"
                             v-model="model.f_price_name"
                             multiple
-                            :options="$parent.$parent.getPricenames"
+                            :options="$parent.$parent.pricenames"
                             condition="f_price_name in {}"
                             ></v-select>
                 </div>
@@ -963,8 +963,36 @@
       })
     },
     methods: {
-      pricetypechanged(){
+      async pricetypechanged(){
         this.$refs.paged.$refs.cri.model.f_price_name = []
+        this.pricenames = []
+        if (this.$refs.paged.$refs.cri.model.pricetype) {
+          let http = new HttpResetClass()
+          let param = {
+            items: 'f_price_name',
+            tablename: 't_stairprice',
+            condition: `f_price_type = '${this.$refs.paged.$refs.cri.model.pricetype[0]}' and f_orgid = '${this.$login.f.orgid}'`,
+            orderitem: 'id'
+          }
+          var res = await http.load('POST', 'rs/sql/manage_singleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取设备列表失败!'})
+          let uniqueMap  = {}
+          let arr = []
+          for (var i = 0; i < res.data.length; i++) {
+            let item = res.data[i];
+            if (!uniqueMap[item.f_price_name]) {
+              arr.push(item);
+              uniqueMap[item.f_price_name] = true;
+            }
+          }
+          console.log('arr',arr)
+          if (arr.length > 0) {
+            arr.forEach(row => {
+              this.pricenames.push({label: row.f_price_name,value: row.f_price_name})
+            })
+          } else {
+            this.pricenames.push({label: '全部', value: ''})
+          }
+        }
       },
       // 获取设备下拉选
       async getEquipment () {
@@ -1244,39 +1272,6 @@
              }
              return aaa
          },
-      getPricenames() {
-        let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
-        let f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties;
-        let pricetype = this.$refs.paged.$refs.cri.model.pricetype;
-        console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
-        if(this.$refs.paged.$refs.cri.model !==null) {
-          let rs = []
-          let priceArr = []
-          if ( pricetype.length >0) {
-            let params = {
-              f_price_type: pricetype[0],
-              filter: this.f_filialeid,
-              prices: this.prices
-            }
-            this.$MagGetSaleParam.getPrice(params).forEach((item) => {
-              let temp = {}
-              temp.label = item.label
-              temp.value = item.value.f_price_name
-              priceArr.push(temp)
-            })
-            if(priceArr.length == 0 ){
-              rs= [{label: '全部', value: ''}]
-            }else{
-              rs = [ ...priceArr]
-            }
-          }
-          if (rs.length === 0) {
-            console.log('rs读出来是空')
-            this.$refs.paged.$refs.cri.model.f_price_name = ''
-          }
-          return rs
-        }
-      },
       getCondition() {
         return {
           startDate: this.$refs.paged.$refs.cri.model.startDate,

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

@@ -502,7 +502,7 @@
                   <th colspan="6">
                     <nobr>燃气表</nobr>
                   </th>
-                  <th colspan="62">
+                  <th colspan="63">
                     <nobr>其他</nobr>
                   </th>
                 </tr>

package/src/filiale/huayin/ChargeQuery.vue

@@ -581,7 +581,7 @@
                 <nobr>{{row.f_tablebase }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_pregas}}</nobr>
+                <nobr>{{(row.f_pregas-0).toFixed(2)}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.fee}}</nobr>
@@ -694,7 +694,7 @@
                 <nobr>{{row.f_corr_operate_date}}</nobr>
               </td>
                 <td style="text-align: center;">
-                    <nobr>{{row.f_stairamount1}}</nobr>
+                    <nobr>{{(row.f_stairamount1 - 0).toFixed(2)}}</nobr>
                 </td>
                 <td style="text-align: center;">
                     <nobr>{{row.conutnum>1?'--':row.f_stair1price}}</nobr>
@@ -703,7 +703,7 @@
                     <nobr>{{(row.f_stair1fee - 0).toFixed(2)}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                    <nobr>{{row.f_stair2amount}}</nobr>
+                    <nobr>{{(row.f_stair2amount - 0).toFixed(2)}}</nobr>
                 </td>
                 <td style="text-align: center;">
                     <nobr>{{row.conutnum>1?'--':row.f_stair2price}}</nobr>
@@ -712,7 +712,7 @@
                     <nobr>{{(row.f_stair2fee - 0).toFixed(2)}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                    <nobr>{{row.f_stair3amount}}</nobr>
+                    <nobr>{{(row.f_stair3amount - 0).toFixed(2)}}</nobr>
                 </td>
                 <td style="text-align: center;">
                     <nobr>{{row.conutnum>1?'--':row.f_stair3price}}</nobr>
@@ -755,19 +755,19 @@
               优惠合计:&emsp;{{sumsmodel.f_privilege_money}}
             </td>
               <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-                  一阶气量合计:&emsp;{{sumsmodel.f_stairamount1}}
+                  一阶气量合计:&emsp;{{sumsmodel.f_stairamount1.toFixed(2)}}
               </td>
               <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
                   一阶气费合计:&emsp;{{sumsmodel.f_stair1fee}}
               </td>
               <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-                  二阶气量合计:&emsp;{{sumsmodel.f_stair2amount}}
+                  二阶气量合计:&emsp;{{sumsmodel.f_stair2amount.toFixed(2)}}
               </td>
               <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
                   二阶气费合计:&emsp;{{sumsmodel.f_stair2fee}}
               </td>
               <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-                  三阶气量合计:&emsp;{{sumsmodel.f_stair3amount}}
+                  三阶气量合计:&emsp;{{sumsmodel.f_stair3amount.toFixed(2)}}
               </td>
               <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
                   三阶气费合计:&emsp;{{sumsmodel.f_stair3fee}}

package/src/filiale/huayin/RecordInfoQuery.vue

@@ -454,6 +454,24 @@
                       condition="f_network_valve='{}'">
                     </v-select>
                   </div>
+                  <div class="col-sm-2 form-group" >
+                    <label for="endDate4" class="font_normal_body" title='未购气开始时间'>开始时间</label>
+                    <datepicker id="endDate4" placeholder="未购气开始时间" style="width:60%"
+                                v-model="model.startDate5"
+                                :value.sync="model.startDate5"
+                                :format="'yyyy-MM-dd'"
+                                :show-reset-button="true">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label for="endDate4" class="font_normal_body" title="未购气结束时间">结束时间</label>
+                    <datepicker id="endDate4" placeholder="未购气结束时间" style="width:60%"
+                                v-model="model.endDate5"
+                                :value.sync="model.endDate5"
+                                :format="'yyyy-MM-dd'"
+                                :show-reset-button="true">
+                    </datepicker>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -473,7 +491,7 @@
                   <th colspan="6">
                     <nobr>燃气表</nobr>
                   </th>
-                  <th colspan="62">
+                  <th colspan="65">
                     <nobr>其他</nobr>
                   </th>
                 </tr>
@@ -488,7 +506,7 @@
                     <nobr>身份证号</nobr>
                   </th>
                   <th>
-                    <nobr>详细地址</nobr>
+                    <data-order field="f_address" name="详细地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                   </th>
                   <th>
                     <nobr>联系电话</nobr>
@@ -665,6 +683,15 @@
                   <th>
                     <nobr>灶具信息</nobr>
                   </th>
+                  <th>
+                    <nobr>上次安检时间</nobr>
+                  </th
+                  ><th>
+                    <nobr>上次安检状态</nobr>
+                  </th>
+                  <th>
+                    <nobr>上次购气时间</nobr>
+                  </th>
                   <th>
                     <nobr>备注</nobr>
                   </th>
@@ -795,6 +822,9 @@
                 <td style="text-align: center;"><nobr>{{row.f_alarm_code}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_maxdate}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_devices_type}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_last_check_date}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_last_check_result}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_last_gas_date}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_comments}}</nobr></td>
               </template>
               <template partial='foot'>
@@ -880,7 +910,7 @@ let readySomething = async function (self) {
   self.getPricenames();
   self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
   // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
-  // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+  self.$refs.paged.$refs.cri.model.endDate5 = self.$login.toStandardDateString()
   // await self.$refs.paged.$refs.cri.search()
 }
 export default {
@@ -892,7 +922,10 @@ export default {
       isSingleUser: null,
       other:[],
       footer:[],
-      model: new PagedList('rs/sql/compreQuery', 20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc'`},{f_yiguabiao:0,f_weiguabiao:0}),
+      model: new PagedList('rs/sql/compreQuery', 20,
+        {startDate5: 'this.model.startDate5', endDate5: 'this.model.endDate5',
+          orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_residential_area asc,f_building asc,f_unit asc,f_floor asc,f_room asc'`},
+        {f_yiguabiao:0,f_weiguabiao:0}),
       criteriaShow: false,
       orgCondtionStr:'',
       residentialArea: [],
@@ -908,7 +941,7 @@ export default {
       tfoot: '',
       defaultfield: [],
       //排序
-      orderitem: 'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc',
+      orderitem: 'f_residential_area asc,f_building asc,f_unit asc,f_floor asc,f_room asc',
       orderFields: {
         f_operate_date: 'no'
       },

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

@@ -226,7 +226,7 @@ export default{
     'f_fillcard_times': '补卡次数', 'f_sendsuccess': '表同步状态', 'f_isband': '微信绑定', 'f_cost_type': '缴费类型',
     'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号',
     'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号', 'f_maxdate': '换表时间', 'f_devices_type': '灶具信息', 'f_network_valve': '自动阀控',
-    'f_defendcard': '防盗卡号', 'f_factory_date': '生产年月'
+    'f_defendcard': '防盗卡号', 'f_factory_date': '生产年月', 'f_last_check_date': '上次安检时间', 'f_last_check_result': '上次安检状态', 'f_last_gas_date': '上次购气时间'
   },
 
   compreConfigGY: {

package/src/filiale/qianneng/QnAqzzYsmx.vue

@@ -133,6 +133,20 @@
                   <th>
                     <nobr>地址</nobr>
                   </th>
+
+                  <th>
+                    <nobr>奥枫个性化金额</nobr>
+                  </th>
+                  <th>
+                    <nobr>奥枫补贴项金额</nobr>
+                  </th>
+                  <th>
+                    <nobr>宜达个性化金额</nobr>
+                  </th>
+                  <th>
+                    <nobr>宜达补贴项金额</nobr>
+                  </th>
+
                   <th>
                     <nobr>与收费比对结果</nobr>
                   </th>
@@ -163,6 +177,20 @@
                 <td style="text-align: center;">
                   <nobr>{{row.textfield_li9rszuo}}</nobr>
                 </td>
+
+                <td style="text-align: center;">
+                  <nobr>{{row.afgxhje}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.afbtxjec}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.afbtxje}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.ydbtxje}}</nobr>
+                </td>
+
                 <td style="text-align: center;">
                   <nobr>{{row.matchedaofeng}}</nobr>
                 </td>

package/src/filiale/qianneng/exportConfig.js

@@ -223,7 +223,7 @@ export default{
   qnAqzzYsmx:{
     'title':'标题','createtimegmt':'发起时间','originator':'发起人','modifiedtimegmt':'验收时间','modifyuser':'验收人',
     'textfield_li9rszui':'用户编号','textfield_li9rszuj':'用户姓名',
-    'textfield_li9rszuo':'地址','matchedaofeng':'与收费比对结果'
+    'textfield_li9rszuo':'地址','afgxhje':'奥枫个性化金额','afbtxje':'奥枫补贴项金额','ydgxhje':'宜达个性化金额','ydbtxje':'宜达补贴项金额','matchedaofeng':'与收费比对结果'
   },
 }