manage-client 3.2.76-jb → 3.2.77-aode

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('错误类型'):[]],
         //合计数据
       }
     },

package/src/components/sale/businessquery/{ResourceOperatingQuery.vue → ncpushQuery.vue}

@@ -7,46 +7,45 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+
+                <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" :defaultselect="$parent.$parent.selectfields"
+                                :field="$parent.$parent.getfield"
+                                :defaultselect="$parent.$parent.selectfields"
+                                sqlurl="rs/logic/exportfile" sql-name="enableQuery" 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 for="startDate" class="font_normal_body">操作开始时间</label>
-                  <datepicker id="startDate" placeholder="操作开始时间" style="width:60%"
+                  <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'"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
                               :show-reset-button="true"
-                              condition="time >= '{} 00:00:00'">
+                  >
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">操作结束日期</label>
-                  <datepicker id="endDate" placeholder="操作结束日期" style="width:60%"
+                  <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'"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
                               :show-reset-button="true"
-                              condition="time <= '{} 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.username"
-                         condition="username = '{}' " 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"
-                                :field="$parent.$parent.getfield"
-                                :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile" sql-name="ResourceOperatingQuery" template-name='资源操作导出'
-                                :choose-col="true"></export-excel>
-                </div>
               </div>
-
             </div>
           </criteria>
 
@@ -54,83 +53,87 @@
             <template partial='head'>
               <tr>
                 <th>
-                  <nobr>操作内容</nobr>
+                  <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>主键id</nobr>
+                  <nobr>最后推送区间</nobr>
                 </th>
                 <th>
-                  <nobr>登录id</nobr>
+                  <nobr>总推送次数</nobr>
                 </th>
                 <th>
-                  <nobr>登录ip</nobr>
+                  <nobr>推送成功次数</nobr>
                 </th>
                 <th>
-                  <nobr>登陆人</nobr>
+                  <nobr>推送失败次数</nobr>
                 </th>
               </tr>
             </template>
             <template partial='body'>
-
               <td style="text-align: center;">
-                <nobr>{{row.operate}}</nobr>
+                <nobr>{{row.f_operator}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.tablename}}</nobr>
+                <nobr>{{row.orgname}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.type}}</nobr>
+                <nobr>{{row.f_department_name}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.time}}</nobr>
+                <nobr>{{row.maxselldate}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.id}}</nobr>
+                <nobr>{{row.minpushdate}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.userid}}</nobr>
+                <nobr>{{row.maxpushdate}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.loginip}}</nobr>
+                <nobr>{{row.pushdistirct}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.username}}</nobr>
+                <nobr>{{row.pushlen}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.pushsuccess}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.pusherror}}</nobr>
               </td>
             </template>
             <template partial='foot'></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>-->
-        <!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">合计:&emsp;{{sumsmodel.f_pregas}}</td>-->
-        <!--          </tr>-->
-        <!--        </table>-->
+        <table class="table-hover" v-if="false">
+          <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>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">合计:&emsp;{{sumsmodel.f_pregas}}</td>
+          </tr>
+        </table>
       </div>
       <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>
 
@@ -140,97 +143,90 @@
   import exportConfig from '../config/exportConfig'
 
   let readySomething = async function (self) {
-    if(self.data.startDate != null && self.data.endDate!=null){
-      self.$refs.paged.$refs.cri.model.startDate = self.data.startDate.substring(0,10)
-      self.$refs.paged.$refs.cri.model.endDate = self.data.endDate.substring(0,10)
-    }else{
-      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()
-    //self.$refs.paged.$refs.cri.model.f_sendsuccess = ['有效']
-    await self.$MagLoadParams.loadParam()
-
+    //await self.$MagLoadParams.loadParam()
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
-    props:['data'],
+    title:"NC推送统计查询",
     data() {
       return {
         data: {},
-        other: [],
-        footer: [],
-        model: new PagedList('rs/sql/ResourceOperatingQuery', 20, {}),
+        model: new PagedList('rs/sql/ncpushQuery', 20, {}),
         criteriaShow: false,
-        headData: ["客户编号", "客户名称", "操作人", "操作日期", "停用状态", "停用原因", "其他停用原因", "同步状态"],
+        headData: ["客户编号", "客户名称", "操作人", "操作日期", "启用状态", "停用原因", "其他停用原因", "同步状态"],
         bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_othereason", "f_sendsuccess"],
         orgCondtionStr: '',
-        show:false,
-        rowdata:{},
         modelval: [],
         printshow: false,
         all: false,
         fields: {},
-        thead: '',
-        showupload:false,
-        selected:{},
-        tfoot: '',
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
           user:[],
         },
+        show:false,
+        rowdata:{},
+        thead: '',
+        tfoot: '',
         //合计数据
         sumsmodel: {},
-        operattype:[{label: '全部', value: ''},{label: '停用', value: '停用'},{label: '拆表', value: '拆表'}]
+        selectfields:[]
       }
     },
+   // 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.pushqueryconfig){
+        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()
       },
+      cancel() {
+        this.show = false
+      },
       selfSearch(args) {
-        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
+        if(this.$refs.paged.$refs.cri.model.endDate == null || this.$refs.paged.$refs.cri.model.endDate=='' ){
+          this.$showAlert("请选择结束时间!",'warning',2000);
+          return
+        }
+        this.model.params.start_date = this.$refs.paged.$refs.cri.model.startDate == null || this.$refs.paged.$refs.cri.model.startDate=='' ? '' : this.$refs.paged.$refs.cri.model.startDate;
+        this.model.params.end_date = this.$refs.paged.$refs.cri.model.endDate
+        args.condition = `${args.condition} ` + this.orgCondtionStr
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       },
+
       clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+        //部门和人员变为全选
+        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() {
-        this.criteriaShow = true
+      dealmsg(val) {
+        console.log('---------------dealmsg')
+        this.rowdata=val
+        this.show=true
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
       },
       hidden() {
         this.criteriaShow = !this.criteriaShow
@@ -256,16 +252,6 @@
         }
         this.thead += '</tr>'
       },
-      cancel() {
-        this.show = false
-      },
-      dealmsg(val) {
-        console.log('---------------dealmsg')
-        this.rowdata=val
-        this.show=true
-        val.model = this.model.model
-        this.$dispatch('deal-msg', val)
-      },
       print() {
         this.$refs.print.PrintAsFile()
         this.printshow = false
@@ -295,22 +281,23 @@
           this.put()
         }
       },
-      sumsmodel: {
-        handler: function (val) {
-          this.getotherfooter();
-        },
-        deep: true
-      },
       'modelval.length'() {
         this.put()
       },
+      '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}
+        return {condition: `${this.$refs.paged.$refs.cri.condition} ` + this.orgCondtionStr}
       },
       getfield() {
-        return exportConfig.resourceConfig
+        return exportConfig.pushqueryconfig
       }
     }
   }