manage-client 3.2.91-1 → 3.2.91-aode

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

@@ -3,18 +3,28 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex"  v-if="!show" >
 
-        <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">客户编号</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">客户地址</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 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 HH:mm:ss'"
+                              :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_operate_date >= '{}'">
+                              condition="f_operate_date >= '{} 00:00:00'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -22,54 +32,26 @@
                   <datepicker id="endDate" placeholder="结束日期" style="width:60%"
                               v-model="model.endDate"
                               :value.sync="model.endDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_operate_date <= '{}'">
+                              condition="f_operate_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" title="旧客户编号">档案编号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
-                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
-                </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" :footer="$parent.$parent.footer"
-                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
+
+                  <export-excel :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.selectfields"
+                                :field="$parent.$parent.getfield"
                                 sqlurl="rs/logic/exportfile" sql-name="transferQuery" template-name='过户查询导出'
                                 :choose-col="true"></export-excel>
-                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
-                               :defaultfield="$parent.$parent.defaultfield"
-                              titletable="过户记录"
-                              :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>
+              <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
               <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 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">表&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 form-group">
-                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
-                         condition="f_card_id = '{}'" placeholder='卡号'>
-                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">过户状态</label>
                   <v-select :value.sync="model.f_state"
@@ -107,20 +89,13 @@
             <template partial='head'>
               <tr>
                 <th>
-<!--                  <nobr>客户编号</nobr>-->
-                  <data-order field="f_userinfo_code" name="客户编号"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
+                  <nobr>客户编号</nobr>
                 </th>
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
                 <th>
-                  <nobr>档案编号</nobr>
-                </th>
-                <th>
-<!--                  <nobr>客户地址</nobr>-->
-                  <data-order field="f_address" name="客户地址"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                  <nobr>客户地址</nobr>
                 </th>
                 <th>
                   <nobr>原客户名称</nobr>
@@ -135,9 +110,7 @@
                   <nobr>过户费</nobr>
                 </th>
                 <th>
-<!--                  <nobr>过户日期</nobr>-->
-                  <data-order field="f_operate_date" name="过户日期"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
+                  <nobr>过户日期</nobr>
                 </th>
                 <th>
                   <nobr>备注</nobr>
@@ -151,7 +124,6 @@
                 <th>
                   <nobr>公司</nobr>
                 </th>
-                <th><nobr>附件</nobr></th>
               </tr>
             </template>
             <template partial='body'>
@@ -162,9 +134,6 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_newuser_name}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_olduserinfo_code}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
@@ -195,9 +164,6 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
-              <td style="text-align: center;"><nobr>
-                <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
-              </nobr></td>
             </template>
             <template partial='foot'></template>
           </data-grid>
@@ -209,26 +175,16 @@
               style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
               汇总信息
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
               过户费合计:&emsp;{{sumsmodel.f_transfer_fees}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              户数合计:&emsp;{{sumsmodel.hushu}}
-            </td>
           </tr>
         </table>
       </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 v-if="show">
+        <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
       </div>
     </div>
-    <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
-      <article slot="modal-body">
-        <upload :blodid="selected.f_userinfo_id" v-ref:upload isupload="false" takeimg="false"  fusetype="过户" :isremark="false" style="width:auto" ></upload>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-      </footer>
-    </modal>
   </div>
 </template>
 
@@ -238,25 +194,19 @@
   import exportConfig from '../config/exportConfig'
 
   let readySomething = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
-    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    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.$login.f)
-
+    await self.$MagLoadParams.loadParam(self.$login.f.orgid);
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
-    props:['data'],
-    title: '过户查询',
     data() {
       return {
         data: {},
-        other:[],
-        footer:[],
         show:false,
         rowdata:{},
-        model: new PagedList('rs/sql/transferQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}, {f_transfer_fees: 0,hushu:0}),
+        model: new PagedList('rs/sql/transferQuery', 20, {}, {f_transfer_fees: 0}),
         criteriaShow: false,
         initres: {
           org:[this.$login.f.orgid],
@@ -270,59 +220,35 @@
         printshow: false,
         all: false,
         fields: {},
-        config: {
-          defaultPrint: ["f_userinfo_code", "f_newuser_name", "f_newuser_phone", "address", "f_state", "f_user_name","f_transfer_fees", "f_operate_date", "f_operator", "f_depname", "f_orgname"]
-        },
-        //排序
-        orderitem:'f_operate_date desc',
-        orderFields: {
-          f_operate_date: 'no'
-        },
-        //默认打印列
-        defaultfield: [],
         thead: '',
         tfoot: '',
-        showupload:false,
-        selected:{},
 
         transferstate: this.$appdata.getParam('过户状态') ? [{
           label: '全部',
           value: ''
         }, ...this.$appdata.getParam('过户状态')] : [],
         //合计数据
-        sumsmodel: {}
+        sumsmodel: {},
+        selectfields:[]
       }
     },
+    props:['selectorg'],
     ready() {
+      if(this.selectorg != null && this.selectorg != null != ''){
+        this.initres.org=[]
+        this.initres.org.push(this.selectorg);
+      }
       console.log(this.$login.f)
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
         this.$emit('error', error)
       })
+      for(var item in exportConfig.dataReportConfig){
+        this.selectfields.push(item)
+      }
     },
     methods: {
-      view(row){
-        this.showupload = true
-        this.selected= row
-      },
-      getotherfooter(){
-        // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
-        // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
-        this.other=[];
-        this.footer=[];
-        let exportdata = this.getCondition;
-        let otherInData=[];
-        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
-        let footerData=[],exportfield=this.getfield;
-        footerData.push("合计");
-        let self = this;
-        for(var field in self.sumsmodel){
-          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
-        }
-        this.footer.push(footerData);
-        this.other.push(otherInData);
-      },
       search(){
         this.$refs.paged.$refs.cri.search()
       },
@@ -331,16 +257,11 @@
         this.showinfo = true
       },
       async selfSearch(args) {
-        if (this.data) {
-          this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
-          this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
-        }
         args.condition = `${args.condition}` + this.orgCondtionStr
         console.log('我的阐述', JSON.stringify(args.condition))
         await this.model.search(args.condition, args.model)
-        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-        this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
 
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
         console.log('合计字段', this.sumsmodel)
       },
       dealmsg(val) {
@@ -360,7 +281,7 @@
         this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
         this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
         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() {
@@ -408,24 +329,6 @@
         })
         this.modelval = sortModel
         console.log('选择的打印的字段', this.modelval)
