manage-client 3.2.300 → 3.3.2

package/src/filiale/shanxian/FmyGasDeviceQuery.vue

@@ -93,6 +93,29 @@
                     <input type="number" style="width:60%" class="input_search" v-model="model.diffAllyear2"
                            condition="diffAllyear <= {}" placeholder="最大值">
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">客户类型</label>
+                    <v-select
+                      :value.sync="model.f_user_type"
+                      @change="$parent.$parent.userTypeChange()"
+                      :options="$parent.$parent.usertypes"
+                      placeholder="请选择"
+                      v-model="model.f_user_type"
+                      condition="f_user_type = '{}'"
+                      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"
+                      :options="$parent.$parent.gasproperties"
+                      placeholder="请选择"
+                      condition="f_gasproperties = '{}'"
+                      close-on-select
+                    ></v-select>
+                  </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
                     <v-select :value.sync="model.f_residential_area"
@@ -113,26 +136,30 @@
               <template partial='head'>
                 <tr>
                   <th rowspan="2"><nobr>序号</nobr></th>
-                  <th colspan="10"><nobr>用户信息</nobr></th>
+                  <th colspan="12"><nobr>用户信息</nobr></th>
                   <th colspan="8"><nobr>燃气计量装置</nobr></th>
                   <th colspan="6"><nobr>控制器设备</nobr></th>
                   <th colspan="6"><nobr>燃气连接管</nobr></th>
                   <th colspan="7"><nobr>调压设备</nobr></th>
                   <th colspan="11"><nobr>燃气报警器装置</nobr></th>
-                  <th colspan="6"><nobr>建档信息</nobr></th>
+                  <th colspan="5"><nobr>建档信息</nobr></th>
                   <th colspan="6"><nobr>安检信息</nobr></th>
+                  <th colspan="2"><nobr>初次充值信息</nobr></th>
+                  <th colspan="2"><nobr>最新充值信息</nobr></th>
                   <th rowspan="2"><nobr>备注</nobr></th>
                 </tr>
 
                 <tr>
-                  <th><nobr>营业执照名称</nobr></th>
                   <th><nobr>统一社会信用代码</nobr></th>
+                  <th><nobr>单位名称</nobr></th>
+                  <th><nobr>经营名称</nobr></th>
+                  <th><nobr>经营场所</nobr></th>
                   <th><nobr>法定代表人/经营者</nobr></th>
+                  <th><nobr>电话号码</nobr></th>
                   <th><nobr>身份证号</nobr></th>
-                  <th><nobr>联系人</nobr></th>
-                  <th><nobr>联系电话</nobr></th>
-                  <th><nobr>项目名称</nobr></th>
-                  <th><nobr>项目地址</nobr></th>
+                  <th><nobr>代理人</nobr></th>
+                  <th><nobr>身份证号(代理人)</nobr></th>
+                  <th><nobr>代理人电话</nobr></th>
                   <th><nobr>用气设备</nobr></th>
                   <th><nobr>变更记录</nobr></th>
 
@@ -183,15 +210,22 @@
                   <th><nobr>供用气合同编号</nobr></th>
                   <th><nobr>通气日期</nobr></th>
                   <th><nobr>通气人员</nobr></th>
-                  <th><nobr>通气年限</nobr></th>
+<!--                  <th><nobr>通气年限</nobr></th>-->
                   <th><nobr>变更记录</nobr></th>
 
                   <th><nobr>安检日期</nobr></th>
                   <th><nobr>安检人员</nobr></th>
                   <th><nobr>用气总量</nobr></th>
-                  <th><nobr>剩余气量</nobr></th>
+                  <th><nobr>充值次数</nobr></th>
+<!--                  <th><nobr>剩余气量</nobr></th>-->
                   <th><nobr>发现问题</nobr></th>
                   <th><nobr>整改日期</nobr></th>
+
+                  <th><nobr>充值金额</nobr></th>
+                  <th><nobr>充值日期</nobr></th>
+
+                  <th><nobr>充值金额</nobr></th>
+                  <th><nobr>充值日期</nobr></th>
                 </tr>
               </template>
               <template partial='body'>
@@ -202,17 +236,17 @@
                 <!--用户信息-->
                 <td style="text-align: center;">
                   <nobr>
-                    {{row.f_paper_name}}
+                    {{row.f_taxpayer_id}}
                   </nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_taxpayer_id}}</nobr>
+                  <nobr>{{row.f_paper_name}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_legal_name}}</nobr>
+                  <nobr>{{row.f_user_name}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_idnumber}}</nobr>
+                  <nobr>{{row.f_address}}</nobr>
                 </td>
                 <td style="text-align: center;">
                   <nobr>{{row.f_legal_name}}</nobr>
@@ -221,13 +255,19 @@
                   <nobr>{{row.f_user_phone}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_user_name}}</nobr>
