manage-client 3.3.1 → 3.3.3

package/src/filiale/shanxian/FmyGasDeviceQuery.vue

@@ -136,13 +136,14 @@
               <template partial='head'>
                 <tr>
                   <th rowspan="2"><nobr>序号</nobr></th>
-                  <th colspan="12"><nobr>用户信息</nobr></th>
+                  <th colspan="11"><nobr>用户信息</nobr></th>
+                  <th colspan="5"><nobr>建档信息</nobr></th>
+                  <th colspan="8"><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="5"><nobr>建档信息</nobr></th>
                   <th colspan="6"><nobr>安检信息</nobr></th>
                   <th colspan="2"><nobr>初次充值信息</nobr></th>
                   <th colspan="2"><nobr>最新充值信息</nobr></th>
@@ -160,10 +161,24 @@
                   <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>
+                  <th><nobr>变更记录</nobr></th>
+
+                  <th><nobr>品牌</nobr></th>
                   <th><nobr>编号</nobr></th>
                   <th><nobr>类型</nobr></th>
                   <th><nobr>型号</nobr></th>
@@ -206,12 +221,7 @@
                   <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>
@@ -267,11 +277,57 @@
                   <nobr>{{row.f_agent_phone}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr></nobr>
+                  <nobr>
+                    <span @click="$parent.$parent.$parent.dealmsg(row,'','用户信息')"><a><b>变更记录</b></a></span>
+                  </nobr>
+                </td>
+
+
+                <!--建档信息-->
+                <td style="text-align: center;">
+                  <nobr>{{row.f_createfile_date}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_contract_id}}</nobr>
+                </td>
+                <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>
-                    <span @click="$parent.$parent.$parent.dealmsg(row,'','用户信息')"><a><b>变更记录</b></a></span>
+                    <span @click="$parent.$parent.$parent.dealmsg(row,'','建档信息')"><a><b>变更记录</b></a></span>
+                  </nobr>
+                </td>
+
+
+                <!--用气设备-->
+                <td style="text-align: center;">
+                  <nobr>{{row.f_zx}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_bzl}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_syz}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_dyz}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_rsq}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_dgz}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_gl}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>
+                    <span @click="$parent.$parent.$parent.dealmsg(row,'','用气设备')"><a><b>变更记录</b></a></span>
                   </nobr>
                 </td>
 
@@ -411,27 +467,6 @@
                   </nobr>
                 </td>
 
-                <!--建档信息-->
-                <td style="text-align: center;">
-                  <nobr>{{row.f_createfile_date}}</nobr>
-                </td>
-                <td style="text-align: center;">
-                  <nobr>{{row.f_contract_id}}</nobr>
-                </td>
-                <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;" :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>
-                  </nobr>
-                </td>
 
                 <!--安检信息-->
                 <td style="text-align: center;">

package/src/filiale/shanxian/InspectListUserNew.vue

@@ -11,27 +11,22 @@
               <right-tree @re-res="$parent.$parent.getorg"
                           :initresid='$parent.$parent.org'></right-tree>
             </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_residential_area"
+                     condition="f_residential_area like '%{}%'" 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.f_user_name"
                      condition="f_user_name like '%{}%'" placeholder="用户名称">
             </div>
             <div class="col-sm-2  form-group">
-              <label class="font_normal_body">用户地址</label>
+              <label class="font_normal_body">详细地址</label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
                      condition="f_address like '%{}%'" placeholder='用户地址'>
             </div>
-            <div class="col-sm-2 flex-row" style="white-space: nowrap">
-              <label class="font_normal_body">未购天数</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.diffdaymin"
-                       condition="diffday >= {} " placeholder="">
-                <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.diffdaymax"
-                       condition="diffday <= {} " placeholder="">
-              </div>
 
-            </div>
 
             <div class="span" style="float:right;">
               <button class="btn button_search" @click="search()">查询</button>
@@ -93,11 +88,7 @@
                         condition="f_user_state = '{}'"
                         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_residential_area"
-                     condition="f_residential_area like '%{}%'" placeholder="小区名称">
-            </div>
+
             <div class="col-sm-2 form-group">
               <label for="f_table_state" class="font_normal_body">&emsp;表状态</label>
               <v-select id="f_table_state"
@@ -110,6 +101,17 @@
                         close-on-select >
               </v-select>
             </div>
+            <div class="col-sm-2 flex-row" style="white-space: nowrap">
+              <label class="font_normal_body">未购天数</label>
+              <div class="row">
+                <input type="text" style="width:30%" class="input_search" v-model="model.diffdaymin"
+                       condition="diffday >= {} " placeholder="">
+                <label   class="font_normal_body">  ≤ x ≤ </label>
+                <input type="text" style="width:30%" class="input_search" v-model="model.diffdaymax"
+                       condition="diffday <= {} " placeholder="">
+              </div>
+
+            </div>
             <div class="col-sm-2 form-group" >
               <label class="font_normal_body">总购次数</label>
 <!--              <label class="font_normal_body" v-else>抄表次数</label>-->

package/src/filiale/shanxian/LostContactAnalysisList.vue

@@ -12,21 +12,21 @@
               <!--</div>-->
 
               <div class="col-sm-2 form-group">
-                <label class="font_normal_body">客户编号</label>
+                <label class="font_normal_body">{{$parent.$parent.usertitle}}编号</label>
                 <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
-                       v-model="model.f_userinfo_code" placeholder='客户编号'
+                       v-model="model.f_userinfo_code" placeholder='用户编号'
                        condition="f_userinfo_code like '%{}%'" v-el:xq v-next-el='userinfocode' v-el:username
                 >
               </div>
               <div class="col-sm-2 form-group">
