manage-client 3.2.201 → 3.2.203

package/src/components/SellReport/OperatorSellReport.vue

@@ -1,268 +1,221 @@
 <template>
-    <div class="basic-main" style="height: 98%">
-      <criteria-paged :model="model" :pager='false' v-ref:paged>
-        <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
-          <p class="bg-info text-center" style="padding: 8px;">收费员收费汇总报表</p>
-          <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
-          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
-            <div class="row">
-              <div class="col-sm-4" >
-                <label class="font_normal_body" for="startDate">开始日期:</label>
-                <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
-                            v-model="model.startDate"
-                            :value.sync="model.startDate"
-                            :disabled-days-of-Week="[]"
-                            :format="'yyyy-MM-dd HH:mm:ss'"
-                            :show-reset-button="reset">
-                </datepicker>
-              </div>
-              <div class="col-sm-4" >
-                <label  class="font_normal_body" for="endDate">结束日期:</label>
-                <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
-                            v-model="model.endDate"
-                            :value.sync="model.endDate"
-                            :disabled-days-of-Week="[]"
-                            :format="'yyyy-MM-dd HH:mm:ss'"
-                            :show-reset-button="reset">
-                </datepicker>
-              </div>
-              <div class="col-sm-4">
-                <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
-                <right-tree @re-res="$parent.$parent.getRes"></right-tree>
-              </div>
-              <div class="col-sm-4">
-                <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
-                <res-select restype='department'
-                            @res-select="$parent.$parent.getdep"
-                            :parentresid="$parent.$parent.depresid"
-                            :initresid='$parent.$parent.depid'>
-                </res-select>
-
-              </div>
-              <div class="col-sm-4">
-                <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
-                <res-select restype='user'
-                            @res-select="$parent.$parent.getuser"
-                            :parentresid="$parent.$parent.userresid"
-                            :initresid='$parent.$parent.operatorid'>
-                </res-select>
-              </div>
+  <div class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <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" for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div><!--
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
+              <right-tree @re-res="$parent.$parent.getRes" style="width: 60%"></right-tree>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
+              <res-select restype='department'
+                          is-mul="false"
+                          @res-select="$parent.$parent.getdep"
+                          :parentresid="$parent.$parent.depresid"
+                          :initresid='$parent.$parent.depid'>
+              </res-select>
 
             </div>
-            <div class="span" style = "float:right;">
-              <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
-              <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
-              <report-excel id='gasprice'></report-excel>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
+              <res-select restype='user'
+                          is-mul="false"
+                          @res-select="$parent.$parent.getuser"
+                          :parentresid="$parent.$parent.userresid"
+                          :initresid='$parent.$parent.operatorid'>
+              </res-select>
             </div>
+-->
+            <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
           </div>
-        </criteria>
-        <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
-          <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
-            <thead>
-            <tr>
-              <th colspan='9' style="font-weight: normal; text-align: left;">
-                <h3 style="text-align: center">收费员收费汇总报表</h3>
-              </th>
-            </tr>
-            <tr>
-              <th colspan='9' style="font-weight: normal; text-align: center;">
-                开始时间：{{model.model.startDate}}<br>
-                结束时间：{{ model.model.endDate }}<br>
-                打印时间：{{{$parent.printTime}}}
-              </th>
-            </tr>
-            <tr>
-              <th colspan='9' style="font-weight: normal; text-align: center;">
-                <div>
-                  <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
-                  <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
-                  <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
-                </div>
-              </th>
-            </tr>
-            </thead>
-            <tr>
-              <td colspan='9'>
-                {{{ model.data.substring(26,model.data.length-8) }}}
-              </td>
-            </tr>
-            <tfoot>
-            <tr style="text-align: left">
-              <th colspan='3'>财务审核：</th>
-              <th colspan='3'>收款审核：</th>
-              <th colspan='3'>收款员：</th>
-            </tr>
-            </tfoot>
-          </table>
-          {{{ $parent.reportStr}}}
-        </div>
-      </criteria-paged>
-      <modal :show.sync="show" v-ref:modal small backdrop="false">
-        <header slot="modal-header" class="modal-header">
-          <h4 class="modal-title">输入文件名称</h4>
-        </header>
-        <article slot="modal-body" class="modal-body">
-          <div class="form-group">
-            <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+            <report-excel id='gasprice'></report-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 class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">收费状态</label>
+              <v-select :value.sync="$parent.$parent.f_state" multiple
+                        v-model="$parent.$parent.f_state"
+                        :options='$parent.$parent.charge_state' placeholder='请选择'
+                        condition="f_state in {}"
+                        close-on-select></v-select>
+            </div>
           </div>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-          <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
