npm - manage-client - Versions diffs - 4.0.77 → 4.0.78-1 - Mend

manage-client 4.0.77 → 4.0.78-1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/package.json +1 -1
package/src/components/SellReport/siyang/SYKFSummary.vue +26 -1
package/src/components/sale/businessquery/InspectListUser.vue +39 -28
package/src/filiale/jingyang/ChargeQuery.vue +1 -1
package/src/filiale/jingyang/NewGasStatistics.vue +9 -1
package/src/filiale/jingyang/usergas.vue +1 -1

package/package.json CHANGED Viewed

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

package/src/components/SellReport/siyang/SYKFSummary.vue CHANGED Viewed

@@ -24,6 +24,24 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="model.f_user_type"
+                        v-model="model.f_user_type"
+                        multiple
+                        :options='$parent.$parent.user_type' placeholder='请选择'
+                        condition="f_user_type in {}"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">用气性质</label>
+              <v-select :value.sync="model.f_gasproperties"
+                        v-model="model.f_gasproperties"
+                        multiple
+                        :options='$parent.$parent.gasproperties' placeholder='请选择'
+                        condition="f_gasproperties in {}"
+                        close-on-select></v-select>
+            </div>
             <res-select-group :show-component="$parent.$parent.resshow"
                               :selectin="true" :initres="$parent.$parent.initres"
                               :cascade =true @re-res="$parent.$parent.getRes"
@@ -103,6 +121,7 @@ export default {
       operatorname: '',
       orgCondtionStr: '1=1',
       f_user_type: '',
+      f_gasproperties: '',
       f_state: ['有效'],
       model: new DataModel('api/af-revenue/report/sy_charge', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
         f_orgid: 'this.model.f_orgid'}),
@@ -126,7 +145,7 @@ export default {
     },
     selfSearch (args) {
       this.printTime = this.$login.toStandardTimeString()
-      let orgcondition = '1=1'
+      let orgcondition = args.condition
       let orgstr = this.orgCondtionStr
       orgcondition = orgcondition + orgstr
       this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
@@ -165,6 +184,12 @@ export default {
     }
   },
   computed: {
+    user_type () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    gasproperties () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+    }
   }
 }
 </script>

package/src/components/sale/businessquery/InspectListUser.vue CHANGED Viewed

@@ -32,7 +32,7 @@
                         close-on-select></v-select>
             </div>
             <div class="col-sm-2 flex-row" style="white-space: nowrap">
-              <label class="font_normal_body" v-if="['卡表','物联网表'].includes($parent.$parent.meter_classify)" >未购天数</label>
+              <label class="font_normal_body" v-if="$parent.$parent.meter_classify.includes('卡表') || $parent.$parent.meter_classify.includes('物联网表')" >未购天数</label>
               <label class="font_normal_body" v-else>未抄天数</label>
               <div class="row">
                 <input type="text" style="width:30%" class="input_search" v-model="model.diffdaymin"
@@ -114,7 +114,7 @@
               </v-select>
             </div>
             <div class="col-sm-2" >
-              <label class="font_normal_body" v-if="['卡表','物联网表'].includes($parent.$parent.meter_classify)">总购次数</label>
+              <label class="font_normal_body" v-if="$parent.$parent.meter_classify.includes('卡表') || $parent.$parent.meter_classify.includes('物联网表')">购气次数</label>
               <label class="font_normal_body" v-else>抄表次数</label>
                 <input type="text" style="width:25%" class="input_search" v-model="model.cishumin"
                        condition="cishu >= {} " placeholder="">
@@ -123,15 +123,23 @@
                        condition="cishu <= {} " placeholder="">
             </div>
             <div class="col-sm-2">
-              <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '卡表'">总购气量</label>
-              <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '机表'">总用气量</label>
-              <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '物联网表'">总购金额</label>
+              <label class="font_normal_body" v-if="$parent.$parent.meter_classify.includes('卡表')">&nbsp;&nbsp;购气量</label>
+              <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '机表'">&nbsp;&nbsp;用气量</label>
+              <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '物联网表'">购气金额</label>
                 <input type="text" style="width:25%" class="input_search" v-model="model.pregasmin"
                        condition="pregas >= {} " placeholder="">
                 <label   class="font_normal_body">  ≤ x ≤ </label>
                 <input type="text" style="width:25%" class="input_search" v-model="model.pregasmax"
                        condition="pregas <= {} " placeholder="">
             </div>