-      },
-      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.orderitem}'`
-        } else {
-          this.model.paramSource.orderitem = `'${field} ${rule}'`
-        }
-
-        this.search()
       }
     },
     watch: {
@@ -440,18 +343,17 @@
       'modelval.length'() {
         this.put()
       },
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
+      'orgCondtionStr'(val) {
+        let res = val.match(/'(.*?)'/)
+        console.log('正则提取:',res && res[1])
+        if (res) {
+          this.selectorg = res[1]
+        }
       }
     },
     computed: {
       getCondition() {
-        return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
-          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {
         return exportConfig.transferConfig

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

@@ -28,7 +28,7 @@
                   </datepicker>
                 </div>
                 <div class="form-group col-sm-2" >
-                  <label class="font_normal_body">错误类型</label>
+                  <label class="font_normal_body">操作类型</label>
                   <v-select :value.sync="model.f_operator_type" :value-single="true"
                             class="select_list select"
                             title="参数:抄表错误类型"
@@ -51,18 +51,7 @@
                             close-on-select search="true">
                   </v-select>
                 </div>
-                <div class="form-group col-sm-2" >
-                  <label class="font_normal_body">银行名称</label>
-                  <v-select :value.sync="model.f_bankname" :value-single="true"
-                            class="select_list select"
-                            title="参数:抄表错误类型"
-                            style="width: 60%"
-                            v-model="model.f_bankname"
-                            :options='$parent.$parent.bankname' placeholder='银行名称'
-                            condition = "f_bankname = '{}'"
-                            close-on-select search="true">
-                  </v-select>
-                </div>
+
                 <div class="col-sm-2 form-group" v-if="false">
                   <label class="font_normal_body">公&ensp;&ensp;司</label>
                   <res-select :initresid="$parent.$parent.orgid"
@@ -72,17 +61,6 @@
                               restype='organization'>
                   </res-select>
                 </div>
-                <div class="form-group col-sm-2" v-if="false">
-                  <label class="font_normal_body">选择小区</label>
-                  <v-select :value.sync="model.f_residential_area" :value-single="true"
-                            class="select_list select"
-                            style="width: 60%"
-                            v-model="model.f_residential_area"
-                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
-                            condition = "f_residential_area = '{}'"
-                            close-on-select search="true">
-                  </v-select>
-                </div>
 
                 <div class="span" style="float:right;">
                   <button class="button_search button_spacing" @click="search">查询</button>
@@ -117,17 +95,23 @@
                 <th>
                   <nobr>抄表时间</nobr>
                 </th>
+                <th>
+                  <nobr>操作类型</nobr>
+                </th>
                 <th>
                   <nobr>错误类型</nobr>
                 </th>
                 <th>
-                  <nobr>错误原因</nobr>
+                  <nobr>错误信息</nobr>
                 </th>
                 <th>
-                  <nobr>银行名称</nobr>
+                  <nobr>公司</nobr>
                 </th>
                 <th>
-                  <nobr>错误信息</nobr>
+                  <nobr>部门</nobr>
+                </th>
+                <th>
+                  <nobr>操作人</nobr>
                 </th>
               </tr>
             </template>
@@ -151,11 +135,18 @@
                 <nobr>{{row.f_error_type}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_bankname}}</nobr>
+                <nobr>{{row.f_operator_info}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_orgname}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_msg}}</nobr>
+                <nobr>{{row.f_depname}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+
             </template>
             <template partial='foot'></template>
           </data-grid>
@@ -198,9 +189,8 @@
         //小区
         residentialArea: [],
         orgCondtionStr: '(' + this.$login.f.orgid + ')',
-        operatortype:[{label: '全部', value: ''}, ...this.$appdata.getParam('抄表错误类型')?this.$appdata.getParam('抄表错误类型'):[]],
-        errortype:[{label: '全部', value: ''}, ...this.$appdata.getParam('错误原因')?this.$appdata.getParam('错误原因'):[]],
-        bankname:[{label: '全部', value: ''}, ...this.$appdata.getParam('银行名称')?this.$appdata.getParam('银行名称'):[]],
+        operatortype:[{label: '全部', value: ''}, ...this.$appdata.getParam('操作类型')?this.$appdata.getParam('操作类型'):[]],
+        errortype:[{label: '全部', value: ''}, ...this.$appdata.getParam('错误类型')?this.$appdata.getParam('错误类型'):[]],
         //合计数据
       }
     },