manage-client 3.2.84-1 → 3.2.84-aode

package/src/components/sale/{businessquery/pricechangeRecordQuery.vue → report/aode/iot/FarawayQuery.vue}

@@ -1,69 +1,73 @@
 <template>
   <div id="unit" class="flex-row">
     <div class="basic-main" @keyup.enter="search">
-      <div class="flex">
+      <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">
                 <div class="col-sm-2 form-group">
-                  <label for="startDate" class="font_normal_body">开始日期</label>
+                  <label class="font_normal_body">公&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;司</label>
+                  <right-tree @re-res="$parent.$parent.getorg"
+                              :initresid='$parent.$parent.org'></right-tree>
+                </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">客户名称</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="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"
-                              condition="f_operate_date >= '{}'">
+                              condition="f_hand_date >= '{}'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <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"
-                              condition="f_operate_date <= '{}'">
+                              condition="f_hand_date <= '{}'">
                   </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="button_clear  button_spacing" @click="$parent.$parent.clear()">清空</button>
 
-                  <export-excel :data="$parent.$parent.getCondition"
+                  <export-excel :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.selectfields"
                                 :field="$parent.$parent.getfield"
-                                :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile" sql-name="pricechangeRecordQuery" template-name='调价记录导出'
+                                :defaultselect="$parent.$parent.selectfields"
+                                sqlurl="rs/logic/exportfile" sql-name="iotfarawayprice" 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>
-
-
-
               <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>
+                  <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="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
                   <v-select :value.sync="model.f_user_type"
-                            :options='$parent.$parent.usertypes'
                             @change="$parent.$parent.userTypeChange()"
-                            placeholder='请选择' v-model="model.f_user_type"
+                            :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
                             condition="f_user_type = '{}'"
                             close-on-select></v-select>
                 </div>
@@ -74,40 +78,23 @@
                             condition="f_gasproperties = '{}'"
                             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_comments"
-                         condition="f_comments like '%{}%' " placeholder="调价原因">
-                </div>
-
                 <div class="col-sm-2 form-group">
-                  <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 = '{}'"
+                  <label class="font_normal_body">是&nbsp;&nbsp;否&nbsp;&nbsp;一&nbsp;&nbsp;致</label>
+                  <v-select :value.sync="model.istrue" v-model="model.istrue"
+                            :options='$parent.$parent.istrueoptions' placeholder='请选择'
+                            condition="istrue = '{}'"
                             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_meter_brand"
-                            v-model="model.f_meter_brand"
-                            :options='$parent.$parent.meterbrands' placeholder='请选择'
-                            condition="f_meter_brand = '{}'"
-                            close-on-select></v-select>
+                <div class="col-sm-4 form-group">
+                  <p style="font-weight:bold;font-size: 14px; color:darkred;">说明:阶梯气价为特殊气价,系统不进行比对,默认为不一致,请仔细核对!</p>
                 </div>
-
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">气表型号</label>
-                  <v-select :value.sync="model.f_meter_style"
-                            v-model="model.f_meter_style"
-                            :options='$parent.$parent.meterstyle[model.f_meter_brand]' placeholder='请选择'
-                            condition="f_meter_style = '{}'"
+                  <label class="font_normal_body">气价类型</label>
+                  <v-select :value.sync="model.f_price_type" v-model="model.f_price_type"
+                            :options='$parent.$parent.pricetypeoptions' placeholder='请选择'
+                            condition="f_price_type = '{}'"
                             close-on-select></v-select>
                 </div>
-
               </div>
             </div>
           </criteria>
@@ -119,13 +106,7 @@
                   <nobr>客户编号</nobr>
                 </th>
                 <th>
-                  <nobr>客户姓名</nobr>
-                </th>
-                <th>
-                  <nobr>档案编号</nobr>
-                </th>
-                <th>
-                  <nobr>客户地址</nobr>
+                  <nobr>客户名称</nobr>
                 </th>
                 <th>
                   <nobr>用户类型</nobr>
@@ -134,178 +115,147 @@
                   <nobr>用气性质</nobr>
                 </th>
                 <th>
-                  <nobr>原价格</nobr>
+                  <nobr>表具品牌</nobr>
                 </th>
                 <th>
-                  <nobr>新价格</nobr>
+                  <nobr>表具型号</nobr>
                 </th>
                 <th>
-                  <nobr>原价执行日期</nobr>
+                  <nobr>表号</nobr>
                 </th>
                 <th>
-                  <nobr>新价执行日期</nobr>
+                  <nobr>系统价格</nobr>
                 </th>
                 <th>
-                  <nobr>片区</nobr>
+                  <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>
-                <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_userinfo_code}}</nobr>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" 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>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
-              </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>
-              <td style="text-align: center;">
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
                 <nobr>{{row.f_user_type}}</nobr>
               </td>
-              <td style="text-align: center;">
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
                 <nobr>{{row.f_gasproperties}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_oldprice}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_newprice}}</nobr>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.f_meter_brand}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.oldprice_performdate}}</nobr>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.f_meter_style}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.newprice_performdate}}</nobr>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.f_meternumber}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_slice_area}}</nobr>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.value}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_comments}}</nobr>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.curentprice}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_meter_classify}}</nobr>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.f_hand_date}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_meter_brand}}</nobr>
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
+                <nobr>{{row.f_orgname}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_meter_style}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_operator}}</nobr>
-              </td>
-              <td style="text-align: center;">
+              <td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
                 <nobr>{{row.f_depname}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_operate_date}}</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>
+
         </criteria-paged>
+
+
+      </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>
-  <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>
 </template>
 
 <script>
