manage-client 3.2.29 → 3.2.30-aode

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

@@ -0,0 +1,313 @@
+ <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"
+                                  :field="$parent.$parent.getfield"
+                                  :defaultselect="$parent.$parent.selectfields"
+                                  sqlurl="rs/logic/exportfile" sql-name="userLogOff" 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 class="font_normal_body">客户编号</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_id"
+                           condition="f_userinfo_code like '{}%' " 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'"
+                                :show-reset-button="true"
+                                condition="f_operate_date >= '{} 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%"
+                                v-model="model.endDate"
+                                :value.sync="model.endDate"
+                                :format="'yyyy-MM-dd'"
+                                :show-reset-button="true"
+                                condition="f_operate_date <= '{} 23:59:59'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">用户状态</label>
+                    <v-select :options='$parent.$parent.fuserstate'
+                              :value.sync="model.f_state"
+                              close-on-select
+                              condition="f_state = '{}'"
+                              placeholder='用户状态'
+                              style="width: 60%"
+                              v-model="model.f_state">
+                    </v-select>
+                  </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>
+                  <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+                </nobr> </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_user_name}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_orgname}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_depname}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_operator}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_operate_date}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_meter_classify}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_meter_brand}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_state}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_comments}}</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>
+  </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()
+      self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+      // await self.$refs.paged.$refs.cri.search()
+      //self.$refs.paged.$refs.cri.model.f_sendsuccess = ['有效']
+      await self.$MagLoadParams.loadParam()
+
+      self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+    }
+    export default {
+      data() {
+        return {
+          data: {},
+          model: new PagedList('rs/sql/userLogOff', 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: '',
+          show:false,
+          rowdata:{},
+          modelval: [],
+          printshow: false,
+          all: false,
+          fields: {},
+          thead: '',
+          tfoot: '',
+          initres: {
+            org:[this.$login.f.orgid],
+            dep:[],
+            user:[],
+          },
+          //合计数据
+          sumsmodel: {},
+          selectfields:[],
+          fuserstate:[{label: '启用', value: '启用'}, {label: '销户', value: '销户'},{label: '有效',value:'有效'},{label: '正常',value:'正常'}]
+        }
+      },
+      props:['selectorg'],
+      ready() {
+        if(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.queryUserStateFiles){
+          this.selectfields.push(item)
+        }
+      },
+      methods: {
+        search(){
+          this.$refs.paged.$refs.cri.search()
+        },
+        selfSearch(args) {
+          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] = ''
+          })
+        },
+        show() {
+          this.criteriaShow = true
+        },
+        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>'
+        },
+        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
+        },
+        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.queryUserStateFiles
+        }
+      }
+    }
+  </script>

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

@@ -7,14 +7,24 @@
           <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_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'"
+                              :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,40 +32,25 @@
                   <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">客户名称</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="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="reverseQuery" template-name='冲正查询导出'
                                 :choose-col="true"></export-excel>
-                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
 
-                              titletable="冲正记录" :defaultfield="$parent.$parent.defaultfield"
-                              :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"
@@ -116,7 +111,6 @@
                 <th>
                   <nobr>公司</nobr>
                 </th>
-                <th><nobr>附件</nobr></th>
               </tr>
             </template>
             <template partial='body'>
@@ -154,9 +148,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>
@@ -169,30 +160,23 @@
               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_pregas}}
             </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_preamount}}
             </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_collection}}
             </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>
 
@@ -202,21 +186,18 @@
   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 {
+        selectfields:[],
         data: {},
-        other:[],
-        footer:[],
         model: new PagedList('rs/sql/reverseQuery', 20, {}, {f_pregas: 0, f_preamount: 0, f_collection: 0}),
         criteriaShow: false,
         orgCondtionStr: '',
@@ -232,47 +213,27 @@
         all: false,
         fields: {},
         thead: '',
-        //默认打印列
-        defaultfield: [],
-        config: {
-          defaultPrint: ['f_userinfo_code','f_user_name', 'f_address']
-        },
-        showupload:false,
-        selected:{},
         tfoot: '',
         //合计数据
         sumsmodel: {}
       }
     },
+    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.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()
       },
@@ -280,10 +241,6 @@
         this.show = false
       },
       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
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
@@ -295,7 +252,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() {
@@ -361,15 +318,16 @@
           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() {
@@ -378,9 +336,6 @@
       getfield() {
         return exportConfig.reverseConfig
       },
-      defaultexport() {
-        return exportConfig.reverseexportConfig
-      },
       usertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },