manage-client-xy 3.1.98 → 3.2.0

package/build/dev-server.js

@@ -19,8 +19,11 @@ var proxyTable = {
   // '/rs/logic/exportfile': {
   //   target: 'http://127.0.0.1:9014/'
   // },
-  '/rs/sql/GMHgasQuery': {
-    target: bendi
+  '/rs/sql/cancelAccountQuery': {
+    target: 'http://127.0.0.1:9019/'
+  },
+  '/rs/sql/cancelAccountQuery/': {
+    target: 'http://127.0.0.1:9019/'
   },
   '/rs/sql/GMHgasQuery/': {
     target: bendi
@@ -29,7 +32,7 @@ var proxyTable = {
     target: fuwu
   },
   '/rs/sql': {
-    target: bendi
+    target: fuwu
   },
   // 查找资源服务数据
   '/rs/search': {
@@ -72,7 +75,7 @@ var proxyTable = {
     target: fuwu
   },
   '/rs/report': {
-    target: bendi
+    target: fuwu
   },
   '/rs/vue': {
     target: fuwu

package/package.json

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

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

@@ -46,6 +46,9 @@
       <tabs-manage header="开户查询">
         <new-account-query v-if="show[13]" @deal-msg="dealMsg"></new-account-query>
       </tabs-manage>
+      <tabs-manage header="销户查询">
+        <cancel-account-query v-if="show[13]" @deal-msg="dealMsg"></cancel-account-query>
+      </tabs-manage>
       <tabs-manage header="通气统计">
         <residential-query v-if="show[14]" @deal-msg="dealMsg"></residential-query>
       </tabs-manage>

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

@@ -22,9 +22,9 @@
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
                               v-model="model.startDate"
                               :value.sync="model.startDate"
-                              :format="'yyyy-MM-dd'"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
                               :show-reset-button="true"
-                              condition="f_operate_date >= to_date('{} 00:00:00','yyyy-mm-dd hh24:mi:ss')">
+                              condition="f_operate_date >= to_date('{}','yyyy-mm-dd hh24:mi:ss')">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -32,9 +32,9 @@
                   <datepicker id="endDate" placeholder="结束日期" style="width:60%"
                               v-model="model.endDate"
                               :value.sync="model.endDate"
-                              :format="'yyyy-MM-dd'"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
                               :show-reset-button="true"
-                              condition="f_operate_date <= to_date('{} 23:59:59','yyyy-mm-dd hh24:mi:ss')">
+                              condition="f_operate_date <= to_date('{}','yyyy-mm-dd hh24:mi:ss')">
                   </datepicker>
                 </div>
                 <div class="span" style="float:right;">
@@ -223,82 +223,91 @@
     </header>
     <article class="modal-body" slot="modal-body">
       <div style="min-height: 600px; overflow-y: auto; padding: 20px;">
-        <!-- 上部：原用户信息 -->
-        <div style="display: flex; margin-bottom: 20px;">
-          <!-- 原用户信息 -->
-          <div style="flex: 1; margin-right: 20px;">
-            <h5>原用户信息</h5>
-            <div class="col-sm-12">
-              <label class="font_normal_body">原用户名</label>
-              <input type="text" style="width:100%;" class="input_search" v-model="transferInfo.f_user_name" readonly="true" placeholder="原用户名">
-            </div>
-            <div class="col-sm-12 form-group form-fix-width">
-              <label class="font_normal_body">原用户手机号</label>
-              <input type="text" style="width:100%;" class="input_search" v-model="transferInfo.f_user_phone" readonly="true" placeholder="原用户手机号">
-            </div>
-            <div class="col-sm-12 form-group form-fix-width">
-              <label class="font_normal_body">原用户证件号</label>
-              <input type="text" style="width:100%;" class="input_search" v-model="transferInfo.f_idnumber" readonly="true" placeholder="原用户证件号">
-            </div>
-          </div>
-          <!-- 原用户材料图片展示 -->
-          <div style="flex: 1; border: 1px dashed #ccc; padding: 10px;">
-            <p>原用户材料图片</p>
-            <div style="display: flex; flex-wrap: wrap; gap: 10px;" v-if="imgList.length">
-              <!-- 使用 v-for 循环遍历图片列表 -->
-              <img-self
-                v-for="(index, img) in imgList"
-                :key="index"
-                :src="img.imgUrl"
-                :alt="'原用户材料图片 ' + (index + 1)"
-                :width="100" :height="100"
-              ></img-self>
+        <!-- 上部：原用户信息、新用户信息、材料展示区 -->
+        <div style="display: flex; flex-direction: column; gap: 20px;">
+          <!-- 原用户信息和新用户信息 -->
+          <div>
+            <!-- 原用户信息 -->
+            <div class="row" style="margin-top:10px;">
+              <h5>原用户信息</h5>
+              <div class="col-sm-6 form-group">
+                <label class="font_normal_body">原用户名</label>
+                <input type="text" style="width:60%;" class="input_search" v-model="transferInfo.f_user_name" readonly="true" placeholder="原用户名">
+              </div>
+              <div class="col-sm-6 form-group">
+                <label class="font_normal_body">原用户手机号</label>
+                <input type="text" style="width:60%;" class="input_search" v-model="transferInfo.f_user_phone" readonly="true" placeholder="原用户手机号">
+              </div>
+              <div class="col-sm-6 form-group">
+                <label class="font_normal_body">原用户证件号</label>
+                <input type="text" style="width:60%;" class="input_search" v-model="transferInfo.f_idnumber" readonly="true" placeholder="原用户证件号">
+              </div>
             </div>
-            <div v-else style="display: flex; flex-wrap: wrap; gap: 10px;">
-              暂无
+
+            <!-- 新用户信息 -->
+            <div  class="row" style="margin-top:10px;">
+              <h5>新用户信息</h5>
+              <div class="col-sm-6">
+                <label class="font_normal_body">新用户名</label>
+                <input type="text" style="width:60%;" class="input_search" v-model="transferInfo.f_newuser_name" readonly="true" placeholder="新用户名">
+              </div>
+              <div class="col-sm-6 form-group">
+                <label class="font_normal_body">新用户手机号</label>
+                <input type="text" style="width:60%;" class="input_search" v-model="transferInfo.f_newuser_phone" readonly="true" placeholder="新用户手机号">
+              </div>
+
+              <div class="col-sm-6 form-group">
+                <label class="font_normal_body">新用户证件类型</label>
+                <input type="text" style="width:60%;" class="input_search" v-model="transferInfo.f_newcredentials" readonly="true" placeholder="新用户证类型">
+              </div>
+              <div class="col-sm-6 form-group">
+                <label class="font_normal_body">新用户证件号</label>
+                <input type="text" style="width:60%;" class="input_search" v-model="transferInfo.f_newidnumber" readonly="true" placeholder="新用户证件号">
+              </div>
             </div>
           </div>
-        </div>
 
-        <!-- 下部：新用户信息 -->
-        <div style="display: flex;">
-          <!-- 新用户信息 -->
-          <div style="flex: 1; margin-right: 20px;">
-            <h5>新用户信息</h5>
-            <div class="col-sm-12">
-              <label class="font_normal_body">新用户名</label>
-              <input type="text" style="width:100%;" class="input_search" v-model="transferInfo.f_newuser_name" readonly="true" placeholder="新用户名">
+          <!-- 材料展示区 -->
+          <div>
+            <div v-if="imgList.f_idimglist.length >0"  class="col-sm-12 form-group" style="margin-top: 10px;padding: 10px">
+              <label class="col-sm-3 control-label text-left">原户主证件材料：</label>
+              <div v-for="row in imgList.f_idimglist" class="col-sm-3">
+                <img-self :src="row.imgUrl" alt="图片加载失败" :width="100" :height="100"></img-self>
+              </div>
             </div>
-            <div class="col-sm-12 form-group form-fix-width">
-              <label class="font_normal_body">新用户手机号</label>
-              <input type="text" style="width:100%;" class="input_search" v-model="transferInfo.f_newuser_phone" readonly="true" placeholder="新用户手机号">
+            <div v-if="imgList.f_houseimglist.length >0"  class="col-sm-12 form-group" style="margin-top: 10px;padding: 10px">
+              <label class="col-sm-3 control-label text-left">原户主房屋材料：</label>
+              <div v-for="row in imgList.f_houseimglist" class="col-sm-3">
+                <img-self :src="row.imgUrl" alt="图片加载失败" :width="100" :height="100"></img-self>
+              </div>
             </div>
-            <div class="col-sm-12 form-group form-fix-width">
-              <label class="font_normal_body">新用户证件号</label>
-              <input type="text" style="width:100%;" class="input_search" v-model="transferInfo.f_newidnumber" readonly="true" placeholder="新用户证件号">
+            <div v-if="newImgList.f_meterimglist.length >0"  class="col-sm-12 form-group" style="margin-top: 10px;padding: 10px">
+              <label class="col-sm-3 control-label text-left">气表照片：</label>
+              <div  v-for="row in newImgList.f_meterimglist" class="col-sm-3">
+                <img-self  :src="row.imgUrl" alt="图片加载失败" :width="100" :height="100"></img-self>
+              </div>
             </div>
-          </div>
-          <!-- 新用户材料图片展示 -->
-          <div style="flex: 1; border: 1px dashed #ccc; padding: 10px;">
-            <p>新用户材料图片</p>
-            <div style="display: flex; flex-wrap: wrap; gap: 10px;" v-if="newImgList.length">
-              <!-- 使用 v-for 循环遍历图片列表 -->
-              <img-self
-                v-for="(index,img) in newImgList"
-                :key="index"
-                :src="img.imgUrl"
-                :alt="'新用户材料图片 ' + (index + 1)"
-                :width="100" :height="100"
-              ></img-self>
+            <div v-if="newImgList.f_newidimglist.length >0"  class="col-sm-12 form-group" style="margin-top: 10px;padding: 10px">
+              <label class="col-sm-3 control-label text-left">新户主证件材料：</label>
+              <div  v-for="row in newImgList.f_newidimglist" class="col-sm-3">
+                <img-self  :src="row.imgUrl" alt="图片加载失败" :width="100" :height="100"></img-self>
+              </div>
             </div>
-            <div v-else style="display: flex; flex-wrap: wrap; gap: 10px;">
-              暂无
+            <div v-if="newImgList.f_newhouseimglist.length >0"  class="col-sm-12 form-group" style="margin-top: 10px;padding: 10px">
+              <label class="col-sm-3 control-label text-left">新户主房屋材料：</label>
+              <div  v-for="row in newImgList.f_newhouseimglist" class="col-sm-3">
+                <img-self  :src="row.imgUrl" alt="图片加载失败" :width="100" :height="100"></img-self>
+              </div>
             </div>
           </div>
         </div>
-        <div class="col-sm-12">
-          <label class="font_normal_body">审核员备注</label>
-          <input type="text" style="width:100%;" class="input_search" v-model="transferInfo.f_comments" readonly="true" placeholder="审核员备注">
+
+        <!-- 下部：审核员备注 -->
+        <div style="margin-top: 20px;">
+          <div class="col-sm-12">
+            <label class="font_normal_body">审核员备注</label>
+            <input type="text" style="width:100%;" class="input_search" v-model="transferInfo.f_comments" readonly="true" placeholder="审核员备注">
+          </div>
         </div>
       </div>
     </article>
@@ -314,8 +323,8 @@
   import exportConfig from '../config/exportConfig'
 
   let readySomething = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
-    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
     // await self.$refs.paged.$refs.cri.search()
     await self.$MagLoadParams.loadParam()
 
@@ -356,8 +365,8 @@
         sumsmodel: {},
         handshow: false,
         transferInfo: {},
-        newImgList: [],
-        imgList: []
+        newImgList: {},
+        imgList: {}
       }
     },
     ready() {
@@ -371,13 +380,13 @@
     },
     methods: {
       handchange(val) {
-        this.imgList = []
-        this.newImgList = []
+        this.imgList = {}
+        this.newImgList = {}
         if (val) {
           console.log("开启弹窗")
           this.transferInfo = val
-          this.imgList = this.transferInfo.f_imglist ? JSON.parse(this.transferInfo.f_imglist) : []
-          this.newImgList = this.transferInfo.f_newimglist ? JSON.parse(this.transferInfo.f_newimglist) : []
+          this.imgList = this.transferInfo.f_imglist ? JSON.parse(this.transferInfo.f_imglist) : {}
+          this.newImgList = this.transferInfo.f_newimglist ? JSON.parse(this.transferInfo.f_newimglist) : {}
         } else {
           console.log("返回置空")
           this.transferInfo = {}

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

@@ -0,0 +1,488 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <div class="flex" v-if="!showinfo">
+
+        <criteria-paged :model="model" v-ref:paged @sort="sort">
+          <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 form-group">
+                  <label class="font_normal_body">客户编号</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 form-group">
+                  <label for="startDate" class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd'"
+                              :show-reset-button="true"
+                              condition="f_operate_date >= to_date('{} 00:00:00','yyyy-mm-dd hh24:mi:ss')">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd'"
+                              :show-reset-button="true"
+                              condition="f_operate_date <= to_date('{} 23:59:59','yyyy-mm-dd hh24:mi:ss')">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select :value.sync="model.f_meter_brand"
+                            v-model="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
+
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="rs/logic/exportfile" sql-name="newAccountQuery" template-name='开户查询导出'
+                                :choose-col="true"></export-excel>
+
+                  <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 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_user_mold"
+                            @change="$parent.$parent.userMoldChange"
+                            :options='$parent.$parent.usermold' placeholder='请选择' v-model="model.f_user_mold"
+                            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>
+                <res-select-group style="col-sm-2 form-group" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <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_address"
+                         condition="f_address 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 for="f_area_id" class="font_normal_body">小区编码</label>
+                  <input id="f_area_id" type="text" style="width:60%" class="input_search" v-model="model.f_area_id"
+                         condition="f_area_id = '{}'" placeholder='小区编码'>
+                </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"
+                            class="select_list select"
+                            enter-push
+                            multiple = "true"
+                            v-model="model.f_residential_area"
+                            style="width: 60%"
+                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                            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_operator"
+                         condition="f_operator 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>
+                  <data-order field="f_address" name="客户地址"></data-order>
+                </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'>
+              <td style="text-align: center;">
+                <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_phone}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_idnumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_price_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operate_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meternumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gas_person}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gas_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gasproperties}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_total_gas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_brand}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_comments}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+      <div v-if="showinfo">
+        <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import defaultPrint from '../config/DefaultPrint'
+import exportConfig from '../config/exportConfig'
+import plugins from '../../../plugins/GetLoginInfoService'
+
+let readySomething = async function (self) {
+  self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
+  self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+  // await self.$refs.paged.$refs.cri.search()
+  await self.$MagLoadParams.loadParam()
+  self.initParams()
+
+  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+}
+export default {
+  title: '销户统计',
+  data() {
+    return {
+      data: {},
+      initres: {
+        org:[this.$login.f.orgid],
+        dep:[],
+        user:[],
+      },
+      gasproperties:[],
+      usermold:[],
+      orderFields: {
+        f_address: 'no'
+      },
+      orderDefault: "'f_operate_date desc'",
+      model: new PagedList('rs/sql/cancelAccountQuery', 20,{orderitem: "'f_operate_date desc'"}),
+      f_orgid: this.$login.f.orgid,
+      criteriaShow: false,
+      modelval: [],
+      printshow: false,
+      all: false,
+      fields: {},
+      thead: '',
+      tfoot: '',
+      orgCondtionStr: '(' + this.$login.f.orgid + ')',
+      // orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
+      meterbrands: [],
+      showinfo:false,
+      jurisdiction:this.$login.r,
+      rowdata:{},
+      //合计数据
+      sumsmodel: {},
+      residentialArea:[],
+      area:[]
+    }
+  },
+  ready() {
+    this.getaddress()
+
+    readySomething(this).then(() => {
+      this.$emit('ready')
+    }).catch((error) => {
+      this.$emit('error', error)
+    })
+  },
+  methods: {
+    userTypeChange () {
+      this.usermold=[]
+      this.f_gasproperties=[]
+      if(this.$refs.paged.$refs.cri.model !== null) {
+        this.$refs.paged.$refs.cri.model.f_gasproperties=''
+        this.$refs.paged.$refs.cri.model.f_user_mold=''
+        this.usermold = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+      }
+      else{
+        this.usermold =[{label: '全部', value: ''}]
+      }
+    },
+    userMoldChange () {
+      this.gasproperties=[]
+      if(this.$refs.paged.$refs.cri.model !==null) {
+        this.$refs.paged.$refs.cri.model.f_gasproperties=''
+        if (this.$refs.paged.$refs.cri.model.f_user_mold[0] ==='居民'){
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0] + this.$refs.paged.$refs.cri.model.f_user_mold[0])
+          return
+        }
+        this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_mold[0])
+      }
+      else{
+        this.gasproperties =[{label: '全部', value: ''}]
+      }
+    },
+    async getaddress(){
+      console.log('开始获取小区')
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
+        data: {
+          condition: '1=1'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+      console.log('小区',data)
+      let house = []
+      for (let row of data.data){
+        console.log('开始保存小区')
+        house.push({label: row.f_residential_area, value: row.f_residential_area})
+      }
+      this.residentialArea = house
+    },
+    cancel() {
+      this.showinfo = false
+    },
+    search() {
+      this.$refs.paged.$refs.cri.search()
+    },
+    getRes(obj,val) {
+      console.log(obj,"=====111===",val)
+      this.orgCondtionStr = obj
+    },
+
+    selfSearch(args) {
+      //小区查询条件
+      this.area =  this.$refs.paged.$refs.cri.model.f_residential_area
+      console.log("=====小区model绑定====",this.area)
+      if(this.area.length !== 0){
+        let str = JSON.stringify(this.area)
+        str = str.replace(/"/g,`'`)
+        str = str.replace(/\[/g,``)
+        str = str.replace(/\]/g,``)
+        console.log("=====小区model22222222222绑定====",str)
+        //查询多个小区时条件
+        args.condition += ` and f_residential_area in  ( ${str} )`
+      }
+
+      args.condition = `${args.condition}` + this.orgCondtionStr
+      this.model.search(args.condition, args.model)
+    },
+    showmsg(obj){
+      this.rowdata=obj
+      this.showinfo=true
+    },
+    initParams() {
+      // 初始化气表品牌
+      let brandArr = []
+      this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+        let temp = {}
+        temp.label = item.label
+        temp.value = item.value.f_meter_brand
+        brandArr.push(temp)
+      })
+      this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+    },
+
+    clear() {
+      Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+        this.$refs.paged.$refs.cri.model[key] = ''
+      })
+    },
+    show() {
+      this.criteriaShow = true
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    dealmsg(val) {
+      console.log('---------------dealmsg')
+      this.rowdata=val
+      this.show=true
+      val.model = this.model.model
+      this.$dispatch('deal-msg', val)
+    },
+    stamp() {
+      this.all = false
+      //默认选择要打印的列
+      this.modelval = defaultPrint.config
+      this.fields = this.getfield
+      console.log('所有打印字段', this.fields)
+      this.printshow = true
+      this.put()
+    },
+    put() {
+      // 对Modelval进行排序
+      this.sortModelval()
+      this.thead = `<tr><th colspan=${this.modelval.length}>补卡查询统计报表</th></tr><tr>`
+      for (let key of this.modelval) {
+        this.thead += '<th>' + this.fields[key] + '</th>'
+      }
+      this.thead += '</tr>'
+    },
+    print() {
+      this.$refs.print.PrintAsFile()
+      this.printshow = false
+    },
+    close() {
+      this.printshow = false
+      this.all = false
+    },
+    // 对选择的列进行排序
+    sortModelval() {
+      let sortModel = []
+      Object.keys(this.fields).forEach((key) => {
+        if (this.modelval.includes(key)) {
+          sortModel.push(key)
+        }
+      })
+      this.modelval = sortModel
+      console.log('选择的打印的字段', this.modelval)
+    },
+    async updateParams() {
+      await this.$MagLoadParams.loadParam(this.f_filialeid)
+      this.initParams()
+    },
+    sort (field, rule) {
+      // 将所有排序方式设为不排序，实现相互排斥
+      debugger
+      for (let key in this.orderFields) {
+        if (key === field) {
+          this.orderFields[key] = rule
+        } else {
+          this.orderFields[key] = 'no'
+        }
+      }
+      // 如果新规则不排序，还原为默认排序
+      if (rule === 'no') {
+        this.model.paramSource.orderitem = `'${this.orderDefault}'`
+      } else {
+        this.model.paramSource.orderitem = `'${field} ${rule}'`
+      }
+
+      this.search()
+    }
+  },
+  watch: {
+    'all'(val) {
+      if (val) {
+        this.modelval = this.bodyData
+      } else {
+        this.modelval = defaultPrint.config
+        this.put()
+      }
+    },
+    'modelval.length'() {
+      this.put()
+    }
+  },
+  computed: {
+    usertypes() {
+      return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    authArr () {
+      return this.$login.r ? this.$login.r : []
+    },
+    getCondition () {
+      var con = ""
+      if (this.orgCondtionStr) {
+        con = `${this.$refs.paged.$refs.cri.condition}` +   this.orgCondtionStr
+      }
+      else {
+        con = `${this.$refs.paged.$refs.cri.condition}and f_orgid in ('${this.$login.f.orgid}' )`
+      }
+      return {
+        condition: con
+      }
+    },
+    getfield() {
+      return exportConfig.NewAccountConfig
+    }
+  }
+}
+</script>

package/src/saleManage.js

@@ -104,6 +104,9 @@ export default function () {
   Vue.component('new-account-query', (resolve) => {
     require(['./components/sale/businessquery/NewAccountQuery'], resolve)
   })
+  Vue.component('cancel-account-query', (resolve) => {
+    require(['./components/sale/businessquery/cancelAccountQuery'], resolve)
+  })
   Vue.component('area-general-query', (resolve) => {
     require(['./components/sale/businessquery/AreaGeneralQuery'], resolve)
   })