manage-client 4.0.7 → 4.0.9

package/package.json

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

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

@@ -84,6 +84,14 @@
                             close-on-select></v-select>
                   <!--:options='$parent.$parent.fillGasTypes' placeholder='请选择'-->
                 </div>
+                <div class="col-sm-2 form-group" v-if="$parent.$parent.isChangeTableAndFillGas">
+                  <label class="font_normal_body">换表类型</label>
+                  <v-select :value.sync="model.f_type_table"
+                            v-model="model.f_type_table"
+                            :options='$parent.$parent.changeTypes' placeholder='请选择'
+                            condition="f_type_table = '{}'"
+                            close-on-select></v-select>
+                </div>
 
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">卡&emsp;&emsp;号</label>
@@ -142,6 +150,7 @@
                             condition="f_gasproperties = '{}'"
                             close-on-select></v-select>
                 </div>
+
               </div>
 
             </div>
@@ -191,6 +200,9 @@
                   <nobr>补气类型</nobr>
                 </th>
                 <th>
+                  <nobr>换表类型</nobr>
+                </th>
+                <th>
 <!--                  <nobr>补气日期</nobr>-->
                   <data-order field="f_operate_date" name="补气日期"
                               :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
@@ -248,6 +260,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_type}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_type_table}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
@@ -418,6 +433,8 @@
           this.model.paramSource.orderitem = `'${field} ${rule}'`
         }
 
+        console.log("==========================",this.model.f_type)
+        console.log("==========================",this.$refs.paged.$refs.cri.model.f_type.includes('换表补气'))
         this.search()
       },
       search(){
@@ -545,6 +562,7 @@
     },
     watch: {
       'all'(val) {
+        console.log("==========================",this.$refs.paged.$refs.criteria.model.f_type)
         if (val) {
           this.modelval = this.bodyData
         } else {
@@ -571,6 +589,9 @@
       }
     },
     computed: {
+      isChangeTableAndFillGas() {
+        return this.$refs.paged.$refs.cri.model.f_type.includes('换表补气')
+      },
       getCondition() {
         return {
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
@@ -585,6 +606,9 @@
       chargeState() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('补气状态')]
       },
+      changeTypes() {
+        return  [{label: '全部', value: ''}, ...this.$appdata.getParam('换表类型')]
+      },
       usertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       }

package/src/filiale/fugou/UserQuery.vue

@@ -357,6 +357,9 @@
                   <th>
                     <nobr>表号</nobr>
                   </th>
+                  <th>
+                    <nobr>表封号</nobr>
+                  </th>
                   <th>
                     <nobr>小区</nobr>
                   </th>
@@ -401,6 +404,12 @@
                   <th>
                     <nobr>缴费编号</nobr>
                   </th>
+                  <th>
+                    <nobr>挂表人</nobr>
+                  </th>
+                  <th>
+                    <nobr>通气人</nobr>
+                  </th>
                   <th>
                     <nobr>通气状态</nobr>
                   </th>
@@ -458,6 +467,9 @@
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_meternumber}}</nobr>
                 </td>
+                <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_metertitles}}</nobr>
+                </td>
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_residential_area}}</nobr>
                 </td>
@@ -500,6 +512,12 @@
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr><span v-if="row.f_cost_type =='银行代扣'">{{row.f_bank_pay_number}}</span></nobr>
                 </td>
+                <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_gas_person}}</nobr>
+                </td>
+                <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_install_person}}</nobr>
+                </td>
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_address_state}}</nobr>
                 </td>

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

@@ -26,7 +26,11 @@ export default {
     'f_inputtor': '抄表员',
     'f_bank_idnumber': '银行身份证号',
     'f_bank_pay_number': '缴费编号',
-    'f_gas_date': '通气时间'
+    'f_gas_date': '通气时间',
+    'f_meternumber': '表号',
+    'f_metertitles': '表封号',
+    'f_gas_person': '通气人',
+    'f_install_person': '挂表人'
   },
 
     // 垃圾费查询