manage-client 3.1.9-aode → 3.1.9-ls

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

@@ -12,6 +12,8 @@
             <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>
@@ -21,6 +23,8 @@
             <tr >
               <td style="text-align:center;">{{$index+1}}</td>
               <th style="text-align:center">{{row.f_brand_spec}}</th>
+              <th style="text-align:center">{{row.f_typename}}</th>
+              <th style="text-align:center">{{row.f_typenumber}}</th>
               <th style="text-align:center">{{row.f_number}}</th>
               <th style="text-align:center">{{row.f_unitprice}}</th>
               <th style="text-align:center">{{(row.f_number-0)*(row.f_unitprice-0)}}</th>

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

@@ -7,16 +7,6 @@
           <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%"
@@ -37,21 +27,36 @@
                               condition="f_operate_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">客户名称</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" :defaultselect="$parent.$parent.selectfields"
-                                :field="$parent.$parent.getfield"
+                  <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
                                 sqlurl="rs/logic/exportfile" sql-name="otherChargeQuery" 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>
-              <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"
@@ -59,12 +64,54 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">收费类型</label>
-                  <v-select id="f_type"
-                            v-model="model.f_brand_spec"
+                  <v-select v-model="model.f_brand_spec"
                             placeholder='请选择'
-                            condition="f_type ='{}'"
-                            :value.sync="model.f_type"
+                            condition="f_brand_spec in {}"
+                            :value.sync="model.f_brand_spec" multiple
                             :options='$parent.$parent.chargetype'
+                            @change="$parent.$parent.setTypename"
+                            close-on-select clear-button></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">品名规格</label>
+                  <v-select v-model="model.f_typename"
+                            placeholder='请选择'
+                            condition="f_typename in {}"
+                            :value.sync="model.f_typename" multiple
+                            :options='$parent.$parent.typeNameList'
+                            @change="$parent.$parent.setTypenumber"
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">型&emsp;&emsp;号</label>
+                  <v-select v-model="model.f_typenumber"
+                            placeholder='请选择'
+                            condition="f_typenumber = '{}'"
+                            :value.sync="model.f_typenumber"
+                            :options='$parent.$parent.typenumberList'
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用户类型</label>
+                  <v-select id="f_user_type"
+                            v-model="model.f_user_type"
+                            placeholder='请选择'
+                            condition="f_user_type ='{}'"
+                            :value.sync="model.f_user_type"
+                            @change="$parent.$parent.userTypeChange(model.f_user_type)"
+                            :options='$parent.$parent.userTypes'
+                            close-on-select clear-button></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用气性质</label>
+                  <v-select id="f_gasproperties"
+                            v-model="model.f_gasproperties"
+                            placeholder='请选择'
+                            condition="f_gasproperties ='{}'"
+                            :value.sync="model.f_gasproperties"
+                            :options='$parent.$parent.gasproperties'
                             close-on-select clear-button></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -72,7 +119,8 @@
                   <v-select id="f_state"
                             v-model="model.f_state"
                             placeholder='请选择'
-                            condition="f_state ='{}'"
+                            condition="f_state in {}"
+                            multiple="true"
                             :value.sync="model.f_state"
                             :options='$parent.$parent.chargeState'
                             close-on-select clear-button>
@@ -84,7 +132,8 @@
                   <v-select id="f_payment"
                             v-model="model.f_payment"
                             placeholder='请选择'
-                            condition="f_payment ='{}'"
+                            condition="f_payment in {}"
+                            multiple="true"
                             :value.sync="model.f_payment"
                             :options='$parent.$parent.payments'
                             close-on-select clear-button>
@@ -101,6 +150,21 @@
                             close-on-select clear-button>
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表类型</label>
+                  <v-select :value.sync="model.f_meter_classify" multiple
+                            :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_classify"
+                            condition="f_meter_classify in {}"
+                            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" multiple
+                            v-model="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand in {}"
+                            close-on-select></v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -111,12 +175,43 @@
                 <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>
+                <th>
+                  <nobr>单价</nobr>
+                </th>
+                <th>
+                  <nobr>数量</nobr>
+                </th>
                 <th>
                   <nobr>收款</nobr>
                 </th>
