manage-client 4.0.80 → 4.0.81

package/package.json

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

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

@@ -1672,6 +1672,7 @@ export default {
   defaultDataReportConfig: {
     'f_userinfo_code': '客户编号',
     'f_user_name': '客户姓名',
+    'f_zones': '区/县',
     'f_address': '地址',
     'f_gasproperties': '用气性质',
     'f_operate_date': '充值时间',

package/src/filiale/lixianV3/RecordInfoQuery.vue

@@ -505,6 +505,23 @@
                       close-on-select>
                     </v-select>
                   </div>
+                  <div class="col-sm-2 form-group" title="参数名称：【有无铅封】">
+                    <label class="font_normal_body">有无铅封</label>
+                    <v-select
+                      placeholder='有无铅封'
+                      :value.sync="$parent.$parent.f_hasseal"
+                      style="width:60%"
+                      :value-single="true"
+                      v-model="$parent.$parent.f_hasseal"
+                      :options='$parent.$parent.hasseal'
+                      close-on-select>
+                    </v-select>
+                  </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.f_seal_number"
+                           condition="f_seal_number = '{}'" placeholder='铅封编号'>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -563,6 +580,9 @@
                   <th>
                     <nobr>防盗卡号</nobr>
                   </th>
+                  <th>
+                    <nobr>铅封编号</nobr>
+                  </th>
                   <th>
                     <nobr>品牌</nobr>
                   </th>
@@ -737,6 +757,9 @@
                 <td style="text-align: center;"><nobr>{{row.f_gas_date}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_gas_person}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_defendcard}}</nobr></td>
+
+                <td style="text-align: center;"><nobr>{{row.f_seal_number}}</nobr></td>
+
                 <td style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_meter_type}}</nobr></td>
@@ -1407,6 +1430,9 @@
       positions() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('安装位置')]
       },
+      hasseal() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('有无铅封')]
+      },
       // meterbooks(){
       //   return [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
       // },

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

@@ -520,6 +520,8 @@ export default {
     'f_price_name': '气价名称',
     'f_position': '安装位置',
     'f_meter_type': '类型',
+    'f_hasseal': '有无铅封',
+    'f_seal_number': '铅封编号',
     'f_meter_brand': '品牌',
     'f_meternumber': '表号',
     'f_metertitles': '表封号',

package/src/filiale/rongcheng/businessquery/ChangeMeterQuery.vue

@@ -172,6 +172,17 @@
                             close-on-select clear-button>
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">换表方式</label>
+                  <v-select id="f_meter_change_type"
+                            v-model="model.f_meter_change_type"
+                            placeholder='请选择'
+                            condition="f_meter_change_type ='{}'"
+                            :value.sync="model.f_meter_change_type"
+                            :options='$parent.$parent.meter_change'
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">表&emsp;&emsp;号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
@@ -233,6 +244,9 @@
                 <th>
                   <nobr>换表类型</nobr>
                 </th>
+                <th>
+                  <nobr>换表方式</nobr>
+                </th>
                 <th>
                   <nobr>换表费</nobr>
                 </th>
@@ -328,6 +342,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_type}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_change_type}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_changemeter_fee}}</nobr>
               </td>
@@ -785,6 +802,9 @@
     check_state(){
       return [{label: '通过', value: "通过"},{label: '未通过', value: '未通过'}]
     },
+    meter_change(){
+      return [{label: '线上换表', value: "线上换表"},{label: '线下换表', value: '线下换表'}]
+    },
     payments() {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
     }

package/src/filiale/rongcheng/exportConfig.js

@@ -208,6 +208,7 @@ export default {
     'f_address': '客户地址',
     'f_meternumber': '表号',
     'f_type': '换表类型',
+    'f_meter_change_type': '换表方式',
     'f_changemeter_fee': '换表费',
     'f_meter_base': '旧表底数',
     'f_newmeter_base': '新表底数',