manage-client 3.3.209 → 3.3.211-by

package/src/components/SellReport/yangchun/YcBusSummaryes.vue

@@ -0,0 +1,229 @@
+<template>
+  <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="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"  :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+          </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 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_user_type"-->
+<!--                        v-model="$parent.$parent.f_user_type"-->
+<!--                        :options='$parent.$parent.user_type' placeholder='请选择'-->
+<!--                        condition="f_user_type = '{}'"-->
+<!--                        close-on-select></v-select>-->
+<!--            </div>-->
+<!--            &lt;!&ndash;<div class="col-sm-2 form-group">&ndash;&gt;-->
+<!--            &lt;!&ndash;<label class="font_normal_body">收费状态</label>&ndash;&gt;-->
+<!--            &lt;!&ndash;<v-select :value.sync="$parent.$parent.f_state" multiple&ndash;&gt;-->
+<!--            &lt;!&ndash;v-model="$parent.$parent.f_state"&ndash;&gt;-->
+<!--            &lt;!&ndash;:options='$parent.$parent.charge_state' placeholder='请选择'&ndash;&gt;-->
+<!--            &lt;!&ndash;condition="f_state in {}"&ndash;&gt;-->
+<!--            &lt;!&ndash;close-on-select></v-select>&ndash;&gt;-->
+<!--            &lt;!&ndash;</div>&ndash;&gt;-->
+<!--          </div>-->
+        </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="$parent.operatorname">人员：{{$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'
+
+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_user_type: '',
+      f_state:['有效'],
+      model: new DataModel('api/af-revenue/report/yc', {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: []
+      }
+    }
+  },
+  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_user_type && this.f_user_type[0]) {
+        orgcondition += ` and f_user_type = '${ this.f_user_type}  '`
+      }
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.$refs.paged.search(args)
+    },
+
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes (condition, obj) {
+      this.orgCondtionStr = condition
+      this.orgname = obj.orgnames[0]
+      this.depname = obj.depnames[0]
+      console.log(obj,"========")
+      this.operatorname = obj.operatornames[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
+    }
+  },
+  computed: {
+    charge_state() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
+    },
+    user_type () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

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

@@ -32,9 +32,9 @@
                          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="档案编号">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
                 </div>
 
                 <div class="span" style="float:right;">
@@ -66,6 +66,11 @@
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
                 <res-select-group :show-component="$parent.$parent.resshow"  :initres="$parent.$parent.initres"  :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <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="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"
@@ -170,11 +175,6 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_id"
                          condition="f_user_id = '{}'" placeholder='表编号'>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">表&emsp;&emsp;号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
-                         condition="f_meternumber = '{}'" placeholder='表号'>
-                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">卡&emsp;&emsp;号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"

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

@@ -34,11 +34,11 @@
                   <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.Fileinput()">反盘导入</button>
-                  <export-excel :data="$parent.$parent.getCondition"
-                                :field="$parent.$parent.getBankfield" :header="$parent.$parent.other"
-                                sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="newhandplanQuery" template-name='送盘导出' btn-name="送盘导出"
-                                :choose-col="true"></export-excel>
+<!--                  <button class="btn btn-default" @click="$parent.$parent.Fileinput()">反盘导入</button>-->
+<!--                  <export-excel :data="$parent.$parent.getCondition"-->
+<!--                                :field="$parent.$parent.getBankfield" :header="$parent.$parent.other"-->
+<!--                                sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="newhandplanQuery" template-name='送盘导出' btn-name="送盘导出"-->
+<!--                                :choose-col="true"></export-excel>-->
                   <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
                                 :field="$parent.$parent.getfield" :header="$parent.$parent.other"
                                 sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="handplanQuery" template-name='抄表查询导出'
@@ -295,14 +295,14 @@
                             condition="f_accounts_state = '{}'"
                             close-on-select></v-select>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&ensp;壁挂炉&ensp;</label>
