manage-client 3.3.129 → 3.3.130

package/package.json

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

package/src/components/webmeter/gasStatistics/GasStatistics.vue

@@ -282,6 +282,9 @@
       </div>
     </div>
   </div>
+  <div  class="flex-row" style="width:99%;height:98%;margin-bottom:0px" v-if="showdetail">
+    <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+  </div>
 </template>
 
 <script>
@@ -318,6 +321,7 @@
         sumsmodel: {},
         orgid:[this.$login.f.orgid],
         criteriaShow:false,
+        showdetail:false,
         //默认打印列
         defaultfield: [],
         orgCondtionStr: '',
@@ -390,7 +394,7 @@
         this.criteriaShow = !this.criteriaShow
       },
       cancel() {
-        this.show = false
+        this.showdetail = false
       },
       clearmsg () {
         Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
@@ -404,7 +408,7 @@
       },
       showmsg(obj){
         this.rowdata=obj
-        this.show=true
+        this.showdetail=true
       },
 
       search (args) {

package/src/components/webmeter/gasStatistics/NewGasStatistics.vue

@@ -291,6 +291,9 @@
       </div>
     </div>
   </div>
+  <div  class="flex-row" style="width:99%;height:98%;margin-bottom:0px" v-if="showdetail">
+    <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+  </div>
 </template>
 
 <script>
@@ -327,6 +330,7 @@
         sumsmodel: {},
         orgid:[this.$login.f.orgid],
         criteriaShow:false,
+        showdetail:false,
         //默认打印列
         defaultfield: [],
         orgCondtionStr: '',
@@ -400,7 +404,7 @@
         this.criteriaShow = !this.criteriaShow
       },
       cancel() {
-        this.show = false
+        this.showdetail = false
       },
       clearmsg () {
         Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
@@ -414,7 +418,7 @@
       },
       showmsg(obj){
         this.rowdata=obj
-        this.show=true
+        this.showdetail=true
       },
 
       search (args) {

package/src/components/webmeter/operationValueRecord.vue

@@ -107,6 +107,26 @@
                             v-model="model.f_end_date"
                 ></datepicker>
               </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">操作类型</label>
+                <v-select
+                  :options='$parent.$parent.operatetypes'
+
+                  :value.sync="model.f_instruct_title"
+                  close-on-select
+                  condition="f_instruct_title='{}'"
+                  placeholder='操作类型'
+                  style="width:60%"
+                  v-model="model.f_instruct_title">
+                </v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">气表类型</label>
+                <v-select :value.sync="model.f_meter_type" multiple
+                          :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
+                          condition="s.f_meter_type in {}"
+                          close-on-select></v-select>
+              </div>
             </div>
           </div>
         </criteria>
@@ -306,13 +326,18 @@
 
     },
     computed: {
-     userType () {
+      userType () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
-       Gasproperties () {
-      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
-    }
-
+      Gasproperties () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+      },
+      operatetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('开关阀操作类型')]
+      },
+      metertypes () {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+      }
     }
   }
 </script>

package/src/filiale/haile/exportConfig.js

