manage-client 3.2.90-aode → 3.2.90-aodeToV4

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

@@ -67,7 +67,7 @@
                   <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
                   <export-excel :data="$parent.$parent.getCondition"
                                 :field="$parent.$parent.getfield"
-                                sqlurl="rs/logic/exportfile" sql-name="battcherror" template-name='报错查询'
+                                sqlurl="api/af-revenue/logic/exportfile" sql-name="battcherror" 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"
@@ -177,7 +177,7 @@
     data() {
       return {
         data: {},
-        model: new PagedList('rs/sql/battcherror', 20),
+        model: new PagedList('api/af-revenue/sql/battcherror', 20),
         criteriaShow: false,
         f_filialeid: this.$login.f.orgid,
         //默认打印列

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

@@ -1,304 +1,304 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div class="basic-main" @keyup.enter="search">
-      <div class="flex" v-if="!show">
-
-        <criteria-paged :model="model" v-ref:paged>
-          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
-            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-              <div class="row">
-                <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%"
-                              v-model="model.startDate"
-                              :value.sync="model.startDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                  >
-                  </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 HH:mm:ss'"
-                              :show-reset-button="true"
-                  >
-                  </datepicker>
-                </div>
-              </div>
-            </div>
-          </criteria>
-
-          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
-            <template partial='head'>
-              <tr>
-                <th>
-                  <nobr>操作人</nobr>
-                </th>
-                <th>
-                  <nobr>所属公司</nobr>
-                </th>
-                <th>
-                  <nobr>所属部门</nobr>
-                </th>
-                <th>
-                  <nobr>最后收费时间</nobr>
-                </th>
-                <th>
-                  <nobr>最初推送时间</nobr>
-                </th>
-                <th>
-                  <nobr>最后推送时间</nobr>
-                </th>
-                <th>
-                  <nobr>最后推送区间</nobr>
-                </th>
-                <th>
-                  <nobr>总推送次数</nobr>
-                </th>
-                <th>
-                  <nobr>推送成功次数</nobr>
-                </th>
-                <th>
-                  <nobr>推送失败次数</nobr>
-                </th>
-              </tr>
-            </template>
-            <template partial='body'>
-              <td style="text-align: center;">
-                <nobr>{{row.f_operator}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.orgname}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_department_name}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.maxselldate}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.minpushdate}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.maxpushdate}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.pushdistirct}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <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" 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>
-  </div>
-</template>
-
-<script>
-  import {PagedList} from 'vue-client'
-  import defaultPrint from '../config/DefaultPrint'
-  import exportConfig from '../config/exportConfig'
-
-  let readySomething = async function (self) {
-    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()
-    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
-  }
-  export default {
-    title:"NC推送统计查询",
-    data() {
-      return {
-        data: {},
-        model: new PagedList('rs/sql/ncpushQuery', 20, {}),
-        criteriaShow: false,
-        headData: ["客户编号", "客户名称", "操作人", "操作日期", "启用状态", "停用原因", "其他停用原因", "同步状态"],
-        bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_othereason", "f_sendsuccess"],
-        orgCondtionStr: '',
-        modelval: [],
-        printshow: false,
-        all: false,
-        fields: {},
-        initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[],
-        },
-        show:false,
-        rowdata:{},
-        thead: '',
-        tfoot: '',
-        //合计数据
-        sumsmodel: {},
-        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: {
-      search(){
-        this.$refs.paged.$refs.cri.search()
-      },
-      cancel() {
-        this.show = false
-      },
-      selfSearch(args) {
-        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] = ''
-        })
-      },
-      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
-      },
-      getRes(obj) {
-        this.orgCondtionStr = obj
-      },
-      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)
-      }
-    },
-    watch: {
-      'all'(val) {
-        if (val) {
-          this.modelval = this.bodyData
-        } else {
-          this.modelval = defaultPrint.config
-          this.put()
-        }
-      },
-      '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}
-      },
-      getfield() {
-        return exportConfig.pushqueryconfig
-      }
-    }
-  }
-</script>
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex" v-if="!show">
+
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <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="api/af-revenue/logic/exportfile" sql-name="ncpushQuery" 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%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                  >
+                  </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 HH:mm:ss'"
+                              :show-reset-button="true"
+                  >
+                  </datepicker>
+                </div>
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th>
+                  <nobr>操作人</nobr>
+                </th>
+                <th>
+                  <nobr>所属公司</nobr>
+                </th>
+                <th>
+                  <nobr>所属部门</nobr>
+                </th>
+                <th>
+                  <nobr>最后收费时间</nobr>
+                </th>
+                <th>
+                  <nobr>最初推送时间</nobr>
+                </th>
+                <th>
+                  <nobr>最后推送时间</nobr>
+                </th>
+                <th>
+                  <nobr>最后推送区间</nobr>
+                </th>
+                <th>
+                  <nobr>总推送次数</nobr>
+                </th>
+                <th>
+                  <nobr>推送成功次数</nobr>
+                </th>
+                <th>
+                  <nobr>推送失败次数</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.orgname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_department_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.maxselldate}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.minpushdate}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.maxpushdate}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.pushdistirct}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <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" 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>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import defaultPrint from '../config/DefaultPrint'
+  import exportConfig from '../config/exportConfig'
+
+  let readySomething = async function (self) {
+    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()
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    title:"NC推送统计查询",
+    data() {
+      return {
+        data: {},
+        model: new PagedList('api/af-revenue/sql/ncpushQuery', 20, {}),
+        criteriaShow: false,
+        headData: ["客户编号", "客户名称", "操作人", "操作日期", "启用状态", "停用原因", "其他停用原因", "同步状态"],
+        bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_othereason", "f_sendsuccess"],
+        orgCondtionStr: '',
+        modelval: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        show:false,
+        rowdata:{},
+        thead: '',
+        tfoot: '',
+        //合计数据
+        sumsmodel: {},
+        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: {
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      cancel() {
+        this.show = false
+      },
+      selfSearch(args) {
+        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] = ''
+        })
+      },
+      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
+      },
+      getRes(obj) {
+        this.orgCondtionStr = obj
+      },
+      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)
+      }
+    },
+    watch: {
+      'all'(val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      '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}
+      },
+      getfield() {
+        return exportConfig.pushqueryconfig
+      }
+    }
+  }
+</script>

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

@@ -26,7 +26,7 @@
                   <export-excel :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.selectfields"
                                 :field="$parent.$parent.getfield"
                                 :defaultselect="$parent.$parent.selectfields"
-                                sqlurl="rs/logic/exportfile" sql-name="toolcardquery" template-name='工具卡制作日志导出'
+                                sqlurl="api/af-revenue/logic/exportfile" sql-name="toolcardquery" 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>
@@ -152,7 +152,7 @@
         shouc:['company','department','operator'],
         selectfields:[],
         data: {},
-        model: new PagedList('rs/sql/toolcardquery', 20),
+        model: new PagedList('api/af-revenue/sql/toolcardquery', 20),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "客户电话", "身份证号", "地址", "补卡类型", "表编号", "卡号", "气表品牌", "气表状态", "卡费", "补卡日期", "人员", "部门", "公司"],
         bodyData: ["f_userinfo_code", "f_user_name", "f_user_phone", "f_idnumber", "address", " f_type", "f_user_id", "f_card_id", "f_meter_brand", "f_table_state", "f_cardfees", "f_operate_date", "f_operator", "f_depname", "f_orgname"],