+                  <nobr>{{row.f_idnumber}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_address}}</nobr>
+                  <nobr>{{row.f_agent_name}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_agent_credentials}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_agent_phone}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_meter_brand}}</nobr>
+                  <nobr></nobr>
                 </td>
                 <td style="text-align: center;">
                   <nobr>
@@ -384,9 +424,9 @@
                 <td style="text-align: center;">
                   <nobr>{{row.f_gas_person}}</nobr>
                 </td>
-                <td style="text-align: center;" :style="$parent.$parent.$parent.ventilationYear(row.diffallyear)">
-                  <nobr>{{row.ventilation_years}}</nobr>
-                </td>
+<!--                <td style="text-align: center;" :style="$parent.$parent.$parent.ventilationYear(row.diffallyear)">-->
+<!--                  <nobr>{{row.ventilation_years}}</nobr>-->
+<!--                </td>-->
                 <td style="text-align: center;">
                   <nobr>
                     <span @click="$parent.$parent.$parent.dealmsg(row,'','建档信息')"><a><b>变更记录</b></a></span>
@@ -403,9 +443,9 @@
                 <td style="text-align: center;">
                   <nobr>{{row.f_total_gas}}</nobr>
                 </td>
-                <td style="text-align: center;">
-                  <nobr>{{row.f_balance_gas}}</nobr>
-                </td>
+<!--                <td style="text-align: center;">-->
+<!--                  <nobr>{{row.f_balance_gas}}</nobr>-->
+<!--                </td>-->
                 <td style="text-align: center;">
                   <nobr>{{row.f_defect_content}}</nobr>
                 </td>
@@ -413,6 +453,20 @@
                   <nobr>{{row.f_repair_date}}</nobr>
                 </td>
 
+                <td style="text-align: center;">
+                  <nobr>{{row.f_collection}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_operate_date}}</nobr>
+                </td>
+
+                <td style="text-align: center;">
+                  <nobr>{{row.f_collection1}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_operate_date1}}</nobr>
+                </td>
+
                 <!--备注-->
                 <td style="text-align: center;">
                   <nobr>{{row.f_comments}}</nobr>
@@ -472,6 +526,7 @@
         titles:'',
         other:[],
         footer:[],
+        gasproperties: [],
         model: new PagedList('rs/sql/fmyGasDeviceQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userinfo_code desc'`}),
         criteriaShow: false,
         orgCondtionStr: '',
@@ -671,6 +726,20 @@
           return
         }
       },
+      userTypeChange() {
+        this.gasproperties = [];
+        if (this.$refs.paged.$refs.cri.model !== null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties = "";
+
+          // console.log("查看客户类型",this.$refs.paged.$refs.cri.model.f_user_type[0])
+          this.gasproperties = this.$appdata.getParam(
+            this.$refs.paged.$refs.cri.model.f_user_type[0]
+          );
+          // this.gasproperties.push({label: '全部', value: ''})
+        } else {
+          this.gasproperties = [{ label: "全部", value: "" }];
+        }
+      },
       //把数据库查询数据转换为下拉数据
       calculate(rows){
         let data = []
@@ -833,6 +902,12 @@
       getExportField() {
         return exportConfig.userConfig
       },
+      usertypes() {
+        return [
+          { label: " 全部 ", value: "" },
+          ...this.$appdata.getParam("用户类型"),
+        ];
+      },
       addressstate() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]
       }

package/src/filiale/shanxian/GasDeviceQuery.vue

@@ -457,10 +457,10 @@
 
                 <!--每年充值-->
                 <td style="text-align: center;">
-                  <nobr>{{row.yeartimes}}</nobr>
+                  <nobr>{{row.f_max_operate_date}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_preamount_all}}</nobr>
+                  <nobr>{{row.f_max_preamount}}</nobr>
                 </td>
 
                 <!--安检信息-->
@@ -483,7 +483,7 @@
                   <!--<nobr>{{row.f_balance_gas}}</nobr>-->
                 <!--</td>-->
                 <td style="text-align: center;">
-                  <nobr>{{row.f_defect_content}}</nobr>
+                  <nobr>{{$parent.$parent.$parent.trouble(row.f_defect_content)}}</nobr>
                 </td>
                 <td style="text-align: center;">
                   <nobr>{{row.f_complete}}</nobr>
@@ -633,6 +633,22 @@
       })
     },
     methods: {
+      //转换json数值
+      trouble(val) {
+        const defect_content = JSON.parse(val)
+        let result = ''
+        if (defect_content.data) {
+          const jsonData = defect_content.data
+          for (const itemdata of jsonData) {
+            const keys = Object.keys(itemdata)
+            for (const itm of keys) {
+              const value = itemdata[itm]
+              result += itm + ':' + value
+            }
+          }
+        }
+        return result
+      },
       async dealmsg(row,id,type){
         this.titles = type+'变更记录'
         this.filechangeHistorys.rows = []