@@ -98,7 +98,7 @@ export default{
     'f_curbalance': '本期结余', 'f_type': '收费类型', 'f_payment': '付款方式', 'f_bank_type': '支付渠道', 'f_state': '状态', 'f_operate_date': '收费日期', 'f_serial_id': '流水号',
     '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_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费', 'f_fm_state': '阀门状态', 'f_fm_reason': '开关阀原因',
     'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_inputtor': '抄表员','f_residential_area':'小区','f_serial_number':'业务单号', 'f_user_comments': '用户档案备注'
   },
   loginQueryConfig:{

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

@@ -553,6 +553,12 @@
                   <th>
                       <nobr>三阶气费</nobr>
                   </th>
+                  <th>
+                      <nobr>阀门状态</nobr>
+                  </th>
+                  <th>
+                      <nobr>开关阀原因</nobr>
+                  </th>
 
                 <th><nobr>附件</nobr></th>
               </tr>
@@ -770,6 +776,12 @@
                 <td style="text-align: center;">
                     <nobr>{{(row.f_stair3fee - 0).toFixed(2)}}</nobr>
                 </td>
+                <td style="text-align: center;">
+                    <nobr>{{row.f_fm_state}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                    <nobr>{{row.f_fm_reason}}</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/kelai/exportConfig.js

@@ -1052,7 +1052,7 @@ export default{
     'f_orgname': '所属公司'
   },
   reportDetailConfig: {
-    'f_userinfo_code': '用户编号', 'f_user_name': '用户名称', 'f_address': '用户地址', 'f_user_phone': '联系方式',
+    'f_userinfo_code': '用户编号', 'f_slice_area': '所属片区', 'f_user_name': '用户名称', 'f_address': '用户地址', 'f_user_phone': '联系方式',
     'f_user_nature': '用户类型', 'f_meternumber': '表号', 'f_serial_id': '支付流水号',
     'f_type': '收费类型', 'f_brand_spec': '规格名称', 'f_typenumber': '型号', 'f_unitprice': '单价','f_number': '数量',
     'f_collection': '收款', 'f_payment': '付款方式', 'f_operate_date': '收费日期', 'f_state': '状态',

package/src/filiale/kelai/feimin_style.vue

@@ -75,6 +75,9 @@
                 <th>
                   <nobr>用户编号</nobr>
                 </th>
+                <th>
+                  <nobr>所属片区</nobr>
+                </th>
                 <th>
                   <nobr>用户名称</nobr>
                 </th>
@@ -85,7 +88,7 @@
                   <nobr>单价</nobr>
                 </th>
                 <th>
-                  <nobr>总购气量</nobr>
+                  <nobr>户总购气量</nobr>
                 </th>
                 <th>
                   <nobr>本月购气量</nobr>
@@ -117,6 +120,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_userinfo_code}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_slice_area}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
@@ -173,7 +179,7 @@
               汇总信息
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              总购气量汇总:&emsp;{{sumsmodel.zgougas.toFixed(2)}}
+              户总购气量汇总:&emsp;{{sumsmodel.zgougas.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.gougas.toFixed(2)}}

package/src/filiale/ningjin/GasStatistics.vue

@@ -279,6 +279,9 @@
       </div>
     </div>
   </div>
+  <div  class="flex-row" style="width:99%;height:98%;margin-bottom:0px" v-if="showdetail">
+    <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+  </div>
 </template>
 
 <script>
@@ -315,6 +318,7 @@
         sumsmodel: {},
         orgid:[this.$login.f.orgid],
         criteriaShow:false,
+        showdetail:false,
         //默认打印列
         defaultfield: [],
         orgCondtionStr: '',
@@ -387,7 +391,7 @@
         this.criteriaShow = !this.criteriaShow
       },
       cancel() {
-        this.show = false
+        this.showdetail = false
       },
       clearmsg () {
         Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
@@ -401,7 +405,7 @@
       },
       showmsg(obj){
         this.rowdata=obj
-        this.show=true
+        this.showdetail=true
       },
 
       search (args) {

package/src/filiale/qianneng/ArrearsQuery.vue

@@ -116,13 +116,13 @@
                          condition="f_meter_book_sort = '{}'" placeholder="册内序号">
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" >表册抄表员</label>
+                  <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>
                   <v-select :value.sync="model.f_inputtor"
                             v-model="model.f_inputtor"
                             :options='$parent.$parent.inputtores' placeholder='请选择'
                             condition="f_inputtor = '{}'"
                             @change="$parent.$parent.inputtorchange"
-                            close-on-select :search="false">
+                            close-on-select :search="true">
                   </v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -227,11 +227,6 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.c"
                          condition="c > '{}'" 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.c"
-                         condition="f_hand_inputtor like '%{}%'" placeholder='实际抄表员'>
-                </div>
 
               </div>
             </div>