+            <div class="col-sm-2" v-if="$parent.$parent.meter_classify.includes('卡表')">
+              <label class="font_normal_body">购气金额</label>
+                <input type="text" style="width:25%" class="input_search" v-model="model.collectionmin"
+                       condition="collection >= {} " placeholder="">
+                <label   class="font_normal_body">  ≤ x ≤ </label>
+                <input type="text" style="width:25%" class="input_search" v-model="model.collectionmax"
+                       condition="collection <= {} " placeholder="">
+            </div>
             <div class="col-sm-2">
               <label class="font_normal_body">&emsp;&emsp;表号</label>
@@ -204,16 +212,17 @@
             <th><nobr>表具状态</nobr></th>
             <th><nobr>气表品牌</nobr></th>
             <th><nobr>气价名称</nobr></th>
-            <th><nobr>最后购气日期</nobr></th>
-            <th v-show="['卡表','物联网表'].includes($parent.$parent.$parent.meter_classify)"><nobr>总购气次数</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>总抄表次数</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify.includes('卡表') || $parent.$parent.$parent.meter_classify.includes('物联网表')"><nobr>区间内最后购气日期</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>区间内最后抄表日期</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify.includes('卡表') || $parent.$parent.$parent.meter_classify.includes('物联网表')"><nobr>区间内购气次数</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>区间内抄表次数</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify === '卡表'"><nobr>总购气量</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify === '物联网表'"><nobr>总购金额</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>总用气量</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify.includes('卡表')"><nobr>区间内购气量</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify.includes('卡表') || $parent.$parent.$parent.meter_classify.includes('物联网表')"><nobr>区间内购气金额</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>区间内用气量</nobr></th>
-            <th v-show="['卡表','物联网表'].includes($parent.$parent.$parent.meter_classify)"><nobr>累计未购气天数</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>累计未抄表天数</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify.includes('卡表') || $parent.$parent.$parent.meter_classify.includes('物联网表')"><nobr>区间内未购气天数</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>区间内未抄表天数</nobr></th>
             <th><nobr>组织机构</nobr></th>
             <th><nobr>安检次数</nobr></th>
             <th><nobr>最后安检时间</nobr></th>
@@ -240,6 +249,7 @@
           <td style="text-align: center;"><nobr>{{row.cishu}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.pregas}}</nobr></td>
+          <td style="text-align: center;" v-show="$parent.$parent.$parent.meter_classify.includes('卡表')"><nobr>{{row.collection}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.diffday}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_checknum}}</nobr></td>
@@ -250,9 +260,9 @@
         <table class="table-hover">
           <tr style="position: relative" class="table-bordered">
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
-            <td v-if="meter_classify === '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总购气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
-            <td v-if="meter_classify === '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
-            <td v-if="meter_classify === '物联网表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总购金额合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
+            <td v-if="meter_classify.includes('卡表')" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">购气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
+            <td v-if="meter_classify === '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
+            <td v-if="meter_classify === '物联网表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">购气金额合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
           </tr>
         </table>
   </div>
@@ -392,7 +402,7 @@
   import plugin from 'system-clients/src/plugins/GetLoginInfoService'
   let readySomething = async function (self) {
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
     self.$refs.paged.$refs.cri.model.endDate =  self.$login.toStandardDateString()
     // await self.$refs.paged.$refs.cri.search()
@@ -406,7 +416,7 @@
         footer:[],
         org:[this.$login.f.orgid],
         criteriaShow: false,
-        meter_classify:'卡表',
+        meter_classify:'气量卡表',
         filialeNameStr: null,
         filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
@@ -414,8 +424,8 @@
         getfield:{"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"客户名称",
           "f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址","f_createfile_date":"建档日期","f_user_type":"用户类型",
           "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
-          "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量",
-          "diffday":"未购气总天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"},
+          "delivery_date":"区间内最后购气日期","cishu":"区间内购气次数","pregas":"区间内购气量","collection":"区间内购气金额",
+          "diffday":"区间内未购气天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"},
         model: new PagedList('api/af-revenue/sql/inspectList', 50,{startDate:'this.model.startDate',endDate:'this.model.endDate'},{pregas: 0}),
         rows: null,
         //orgid:'',
