manage-client 3.2.140 → 3.2.144

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

@@ -2,260 +2,252 @@
   <div id="unit" class="flex-row">
     <div class="basic-main">
       <div class="flex" v-if="!show">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
-          <div class="row">
-            <div class="col-sm-2">
-              <label class="font_normal_body">公&emsp;&emsp;司</label>
-              <right-tree @re-res="$parent.$parent.getorg"
-                          :initresid='$parent.$parent.org'></right-tree>
-            </div>
-
-            <div class="col-sm-2 ">
-              <label v-if="$parent.$parent.meter_classify == '卡表'" for="startDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;购气开始</label>
-              <label v-else for="startDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;抄表开始</label>
-              <datepicker id="startDate" placeholder="开始日期"
-                          v-model="model.startDate"
-                          style="width:60%"
-                          :value.sync="model.startDate"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-2 ">
-              <label v-if="$parent.$parent.meter_classify == '卡表'" for="startDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;购气结束</label>
-              <label v-else for="startDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;抄表结束</label>
-              <datepicker id="endDate" placeholder="结束日期"
-                          v-model="model.endDate"
-                          style="width:60%"
-                          :value.sync="model.endDate"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-
-            <div class="col-sm-2 ">
-              <label for="f_gasproperties"class="font_normal_body">&nbsp;&nbsp;&nbsp;用气性质</label>
-              <v-select id="f_gasproperties"
-                        style="width:60%"
-                        v-model="model.f_gasproperties"
-                        placeholder='用气性质'
-                        :value.sync="model.f_gasproperties"
-                        :options='$parent.$parent.gasproperties'
-                        condition="f_gasproperties = '{}'"
-                        close-on-select >
-              </v-select>
-            </div>
-
-            <div class="span" style="float:right;">
-              <button class="btn button_search" @click="search()">查询</button>
-              <button class="btn button_clear" @click="$parent.$parent.clear()">清空</button>
-              <export-excel :data="$parent.$parent.getCondition"
-                            :field="$parent.$parent.getfield"
-                            :footer="$parent.$parent.footer"
-                            :header="$parent.$parent.other"
-                            sqlurl="rs/logic/exportfile"
-                            :sql-name="$parent.$parent.sqlName"
-                            template-name='购气稽查导出'  :choose-col="true"></export-excel>
-              <print-data :model="$parent.model" :field="$parent.$parent.getfield" :defaultfield="$parent.$parent.defaultfield" print-name="稽查查询打印" :sumsmodel="$parent.$parent.sumsmodel" ></print-data>
-              <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
-
-            </div>
-          </div>
-          <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="col-sm-2 flex-row">
-              <label class="font_normal_body" title="旧客户编号">档案编号</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
-                     condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
-            </div>
-            <div  v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap">
-              <label  class="font_normal_body">&nbsp;&nbsp;&nbsp;期间次数&nbsp;</label>
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
               <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.sellcishumin"
-                       condition="sellcishu >= {} " placeholder="">
-                <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.sellcishumax"
-                       condition="sellcishu <= {} " placeholder="">
-              </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">公&emsp;&emsp;&emsp;司</label>
+                  <right-tree @re-res="$parent.$parent.getorg"
+                              :initresid='$parent.$parent.org'></right-tree>
+                </div>
 
+                <div class="col-sm-2 ">
+                  <label v-if="$parent.$parent.meter_classify == '卡表'" for="startDate" class="font_normal_body">&emsp;购气开始</label>
+                  <label v-else for="startDate" class="font_normal_body">&emsp;抄表开始</label>
+                  <datepicker id="startDate" placeholder="开始日期"
+                              v-model="model.startDate"
+                              style="width:60%"
+                              :value.sync="model.startDate"
+                              :disabled-days-of-Week="[]"
+                              :format="'yyyy-MM-dd'"
+                              :show-reset-button="reset">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 ">
+                  <label v-if="$parent.$parent.meter_classify == '卡表'" for="startDate" class="font_normal_body">&emsp;购气结束</label>
+                  <label v-else for="startDate" class="font_normal_body">&emsp;抄表结束</label>
+                  <datepicker id="endDate" placeholder="结束日期"
+                              v-model="model.endDate"
+                              style="width:60%"
+                              :value.sync="model.endDate"
+                              :disabled-days-of-Week="[]"
+                              :format="'yyyy-MM-dd'"
+                              :show-reset-button="reset">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 ">
+                  <label for="f_meter_classify"class="font_normal_body">&emsp;&emsp;表类型</label>
+                  <v-select id="f_meter_classify"
+                            v-model="$parent.$parent.meter_classify"
+                            placeholder='表类型'
+                            style="width:70%"
+                            :value.sync="$parent.$parent.meter_classify"
+                            :options='$parent.$parent.f_meter_classify'
+                            condition="f_meter_type like '%{}'"
+                            :value-single="true"
+                            close-on-select >
+                  </v-select>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="btn button_search" @click="search()">查询</button>
+                  <button class="btn button_clear" @click="$parent.$parent.clear()">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                :sql-name="$parent.$parent.sqlName"
+                                template-name='购气稽查导出'  :choose-col="true"></export-excel>
+                  <print-data :model="$parent.model" :field="$parent.$parent.getfield" :defaultfield="$parent.$parent.defaultfield" print-name="稽查查询打印" :sumsmodel="$parent.$parent.sumsmodel" ></print-data>
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
 
