manage-client 3.2.62 → 3.2.63-aode

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

@@ -3,10 +3,23 @@
     <div class="basic-main">
       <div class="flex" v-if="!showinfo">
 
-        <criteria-paged :model="model" v-ref:paged @sort="sort">
+        <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 form-group">
+                  <label class="font_normal_body">公&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;司</label>
+                  <res-select :initresid="$parent.$parent.orgid"
+                              style="width:60%"
+                              @res-select="$parent.$parent.getRes"
+                              restype='organization'>
+                  </res-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_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%"
@@ -27,31 +40,16 @@
                               condition="f_open_date <= '{} 23:59:59'">
                   </datepicker>
                 </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_userinfo_code"
-                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">公&ensp;&ensp;司</label>
-                  <res-select :initresid="$parent.$parent.orgid"
-                              style="width:60%"
-                              @res-select="$parent.$parent.getRes"
-                              restype='organization'>
-                  </res-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"
+                  <export-excel-plus :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.selectfields"
                                 :field="$parent.$parent.getfield"
-                                v-if="$parent.$parent.authArr.includes('开户查询导出')"
-                                sqlurl="rs/logic/exportfile" sql-name="newAccountQuery" template-name='开户查询导出'
-                                :choose-col="true"></export-excel>
+                                sqlurl="rs/logic/exportfileplus" sql-name="newAccountQuery" :template-name="$parent.$parent.getName"
+                                :choose-col="true"></export-excel-plus>
 
                   <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>
@@ -64,10 +62,18 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用气性质</label>
-                  <v-select :value.sync="model.f_gasproperties"
+                  <v-select :value.sync="model.f_gasproperties" :multiple="true"
                             v-model="model.f_gasproperties"
-                            :options='$parent.$parent.gaspropertyTypes' placeholder='请选择'
-                            condition=" f_gasproperties = '{}'"
+                            :options='$parent.$parent.newuseroptiones' placeholder='请选择'
+                            condition=" f_gasproperties in {}"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">气表分类</label>
+                  <v-select :value.sync="model.f_meter_classify"
+                            v-model="model.f_meter_classify"
+                            :options='$parent.$parent.metertypes' placeholder='请选择'
+                            condition="f_meter_classify = '{}'"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -79,19 +85,50 @@
                             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_address"
-                       condition="f_address like '%{}%'" placeholder='客户地址'>
+                  <label class="font_normal_body">用户状态</label>
+                  <v-select :value.sync="model.f_user_state"
+                            v-model="model.f_user_state"
+                            :options='$parent.$parent.getusertypes' placeholder='请选择'
+                            condition="f_user_state = '{}'"
+                            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>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_residential_area"
-                         condition="f_residential_area like '%{}%'" placeholder="小区"/>
+                  <label class="font_normal_body">表具状态</label>
+                  <v-select :value.sync="model.f_table_state"
+                            v-model="model.f_table_state"
+                            :options='$parent.$parent.gettabletypes' placeholder='请选择'
+                            condition="f_table_state = '{}'"
+                            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_back"
+                            v-model="model.f_user_back"
+                            :options='$parent.$parent.backstates' placeholder='请选择'
+                            condition="f_user_back = '{}'"
+                            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_substite"
+                            v-model="model.f_substite"
+                            :options='$parent.$parent.backstates' placeholder='请选择'
+                            condition="f_substite = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">是否已缴费</label>
+                  <v-select :value.sync="model.sellnum"
+                            v-model="model.sellnum"
+                            :options='$parent.$parent.sellnumoptions' placeholder='请选择'
+                            condition=" {} "
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-4 form-group">
+                  <label class="font_normal_body">客户地址</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="model.f_address"
+                         condition="f_address like '%{}%' " placeholder="客户地址">
                 </div>
-              </div>
-              <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-
               </div>
 
             </div>
@@ -107,7 +144,13 @@
                   <nobr>客户名称</nobr>
                 </th>
                 <th>
-                  <data-order field="f_address" name="客户地址"></data-order>
+                  <nobr>用户状态</nobr>
+                </th>
+                <th>
+                  <nobr>表具状态</nobr>
+                </th>
+                <th>
+                  <nobr>客户地址</nobr>
                 </th>
                 <th>
                   <nobr>客户电话</nobr>
@@ -121,6 +164,9 @@
                 <th>
                   <nobr>开户时间</nobr>
                 </th>
+                <th>
+                  <nobr>开户人</nobr>
+                </th>
                 <th>
                   <nobr>表号</nobr>
                 </th>
@@ -128,7 +174,7 @@
                   <nobr>置换员</nobr>
                 </th>
                 <th>
-                  <nobr>通气时间</nobr>
+                  <nobr>当前表通气时间</nobr>
                 </th>
                 <th>
                   <nobr>用气性质</nobr>
@@ -136,6 +182,9 @@
                 <th>
                   <nobr>累购气量</nobr>
                 </th>
+                <th>
+                  <nobr>气表类型</nobr>
+                </th>
                 <th>
                   <nobr>气表品牌</nobr>
                 </th>
@@ -143,7 +192,28 @@
                   <nobr>是否有壁挂炉</nobr>
                 </th>
                 <th>
-                  <nobr>开户人</nobr>
+                  <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>
@@ -154,6 +224,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_state}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_table_state}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
@@ -169,6 +245,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_open_date}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_createfile_person}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_meternumber}}</nobr>
               </td>
@@ -184,6 +263,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_total_gas}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_type}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_brand}}</nobr>
               </td>
@@ -191,7 +273,28 @@
                 <nobr>{{row.isbgl}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_operator}}</nobr>