@@ -144,7 +239,8 @@
                 <th>
                   <nobr>公司</nobr>
                 </th>
-                <th><nobr>查看详情</nobr></th>
+                <th><nobr>附件</nobr></th>
+                <!--<th><nobr>查看详情</nobr></th>-->
               </tr>
             </template>
             <template partial='body'>
@@ -152,6 +248,9 @@
                 <nobr>
                   <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.id}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
@@ -159,7 +258,35 @@
                 <nobr>{{row.f_address}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_collection}}</nobr>
+                <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_card_id}}</nobr>
+              </td>
+
+              <td style="text-align: center;">
+                <nobr>{{row.f_bill_number}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_brand_spec}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_typename}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_typenumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_unitprice}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_number}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_money}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_payment}}</nobr>
@@ -185,9 +312,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <button class="btn btn-link" @click.stop="$parent.$parent.$parent.showchargedetail(row)">查看</button>
-              </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>
+              <!--<td style="text-align: center;">-->
+                <!--<button class="btn btn-link" @click.stop="$parent.$parent.$parent.showchargedetail(row)">查看</button>-->
+              <!--</td>-->
             </template>
             <template partial='foot'></template>
           </data-grid>
@@ -200,17 +330,24 @@
               style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
               汇总信息
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-              收款合计:&emsp;{{sumsmodel.f_collection}}
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              收款合计:&emsp;{{sumsmodel.f_money}}
             </td>
           </tr>
         </table>
 
       </div>
-      <div v-if="show">
-        <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
+      <div class="basic-main" v-if="show">
+        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
       </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>
 
     <modal v-if="showdetail" :show.sync="showdetail" title="详细记录" v-ref:modal large backdrop="false">
@@ -230,28 +367,40 @@
   import OtherChargeDetailQuery from "./OtherChargeDetailQuery";
 
   let readySomething = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+    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.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
     // await self.$refs.paged.$refs.cri.search()
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
     await self.$MagLoadParams.loadParam()
 
+    self.initParams()
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
     components: {
       OtherChargeDetailQuery
     },
+    props:['data'],
+    title: '其他收费查询',
     data() {
       return {
-        selectfields:[],
         data: {},
-        model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_collection: 0}),
+        other:[],
+        footer:[],
+        model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
         printshow: false,
         all: false,
         fields: {},
+        config: {
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_brand_spec', 'f_typename', 'f_typenumber', 'f_unitprice', 'f_number', 'f_money','f_operate_date', 'f_operator']
+        },
+        //默认打印列
+        defaultfield: [],
         thead: '',
         tfoot: '',
         initres: {
@@ -263,30 +412,67 @@
         showdetail:false,
         otherchargeid:'',
         rowdata:{},
+        meterbrands: [],
         //合计数据
-        sumsmodel: {}
+        sumsmodel: {},
+        showupload:false,
+        selected:{},
+        // 用气性质
+        gasproperties: [],
+        // 品名规格
+        typeNameList: [],
+        // 型号
+        typenumberList: []
       }
     },
-    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
+      },
+      initParams() {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+      },
+      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()
       },
       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
@@ -298,7 +484,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() {
@@ -360,6 +546,22 @@
       showchargedetail(row){
         this.showdetail=true
         this.otherchargeid=row.id
+      },
+      userTypeChange (f_user_type) {
+        this.gasproperties = []
+        if (f_user_type) {
+          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: ''}]
+        }
+      },
+      setTypename (val) {
+        this.typenumberList = []
+        this.typeNameList = this.$appdata.getParam(val)
+      },
+      setTypenumber (val) {
+        this.typenumberList = this.$appdata.getParam(val)
       }
     },
     watch: {
@@ -374,12 +576,11 @@
       'modelval.length'() {
         this.put()
       },
-      'orgCondtionStr'(val) {
-        let res = val.match(/'(.*?)'/)
-        console.log('正则提取:',res && res[1])
-        if (res) {
-          this.selectorg = res[1]
-        }
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
       }
     },
     computed: {
@@ -395,9 +596,15 @@
       chargetype() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('品名及规格')]
       },
+      userTypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
       chargeState() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
       },
+      metertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+      },
       payments() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
       }