-          <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
-        </footer>
-      </modal>
-    </div>
-  </template>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">收费员收费汇总报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
+              <!--打印时间：{{{$parent.printTime}}}-->
+              打印时间：{{$parent.printTime}}
+              <!--收费员：{{// $parent.operatorname}}-->
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
+                <!--                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$refs.criteria.$refs.res.obj.operatornames[0]">人员：{{$parent.operatorname}}</span>-->
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td :colspan='$parent.spans' class="noborder">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>收款员：</th>
+          </tr>
+          </tfoot>
+        </table>
+        {{{ $parent.reportStr}}}
+      </div>
+    </criteria-paged>
+  </div>
+</template>
 
-  <script>
-    import { DataModel } from 'vue-client'
-    import co from 'co'
-    let saveFile = function * (self) {
-      // 线验证文件是否重名
-      let count = yield self.$resetpost('rs/sql/manageSingleTable',
-        {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
-        {resolveMsg: null, rejectMsg: null})
-      if (count.data.length > 0) {
-        self.$showAlert('无法保存，文件名重名', 'warning', 3000)
-        return
-      }
-      let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
-        f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
-        f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
-        f_outlets: this.$login.f.depname})
-      if (saveBack.data.status === 'succeed') {
-        self.show = false
-        self.filename = ''
-        // 后台保存完成，通知刷新
-        self.$dispatch('save-success', self.filename)
+<script>
+import { DataModel } from 'vue-client'
+import co from 'co'
+
+export default {
+  title: '收费员收费汇总报表',
+  props: ['data'],
+  data () {
+    return {
+      printTime: this.$login.toStandardTimeString(),
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      criteriaShow: false,
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      f_state:['有效'],
+      model: new DataModel('rs/report/operatorSellReport', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      resshow:['company','department','operator'],
+      spans: 0,
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
       }
     }
-    export default {
-      title: '收费员收费汇总报表',
-      props: ['data'],
-      data () {
-        return {
-          printTime: this.$login.toStandardTimeString(),
-          depresid: [],
-          userresid: [],
-          f_orgid: this.$login.f.orgid,
-          f_depid: this.$login.f.depids,
-          f_operatorid: this.$login.f.id,
-          operatorid: [],
-          depid: [],
-          orgname: '',
-          depname: '',
-          operatorname: '',
-          orgCondtionStr: '1=1',
-          model: new DataModel('rs/report/operatorSellReport', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-            f_orgid: 'this.model.f_orgid'}),
-          reportStr: null,
-          show: false,
-        }
-      },
-      ready () {
-        this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
-        this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
-        // this.$refs.paged.$refs.criteria.search()
-        console.log(this.$login.f)
-      },
-      methods: {
-        searchData () {
-          this.$refs.paged.$refs.criteria.search()
-        },
-        selfSearch (args) {
-          this.printTime = this.$login.toStandardTimeString()
-          console.log( "condition:" + args.condition)
-          let orgcondition = '1=1'
-          if (this.f_orgid[0]) {
-            orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
-          }
-          let deps = ''
-          let i = 0
-          let depss = ''
-          if (this.f_depid[0]) {
-            for ( i; i< this.f_depid.length; i++ )
-              deps += `'${this.f_depid[i]}',`
-            depss = deps.toString().substring(1,deps.length-2)
-            orgcondition +=  " and f_depid in ( '" + depss + "' ) "
-          }else {
-            depss = ''
-          }
-          console.log("所选部门:" + depss)
-
-          let opes = ''
-          let j = 0
-          let opess = ''
-          if(this.f_operatorid[0]) {
-            for ( j; j< this.f_operatorid.length; j++ )
-              opes += `'${this.f_operatorid[j]}',`
-            opess = opes.toString().substring(1,opes.length-2)
-            orgcondition += "and f_operatorid in ( '" + opess + "' ) "
-          }else {
-            opess = ''
-          }
-          console.log("所选人员:" + opess)
-
-          this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition + " and " + args.condition
-          this.$refs.paged.search(args)
-        },
-        getRes (obj) {
-          this.orgname = obj.res[0]
-          this.depresid = obj.resids
-          this.f_orgid = obj.resids
-          this.userresid = obj.resids
-        },
-        getdep (obj, val) {
-          this.depname = val
-          // this.userresid = obj
-          this.f_depid = obj
-        },
-        getuser ( obj, val) {
-          this.operatorname = val
-          this.f_operatorid = obj
-        },
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+    console.log(this.$login.f)
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = '1=1'
+      let orgstr = this.orgCondtionStr
+      orgcondition = orgcondition + orgstr
+      /*        if (this.f_orgid && this.f_orgid[0]) {
+                orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
+              }
+              if (this.f_depid && this.f_depid[0]) {
+                orgcondition += ' and f_depid in (' + this.f_depid + ')'
+              }
+              if(this.f_operatorid && this.f_operatorid[0]) {
+                orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
+              }*/
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.$refs.paged.search(args)
+    },
 
-        // 根据文件路径获取储存的报表内容
-        getFileContent (path) {
-          this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-            this.reportStr = res.data.filecontent
-            this.model.state = '正确'
-          })
-        },
-        confirm () {
-          if (!this.filename || this.filename === '') {
-            this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
-          }
-          let saveGen = saveFile(this)
-          co(saveGen)
-        },
-        close () {
-          this.show = false
-        },
-        // 将报表保存成文件
-        confirmReport () {
-          this.show = true
-          this.filename = this.data.f_report_name + this.$login.toStandardDateString()
-        },
-      },
-      watch: {
-        'data' (val) {
-          if (val.f_files_path) {
-            this.getFileContent(val.f_files_path)
-          } else {
-            this.reportStr = null
-          }
-        }
-      },
-      computed: {
-        metertypes() {
-          return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes (condition, obj) {
+      this.orgCondtionStr = condition
+      this.orgname = obj.orgnames[0]
+      this.depname = obj.depnames[0]
+    },
+    getdep (obj, val) {
+      this.depname = val[0]
+      this.userresid = obj
+      this.f_depid = obj
+    },
+    getuser ( obj, val) {
+      this.operatorname = val[0]
+      this.f_operatorid = obj
+    }
+  },
+  watch: {
+    'model.data' (val) {
+      let len=0
+      let a=val.split('</tr>')
+      for(let i=0;i<a.length;i++){
+        if(a[i].split('</td>').length-1>len){
+          len=a[i].split('</td>').length-1
         }
       }
+      this.spans = len
     }
-  </script>
-  <style scoped>
-    .noborder{
-      border: none;
+  },
+  computed: {
+    charge_state() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
     }
-  </style>
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

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

@@ -181,9 +181,9 @@
             <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>
             <th><nobr>气表品牌</nobr></th>

package/src/components/sale/config/exportConfig.js

@@ -33,7 +33,7 @@ export default{
   },
   //收据查询默认选择
   receiptexportConfig: {
-    'f_userinfo_code':'用户编号',	'f_user_name':'客户名称','f_address':'客户地址',	'f_meternumber':'表号'
+    'f_userinfo_code': '用户编号',	'f_user_name': '客户名称','f_address': '客户地址',	'f_meternumber':'表号'
   },
   // 资源操作
   resourceConfig: {
@@ -46,8 +46,8 @@ export default{
     'f_address': '客户地址'
   },
   meterConfig: {
-    'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_customer': '团缴编号',
-    'f_user_phone': '客户电话','f_rent_phone': '备用电话', 'idnumber': '身份证号', 'f_address': '客户地址', 'f_book_slice_area': '表册片区',
+    'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_customer': '团缴编号', 'f_userfiles_id': '表ID',
+    'f_user_phone': '客户电话', 'f_rent_phone': '备用电话', 'idnumber': '身份证号', 'f_address': '客户地址', 'f_book_slice_area': '表册片区',
     'f_balance_amount': '表上余额', 'f_user_type': '客户类型', 'f_usetype': '使用类型', 'f_gasproperties': '用气性质',
     'f_meternumber': '表号', 'f_card_id': '卡号', 'f_price_name': '气价名称', 'value': '气价详情', 'f_meter_brand': '气表品牌',
     'f_meter_style': '气表型号', 'f_inputtor': '户管员', 'f_gas_person': '通气人', 'f_gas_date': '通气时间',
@@ -417,7 +417,7 @@ export default{
   },
   transferConfig: {
     'f_userinfo_code': '客户编号', 'f_newuser_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址',
-    'f_user_name': '新客户名称', 'f_newuser_phone': '新客户电话', 'f_user_phone': '原客户电话', 'f_transfer_fees': '过户费', 'f_operate_date': '过户日期',
+    'f_user_name': '原客户名称', 'f_newuser_phone': '新客户电话', 'f_user_phone': '原客户电话', 'f_transfer_fees': '过户费', 'f_operate_date': '过户日期',
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号'
   },
   transferRecordConfig: {

package/src/components/sale/filesquery/GasDeviceQuery.vue

@@ -138,7 +138,7 @@
                   <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>

package/src/components/sale/filesquery/UserQuery.vue

@@ -63,7 +63,7 @@
                               close-on-select></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">用户类型</label>
+                    <label class="font_normal_body">客户类型</label>
                     <v-select :value.sync="model.f_user_type"
                               v-model="model.f_user_type" condition="f_user_type = '{}'"
                               :options='$parent.$parent.userTypes' placeholder='请选择'
@@ -314,7 +314,7 @@
                     <nobr>客户等级</nobr>
                   </th>
                   <th>
-                    <nobr>用户类型</nobr>
+                    <nobr>客户类型</nobr>
                   </th>
                   <th>
                     <data-order field="f_address" name="客户地址"