+                <nobr>{{row.ishot}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_back}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_substite}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_check_time}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_canceloperator}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_canceltime}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_cancelreason}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_orgname}}</nobr>
               </td>
             </template>
             <template partial='foot'></template>
@@ -199,7 +302,7 @@
         </criteria-paged>
       </div>
       <div v-if="showinfo">
-        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+        <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
       </div>
     </div>
   </div>
@@ -210,7 +313,7 @@
   import defaultPrint from '../config/DefaultPrint'
   import exportConfig from '../config/exportConfig'
   import plugins from '../../../plugins/GetLoginInfoService'
-
+  import * as Util from '../../../stores/Util'
   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()
@@ -225,16 +328,8 @@
     data() {
       return {
         data: {},
-        initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[],
-        },
-        orderFields: {
-          f_address: 'no'
-        },
-        orderDefault: "'f_open_date desc'",
-        model: new PagedList('rs/sql/newAccountQuery', 20,{orderitem: "'f_open_date desc'"}),
+        orgid:[this.$login.f.orgid],
+        model: new PagedList('rs/sql/newAccountQuery', 20),
         f_orgid: this.$login.f.orgid,
         criteriaShow: false,
         modelval: [],
@@ -249,30 +344,45 @@
         showinfo:false,
         rowdata:{},
         //合计数据
-        sumsmodel: {}
-      }
+        sumsmodel: {},
+        newuseroptiones:[{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')],
+        selectfields:[],
+          metertypes:[{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')],
+        backstates:[{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
+        gaspropertyTypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')],
+        getusertypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')],
+        gettabletypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('表具状态')],
+        sellnumoptions:[{label: '全部', value: ''},{label:'是',value:'sellnum>0'},{label:'否',value:'sellnum=0'}]
+    }
     },
+    props:['selectorg'],
     ready() {
+      if(this.selectorg != null && this.selectorg != null != ''){
+        this.initres.org=[]
+        this.initres.org.push(this.selectorg);
+      }
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
         this.$emit('error', error)
       })
+      for(var item in exportConfig.NewAccountConfig){
+        this.selectfields.push(item)
+      }
     },
     methods: {
       cancel() {
         this.showinfo = false
       },
-      search() {
-        this.$refs.paged.$refs.cri.search()
-      },
-      getRes(obj) {
-        console.log(obj,"========")
-        this.orgCondtionStr = obj
+      getRes (obj) {
+        this.orgCondtionStr = plugins.convertToIn(obj)
       },
 
       selfSearch(args) {
-        args.condition = `${args.condition}` + this.orgCondtionStr
+        if (this.orgCondtionStr)
+          args.condition = `${args.condition}` + 'and f_filialeid in ' + this.orgCondtionStr
+        else
+          args.condition = `${args.condition}` + 'and f_filialeid in ' + '(' + this.$login.f.orgid + ')'
         this.model.search(args.condition, args.model)
       },
       showmsg(obj){
@@ -293,7 +403,7 @@
 
       clear() {
         Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
-          this.$refs.paged.$refs.cri.model[key] = []
+          this.$refs.paged.$refs.cri.model[key] = ''
         })
       },
       show() {
@@ -340,70 +450,57 @@
         let sortModel = []
         Object.keys(this.fields).forEach((key) => {
           if (this.modelval.includes(key)) {
-            sortModel.push(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) {
-        // 将所有排序方式设为不排序，实现相互排斥
-        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'() {
+    await this.$MagLoadParams.loadParam(this.f_filialeid)
+    this.initParams()
+  }
+  },
+  watch: {
+    'all'(val) {
+      if (val) {
+        this.modelval = this.bodyData
+      } else {
+        this.modelval = defaultPrint.config
         this.put()
       }
     },
-    computed: {
-      authArr () {
-        return this.$login.r ? this.$login.r : []
-      },
-      getCondition () {
-        var con = ""
-        if (this.orgCondtionStr) {
-          con = `${this.$refs.paged.$refs.cri.condition} and f_orgid in  (${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
-      },
-      gaspropertyTypes() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+    'modelval.length'() {
+      this.put()
+    },
+    'orgCondtionStr'(val) {
+      let res = val.match(/'(.*?)'/)
+      console.log('正则提取:',res && res[1])
+      if (res) {
+        this.selectorg = res[1]
       }
     }
+
+  },
+  computed: {
+    getCondition () {
+      var con = ""
+      if (this.orgCondtionStr) {
+        con = `${this.$refs.paged.$refs.cri.condition} and f_filialeid  in  ${this.orgCondtionStr}`
+      }
+      else {
+        con = `${this.$refs.paged.$refs.cri.condition}and f_filialeid  in ('${this.$login.f.orgid}' )`
+      }
+      return {
+        condition: con
+      }
+    },
+    getName() {
+      return '开户查询导出'+ Util.guid()
+    },
+    getfield() {
+      return exportConfig.NewAccountConfig
+    }
+  }
   }
 </script>

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

@@ -12,8 +12,6 @@
             <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>
@@ -23,8 +21,6 @@
             <tr >
               <td style="text-align:center;">{{$index+1}}</td>
               <th style="text-align:center">{{row.f_brand_spec}}</th>
-              <th style="text-align:center">{{row.f_typename}}</th>
-              <th style="text-align:center">{{row.f_typenumber}}</th>
               <th style="text-align:center">{{row.f_number}}</th>
               <th style="text-align:center">{{row.f_unitprice}}</th>
               <th style="text-align:center">{{(row.f_number-0)*(row.f_unitprice-0)}}</th>