-            </div>
-            <div  v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap">
-              <label  class="font_normal_body">&nbsp;&nbsp;&nbsp;期间次数&nbsp;</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.handsellcishumin"
-                       condition="sellcishu >= {} " placeholder="">
-                <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.handsellcishumax"
-                       condition="sellcishu <= {} " placeholder="">
+                </div>
               </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <div class="col-sm-2 ">
+                  <label for="f_gasproperties"class="font_normal_body">&emsp;用气性质</label>
+                  <v-select id="f_gasproperties"
+                            style="width:60%"
+                            v-model="model.f_gasproperties"
+                            placeholder='用气性质'
+                            :value.sync="model.f_gasproperties"
+                            :options='$parent.$parent.gasproperties'
+                            condition="f_gasproperties = '{}'"
+                            close-on-select >
+                  </v-select>
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body" title="旧客户编号">&emsp;档案编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
+                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
+                </div>
+                <div class="col-sm-2 ">
+                  <label for="contain_newfile" class="font_normal_body">包含新开户</label>
+                  <v-select id="contain_newfile"
+                            v-model="model.contain_newfile"
+                            style="width:60%"
+                            :value.sync="model.contain_newfile"
+                            :options='$parent.$parent.contain_newfiles'
+                            :value-single="true"
+                            close-on-select >
+                  </v-select>
+                </div>
+                <div class="col-sm-2" >
+                  <label  for="f_user_state" class="font_normal_body">&emsp;客户状态</label>
+                  <v-select :value.sync="model.f_user_state"
+                            v-model="model.f_user_state"
+                            :options='$parent.$parent.userstate' placeholder='请选择'
+                            condition="f_user_state = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 ">
+                  <label for="f_table_state"class="font_normal_body">&emsp;&emsp;表状态</label>
+                  <v-select id="f_table_state"
+                            style="width:60%"
+                            v-model="model.f_table_state"
+                            placeholder='表状态'
+                            :value.sync="model.f_table_state"
+                            :options='$parent.$parent.tablestate'
+                            condition="f_table_state = '{}'"
+                            close-on-select >
+                  </v-select>
+                </div>
 
-            </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;表号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 ">
+                  <label class="font_normal_body">&emsp;用户类型</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 v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap">
-              <label  class="font_normal_body">期间购气量&nbsp;</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.sellpregasmin"
-                       condition="sellpregas >= {} " placeholder="">
-                <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.sellpregasmax"
-                       condition="sellpregas <= {} " placeholder="">
-              </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">&emsp;客户名称</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">
+                  <label class="font_normal_body">&emsp;客户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">&emsp;客户地址</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">
+                  <label class="font_normal_body">&emsp;客户电话</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
+                         condition="f_user_phone like '%{}%'" placeholder="客户电话">
+                </div>
 
