manage-client 3.3.90 → 3.3.92

package/src/filiale/WEINAN/ManageCompanyGasManage.vue

@@ -6,7 +6,7 @@
                                   :style="style">
       </manage-company-gas-summary>
     </div>
-    <div v-show="showDetail" class="binary-right">
+    <div v-if="showDetail" class="binary-right">
       <div class="flex">
         <manage-company-gas-detail v-if="showDetail" :data="row">
         </manage-company-gas-detail>
@@ -36,6 +36,10 @@ export default {
         this.row = obj.val
         this.row.startDate = this.$refs.gas.$refs.paged.$refs.cri.model.startDate
         this.row.endDate = this.$refs.gas.$refs.paged.$refs.cri.model.endDate
+        this.row.f_user_type = this.$refs.gas.$refs.paged.$refs.cri.model.f_user_type
+        this.row.f_user_usetype = this.$refs.gas.$refs.paged.$refs.cri.model.f_user_usetype
+        this.row.f_user_usenature = this.$refs.gas.$refs.paged.$refs.cri.model.f_user_usenature
+        this.row.f_use_institution = this.$refs.gas.$refs.paged.$refs.cri.model.f_use_institution
       }
     },
     refresh () {
@@ -45,6 +49,7 @@ export default {
     'cancel' () {
       this.style = 'col-sm-2 form-group'
       this.row = null
+      this.$refs.gas.$refs.paged.$refs.grid.cleanSelected()
       this.showDetail = false
     }
   }

package/src/filiale/WEINAN/ManageCompanyGasSummary.vue

@@ -100,13 +100,12 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label for="f_user_usetype" class="font_normal_body ">用气类型</label>
-                  <v-select :value.sync="model.f_user_usetype" :search="false"
+                  <v-select :value.sync="model.f_userusetype" :search="false"
                             @change="$parent.$parent.userUseTypeChange()"
-                            v-model="model.f_user_usetype"
-                            :value-single="true"
+                            v-model="model.f_userusetype"
+                            :multiple="true"
                             :options='$parent.$parent.userusetypes'
-                            placeholder='用气类型'
-                            close-on-select>
+                            placeholder='用气类型'>
                   </v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -369,11 +368,11 @@ export default {
       this.userusetypes = []
       this.userusenatures = []
       this.useinstitutions = []
-      this.$refs.paged.$refs.cri.model.f_user_usetype = ''
+      this.$refs.paged.$refs.cri.model.f_userusetype = []
       this.$refs.paged.$refs.cri.model.f_use_institution = ''
       this.$refs.paged.$refs.cri.model.f_user_usenature = ''
       if (this.$refs.paged.$refs.cri.model.f_user_type) {
-          let str = this.$refs.paged.$refs.cri.model.f_user_type + '用气类型'
+        let str = this.$refs.paged.$refs.cri.model.f_user_type + '用气类型'
         this.userusetypes = this.$appdata.getParam(str)
       }
     },
@@ -382,10 +381,18 @@ export default {
       this.userusenatures = []
       this.$refs.paged.$refs.cri.model.f_use_institution = ''
       this.$refs.paged.$refs.cri.model.f_user_usenature = ''
-      if (this.$refs.paged.$refs.cri.model.f_user_usetype) {
-        let str = this.$refs.paged.$refs.cri.model.f_user_usetype + '机构'
-        this.useinstitutions = this.$appdata.getParam(str)
+      if (this.$refs.paged.$refs.cri.model.f_userusetype.length > 0) {
+        for (var i = 0; i < this.$refs.paged.$refs.cri.model.f_userusetype.length; i++) {
+          let str = this.$refs.paged.$refs.cri.model.f_userusetype[i] + '机构'
+          let getParam = this.$appdata.getParam(str)
+          Array.prototype.push.apply(this.useinstitutions, getParam);
+        }
       }
+      let temp = {}
+      this.useinstitutions = this.useinstitutions.filter(function(item) {
+        var key = JSON.stringify(item);
+        return temp.hasOwnProperty(key) ? false : (temp[key] = true);
+      });
     },
     userUseInstitutionChange () {
       this.userusenatures = []
@@ -432,6 +439,11 @@ export default {
     },
     async selfSearch (args) {
       let companyCondition2 = '1=1'
+      if (this.$refs.paged.$refs.cri.model.f_userusetype.length > 0) {
+        this.$refs.paged.$refs.cri.model.f_user_usetype = this.appendCondition(this.$refs.paged.$refs.cri.model.f_userusetype)
+      } else {
+        this.$refs.paged.$refs.cri.model.f_user_usetype = ''
+      }
       if (!this.orgConditionStr) {
         args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
       } else {

package/src/filiale/WEINAN/ManageSummaryReport.vue

@@ -79,7 +79,6 @@
                   <v-select :value.sync="model.f_user_type"
                             :options='$parent.$parent.usertypes'
                             placeholder='请选择' v-model="model.f_user_type"
-                            condition="f_user_type = '{}'"
                             :value-single="true"
                             @change="$parent.$parent.userTypeChange()"
                             close-on-select></v-select>
@@ -89,11 +88,10 @@
                   <v-select :value.sync="model.f_user_usetype" :search="false"
                             @change="$parent.$parent.userUseTypeChange()"
                             v-model="model.f_user_usetype"
-                            :value-single="true"
+                            :multiple="true"
                             :options='$parent.$parent.userusetypes'
-                            condition="f_user_usetype = '{}'"
-                            placeholder='用气类型'
-                            close-on-select>
+                            condition="f_user_usetype in {}"
+                            placeholder='用气类型'>
                   </v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -441,7 +439,7 @@ export default {
       this.userusetypes = []
       this.userusenatures = []
       this.useinstitutions = []
-      this.$refs.paged.$refs.cri.model.f_user_usetype = ''
+      this.$refs.paged.$refs.cri.model.f_user_usetype = []
       this.$refs.paged.$refs.cri.model.f_use_institution = ''
       this.$refs.paged.$refs.cri.model.f_user_usenature = ''
       if (this.$refs.paged.$refs.cri.model.f_user_type) {
@@ -454,10 +452,18 @@ export default {
       this.userusenatures = []
       this.$refs.paged.$refs.cri.model.f_use_institution = ''
       this.$refs.paged.$refs.cri.model.f_user_usenature = ''
-      if (this.$refs.paged.$refs.cri.model.f_user_usetype) {
-        let str = this.$refs.paged.$refs.cri.model.f_user_usetype + '机构'
-        this.useinstitutions = this.$appdata.getParam(str)
+      if (this.$refs.paged.$refs.cri.model.f_user_usetype.length > 0) {
+        for (var i = 0; i < this.$refs.paged.$refs.cri.model.f_user_usetype.length; i++) {
+          let str = this.$refs.paged.$refs.cri.model.f_user_usetype[i] + '机构'
+          let getParam = this.$appdata.getParam(str)
+          Array.prototype.push.apply(this.useinstitutions, getParam);
+        }
       }
+      let temp = {}
+      this.useinstitutions = this.useinstitutions.filter(function(item) {
+        var key = JSON.stringify(item);
+        return temp.hasOwnProperty(key) ? false : (temp[key] = true);
+      });
     },
     userUseInstitutionChange () {
       this.userusenatures = []
@@ -519,6 +525,11 @@ export default {
           companyCondition2 = companyCondition2 + ' and id in (' + await this.appendCondition(args.model.f_residential_area_id) + ')'
         }
       }
+      if (this.$refs.paged.$refs.cri.model.f_user_type == '民用' && !this.$refs.paged.$refs.cri.model.f_user_usetype[0]) {
+        args.condition = args.condition + " and f_user_usetype in ('居民用气')"
+      } else if (this.$refs.paged.$refs.cri.model.f_user_type == '非民用' && !this.$refs.paged.$refs.cri.model.f_user_usetype[0]) {
+        args.condition = args.condition + " and f_user_usetype in ('公福用气','商业用户','工业用户')"
+      }
       args.model.condition2 = companyCondition2
       this.condition = args.condition
       console.log("查看条件",this.condition)

package/src/filiale/haile/exportConfig.js

@@ -99,7 +99,7 @@ export default{
     'f_delaypay': '违约金', 'f_comments': '备注', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
     'f_yucun': '预存金额', 'f_card_id': '卡号', 'f_stairamount1': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',
     'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
-    'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_inputtor': '抄表员','f_residential_area':'小区','f_serial_number':'业务单号'
+    'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_inputtor': '抄表员','f_residential_area':'小区','f_serial_number':'业务单号', 'f_user_comments': '用户档案备注'
   },
   loginQueryConfig:{
     'userid': '登录人编号','username': '登录人名称', 'logindate': '登录时间', 'type': '类型'

package/src/filiale/haile/sale/businessquery/ChargeQuery.vue

@@ -550,6 +550,9 @@
                   <th>
                       <nobr>三阶气费</nobr>
                   </th>
+                  <th>
+                      <nobr>用户档案备注</nobr>
+                  </th>
 
                 <th><nobr>附件</nobr></th>
               </tr>
@@ -764,6 +767,9 @@
                 <td style="text-align: center;">
                     <nobr>{{(row.f_stair3fee - 0).toFixed(2)}}</nobr>
                 </td>
+                <td style="text-align: center;">
+                    <nobr>{{row.f_user_comments}}</nobr>
+                </td>
               <td style="text-align: center;"><nobr>
                 <button style=" height: 28px;line-height: 16px;" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
               </nobr></td>

package/src/filiale/yuansheng/DayReportList.vue

@@ -50,13 +50,6 @@
                         condition="f_state in {}"
                         close-on-select></v-select>
             </div>
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">缴费渠道</label>
-              <v-select :value.sync="model.f_payment" v-model="model.f_payment"
-                        :options='$parent.$parent.paymentchannels' placeholder='请选择'
-                        condition="f_payment {} "
-                        close-on-select></v-select>
-            </div>
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">气表品牌</label>
               <v-select :value.sync="model.f_meter_brand" multiple
@@ -93,7 +86,7 @@
               <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
                      condition="f_address like '%{}%'" placeholder='客户地址'>
             </div>
-            <div :class="$parent.$parent.style">
+            <div :class="$parent.$parent.style" title="参数名称:【付款方式查询】">
               <label class="font_normal_body">付款方式</label>
               <v-select id="f_payment"
                         v-model="model.f_payment"
@@ -445,7 +438,7 @@ export default {
       return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
     },
     payments() {
-      return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式查询')]
     },
     sellstate() {
       return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('收费状态')]

package/src/reportManage.js

@@ -708,4 +708,33 @@ export default function () {
   Vue.component('genera-hand-report', (resolve) => {
     require(['./components/handReport/GeneraHandReport'], resolve)
   })
+  // 抄表用气性质统计报表
+  Vue.component('hand-price-report', (resolve) => {
+    require(['./components/handReport/HandPriceReport.vue'], resolve)
+  })
+  // 抄表气价统计报表
+  Vue.component('hand-gasproperties-report', (resolve) => {
+    require(['./components/handReport/HandGaspropertiesReport.vue'], resolve)
+  })
+  // 抄表性质统计报表
+  Vue.component('web-gastype-report', (resolve) => {
+    require(['./components/handReport/WebGastypeReport.vue'], resolve)
+  })
+
+  // 收费日统计报表
+  Vue.component('day-sell-summary', (resolve) => {
+    require(['./components/SellReport/daySellSummary'], resolve)
+  })
+  // 收费月统计报表
+  Vue.component('month-sell-summary', (resolve) => {
+    require(['./components/SellReport/monthSellSummary'], resolve)
+  })
+  // 补气费统计报表
+  Vue.component('manage-fillgas-summary', (resolve) => {
+    require(['./components/SellReport/FillGasSummary'], resolve)
+  })
+  //  补卡费统计报表
+  Vue.component('manage-fillcard-summary', (resolve) => {
+    require(['./components/SellReport/FillCardSummary'], resolve)
+  })
 }