-  import {HttpResetClass, PagedList} from 'vue-client'
-  import exportConfig from '../config/exportConfig'
-  import defaultPrint from '../config/DefaultPrint'
+  import {PagedList} from 'vue-client'
+  import exportConfig from '../../../config/exportConfig'
+  import defaultPrint from "../../../config/DefaultPrint";
+  import plugin from "system-clients/src/plugins/GetLoginInfoService";
 
   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.$refs.paged.$refs.cri.model.operateDate = self.$login.toStandardDateString() + ' 00:00:00'
-    // self.$refs.paged.$refs.cri.model.performDate = self.$login.toStandardDateString() + ' 23:59:59'
-    await self.$MagLoadParams.loadParam()
+    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'
+    // self.$refs.paged.$refs.cri.search()
+    self.initParams();
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
-    self.initParams()
-    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
+    await self.$MagLoadParams.loadParam()
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
-    props:['data'],
-    title: '调价记录查询',
+    title: '气价监控',
     data() {
       return {
-        other:[],
-        footer:[],
+        org:[this.$login.f.orgid],
+        filialeCodeStr: `and f_filialeid = ${this.$login.f.orgid}`,
         config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name','f_address', 'f_user_type', 'f_gasproperties','f_oldprice','f_newprice','oldprice_performdate','newprice_performdate','f_operate_date','f_operator','f_depname']
+          defaultPrint: ['f_userinfo_code', 'f_address', 'f_pregas', 'f_preamount']
         },
         //f_price_name:[],
         gasproperties:[],
+        showinfo: false,
         data: {},
+        show:false,
+        rowdata:{},
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
-          user:[]
+          user:[],
         },
-        model: new PagedList('rs/sql/pricechangeRecordQuery', 20, {}, ),
-        criteriaShow: false,
+        model: new PagedList('rs/sql/iotfarawayprice', 20, {}, ),
+        criteriaShow: true,
         orgCondtionStr: '',
         // 下拉框
         meterbrands: [],
+        pricenames: [],
+        prices: [],
         //合计数据
         defaultfield: [],
         sumsmodel: {},
-        showupload:false,
-        selected:{},
         f_filialeid: this.$login.f.f_orgid,
+        selectfields:[],
+        istrueoptions:[{label:"全部",value:""},{label:"是",value:"0"},{label:"否",value:"1"}]
       }
     },
     ready() {
+
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
         this.$emit('error', error)
       })
-
+      for(var item in exportConfig.FarawayConfig){
+        this.selectfields.push(item)
+      }
     },
     methods: {
-      view(row){
-        this.showupload = true
-        this.selected= row
-      },
       initParams() {
         // 初始化气表品牌
         let brandArr = []
@@ -316,31 +266,47 @@
           brandArr.push(temp)
         })
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
-      },
 
+      },
+      getorg (obj) {
+        if(obj.resids.length>0){
+          this.selectorgid = obj.resids
+          this.filialeCodeStr =" and f_filialeid in " + plugin.convertToIn(obj.resids)
+        }
+        else{
+          this.filialeCodeStr= " and f_filialeid = " + this.$login.f.orgid
+        }
+      },
       search(){
         this.$refs.paged.$refs.cri.search()
       },
+      cancel() {
+        this.show = false
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.show=true
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties=''
 
+          console.log(this.$refs.paged.$refs.cri.model.f_user_type[0])
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+          // this.gasproperties.push({label: '全部', value: ''})
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
+      },
 
       selfSearch(args) {
-        //小区查询条件
-        if (this.data) {
-          this.$parent.$parent.$parent.data.operateDate=this.$refs.paged.$refs.cri.model.operateDate
-          this.$parent.$parent.$parent.data.performDate=this.$refs.paged.$refs.cri.model.performDate
-        }
-        let f_orgstr = this.orgCondtionStr
-        args.condition = `${args.condition} ` + f_orgstr
+        args.condition = args.condition+ ` ${this.filialeCodeStr}`
         this.model.search(args.condition, args.model)
-        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
-
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       },
       clear() {
-        console.log('---------aaaa')
-        //清空部门和人员
-        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] = []
@@ -359,51 +325,77 @@
       },
       getRes(condition,obj) {
         this.orgCondtionStr = condition
-        this.orgname = obj.orgnames[0]
-        this.depname = obj.depnames[0]
+        this.f_orgid = obj.resids
       },
-      userTypeChange () {
-        this.gasproperties=[]
-        if(this.$refs.paged.$refs.cri.model !==null) {
-          this.$refs.paged.$refs.cri.model.f_gasproperties=''
-          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
-        }
-        else{
-          this.gasproperties =[{label: '全部', value: ''}]
+      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()
       },
-
-    },
-    events:{
-
     },
     watch: {
-
-      'orgCondtionStr'(val) {
+      'model'(val) {
+        console.log(val, "12222222222222222222")
+      },
+      'filialeCodeStr'(val) {
         let res = val.match(/'(.*?)'/)
         console.log('正则提取:',res && res[1])
         if (res) {
           this.f_filialeid = res[1]
+          this.updateParams()
         }
       }
     },
     computed: {
-
       getCondition() {
-        return {
-          operateDate: this.$refs.paged.$refs.cri.model.operateDate,
-          performDate: this.$refs.paged.$refs.cri.model.performDate,
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.filialeCodeStr}
       },
-      getfield() {
-        return exportConfig.pricechangeRecordConfig
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
-      metertypes() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
+      pricetypeoptions(){
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气价类型')]
       },
-      usertypes() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      getfield() {
+        return exportConfig.FarawayConfig
       },
+
     }
   }
 </script>