-            </div>
-            <div v-if="$parent.$parent.meter_classify == '机表'"  class="col-sm-2 flex-row" style="white-space: nowrap">
-              <label class="font_normal_body">期间用气量&nbsp;</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.handsellpregasmin"
-                       condition="sellpregas >= {} " placeholder="">
-                <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.handsellpregasmax"
-                       condition="sellpregas <= {} " placeholder="">
+                <div  v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap">
+                  <label  class="font_normal_body">&emsp;期间次数</label>
+                  <div class="row">
+                    <input type="text" style="width:30%" class="input_search" v-model="model.sellcishumin"
+                           condition="sellcishu >= {} " placeholder="">
+                    <label   class="font_normal_body">  ≤ x ≤ </label>
+                    <input type="text" style="width:30%" class="input_search" v-model="model.sellcishumax"
+                           condition="sellcishu <= {} " placeholder="">
+                  </div>
+                </div>
+                <div  v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap">
+                  <label  class="font_normal_body">&emsp;期间次数</label>
+                  <div class="row">
+                    <input type="text" style="width:30%" class="input_search" v-model="model.handsellcishumin"
+                           condition="sellcishu >= {} " placeholder="">
+                    <label   class="font_normal_body">  ≤ x ≤ </label>
+                    <input type="text" style="width:30%" class="input_search" v-model="model.handsellcishumax"
+                           condition="sellcishu <= {} " placeholder="">
+                  </div>
+                </div>
+                <div v-if="$parent.$parent.meter_classify == '卡表'" 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.sellpregasmin"
+                           condition="sellpregas >= {} " placeholder="">
+                    <label   class="font_normal_body">  ≤ x ≤ </label>
+                    <input type="text" style="width:30%" class="input_search" v-model="model.sellpregasmax"
+                           condition="sellpregas <= {} " placeholder="">
+                  </div>
+                </div>
+                <div v-if="$parent.$parent.meter_classify == '机表'"  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.handsellpregasmin"
+                           condition="sellpregas >= {} " placeholder="">
+                    <label   class="font_normal_body">  ≤ x ≤ </label>
+                    <input type="text" style="width:30%" class="input_search" v-model="model.handsellpregasmax"
+                           condition="sellpregas <= {} " placeholder="">
+                  </div>
+                </div>
               </div>
             </div>