-                  <v-select :value.sync="model.f_bgl"
-                            v-model="model.f_bgl"
-                            :options='$parent.$parent.bgl' placeholder='请选择'
-                            condition="f_bgl = '{}'"
-                            close-on-select></v-select>
-                </div>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">&ensp;壁挂炉&ensp;</label>-->
+<!--                  <v-select :value.sync="model.f_bgl"-->
+<!--                            v-model="model.f_bgl"-->
+<!--                            :options='$parent.$parent.bgl' placeholder='请选择'-->
+<!--                            condition="f_bgl = '{}'"-->
+<!--                            close-on-select></v-select>-->
+<!--                </div>-->
               </div>
             </div>
           </criteria>
@@ -360,9 +360,9 @@
                 <th>
                   <nobr>用气量</nobr>
                 </th>
-                <th>
-                  <nobr>违约金</nobr>
-                </th>
+<!--                <th>-->
+<!--                  <nobr>违约金</nobr>-->
+<!--                </th>-->
                 <th>
                   <nobr>用气金额</nobr>
                 </th>
@@ -392,14 +392,14 @@
                 <th>
                   <nobr>收费人员</nobr>
                 </th>
-                <th>
-<!--                  <nobr>冲正时间</nobr>-->
-                  <data-order field="f_corrhand_date" name="冲正时间"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_corrhand_date"></data-order>
-                </th>
-                <th>
-                  <nobr>冲正人员</nobr>
-                </th>
+<!--                <th>-->
+<!--&lt;!&ndash;                  <nobr>冲正时间</nobr>&ndash;&gt;-->
+<!--                  <data-order field="f_corrhand_date" name="冲正时间"-->
+<!--                              :order.sync="$parent.$parent.$parent.orderFields.f_corrhand_date"></data-order>-->
+<!--                </th>-->
+<!--                <th>-->
+<!--                  <nobr>冲正人员</nobr>-->
+<!--                </th>-->
                 <th>
 <!--                  <nobr>下发日期</nobr>-->
                   <data-order field="f_hand_date" name="下发日期"
@@ -521,9 +521,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_oughtamount}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.overdue}}</nobr>
-              </td>
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.overdue}}</nobr>-->
+<!--              </td>-->
               <td style="text-align: center;">
                 <nobr>{{row.f_oughtfee}}</nobr>
               </td>
@@ -551,12 +551,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_sell_operator}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_corrhand_date}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_corrhand_operator}}</nobr>
-              </td>
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_corrhand_date}}</nobr>-->
+<!--              </td>-->
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_corrhand_operator}}</nobr>-->
+<!--              </td>-->
               <td style="text-align: center;">
                 <nobr>{{row.f_hand_date}}</nobr>
               </td>

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

@@ -149,9 +149,6 @@
                             condition="f_meter_brand in {}"
                             close-on-select></v-select>
                 </div>
-
-
-
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>
                   <v-select :value.sync="model.f_inputtor"
@@ -181,6 +178,19 @@
                             close-on-select
                             condition="f_meter_book_num in {}"></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">阀门状态</label>
+                  <v-select :value.sync="model.f_valve_state"
+                            v-model="model.f_valve_state"
+                            :options='$parent.$parent.valvestate' placeholder='阀门状态'
+                            condition="f_valve_state = '{}'"
+                            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_curbalance"
+                         condition="f_curbalance < '{}' " placeholder="本期余额小于">
+                </div>
               </div>
             </div>
           </criteria>
@@ -209,6 +219,9 @@
                 <th>
                   <nobr>客户手机</nobr>
                 </th>
+                <th>
+                  <nobr>阀门状态</nobr>
+                </th>
                 <th>
                   <nobr>表号</nobr>
                 </th>
@@ -327,6 +340,10 @@
               <td style="text-align: center;">
                 <nobr>{{row.phone}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_valve_state}}</nobr>
+              </td>
+
               <td style="text-align: center;">
                 <nobr>{{row.f_meternumber}}</nobr>
               </td>
@@ -891,7 +908,7 @@
       },
       getfield() {
         return {
-          'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址', 'f_zones': '片区', 'phone': '客户手机',
+          'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址', 'f_zones': '片区', 'phone': '客户手机', 'f_valve_state': '阀门状态',
           'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额','f_meternumber': '表号', 'ym_data': '数据年月',
           'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_hand_date': '抄表日期','f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
           'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
@@ -911,6 +928,9 @@
       handstate() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('表单状态')]
       },
+      valvestate() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('阀门状态')]
+      },
       pricetypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
       },