-                <label class="font_normal_body">客户名称</label>
+                <label class="font_normal_body">{{$parent.$parent.usertitle}}名称</label>
                 <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
-                       v-model="model.f_user_name" placeholder='客户名称'
+                       v-model="model.f_user_name" placeholder='用户名称'
                        condition="f_user_name like '%{}%'" v-el:xq v-next-el='username' v-el:username
                 >
               </div>
               <div class="col-sm-2 form-group">
-                <label class="font_normal_body">客户地址</label>
+                <label class="font_normal_body">{{$parent.$parent.usertitle}}地址</label>
                 <input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_area"
                        placeholder='地址'
                        condition="f_address like '%{}%'" v-el:xq v-next-el='address' v-el:area
@@ -59,10 +59,10 @@
                           :initresid='$parent.$parent.org'></right-tree>
             </div>
             <div class="col-sm-2 form-group">
-              <label class="font_normal_body">客户类型</label>
+              <label class="font_normal_body">{{$parent.$parent.usertitle}}类型</label>
               <v-select style="width:60%" id="f_user_type"
                         v-model="model.f_user_type"
-                        placeholder='客户类型'
+                        placeholder='用户类型'
                         :value.sync="model.f_user_type"
                         @change="$parent.$parent.userTypeChange()"
                         :options='$parent.$parent.usertypes'
@@ -202,10 +202,10 @@
             <!--:thead='"<th>序号</th>\n"+-->
             <!--"<th>档案编号</th>" +-->
             <!--" <th>档案标识</th>"+-->
-            <!--"<th>客户名称</th>"+-->
+            <!--"<th>用户名称</th>"+-->
             <!--"<th>表号</th"+-->
             <!--"<th>表具类型</th>"+-->
-            <!--"<th>客户类型</th>"+-->
+            <!--"<th>用户类型</th>"+-->
             <!--"<th>区域</th>"+-->
             <!--"<th>小区</th>"+-->
             <!--"<th>地址</th>"+-->
@@ -217,7 +217,7 @@
             <!--:fields='["$index+1","f_username","f_meternumber","f_usertype","f_save_money","f_operate_status","f_close_reason","f_area","f_districtname","f_address","id","yytdepa"]'>-->
             <!--</print-table>-->
             <!--<export-excel :data="{orderitem: 'lastinputdate desc', condition: '1=1'}"-->
-            <!--:field="{f_username: '客户名称', f_meternumber: '表号',f_usertype:'客户类型',f_save_money:'剩余金额',-->
+            <!--:field="{f_username: '用户名称', f_meternumber: '表号',f_usertype:'用户类型',f_save_money:'剩余金额',-->
             <!--f_operate_status:'状态',f_close_reason:'关阀原因',f_area:'区域',f_districtname:'小区', f_address: '地址',id:'档案编号',yytdepa:'所属机构'}"-->
             <!--sqlurl="rs/sql/getUserGas"></export-excel>-->
         </div>
@@ -229,16 +229,16 @@
               <nobr>序号</nobr>
             </th>
             <th style="text-align:center">
-              <nobr>客户编号</nobr>
+              <nobr>{{$parent.$parent.$parent.usertitle}}编号</nobr>
             </th>
             <th style="text-align:center">
-              <nobr>客户名称</nobr>
+              <nobr>{{$parent.$parent.$parent.usertitle}}名称</nobr>
             </th>
             <th style="text-align:center">
-              <nobr>客户地址</nobr>
+              <nobr>{{$parent.$parent.$parent.usertitle}}地址</nobr>
             </th>
             <th style="text-align:center">
-              <nobr>客户类型</nobr>
+              <nobr>{{$parent.$parent.$parent.usertitle}}类型</nobr>
             </th>
             <th style="text-align:center">
               <nobr>用气性质</nobr>
@@ -366,8 +366,8 @@
           endDate: 'this.model.endDate'
         }),
         getfield:{
-          "f_userinfo_code":"客户编号","f_user_name":"客户名称","f_residential_area":"小区",
-          "f_address":"客户地址","f_user_type":"客户类型","f_gasproperties":"用气性质",
+          "f_userinfo_code":"用户编号","f_user_name":"用户名称","f_residential_area":"小区",
+          "f_address":"用户地址","f_user_type":"用户类型","f_gasproperties":"用气性质",
           "f_meternumber":"表号",
 
           "f_startuse_date":"启用日期",
@@ -385,6 +385,7 @@
         outlets: [],
         gasproperties:[{label: '全部', value: ''}],
         operator: [],
+        usertitle: this.$appdata.getSingleValue('用户名称前缀') ? this.$appdata.getSingleValue('用户名称前缀') : '客户',
         WarningType: [
           {label: '全部', value: ''}
         ],
@@ -401,7 +402,7 @@
         condition: '1=1',
         groupname: ['max_days_type'],
         getgroupname: [
-          {label: '客户类型', value: 'f_user_type'},
+          {label: '用户类型', value: 'f_user_type'},
           {label: '用气性质', value: 'f_gasproperties'},
           {label: '分公司', value: 'f_orgname'},
           {label: '最长失联天数', value: 'max_days_type'},
@@ -569,7 +570,7 @@
     },
     computed: {
       // usertypes () {
-      //   return this.$appdate.getParams("客户类型")
+      //   return this.$appdate.getParams("用户类型")
       // },
       getCondition() {
         let condition=this.$refs.paged.$refs.cri.condition + this.orgCondtionStr