-            <div class="col-sm-2 ">
-              <label for="contain_newfile" class="font_normal_body">包含新开户</label>
-              <v-select id="contain_newfile"
-                        v-model="model.contain_newfile"
-                        style="width:60%"
-                        :value.sync="model.contain_newfile"
-                        :options='$parent.$parent.contain_newfiles'
-                        :value-single="true"
-                        close-on-select >
-              </v-select>
-            </div>
-            <div class="col-sm-2 ">
-              <label for="f_meter_classify"class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;表类型</label>
-              <v-select id="f_meter_classify"
-                        v-model="$parent.$parent.meter_classify"
-                        placeholder='表类型'
-                        style="width:70%"
-                        :value.sync="$parent.$parent.meter_classify"
-                        :options='$parent.$parent.f_meter_classify'
-                        condition="f_meter_type like '%{}'"
-                        :value-single="true"
-                        close-on-select >
-              </v-select>
-            </div>
-            <div class="col-sm-2" >
-              <label  for="f_user_state" class="font_normal_body">客户状态</label>
-              <v-select :value.sync="model.f_user_state"
-                        v-model="model.f_user_state"
-                        :options='$parent.$parent.userstate' placeholder='请选择'
-                        condition="f_user_state = '{}'"
-                        close-on-select></v-select>
-            </div>
-            <div class="col-sm-2 ">
-              <label for="f_table_state"class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;表状态</label>
-              <v-select id="f_table_state"
-                        style="width:60%"
-                        v-model="model.f_table_state"
-                        placeholder='表状态'
-                        :value.sync="model.f_table_state"
-                        :options='$parent.$parent.tablestate'
-                        condition="f_table_state = '{}'"
-                        close-on-select >
-              </v-select>
-            </div>
-
-            <div class="col-sm-2">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表号</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
-                     condition="f_meternumber = '{}'" placeholder='表号'>
-            </div>
-            <div class="col-sm-2 ">
-              <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">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;客户名称</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">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;客户编号</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
-                     condition="f_userinfo_code = '{}' " placeholder="客户编号">
-            </div>
-            <div class="col-sm-2">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;客户地址</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">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;客户电话</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
-                     condition="f_user_phone like '%{}%'" placeholder="客户电话">
-            </div>
-
-          </div>
-
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid>
-        <template partial='head'>
-          <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 v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>总购气次数</nobr></th>-->
-<!--            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>总抄表次数</nobr></th>-->
-<!--            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>总购气量</nobr></th>-->
-<!--            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>总抄表气量</nobr></th>-->
-            <th v-show="$parent.$parent.$parent.meter_classify == '卡表' || $parent.$parent.$parent.meter_classify =='物联网表'"><nobr>期间购气次数</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>期间抄表次数</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify == '卡表' || $parent.$parent.$parent.meter_classify == '物联网表'"><nobr>期间购气量</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>期间抄表气量</nobr></th>
-<!--            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>累计未购气天数</nobr></th>-->
-<!--            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>累计未抄表天数</nobr></th>-->
-            <th><nobr>组织机构</nobr></th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td style="text-align: center;"><nobr>{{$index+1}}</nobr></td>
-          <td style="text-align: center;"><nobr>
-            <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
-          </nobr> </td>
-          <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
-          <th style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_address}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_table_state}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.delivery_date}}</nobr></th>
-<!--          <th style="text-align: center;"><nobr>{{row.cishu}}</nobr></th>-->
-<!--          <th style="text-align: center;"><nobr>{{row.pregas}}</nobr></th>-->
-          <th style="text-align: center;"><nobr>{{row.sellcishu}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.sellpregas}}</nobr></th>
-<!--          <th style="text-align: center;"><nobr>{{row.diffday}}</nobr></th>-->
-          <th style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></th>
-        </template>
-      </data-grid>
-    </criteria-paged>
+          </criteria>
+          <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid>
+            <template partial='head'>
+              <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 v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>总购气次数</nobr></th>-->
+    <!--            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>总抄表次数</nobr></th>-->
+    <!--            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>总购气量</nobr></th>-->
+    <!--            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>总抄表气量</nobr></th>-->
+                <th v-show="$parent.$parent.$parent.meter_classify == '卡表' || $parent.$parent.$parent.meter_classify =='物联网表'"><nobr>期间购气次数</nobr></th>
+                <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>期间抄表次数</nobr></th>
+                <th v-show="$parent.$parent.$parent.meter_classify == '卡表' || $parent.$parent.$parent.meter_classify == '物联网表'"><nobr>期间购气量</nobr></th>
+                <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>期间抄表气量</nobr></th>
+    <!--            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>累计未购气天数</nobr></th>-->
+    <!--            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>累计未抄表天数</nobr></th>-->
+                <th><nobr>组织机构</nobr></th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;"><nobr>{{$index+1}}</nobr></td>
+              <td style="text-align: center;"><nobr>
+                <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+              </nobr> </td>
+              <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
+              <th style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></th>
+              <th style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></th>
+              <th style="text-align: center;"><nobr>{{row.f_address}}</nobr></th>
+              <th style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></th>
+              <th style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></th>
+              <th style="text-align: center;"><nobr>{{row.f_table_state}}</nobr></th>
+              <th style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></th>
+              <th style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></th>
+              <th style="text-align: center;"><nobr>{{row.delivery_date}}</nobr></th>
+    <!--          <th style="text-align: center;"><nobr>{{row.cishu}}</nobr></th>-->
+    <!--          <th style="text-align: center;"><nobr>{{row.pregas}}</nobr></th>-->
+              <th style="text-align: center;"><nobr>{{row.sellcishu}}</nobr></th>
+              <th style="text-align: center;"><nobr>{{row.sellpregas}}</nobr></th>
+    <!--          <th style="text-align: center;"><nobr>{{row.diffday}}</nobr></th>-->
+              <th style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></th>
+            </template>
+          </data-grid>
+        </criteria-paged>
         <table class="table-hover">
           <tr style="position: relative" class="table-bordered">
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
@@ -265,7 +257,7 @@
             <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">期间抄表气量合计:&emsp;{{sumsmodel.sellpregas}}</td>
           </tr>
         </table>
-  </div>
+      </div>
       <div class="flex" v-if="show">
         <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
       </div>

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

@@ -79,7 +79,7 @@
                   <nobr>本期结余</nobr>
                 </th>
                 <th>
-                  <nobr>气费滞纳金</nobr>
+                  <nobr>气费违约金</nobr>
                 </th>
                 <th>
                   <nobr>退费</nobr>
@@ -91,7 +91,7 @@
                   <nobr>冲正金额</nobr>
                 </th>
                 <th>
-                  <nobr>冲正滞纳金</nobr>
+                  <nobr>冲正违约金</nobr>
                 </th>
                 <th>
                   <nobr>发卡数</nobr>
@@ -154,7 +154,7 @@
               售气金额合计:&emsp;{{sumsmodel.f_preamount}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              气费滞纳金合计:&emsp;{{sumsmodel.f_delaypay}}
+              气费违约金合计:&emsp;{{sumsmodel.f_delaypay}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               退费合计:&emsp;{{sumsmodel.f_returnfee}}
@@ -166,7 +166,7 @@
               冲正金额合计:&emsp;{{sumsmodel.f_czpreamount}}
             </td>
            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              冲正滞纳金合计:&emsp;{{sumsmodel.f_czdelaypay}}
+              冲正违约金合计:&emsp;{{sumsmodel.f_czdelaypay}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               发卡数合计:&emsp;{{sumsmodel.fkcardnum}}