@@ -451,15 +461,15 @@
     },
     watch:{
       meter_classify(val){
-        if (val === '卡表') {
+        if (val.includes('卡表')) {
           this.model.url = this.url = 'api/af-revenue/sql/inspectList'
           this.sqlName = 'inspectList'
           this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
             "f_user_name":"客户名称","f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址",
             "f_createfile_date":"建档日期","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
-            "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量",
-            "diffday":"累计未购气天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"}
+            "delivery_date":"区间内最后购气日期","cishu":"区间内购气次数","pregas":"区间内购气量","collection":"区间内购气金额",
+            "diffday":"区间内未购气天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"}
         }else if (val === '机表') {
           this.model.url = this.url = 'api/af-revenue/sql/handinspectList'
           this.sqlName = 'handinspectList'
@@ -467,8 +477,8 @@
             "f_user_name":"客户名称","f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址",
             "f_createfile_date":"建档日期","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
-            "delivery_date":"最后抄表日期","cishu":"总抄表次数","pregas":"抄表气量",
-            "diffday":"累计未抄表天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"}
+            "delivery_date":"区间内最后抄表日期","cishu":"区间内抄表次数","pregas":"区间内抄表气量",
+            "diffday":"区间内未抄表天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"}
         } else if (val === '物联网表') {
           this.model.url = this.url = 'api/af-revenue/sql/getWebMeterList'
           this.sqlName = 'getWebMeterList'
@@ -476,8 +486,8 @@
             "f_user_name":"客户名称","f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址",
             "f_createfile_date":"建档日期", "f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
-            "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购金额",
-            "diffday":"累计未购气天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"}
+            "delivery_date":"区间内最后购气日期","cishu":"区间内购气次数","pregas":"区间内购气金额",
+            "diffday":"区间内未购气天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期"}
         }
         this.clear()
         this.model.rows = []
@@ -607,6 +617,7 @@
           this.$showMessage('请选择气表类型。。。')
           return
         }
+        this.model.params.meter_classify = this.meter_classify
         args.condition = args.condition+ ` ${this.filialeCodeStr}`
         this.model.search(args.condition, args.model)
       },
@@ -618,7 +629,7 @@
           if(key != 'startDate' && key != 'endDate')
             this.$refs.paged.$refs.cri.model[key] = []
         })
-        this.$refs.paged.$refs.cri.model.startDate =  this.$login.toStandardDateString()
+        this.$refs.paged.$refs.cri.model.startDate =  this.$login.toStartAndEndDateString()[0]
         this.$refs.paged.$refs.cri.model.endDate =  this.$login.toStandardDateString()
       }
     },

package/src/filiale/jingyang/ChargeQuery.vue CHANGED Viewed

@@ -974,7 +974,7 @@
         rowdata:{},
         initres: {
           org:[this.$login.f.orgid],
-          dep:[],
+          dep:[this.$login.f.depids],
           user:[]
         },
         model: new PagedList('api/af-revenue/sql/chargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`},{

package/src/filiale/jingyang/NewGasStatistics.vue CHANGED Viewed

@@ -287,6 +287,12 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               三阶气费合计:&emsp;{{sumsmodel.f_stair3fee}}
             </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              非民用气量合计:&emsp;{{sumsmodel.f_fmy_gas}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              非民用气费合计:&emsp;{{sumsmodel.f_fmy_fee}}
+            </td>
           </tr>
         </table>
       </div>
@@ -347,7 +353,9 @@
           f_stairamount2:0,
           f_stair2fee:0,
           f_stairamount3:0,
-          f_stair3fee:0
+          f_stair3fee:0,
+          f_fmy_gas:0,
+          f_fmy_fee:0
         }),
         showbottomsum:false  //页面下方是否有合计: 默认为false, 在watch修改
       }

package/src/filiale/jingyang/usergas.vue CHANGED Viewed

@@ -148,7 +148,7 @@
 </template>
 <script>
 import { PagedList } from 'vue-client'
-import defaultPrint from '../config/DefaultPrint'
+import defaultPrint from './config/DefaultPrint'
 import exportConfig from './config/exportConfig.js'
 let readySomething = async function(self) {
   self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]